#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?
*/
};
GNUNET_NETWORK_STRUCT_END
-
-/**
- * Address options
- */
-static uint32_t myoptions;
-
/**
* Handle for a session.
*/
*/
struct UNIX_Sock_Info unix_sock;
+ /**
+ * Address options in HBO
+ */
+ uint32_t myoptions;
+
+
/**
* ATS network
*/
*/
int with_ws;
+ 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
struct UnixAddress *ua = (struct UnixAddress *) addr;
char *addrstr;
size_t addr_str_len;
+ unsigned int off;
if ((NULL == addr) || (sizeof (struct UnixAddress) > addrlen))
{
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);
+ ntohl (ua->options), addrstr);*/
return rbuf;
}
-static struct sockaddr_un *
-unix_address_to_sockaddr (const struct GNUNET_CONFIGURATION_Handle *cfg,
- 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';
-#ifdef LINUX
- {
- int abstract;
-
- abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "TESTING",
- "USE_ABSTRACT_SOCKETS");
- if (GNUNET_YES == abstract)
- un->sun_path[0] = '\0';
- }
-#endif
- slen = sizeof (struct sockaddr_un);
-#if HAVE_SOCKADDR_IN_SIN_LEN
- un->sun_len = (u_char) slen;
-#endif
- (*sock_len) = slen;
- return un;
-}
/**
"Disconnecting session for peer `%s' `%s'\n",
GNUNET_i2s (&s->target),
unix_address_to_string (NULL, s->address->address, s->address->address_length) );
- plugin->env->session_end (plugin->env->cls, &s->target, s);
+ plugin->env->session_end (plugin->env->cls, s->address, s);
removed = GNUNET_NO;
next = plugin->msg_head;
while (NULL != next)
/* Prepare address */
unixpath = (const char *) &addr[1];
- if (NULL == (un = unix_address_to_sockaddr (plugin->env->cfg,
- unixpath,
+ 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 = GNUNET_NETWORK_socket_sendto (send_handle, msgbuf, msgbuf_size,
struct UnixAddress *ua;
char * addrstr;
uint32_t addr_str_len;
+ uint32_t addr_option;
GNUNET_assert (NULL != plugin);
GNUNET_assert (NULL != address);
GNUNET_break (0);
return NULL;
}
- addrstr = (char *) &ua[1];
- addr_str_len = ntohl (ua->addrlen);
- if (addr_str_len != address->address_length - sizeof (struct UnixAddress))
+ 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))
{
- /* This can be a legacy address */
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);
s = GNUNET_new (struct Session);
s->target = address->peer;
s->address = GNUNET_HELLO_address_copy (address);
+ s->plugin = plugin;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
&session_timeout,
ssize_t ret;
int offset;
int tsize;
+ int is_abstract;
char *msgbuf;
const struct GNUNET_MessageHeader *currhdr;
uint16_t csize;
}
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);
- ua->options = htonl (0);
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);
struct sockaddr_un *un;
socklen_t un_len;
- un = unix_address_to_sockaddr (plugin->env->cfg,
- plugin->unix_socket_path,
+ 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);
return GNUNET_SYSERR;
}
if ('\0' != un->sun_path[0])
- GNUNET_DISK_directory_create_for_file (un->sun_path);
+ {
+ if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (un->sun_path))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR, _("Cannot create path to `%s'\n"),
+ un->sun_path);
+ GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
+ plugin->unix_sock.desc = NULL;
+ GNUNET_free (un);
+ return GNUNET_SYSERR;
+ }
+ }
if (GNUNET_OK !=
GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, (const struct sockaddr *) un, un_len))
{
{
if ((NULL != addr) && (addrlen > 0))
{
- asc (asc_cls, unix_address_to_string (NULL, addr, addrlen));
- }
- else if (0 == addrlen)
- {
- asc (asc_cls, TRANSPORT_SESSION_INBOUND_STRING);
+ asc (asc_cls, unix_address_to_string (NULL, addr, addrlen), GNUNET_OK);
}
else
- {
- GNUNET_break (0);
- asc (asc_cls, "<invalid UNIX address>");
- }
- asc (asc_cls, NULL);
+ asc (asc_cls, NULL, GNUNET_SYSERR);
+ asc (asc_cls, NULL, GNUNET_OK);
}
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 (myoptions);
+ 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);
+ 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;
address = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
plugin->env = env;
/* Initialize my flags */
- myoptions = 0;
+#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_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"));
+ 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;
len = sizeof (struct UnixAddress) + strlen (plugin->unix_socket_path) + 1;
ua = GNUNET_malloc (len);
- ua->options = htonl (myoptions);
+ 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,
projects / oweals / gnunet.git / blobdiff