/*
This file is part of GNUnet
- (C) 2010 Christian Grothoff (and other contributing authors)
+ (C) 2010, 2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
* @author Christian Grothoff
* @author Nathan Evans
*/
-
#include "platform.h"
#include "gnunet_hello_lib.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_container_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_peerinfo_service.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
#include "gnunet_transport_plugin.h"
#include "transport.h"
-#define DEBUG_UNIX GNUNET_EXTRALOGGING
-#define DETAILS GNUNET_NO
-
-#define MAX_PROBES 20
-/*
- * Transport cost to peer, always 1 for UNIX (direct connection)
+/**
+ * Return code we give on 'send' if we failed to send right now
+ * but it makes sense to retry later. (Note: we might want to
+ * move this to the plugin API!?).
*/
-#define UNIX_DIRECT_DISTANCE 1
-
-#define DEFAULT_NAT_PORT 0
+#define RETRY 0
/**
* How long until we give up on transmitting the welcome message?
#define HOSTNAME_RESOLVE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
/**
- * Starting port for listening and sending, eventually a config value
+ * Default "port" to use, if configuration does not specify.
+ * Essentially just a number appended to the UNIX path.
*/
#define UNIX_NAT_DEFAULT_PORT 22086
+
+#define LOG(kind,...) GNUNET_log_from (kind, "transport-unix",__VA_ARGS__)
+
+
GNUNET_NETWORK_STRUCT_BEGIN
/**
};
+
+/**
+ * Handle for a session.
+ */
struct Session
{
+ struct GNUNET_PeerIdentity target;
+
+ struct Plugin * plugin;
+
void *addr;
+
size_t addrlen;
- struct GNUNET_PeerIdentity target;
+
+ /**
+ * Session timeout task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
};
+
struct UNIXMessageWrapper
{
+ /**
+ * We keep messages in a doubly linked list.
+ */
struct UNIXMessageWrapper *next;
+
+ /**
+ * We keep messages in a doubly linked list.
+ */
struct UNIXMessageWrapper *prev;
+ /**
+ * The actual payload (allocated separately right now).
+ */
struct UNIXMessage * msg;
- size_t msgsize;
-
- struct GNUNET_TIME_Relative timeout;
- unsigned int priority;
+ /**
+ * Session this message belongs to.
+ */
struct Session *session;
+
+ /**
+ * Function to call upon transmission.
+ */
GNUNET_TRANSPORT_TransmitContinuation cont;
+
+ /**
+ * Closure for 'cont'.
+ */
void *cont_cls;
+
+ /**
+ * Timeout for this message.
+ */
+ struct GNUNET_TIME_Absolute timeout;
+
+ /**
+ * Number of bytes in 'msg'.
+ */
+ size_t msgsize;
+
+ /**
+ * Number of bytes of payload encapsulated in 'msg'.
+ */
+ size_t payload;
+
+ /**
+ * Priority of the message (ignored, just dragged along in UNIX).
+ */
+ unsigned int priority;
};
-/* Forward definition */
+
+/**
+ * Encapsulation of all of the state of the plugin.
+ */
struct Plugin;
/**
- * UNIX NAT "Session"
+ * UNIX "Session"
*/
struct PeerSession
{
};
+
/**
* Information we keep for each of our listen sockets.
*/
struct GNUNET_NETWORK_Handle *desc;
/**
- * The port we bound to
+ * The port we bound to (not an actual PORT, as UNIX domain sockets
+ * don't have ports, but rather a number in the path name to make this
+ * one unique).
*/
uint16_t port;
};
*/
struct Plugin
{
- /**
- * Our environment.
- */
- struct GNUNET_TRANSPORT_PluginEnvironment *env;
-
- /*
- * Session of peers with whom we are currently connected
- */
- struct PeerSession *sessions;
-
- /*
- * Sessions
- */
- struct GNUNET_CONTAINER_MultiHashMap *session_map;
/**
* ID of task used to update our addresses when one expires.
GNUNET_SCHEDULER_TaskIdentifier select_task;
/**
- * Integer to append to unix domain socket.
+ * Number of bytes we currently have in our write queue.
*/
- uint16_t port;
+ unsigned long long bytes_in_queue;
/**
- * FD Read set
+ * Our environment.
*/
- struct GNUNET_NETWORK_FDSet *rs;
+ struct GNUNET_TRANSPORT_PluginEnvironment *env;
/**
- * FD Write set
+ * Sessions
*/
- struct GNUNET_NETWORK_FDSet *ws;
+ struct GNUNET_CONTAINER_MultiHashMap *session_map;
- int with_ws;
+ /**
+ * FD Read set
+ */
+ struct GNUNET_NETWORK_FDSet *rs;
/**
- * socket that we transmit all data with
+ * FD Write set
*/
- struct UNIX_Sock_Info unix_sock;
+ struct GNUNET_NETWORK_FDSet *ws;
/**
* Path of our unix domain socket (/tmp/unix-plugin-PORT)
*/
char *unix_socket_path;
+ /**
+ * Head of queue of messages to transmit.
+ */
struct UNIXMessageWrapper *msg_head;
+
+ /**
+ * Tail of queue of messages to transmit.
+ */
struct UNIXMessageWrapper *msg_tail;
+ /**
+ * socket that we transmit all data with
+ */
+ struct UNIX_Sock_Info unix_sock;
+
/**
* ATS network
*/
struct GNUNET_ATS_Information ats_network;
- unsigned int bytes_in_queue;
-};
-
-
-static int
-get_session_delete_it (void *cls, const GNUNET_HashCode * key, void *value)
-{
- struct Session *s = value;
- struct Plugin *plugin = cls;
- GNUNET_assert (plugin != NULL);
-
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleting session for peer `%s' `%s' \n", GNUNET_i2s (&s->target), s->addr);
-#endif
+ /**
+ * Is the write set in the current 'select' task? GNUNET_NO if the
+ * write queue was empty when the main task was scheduled,
+ * GNUNET_YES if we're already waiting for being allowed to write.
+ */
+ int with_ws;
- plugin->env->session_end (plugin->env->cls, &s->target, s);
+ /**
+ * Integer to append to unix domain socket.
+ */
+ uint16_t port;
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove(plugin->session_map, &s->target.hashPubKey, s));
+};
- GNUNET_STATISTICS_set(plugin->env->stats,
- "# UNIX sessions active",
- GNUNET_CONTAINER_multihashmap_size(plugin->session_map),
- GNUNET_NO);
- GNUNET_free (s);
+/**
+ * Increment session timeout due to activity
+ *
+ * @param s session for which the timeout should be moved
+ */
+static void
+reschedule_session_timeout (struct Session *s);
- return GNUNET_YES;
-}
/**
- * Disconnect from a remote node. Clean up session if we have one for this peer
+ * We have been notified that our writeset has something to read. We don't
+ * know which socket needs to be read, so we have to check each one
+ * Then reschedule this function to be called again once more is available.
*
- * @param cls closure for this call (should be handle to Plugin)
- * @param target the peeridentity of the peer to disconnect
- * @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
+ * @param cls the plugin handle
+ * @param tc the scheduling context (for rescheduling this function again)
*/
-void
-unix_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
-{
- struct Plugin *plugin = cls;
- GNUNET_assert (plugin != NULL);
+static void
+unix_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
- GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map, &target->hashPubKey, &get_session_delete_it, plugin);
- return;
-}
/**
- * Shutdown the server process (stop receiving inbound traffic). Maybe
- * restarted later!
- *
- * @param cls Handle to the plugin for this transport
+ * Re-schedule the main 'select' callback (unix_plugin_select)
+ * for this plugin.
*
- * @return returns the number of sockets successfully closed,
- * should equal the number of sockets successfully opened
+ * @param plugin the plugin context
*/
-static int
-unix_transport_server_stop (void *cls)
+static void
+reschedule_select (struct Plugin * plugin)
{
- struct Plugin *plugin = cls;
-
- struct UNIXMessageWrapper * msgw = plugin->msg_head;
-
- while (NULL != (msgw = plugin->msg_head))
- {
- GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
- if (msgw->cont != NULL)
- msgw->cont (msgw->cont_cls, &msgw->session->target, GNUNET_SYSERR);
- GNUNET_free (msgw->msg);
- GNUNET_free (msgw);
- }
-
if (plugin->select_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (plugin->select_task);
plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
}
-
- if (NULL != plugin->unix_sock.desc)
+ if (NULL != plugin->msg_head)
{
- GNUNET_break (GNUNET_OK ==
- GNUNET_NETWORK_socket_close (plugin->unix_sock.desc));
- plugin->unix_sock.desc = NULL;
+ plugin->select_task =
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->rs,
+ plugin->ws,
+ &unix_plugin_select, plugin);
+ plugin->with_ws = GNUNET_YES;
+ }
+ else
+ {
+ plugin->select_task =
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->rs,
+ NULL,
+ &unix_plugin_select, plugin);
plugin->with_ws = GNUNET_NO;
}
- return GNUNET_OK;
}
-struct PeerSession *
-find_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *peer)
+/**
+ * Closure to 'lookup_session_it'.
+ */
+struct LookupCtx
+{
+ /**
+ * Location to store the session, if found.
+ */
+ struct Session *s;
+
+ /**
+ * Address we are looking for.
+ */
+ const struct sockaddr_un *addr;
+};
+
+
+/**
+ * Function called to find a session by address.
+ *
+ * @param cls the 'struct LookupCtx'
+ * @param key peer we are looking for (unused)
+ * @param value a session
+ * @return GNUNET_YES if not found (continue looking), GNUNET_NO on success
+ */
+static int
+lookup_session_it (void *cls,
+ const struct GNUNET_HashCode * key,
+ void *value)
{
- struct PeerSession *pos;
+ struct LookupCtx *lctx = cls;
+ struct Session *t = value;
- pos = plugin->sessions;
- while (pos != NULL)
+ if (0 == strcmp (t->addr, lctx->addr->sun_path))
{
- if (memcmp (&pos->target, peer, sizeof (struct GNUNET_PeerIdentity)) == 0)
- return pos;
- pos = pos->next;
+ lctx->s = t;
+ return GNUNET_NO;
}
+ return GNUNET_YES;
+}
- return pos;
+
+/**
+ * Find an existing session by address.
+ *
+ * @param plugin the plugin
+ * @param sender for which peer should the session be?
+ * @param addr address to look for
+ * @return NULL if session was not found
+ */
+static struct Session *
+lookup_session (struct Plugin *plugin,
+ const struct GNUNET_PeerIdentity *sender,
+ const struct sockaddr_un *addr)
+{
+ struct LookupCtx lctx;
+
+ GNUNET_assert (NULL != plugin);
+ GNUNET_assert (NULL != sender);
+ GNUNET_assert (NULL != addr);
+ lctx.s = NULL;
+ lctx.addr = addr;
+ GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map,
+ &sender->hashPubKey,
+ &lookup_session_it, &lctx);
+ return lctx.s;
+}
+
+
+/**
+ * Functions with this signature are called whenever we need
+ * to close a session due to a disconnect or failure to
+ * establish a connection.
+ *
+ * @param s session to close down
+ */
+static void
+disconnect_session (struct Session *s)
+{
+ struct Plugin *plugin = s->plugin;
+ struct UNIXMessageWrapper *msgw;
+ struct UNIXMessageWrapper *next;
+ int removed;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting session for peer `%s' `%s'\n",
+ GNUNET_i2s (&s->target),
+ s->addr);
+ plugin->env->session_end (plugin->env->cls, &s->target, s);
+ removed = GNUNET_NO;
+ next = plugin->msg_head;
+ while (NULL != next)
+ {
+ msgw = next;
+ next = msgw->next;
+ if (msgw->session != s)
+ continue;
+ GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
+ if (NULL != msgw->cont)
+ msgw->cont (msgw->cont_cls, &msgw->session->target, GNUNET_SYSERR,
+ msgw->payload, 0);
+ GNUNET_free (msgw->msg);
+ GNUNET_free (msgw);
+ removed = GNUNET_YES;
+ }
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (plugin->session_map,
+ &s->target.hashPubKey,
+ s));
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# UNIX sessions active",
+ GNUNET_CONTAINER_multihashmap_size (plugin->session_map),
+ GNUNET_NO);
+ if ((GNUNET_YES == removed) && (NULL == plugin->msg_head))
+ reschedule_select (plugin);
+ if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_free (s);
}
* @param timeout when should we time out (give up) if we can not transmit?
* @param addr the addr to send the message to, needs to be a sockaddr for us
* @param addrlen the len of addr
+ * @param payload bytes payload to send
* @param cont continuation to call once the message has
* been transmitted (or if the transport is ready
* for the next transmission call; or if the
* peer disconnected...)
* @param cont_cls closure for cont
- *
- * @return the number of bytes written, -1 on errors
+ * @return on success the number of bytes written, RETRY for retry, -1 on errors
*/
static ssize_t
unix_real_send (void *cls,
struct GNUNET_NETWORK_Handle *send_handle,
const struct GNUNET_PeerIdentity *target, const char *msgbuf,
size_t msgbuf_size, unsigned int priority,
- struct GNUNET_TIME_Relative timeout, const void *addr,
- size_t addrlen, GNUNET_TRANSPORT_TransmitContinuation cont,
+ struct GNUNET_TIME_Absolute timeout,
+ const void *addr,
+ size_t addrlen,
+ size_t payload,
+ GNUNET_TRANSPORT_TransmitContinuation cont,
void *cont_cls)
{
-
+ struct Plugin *plugin = cls;
ssize_t sent;
const void *sb;
size_t sbs;
struct sockaddr_un un;
size_t slen;
- int retry;
- if (send_handle == NULL)
+ GNUNET_assert (NULL != plugin);
+ if (NULL == send_handle)
{
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "unix_real_send with send_handle NULL!\n");
-#endif
- /* failed to open send socket for AF */
- if (cont != NULL)
- cont (cont_cls, target, GNUNET_SYSERR);
- return 0;
+ GNUNET_break (0); /* We do not have a send handle */
+ return GNUNET_SYSERR;
}
- if ((addr == NULL) || (addrlen == 0))
+ if ((NULL == addr) || (0 == addrlen))
{
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "unix_real_send called without address, returning!\n");
-#endif
- if (cont != NULL)
- cont (cont_cls, target, GNUNET_SYSERR);
- return 0; /* Can never send if we don't have an address!! */
+ GNUNET_break (0); /* Can never send if we don't have an address */
+ return GNUNET_SYSERR;
}
+ /* Prepare address */
memset (&un, 0, sizeof (un));
un.sun_family = AF_UNIX;
slen = strlen (addr) + 1;
if (slen >= sizeof (un.sun_path))
slen = sizeof (un.sun_path) - 1;
- sent = 0;
GNUNET_assert (slen < sizeof (un.sun_path));
memcpy (un.sun_path, addr, slen);
un.sun_path[slen] = '\0';
#endif
sb = (struct sockaddr *) &un;
sbs = slen;
- retry = GNUNET_NO;
- sent = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size, sb, sbs);
- if ((GNUNET_SYSERR == sent) && ((errno == EAGAIN) || (errno == ENOBUFS)))
- retry = GNUNET_YES;
+resend:
+ /* Send the data */
+ sent = 0;
+ sent = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size, sb, sbs);
- if ((GNUNET_SYSERR == sent) && (errno == EMSGSIZE))
+ if (GNUNET_SYSERR == sent)
{
- socklen_t size = 0;
- socklen_t len = sizeof (size);
-
- GNUNET_NETWORK_socket_getsockopt ((struct GNUNET_NETWORK_Handle *)
- send_handle, SOL_SOCKET, SO_SNDBUF, &size,
- &len);
-
- if (size < msgbuf_size)
+ if ( (EAGAIN == errno) ||
+ (ENOBUFS == errno) )
+ return RETRY; /* We have to retry later */
+ if (EMSGSIZE == errno)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to increase socket buffer size from %i to %i for message size %i\n",
- size, ((msgbuf_size / 1000) + 2) * 1000, msgbuf_size);
- size = ((msgbuf_size / 1000) + 2) * 1000;
- if (GNUNET_NETWORK_socket_setsockopt
- ((struct GNUNET_NETWORK_Handle *) send_handle, SOL_SOCKET, SO_SNDBUF,
- &size, sizeof (size)) == GNUNET_OK)
+ socklen_t size = 0;
+ socklen_t len = sizeof (size);
+
+ GNUNET_NETWORK_socket_getsockopt ((struct GNUNET_NETWORK_Handle *)
+ send_handle, SOL_SOCKET, SO_SNDBUF, &size,
+ &len);
+ if (size < msgbuf_size)
{
- sent = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size, sb, sbs);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to increase socket buffer size from %i to %i for message size %i\n",
+ size, ((msgbuf_size / 1000) + 2) * 1000, msgbuf_size);
+ size = ((msgbuf_size / 1000) + 2) * 1000;
+ if (GNUNET_OK == GNUNET_NETWORK_socket_setsockopt
+ ((struct GNUNET_NETWORK_Handle *) send_handle, SOL_SOCKET, SO_SNDBUF,
+ &size, sizeof (size)))
+ goto resend; /* Increased buffer size, retry sending */
+ else
+ {
+ /* Could not increase buffer size: error, no retry */
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "setsockopt");
+ return GNUNET_SYSERR;
+ }
}
else
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "setsockopt");
+ /* Buffer is bigger than message: error, no retry
+ * This should never happen!*/
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
}
}
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "UNIX transmit %u-byte message to %s (%d: %s)\n",
- (unsigned int) msgbuf_size, GNUNET_a2s (sb, sbs), (int) sent,
- (sent < 0) ? STRERROR (errno) : "ok");
-#endif
- /* Calling continuation */
- if (cont != NULL)
- {
- if ((sent == GNUNET_SYSERR) && (retry == GNUNET_NO))
- cont (cont_cls, target, GNUNET_SYSERR);
- if (sent > 0)
- cont (cont_cls, target, GNUNET_OK);
- }
-
- /* return number of bytes successfully sent */
- if (sent > 0)
- return sent;
- /* failed and retry: return 0 */
- if ((GNUNET_SYSERR == sent) && (retry == GNUNET_YES))
- return 0;
- /* failed and no retry: return -1 */
- if ((GNUNET_SYSERR == sent) && (retry == GNUNET_NO))
- return -1;
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "UNIX transmit %u-byte message to %s (%d: %s)\n",
+ (unsigned int) msgbuf_size,
+ GNUNET_a2s (sb, sbs),
+ (int) sent,
+ (sent < 0) ? STRERROR (errno) : "ok");
return sent;
}
-struct gsi_ctx
-{
- char *address;
- size_t addrlen;
+
+/**
+ * Closure for 'get_session_it'.
+ */
+struct GetSessionIteratorContext
+{
+ /**
+ * Location to store the session, if found.
+ */
struct Session *res;
+
+ /**
+ * Address information.
+ */
+ const char *address;
+
+ /**
+ * Number of bytes in 'address'
+ */
+ size_t addrlen;
};
+
+/**
+ * Function called to find a session by address.
+ *
+ * @param cls the 'struct LookupCtx'
+ * @param key peer we are looking for (unused)
+ * @param value a session
+ * @return GNUNET_YES if not found (continue looking), GNUNET_NO on success
+ */
static int
-get_session_it (void *cls, const GNUNET_HashCode * key, void *value)
+get_session_it (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
- struct gsi_ctx *gsi = cls;
+ struct GetSessionIteratorContext *gsi = cls;
struct Session *s = value;
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing session %s %s\n", gsi->address, s->addr);
-#endif
- if ((gsi->addrlen == s->addrlen) &&
- (0 == memcmp (gsi->address, s->addr, s->addrlen)))
+ if ( (gsi->addrlen == s->addrlen) &&
+ (0 == memcmp (gsi->address, s->addr, s->addrlen)) )
{
gsi->res = s;
return GNUNET_NO;
return GNUNET_YES;
}
+
+/**
+ * Session was idle for too long, so disconnect it
+ *
+ * @param cls the 'struct Session' to disconnect
+ * @param tc scheduler context
+ */
+static void
+session_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Session *s = cls;
+
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Session %p was idle for %s, disconnecting\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
+ disconnect_session (s);
+}
+
+
/**
* Creates a new outbound session the transport service will use to send data to the
* peer
*/
static struct Session *
unix_plugin_get_session (void *cls,
- const struct GNUNET_HELLO_Address *address)
+ const struct GNUNET_HELLO_Address *address)
{
- struct Session * s = NULL;
struct Plugin *plugin = cls;
- struct gsi_ctx gsi;
+ struct Session *s;
+ struct GetSessionIteratorContext gsi;
- /* Checks */
- GNUNET_assert (plugin != NULL);
- GNUNET_assert (address != NULL);
+ GNUNET_assert (NULL != plugin);
+ GNUNET_assert (NULL != address);
/* Check if already existing */
- gsi.address = (char *) address->address;
+ gsi.address = (const char *) address->address;
gsi.addrlen = address->address_length;
gsi.res = NULL;
- GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map, &address->peer.hashPubKey, &get_session_it, &gsi);
- if (gsi.res != NULL)
+ GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map,
+ &address->peer.hashPubKey,
+ &get_session_it, &gsi);
+ if (NULL != gsi.res)
{
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found existing session\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found existing session\n");
return gsi.res;
}
- /* Create a new session */
-
+ /* create a new session */
s = GNUNET_malloc (sizeof (struct Session) + address->address_length);
s->addr = &s[1];
s->addrlen = address->address_length;
- memcpy(s->addr, address->address, s->addrlen);
- memcpy(&s->target, &address->peer, sizeof (struct GNUNET_PeerIdentity));
-
- GNUNET_CONTAINER_multihashmap_put (plugin->session_map,
- &address->peer.hashPubKey, s,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-
- GNUNET_STATISTICS_set(plugin->env->stats,
- "# UNIX sessions active",
- GNUNET_CONTAINER_multihashmap_size(plugin->session_map),
- GNUNET_NO);
-
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating new session\n");
-#endif
-
+ s->plugin = plugin;
+ memcpy (s->addr, address->address, s->addrlen);
+ memcpy (&s->target, &address->peer, sizeof (struct GNUNET_PeerIdentity));
+
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ &session_timeout,
+ s);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating a new session %p with timeout set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
+ (void) GNUNET_CONTAINER_multihashmap_put (plugin->session_map,
+ &address->peer.hashPubKey, s,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# UNIX sessions active",
+ GNUNET_CONTAINER_multihashmap_size (plugin->session_map),
+ GNUNET_NO);
return s;
}
-/*
- * @param cls the plugin handle
- * @param tc the scheduling context (for rescheduling this function again)
- *
- * We have been notified that our writeset has something to read. We don't
- * know which socket needs to be read, so we have to check each one
- * Then reschedule this function to be called again once more is available.
- *
- */
-static void
-unix_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
* Function that can be used by the transport service to transmit
struct UNIXMessageWrapper *wrapper;
struct UNIXMessage *message;
int ssize;
-
- GNUNET_assert (plugin != NULL);
- GNUNET_assert (session != NULL);
-
- if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_contains_value(plugin->session_map,
- &session->target.hashPubKey, session))
+
+ GNUNET_assert (NULL != plugin);
+ GNUNET_assert (NULL != session);
+
+ if (GNUNET_OK !=
+ GNUNET_CONTAINER_multihashmap_contains_value (plugin->session_map,
+ &session->target.hashPubKey,
+ session))
{
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Invalid session for peer `%s' `%s'\n",
+ GNUNET_i2s (&session->target),
+ (const char *) session->addr);
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending %u bytes with session for peer `%s' `%s'\n",
+ msgbuf_size,
+ GNUNET_i2s (&session->target),
+ (const char *) session->addr);
ssize = sizeof (struct UNIXMessage) + msgbuf_size;
message = GNUNET_malloc (sizeof (struct UNIXMessage) + msgbuf_size);
message->header.size = htons (ssize);
memcpy (&message->sender, plugin->env->my_identity,
sizeof (struct GNUNET_PeerIdentity));
memcpy (&message[1], msgbuf, msgbuf_size);
-
-
+ reschedule_session_timeout (session);
wrapper = GNUNET_malloc (sizeof (struct UNIXMessageWrapper));
wrapper->msg = message;
wrapper->msgsize = ssize;
+ wrapper->payload = msgbuf_size;
wrapper->priority = priority;
- wrapper->timeout = to;
+ wrapper->timeout = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(), to);
wrapper->cont = cont;
wrapper->cont_cls = cont_cls;
wrapper->session = session;
-
- GNUNET_CONTAINER_DLL_insert(plugin->msg_head, plugin->msg_tail, wrapper);
-
+ GNUNET_CONTAINER_DLL_insert (plugin->msg_head,
+ plugin->msg_tail,
+ wrapper);
plugin->bytes_in_queue += ssize;
- GNUNET_STATISTICS_set (plugin->env->stats,"# UNIX bytes in send queue",
- plugin->bytes_in_queue, GNUNET_NO);
-
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sent %d bytes to `%s'\n", ssize,
- (char *) session->addr);
-#endif
-
- if (plugin->with_ws == GNUNET_NO)
- {
- if (plugin->select_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(plugin->select_task);
-
- plugin->select_task =
- GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_TIME_UNIT_FOREVER_REL,
- plugin->rs,
- plugin->ws,
- &unix_plugin_select, plugin);
- plugin->with_ws = GNUNET_YES;
- }
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# bytes currently in UNIX buffers",
+ plugin->bytes_in_queue,
+ GNUNET_NO);
+ if (GNUNET_NO == plugin->with_ws)
+ reschedule_select (plugin);
return ssize;
}
const struct GNUNET_MessageHeader *currhdr,
const struct sockaddr_un *un, size_t fromlen)
{
- struct GNUNET_ATS_Information ats[2];
+ struct Session *s = NULL;
+ struct GNUNET_HELLO_Address * addr;
- ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
- ats[0].value = htonl (UNIX_DIRECT_DISTANCE);
- ats[1] = plugin->ats_network;
GNUNET_break (ntohl(plugin->ats_network.value) != GNUNET_ATS_NET_UNSPECIFIED);
GNUNET_assert (fromlen >= sizeof (struct sockaddr_un));
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received message from %s\n",
- un->sun_path);
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received message from %s\n",
+ un->sun_path);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# bytes received via UNIX",
+ ntohs (currhdr->size),
+ GNUNET_NO);
+
+ addr = GNUNET_HELLO_address_allocate (sender,
+ "unix",
+ un->sun_path,
+ strlen (un->sun_path) + 1);
+ s = lookup_session (plugin, sender, un);
+ if (NULL == s)
+ s = unix_plugin_get_session (plugin, addr);
+ reschedule_session_timeout (s);
+
plugin->env->receive (plugin->env->cls, sender, currhdr,
- (const struct GNUNET_ATS_Information *) &ats, 2,
- NULL, un->sun_path, strlen (un->sun_path) + 1);
+ s, un->sun_path, strlen (un->sun_path) + 1);
+
+ plugin->env->update_address_metrics (plugin->env->cls,
+ sender,
+ un->sun_path,
+ strlen (un->sun_path) + 1,
+ s,
+ &plugin->ats_network, 1);
+
+ GNUNET_free (addr);
}
+/**
+ * Read from UNIX domain socket (it is ready).
+ *
+ * @param plugin the plugin
+ */
static void
-unix_plugin_select_read (struct Plugin * plugin)
+unix_plugin_select_read (struct Plugin *plugin)
{
char buf[65536] GNUNET_ALIGN;
struct UNIXMessage *msg;
#if LINUX
un.sun_path[0] = '/';
#endif
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Read %d bytes from socket %s\n", ret,
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %d bytes from socket %s\n", ret,
&un.sun_path[0]);
-#endif
}
GNUNET_assert (AF_UNIX == (un.sun_family));
}
}
+
+/**
+ * Write to UNIX domain socket (it is ready).
+ *
+ * @param plugin the plugin
+ */
static void
-unix_plugin_select_write (struct Plugin * plugin)
+unix_plugin_select_write (struct Plugin *plugin)
{
int sent = 0;
- struct UNIXMessageWrapper * msgw = plugin->msg_head;
+ struct UNIXMessageWrapper * msgw;
+
+ while (NULL != (msgw = plugin->msg_tail))
+ {
+ if (GNUNET_TIME_absolute_get_remaining (msgw->timeout).rel_value > 0)
+ break; /* Message is ready for sending */
+ /* Message has a timeout */
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout for message with %u bytes \n",
+ (unsigned int) msgw->msgsize);
+ GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
+ plugin->bytes_in_queue -= msgw->msgsize;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# bytes currently in UNIX buffers",
+ plugin->bytes_in_queue, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UNIX bytes discarded",
+ msgw->msgsize,
+ GNUNET_NO);
+ if (NULL != msgw->cont)
+ msgw->cont (msgw->cont_cls,
+ &msgw->session->target,
+ GNUNET_SYSERR,
+ msgw->payload,
+ 0);
+ GNUNET_free (msgw->msg);
+ GNUNET_free (msgw);
+ }
+ if (NULL == msgw)
+ return; /* Nothing to send at the moment */
sent = unix_real_send (plugin,
plugin->unix_sock.desc,
msgw->timeout,
msgw->session->addr,
msgw->session->addrlen,
+ msgw->payload,
msgw->cont, msgw->cont_cls);
- /* successfully sent bytes */
- if (sent > 0)
+ if (RETRY == sent)
{
- GNUNET_CONTAINER_DLL_remove(plugin->msg_head, plugin->msg_tail, msgw);
-
- GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
- plugin->bytes_in_queue -= msgw->msgsize;
- GNUNET_STATISTICS_set (plugin->env->stats,"# UNIX bytes in send queue",
- plugin->bytes_in_queue, GNUNET_NO);
-
- GNUNET_free (msgw->msg);
- GNUNET_free (msgw);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UNIX retry attempts",
+ 1, GNUNET_NO);
return;
}
-
- /* failed and no retry */
- if (sent == -1)
+ if (GNUNET_SYSERR == sent)
{
+ /* failed and no retry */
+ if (NULL != msgw->cont)
+ msgw->cont (msgw->cont_cls, &msgw->session->target, GNUNET_SYSERR, msgw->payload, 0);
+
GNUNET_CONTAINER_DLL_remove(plugin->msg_head, plugin->msg_tail, msgw);
GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
plugin->bytes_in_queue -= msgw->msgsize;
- GNUNET_STATISTICS_set (plugin->env->stats,"# UNIX bytes in send queue",
- plugin->bytes_in_queue, GNUNET_NO);
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# bytes currently in UNIX buffers",
+ plugin->bytes_in_queue, GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# UNIX bytes discarded",
+ msgw->msgsize,
+ GNUNET_NO);
GNUNET_free (msgw->msg);
GNUNET_free (msgw);
return;
}
-
- /* failed and retry */
- if (sent == 0)
- return;
+ /* successfully sent bytes */
+ GNUNET_break (sent > 0);
+ GNUNET_CONTAINER_DLL_remove (plugin->msg_head,
+ plugin->msg_tail,
+ msgw);
+ GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
+ plugin->bytes_in_queue -= msgw->msgsize;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# bytes currently in UNIX buffers",
+ plugin->bytes_in_queue,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ "# bytes transmitted via UNIX",
+ msgw->msgsize,
+ GNUNET_NO);
+ if (NULL != msgw->cont)
+ msgw->cont (msgw->cont_cls, &msgw->session->target,
+ GNUNET_OK,
+ msgw->payload,
+ msgw->msgsize);
+ GNUNET_free (msgw->msg);
+ GNUNET_free (msgw);
}
-/*
- * @param cls the plugin handle
- * @param tc the scheduling context (for rescheduling this function again)
- *
+
+/**
* We have been notified that our writeset has something to read. We don't
* know which socket needs to be read, so we have to check each one
* Then reschedule this function to be called again once more is available.
*
+ * @param cls the plugin handle
+ * @param tc the scheduling context (for rescheduling this function again)
*/
static void
-unix_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+unix_plugin_select (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Plugin *plugin = cls;
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
- plugin->with_ws = GNUNET_NO;
if ((tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY) != 0)
{
+ /* Ready to send data */
GNUNET_assert (GNUNET_NETWORK_fdset_isset
(tc->write_ready, plugin->unix_sock.desc));
- if (plugin->msg_head != NULL)
+ if (NULL != plugin->msg_head)
unix_plugin_select_write (plugin);
}
if ((tc->reason & GNUNET_SCHEDULER_REASON_READ_READY) != 0)
{
+ /* Ready to receive data */
GNUNET_assert (GNUNET_NETWORK_fdset_isset
(tc->read_ready, plugin->unix_sock.desc));
unix_plugin_select_read (plugin);
}
-
- if (plugin->select_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (plugin->select_task);
- plugin->select_task =
- GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_TIME_UNIT_FOREVER_REL,
- plugin->rs,
- (plugin->msg_head != NULL) ? plugin->ws : NULL,
- &unix_plugin_select, plugin);
- if (plugin->msg_head != NULL)
- plugin->with_ws = GNUNET_YES;
+ reschedule_select (plugin);
}
+
/**
* Create a slew of UNIX sockets. If possible, use IPv6 and IPv4.
*
* @param cls closure for server start, should be a struct Plugin *
* @return number of sockets created or GNUNET_SYSERR on error
-*/
+ */
static int
unix_transport_server_start (void *cls)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
return GNUNET_SYSERR;
}
- if (GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen)
+ if (GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen, 0)
!= GNUNET_OK)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
plugin->unix_sock.desc = NULL;
return GNUNET_SYSERR;
}
-#if DEBUG_UNIX
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "unix", "Bound to `%s'\n",
- &un.sun_path[0]);
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Bound to `%s'\n", plugin->unix_socket_path);
plugin->rs = GNUNET_NETWORK_fdset_create ();
plugin->ws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_zero (plugin->rs);
GNUNET_NETWORK_fdset_set (plugin->rs, plugin->unix_sock.desc);
GNUNET_NETWORK_fdset_set (plugin->ws, plugin->unix_sock.desc);
- plugin->select_task =
- GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_TIME_UNIT_FOREVER_REL,
- plugin->rs,
- NULL,
- &unix_plugin_select, plugin);
- plugin->with_ws = GNUNET_NO;
+ reschedule_select (plugin);
return 1;
}
static int
unix_check_address (void *cls, const void *addr, size_t addrlen)
{
-
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Informing transport service about my address `%s'\n",
(char *) addr);
-#endif
return GNUNET_OK;
}
GNUNET_TRANSPORT_AddressStringCallback asc,
void *asc_cls)
{
- if ((addr != NULL) && (addrlen > 0))
+ if ((NULL != addr) && (addrlen > 0))
+ {
asc (asc_cls, (const char *) addr);
+ }
else
{
GNUNET_break (0);
- asc (asc_cls, "Invalid UNIX address");
+ asc (asc_cls, "<invalid UNIX address>");
}
-
+ asc (asc_cls, NULL);
}
+
/**
* Function called to convert a string address to
* a binary address.
*
* @param cls closure ('struct Plugin*')
* @param addr string address
- * @param addrlen length of the address
+ * @param addrlen length of the address (strlen(addr) + '\0')
* @param buf location to store the buffer
* If the function returns GNUNET_SYSERR, its contents are undefined.
* @param added length of created address
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
-int
+static int
unix_string_to_address (void *cls, const char *addr, uint16_t addrlen,
void **buf, size_t *added)
{
- if ((NULL == addr) || (addrlen == 0))
+ if ((NULL == addr) || (0 == addrlen))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- char * tmp = GNUNET_malloc (addrlen + 1);
- memcpy (tmp, addr, addrlen);
- tmp[addrlen] = '\0';
+ if ('\0' != addr[addrlen - 1])
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
- //GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "`%s'\n", tmp);
+ if (strlen (addr) != addrlen - 1)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
- (*buf) = tmp;
- (*added) = strlen (tmp) + 1;
+ (*buf) = strdup (addr);
+ (*added) = strlen (addr) + 1;
return GNUNET_OK;
}
-
-
/**
* Function called for a quick conversion of the binary address to
* a numeric address. Note that the caller must not free the
{
if ((addr != NULL) && (addrlen > 0))
return (const char *) addr;
- else
- return NULL;
+ return NULL;
}
+
/**
* Notify transport service about address
*
* @param tc unused
*/
static void
-address_notification (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+address_notification (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Plugin *plugin = cls;
+ plugin->address_update_task = GNUNET_SCHEDULER_NO_TASK;
plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
plugin->unix_socket_path,
- strlen (plugin->unix_socket_path) + 1);
+ strlen (plugin->unix_socket_path) + 1,
+ "unix");
+}
+
+
+/**
+ * Increment session timeout due to activity
+ *
+ * @param s session for which the timeout should be moved
+ */
+static void
+reschedule_session_timeout (struct Session *s)
+{
+ GNUNET_assert (NULL != s);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ &session_timeout,
+ s);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout rescheduled for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
}
+
/**
- * The exported method. Makes the core api available via a global and
- * returns the unix transport API.
+ * Function called on sessions to disconnect
+ *
+ * @param cls the plugin (unused)
+ * @param key peer identity (unused)
+ * @param value the 'struct Session' to disconnect
+ * @return GNUNET_YES (always, continue to iterate)
+ */
+static int
+get_session_delete_it (void *cls, const struct GNUNET_HashCode * key, void *value)
+{
+ struct Session *s = value;
+
+ disconnect_session (s);
+ return GNUNET_YES;
+}
+
+
+/**
+ * Disconnect from a remote node. Clean up session if we have one for this peer
+ *
+ * @param cls closure for this call (should be handle to Plugin)
+ * @param target the peeridentity of the peer to disconnect
+ * @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
+ */
+static void
+unix_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *target)
+{
+ struct Plugin *plugin = cls;
+
+ GNUNET_assert (plugin != NULL);
+ GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map,
+ &target->hashPubKey,
+ &get_session_delete_it, plugin);
+}
+
+
+/**
+ * The exported method. Initializes the plugin and returns a
+ * struct with the callbacks.
+ *
+ * @param cls the plugin's execution environment
+ * @return NULL on error, plugin functions otherwise
*/
void *
libgnunet_plugin_transport_unix_init (void *cls)
api->string_to_address = &unix_string_to_address;
return api;
}
- GNUNET_assert( NULL != env->stats);
-
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-unix", "PORT",
&port))
plugin = GNUNET_malloc (sizeof (struct Plugin));
plugin->port = port;
plugin->env = env;
- GNUNET_asprintf (&plugin->unix_socket_path, "/tmp/unix-plugin-sock.%d",
+ GNUNET_asprintf (&plugin->unix_socket_path,
+ "/tmp/unix-plugin-sock.%d",
plugin->port);
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->check_address = &unix_check_address;
api->string_to_address = &unix_string_to_address;
sockets_created = unix_transport_server_start (plugin);
- if (sockets_created == 0)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Failed to open UNIX sockets\n"));
-
- plugin->session_map = GNUNET_CONTAINER_multihashmap_create(10);
-
- GNUNET_SCHEDULER_add_now (address_notification, plugin);
+ if (0 == sockets_created)
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to open UNIX listen socket\n"));
+ plugin->session_map = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
+ plugin->address_update_task = GNUNET_SCHEDULER_add_now (&address_notification, plugin);
return api;
}
+
+/**
+ * Shutdown the plugin.
+ *
+ * @param cls the plugin API returned from the initialization function
+ * @return NULL (always)
+ */
void *
libgnunet_plugin_transport_unix_done (void *cls)
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
+ struct UNIXMessageWrapper * msgw;
if (NULL == plugin)
{
GNUNET_free (api);
return NULL;
}
- unix_transport_server_stop (plugin);
+ plugin->env->notify_address (plugin->env->cls, GNUNET_NO,
+ plugin->unix_socket_path,
+ strlen (plugin->unix_socket_path) + 1,
+ "unix");
+ while (NULL != (msgw = plugin->msg_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
+ if (msgw->cont != NULL)
+ msgw->cont (msgw->cont_cls, &msgw->session->target, GNUNET_SYSERR,
+ msgw->payload, 0);
+ GNUNET_free (msgw->msg);
+ GNUNET_free (msgw);
+ }
- GNUNET_CONTAINER_multihashmap_iterate (plugin->session_map, &get_session_delete_it, plugin);
+ if (GNUNET_SCHEDULER_NO_TASK != plugin->select_task)
+ {
+ GNUNET_SCHEDULER_cancel (plugin->select_task);
+ plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != plugin->address_update_task)
+ {
+ GNUNET_SCHEDULER_cancel (plugin->address_update_task);
+ plugin->address_update_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != plugin->unix_sock.desc)
+ {
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_NETWORK_socket_close (plugin->unix_sock.desc));
+ plugin->unix_sock.desc = NULL;
+ plugin->with_ws = GNUNET_NO;
+ }
+ GNUNET_CONTAINER_multihashmap_iterate (plugin->session_map,
+ &get_session_delete_it, plugin);
GNUNET_CONTAINER_multihashmap_destroy (plugin->session_map);
-
- GNUNET_NETWORK_fdset_destroy (plugin->rs);
- GNUNET_NETWORK_fdset_destroy (plugin->ws);
+ if (NULL != plugin->rs)
+ GNUNET_NETWORK_fdset_destroy (plugin->rs);
+ if (NULL != plugin->ws)
+ GNUNET_NETWORK_fdset_destroy (plugin->ws);
GNUNET_free (plugin->unix_socket_path);
GNUNET_free (plugin);
GNUNET_free (api);
projects / oweals / gnunet.git / blobdiff