aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-06 09:35:14 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-06 09:35:14 +0000
commit99ba3c2b1294b890671d0d7d6e4319be70bee5a0 (patch)
tree2e9b1339869d5f115b80246b63af6c0604023e75 /src/transport
parentaee28f4afd42710aba0c37d8ec86572aef092044 (diff)
downloadgnunet-99ba3c2b1294b890671d0d7d6e4319be70bee5a0.tar.gz
gnunet-99ba3c2b1294b890671d0d7d6e4319be70bee5a0.zip
-doxygen, coding conventions
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/plugin_transport_http.c12
-rw-r--r--src/transport/plugin_transport_http_server.c14
2 files changed, 13 insertions, 13 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 937f4f62f..637e74063 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -829,7 +829,7 @@ http_check_ipv6 (struct Plugin *plugin)
829 829
830 830
831int 831int
832http_get_addresses (struct Plugin *plugin, const char *serviceName, 832http_get_addresses (struct Plugin *plugin, const char *service_name,
833 const struct GNUNET_CONFIGURATION_Handle *cfg, 833 const struct GNUNET_CONFIGURATION_Handle *cfg,
834 struct sockaddr ***addrs, socklen_t ** addr_lens) 834 struct sockaddr ***addrs, socklen_t ** addr_lens)
835{ 835{
@@ -852,10 +852,10 @@ http_get_addresses (struct Plugin *plugin, const char *serviceName,
852 disablev6 = !plugin->ipv6; 852 disablev6 = !plugin->ipv6;
853 853
854 port = 0; 854 port = 0;
855 if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "PORT")) 855 if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
856 { 856 {
857 GNUNET_break (GNUNET_OK == 857 GNUNET_break (GNUNET_OK ==
858 GNUNET_CONFIGURATION_get_value_number (cfg, serviceName, 858 GNUNET_CONFIGURATION_get_value_number (cfg, service_name,
859 "PORT", &port)); 859 "PORT", &port));
860 if (port > 65535) 860 if (port > 65535)
861 { 861 {
@@ -873,10 +873,10 @@ http_get_addresses (struct Plugin *plugin, const char *serviceName,
873 } 873 }
874 874
875 875
876 if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "BINDTO")) 876 if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO"))
877 { 877 {
878 GNUNET_break (GNUNET_OK == 878 GNUNET_break (GNUNET_OK ==
879 GNUNET_CONFIGURATION_get_value_string (cfg, serviceName, 879 GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
880 "BINDTO", &hostname)); 880 "BINDTO", &hostname));
881 } 881 }
882 else 882 else
@@ -886,7 +886,7 @@ http_get_addresses (struct Plugin *plugin, const char *serviceName,
886 { 886 {
887 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, 887 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
888 "Resolving `%s' since that is where `%s' will bind to.\n", 888 "Resolving `%s' since that is where `%s' will bind to.\n",
889 hostname, serviceName); 889 hostname, service_name);
890 memset (&hints, 0, sizeof (struct addrinfo)); 890 memset (&hints, 0, sizeof (struct addrinfo));
891 if (disablev6) 891 if (disablev6)
892 hints.ai_family = AF_INET; 892 hints.ai_family = AF_INET;
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 58e5db46a..5695e1d7d 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2341,7 +2341,7 @@ server_nat_port_map_callback (void *cls, int add_remove, const struct sockaddr *
2341 * Get valid server addresses 2341 * Get valid server addresses
2342 * 2342 *
2343 * @param plugin the plugin handle 2343 * @param plugin the plugin handle
2344 * @param serviceName the servicename 2344 * @param service_name the servicename
2345 * @param cfg configuration handle 2345 * @param cfg configuration handle
2346 * @param addrs addresses 2346 * @param addrs addresses
2347 * @param addr_lens address length 2347 * @param addr_lens address length
@@ -2349,7 +2349,7 @@ server_nat_port_map_callback (void *cls, int add_remove, const struct sockaddr *
2349 */ 2349 */
2350static int 2350static int
2351server_get_addresses (struct HTTP_Server_Plugin *plugin, 2351server_get_addresses (struct HTTP_Server_Plugin *plugin,
2352 const char *serviceName, 2352 const char *service_name,
2353 const struct GNUNET_CONFIGURATION_Handle *cfg, 2353 const struct GNUNET_CONFIGURATION_Handle *cfg,
2354 struct sockaddr ***addrs, socklen_t ** addr_lens) 2354 struct sockaddr ***addrs, socklen_t ** addr_lens)
2355{ 2355{
@@ -2372,10 +2372,10 @@ server_get_addresses (struct HTTP_Server_Plugin *plugin,
2372 disablev6 = !plugin->use_ipv6; 2372 disablev6 = !plugin->use_ipv6;
2373 2373
2374 port = 0; 2374 port = 0;
2375 if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "PORT")) 2375 if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
2376 { 2376 {
2377 GNUNET_break (GNUNET_OK == 2377 GNUNET_break (GNUNET_OK ==
2378 GNUNET_CONFIGURATION_get_value_number (cfg, serviceName, 2378 GNUNET_CONFIGURATION_get_value_number (cfg, service_name,
2379 "PORT", &port)); 2379 "PORT", &port));
2380 if (port > 65535) 2380 if (port > 65535)
2381 { 2381 {
@@ -2393,10 +2393,10 @@ server_get_addresses (struct HTTP_Server_Plugin *plugin,
2393 } 2393 }
2394 2394
2395 2395
2396 if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "BINDTO")) 2396 if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO"))
2397 { 2397 {
2398 GNUNET_break (GNUNET_OK == 2398 GNUNET_break (GNUNET_OK ==
2399 GNUNET_CONFIGURATION_get_value_string (cfg, serviceName, 2399 GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
2400 "BINDTO", &hostname)); 2400 "BINDTO", &hostname));
2401 } 2401 }
2402 else 2402 else
@@ -2406,7 +2406,7 @@ server_get_addresses (struct HTTP_Server_Plugin *plugin,
2406 { 2406 {
2407 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, 2407 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
2408 "Resolving `%s' since that is where `%s' will bind to.\n", 2408 "Resolving `%s' since that is where `%s' will bind to.\n",
2409 hostname, serviceName); 2409 hostname, service_name);
2410 memset (&hints, 0, sizeof (struct addrinfo)); 2410 memset (&hints, 0, sizeof (struct addrinfo));
2411 if (disablev6) 2411 if (disablev6)
2412 hints.ai_family = AF_INET; 2412 hints.ai_family = AF_INET;