* @author Nathan Evans
*/
#include "platform.h"
-#include "gnunet_hello_lib.h"
#include "gnunet_util_lib.h"
+#include "gnunet_hello_lib.h"
#include "gnunet_protocols.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
*/
#define RETRY 0
+#define PLUGIN_NAME "unix"
+
+enum UNIX_ADDRESS_OPTIONS
+{
+ UNIX_OPTIONS_NONE = 0,
+ UNIX_OPTIONS_USE_ABSTRACT_SOCKETS = 1
+};
+
+
/**
* How long until we give up on transmitting the welcome message?
*/
#define HOSTNAME_RESOLVE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-/**
- * 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
+struct UnixAddress
+{
+ uint32_t options GNUNET_PACKED;
+
+ uint32_t addrlen GNUNET_PACKED;
+};
+
+
/**
* UNIX Message-Packet header.
*/
};
-
+GNUNET_NETWORK_STRUCT_END
/**
* Handle for a session.
*/
struct Plugin * plugin;
- void *addr;
-
- size_t addrlen;
+ struct GNUNET_HELLO_Address *address;
/**
* Session timeout task
/**
* Sessions
*/
- struct GNUNET_CONTAINER_MultiHashMap *session_map;
+ struct GNUNET_CONTAINER_MultiPeerMap *session_map;
/**
* FD Read set
*/
struct UNIX_Sock_Info unix_sock;
+ /**
+ * Address options in HBO
+ */
+ uint32_t myoptions;
+
+
/**
* ATS network
*/
*/
int with_ws;
- /**
- * Integer to append to unix domain socket.
- */
- uint16_t port;
-
+ int abstract;
};
static void
unix_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+static struct sockaddr_un *
+unix_address_to_sockaddr (const char *unixpath,
+ socklen_t *sock_len)
+{
+ struct sockaddr_un *un;
+ size_t slen;
+
+ GNUNET_assert (0 < strlen (unixpath)); /* sanity check */
+ un = GNUNET_new (struct sockaddr_un);
+ un->sun_family = AF_UNIX;
+ slen = strlen (unixpath);
+ if (slen >= sizeof (un->sun_path))
+ slen = sizeof (un->sun_path) - 1;
+ memcpy (un->sun_path, unixpath, slen);
+ un->sun_path[slen] = '\0';
+ slen = sizeof (struct sockaddr_un);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ un->sun_len = (u_char) slen;
+#endif
+ (*sock_len) = slen;
+ return un;
+}
+
+
+/**
+ * Function called for a quick conversion of the binary address to
+ * a numeric address. Note that the caller must not free the
+ * address and that the next call to this function is allowed
+ * to override the address again.
+ *
+ * @param cls closure
+ * @param addr binary address
+ * @param addrlen length of the address
+ * @return string representing the same address
+ */
+static const char *
+unix_address_to_string (void *cls, const void *addr, size_t addrlen)
+{
+ static char rbuf[1024];
+ struct UnixAddress *ua = (struct UnixAddress *) addr;
+ char *addrstr;
+ size_t addr_str_len;
+ unsigned int off;
+
+ if ((NULL == addr) || (sizeof (struct UnixAddress) > addrlen))
+ {
+ GNUNET_break(0);
+ return NULL ;
+ }
+ addrstr = (char *) &ua[1];
+ addr_str_len = ntohl (ua->addrlen);
+
+ if (addr_str_len != addrlen - sizeof(struct UnixAddress))
+ {
+ GNUNET_break(0);
+ return NULL ;
+ }
+
+ if ('\0' != addrstr[addr_str_len - 1])
+ {
+ GNUNET_break(0);
+ return NULL ;
+ }
+ if (strlen (addrstr) + 1 != addr_str_len)
+ {
+ GNUNET_break(0);
+ return NULL ;
+ }
+
+ off = 0;
+ if ('\0' == addrstr[0])
+ off++;
+ memset (rbuf, 0, sizeof (rbuf));
+ GNUNET_snprintf (rbuf, sizeof (rbuf) - 1, "%s.%u.%s%.*s",
+ PLUGIN_NAME,
+ ntohl (ua->options),
+ (off == 1) ? "@" : "",
+ (int) (addr_str_len - off),
+ &addrstr[off]);
+/*
+ GNUNET_snprintf (rbuf, sizeof(rbuf), "%s.%u.%s", PLUGIN_NAME,
+ ntohl (ua->options), addrstr);*/
+ return rbuf;
+}
+
+
+
/**
* Re-schedule the main 'select' callback (unix_plugin_select)
/**
- * Closure to 'lookup_session_it'.
+ * Closure to #lookup_session_it.
*/
struct LookupCtx
{
/**
* Location to store the session, if found.
*/
- struct Session *s;
+ struct Session *res;
- /**
- * Address we are looking for.
- */
- const struct sockaddr_un *addr;
+ struct GNUNET_HELLO_Address *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
+ * @return #GNUNET_YES if not found (continue looking), #GNUNET_NO on success
*/
-static int
+static int
lookup_session_it (void *cls,
- const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity * key,
void *value)
{
struct LookupCtx *lctx = cls;
- struct Session *t = value;
+ struct Session *s = value;
- if (0 == strcmp (t->addr, lctx->addr->sun_path))
+ if (0 == GNUNET_HELLO_address_cmp (lctx->address, s->address))
{
- lctx->s = t;
+ lctx->res = s;
return GNUNET_NO;
}
return GNUNET_YES;
* 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
+ * @param address the address to find
* @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)
+lookup_session (struct Plugin *plugin,
+ struct GNUNET_HELLO_Address *address)
{
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,
+ lctx.address = address;
+ lctx.res = NULL;
+ GNUNET_CONTAINER_multipeermap_get_multiple (plugin->session_map,
+ &address->peer,
&lookup_session_it, &lctx);
- return lctx.s;
+ return lctx.res;
}
* to close a session due to a disconnect or failure to
* establish a connection.
*
+ * @param cls closure with the `struct Plugin`
* @param s session to close down
+ * @return #GNUNET_OK on success
*/
-static void
-disconnect_session (struct Session *s)
+static int
+unix_session_disconnect (void *cls,
+ struct Session *s)
{
- struct Plugin *plugin = s->plugin;
+ struct Plugin *plugin = cls;
struct UNIXMessageWrapper *msgw;
struct UNIXMessageWrapper *next;
int removed;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ 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);
+ GNUNET_i2s (&s->target),
+ unix_address_to_string (NULL, s->address->address, s->address->address_length) );
+ plugin->env->session_end (plugin->env->cls, s->address, s);
removed = GNUNET_NO;
next = plugin->msg_head;
while (NULL != next)
msgw->payload, 0);
GNUNET_free (msgw->msg);
GNUNET_free (msgw);
- removed = GNUNET_YES;
+ removed = GNUNET_YES;
}
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (plugin->session_map,
- &s->target.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_remove (plugin->session_map,
+ &s->target,
s));
GNUNET_STATISTICS_set (plugin->env->stats,
"# UNIX sessions active",
- GNUNET_CONTAINER_multihashmap_size (plugin->session_map),
+ GNUNET_CONTAINER_multipeermap_size (plugin->session_map),
GNUNET_NO);
if ((GNUNET_YES == removed) && (NULL == plugin->msg_head))
reschedule_select (plugin);
GNUNET_SCHEDULER_cancel (s->timeout_task);
s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
+ GNUNET_HELLO_address_free (s->address);
GNUNET_free (s);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Function that is called to get the keepalive factor.
+ * GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
+ * calculate the interval between keepalive packets.
+ *
+ * @param cls closure with the `struct Plugin`
+ * @return keepalive factor
+ */
+static unsigned int
+unix_query_keepalive_factor (void *cls)
+{
+ return 3;
}
* @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 addr the addr to send the message to, needs to be a sockaddr for us
- * @param addrlen the len of addr
+ * @param addrlen the len of @a 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
+ * @param cont_cls closure for @a cont
* @return on success the number of bytes written, RETRY for retry, -1 on errors
*/
static ssize_t
const struct GNUNET_PeerIdentity *target, const char *msgbuf,
size_t msgbuf_size, unsigned int priority,
struct GNUNET_TIME_Absolute timeout,
- const void *addr,
+ const struct UnixAddress *addr,
size_t addrlen,
size_t payload,
GNUNET_TRANSPORT_TransmitContinuation cont,
{
struct Plugin *plugin = cls;
ssize_t sent;
- const void *sb;
- size_t sbs;
- struct sockaddr_un un;
- size_t slen;
+ struct sockaddr_un *un;
+ socklen_t un_len;
+ const char *unixpath;
GNUNET_assert (NULL != plugin);
if (NULL == send_handle)
}
/* 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;
- GNUNET_assert (slen < sizeof (un.sun_path));
- memcpy (un.sun_path, addr, slen);
- un.sun_path[slen] = '\0';
- slen = sizeof (struct sockaddr_un);
-#if LINUX
- un.sun_path[0] = '\0';
-#endif
-#if HAVE_SOCKADDR_IN_SIN_LEN
- un.sun_len = (u_char) slen;
-#endif
- sb = (struct sockaddr *) &un;
- sbs = slen;
+ unixpath = (const char *) &addr[1];
+ if (NULL == (un = unix_address_to_sockaddr (unixpath,
+ &un_len)))
+ {
+ GNUNET_break (0);
+ return -1;
+ }
+ if ((GNUNET_YES == plugin->abstract) &&
+ (0 != (UNIX_OPTIONS_USE_ABSTRACT_SOCKETS & ntohl(addr->options) )) )
+ {
+ un->sun_path[0] = '\0';
+ }
resend:
/* Send the data */
- sent = 0;
- sent = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size, sb, sbs);
-
+ sent = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size,
+ (const struct sockaddr *) un, un_len);
if (GNUNET_SYSERR == sent)
{
if ( (EAGAIN == errno) ||
(ENOBUFS == errno) )
+ {
+ GNUNET_free (un);
return RETRY; /* We have to retry later */
+ }
if (EMSGSIZE == errno)
{
socklen_t size = 0;
{
/* Could not increase buffer size: error, no retry */
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "setsockopt");
+ GNUNET_free (un);
return GNUNET_SYSERR;
}
}
/* Buffer is bigger than message: error, no retry
* This should never happen!*/
GNUNET_break (0);
+ GNUNET_free (un);
return GNUNET_SYSERR;
}
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
"UNIX transmit %u-byte message to %s (%d: %s)\n",
- (unsigned int) msgbuf_size,
- GNUNET_a2s (sb, sbs),
+ (unsigned int) msgbuf_size,
+ GNUNET_a2s ((const struct sockaddr *)un, un_len),
(int) sent,
(sent < 0) ? STRERROR (errno) : "ok");
+ GNUNET_free (un);
return sent;
}
* Closure for 'get_session_it'.
*/
struct GetSessionIteratorContext
-{
+{
/**
* Location to store the session, if found.
*/
/**
* Address information.
*/
- const char *address;
-
- /**
- * Number of bytes in 'address'
- */
- size_t addrlen;
+ const struct GNUNET_HELLO_Address *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
+ * @return #GNUNET_YES if not found (continue looking), #GNUNET_NO on success
*/
static int
-get_session_it (void *cls,
- const struct GNUNET_HashCode *key,
+get_session_it (void *cls,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct GetSessionIteratorContext *gsi = cls;
struct Session *s = value;
- if ( (gsi->addrlen == s->addrlen) &&
- (0 == memcmp (gsi->address, s->addr, s->addrlen)) )
+ if (0 == GNUNET_HELLO_address_cmp(s->address, gsi->address))
{
gsi->res = s;
return GNUNET_NO;
* @param tc scheduler context
*/
static void
-session_timeout (void *cls,
+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);
+ unix_session_disconnect (s->plugin, s);
+}
+
+
+/**
+ * Function obtain the network type for a session
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type in HBO or #GNUNET_SYSERR
+ */
+static enum GNUNET_ATS_Network_Type
+unix_get_network (void *cls,
+ struct Session *session)
+{
+ GNUNET_assert (NULL != session);
+ return GNUNET_ATS_NET_LOOPBACK;
}
struct Plugin *plugin = cls;
struct Session *s;
struct GetSessionIteratorContext gsi;
+ struct UnixAddress *ua;
+ char * addrstr;
+ uint32_t addr_str_len;
+ uint32_t addr_option;
GNUNET_assert (NULL != plugin);
GNUNET_assert (NULL != address);
+ ua = (struct UnixAddress *) address->address;
+ if ((NULL == address->address) || (0 == address->address_length) ||
+ (sizeof (struct UnixAddress) > address->address_length))
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ addrstr = (char *) &ua[1];
+ addr_str_len = ntohl (ua->addrlen);
+ addr_option = ntohl (ua->options);
+
+ if ( (0 != (UNIX_OPTIONS_USE_ABSTRACT_SOCKETS & addr_option)) &&
+ (GNUNET_NO == plugin->abstract))
+ {
+ return NULL;
+ }
+
+ if (addr_str_len != address->address_length - sizeof (struct UnixAddress))
+ {
+ return NULL; /* This can be a legacy address */
+ }
+
+ if ('\0' != addrstr[addr_str_len - 1])
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ if (strlen (addrstr) + 1 != addr_str_len)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+
/* Check if already existing */
- gsi.address = (const char *) address->address;
- gsi.addrlen = address->address_length;
+ gsi.address = address;
gsi.res = NULL;
- GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map,
- &address->peer.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_get_multiple (plugin->session_map,
+ &address->peer,
&get_session_it, &gsi);
if (NULL != gsi.res)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Found existing session\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Found existing session %p for address `%s'\n",
+ gsi.res,
+ unix_address_to_string (NULL, address->address, address->address_length));
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;
+ s = GNUNET_new (struct Session);
+ s->target = address->peer;
+ s->address = GNUNET_HELLO_address_copy (address);
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,
+ "Creating a new session %p for address `%s'\n",
+ s, unix_address_to_string (NULL, address->address, address->address_length));
+ (void) GNUNET_CONTAINER_multipeermap_put (plugin->session_map,
+ &address->peer, s,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
GNUNET_STATISTICS_set (plugin->env->stats,
"# UNIX sessions active",
- GNUNET_CONTAINER_multihashmap_size (plugin->session_map),
+ GNUNET_CONTAINER_multipeermap_size (plugin->session_map),
GNUNET_NO);
return s;
}
+static void
+unix_plugin_update_session_timeout (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct Session *session)
+{
+ struct Plugin *plugin = cls;
+
+ if (GNUNET_OK !=
+ GNUNET_CONTAINER_multipeermap_contains_value (plugin->session_map,
+ &session->target,
+ session))
+ return;
+ reschedule_session_timeout (session);
+}
/**
* Function that can be used by the transport service to transmit
* @param cls closure
* @param session which session must be used
* @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in 'msgbuf'
+ * @param msgbuf_size number of bytes in @a 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
* been transmitted (or if the transport is ready
* for the next transmission call; or if the
* peer disconnected...); can be NULL
- * @param cont_cls closure for cont
+ * @param cont_cls closure for @a cont
* @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)
struct UNIXMessageWrapper *wrapper;
struct UNIXMessage *message;
int ssize;
-
- GNUNET_assert (NULL != plugin);
- GNUNET_assert (NULL != session);
- if (GNUNET_OK !=
- GNUNET_CONTAINER_multihashmap_contains_value (plugin->session_map,
- &session->target.hashPubKey,
+ if (GNUNET_OK !=
+ GNUNET_CONTAINER_multipeermap_contains_value (plugin->session_map,
+ &session->target,
session))
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
+ LOG (GNUNET_ERROR_TYPE_ERROR,
"Invalid session for peer `%s' `%s'\n",
GNUNET_i2s (&session->target),
- (const char *) session->addr);
+ unix_address_to_string(NULL, session->address->address,
+ session->address->address_length));
GNUNET_break (0);
return GNUNET_SYSERR;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ 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);
+ unix_address_to_string(NULL, session->address->address,
+ session->address->address_length));
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 = GNUNET_new (struct UNIXMessageWrapper);
wrapper->msg = message;
wrapper->msgsize = ssize;
wrapper->payload = msgbuf_size;
wrapper->cont = cont;
wrapper->cont_cls = cont_cls;
wrapper->session = session;
- GNUNET_CONTAINER_DLL_insert (plugin->msg_head,
+ GNUNET_CONTAINER_DLL_insert (plugin->msg_head,
plugin->msg_tail,
wrapper);
plugin->bytes_in_queue += ssize;
GNUNET_STATISTICS_set (plugin->env->stats,
"# bytes currently in UNIX buffers",
- plugin->bytes_in_queue,
+ plugin->bytes_in_queue,
GNUNET_NO);
if (GNUNET_NO == plugin->with_ws)
reschedule_select (plugin);
* @param plugin the main plugin for this transport
* @param sender from which peer the message was received
* @param currhdr pointer to the header of the message
- * @param un the address from which the message was received
- * @param fromlen the length of the address
+ * @param ua address to look for
+ * @param ua_len length of the address @a ua
*/
static void
unix_demultiplexer (struct Plugin *plugin, struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *currhdr,
- const struct sockaddr_un *un, size_t fromlen)
+ const struct UnixAddress *ua, size_t ua_len)
{
struct Session *s = NULL;
- struct GNUNET_HELLO_Address * addr;
+ struct GNUNET_HELLO_Address *address;
GNUNET_break (ntohl(plugin->ats_network.value) != GNUNET_ATS_NET_UNSPECIFIED);
-
- GNUNET_assert (fromlen >= sizeof (struct sockaddr_un));
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_assert (ua_len >= sizeof (struct UnixAddress));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received message from %s\n",
- un->sun_path);
+ unix_address_to_string(NULL, ua, ua_len));
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);
+ /* Look for existing session */
+ address = GNUNET_HELLO_address_allocate (sender, PLUGIN_NAME, ua, ua_len,
+ GNUNET_HELLO_ADDRESS_INFO_NONE); /* UNIX does not have "inbound" sessions */
+ s = lookup_session (plugin, address);
+
if (NULL == s)
- s = unix_plugin_get_session (plugin, addr);
+ {
+ s = unix_plugin_get_session (plugin, address);
+ /* Notify transport and ATS about new inbound session */
+ plugin->env->session_start (NULL, s->address, s, &plugin->ats_network, 1);
+ }
+ GNUNET_HELLO_address_free (address);
reschedule_session_timeout (s);
- plugin->env->receive (plugin->env->cls, sender, currhdr,
- 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->env->receive (plugin->env->cls, s->address, s, currhdr);
+ plugin->env->update_address_metrics (plugin->env->cls, s->address, s,
&plugin->ats_network, 1);
-
- GNUNET_free (addr);
}
unix_plugin_select_read (struct Plugin *plugin)
{
char buf[65536] GNUNET_ALIGN;
+ struct UnixAddress *ua;
struct UNIXMessage *msg;
struct GNUNET_PeerIdentity sender;
struct sockaddr_un un;
ssize_t ret;
int offset;
int tsize;
+ int is_abstract;
char *msgbuf;
const struct GNUNET_MessageHeader *currhdr;
uint16_t csize;
+ size_t ua_len;
addrlen = sizeof (un);
memset (&un, 0, sizeof (un));
}
else
{
-#if LINUX
- un.sun_path[0] = '/';
-#endif
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %d bytes from socket %s\n", ret,
- &un.sun_path[0]);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Read %d bytes from socket %s\n",
+ (int) ret,
+ un.sun_path);
}
GNUNET_assert (AF_UNIX == (un.sun_family));
+ is_abstract = GNUNET_NO;
+ if ('\0' == un.sun_path[0])
+ {
+ un.sun_path[0] = '@';
+ is_abstract = GNUNET_YES;
+ }
+
+ ua_len = sizeof (struct UnixAddress) + strlen (un.sun_path) + 1;
+ ua = GNUNET_malloc (ua_len);
+ ua->addrlen = htonl (strlen (&un.sun_path[0]) +1);
+ memcpy (&ua[1], &un.sun_path[0], strlen (un.sun_path) + 1);
+ if (is_abstract)
+ ua->options = htonl(UNIX_OPTIONS_USE_ABSTRACT_SOCKETS);
+ else
+ ua->options = htonl(UNIX_OPTIONS_NONE);
msg = (struct UNIXMessage *) buf;
csize = ntohs (msg->header.size);
if ((csize < sizeof (struct UNIXMessage)) || (csize > ret))
{
GNUNET_break_op (0);
+ GNUNET_free (ua);
return;
}
msgbuf = (char *) &msg[1];
GNUNET_break_op (0);
break;
}
- unix_demultiplexer (plugin, &sender, currhdr, &un, sizeof (un));
+ unix_demultiplexer (plugin, &sender, currhdr, ua, ua_len);
offset += csize;
}
+ GNUNET_free (ua);
}
while (NULL != (msgw = plugin->msg_tail))
{
- if (GNUNET_TIME_absolute_get_remaining (msgw->timeout).rel_value > 0)
+ if (GNUNET_TIME_absolute_get_remaining (msgw->timeout).rel_value_us > 0)
break; /* Message is ready for sending */
/* Message has a timeout */
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout for message with %u bytes \n",
+ "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,
+ GNUNET_STATISTICS_set (plugin->env->stats,
"# bytes currently in UNIX buffers",
- plugin->bytes_in_queue, GNUNET_NO);
+ 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);
+ &msgw->session->target,
+ GNUNET_SYSERR,
+ msgw->payload,
+ 0);
GNUNET_free (msgw->msg);
- GNUNET_free (msgw);
+ GNUNET_free (msgw);
}
if (NULL == msgw)
return; /* Nothing to send at the moment */
msgw->msgsize,
msgw->priority,
msgw->timeout,
- msgw->session->addr,
- msgw->session->addrlen,
+ msgw->session->address->address,
+ msgw->session->address->address_length,
msgw->payload,
msgw->cont, msgw->cont_cls);
GNUNET_assert (plugin->bytes_in_queue >= msgw->msgsize);
plugin->bytes_in_queue -= msgw->msgsize;
- GNUNET_STATISTICS_set (plugin->env->stats,
+ GNUNET_STATISTICS_set (plugin->env->stats,
"# bytes currently in UNIX buffers",
plugin->bytes_in_queue, GNUNET_NO);
GNUNET_STATISTICS_update (plugin->env->stats,
}
/* successfully sent bytes */
GNUNET_break (sent > 0);
- GNUNET_CONTAINER_DLL_remove (plugin->msg_head,
- plugin->msg_tail,
- msgw);
+ 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,
GNUNET_STATISTICS_update (plugin->env->stats,
"# bytes transmitted via UNIX",
msgw->msgsize,
- GNUNET_NO);
+ GNUNET_NO);
if (NULL != msgw->cont)
- msgw->cont (msgw->cont_cls, &msgw->session->target,
+ msgw->cont (msgw->cont_cls, &msgw->session->target,
GNUNET_OK,
- msgw->payload,
- msgw->msgsize);
+ msgw->payload,
+ msgw->msgsize);
GNUNET_free (msgw->msg);
GNUNET_free (msgw);
}
* 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
+ * @return number of sockets created or #GNUNET_SYSERR on error
*/
static int
unix_transport_server_start (void *cls)
{
struct Plugin *plugin = cls;
- struct sockaddr *serverAddr;
- socklen_t addrlen;
- struct sockaddr_un un;
- size_t slen;
-
- memset (&un, 0, sizeof (un));
- un.sun_family = AF_UNIX;
- slen = strlen (plugin->unix_socket_path) + 1;
- if (slen >= sizeof (un.sun_path))
- slen = sizeof (un.sun_path) - 1;
-
- memcpy (un.sun_path, plugin->unix_socket_path, slen);
- un.sun_path[slen] = '\0';
- slen = sizeof (struct sockaddr_un);
-#if HAVE_SOCKADDR_IN_SIN_LEN
- un.sun_len = (u_char) slen;
-#endif
+ struct sockaddr_un *un;
+ socklen_t un_len;
- serverAddr = (struct sockaddr *) &un;
- addrlen = slen;
-#if LINUX
- un.sun_path[0] = '\0';
-#endif
- plugin->ats_network = plugin->env->get_address_type (plugin->env->cls, serverAddr, addrlen);
+ un = unix_address_to_sockaddr (plugin->unix_socket_path,
+ &un_len);
+ if (GNUNET_YES == plugin->abstract)
+ {
+ plugin->unix_socket_path[0] = '@';
+ un->sun_path[0] = '\0';
+ }
+ plugin->ats_network = plugin->env->get_address_type (plugin->env->cls, (const struct sockaddr *) un, un_len);
plugin->unix_sock.desc =
GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0);
if (NULL == plugin->unix_sock.desc)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
return GNUNET_SYSERR;
}
- if (GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen, 0)
- != GNUNET_OK)
+ if ('\0' != un->sun_path[0])
+ GNUNET_DISK_directory_create_for_file (un->sun_path);
+ if (GNUNET_OK !=
+ GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, (const struct sockaddr *) un, un_len))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
plugin->unix_sock.desc = NULL;
+ GNUNET_free (un);
return GNUNET_SYSERR;
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "Bound to `%s'\n", plugin->unix_socket_path);
GNUNET_NETWORK_fdset_set (plugin->ws, plugin->unix_sock.desc);
reschedule_select (plugin);
-
+ GNUNET_free (un);
return 1;
}
static int
unix_check_address (void *cls, const void *addr, size_t addrlen)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Informing transport service about my address `%s'\n",
- (char *) addr);
- return GNUNET_OK;
+ struct Plugin* plugin = cls;
+ struct UnixAddress *ua = (struct UnixAddress *) addr;
+ char *addrstr;
+ size_t addr_str_len;
+
+ if ((NULL == addr) || (0 == addrlen) || (sizeof (struct UnixAddress) > addrlen))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ addrstr = (char *) &ua[1];
+ addr_str_len = ntohl (ua->addrlen);
+ if ('\0' != addrstr[addr_str_len - 1])
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (strlen (addrstr) + 1 != addr_str_len)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+
+ if (0 == strcmp (plugin->unix_socket_path, addrstr))
+ return GNUNET_OK;
+ return GNUNET_SYSERR;
}
* @param type name of the transport that generated the address
* @param addr one of the addresses of the host, NULL for the last address
* the specific address format depends on the transport
- * @param addrlen length of the address
+ * @param addrlen length of the @a addr
* @param numeric should (IP) addresses be displayed in numeric form?
* @param timeout after how long should we give up?
* @param asc function to call on each string
- * @param asc_cls closure for asc
+ * @param asc_cls closure for @a asc
*/
static void
unix_plugin_address_pretty_printer (void *cls, const char *type,
{
if ((NULL != addr) && (addrlen > 0))
{
- asc (asc_cls, (const char *) addr);
+ asc (asc_cls, unix_address_to_string (NULL, addr, addrlen));
+ }
+ else if (0 == addrlen)
+ {
+ asc (asc_cls, TRANSPORT_SESSION_INBOUND_STRING);
}
else
{
*
* @param cls closure ('struct Plugin*')
* @param addr string address
- * @param addrlen length of the address (strlen(addr) + '\0')
+ * @param addrlen length of the @a addr (strlen(addr) + '\0')
* @param buf location to store the buffer
- * If the function returns GNUNET_SYSERR, its contents are undefined.
+ * 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
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
static int
-unix_string_to_address (void *cls, const char *addr, uint16_t addrlen,
- void **buf, size_t *added)
+unix_string_to_address (void *cls,
+ const char *addr, uint16_t addrlen,
+ void **buf, size_t *added)
{
- if ((NULL == addr) || (0 == addrlen))
+ struct UnixAddress *ua;
+ char *address;
+ char *plugin;
+ char *optionstr;
+ uint32_t options;
+ size_t ua_size;
+
+ /* Format unix.options.address */
+ address = NULL;
+ plugin = NULL;
+ optionstr = NULL;
+
+ if ((NULL == addr) || (addrlen == 0))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
if ('\0' != addr[addrlen - 1])
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
if (strlen (addr) != addrlen - 1)
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
+ plugin = GNUNET_strdup (addr);
+ optionstr = strchr (plugin, '.');
+ if (NULL == optionstr)
+ {
+ GNUNET_break (0);
+ GNUNET_free (plugin);
+ return GNUNET_SYSERR;
+ }
+ optionstr[0] = '\0';
+ optionstr++;
+ options = atol (optionstr);
+ address = strchr (optionstr, '.');
+ if (NULL == address)
+ {
+ GNUNET_break (0);
+ GNUNET_free (plugin);
+ return GNUNET_SYSERR;
+ }
+ address[0] = '\0';
+ address++;
+ if (0 != strcmp(plugin, PLUGIN_NAME))
+ {
+ GNUNET_break (0);
+ GNUNET_free (plugin);
+ return GNUNET_SYSERR;
+ }
- (*buf) = strdup (addr);
- (*added) = strlen (addr) + 1;
- return GNUNET_OK;
-}
-
+ ua_size = sizeof (struct UnixAddress) + strlen (address) + 1;
+ ua = GNUNET_malloc (ua_size);
+ ua->options = htonl (options);
+ ua->addrlen = htonl (strlen (address) + 1);
+ memcpy (&ua[1], address, strlen (address) + 1);
+ GNUNET_free (plugin);
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address. Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
- */
-static const char *
-unix_address_to_string (void *cls, const void *addr, size_t addrlen)
-{
- if ((addr != NULL) && (addrlen > 0))
- return (const char *) addr;
- return NULL;
+ (*buf) = ua;
+ (*added) = ua_size;
+ return GNUNET_OK;
}
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Plugin *plugin = cls;
+ struct GNUNET_HELLO_Address *address;
+ size_t len;
+ struct UnixAddress *ua;
+ char *unix_path;
+
+ len = sizeof (struct UnixAddress) + strlen (plugin->unix_socket_path) + 1;
+ ua = GNUNET_malloc (len);
+ ua->options = htonl (plugin->myoptions);
+ ua->addrlen = htonl(strlen (plugin->unix_socket_path) + 1);
+ unix_path = (char *) &ua[1];
+ memcpy (unix_path, plugin->unix_socket_path, strlen (plugin->unix_socket_path) + 1);
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,
- "unix");
+ address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
+ PLUGIN_NAME, ua, len, GNUNET_HELLO_ADDRESS_INFO_NONE);
+
+ plugin->env->notify_address (plugin->env->cls, GNUNET_YES, address);
+ GNUNET_free (ua);
+ GNUNET_free (address);
}
/**
* Increment session timeout due to activity
*
- * @param s session for which the timeout should be moved
+ * @param s session for which the timeout should be rescheduled
*/
static void
reschedule_session_timeout (struct Session *s)
/**
* Function called on sessions to disconnect
*
- * @param cls the plugin (unused)
+ * @param cls the plugin
* @param key peer identity (unused)
* @param value the 'struct Session' to disconnect
- * @return GNUNET_YES (always, continue to iterate)
+ * @return #GNUNET_YES (always, continue to iterate)
*/
static int
-get_session_delete_it (void *cls, const struct GNUNET_HashCode * key, void *value)
+get_session_delete_it (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
+ struct Plugin *plugin = cls;
struct Session *s = value;
- disconnect_session (s);
+ unix_session_disconnect (plugin, s);
return GNUNET_YES;
}
*
* @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
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if the operation failed
*/
static void
-unix_disconnect (void *cls,
- const struct GNUNET_PeerIdentity *target)
+unix_peer_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,
+ GNUNET_CONTAINER_multipeermap_get_multiple (plugin->session_map,
+ target,
&get_session_delete_it, plugin);
}
libgnunet_plugin_transport_unix_init (void *cls)
{
struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
- unsigned long long port;
struct GNUNET_TRANSPORT_PluginFunctions *api;
struct Plugin *plugin;
int sockets_created;
{
/* 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 = GNUNET_new (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 = &unix_string_to_address;
return api;
}
+
+ plugin = GNUNET_new (struct Plugin);
if (GNUNET_OK !=
- 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;
+ GNUNET_CONFIGURATION_get_value_filename(env->cfg, "transport-unix", "UNIXPATH",
+ &plugin->unix_socket_path))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("No UNIXPATH given in configuration!\n"));
+ GNUNET_free (plugin);
+ return NULL;
+ }
+
plugin->env = env;
- GNUNET_asprintf (&plugin->unix_socket_path,
- "/tmp/unix-plugin-sock.%d",
- plugin->port);
- api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ /* Initialize my flags */
+#ifdef LINUX
+ plugin->abstract = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg,
+ "testing", "USE_ABSTRACT_SOCKETS");
+#endif
+ plugin->myoptions = UNIX_OPTIONS_NONE;
+ if (GNUNET_YES == plugin->abstract)
+ {
+ plugin->myoptions = UNIX_OPTIONS_USE_ABSTRACT_SOCKETS;
+ }
+
+ api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = plugin;
api->get_session = &unix_plugin_get_session;
api->send = &unix_plugin_send;
- api->disconnect = &unix_disconnect;
+ api->disconnect_peer = &unix_peer_disconnect;
+ api->disconnect_session = &unix_session_disconnect;
+ api->query_keepalive_factor = &unix_query_keepalive_factor;
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;
+ api->get_network = &unix_get_network;
+ api->update_session_timeout = &unix_plugin_update_session_timeout;
sockets_created = unix_transport_server_start (plugin);
- if (0 == sockets_created)
+ if ((0 == sockets_created) || (GNUNET_SYSERR == sockets_created))
+ {
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Failed to open UNIX listen socket\n"));
- plugin->session_map = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
+ GNUNET_free (api);
+ GNUNET_free (plugin->unix_socket_path);
+ GNUNET_free (plugin);
+ return NULL;
+ }
+ plugin->session_map = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
plugin->address_update_task = GNUNET_SCHEDULER_add_now (&address_notification, plugin);
return api;
}
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
+ struct GNUNET_HELLO_Address *address;
struct UNIXMessageWrapper * msgw;
+ struct UnixAddress *ua;
+ size_t len;
if (NULL == plugin)
{
GNUNET_free (api);
return NULL;
}
- plugin->env->notify_address (plugin->env->cls, GNUNET_NO,
- plugin->unix_socket_path,
- strlen (plugin->unix_socket_path) + 1,
- "unix");
+
+ len = sizeof (struct UnixAddress) + strlen (plugin->unix_socket_path) + 1;
+ ua = GNUNET_malloc (len);
+ ua->options = htonl (plugin->myoptions);
+ ua->addrlen = htonl(strlen (plugin->unix_socket_path) + 1);
+ memcpy (&ua[1], plugin->unix_socket_path, strlen (plugin->unix_socket_path) + 1);
+ address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
+ PLUGIN_NAME, ua, len, GNUNET_HELLO_ADDRESS_INFO_NONE);
+ plugin->env->notify_address (plugin->env->cls, GNUNET_NO, address);
+
+ GNUNET_free (address);
+ GNUNET_free (ua);
+
while (NULL != (msgw = plugin->msg_head))
{
GNUNET_CONTAINER_DLL_remove (plugin->msg_head, plugin->msg_tail, msgw);
plugin->unix_sock.desc = NULL;
plugin->with_ws = GNUNET_NO;
}
- GNUNET_CONTAINER_multihashmap_iterate (plugin->session_map,
+ GNUNET_CONTAINER_multipeermap_iterate (plugin->session_map,
&get_session_delete_it, plugin);
- GNUNET_CONTAINER_multihashmap_destroy (plugin->session_map);
+ GNUNET_CONTAINER_multipeermap_destroy (plugin->session_map);
if (NULL != plugin->rs)
GNUNET_NETWORK_fdset_destroy (plugin->rs);
if (NULL != plugin->ws)