From 236b945be1ccdbaa06792e87e622ead0b2770920 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philipp=20T=C3=B6lke?= Date: Mon, 14 Mar 2011 15:16:28 +0000 Subject: [PATCH] fixed FIXMEs --- src/vpn/gnunet-daemon-exit.c | 10 ++++++---- src/vpn/gnunet-service-dns.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c index 03e9831c8..1c53a83d1 100644 --- a/src/vpn/gnunet-daemon-exit.c +++ b/src/vpn/gnunet-daemon-exit.c @@ -292,21 +292,23 @@ read_service_conf (void *cls, const char *section, const char *option, { if (NULL == (hostname = strstr (redirect, ":"))) { - // FIXME: bitch + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Warning: option %s is not formatted correctly!\n", redirect); continue; } hostname[0] = '\0'; hostname++; if (NULL == (hostport = strstr (hostname, ":"))) { - // FIXME: bitch + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Warning: option %s is not formatted correctly!\n", redirect); continue; } hostport[0] = '\0'; hostport++; int local_port = atoi (redirect); - GNUNET_assert ((local_port > 0) && (local_port < 65536)); // FIXME: don't crash!!! + if (!((local_port > 0) && (local_port < 65536))) + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Warning: %s is not a correct port.", redirect); + *desc = local_port; GNUNET_CRYPTO_hash (desc, sizeof (GNUNET_HashCode) + 2, &hash); @@ -642,7 +644,7 @@ run (void *cls, }; mesh_handle = GNUNET_MESH_connect(cfg_, NULL, - NULL, /* FIXME */ + NULL, handlers); cfg = cfg_; diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c index 8286b7abd..40c3d8052 100644 --- a/src/vpn/gnunet-service-dns.c +++ b/src/vpn/gnunet-service-dns.c @@ -595,12 +595,13 @@ get_port_from_redirects (const char *udp_redirects, const char *tcp_redirects) { if (NULL == (hostname = strstr (redirect, ":"))) { - // FIXME: bitch + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Warning: option %s is not formatted correctly!\n", redirect); continue; } hostname[0] = '\0'; local_port = atoi (redirect); - GNUNET_assert ((local_port > 0) && (local_port < 65536)); // FIXME: don't crash!!! + if (!((local_port > 0) && (local_port < 65536))) + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Warning: %s is not a correct port.", redirect); ret |= (0xFFFF & htons(local_port)); ret <<= 16; @@ -623,12 +624,13 @@ get_port_from_redirects (const char *udp_redirects, const char *tcp_redirects) { if (NULL == (hostname = strstr (redirect, ":"))) { - // FIXME: bitch + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Warning: option %s is not formatted correctly!\n", redirect); continue; } hostname[0] = '\0'; local_port = atoi (redirect); - GNUNET_assert ((local_port > 0) && (local_port < 65536)); // FIXME: don't crash!!! + if (!((local_port > 0) && (local_port < 65536))) + GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Warning: %s is not a correct port.", redirect); ret |= (0xFFFF & htons(local_port)); ret <<= 16; -- 2.25.1