aboutsummaryrefslogtreecommitdiff
path: root/src/gns/gnunet-gns-proxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gns/gnunet-gns-proxy.c')
-rw-r--r--src/gns/gnunet-gns-proxy.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 93aee2004..47875281b 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -356,7 +356,7 @@ struct MhdHttpList
356 /** 356 /**
357 * The task ID 357 * The task ID
358 */ 358 */
359 GNUNET_SCHEDULER_TaskIdentifier httpd_task; 359 struct GNUNET_SCHEDULER_Task * httpd_task;
360 360
361 /** 361 /**
362 * is this an ssl daemon? 362 * is this an ssl daemon?
@@ -456,17 +456,17 @@ struct Socks5Request
456 /** 456 /**
457 * Client socket read task 457 * Client socket read task
458 */ 458 */
459 GNUNET_SCHEDULER_TaskIdentifier rtask; 459 struct GNUNET_SCHEDULER_Task * rtask;
460 460
461 /** 461 /**
462 * Client socket write task 462 * Client socket write task
463 */ 463 */
464 GNUNET_SCHEDULER_TaskIdentifier wtask; 464 struct GNUNET_SCHEDULER_Task * wtask;
465 465
466 /** 466 /**
467 * Timeout task 467 * Timeout task
468 */ 468 */
469 GNUNET_SCHEDULER_TaskIdentifier timeout_task; 469 struct GNUNET_SCHEDULER_Task * timeout_task;
470 470
471 /** 471 /**
472 * Read buffer 472 * Read buffer
@@ -593,17 +593,17 @@ static struct GNUNET_NETWORK_Handle *lsock6;
593/** 593/**
594 * The listen task ID for IPv4 594 * The listen task ID for IPv4
595 */ 595 */
596static GNUNET_SCHEDULER_TaskIdentifier ltask4; 596static struct GNUNET_SCHEDULER_Task * ltask4;
597 597
598/** 598/**
599 * The listen task ID for IPv6 599 * The listen task ID for IPv6
600 */ 600 */
601static GNUNET_SCHEDULER_TaskIdentifier ltask6; 601static struct GNUNET_SCHEDULER_Task * ltask6;
602 602
603/** 603/**
604 * The cURL download task (curl multi API). 604 * The cURL download task (curl multi API).
605 */ 605 */
606static GNUNET_SCHEDULER_TaskIdentifier curl_download_task; 606static struct GNUNET_SCHEDULER_Task * curl_download_task;
607 607
608/** 608/**
609 * The cURL multi handle 609 * The cURL multi handle
@@ -716,11 +716,11 @@ cleanup_s5r (struct Socks5Request *s5r)
716 if ( (NULL != s5r->response) && 716 if ( (NULL != s5r->response) &&
717 (curl_failure_response != s5r->response) ) 717 (curl_failure_response != s5r->response) )
718 MHD_destroy_response (s5r->response); 718 MHD_destroy_response (s5r->response);
719 if (GNUNET_SCHEDULER_NO_TASK != s5r->rtask) 719 if (NULL != s5r->rtask)
720 GNUNET_SCHEDULER_cancel (s5r->rtask); 720 GNUNET_SCHEDULER_cancel (s5r->rtask);
721 if (GNUNET_SCHEDULER_NO_TASK != s5r->timeout_task) 721 if (NULL != s5r->timeout_task)
722 GNUNET_SCHEDULER_cancel (s5r->timeout_task); 722 GNUNET_SCHEDULER_cancel (s5r->timeout_task);
723 if (GNUNET_SCHEDULER_NO_TASK != s5r->wtask) 723 if (NULL != s5r->wtask)
724 GNUNET_SCHEDULER_cancel (s5r->wtask); 724 GNUNET_SCHEDULER_cancel (s5r->wtask);
725 if (NULL != s5r->gns_lookup) 725 if (NULL != s5r->gns_lookup)
726 GNUNET_GNS_lookup_cancel (s5r->gns_lookup); 726 GNUNET_GNS_lookup_cancel (s5r->gns_lookup);
@@ -1266,10 +1266,10 @@ curl_download_prepare ()
1266 long to; 1266 long to;
1267 struct GNUNET_TIME_Relative rtime; 1267 struct GNUNET_TIME_Relative rtime;
1268 1268
1269 if (GNUNET_SCHEDULER_NO_TASK != curl_download_task) 1269 if (NULL != curl_download_task)
1270 { 1270 {
1271 GNUNET_SCHEDULER_cancel (curl_download_task); 1271 GNUNET_SCHEDULER_cancel (curl_download_task);
1272 curl_download_task = GNUNET_SCHEDULER_NO_TASK; 1272 curl_download_task = NULL;
1273 } 1273 }
1274 max = -1; 1274 max = -1;
1275 FD_ZERO (&rs); 1275 FD_ZERO (&rs);
@@ -1327,7 +1327,7 @@ curl_task_download (void *cls,
1327 CURLMcode mret; 1327 CURLMcode mret;
1328 struct Socks5Request *s5r; 1328 struct Socks5Request *s5r;
1329 1329
1330 curl_download_task = GNUNET_SCHEDULER_NO_TASK; 1330 curl_download_task = NULL;
1331 do 1331 do
1332 { 1332 {
1333 running = 0; 1333 running = 0;
@@ -1750,7 +1750,7 @@ mhd_log_callback (void *cls,
1750 } 1750 }
1751 s5r->url = GNUNET_strdup (url); 1751 s5r->url = GNUNET_strdup (url);
1752 GNUNET_SCHEDULER_cancel (s5r->timeout_task); 1752 GNUNET_SCHEDULER_cancel (s5r->timeout_task);
1753 s5r->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1753 s5r->timeout_task = NULL;
1754 return s5r; 1754 return s5r;
1755 } 1755 }
1756 } 1756 }
@@ -1772,10 +1772,10 @@ kill_httpd (struct MhdHttpList *hd)
1772 hd); 1772 hd);
1773 GNUNET_free_non_null (hd->domain); 1773 GNUNET_free_non_null (hd->domain);
1774 MHD_stop_daemon (hd->daemon); 1774 MHD_stop_daemon (hd->daemon);
1775 if (GNUNET_SCHEDULER_NO_TASK != hd->httpd_task) 1775 if (NULL != hd->httpd_task)
1776 { 1776 {
1777 GNUNET_SCHEDULER_cancel (hd->httpd_task); 1777 GNUNET_SCHEDULER_cancel (hd->httpd_task);
1778 hd->httpd_task = GNUNET_SCHEDULER_NO_TASK; 1778 hd->httpd_task = NULL;
1779 } 1779 }
1780 GNUNET_free_non_null (hd->proxy_cert); 1780 GNUNET_free_non_null (hd->proxy_cert);
1781 if (hd == httpd) 1781 if (hd == httpd)
@@ -1796,7 +1796,7 @@ kill_httpd_task (void *cls,
1796{ 1796{
1797 struct MhdHttpList *hd = cls; 1797 struct MhdHttpList *hd = cls;
1798 1798
1799 hd->httpd_task = GNUNET_SCHEDULER_NO_TASK; 1799 hd->httpd_task = NULL;
1800 kill_httpd (hd); 1800 kill_httpd (hd);
1801} 1801}
1802 1802
@@ -1858,7 +1858,7 @@ schedule_httpd (struct MhdHttpList *hd)
1858 wrs = NULL; 1858 wrs = NULL;
1859 wws = NULL; 1859 wws = NULL;
1860 } 1860 }
1861 if (GNUNET_SCHEDULER_NO_TASK != hd->httpd_task) 1861 if (NULL != hd->httpd_task)
1862 GNUNET_SCHEDULER_cancel (hd->httpd_task); 1862 GNUNET_SCHEDULER_cancel (hd->httpd_task);
1863 if ( (MHD_YES != haveto) && 1863 if ( (MHD_YES != haveto) &&
1864 (-1 == max) && 1864 (-1 == max) &&
@@ -1895,7 +1895,7 @@ do_httpd (void *cls,
1895{ 1895{
1896 struct MhdHttpList *hd = cls; 1896 struct MhdHttpList *hd = cls;
1897 1897
1898 hd->httpd_task = GNUNET_SCHEDULER_NO_TASK; 1898 hd->httpd_task = NULL;
1899 MHD_run (hd->daemon); 1899 MHD_run (hd->daemon);
1900 schedule_httpd (hd); 1900 schedule_httpd (hd);
1901} 1901}
@@ -1909,7 +1909,7 @@ do_httpd (void *cls,
1909static void 1909static void
1910run_mhd_now (struct MhdHttpList *hd) 1910run_mhd_now (struct MhdHttpList *hd)
1911{ 1911{
1912 if (GNUNET_SCHEDULER_NO_TASK != 1912 if (NULL !=
1913 hd->httpd_task) 1913 hd->httpd_task)
1914 GNUNET_SCHEDULER_cancel (hd->httpd_task); 1914 GNUNET_SCHEDULER_cancel (hd->httpd_task);
1915 hd->httpd_task = GNUNET_SCHEDULER_add_now (&do_httpd, 1915 hd->httpd_task = GNUNET_SCHEDULER_add_now (&do_httpd,
@@ -2146,7 +2146,7 @@ timeout_s5r_handshake (void *cls,
2146{ 2146{
2147 struct Socks5Request *s5r = cls; 2147 struct Socks5Request *s5r = cls;
2148 2148
2149 s5r->timeout_task = GNUNET_SCHEDULER_NO_TASK; 2149 s5r->timeout_task = NULL;
2150 cleanup_s5r (s5r); 2150 cleanup_s5r (s5r);
2151} 2151}
2152 2152
@@ -2221,7 +2221,7 @@ do_write (void *cls,
2221 struct Socks5Request *s5r = cls; 2221 struct Socks5Request *s5r = cls;
2222 ssize_t len; 2222 ssize_t len;
2223 2223
2224 s5r->wtask = GNUNET_SCHEDULER_NO_TASK; 2224 s5r->wtask = NULL;
2225 len = GNUNET_NETWORK_socket_send (s5r->sock, 2225 len = GNUNET_NETWORK_socket_send (s5r->sock,
2226 s5r->wbuf, 2226 s5r->wbuf,
2227 s5r->wbuf_len); 2227 s5r->wbuf_len);
@@ -2253,7 +2253,7 @@ do_write (void *cls,
2253 GNUNET_assert (0); 2253 GNUNET_assert (0);
2254 break; 2254 break;
2255 case SOCKS5_REQUEST: 2255 case SOCKS5_REQUEST:
2256 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s5r->rtask); 2256 GNUNET_assert (NULL != s5r->rtask);
2257 break; 2257 break;
2258 case SOCKS5_DATA_TRANSFER: 2258 case SOCKS5_DATA_TRANSFER:
2259 setup_data_transfer (s5r); 2259 setup_data_transfer (s5r);
@@ -2285,7 +2285,7 @@ signal_socks_failure (struct Socks5Request *s5r,
2285 s_resp->version = SOCKS_VERSION_5; 2285 s_resp->version = SOCKS_VERSION_5;
2286 s_resp->reply = sc; 2286 s_resp->reply = sc;
2287 s5r->state = SOCKS5_WRITE_THEN_CLEANUP; 2287 s5r->state = SOCKS5_WRITE_THEN_CLEANUP;
2288 if (GNUNET_SCHEDULER_NO_TASK != s5r->wtask) 2288 if (NULL != s5r->wtask)
2289 s5r->wtask = 2289 s5r->wtask =
2290 GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, 2290 GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
2291 s5r->sock, 2291 s5r->sock,
@@ -2314,7 +2314,7 @@ signal_socks_success (struct Socks5Request *s5r)
2314 sizeof (struct in_addr) + sizeof (uint16_t)); 2314 sizeof (struct in_addr) + sizeof (uint16_t));
2315 s5r->wbuf_len += sizeof (struct Socks5ServerResponseMessage) + 2315 s5r->wbuf_len += sizeof (struct Socks5ServerResponseMessage) +
2316 sizeof (struct in_addr) + sizeof (uint16_t); 2316 sizeof (struct in_addr) + sizeof (uint16_t);
2317 if (GNUNET_SCHEDULER_NO_TASK == s5r->wtask) 2317 if (NULL == s5r->wtask)
2318 s5r->wtask = 2318 s5r->wtask =
2319 GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, 2319 GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
2320 s5r->sock, 2320 s5r->sock,
@@ -2482,7 +2482,7 @@ do_s5r_read (void *cls,
2482 ssize_t rlen; 2482 ssize_t rlen;
2483 size_t alen; 2483 size_t alen;
2484 2484
2485 s5r->rtask = GNUNET_SCHEDULER_NO_TASK; 2485 s5r->rtask = NULL;
2486 if ( (NULL != tc->read_ready) && 2486 if ( (NULL != tc->read_ready) &&
2487 (GNUNET_NETWORK_fdset_isset (tc->read_ready, s5r->sock)) ) 2487 (GNUNET_NETWORK_fdset_isset (tc->read_ready, s5r->sock)) )
2488 { 2488 {
@@ -2527,7 +2527,7 @@ do_s5r_read (void *cls,
2527 s5r->wbuf_len = sizeof (struct Socks5ServerHelloMessage); 2527 s5r->wbuf_len = sizeof (struct Socks5ServerHelloMessage);
2528 s_hello->version = SOCKS_VERSION_5; 2528 s_hello->version = SOCKS_VERSION_5;
2529 s_hello->auth_method = SOCKS_AUTH_NONE; 2529 s_hello->auth_method = SOCKS_AUTH_NONE;
2530 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s5r->wtask); 2530 GNUNET_assert (NULL == s5r->wtask);
2531 s5r->wtask = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, 2531 s5r->wtask = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
2532 s5r->sock, 2532 s5r->sock,
2533 &do_write, s5r); 2533 &do_write, s5r);
@@ -2666,7 +2666,7 @@ do_s5r_read (void *cls,
2666 } 2666 }
2667 /* We are done reading right now */ 2667 /* We are done reading right now */
2668 GNUNET_SCHEDULER_cancel (s5r->rtask); 2668 GNUNET_SCHEDULER_cancel (s5r->rtask);
2669 s5r->rtask = GNUNET_SCHEDULER_NO_TASK; 2669 s5r->rtask = NULL;
2670 return; 2670 return;
2671 case SOCKS5_RESOLVING: 2671 case SOCKS5_RESOLVING:
2672 GNUNET_assert (0); 2672 GNUNET_assert (0);
@@ -2696,9 +2696,9 @@ do_accept (void *cls,
2696 struct Socks5Request *s5r; 2696 struct Socks5Request *s5r;
2697 2697
2698 if (lsock == lsock4) 2698 if (lsock == lsock4)
2699 ltask4 = GNUNET_SCHEDULER_NO_TASK; 2699 ltask4 = NULL;
2700 else 2700 else
2701 ltask6 = GNUNET_SCHEDULER_NO_TASK; 2701 ltask6 = NULL;
2702 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) 2702 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
2703 return; 2703 return;
2704 if (lsock == lsock4) 2704 if (lsock == lsock4)
@@ -2778,20 +2778,20 @@ do_shutdown (void *cls,
2778 GNUNET_GNS_disconnect (gns_handle); 2778 GNUNET_GNS_disconnect (gns_handle);
2779 gns_handle = NULL; 2779 gns_handle = NULL;
2780 } 2780 }
2781 if (GNUNET_SCHEDULER_NO_TASK != curl_download_task) 2781 if (NULL != curl_download_task)
2782 { 2782 {
2783 GNUNET_SCHEDULER_cancel (curl_download_task); 2783 GNUNET_SCHEDULER_cancel (curl_download_task);
2784 curl_download_task = GNUNET_SCHEDULER_NO_TASK; 2784 curl_download_task = NULL;
2785 } 2785 }
2786 if (GNUNET_SCHEDULER_NO_TASK != ltask4) 2786 if (NULL != ltask4)
2787 { 2787 {
2788 GNUNET_SCHEDULER_cancel (ltask4); 2788 GNUNET_SCHEDULER_cancel (ltask4);
2789 ltask4 = GNUNET_SCHEDULER_NO_TASK; 2789 ltask4 = NULL;
2790 } 2790 }
2791 if (GNUNET_SCHEDULER_NO_TASK != ltask6) 2791 if (NULL != ltask6)
2792 { 2792 {
2793 GNUNET_SCHEDULER_cancel (ltask6); 2793 GNUNET_SCHEDULER_cancel (ltask6);
2794 ltask6 = GNUNET_SCHEDULER_NO_TASK; 2794 ltask6 = NULL;
2795 } 2795 }
2796 gnutls_x509_crt_deinit (proxy_ca.cert); 2796 gnutls_x509_crt_deinit (proxy_ca.cert);
2797 gnutls_x509_privkey_deinit (proxy_ca.key); 2797 gnutls_x509_privkey_deinit (proxy_ca.key);