aboutsummaryrefslogtreecommitdiff
path: root/src/util/network.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/network.c')
-rw-r--r--src/util/network.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/util/network.c b/src/util/network.c
index 309c3a26d..a921998e9 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -118,7 +118,7 @@ GNUNET_NETWORK_shorten_unixpath (char *unixpath)
118 struct GNUNET_CRYPTO_HashAsciiEncoded ae; 118 struct GNUNET_CRYPTO_HashAsciiEncoded ae;
119 size_t upm; 119 size_t upm;
120 120
121 upm = sizeof (dummy.sun_path); 121 upm = sizeof (dummy.sun_path);
122 slen = strlen (unixpath); 122 slen = strlen (unixpath);
123 if (slen < upm) 123 if (slen < upm)
124 return unixpath; /* no shortening required */ 124 return unixpath; /* no shortening required */
@@ -243,7 +243,7 @@ socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle *h)
243 int abs_value = 1; 243 int abs_value = 1;
244 244
245 if (0 != 245 if (0 !=
246 setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, 246 setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
247 (const void *) &abs_value, 247 (const void *) &abs_value,
248 sizeof (abs_value))) 248 sizeof (abs_value)))
249 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt"); 249 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
@@ -270,7 +270,7 @@ socket_set_nodelay (const struct GNUNET_NETWORK_Handle *h)
270 const char *abs_value = "1"; 270 const char *abs_value = "1";
271 271
272 if (0 != 272 if (0 !=
273 setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, 273 setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY,
274 (const void *) abs_value, 274 (const void *) abs_value,
275 sizeof (abs_value))) 275 sizeof (abs_value)))
276 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt"); 276 LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
@@ -325,7 +325,7 @@ initialize_network_handle (struct GNUNET_NETWORK_Handle *h,
325#ifdef DARWIN 325#ifdef DARWIN
326 socket_set_nosigpipe (h); 326 socket_set_nosigpipe (h);
327#endif 327#endif
328 if ( (type == SOCK_STREAM) 328 if ( (type == SOCK_STREAM)
329#ifdef AF_UNIX 329#ifdef AF_UNIX
330 && (af != AF_UNIX) 330 && (af != AF_UNIX)
331#endif 331#endif
@@ -345,7 +345,7 @@ initialize_network_handle (struct GNUNET_NETWORK_Handle *h,
345 */ 345 */
346struct GNUNET_NETWORK_Handle * 346struct GNUNET_NETWORK_Handle *
347GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc, 347GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
348 struct sockaddr *address, 348 struct sockaddr *address,
349 socklen_t *address_len) 349 socklen_t *address_len)
350{ 350{
351 struct GNUNET_NETWORK_Handle *ret; 351 struct GNUNET_NETWORK_Handle *ret;
@@ -358,7 +358,7 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
358 int gsn = getsockname (desc->fd, &name, &namelen); 358 int gsn = getsockname (desc->fd, &name, &namelen);
359 359
360 if (gsn == 0) 360 if (gsn == 0)
361 LOG (GNUNET_ERROR_TYPE_DEBUG, 361 LOG (GNUNET_ERROR_TYPE_DEBUG,
362 "Accepting connection on `%s'\n", 362 "Accepting connection on `%s'\n",
363 GNUNET_a2s (&name, namelen)); 363 GNUNET_a2s (&name, namelen));
364 } 364 }
@@ -414,8 +414,8 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
414 const int on = 1; 414 const int on = 1;
415 415
416 if (desc->af == AF_INET6) 416 if (desc->af == AF_INET6)
417 if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY, 417 if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
418 (const void *) &on, 418 (const void *) &on,
419 sizeof (on))) 419 sizeof (on)))
420 LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt"); 420 LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
421 } 421 }
@@ -424,9 +424,9 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
424#ifndef WINDOWS 424#ifndef WINDOWS
425 { 425 {
426 const int on = 1; 426 const int on = 1;
427 427
428 /* This is required here for TCP sockets, but only on UNIX */ 428 /* This is required here for TCP sockets, but only on UNIX */
429 if ((SOCK_STREAM == desc->type) 429 if ((SOCK_STREAM == desc->type)
430 && (0 != setsockopt (desc->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)))) 430 && (0 != setsockopt (desc->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on))))
431 LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt"); 431 LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
432 } 432 }
@@ -1437,7 +1437,7 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
1437 tv.tv_usec = 1437 tv.tv_usec =
1438 (timeout.rel_value_us - 1438 (timeout.rel_value_us -
1439 (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us)); 1439 (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us));
1440 return select (nfds, 1440 return select (nfds,
1441 (NULL != rfds) ? &rfds->sds : NULL, 1441 (NULL != rfds) ? &rfds->sds : NULL,
1442 (NULL != wfds) ? &wfds->sds : NULL, 1442 (NULL != wfds) ? &wfds->sds : NULL,
1443 (NULL != efds) ? &efds->sds : NULL, 1443 (NULL != efds) ? &efds->sds : NULL,