aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-09-20 10:57:31 +0000
committerChristian Grothoff <christian@grothoff.org>2012-09-20 10:57:31 +0000
commit541d0d25a1ce13b0bd1b4dcf7cb482d024cb27bd (patch)
tree468966435b12a55b91aecaae8529d12ccf9cd103
parent2a53d025446c993ccb516e2d7005169b26950a29 (diff)
downloadgnunet-541d0d25a1ce13b0bd1b4dcf7cb482d024cb27bd.tar.gz
gnunet-541d0d25a1ce13b0bd1b4dcf7cb482d024cb27bd.zip
-fix segv
-rw-r--r--src/gns/gnunet-gns-proxy.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index bf1d9f27d..23427d3f1 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -17,22 +17,18 @@
17 Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20
21#include "platform.h" 20#include "platform.h"
22#include <gnunet_util_lib.h>
23#include <gnunet_gns_service.h>
24#include <microhttpd.h> 21#include <microhttpd.h>
25#include <curl/curl.h> 22#include <curl/curl.h>
26#include <regex.h>
27#include "gns_proxy_proto.h"
28#include "gns.h"
29
30/** SSL **/
31#include <gnutls/gnutls.h> 23#include <gnutls/gnutls.h>
32#include <gnutls/x509.h> 24#include <gnutls/x509.h>
33#include <gnutls/abstract.h> 25#include <gnutls/abstract.h>
34#include <gnutls/crypto.h> 26#include <gnutls/crypto.h>
35#include <time.h> 27#include <regex.h>
28#include "gnunet_util_lib.h"
29#include "gnunet_gns_service.h"
30#include "gns_proxy_proto.h"
31#include "gns.h"
36 32
37#define HAVE_MHD_NO_LISTEN_SOCKET MHD_VERSION >= 0x00091401 33#define HAVE_MHD_NO_LISTEN_SOCKET MHD_VERSION >= 0x00091401
38 34
@@ -3589,8 +3585,8 @@ main (int argc, char *const *argv)
3589{ 3585{
3590 static const struct GNUNET_GETOPT_CommandLineOption options[] = { 3586 static const struct GNUNET_GETOPT_CommandLineOption options[] = {
3591 {'p', "port", NULL, 3587 {'p', "port", NULL,
3592 gettext_noop ("listen on specified port"), 1, 3588 gettext_noop ("listen on specified port (default: 7777)"), 1,
3593 &GNUNET_GETOPT_set_string, &port}, 3589 &GNUNET_GETOPT_set_ulong, &port},
3594 {'a', "authority", NULL, 3590 {'a', "authority", NULL,
3595 gettext_noop ("pem file to use as CA"), 1, 3591 gettext_noop ("pem file to use as CA"), 1,
3596 &GNUNET_GETOPT_set_string, &cafile_opt}, 3592 &GNUNET_GETOPT_set_string, &cafile_opt},