aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_connection_addressing.c
diff options
context:
space:
mode:
authorDavid Barksdale <amatus.amongus@gmail.com>2009-09-24 04:59:14 +0000
committerDavid Barksdale <amatus.amongus@gmail.com>2009-09-24 04:59:14 +0000
commit7cefd6d64dfd666654141492495326d11265044b (patch)
tree4c35d51304657efffe3bcfdd4f5b282c7ccee07b /src/util/test_connection_addressing.c
parent90a2b1d7181640cf9b5fd47875e508c733be636d (diff)
downloadgnunet-7cefd6d64dfd666654141492495326d11265044b.tar.gz
gnunet-7cefd6d64dfd666654141492495326d11265044b.zip
FreeBSD has sockaddr_in.sin_len, and sockaddr_in6.sin6_len.
Diffstat (limited to 'src/util/test_connection_addressing.c')
-rw-r--r--src/util/test_connection_addressing.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index 0d6462b17..ce44e6acf 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -57,6 +57,9 @@ open_listen_socket ()
57 struct GNUNET_NETWORK_Handle *desc; 57 struct GNUNET_NETWORK_Handle *desc;
58 58
59 memset (&sa, 0, sizeof (sa)); 59 memset (&sa, 0, sizeof (sa));
60#if HAVE_SOCKADDR_IN_SIN_LEN
61 sa.sin_len = sizeof (sa);
62#endif
60 sa.sin_port = htons (PORT); 63 sa.sin_port = htons (PORT);
61 desc = GNUNET_NETWORK_socket_socket (AF_INET, SOCK_STREAM, 0); 64 desc = GNUNET_NETWORK_socket_socket (AF_INET, SOCK_STREAM, 0);
62 GNUNET_assert (desc != 0); 65 GNUNET_assert (desc != 0);
@@ -115,6 +118,9 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
115 GNUNET_assert (alen == sizeof (struct sockaddr_in)); 118 GNUNET_assert (alen == sizeof (struct sockaddr_in));
116 v4 = addr; 119 v4 = addr;
117 memset (&expect, 0, sizeof (expect)); 120 memset (&expect, 0, sizeof (expect));
121#if HAVE_SOCKADDR_IN_SIN_LEN
122 expect.sin_len = sizeof (expect);
123#endif
118 expect.sin_family = AF_INET; 124 expect.sin_family = AF_INET;
119 expect.sin_port = v4->sin_port; 125 expect.sin_port = v4->sin_port;
120 expect.sin_addr.s_addr = htonl (INADDR_LOOPBACK); 126 expect.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
@@ -143,6 +149,9 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
143 lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); 149 lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0);
144 GNUNET_assert (lsock != NULL); 150 GNUNET_assert (lsock != NULL);
145 151
152#if HAVE_SOCKADDR_IN_SIN_LEN
153 v4.sin_len = sizeof (v4);
154#endif
146 v4.sin_family = AF_INET; 155 v4.sin_family = AF_INET;
147 v4.sin_port = htons (PORT); 156 v4.sin_port = htons (PORT);
148 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); 157 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK);