diff options
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/client.c | 4 | ||||
-rw-r--r-- | src/util/connection.c | 4 | ||||
-rw-r--r-- | src/util/service.c | 2 | ||||
-rw-r--r-- | src/util/service_new.c | 2 | ||||
-rw-r--r-- | src/util/test_server_with_client_unix.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/util/client.c b/src/util/client.c index 06f6ebc32..a5e04d7b2 100644 --- a/src/util/client.c +++ b/src/util/client.c | |||
@@ -491,8 +491,8 @@ try_unixpath (const char *service_name, | |||
491 | s_un.sun_path[0] = '\0'; | 491 | s_un.sun_path[0] = '\0'; |
492 | } | 492 | } |
493 | #endif | 493 | #endif |
494 | #if HAVE_SOCKADDR_IN_SIN_LEN | 494 | #if HAVE_SOCKADDR_UN_SUN_LEN |
495 | un.sun_len = (u_char) sizeof (struct sockaddr_un); | 495 | s_un.sun_len = (u_char) sizeof (struct sockaddr_un); |
496 | #endif | 496 | #endif |
497 | sock = GNUNET_NETWORK_socket_create (AF_UNIX, | 497 | sock = GNUNET_NETWORK_socket_create (AF_UNIX, |
498 | SOCK_STREAM, | 498 | SOCK_STREAM, |
diff --git a/src/util/connection.c b/src/util/connection.c index 6d3070415..02dd9f991 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -902,7 +902,7 @@ GNUNET_CONNECTION_create_from_connect_to_unixpath (const struct GNUNET_CONFIGURA | |||
902 | un->sun_path[0] = '\0'; | 902 | un->sun_path[0] = '\0'; |
903 | } | 903 | } |
904 | #endif | 904 | #endif |
905 | #if HAVE_SOCKADDR_IN_SIN_LEN | 905 | #if HAVE_SOCKADDR_UN_SUN_LEN |
906 | un->sun_len = (u_char) sizeof (struct sockaddr_un); | 906 | un->sun_len = (u_char) sizeof (struct sockaddr_un); |
907 | #endif | 907 | #endif |
908 | connection = GNUNET_new (struct GNUNET_CONNECTION_Handle); | 908 | connection = GNUNET_new (struct GNUNET_CONNECTION_Handle); |
@@ -1012,7 +1012,7 @@ GNUNET_CONNECTION_create_from_sockaddr (int af_family, | |||
1012 | return NULL; | 1012 | return NULL; |
1013 | } | 1013 | } |
1014 | return GNUNET_CONNECTION_connect_socket (s, | 1014 | return GNUNET_CONNECTION_connect_socket (s, |
1015 | serv_addr, | 1015 | serv_addr, |
1016 | addrlen); | 1016 | addrlen); |
1017 | } | 1017 | } |
1018 | 1018 | ||
diff --git a/src/util/service.c b/src/util/service.c index 3beb4a085..11128425d 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -481,7 +481,7 @@ add_unixpath (struct sockaddr **saddrs, | |||
481 | if (GNUNET_YES == abstract) | 481 | if (GNUNET_YES == abstract) |
482 | un->sun_path[0] = '\0'; | 482 | un->sun_path[0] = '\0'; |
483 | #endif | 483 | #endif |
484 | #if HAVE_SOCKADDR_IN_SIN_LEN | 484 | #if HAVE_SOCKADDR_UN_SUN_LEN |
485 | un->sun_len = (u_char) sizeof (struct sockaddr_un); | 485 | un->sun_len = (u_char) sizeof (struct sockaddr_un); |
486 | #endif | 486 | #endif |
487 | *saddrs = (struct sockaddr *) un; | 487 | *saddrs = (struct sockaddr *) un; |
diff --git a/src/util/service_new.c b/src/util/service_new.c index 00d05dacc..90829c08c 100644 --- a/src/util/service_new.c +++ b/src/util/service_new.c | |||
@@ -519,7 +519,7 @@ add_unixpath (struct sockaddr **saddrs, | |||
519 | if (GNUNET_YES == abstract) | 519 | if (GNUNET_YES == abstract) |
520 | un->sun_path[0] = '\0'; | 520 | un->sun_path[0] = '\0'; |
521 | #endif | 521 | #endif |
522 | #if HAVE_SOCKADDR_IN_SIN_LEN | 522 | #if HAVE_SOCKADDR_UN_SUN_LEN |
523 | un->sun_len = (u_char) sizeof (struct sockaddr_un); | 523 | un->sun_len = (u_char) sizeof (struct sockaddr_un); |
524 | #endif | 524 | #endif |
525 | *saddrs = (struct sockaddr *) un; | 525 | *saddrs = (struct sockaddr *) un; |
diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c index d240f1a88..8fabbe210 100644 --- a/src/util/test_server_with_client_unix.c +++ b/src/util/test_server_with_client_unix.c | |||
@@ -123,7 +123,7 @@ task (void *cls) | |||
123 | memset (&un, 0, sizeof (un)); | 123 | memset (&un, 0, sizeof (un)); |
124 | un.sun_family = AF_UNIX; | 124 | un.sun_family = AF_UNIX; |
125 | strncpy(un.sun_path, unixpath, sizeof (un.sun_path) - 1); | 125 | strncpy(un.sun_path, unixpath, sizeof (un.sun_path) - 1); |
126 | #if HAVE_SOCKADDR_IN_SIN_LEN | 126 | #if HAVE_SOCKADDR_UN_SUN_LEN |
127 | un.sun_len = (u_char) sizeof (un); | 127 | un.sun_len = (u_char) sizeof (un); |
128 | #endif | 128 | #endif |
129 | 129 | ||