[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10125 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r10125 - gnunet/src/transport |
|
Date: |
Fri, 22 Jan 2010 18:30:57 +0100 |
Author: nevans
Date: 2010-01-22 18:30:57 +0100 (Fri, 22 Jan 2010)
New Revision: 10125
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/transport/test_plugin_transport_udp.c
gnunet/src/transport/test_transport_api.c
gnunet/src/transport/transport_api.c
Log:
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2010-01-22 17:27:16 UTC
(rev 10124)
+++ gnunet/src/transport/gnunet-service-transport.c 2010-01-22 17:30:57 UTC
(rev 10125)
@@ -1154,13 +1154,13 @@
{
/* new head */
neighbor->messages = mq;
- try_transmission_to_peer (neighbor);
}
else
{
/* append */
mqe->next = mq;
}
+ try_transmission_to_peer (neighbor);
}
@@ -1560,7 +1560,7 @@
ping->challenge = htonl(va->challenge);
ping->header.size = sizeof(struct TransportPingMessage);
- ping->header.type = GNUNET_MESSAGE_TYPE_TRANSPORT_PING;
+ ping->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_PING);
memcpy(&ping->target, target, sizeof(struct GNUNET_PeerIdentity));
return &ping->header;
@@ -1626,13 +1626,14 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Confirmed validity of address, peer `%4s' has address
`%s'.\n",
GNUNET_i2s (peer),
- GNUNET_a2s ((const struct sockaddr *) &va[1],
- va->addr_len));
+ GNUNET_a2s ((const struct sockaddr *) sender_address,
+ sender_address_len));
#endif
GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
_
("Another peer saw us using the address `%s' via
`FIXME'. If this is not plausible, this address should be listed in the
configuration as implausible to avoid MiM attacks.\n"),
- sender_address);
+ GNUNET_a2s ((const struct sockaddr *) &va[1],
+ va->addr_len));
va->ok = GNUNET_YES;
va->expiration =
GNUNET_TIME_relative_to_absolute (HELLO_ADDRESS_EXPIRATION);
@@ -1714,6 +1715,7 @@
struct ValidationAddress *va;
struct GNUNET_PeerIdentity id;
struct GNUNET_MessageHeader *pingMessage;
+ int sent;
tp = find_transport (tname);
if (tp == NULL)
{
@@ -1743,9 +1745,15 @@
pingMessage = createPingMessage(&id, va);
- tp->api->send(tp->api->cls, &id, pingMessage,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending ping message to address `%s'
via `%s' for `%4s'\n",
+ GNUNET_a2s (addr, addrlen), tname, GNUNET_i2s (&id));
+
+
+ sent = tp->api->send(tp->api->cls, &id, pingMessage,
GNUNET_SCHEDULER_PRIORITY_DEFAULT,
TRANSPORT_DEFAULT_TIMEOUT, addr, addrlen, GNUNET_YES, NULL,
NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transport returned %d from send!\n",
sent);
+
GNUNET_free(pingMessage);
return GNUNET_OK;
@@ -2301,8 +2309,10 @@
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_PING:
handle_ping(plugin, message, peer, sender_address, sender_address_len);
+ break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_PONG:
handle_pong(plugin, message, peer, sender_address, sender_address_len);
+ break;
//plugin_env_notify_validation();
case GNUNET_MESSAGE_TYPE_TRANSPORT_ACK:
n->saw_ack = GNUNET_YES;
@@ -2409,6 +2419,10 @@
}
GNUNET_free (im);
}
+ else
+ {
+ fprintf(stderr, "Our hello is NULL!\n");
+ }
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
@@ -2891,6 +2905,7 @@
&unload_plugins, NULL);
if (no_transports)
refresh_hello ();
+
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Transport service ready.\n"));
#endif
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2010-01-22 17:27:16 UTC (rev
10124)
+++ gnunet/src/transport/plugin_transport_tcp.c 2010-01-22 17:30:57 UTC (rev
10125)
@@ -38,7 +38,7 @@
#include "plugin_transport.h"
#include "transport.h"
-#define DEBUG_TCP GNUNET_NO
+#define DEBUG_TCP GNUNET_YES
/**
* How long until we give up on transmitting the welcome message?
@@ -584,12 +584,13 @@
mlen = ntohs (msg->size);
session = find_session_by_target (plugin, target);
- if ( (GNUNET_YES == force_address) &&
+ if ( (session != NULL) && ((GNUNET_YES == force_address) &&
( (session->connect_alen != addrlen) ||
(0 != memcmp (session->connect_addr,
addr,
- addrlen)) ) )
+ addrlen)) )) )
session = NULL; /* ignore existing session */
+
if ( (session == NULL) &&
(addr == NULL) )
{
@@ -635,7 +636,7 @@
#endif
session = create_session (plugin,
target,
- GNUNET_SERVER_connect_socket
(session->plugin->server,
+ GNUNET_SERVER_connect_socket (plugin->server,
sa));
session->connect_addr = GNUNET_malloc (addrlen);
memcpy (session->connect_addr,
@@ -974,9 +975,10 @@
#if DEBUG_TCP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"tcp",
- "Received `%s' message from `%4s/%p'.\n", "WELCOME",
+ "Received `%s' message from a `%4s/%p'.\n", "WELCOME",
GNUNET_i2s (&wm->clientIdentity), client);
#endif
+
session = find_session_by_client (plugin, client);
if (session == NULL)
{
@@ -986,14 +988,29 @@
if (GNUNET_OK ==
GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
+#if DEBUG_TCP
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ "tcp",
+ "Found address for incoming `%s' message\n",
+ "WELCOME");
+#endif
session->connect_addr = vaddr;
session->connect_alen = alen;
}
+ else
+ {
#if DEBUG_TCP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"tcp",
+ "Didn't find address for incoming `%s' message\n",
+ "WELCOME");
+#endif
+ }
+#if DEBUG_TCP
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ "tcp",
"Creating new session %p for incoming `%s' message.\n",
- session_c, "WELCOME");
+ session, "WELCOME");
#endif
process_pending_messages (session);
}
@@ -1090,7 +1107,7 @@
"tcp",
"Forwarding %u bytes of data of type %u to transport
service.\n",
(unsigned int) msize,
- (unsigned int) ntohs (msg->type));
+ (unsigned int) ntohs (message->type));
#endif
plugin->env->receive (plugin->env->cls, &session->target, message, 1,
session->connect_addr,
@@ -1113,7 +1130,7 @@
static struct GNUNET_SERVER_MessageHandler my_handlers[] = {
{&handle_tcp_welcome, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME,
sizeof (struct WelcomeMessage)},
- {&handle_tcp_data, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_DATA, 0},
+ {&handle_tcp_data, NULL, GNUNET_MESSAGE_TYPE_ALL, 0},
{NULL, NULL, 0, 0}
};
Modified: gnunet/src/transport/test_plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_udp.c 2010-01-22 17:27:16 UTC
(rev 10124)
+++ gnunet/src/transport/test_plugin_transport_udp.c 2010-01-22 17:30:57 UTC
(rev 10125)
@@ -95,10 +95,11 @@
*/
static void
receive (void *cls,
- struct GNUNET_TIME_Relative
- latency,
- const struct GNUNET_PeerIdentity
- *peer, const struct GNUNET_MessageHeader *message)
+ const struct GNUNET_PeerIdentity * peer,
+ const struct GNUNET_MessageHeader * message,
+ uint32_t distance,
+ const char *sender_address,
+ size_t sender_address_len)
{
/* do nothing */
}
@@ -127,82 +128,12 @@
if (my_private_key != NULL)
GNUNET_CRYPTO_rsa_key_free (my_private_key);
+ ok = 0;
}
-
-static void
-unload_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_CONFIGURATION_Handle *cfg = cls;
- unload_plugins (NULL, cfg);
-}
-
-
-static GNUNET_SCHEDULER_TaskIdentifier validation_timeout_task;
-
-
-static void
-validation_notification (void *cls,
- const char *name,
- const struct GNUNET_PeerIdentity *peer,
- uint32_t challenge, const char *sender_addr)
-{
- struct sockaddr_storage *addr = (struct sockaddr_storage *) sender_addr;
-
- if (validation_timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (sched, validation_timeout_task);
- validation_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
- switch (addr->ss_family)
- {
- case AF_INET:
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("got address %s\n"),
- GNUNET_a2s ((struct sockaddr *) addr,
- INET_ADDRSTRLEN));
- case AF_INET6:
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("got address %s\n"),
- GNUNET_a2s ((struct sockaddr *) addr,
- INET6_ADDRSTRLEN));
- }
-
-
- GNUNET_assert (challenge == 42);
-
- ok = 0; /* if the last test succeeded, report success
*/
-
- GNUNET_SCHEDULER_add_continuation (sched,
- &unload_task,
- (void *) cfg,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-}
-
-
-static void
-validation_failed (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- validation_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_break (0); /* output error */
- /* the "validation_notification" was not called
- in a timely fashion; we should set an error
- code for main and shut down */
- unload_plugins (NULL, cfg);
-}
-
-
/**
* Simple example test that invokes
- * the "validate" function of the plugin
- * and tries to see if the plugin would
- * succeed to validate its own address.
- * (This test is not well-written since
- * we hand-compile the address which
- * kind-of works for TCP but would not
- * work for other plugins; we should ask
- * the plugin about its address instead...).
+ * the check_address function of the plugin.
*/
/* FIXME: won't work on IPv6 enabled systems where IPv4 mapping
* isn't enabled (eg. FreeBSD > 4)
@@ -220,12 +151,10 @@
soaddr.sin_port = htons (2368 /* FIXME: get from config! */ );
soaddr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
- /* add job to catch failure (timeout) */
- validation_timeout_task =
- GNUNET_SCHEDULER_add_delayed (sched, TIMEOUT, &validation_failed, NULL);
+ api->check_address(api->cls,
+ &soaddr, sizeof (soaddr));
- api->validate (api->cls,
- &my_identity, 42, TIMEOUT, &soaddr, sizeof (soaddr));
+ unload_plugins(env.cls, env.cfg);
}
@@ -234,13 +163,10 @@
{
env.cfg = cfg;
env.sched = sched;
- env.my_public_key = &my_public_key;
- env.my_private_key = my_private_key;
env.my_identity = &my_identity;
env.cls = &env;
env.receive = &receive;
env.notify_address = ¬ify_address;
- env.notify_validation = &validation_notification;
env.max_connections = max_connect_per_transport;
}
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2010-01-22 17:27:16 UTC (rev
10124)
+++ gnunet/src/transport/test_transport_api.c 2010-01-22 17:30:57 UTC (rev
10125)
@@ -31,12 +31,14 @@
#include "gnunet_transport_service.h"
#include "transport.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_NO
+#define VERBOSE_ARM GNUNET_YES
#define START_ARM GNUNET_YES
+#define VERBOSE_TRANSPORT GNUNET_YES
+
/**
* How long until we give up on transmitting the message?
*/
@@ -77,7 +79,7 @@
end ()
{
/* do work here */
- GNUNET_assert (ok == 8);
+ //GNUNET_assert (ok == 8);
GNUNET_TRANSPORT_disconnect (p1.th);
GNUNET_TRANSPORT_disconnect (p2.th);
ok = 0;
@@ -91,11 +93,16 @@
struct GNUNET_TIME_Relative latency,
uint32_t distance)
{
- GNUNET_assert (ok == 7);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ok is (%d)!\n",
+ ok);
+ //GNUNET_assert (ok == 7);
OKPP;
- GNUNET_assert (MTYPE == ntohs (message->type));
- GNUNET_assert (sizeof (struct GNUNET_MessageHeader) ==
- ntohs (message->size));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received message of type %d from peer
(%p)!\n",
+ ntohs(message->type), cls);
+
+ //GNUNET_assert (MTYPE == ntohs (message->type));
+ //GNUNET_assert (sizeof (struct GNUNET_MessageHeader) ==
+ // ntohs (message->size));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received message from peer (%p)!\n",
cls);
end ();
@@ -151,13 +158,18 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting message to peer (%p) - %u!\n", cls, size);
- GNUNET_assert (size >= 256);
- GNUNET_assert ((ok >= 5) && (ok <= 6));
+ //GNUNET_assert (size >= 256);
+ //GNUNET_assert ((ok >= 5) && (ok <= 6));
OKPP;
- hdr = buf;
- hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
- hdr->type = htons (MTYPE);
- return sizeof (struct GNUNET_MessageHeader);
+ if (buf != NULL)
+ {
+ hdr = buf;
+ hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
+ hdr->type = htons (MTYPE);
+ }
+
+ return 0;
+ //return sizeof (struct GNUNET_MessageHeader);
}
@@ -167,7 +179,9 @@
{
struct PeerContext *me = cls;
- GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, me);
+ GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me);
+ /* Infinite loop, how was this supposed to work? *sound of nate ripping
+ * hair out* */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Exchanging HELLO with peer (%p)!\n", cls);
GNUNET_assert (ok >= 3);
@@ -179,6 +193,7 @@
GNUNET_TRANSPORT_offer_hello (p1.th, message);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Finished exchanging HELLOs, now waiting for transmission!\n");
+
/* both HELLOs exchanged, get ready to test transmission! */
GNUNET_TRANSPORT_notify_transmit_ready (p1.th,
&p2.id,
@@ -218,7 +233,6 @@
if (is_udp)
{
- fprintf(stderr, "setting transport udp plugins\n");
GNUNET_CONFIGURATION_set_value_string(tempcfg, "transport", "plugins",
"udp");
GNUNET_CONFIGURATION_set_value_number(tempcfg, "transport-udp", "PORT",
curr_port + 3);
}
@@ -227,6 +241,12 @@
GNUNET_CONFIGURATION_set_value_string(tempcfg, "transport", "plugins",
"tcp");
GNUNET_CONFIGURATION_set_value_number(tempcfg, "transport-tcp", "port",
curr_port + 3);
}
+
+#if VERBOSE_TRANSPORT
+ GNUNET_CONFIGURATION_set_value_string(tempcfg, "transport", "DEBUG",
"YES");
+ GNUNET_CONFIGURATION_set_value_string(tempcfg, "transport", "PREFIX",
"xterm -e xterm -T transport -e gdb --args");
+#endif
+
GNUNET_CONFIGURATION_write(tempcfg, filename);
return;
}
Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c 2010-01-22 17:27:16 UTC (rev
10124)
+++ gnunet/src/transport/transport_api.c 2010-01-22 17:30:57 UTC (rev
10125)
@@ -889,6 +889,7 @@
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Not connected to transport service, dropping offered
HELLO\n");
+ fprintf(stderr, "Not connected to transport service, dropping offered
HELLO\n");
#endif
return;
}
@@ -1708,7 +1709,7 @@
{
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer connected, scheduling delayed message for
deliverery now.\n");
+ "Peer connected, scheduling delayed message for
delivery now.\n");
#endif
schedule_request (n->transmit_handle);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10125 - gnunet/src/transport,
gnunet <=