#include "gnunet_transport_plugin.h"
#include "transport.h"
-#define DEBUG_UNIX GNUNET_NO
+#define DEBUG_UNIX GNUNET_EXTRALOGGING
#define DETAILS GNUNET_NO
#define MAX_PROBES 20
*/
#define UNIX_NAT_DEFAULT_PORT 22086
+GNUNET_NETWORK_STRUCT_BEGIN
+
/**
* UNIX Message-Packet header.
*/
};
-struct RetryList
+struct Session
{
- /**
- * Pointer to next element.
- */
- struct RetryList *next;
-
- /**
- * Pointer to previous element.
- */
- struct RetryList *prev;
-
- /**
- * The actual retry context.
- */
- struct RetrySendContext *retry_ctx;
+ void *addr;
+ size_t addrlen;
+ struct GNUNET_PeerIdentity target;
};
-/**
- * Network format for IPv4 addresses.
- */
-struct IPv4UdpAddress
+struct UNIXMessageWrapper
{
- /**
- * IPv4 address, in network byte order.
- */
- uint32_t ipv4_addr GNUNET_PACKED;
+ struct UNIXMessageWrapper *next;
+ struct UNIXMessageWrapper *prev;
- /**
- * Port number, in network byte order.
- */
- uint16_t u_port GNUNET_PACKED;
-};
+ struct UNIXMessage * msg;
+ size_t msgsize;
+ struct GNUNET_TIME_Relative timeout;
+ unsigned int priority;
-/**
- * Network format for IPv6 addresses.
- */
-struct IPv6UdpAddress
-{
- /**
- * IPv6 address.
- */
- struct in6_addr ipv6_addr GNUNET_PACKED;
-
- /**
- * Port number, in network byte order.
- */
- uint16_t u6_port GNUNET_PACKED;
+ struct Session *session;
+ GNUNET_TRANSPORT_TransmitContinuation cont;
+ void *cont_cls;
};
/* Forward definition */
struct Plugin;
-struct PrettyPrinterContext
-{
- GNUNET_TRANSPORT_AddressStringCallback asc;
- void *asc_cls;
- uint16_t port;
-};
-
-struct RetrySendContext
-{
-
- /**
- * Main plugin handle.
- */
- struct Plugin *plugin;
-
- /**
- * Address of recipient.
- */
- char *addr;
-
- /**
- * Length of address.
- */
- ssize_t addrlen;
-
- /**
- * Message to send.
- */
- char *msg;
-
- /**
- * Size of the message.
- */
- int msg_size;
-
- /**
- * Handle to send message out on.
- */
- struct GNUNET_NETWORK_Handle *send_handle;
-
- /**
- * Continuation to call on success or
- * timeout.
- */
- GNUNET_TRANSPORT_TransmitContinuation cont;
-
- /**
- * Closure for continuation.
- */
- void *cont_cls;
-
- /**
- * The peer the message is destined for.
- */
- struct GNUNET_PeerIdentity target;
-
- /**
- * How long before not retrying any longer.
- */
- struct GNUNET_TIME_Absolute timeout;
-
- /**
- * How long the last message was delayed.
- */
- struct GNUNET_TIME_Relative delay;
-
- /**
- * The actual retry task.
- */
- GNUNET_SCHEDULER_TaskIdentifier retry_task;
-
- /**
- * The priority of the message.
- */
- unsigned int priority;
-
- /**
- * Entry in the DLL of retry items.
- */
- struct RetryList *retry_list_entry;
-};
-
/**
* UNIX NAT "Session"
*/
struct PeerSession *sessions;
+ /*
+ * Sessions
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *session_map;
+
/**
* ID of task used to update our addresses when one expires.
*/
*/
struct GNUNET_NETWORK_FDSet *rs;
+ /**
+ * FD Write set
+ */
+ struct GNUNET_NETWORK_FDSet *ws;
+
+ int with_ws;
+
/**
* socket that we transmit all data with
*/
*/
char *unix_socket_path;
+ struct UNIXMessageWrapper *msg_head;
+ struct UNIXMessageWrapper *msg_tail;
+
+ /**
+ * ATS network
+ */
+ struct GNUNET_ATS_Information ats_network;
};
-/**
- * Head of retry DLL.
- */
-static struct RetryList *retry_list_head;
-/**
- * Tail of retry DLL.
- */
-static struct RetryList *retry_list_tail;
+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
+
+ plugin->env->session_end (plugin->env->cls, &s->target, s);
+
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove(plugin->session_map, &s->target.hashPubKey, s));
+ GNUNET_free (s);
+
+ return GNUNET_YES;
+}
/**
* Disconnect from a remote node. Clean up session if we have one for this peer
void
unix_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
{
- /** TODO: Implement! */
+ struct Plugin *plugin = cls;
+ GNUNET_assert (plugin != NULL);
+
+ GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map, &target->hashPubKey, &get_session_delete_it, plugin);
return;
}
unix_transport_server_stop (void *cls)
{
struct Plugin *plugin = cls;
- struct RetryList *pos;
- pos = retry_list_head;
+ struct UNIXMessageWrapper * msgw = plugin->msg_head;
- while (NULL != (pos = retry_list_head))
+ while (NULL != (msgw = plugin->msg_head))
{
- GNUNET_CONTAINER_DLL_remove (retry_list_head, retry_list_tail, pos);
- if (GNUNET_SCHEDULER_NO_TASK != pos->retry_ctx->retry_task)
- {
- GNUNET_SCHEDULER_cancel (pos->retry_ctx->retry_task);
- }
- GNUNET_free (pos->retry_ctx->msg);
- GNUNET_free (pos->retry_ctx->addr);
- GNUNET_free (pos->retry_ctx);
- GNUNET_free (pos);
+ 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_break (GNUNET_OK ==
GNUNET_NETWORK_socket_close (plugin->unix_sock.desc));
plugin->unix_sock.desc = NULL;
-
+ plugin->with_ws = GNUNET_NO;
return GNUNET_OK;
}
return pos;
}
-/* Forward Declaration */
-static ssize_t
-unix_real_send (void *cls,
- struct RetrySendContext *incoming_retry_context,
- 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, void *cont_cls);
-
-/**
- * Retry sending a message.
- *
- * @param cls closure a struct RetrySendContext
- * @param tc context information
- */
-void
-retry_send_message (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct RetrySendContext *retry_ctx = cls;
-
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
- {
- GNUNET_free (retry_ctx->msg);
- GNUNET_free (retry_ctx->addr);
- GNUNET_free (retry_ctx);
- return;
- }
-
- unix_real_send (retry_ctx->plugin,
- retry_ctx,
- retry_ctx->send_handle,
- &retry_ctx->target,
- retry_ctx->msg,
- retry_ctx->msg_size,
- retry_ctx->priority,
- GNUNET_TIME_absolute_get_remaining (retry_ctx->timeout),
- retry_ctx->addr,
- retry_ctx->addrlen, retry_ctx->cont, retry_ctx->cont_cls);
- return;
-}
/**
* Actually send out the message, assume we've got the address and
* send_handle squared away!
*
* @param cls closure
- * @param incoming_retry_context the retry context to use
* @param send_handle which handle to send message on
* @param target who should receive this message (ignored by UNIX)
* @param msgbuf one or more GNUNET_MessageHeader(s) strung together
*/
static ssize_t
unix_real_send (void *cls,
- struct RetrySendContext *incoming_retry_context,
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, void *cont_cls)
+ 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,
+ void *cont_cls)
{
- struct Plugin *plugin = cls;
- struct UNIXMessage *message;
- struct RetrySendContext *retry_ctx;
- int ssize;
+
ssize_t sent;
const void *sb;
size_t sbs;
struct sockaddr_un un;
size_t slen;
- struct RetryList *retry_list_entry;
int retry;
if (send_handle == NULL)
return 0; /* Can never send if we don't have an address!! */
}
- /* Build the message to be sent */
- message = GNUNET_malloc (sizeof (struct UNIXMessage) + msgbuf_size);
- ssize = sizeof (struct UNIXMessage) + msgbuf_size;
-
- message->header.size = htons (ssize);
- message->header.type = htons (0);
- memcpy (&message->sender, plugin->env->my_identity,
- sizeof (struct GNUNET_PeerIdentity));
- memcpy (&message[1], msgbuf, msgbuf_size);
-
memset (&un, 0, sizeof (un));
un.sun_family = AF_UNIX;
slen = strlen (addr) + 1;
sb = (struct sockaddr *) &un;
sbs = slen;
retry = GNUNET_NO;
+ sent = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size, sb, sbs);
- sent = GNUNET_NETWORK_socket_sendto (send_handle, message, ssize, sb, sbs);
-
- if ((GNUNET_SYSERR == sent) && (errno == EAGAIN))
+ if ((GNUNET_SYSERR == sent) && ((errno == EAGAIN) || (errno == ENOBUFS)))
retry = GNUNET_YES;
if ((GNUNET_SYSERR == sent) && (errno == EMSGSIZE))
send_handle, SOL_SOCKET, SO_SNDBUF, &size,
&len);
- if (size < ssize)
+ if (size < msgbuf_size)
{
-#if DEBUG_UNIX
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Trying to increase socket buffer size from %i to %i for message size %i\n",
- size, ((ssize / 1000) + 2) * 1000, ssize);
-#endif
- size = ((ssize / 1000) + 2) * 1000;
+ 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)
}
}
- if (retry == GNUNET_YES)
- {
- if (incoming_retry_context == NULL)
- {
- retry_list_entry = GNUNET_malloc (sizeof (struct RetryList));
- retry_ctx = GNUNET_malloc (sizeof (struct RetrySendContext));
- retry_ctx->addr = GNUNET_malloc (addrlen);
- retry_ctx->msg = GNUNET_malloc (msgbuf_size);
- retry_ctx->plugin = plugin;
- memcpy (retry_ctx->addr, addr, addrlen);
- memcpy (retry_ctx->msg, msgbuf, msgbuf_size);
- retry_ctx->msg_size = msgbuf_size;
- retry_ctx->addrlen = addrlen;
- retry_ctx->send_handle = send_handle;
- retry_ctx->cont = cont;
- retry_ctx->cont_cls = cont_cls;
- retry_ctx->priority = priority;
- retry_ctx->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- memcpy (&retry_ctx->target, target, sizeof (struct GNUNET_PeerIdentity));
- retry_ctx->delay = GNUNET_TIME_UNIT_MILLISECONDS;
- retry_ctx->retry_list_entry = retry_list_entry;
- retry_list_entry->retry_ctx = retry_ctx;
- GNUNET_CONTAINER_DLL_insert (retry_list_head, retry_list_tail,
- retry_list_entry);
- }
- else
- {
- retry_ctx = incoming_retry_context;
- retry_ctx->delay = GNUNET_TIME_relative_multiply (retry_ctx->delay, 2);
- }
- retry_ctx->retry_task =
- GNUNET_SCHEDULER_add_delayed (retry_ctx->delay, &retry_send_message,
- retry_ctx);
-
- //GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "send");
- GNUNET_free (message);
- return ssize;
- }
#if DEBUG_UNIX
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"UNIX transmit %u-byte message to %s (%d: %s)\n",
- (unsigned int) ssize,
- GNUNET_a2s (sb, sbs),
- (int) sent, (sent < 0) ? STRERROR (errno) : "ok");
+ (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)
+ if ((sent == GNUNET_SYSERR) && (retry == GNUNET_NO))
cont (cont_cls, target, GNUNET_SYSERR);
- else
- {
+ if (sent > 0)
cont (cont_cls, target, GNUNET_OK);
- }
}
- if (incoming_retry_context != NULL)
+ /* 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;
+
+ return sent;
+}
+
+struct gsi_ctx
+{
+ char *address;
+ size_t addrlen;
+ struct Session *res;
+};
+
+static int
+get_session_it (void *cls, const GNUNET_HashCode * key, void *value)
+{
+ struct gsi_ctx *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)))
{
- GNUNET_CONTAINER_DLL_remove (retry_list_head, retry_list_tail,
- incoming_retry_context->retry_list_entry);
- GNUNET_free (incoming_retry_context->retry_list_entry);
- GNUNET_free (incoming_retry_context->msg);
- GNUNET_free (incoming_retry_context->addr);
- GNUNET_free (incoming_retry_context);
+ gsi->res = s;
+ return GNUNET_NO;
}
+ return GNUNET_YES;
+}
- GNUNET_free (message);
- return sent;
+/**
+ * Creates a new outbound session the transport service will use to send data to the
+ * peer
+ *
+ * @param cls the plugin
+ * @param address the address
+ * @return the session or NULL of max connections exceeded
+ */
+static struct Session *
+unix_plugin_get_session (void *cls,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct Session * s = NULL;
+ struct Plugin *plugin = cls;
+ struct gsi_ctx gsi;
+
+ /* Checks */
+ GNUNET_assert (plugin != NULL);
+ GNUNET_assert (address != NULL);
+
+ /* Check if already existing */
+ gsi.address = (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)
+ {
+#if DEBUG_UNIX
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found existing session\n");
+#endif
+ return gsi.res;
+ }
+
+ /* 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);
+#if DEBUG_UNIX
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating new session\n");
+#endif
+
+ 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
- * a message using the plugin.
+ * a message using the plugin. Note that in the case of a
+ * peer disconnecting, the continuation MUST be called
+ * prior to the disconnect notification itself. This function
+ * will be called with this peer's HELLO message to initiate
+ * a fresh connection to another peer.
*
* @param cls closure
- * @param target who should receive this message (ignored by UNIX)
- * @param msgbuf one or more GNUNET_MessageHeader(s) strung together
- * @param msgbuf_size the size of the msgbuf to send
- * @param priority how important is the message (ignored by UNIX)
- * @param timeout when should we time out (give up) if we can not transmit?
- * @param session identifier used for this session (can be NULL)
- * @param addr the addr to send the message to, needs to be a sockaddr for us
- * @param addrlen the len of addr
- * @param force_address not used, we had better have an address to send to
- * because we are stateless!!
+ * @param session which session must be used
+ * @param msgbuf the message to transmit
+ * @param msgbuf_size number of bytes in 'msgbuf'
+ * @param priority how important is the message (most plugins will
+ * ignore message priority and just FIFO)
+ * @param to how long to wait at most for the transmission (does not
+ * require plugins to discard the message after the timeout,
+ * just advisory for the desired delay; most plugins will ignore
+ * this as well)
* @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...)
+ * peer disconnected...); can be NULL
* @param cont_cls closure for cont
- *
- * @return the number of bytes written (may return 0 and the message can
- * still be transmitted later!)
+ * @return number of bytes used (on the physical network, with overheads);
+ * -1 on hard errors (i.e. address invalid); 0 is a legal value
+ * and does NOT mean that the message was not transmitted (DV)
*/
static ssize_t
unix_plugin_send (void *cls,
- const struct GNUNET_PeerIdentity *target,
- const char *msgbuf,
- size_t msgbuf_size,
- unsigned int priority,
- struct GNUNET_TIME_Relative timeout,
struct Session *session,
- const void *addr,
- size_t addrlen,
- int force_address,
+ const char *msgbuf, size_t msgbuf_size,
+ unsigned int priority,
+ struct GNUNET_TIME_Relative to,
GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
{
struct Plugin *plugin = cls;
- ssize_t sent;
+ struct UNIXMessageWrapper *wrapper;
+ struct UNIXMessage *message;
+ int ssize;
+
+ GNUNET_assert (plugin != NULL);
+ GNUNET_assert (session != NULL);
- if (force_address == GNUNET_SYSERR)
+ if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_contains_value(plugin->session_map,
+ &session->target.hashPubKey, session))
+ {
+ GNUNET_break (0);
return GNUNET_SYSERR;
- GNUNET_assert (NULL == session);
+ }
+
+ ssize = sizeof (struct UNIXMessage) + msgbuf_size;
+ message = GNUNET_malloc (sizeof (struct UNIXMessage) + msgbuf_size);
+ message->header.size = htons (ssize);
+ message->header.type = htons (0);
+ memcpy (&message->sender, plugin->env->my_identity,
+ sizeof (struct GNUNET_PeerIdentity));
+ memcpy (&message[1], msgbuf, msgbuf_size);
+
+ wrapper = GNUNET_malloc (sizeof (struct UNIXMessageWrapper));
+ wrapper->msg = message;
+ wrapper->msgsize = ssize;
+ wrapper->priority = priority;
+ wrapper->timeout = to;
+ wrapper->cont = cont;
+ wrapper->cont_cls = cont_cls;
+ wrapper->session = session;
+
+ GNUNET_CONTAINER_DLL_insert(plugin->msg_head, plugin->msg_tail, wrapper);
#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asked to send message to `%s'\n",
- (char *) addr);
-#endif
- sent = unix_real_send (cls,
- NULL,
- plugin->unix_sock.desc,
- target,
- msgbuf, msgbuf_size,
- priority, timeout, addr, addrlen, cont, cont_cls);
-#if DEBUG_UNIX
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sent %d bytes to `%s'\n", sent,
- (char *) addr);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sent %d bytes to `%s'\n", ssize,
+ (char *) session->addr);
#endif
- if (sent == GNUNET_SYSERR)
- return 0;
- return sent;
+
+ 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_SCHEDULER_NO_TASK,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->rs,
+ plugin->ws,
+ &unix_plugin_select, plugin);
+ plugin->with_ws = GNUNET_YES;
+ }
+ return ssize;
}
* @param fromlen the length of the address
*/
static void
-unix_demultiplexer (struct Plugin *plugin,
- struct GNUNET_PeerIdentity *sender,
+unix_demultiplexer (struct Plugin *plugin, struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *currhdr,
const struct sockaddr_un *un, size_t fromlen)
{
- struct GNUNET_TRANSPORT_ATS_Information distance[2];
+ struct GNUNET_ATS_Information ats[2];
- distance[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE);
- distance[0].value = htonl (UNIX_DIRECT_DISTANCE);
- distance[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
- distance[1].value = htonl (0);
+ 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));
un->sun_path);
#endif
plugin->env->receive (plugin->env->cls, sender, currhdr,
- (const struct GNUNET_TRANSPORT_ATS_Information *)
- &distance, 2, NULL, un->sun_path,
- strlen (un->sun_path) + 1);
+ (const struct GNUNET_ATS_Information *) &ats, 2,
+ NULL, un->sun_path, strlen (un->sun_path) + 1);
}
-/*
- * @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)
+unix_plugin_select_read (struct Plugin * plugin)
{
- struct Plugin *plugin = cls;
char buf[65536];
struct UNIXMessage *msg;
struct GNUNET_PeerIdentity sender;
const struct GNUNET_MessageHeader *currhdr;
uint16_t csize;
- plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
- if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
- return;
-
addrlen = sizeof (un);
memset (&un, 0, sizeof (un));
- GNUNET_assert (GNUNET_NETWORK_fdset_isset
- (tc->read_ready, plugin->unix_sock.desc));
+
ret =
GNUNET_NETWORK_socket_recvfrom (plugin->unix_sock.desc, buf, sizeof (buf),
(struct sockaddr *) &un, &addrlen);
+ if ((GNUNET_SYSERR == ret) && ((errno == EAGAIN) || (errno == ENOBUFS)))
+ return;
+
if (ret == GNUNET_SYSERR)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "recvfrom");
- plugin->select_task =
- GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_SCHEDULER_NO_TASK,
- GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
- NULL, &unix_plugin_select, plugin);
return;
}
else
if ((csize < sizeof (struct UNIXMessage)) || (csize > ret))
{
GNUNET_break_op (0);
- plugin->select_task =
- GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_SCHEDULER_NO_TASK,
- GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
- NULL, &unix_plugin_select, plugin);
return;
}
msgbuf = (char *) &msg[1];
unix_demultiplexer (plugin, &sender, currhdr, &un, sizeof (un));
offset += csize;
}
+}
+
+static void
+unix_plugin_select_write (struct Plugin * plugin)
+{
+ int sent = 0;
+ struct UNIXMessageWrapper * msgw = plugin->msg_head;
+
+ sent = unix_real_send (plugin,
+ plugin->unix_sock.desc,
+ &msgw->session->target,
+ (const char *) msgw->msg,
+ msgw->msgsize,
+ msgw->priority,
+ msgw->timeout,
+ msgw->session->addr,
+ msgw->session->addrlen,
+ msgw->cont, msgw->cont_cls);
+
+ /* successfully sent bytes */
+ if (sent > 0)
+ {
+ GNUNET_CONTAINER_DLL_remove(plugin->msg_head, plugin->msg_tail, msgw);
+ GNUNET_free (msgw->msg);
+ GNUNET_free (msgw);
+ return;
+ }
+
+ /* failed and no retry */
+ if (sent == -1)
+ {
+ GNUNET_CONTAINER_DLL_remove(plugin->msg_head, plugin->msg_tail, msgw);
+ GNUNET_free (msgw->msg);
+ GNUNET_free (msgw);
+ return;
+ }
+
+ /* failed and retry */
+ if (sent == 0)
+ return;
+}
+
+/*
+ * @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)
+{
+ struct Plugin *plugin = cls;
+
+ plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ return;
+
+ plugin->with_ws = GNUNET_NO;
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY) != 0)
+ {
+ GNUNET_assert (GNUNET_NETWORK_fdset_isset
+ (tc->write_ready, plugin->unix_sock.desc));
+ if (plugin->msg_head != NULL)
+ unix_plugin_select_write (plugin);
+ }
+
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_READ_READY) != 0)
+ {
+ 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_SCHEDULER_NO_TASK,
- GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
- NULL, &unix_plugin_select, plugin);
+ 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;
}
/**
#if LINUX
un.sun_path[0] = '\0';
#endif
-
+ plugin->ats_network = plugin->env->get_address_type (plugin->env->cls, serverAddr, addrlen);
plugin->unix_sock.desc =
GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0);
if (NULL == plugin->unix_sock.desc)
return GNUNET_SYSERR;
}
#if DEBUG_UNIX
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "unix", "Bound to `%s'\n", &un.sun_path[0]);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "unix", "Bound to `%s'\n",
+ &un.sun_path[0]);
#endif
plugin->rs = GNUNET_NETWORK_fdset_create ();
+ plugin->ws = GNUNET_NETWORK_fdset_create ();
GNUNET_NETWORK_fdset_zero (plugin->rs);
+ GNUNET_NETWORK_fdset_zero (plugin->ws);
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_SCHEDULER_NO_TASK,
- GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
- NULL, &unix_plugin_select, plugin);
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->rs,
+ NULL,
+ &unix_plugin_select, plugin);
+ plugin->with_ws = GNUNET_NO;
+
return 1;
}
}
-/**
- * Append our port and forward the result.
- */
-static void
-append_port (void *cls, const char *hostname)
-{
- struct PrettyPrinterContext *ppc = cls;
- char *ret;
-
- if (hostname == NULL)
- {
- ppc->asc (ppc->asc_cls, NULL);
- GNUNET_free (ppc);
- return;
- }
- GNUNET_asprintf (&ret, "%s:%d", hostname, ppc->port);
- ppc->asc (ppc->asc_cls, ret);
- GNUNET_free (ret);
-}
-
-
/**
* Convert the transports address to a nice, human-readable
* format.
* @param asc_cls closure for asc
*/
static void
-unix_plugin_address_pretty_printer (void *cls,
- const char *type,
- const void *addr,
- size_t addrlen,
+unix_plugin_address_pretty_printer (void *cls, const char *type,
+ const void *addr, size_t addrlen,
int numeric,
struct GNUNET_TIME_Relative timeout,
GNUNET_TRANSPORT_AddressStringCallback asc,
void *asc_cls)
{
- struct PrettyPrinterContext *ppc;
- const void *sb;
- size_t sbs;
- struct sockaddr_in a4;
- struct sockaddr_in6 a6;
- const struct IPv4UdpAddress *u4;
- const struct IPv6UdpAddress *u6;
- uint16_t port;
-
- if (addrlen == sizeof (struct IPv6UdpAddress))
+ if ((addr != NULL) && (addrlen > 0))
+ asc (asc_cls, (const char *) addr);
+ else
{
- u6 = addr;
- memset (&a6, 0, sizeof (a6));
- a6.sin6_family = AF_INET6;
- a6.sin6_port = u6->u6_port;
- memcpy (&a6.sin6_addr, &u6->ipv6_addr, sizeof (struct in6_addr));
- port = ntohs (u6->u6_port);
- sb = &a6;
- sbs = sizeof (a6);
+ GNUNET_break (0);
+ asc (asc_cls, "Invalid UNIX address");
}
- else if (addrlen == sizeof (struct IPv4UdpAddress))
+
+}
+
+/**
+ * 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 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
+unix_string_to_address (void *cls, const char *addr, uint16_t addrlen,
+ void **buf, size_t *added)
+{
+ if ((NULL == addr) || (addrlen == 0))
{
- u4 = addr;
- memset (&a4, 0, sizeof (a4));
- a4.sin_family = AF_INET;
- a4.sin_port = u4->u_port;
- a4.sin_addr.s_addr = u4->ipv4_addr;
- port = ntohs (u4->u_port);
- sb = &a4;
- sbs = sizeof (a4);
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- else
+
+ if ((strlen (addr) + 1) != addrlen)
{
- /* invalid address */
- GNUNET_break_op (0);
- asc (asc_cls, NULL);
- return;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- ppc = GNUNET_malloc (sizeof (struct PrettyPrinterContext));
- ppc->asc = asc;
- ppc->asc_cls = asc_cls;
- ppc->port = port;
- GNUNET_RESOLVER_hostname_get (sb, sbs, !numeric, timeout, &append_port, ppc);
+
+ (*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
{
struct Plugin *plugin = cls;
- plugin->env->notify_address (plugin->env->cls,
- GNUNET_YES,
+ plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
plugin->unix_socket_path,
strlen (plugin->unix_socket_path) + 1);
}
struct Plugin *plugin;
int sockets_created;
+ if (NULL == env->receive)
+ {
+ /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
+ initialze the plugin or the API */
+ api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ api->cls = NULL;
+ api->address_pretty_printer = &unix_plugin_address_pretty_printer;
+ api->address_to_string = &unix_address_to_string;
+ api->string_to_address = NULL; // FIXME!
+ return api;
+ }
+
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (env->cfg,
- "transport-unix", "PORT", &port))
+ GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-unix", "PORT",
+ &port))
port = UNIX_NAT_DEFAULT_PORT;
plugin = GNUNET_malloc (sizeof (struct Plugin));
plugin->port = port;
plugin->env = env;
- GNUNET_asprintf (&plugin->unix_socket_path,
- "/tmp/unix-plugin-sock.%d", plugin->port);
+ GNUNET_asprintf (&plugin->unix_socket_path, "/tmp/unix-plugin-sock.%d",
+ plugin->port);
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = plugin;
+ api->get_session = &unix_plugin_get_session;
api->send = &unix_plugin_send;
api->disconnect = &unix_disconnect;
api->address_pretty_printer = &unix_plugin_address_pretty_printer;
api->address_to_string = &unix_address_to_string;
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);
return api;
}
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
+ if (NULL == plugin)
+ {
+ GNUNET_free (api);
+ return NULL;
+ }
unix_transport_server_stop (plugin);
+ 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);
GNUNET_free (plugin->unix_socket_path);
GNUNET_free (plugin);
GNUNET_free (api);
projects / oweals / gnunet.git / blobdiff