[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19531 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19531 - gnunet/src/transport |
Date: |
Mon, 30 Jan 2012 13:40:52 +0100 |
Author: wachs
Date: 2012-01-30 13:40:52 +0100 (Mon, 30 Jan 2012)
New Revision: 19531
Modified:
gnunet/src/transport/plugin_transport_udp_new.c
Log:
- more changes
Modified: gnunet/src/transport/plugin_transport_udp_new.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp_new.c 2012-01-30 12:31:32 UTC
(rev 19530)
+++ gnunet/src/transport/plugin_transport_udp_new.c 2012-01-30 12:40:52 UTC
(rev 19531)
@@ -515,7 +515,9 @@
struct SessionCompareContext cctx;
cctx.addr = address;
cctx.res = NULL;
+#if DEBUG_UDP
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Looking for existing session for peer
`%s' `%s' \n", GNUNET_i2s (&address->peer), udp_address_to_string(NULL,
address->address, address->address_length));
+#endif
GNUNET_CONTAINER_multihashmap_get_multiple(plugin->sessions,
&address->peer.hashPubKey, session_cmp_it, &cctx);
if (cctx.res != NULL)
{
@@ -580,7 +582,38 @@
}
+static ssize_t udp_plugin_send_wrapper (void *cls,
+ const struct
+ GNUNET_PeerIdentity *
+ target,
+ const char *msgbuf,
+ size_t msgbuf_size,
+ uint32_t priority,
+ struct
+ GNUNET_TIME_Relative
+ timeout,
+ struct Session * session,
+ const void *addr,
+ size_t addrlen,
+ int force_address,
+ GNUNET_TRANSPORT_TransmitContinuation
+ cont, void *cont_cls)
+{
+ int ret;
+ struct Session * s = NULL;
+ struct GNUNET_HELLO_Address * ha = NULL;
+ ha = GNUNET_HELLO_address_allocate(target, "", addr,addrlen);
+ GNUNET_assert (ha != NULL);
+ s = udp_plugin_get_session(cls, ha);
+ GNUNET_assert (s != NULL);
+ GNUNET_free (ha);
+ ret = udp_plugin_send (cls, s, msgbuf, msgbuf_size, priority, timeout, cont,
cont_cls);
+
+ return ret;
+}
+
+
/**
* Our external IP address/port mapping has changed.
*
@@ -1014,6 +1047,7 @@
api->address_to_string = &udp_address_to_string;
api->check_address = &udp_plugin_check_address;
api->get_session = &udp_plugin_get_session;
+ api->send = &udp_plugin_send_wrapper;
api->send_with_session = &udp_plugin_send;
LOG (GNUNET_ERROR_TYPE_ERROR, "Setting up sockets\n");
@@ -1050,6 +1084,12 @@
stop_broadcast (plugin);
+ if (plugin->select_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (plugin->select_task);
+ plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
/* Closing sockets */
if (plugin->sockv4 != NULL)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19531 - gnunet/src/transport,
gnunet <=