diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-16 15:26:57 +0100 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2017-03-16 15:26:57 +0100 |
commit | 1c4f90e7c538f1489ea17be3d2f655c2390d7ccf (patch) | |
tree | 9a8dc8245d1ffe456076cc8612754d0d9dd7298f /src/gns/gnunet-gns-proxy.c | |
parent | 04a46ba5acf180be6f3a7d85cd6f6ce0ff13b1ba (diff) | |
download | gnunet-1c4f90e7c538f1489ea17be3d2f655c2390d7ccf.tar.gz gnunet-1c4f90e7c538f1489ea17be3d2f655c2390d7ccf.zip |
porting gnunet-publish + others..
Diffstat (limited to 'src/gns/gnunet-gns-proxy.c')
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index c336848ce..35f42cdec 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -621,7 +621,7 @@ struct Socks5Request | |||
621 | /** | 621 | /** |
622 | * The port the proxy is running on (default 7777) | 622 | * The port the proxy is running on (default 7777) |
623 | */ | 623 | */ |
624 | static unsigned long port = GNUNET_GNS_PROXY_PORT; | 624 | static unsigned long long port = GNUNET_GNS_PROXY_PORT; |
625 | 625 | ||
626 | /** | 626 | /** |
627 | * The CA file (pem) to use for the proxy CA | 627 | * The CA file (pem) to use for the proxy CA |
@@ -3108,7 +3108,7 @@ run_cont () | |||
3108 | return; | 3108 | return; |
3109 | } | 3109 | } |
3110 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 3110 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3111 | "Proxy listens on port %lu\n", | 3111 | "Proxy listens on port %llu\n", |
3112 | port); | 3112 | port); |
3113 | 3113 | ||
3114 | /* start MHD daemon for HTTP */ | 3114 | /* start MHD daemon for HTTP */ |
@@ -3261,13 +3261,20 @@ run (void *cls, | |||
3261 | int | 3261 | int |
3262 | main (int argc, char *const *argv) | 3262 | main (int argc, char *const *argv) |
3263 | { | 3263 | { |
3264 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { | 3264 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
3265 | {'p', "port", NULL, | 3265 | |
3266 | gettext_noop ("listen on specified port (default: 7777)"), 1, | 3266 | GNUNET_GETOPT_OPTION_SET_ULONG ('p', |
3267 | &GNUNET_GETOPT_set_ulong, &port}, | 3267 | "port", |
3268 | {'a', "authority", NULL, | 3268 | NULL, |
3269 | gettext_noop ("pem file to use as CA"), 1, | 3269 | gettext_noop ("listen on specified port (default: 7777)"), |
3270 | &GNUNET_GETOPT_set_string, &cafile_opt}, | 3270 | &port), |
3271 | |||
3272 | GNUNET_GETOPT_OPTION_STRING ('a', | ||
3273 | "authority", | ||
3274 | NULL, | ||
3275 | gettext_noop ("pem file to use as CA"), | ||
3276 | &cafile_opt), | ||
3277 | |||
3271 | GNUNET_GETOPT_OPTION_END | 3278 | GNUNET_GETOPT_OPTION_END |
3272 | }; | 3279 | }; |
3273 | static const char* page = | 3280 | static const char* page = |