[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15314 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15314 - gnunet/src/util |
Date: |
Wed, 25 May 2011 23:58:52 +0200 |
Author: grothoff
Date: 2011-05-25 23:58:52 +0200 (Wed, 25 May 2011)
New Revision: 15314
Modified:
gnunet/src/util/connection.c
gnunet/src/util/server.c
gnunet/src/util/service.c
gnunet/src/util/test_server_with_client_unix.c
Log:
fixthefix
Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c 2011-05-25 21:41:52 UTC (rev 15313)
+++ gnunet/src/util/connection.c 2011-05-25 21:58:52 UTC (rev 15314)
@@ -932,14 +932,14 @@
GNUNET_assert (0 < strlen (unixpath)); /* sanity check */
un = GNUNET_malloc (sizeof (struct sockaddr_un));
un->sun_family = AF_UNIX;
- slen = strlen (unixpath) + 1;
+ 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 = SUN_LEN (un);
+ slen = sizeof (struct sockaddr_un);
#if HAVE_SOCKADDR_IN_SIN_LEN
un->sun_len = (u_char) slen;
#endif
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2011-05-25 21:41:52 UTC (rev 15313)
+++ gnunet/src/util/server.c 2011-05-25 21:58:52 UTC (rev 15314)
@@ -327,7 +327,11 @@
case AF_INET6:
port = ntohs (((const struct sockaddr_in6 *) serverAddr)->sin6_port);
break;
+ case AF_UNIX:
+ port = 0;
+ break;
default:
+ GNUNET_break (0);
port = 0;
break;
}
Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c 2011-05-25 21:41:52 UTC (rev 15313)
+++ gnunet/src/util/service.c 2011-05-25 21:58:52 UTC (rev 15314)
@@ -766,7 +766,7 @@
unixpath,
slen);
un->sun_path[slen] = '\0';
- slen = SUN_LEN (un);
+ slen = sizeof (struct sockaddr_un);
#if LINUX
un->sun_path[0] = '\0';
#endif
Modified: gnunet/src/util/test_server_with_client_unix.c
===================================================================
--- gnunet/src/util/test_server_with_client_unix.c 2011-05-25 21:41:52 UTC
(rev 15313)
+++ gnunet/src/util/test_server_with_client_unix.c 2011-05-25 21:58:52 UTC
(rev 15314)
@@ -133,31 +133,28 @@
static void
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- char * unixpath = "/tmp/testsock";
- int slen = strlen (unixpath) + 1;
-
struct sockaddr_un un;
+ const char * unixpath = "/tmp/testsock";
+ size_t slen = strlen (unixpath);
+ struct sockaddr * sap[2];
+ socklen_t slens[2];
memset(&un, 0, sizeof(un));
un.sun_family = AF_UNIX;
memcpy (un.sun_path, unixpath, slen);
un.sun_path[slen] = '\0';
#if HAVE_SOCKADDR_IN_SIN_LEN
- un.sun_len = (u_char) SUN_LEN (&un);
+ un.sun_len = (u_char) sizeof (un);
#endif
#if LINUX
un.sun_path[0] = '\0';
#endif
- struct sockaddr * sap[2];
- socklen_t slens[2];
sap[0] = (struct sockaddr*) &un;
slens[0] = sizeof (un);
-
sap[1] = NULL;
slens[1] = 0;
-
server = GNUNET_SERVER_create (NULL,
NULL,
sap,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15314 - gnunet/src/util,
gnunet <=