aboutsummaryrefslogtreecommitdiff
path: root/src/util/connection.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-05-25 21:41:52 +0000
committerChristian Grothoff <christian@grothoff.org>2011-05-25 21:41:52 +0000
commit0d43d44a39a7cee4bc1a84ab5eb36ac8eb05e2a2 (patch)
tree7a274ea3d3591fe59d724ca691fdc976d0175066 /src/util/connection.c
parent79ae099456caba64b0599b7c6e2b2b86bcc6571f (diff)
downloadgnunet-0d43d44a39a7cee4bc1a84ab5eb36ac8eb05e2a2.tar.gz
gnunet-0d43d44a39a7cee4bc1a84ab5eb36ac8eb05e2a2.zip
set sxn_len on FreeBSD where required
Diffstat (limited to 'src/util/connection.c')
-rw-r--r--src/util/connection.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/util/connection.c b/src/util/connection.c
index ff41a33a8..09a28923e 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -376,6 +376,9 @@ GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access,
376 v4 = GNUNET_malloc (sizeof (struct sockaddr_in)); 376 v4 = GNUNET_malloc (sizeof (struct sockaddr_in));
377 memset (v4, 0, sizeof (struct sockaddr_in)); 377 memset (v4, 0, sizeof (struct sockaddr_in));
378 v4->sin_family = AF_INET; 378 v4->sin_family = AF_INET;
379#if HAVE_SOCKADDR_IN_SIN_LEN
380 v4->sin_len = (u_char) sizeof (struct sockaddr_in);
381#endif
379 memcpy (&v4->sin_addr, 382 memcpy (&v4->sin_addr,
380 &((char *) &v6->sin6_addr)[sizeof (struct in6_addr) - 383 &((char *) &v6->sin6_addr)[sizeof (struct in6_addr) -
381 sizeof (struct in_addr)], 384 sizeof (struct in_addr)],
@@ -936,10 +939,12 @@ GNUNET_CONNECTION_create_from_connect_to_unixpath (const struct
936 unixpath, 939 unixpath,
937 slen); 940 slen);
938 un->sun_path[slen] = '\0'; 941 un->sun_path[slen] = '\0';
939 slen += sizeof (sa_family_t); 942 slen = SUN_LEN (un);
943#if HAVE_SOCKADDR_IN_SIN_LEN
944 un->sun_len = (u_char) slen;
945#endif
940#if LINUX 946#if LINUX
941 un->sun_path[0] = '\0'; 947 un->sun_path[0] = '\0';
942 slen = sizeof (struct sockaddr_un);
943#endif 948#endif
944 ret = GNUNET_malloc (sizeof (struct GNUNET_CONNECTION_Handle)); 949 ret = GNUNET_malloc (sizeof (struct GNUNET_CONNECTION_Handle));
945 ret->cfg = cfg; 950 ret->cfg = cfg;