diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-16 16:03:20 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-16 16:03:20 +0000 |
commit | 16a6919a9f98ee9fa1fee9dd262906c321004a19 (patch) | |
tree | e09d4fe5191dc329b3e1b667f2914f8313bcba59 /src/transport/plugin_transport_http.c | |
parent | 4d7904c62bb867c44e90b8e9f7cdbb4b283abc44 (diff) | |
download | gnunet-16a6919a9f98ee9fa1fee9dd262906c321004a19.tar.gz gnunet-16a6919a9f98ee9fa1fee9dd262906c321004a19.zip |
even nicer indentation, thanks to LRN's indent patch
Diffstat (limited to 'src/transport/plugin_transport_http.c')
-rw-r--r-- | src/transport/plugin_transport_http.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c index a6b24e73e..5c11f1f32 100644 --- a/src/transport/plugin_transport_http.c +++ b/src/transport/plugin_transport_http.c | |||
@@ -547,24 +547,24 @@ struct PrettyPrinterContext | |||
547 | * @param addrlen length of the address | 547 | * @param addrlen length of the address |
548 | * @return string representing the same address | 548 | * @return string representing the same address |
549 | */ | 549 | */ |
550 | static const char *http_plugin_address_to_string (void *cls, const void *addr, | 550 | static const char * |
551 | size_t addrlen); | 551 | http_plugin_address_to_string (void *cls, const void *addr, size_t addrlen); |
552 | 552 | ||
553 | 553 | ||
554 | /** | 554 | /** |
555 | * Call MHD to process pending ipv4 requests and then go back | 555 | * Call MHD to process pending ipv4 requests and then go back |
556 | * and schedule the next run. | 556 | * and schedule the next run. |
557 | */ | 557 | */ |
558 | static void http_server_daemon_v4_run (void *cls, | 558 | static void |
559 | const struct GNUNET_SCHEDULER_TaskContext | 559 | http_server_daemon_v4_run (void *cls, |
560 | *tc); | 560 | const struct GNUNET_SCHEDULER_TaskContext *tc); |
561 | /** | 561 | /** |
562 | * Call MHD to process pending ipv6 requests and then go back | 562 | * Call MHD to process pending ipv6 requests and then go back |
563 | * and schedule the next run. | 563 | * and schedule the next run. |
564 | */ | 564 | */ |
565 | static void http_server_daemon_v6_run (void *cls, | 565 | static void |
566 | const struct GNUNET_SCHEDULER_TaskContext | 566 | http_server_daemon_v6_run (void *cls, |
567 | *tc); | 567 | const struct GNUNET_SCHEDULER_TaskContext *tc); |
568 | 568 | ||
569 | /** | 569 | /** |
570 | * Function setting up curl handle and selecting message to send | 570 | * Function setting up curl handle and selecting message to send |
@@ -573,7 +573,8 @@ static void http_server_daemon_v6_run (void *cls, | |||
573 | * @param ps session | 573 | * @param ps session |
574 | * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok | 574 | * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok |
575 | */ | 575 | */ |
576 | static int send_check_connections (struct Plugin *plugin, struct Session *ps); | 576 | static int |
577 | send_check_connections (struct Plugin *plugin, struct Session *ps); | ||
577 | 578 | ||
578 | /** | 579 | /** |
579 | * Function setting up file descriptors and scheduling task to run | 580 | * Function setting up file descriptors and scheduling task to run |
@@ -581,7 +582,8 @@ static int send_check_connections (struct Plugin *plugin, struct Session *ps); | |||
581 | * @param plugin plugin as closure | 582 | * @param plugin plugin as closure |
582 | * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok | 583 | * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok |
583 | */ | 584 | */ |
584 | static int curl_schedule (struct Plugin *plugin); | 585 | static int |
586 | curl_schedule (struct Plugin *plugin); | ||
585 | 587 | ||
586 | /** | 588 | /** |
587 | * Task scheduled to reset the inbound quota delay for a specific peer | 589 | * Task scheduled to reset the inbound quota delay for a specific peer |
@@ -1785,10 +1787,8 @@ curl_receive_mst_cb (void *cls, void *client, | |||
1785 | "Connection %X: Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n", | 1787 | "Connection %X: Forwarding message to transport service, type %u and size %u from `%s' (`%s')\n", |
1786 | ps, ntohs (message->type), ntohs (message->size), | 1788 | ps, ntohs (message->type), ntohs (message->size), |
1787 | GNUNET_i2s (&(pc->identity)), http_plugin_address_to_string (NULL, | 1789 | GNUNET_i2s (&(pc->identity)), http_plugin_address_to_string (NULL, |
1788 | ps-> | 1790 | ps->addr, |
1789 | addr, | 1791 | ps->addrlen)); |
1790 | ps-> | ||
1791 | addrlen)); | ||
1792 | #endif | 1792 | #endif |
1793 | struct GNUNET_TRANSPORT_ATS_Information distance[2]; | 1793 | struct GNUNET_TRANSPORT_ATS_Information distance[2]; |
1794 | 1794 | ||
@@ -3333,8 +3333,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
3333 | GNUNET_CONFIGURATION_get_value_string (env->cfg, | 3333 | GNUNET_CONFIGURATION_get_value_string (env->cfg, |
3334 | component_name, | 3334 | component_name, |
3335 | "BINDTO4", | 3335 | "BINDTO4", |
3336 | &plugin-> | 3336 | &plugin->bind_hostname)); |
3337 | bind_hostname)); | ||
3338 | plugin->bind4_address = GNUNET_malloc (sizeof (struct sockaddr_in)); | 3337 | plugin->bind4_address = GNUNET_malloc (sizeof (struct sockaddr_in)); |
3339 | plugin->bind4_address->sin_family = AF_INET; | 3338 | plugin->bind4_address->sin_family = AF_INET; |
3340 | plugin->bind4_address->sin_port = htons (port); | 3339 | plugin->bind4_address->sin_port = htons (port); |
@@ -3494,8 +3493,8 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
3494 | MHD_OPTION_SOCK_ADDR, | 3493 | MHD_OPTION_SOCK_ADDR, |
3495 | tmp, | 3494 | tmp, |
3496 | MHD_OPTION_CONNECTION_LIMIT, | 3495 | MHD_OPTION_CONNECTION_LIMIT, |
3497 | (unsigned int) plugin-> | 3496 | (unsigned int) |
3498 | max_connect_per_transport, | 3497 | plugin->max_connect_per_transport, |
3499 | #if BUILD_HTTPS | 3498 | #if BUILD_HTTPS |
3500 | MHD_OPTION_HTTPS_PRIORITIES, | 3499 | MHD_OPTION_HTTPS_PRIORITIES, |
3501 | plugin->crypto_init, | 3500 | plugin->crypto_init, |
@@ -3534,8 +3533,8 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
3534 | (struct sockaddr_in *) | 3533 | (struct sockaddr_in *) |
3535 | plugin->bind4_address, | 3534 | plugin->bind4_address, |
3536 | MHD_OPTION_CONNECTION_LIMIT, | 3535 | MHD_OPTION_CONNECTION_LIMIT, |
3537 | (unsigned int) plugin-> | 3536 | (unsigned int) |
3538 | max_connect_per_transport, | 3537 | plugin->max_connect_per_transport, |
3539 | #if BUILD_HTTPS | 3538 | #if BUILD_HTTPS |
3540 | MHD_OPTION_HTTPS_PRIORITIES, | 3539 | MHD_OPTION_HTTPS_PRIORITIES, |
3541 | plugin->crypto_init, | 3540 | plugin->crypto_init, |