diff options
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gnunet-bcd.c | 22 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 16 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index 0746d5c57..d7fd1a812 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c | |||
@@ -76,7 +76,7 @@ static char *resfile; | |||
76 | /** | 76 | /** |
77 | * Port number. | 77 | * Port number. |
78 | */ | 78 | */ |
79 | static unsigned int port = 8888; | 79 | static uint16_t port = 8888; |
80 | 80 | ||
81 | 81 | ||
82 | struct Entry | 82 | struct Entry |
@@ -351,7 +351,7 @@ prepare_daemon (struct MHD_Daemon *daemon_handle) | |||
351 | static int | 351 | static int |
352 | server_start () | 352 | server_start () |
353 | { | 353 | { |
354 | if ((0 == port) || (port > UINT16_MAX)) | 354 | if (0 == port) |
355 | { | 355 | { |
356 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 356 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
357 | _("Invalid port number %u. Exiting.\n"), | 357 | _("Invalid port number %u. Exiting.\n"), |
@@ -362,7 +362,7 @@ server_start () | |||
362 | _("Businesscard HTTP server starts on %u\n"), | 362 | _("Businesscard HTTP server starts on %u\n"), |
363 | port); | 363 | port); |
364 | daemon_handle = MHD_start_daemon (MHD_USE_DUAL_STACK | MHD_USE_DEBUG, | 364 | daemon_handle = MHD_start_daemon (MHD_USE_DUAL_STACK | MHD_USE_DEBUG, |
365 | (uint16_t) port, | 365 | port, |
366 | NULL /* accept_policy_callback */, NULL, | 366 | NULL /* accept_policy_callback */, NULL, |
367 | &access_handler_callback, NULL, | 367 | &access_handler_callback, NULL, |
368 | MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 512, | 368 | MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 512, |
@@ -374,7 +374,7 @@ server_start () | |||
374 | { | 374 | { |
375 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 375 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
376 | _("Could not start businesscard HTTP server on port %u\n"), | 376 | _("Could not start businesscard HTTP server on port %u\n"), |
377 | (unsigned short) port); | 377 | (unsigned int) port); |
378 | return GNUNET_SYSERR; | 378 | return GNUNET_SYSERR; |
379 | } | 379 | } |
380 | http_task = prepare_daemon (daemon_handle); | 380 | http_task = prepare_daemon (daemon_handle); |
@@ -516,17 +516,17 @@ main (int argc, char *const *argv) | |||
516 | { | 516 | { |
517 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 517 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
518 | 518 | ||
519 | GNUNET_GETOPT_option_uint ('p', | 519 | GNUNET_GETOPT_option_uint16 ('p', |
520 | "port", | 520 | "port", |
521 | "PORT", | 521 | "PORT", |
522 | gettext_noop ("Run HTTP serve on port PORT (default is 8888)"), | 522 | gettext_noop ("Run HTTP serve on port PORT (default is 8888)"), |
523 | &port), | 523 | &port), |
524 | |||
525 | GNUNET_GETOPT_OPTION_END | 524 | GNUNET_GETOPT_OPTION_END |
526 | }; | 525 | }; |
527 | int ret; | 526 | int ret; |
528 | 527 | ||
529 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 528 | if (GNUNET_OK != |
529 | GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | ||
530 | return 2; | 530 | return 2; |
531 | GNUNET_log_setup ("gnunet-bcd", "WARNING", NULL); | 531 | GNUNET_log_setup ("gnunet-bcd", "WARNING", NULL); |
532 | ret = | 532 | ret = |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 02ebcf0f1..0d7d83b4b 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -636,7 +636,7 @@ struct Socks5Request | |||
636 | /** | 636 | /** |
637 | * The port the proxy is running on (default 7777) | 637 | * The port the proxy is running on (default 7777) |
638 | */ | 638 | */ |
639 | static unsigned long long port = GNUNET_GNS_PROXY_PORT; | 639 | static uint16_t port = GNUNET_GNS_PROXY_PORT; |
640 | 640 | ||
641 | /** | 641 | /** |
642 | * The CA file (pem) to use for the proxy CA | 642 | * The CA file (pem) to use for the proxy CA |
@@ -3399,8 +3399,8 @@ run (void *cls, | |||
3399 | return; | 3399 | return; |
3400 | } | 3400 | } |
3401 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 3401 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3402 | "Proxy listens on port %llu\n", | 3402 | "Proxy listens on port %u\n", |
3403 | port); | 3403 | (unsigned int) port); |
3404 | 3404 | ||
3405 | /* start MHD daemon for HTTP */ | 3405 | /* start MHD daemon for HTTP */ |
3406 | hd = GNUNET_new (struct MhdHttpList); | 3406 | hd = GNUNET_new (struct MhdHttpList); |
@@ -3437,11 +3437,11 @@ int | |||
3437 | main (int argc, char *const *argv) | 3437 | main (int argc, char *const *argv) |
3438 | { | 3438 | { |
3439 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 3439 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
3440 | GNUNET_GETOPT_option_ulong ('p', | 3440 | GNUNET_GETOPT_option_uint16 ('p', |
3441 | "port", | 3441 | "port", |
3442 | NULL, | 3442 | NULL, |
3443 | gettext_noop ("listen on specified port (default: 7777)"), | 3443 | gettext_noop ("listen on specified port (default: 7777)"), |
3444 | &port), | 3444 | &port), |
3445 | GNUNET_GETOPT_option_string ('a', | 3445 | GNUNET_GETOPT_option_string ('a', |
3446 | "authority", | 3446 | "authority", |
3447 | NULL, | 3447 | NULL, |
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 8b20f2ae3..0d04fc6b9 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -60,7 +60,7 @@ | |||
60 | /** | 60 | /** |
61 | * DHT replication level | 61 | * DHT replication level |
62 | */ | 62 | */ |
63 | #define DHT_GNS_REPLICATION_LEVEL 5 | 63 | #define DHT_GNS_REPLICATION_LEVEL 10 |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * How deep do we allow recursions to go before we abort? | 66 | * How deep do we allow recursions to go before we abort? |