* @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"
/**
* Sessions
*/
- struct GNUNET_CONTAINER_MultiHashMap *session_map;
+ struct GNUNET_CONTAINER_MultiPeerMap *session_map;
/**
* FD Read set
static const char *
unix_address_to_string (void *cls, const void *addr, size_t addrlen);
+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
+#if LINUX
+ un->sun_path[0] = '\0';
+#endif
+
+ (*sock_len) = slen;
+ return un;
+}
+
/**
* Re-schedule the main 'select' callback (unix_plugin_select)
* for this plugin.
*/
static int
lookup_session_it (void *cls,
- const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity * key,
void *value)
{
struct LookupCtx *lctx = cls;
lctx.s = NULL;
lctx.ua = ua;
lctx.ua_len = ua_len;
- GNUNET_CONTAINER_multihashmap_get_multiple (plugin->session_map,
- &sender->hashPubKey,
+ GNUNET_CONTAINER_multipeermap_get_multiple (plugin->session_map,
+ sender,
&lookup_session_it, &lctx);
return lctx.s;
}
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);
{
struct Plugin *plugin = cls;
ssize_t sent;
- const void *sb;
- size_t sbs;
- struct sockaddr_un un;
- const char *unix_path;
+ struct sockaddr_un *un;
+ socklen_t un_len;
+ const char *unixpath;
GNUNET_assert (NULL != plugin);
}
/* Prepare address */
- unix_path = (const char *) &addr[1];
- memset (&un, 0, sizeof (un));
- un.sun_family = AF_UNIX;
- strncpy (un.sun_path, unix_path, sizeof (un.sun_path) - 1);
-#if HAVE_SOCKADDR_IN_SIN_LEN
- un.sun_len = (u_char) sizeof (struct sockaddr_un);
-#endif
- sb = (struct sockaddr *) &un;
- sbs = sizeof (struct sockaddr_un);
+ unixpath = (const char *) &addr[1];
+ if (NULL == (un = unix_address_to_sockaddr (unixpath, &un_len)))
+ {
+ GNUNET_break (0);
+ return -1;
+ }
resend:
/* Send the data */
- 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),
+ GNUNET_a2s ((const struct sockaddr *)un, un_len),
(int) sent,
(sent < 0) ? STRERROR (errno) : "ok");
+ GNUNET_free (un);
return sent;
}
*/
static int
get_session_it (void *cls,
- const struct GNUNET_HashCode *key,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct GetSessionIteratorContext *gsi = cls;
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,
+ GNUNET_CONTAINER_multipeermap_get_multiple (plugin->session_map,
+ &address->peer,
&get_session_it, &gsi);
if (NULL != gsi.res)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Creating a new session %p for address `%s'\n",
s, unix_address_to_string (NULL, address->address, address->address_length));
- (void) GNUNET_CONTAINER_multihashmap_put (plugin->session_map,
- &address->peer.hashPubKey, s,
+ (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;
}
GNUNET_assert (NULL != session);
if (GNUNET_OK !=
- GNUNET_CONTAINER_multihashmap_contains_value (plugin->session_map,
- &session->target.hashPubKey,
+ GNUNET_CONTAINER_multipeermap_contains_value (plugin->session_map,
+ &session->target,
session))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Read %d bytes from socket %s\n",
- (int) ret,
- un.sun_path);
+#if LINUX
+ un.sun_path[0] = '/';
+#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %d bytes from socket %s\n", ret,
+ &un.sun_path[0]);
}
GNUNET_assert (AF_UNIX == (un.sun_family));
- ua_len = sizeof (struct UnixAddress) + strlen (un.sun_path) + 1;
+ ua_len = sizeof (struct UnixAddress) + strlen (&un.sun_path[0]) +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);
+ memcpy (&ua[1], &un.sun_path[0], strlen (&un.sun_path[0]) +1);
msg = (struct UNIXMessage *) buf;
csize = ntohs (msg->header.size);
* 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;
+ struct sockaddr_un *un;
+ socklen_t un_len;
- memset (&un, 0, sizeof (un));
- un.sun_family = AF_UNIX;
- strncpy (un.sun_path, plugin->unix_socket_path, sizeof (un.sun_path) - 1);
-#if HAVE_SOCKADDR_IN_SIN_LEN
- un.sun_len = (u_char) sizeof (struct sockaddr_un);
-#endif
-
- serverAddr = (struct sockaddr *) &un;
- addrlen = sizeof (struct sockaddr_un);
- plugin->ats_network = plugin->env->get_address_type (plugin->env->cls, serverAddr, addrlen);
+ un = unix_address_to_sockaddr (plugin->unix_socket_path, &un_len);
+ 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_OK !=
- GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen))
+ if (GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, (const struct sockaddr *) un, un_len, 0)
+ != GNUNET_OK)
{
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;
}
* @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 Session *s = value;
*
* @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,
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);
}
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->session_map = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
plugin->address_update_task = GNUNET_SCHEDULER_add_now (&address_notification, plugin);
return api;
}
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)
projects / oweals / gnunet.git / blobdiff