diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-09 19:22:59 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-09 19:22:59 +0000 |
commit | 7e332f5e005af87032decb86ac0a4bfbcc915cdc (patch) | |
tree | b2fceb05e28b44bc8318950192853417294488e8 | |
parent | 25e37143ca6ddc3ea7d3c2e3fd7c66002a45e060 (diff) | |
download | gnunet-7e332f5e005af87032decb86ac0a4bfbcc915cdc.tar.gz gnunet-7e332f5e005af87032decb86ac0a4bfbcc915cdc.zip |
-rename serverAddr to server_addr to follow naming conventions
-rw-r--r-- | src/include/gnunet_server_lib.h | 6 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 80 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.h | 2 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp_broadcasting.c | 4 | ||||
-rw-r--r-- | src/util/server.c | 36 |
5 files changed, 64 insertions, 64 deletions
diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h index d1097450f..6c1af35bb 100644 --- a/src/include/gnunet_server_lib.h +++ b/src/include/gnunet_server_lib.h | |||
@@ -140,8 +140,8 @@ GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access, | |||
140 | * | 140 | * |
141 | * @param access function for access control | 141 | * @param access function for access control |
142 | * @param access_cls closure for @a access | 142 | * @param access_cls closure for @a access |
143 | * @param serverAddr address toes listen on (including port), NULL terminated array | 143 | * @param server_addr address toes listen on (including port), NULL terminated array |
144 | * @param socklen lengths of respective @a serverAddr | 144 | * @param socklen lengths of respective @a server_addr |
145 | * @param idle_timeout after how long should we timeout idle connections? | 145 | * @param idle_timeout after how long should we timeout idle connections? |
146 | * @param require_found if #GNUNET_YES, connections sending messages of unknown type | 146 | * @param require_found if #GNUNET_YES, connections sending messages of unknown type |
147 | * will be closed | 147 | * will be closed |
@@ -150,7 +150,7 @@ GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access, | |||
150 | */ | 150 | */ |
151 | struct GNUNET_SERVER_Handle * | 151 | struct GNUNET_SERVER_Handle * |
152 | GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls, | 152 | GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls, |
153 | struct sockaddr *const *serverAddr, | 153 | struct sockaddr *const *server_addr, |
154 | const socklen_t * socklen, | 154 | const socklen_t * socklen, |
155 | struct GNUNET_TIME_Relative idle_timeout, | 155 | struct GNUNET_TIME_Relative idle_timeout, |
156 | int require_found); | 156 | int require_found); |
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 317454e83..f5086b070 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -2753,9 +2753,9 @@ setup_sockets (struct Plugin *plugin, | |||
2753 | { | 2753 | { |
2754 | int tries; | 2754 | int tries; |
2755 | int sockets_created = 0; | 2755 | int sockets_created = 0; |
2756 | struct sockaddr_in6 serverAddrv6; | 2756 | struct sockaddr_in6 server_addrv6; |
2757 | struct sockaddr_in serverAddrv4; | 2757 | struct sockaddr_in server_addrv4; |
2758 | struct sockaddr *serverAddr; | 2758 | struct sockaddr *server_addr; |
2759 | struct sockaddr *addrs[2]; | 2759 | struct sockaddr *addrs[2]; |
2760 | socklen_t addrlens[2]; | 2760 | socklen_t addrlens[2]; |
2761 | socklen_t addrlen; | 2761 | socklen_t addrlen; |
@@ -2774,31 +2774,31 @@ setup_sockets (struct Plugin *plugin, | |||
2774 | } | 2774 | } |
2775 | else | 2775 | else |
2776 | { | 2776 | { |
2777 | memset (&serverAddrv6, '\0', sizeof (struct sockaddr_in6)); | 2777 | memset (&server_addrv6, '\0', sizeof (struct sockaddr_in6)); |
2778 | #if HAVE_SOCKADDR_IN_SIN_LEN | 2778 | #if HAVE_SOCKADDR_IN_SIN_LEN |
2779 | serverAddrv6.sin6_len = sizeof (struct sockaddr_in6); | 2779 | server_addrv6.sin6_len = sizeof (struct sockaddr_in6); |
2780 | #endif | 2780 | #endif |
2781 | serverAddrv6.sin6_family = AF_INET6; | 2781 | server_addrv6.sin6_family = AF_INET6; |
2782 | if (NULL != bind_v6) | 2782 | if (NULL != bind_v6) |
2783 | serverAddrv6.sin6_addr = bind_v6->sin6_addr; | 2783 | server_addrv6.sin6_addr = bind_v6->sin6_addr; |
2784 | else | 2784 | else |
2785 | serverAddrv6.sin6_addr = in6addr_any; | 2785 | server_addrv6.sin6_addr = in6addr_any; |
2786 | 2786 | ||
2787 | if (0 == plugin->port) /* autodetect */ | 2787 | if (0 == plugin->port) /* autodetect */ |
2788 | serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); | 2788 | server_addrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); |
2789 | else | 2789 | else |
2790 | serverAddrv6.sin6_port = htons (plugin->port); | 2790 | server_addrv6.sin6_port = htons (plugin->port); |
2791 | addrlen = sizeof (struct sockaddr_in6); | 2791 | addrlen = sizeof (struct sockaddr_in6); |
2792 | serverAddr = (struct sockaddr *) &serverAddrv6; | 2792 | server_addr = (struct sockaddr *) &server_addrv6; |
2793 | 2793 | ||
2794 | tries = 0; | 2794 | tries = 0; |
2795 | while (tries < 10) | 2795 | while (tries < 10) |
2796 | { | 2796 | { |
2797 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 `%s'\n", | 2797 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 `%s'\n", |
2798 | GNUNET_a2s (serverAddr, addrlen)); | 2798 | GNUNET_a2s (server_addr, addrlen)); |
2799 | /* binding */ | 2799 | /* binding */ |
2800 | if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6, | 2800 | if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6, |
2801 | serverAddr, addrlen)) | 2801 | server_addr, addrlen)) |
2802 | break; | 2802 | break; |
2803 | eno = errno; | 2803 | eno = errno; |
2804 | if (0 != plugin->port) | 2804 | if (0 != plugin->port) |
@@ -2807,7 +2807,7 @@ setup_sockets (struct Plugin *plugin, | |||
2807 | break; /* bind failed on specific port */ | 2807 | break; /* bind failed on specific port */ |
2808 | } | 2808 | } |
2809 | /* autodetect */ | 2809 | /* autodetect */ |
2810 | serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); | 2810 | server_addrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); |
2811 | tries ++; | 2811 | tries ++; |
2812 | } | 2812 | } |
2813 | if (tries >= 10) | 2813 | if (tries >= 10) |
@@ -2821,8 +2821,8 @@ setup_sockets (struct Plugin *plugin, | |||
2821 | { | 2821 | { |
2822 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2822 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2823 | "IPv6 socket created on port %s\n", | 2823 | "IPv6 socket created on port %s\n", |
2824 | GNUNET_a2s (serverAddr, addrlen)); | 2824 | GNUNET_a2s (server_addr, addrlen)); |
2825 | addrs[sockets_created] = (struct sockaddr *) &serverAddrv6; | 2825 | addrs[sockets_created] = (struct sockaddr *) &server_addrv6; |
2826 | addrlens[sockets_created] = sizeof (struct sockaddr_in6); | 2826 | addrlens[sockets_created] = sizeof (struct sockaddr_in6); |
2827 | sockets_created++; | 2827 | sockets_created++; |
2828 | } | 2828 | } |
@@ -2830,7 +2830,7 @@ setup_sockets (struct Plugin *plugin, | |||
2830 | { | 2830 | { |
2831 | LOG (GNUNET_ERROR_TYPE_ERROR, | 2831 | LOG (GNUNET_ERROR_TYPE_ERROR, |
2832 | "Failed to bind UDP socket to %s: %s\n", | 2832 | "Failed to bind UDP socket to %s: %s\n", |
2833 | GNUNET_a2s (serverAddr, addrlen), | 2833 | GNUNET_a2s (server_addr, addrlen), |
2834 | STRERROR (eno)); | 2834 | STRERROR (eno)); |
2835 | } | 2835 | } |
2836 | } | 2836 | } |
@@ -2847,35 +2847,35 @@ setup_sockets (struct Plugin *plugin, | |||
2847 | } | 2847 | } |
2848 | else | 2848 | else |
2849 | { | 2849 | { |
2850 | memset (&serverAddrv4, '\0', sizeof (struct sockaddr_in)); | 2850 | memset (&server_addrv4, '\0', sizeof (struct sockaddr_in)); |
2851 | #if HAVE_SOCKADDR_IN_SIN_LEN | 2851 | #if HAVE_SOCKADDR_IN_SIN_LEN |
2852 | serverAddrv4.sin_len = sizeof (struct sockaddr_in); | 2852 | server_addrv4.sin_len = sizeof (struct sockaddr_in); |
2853 | #endif | 2853 | #endif |
2854 | serverAddrv4.sin_family = AF_INET; | 2854 | server_addrv4.sin_family = AF_INET; |
2855 | if (NULL != bind_v4) | 2855 | if (NULL != bind_v4) |
2856 | serverAddrv4.sin_addr = bind_v4->sin_addr; | 2856 | server_addrv4.sin_addr = bind_v4->sin_addr; |
2857 | else | 2857 | else |
2858 | serverAddrv4.sin_addr.s_addr = INADDR_ANY; | 2858 | server_addrv4.sin_addr.s_addr = INADDR_ANY; |
2859 | 2859 | ||
2860 | if (0 == plugin->port) | 2860 | if (0 == plugin->port) |
2861 | /* autodetect */ | 2861 | /* autodetect */ |
2862 | serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); | 2862 | server_addrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); |
2863 | else | 2863 | else |
2864 | serverAddrv4.sin_port = htons (plugin->port); | 2864 | server_addrv4.sin_port = htons (plugin->port); |
2865 | 2865 | ||
2866 | 2866 | ||
2867 | addrlen = sizeof (struct sockaddr_in); | 2867 | addrlen = sizeof (struct sockaddr_in); |
2868 | serverAddr = (struct sockaddr *) &serverAddrv4; | 2868 | server_addr = (struct sockaddr *) &server_addrv4; |
2869 | 2869 | ||
2870 | tries = 0; | 2870 | tries = 0; |
2871 | while (tries < 10) | 2871 | while (tries < 10) |
2872 | { | 2872 | { |
2873 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv4 `%s'\n", | 2873 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv4 `%s'\n", |
2874 | GNUNET_a2s (serverAddr, addrlen)); | 2874 | GNUNET_a2s (server_addr, addrlen)); |
2875 | 2875 | ||
2876 | /* binding */ | 2876 | /* binding */ |
2877 | if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4, | 2877 | if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4, |
2878 | serverAddr, addrlen)) | 2878 | server_addr, addrlen)) |
2879 | break; | 2879 | break; |
2880 | eno = errno; | 2880 | eno = errno; |
2881 | if (0 != plugin->port) | 2881 | if (0 != plugin->port) |
@@ -2885,7 +2885,7 @@ setup_sockets (struct Plugin *plugin, | |||
2885 | } | 2885 | } |
2886 | 2886 | ||
2887 | /* autodetect */ | 2887 | /* autodetect */ |
2888 | serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); | 2888 | server_addrv4.sin_port = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); |
2889 | tries ++; | 2889 | tries ++; |
2890 | } | 2890 | } |
2891 | 2891 | ||
@@ -2899,8 +2899,8 @@ setup_sockets (struct Plugin *plugin, | |||
2899 | if (plugin->sockv4 != NULL) | 2899 | if (plugin->sockv4 != NULL) |
2900 | { | 2900 | { |
2901 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2901 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2902 | "IPv4 socket created on port %s\n", GNUNET_a2s (serverAddr, addrlen)); | 2902 | "IPv4 socket created on port %s\n", GNUNET_a2s (server_addr, addrlen)); |
2903 | addrs[sockets_created] = (struct sockaddr *) &serverAddrv4; | 2903 | addrs[sockets_created] = (struct sockaddr *) &server_addrv4; |
2904 | addrlens[sockets_created] = sizeof (struct sockaddr_in); | 2904 | addrlens[sockets_created] = sizeof (struct sockaddr_in); |
2905 | sockets_created++; | 2905 | sockets_created++; |
2906 | } | 2906 | } |
@@ -2908,7 +2908,7 @@ setup_sockets (struct Plugin *plugin, | |||
2908 | { | 2908 | { |
2909 | LOG (GNUNET_ERROR_TYPE_ERROR, | 2909 | LOG (GNUNET_ERROR_TYPE_ERROR, |
2910 | "Failed to bind UDP socket to %s: %s\n", | 2910 | "Failed to bind UDP socket to %s: %s\n", |
2911 | GNUNET_a2s (serverAddr, addrlen), STRERROR (eno)); | 2911 | GNUNET_a2s (server_addr, addrlen), STRERROR (eno)); |
2912 | } | 2912 | } |
2913 | } | 2913 | } |
2914 | 2914 | ||
@@ -2978,8 +2978,8 @@ libgnunet_plugin_transport_udp_init (void *cls) | |||
2978 | char * bind6_address; | 2978 | char * bind6_address; |
2979 | char * fancy_interval; | 2979 | char * fancy_interval; |
2980 | struct GNUNET_TIME_Relative interval; | 2980 | struct GNUNET_TIME_Relative interval; |
2981 | struct sockaddr_in serverAddrv4; | 2981 | struct sockaddr_in server_addrv4; |
2982 | struct sockaddr_in6 serverAddrv6; | 2982 | struct sockaddr_in6 server_addrv6; |
2983 | int res; | 2983 | int res; |
2984 | int have_bind4; | 2984 | int have_bind4; |
2985 | int have_bind6; | 2985 | int have_bind6; |
@@ -3027,7 +3027,7 @@ libgnunet_plugin_transport_udp_init (void *cls) | |||
3027 | 3027 | ||
3028 | /* Addresses */ | 3028 | /* Addresses */ |
3029 | have_bind4 = GNUNET_NO; | 3029 | have_bind4 = GNUNET_NO; |
3030 | memset (&serverAddrv4, 0, sizeof (serverAddrv4)); | 3030 | memset (&server_addrv4, 0, sizeof (server_addrv4)); |
3031 | if (GNUNET_YES == | 3031 | if (GNUNET_YES == |
3032 | GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp", | 3032 | GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp", |
3033 | "BINDTO", &bind4_address)) | 3033 | "BINDTO", &bind4_address)) |
@@ -3035,7 +3035,7 @@ libgnunet_plugin_transport_udp_init (void *cls) | |||
3035 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 3035 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
3036 | "Binding udp plugin to specific address: `%s'\n", | 3036 | "Binding udp plugin to specific address: `%s'\n", |
3037 | bind4_address); | 3037 | bind4_address); |
3038 | if (1 != inet_pton (AF_INET, bind4_address, &serverAddrv4.sin_addr)) | 3038 | if (1 != inet_pton (AF_INET, bind4_address, &server_addrv4.sin_addr)) |
3039 | { | 3039 | { |
3040 | GNUNET_free (bind4_address); | 3040 | GNUNET_free (bind4_address); |
3041 | return NULL; | 3041 | return NULL; |
@@ -3044,7 +3044,7 @@ libgnunet_plugin_transport_udp_init (void *cls) | |||
3044 | } | 3044 | } |
3045 | GNUNET_free_non_null (bind4_address); | 3045 | GNUNET_free_non_null (bind4_address); |
3046 | have_bind6 = GNUNET_NO; | 3046 | have_bind6 = GNUNET_NO; |
3047 | memset (&serverAddrv6, 0, sizeof (serverAddrv6)); | 3047 | memset (&server_addrv6, 0, sizeof (server_addrv6)); |
3048 | if (GNUNET_YES == | 3048 | if (GNUNET_YES == |
3049 | GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp", | 3049 | GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp", |
3050 | "BINDTO6", &bind6_address)) | 3050 | "BINDTO6", &bind6_address)) |
@@ -3053,7 +3053,7 @@ libgnunet_plugin_transport_udp_init (void *cls) | |||
3053 | "Binding udp plugin to specific address: `%s'\n", | 3053 | "Binding udp plugin to specific address: `%s'\n", |
3054 | bind6_address); | 3054 | bind6_address); |
3055 | if (1 != | 3055 | if (1 != |
3056 | inet_pton (AF_INET6, bind6_address, &serverAddrv6.sin6_addr)) | 3056 | inet_pton (AF_INET6, bind6_address, &server_addrv6.sin6_addr)) |
3057 | { | 3057 | { |
3058 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid IPv6 address: `%s'\n"), | 3058 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid IPv6 address: `%s'\n"), |
3059 | bind6_address); | 3059 | bind6_address); |
@@ -3109,8 +3109,8 @@ libgnunet_plugin_transport_udp_init (void *cls) | |||
3109 | plugin = p; | 3109 | plugin = p; |
3110 | 3110 | ||
3111 | LOG(GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n"); | 3111 | LOG(GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n"); |
3112 | res = setup_sockets (p, (GNUNET_YES == have_bind6) ? &serverAddrv6 : NULL, | 3112 | res = setup_sockets (p, (GNUNET_YES == have_bind6) ? &server_addrv6 : NULL, |
3113 | (GNUNET_YES == have_bind4) ? &serverAddrv4 : NULL ); | 3113 | (GNUNET_YES == have_bind4) ? &server_addrv4 : NULL ); |
3114 | if ((res == 0) || ((p->sockv4 == NULL )&& (p->sockv6 == NULL))) | 3114 | if ((res == 0) || ((p->sockv4 == NULL )&& (p->sockv6 == NULL))) |
3115 | { | 3115 | { |
3116 | LOG (GNUNET_ERROR_TYPE_ERROR, | 3116 | LOG (GNUNET_ERROR_TYPE_ERROR, |
@@ -3124,7 +3124,7 @@ libgnunet_plugin_transport_udp_init (void *cls) | |||
3124 | else if (broadcast == GNUNET_YES) | 3124 | else if (broadcast == GNUNET_YES) |
3125 | { | 3125 | { |
3126 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting broadcasting\n"); | 3126 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting broadcasting\n"); |
3127 | setup_broadcast (p, &serverAddrv6, &serverAddrv4); | 3127 | setup_broadcast (p, &server_addrv6, &server_addrv4); |
3128 | } | 3128 | } |
3129 | 3129 | ||
3130 | api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions)); | 3130 | api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions)); |
diff --git a/src/transport/plugin_transport_udp.h b/src/transport/plugin_transport_udp.h index 6fb573690..46cea2d5b 100644 --- a/src/transport/plugin_transport_udp.h +++ b/src/transport/plugin_transport_udp.h | |||
@@ -299,7 +299,7 @@ void | |||
299 | udp_broadcast_receive (); | 299 | udp_broadcast_receive (); |
300 | 300 | ||
301 | void | 301 | void |
302 | setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struct sockaddr_in *serverAddrv4); | 302 | setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *server_addrv6, struct sockaddr_in *server_addrv4); |
303 | 303 | ||
304 | void | 304 | void |
305 | stop_broadcast (struct Plugin *plugin); | 305 | stop_broadcast (struct Plugin *plugin); |
diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c index 1f26706d4..25c942de2 100644 --- a/src/transport/plugin_transport_udp_broadcasting.c +++ b/src/transport/plugin_transport_udp_broadcasting.c | |||
@@ -391,7 +391,7 @@ iface_proc (void *cls, const char *name, int isDefault, | |||
391 | 391 | ||
392 | 392 | ||
393 | void | 393 | void |
394 | setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struct sockaddr_in *serverAddrv4) | 394 | setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *server_addrv6, struct sockaddr_in *server_addrv4) |
395 | { | 395 | { |
396 | const struct GNUNET_MessageHeader *hello; | 396 | const struct GNUNET_MessageHeader *hello; |
397 | hello = plugin->env->get_our_hello (); | 397 | hello = plugin->env->get_our_hello (); |
@@ -417,7 +417,7 @@ setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6, struc | |||
417 | LOG (GNUNET_ERROR_TYPE_WARNING, | 417 | LOG (GNUNET_ERROR_TYPE_WARNING, |
418 | _ | 418 | _ |
419 | ("Failed to set IPv4 broadcast option for broadcast socket on port %d\n"), | 419 | ("Failed to set IPv4 broadcast option for broadcast socket on port %d\n"), |
420 | ntohs (serverAddrv4->sin_port)); | 420 | ntohs (server_addrv4->sin_port)); |
421 | } | 421 | } |
422 | else | 422 | else |
423 | { | 423 | { |
diff --git a/src/util/server.c b/src/util/server.c index 397e32f8c..40e7c9f48 100644 --- a/src/util/server.c +++ b/src/util/server.c | |||
@@ -433,24 +433,24 @@ process_listen_socket (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
433 | /** | 433 | /** |
434 | * Create and initialize a listen socket for the server. | 434 | * Create and initialize a listen socket for the server. |
435 | * | 435 | * |
436 | * @param serverAddr address to listen on | 436 | * @param server_addr address to listen on |
437 | * @param socklen length of address | 437 | * @param socklen length of address |
438 | * @return NULL on error, otherwise the listen socket | 438 | * @return NULL on error, otherwise the listen socket |
439 | */ | 439 | */ |
440 | static struct GNUNET_NETWORK_Handle * | 440 | static struct GNUNET_NETWORK_Handle * |
441 | open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) | 441 | open_listen_socket (const struct sockaddr *server_addr, socklen_t socklen) |
442 | { | 442 | { |
443 | struct GNUNET_NETWORK_Handle *sock; | 443 | struct GNUNET_NETWORK_Handle *sock; |
444 | uint16_t port; | 444 | uint16_t port; |
445 | int eno; | 445 | int eno; |
446 | 446 | ||
447 | switch (serverAddr->sa_family) | 447 | switch (server_addr->sa_family) |
448 | { | 448 | { |
449 | case AF_INET: | 449 | case AF_INET: |
450 | port = ntohs (((const struct sockaddr_in *) serverAddr)->sin_port); | 450 | port = ntohs (((const struct sockaddr_in *) server_addr)->sin_port); |
451 | break; | 451 | break; |
452 | case AF_INET6: | 452 | case AF_INET6: |
453 | port = ntohs (((const struct sockaddr_in6 *) serverAddr)->sin6_port); | 453 | port = ntohs (((const struct sockaddr_in6 *) server_addr)->sin6_port); |
454 | break; | 454 | break; |
455 | case AF_UNIX: | 455 | case AF_UNIX: |
456 | port = 0; | 456 | port = 0; |
@@ -460,7 +460,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) | |||
460 | port = 0; | 460 | port = 0; |
461 | break; | 461 | break; |
462 | } | 462 | } |
463 | sock = GNUNET_NETWORK_socket_create (serverAddr->sa_family, SOCK_STREAM, 0); | 463 | sock = GNUNET_NETWORK_socket_create (server_addr->sa_family, SOCK_STREAM, 0); |
464 | if (NULL == sock) | 464 | if (NULL == sock) |
465 | { | 465 | { |
466 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket"); | 466 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket"); |
@@ -468,7 +468,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) | |||
468 | return NULL; | 468 | return NULL; |
469 | } | 469 | } |
470 | /* bind the socket */ | 470 | /* bind the socket */ |
471 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen)) | 471 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, server_addr, socklen)) |
472 | { | 472 | { |
473 | eno = errno; | 473 | eno = errno; |
474 | if (EADDRINUSE != errno) | 474 | if (EADDRINUSE != errno) |
@@ -481,7 +481,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) | |||
481 | if (0 != port) | 481 | if (0 != port) |
482 | LOG (GNUNET_ERROR_TYPE_ERROR, _("`%s' failed for port %d (%s).\n"), | 482 | LOG (GNUNET_ERROR_TYPE_ERROR, _("`%s' failed for port %d (%s).\n"), |
483 | "bind", port, | 483 | "bind", port, |
484 | (AF_INET == serverAddr->sa_family) ? "IPv4" : "IPv6"); | 484 | (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6"); |
485 | eno = 0; | 485 | eno = 0; |
486 | } | 486 | } |
487 | else | 487 | else |
@@ -490,10 +490,10 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) | |||
490 | LOG (GNUNET_ERROR_TYPE_WARNING, | 490 | LOG (GNUNET_ERROR_TYPE_WARNING, |
491 | _("`%s' failed for port %d (%s): address already in use\n"), | 491 | _("`%s' failed for port %d (%s): address already in use\n"), |
492 | "bind", port, | 492 | "bind", port, |
493 | (AF_INET == serverAddr->sa_family) ? "IPv4" : "IPv6"); | 493 | (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6"); |
494 | else if (AF_UNIX == serverAddr->sa_family) | 494 | else if (AF_UNIX == server_addr->sa_family) |
495 | { | 495 | { |
496 | const struct sockaddr_un *un = (const struct sockaddr_un *) serverAddr; | 496 | const struct sockaddr_un *un = (const struct sockaddr_un *) server_addr; |
497 | unsigned int off = 0; | 497 | unsigned int off = 0; |
498 | 498 | ||
499 | if ('\0' == un->sun_path[0]) | 499 | if ('\0' == un->sun_path[0]) |
@@ -560,8 +560,8 @@ GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access, | |||
560 | * | 560 | * |
561 | * @param access function for access control | 561 | * @param access function for access control |
562 | * @param access_cls closure for access | 562 | * @param access_cls closure for access |
563 | * @param serverAddr address to listen on (including port), NULL terminated array | 563 | * @param server_addr address to listen on (including port), NULL terminated array |
564 | * @param socklen length of serverAddr | 564 | * @param socklen length of server_addr |
565 | * @param idle_timeout after how long should we timeout idle connections? | 565 | * @param idle_timeout after how long should we timeout idle connections? |
566 | * @param require_found if YES, connections sending messages of unknown type | 566 | * @param require_found if YES, connections sending messages of unknown type |
567 | * will be closed | 567 | * will be closed |
@@ -570,7 +570,7 @@ GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access, | |||
570 | */ | 570 | */ |
571 | struct GNUNET_SERVER_Handle * | 571 | struct GNUNET_SERVER_Handle * |
572 | GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls, | 572 | GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls, |
573 | struct sockaddr *const *serverAddr, | 573 | struct sockaddr *const *server_addr, |
574 | const socklen_t * socklen, | 574 | const socklen_t * socklen, |
575 | struct GNUNET_TIME_Relative idle_timeout, | 575 | struct GNUNET_TIME_Relative idle_timeout, |
576 | int require_found) | 576 | int require_found) |
@@ -582,19 +582,19 @@ GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls, | |||
582 | int seen; | 582 | int seen; |
583 | 583 | ||
584 | i = 0; | 584 | i = 0; |
585 | while (NULL != serverAddr[i]) | 585 | while (NULL != server_addr[i]) |
586 | i++; | 586 | i++; |
587 | if (i > 0) | 587 | if (i > 0) |
588 | { | 588 | { |
589 | lsocks = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle *) * (i + 1)); | 589 | lsocks = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle *) * (i + 1)); |
590 | i = 0; | 590 | i = 0; |
591 | j = 0; | 591 | j = 0; |
592 | while (NULL != serverAddr[i]) | 592 | while (NULL != server_addr[i]) |
593 | { | 593 | { |
594 | seen = 0; | 594 | seen = 0; |
595 | for (k=0;k<i;k++) | 595 | for (k=0;k<i;k++) |
596 | if ( (socklen[k] == socklen[i]) && | 596 | if ( (socklen[k] == socklen[i]) && |
597 | (0 == memcmp (serverAddr[k], serverAddr[i], socklen[i])) ) | 597 | (0 == memcmp (server_addr[k], server_addr[i], socklen[i])) ) |
598 | { | 598 | { |
599 | seen = 1; | 599 | seen = 1; |
600 | break; | 600 | break; |
@@ -605,7 +605,7 @@ GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls, | |||
605 | i++; | 605 | i++; |
606 | continue; | 606 | continue; |
607 | } | 607 | } |
608 | lsocks[j] = open_listen_socket (serverAddr[i], socklen[i]); | 608 | lsocks[j] = open_listen_socket (server_addr[i], socklen[i]); |
609 | if (NULL != lsocks[j]) | 609 | if (NULL != lsocks[j]) |
610 | j++; | 610 | j++; |
611 | i++; | 611 | i++; |