[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -warnings; dns2gns fixes
From: |
gnunet |
Subject: |
[gnunet] branch master updated: -warnings; dns2gns fixes |
Date: |
Wed, 12 Oct 2022 13:27:43 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 342ab049a -warnings; dns2gns fixes
342ab049a is described below
commit 342ab049a74a951d30584ee88ae12765846ee38d
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 12 20:27:37 2022 +0900
-warnings; dns2gns fixes
---
src/gns/gns.conf.in | 7 ++++---
src/gns/gnunet-dns2gns.c | 16 ++++++++--------
src/namestore/perf_namestore_api_import.c | 17 -----------------
src/namestore/test_namestore_api_tx_rollback.c | 1 -
src/namestore/test_plugin_namestore.c | 1 -
5 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index eca75ccb1..6cc5bd798 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -39,9 +39,10 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
[dns2gns]
BINARY = gnunet-dns2gns
START_ON_DEMAND = NO
-RUN_PER_USER = YES
+RUN_PER_USER = NO
BIND_TO=127.0.0.1
BIND_TO6=::1
-# -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use, -p port
to use
-OPTIONS = -d 8.8.8.8 -p 5353
+# -d: DNS resolver to use
+OPTIONS = -d 9.9.9.9
+PORT = 15353
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 46659cdda..960d84fb3 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -193,7 +193,7 @@ static char *dns_ip;
/**
* UDP Port we listen on for inbound DNS requests.
*/
-static unsigned int listen_port = 53;
+static unsigned long long listen_port = 53;
/**
* Configuration to use.
@@ -561,7 +561,8 @@ result_processor (void *cls,
if ((GNUNET_DNSPARSER_TYPE_A != request->packet->queries[0].type) &&
(GNUNET_DNSPARSER_TYPE_AAAA != request->packet->queries[0].type))
break;
- af = (GNUNET_DNSPARSER_TYPE_A == request->packet->queries[0].type) ?
AF_INET :
+ af = (GNUNET_DNSPARSER_TYPE_A == request->packet->queries[0].type) ?
+ AF_INET :
AF_INET6;
if (sizeof(struct GNUNET_TUN_GnsVpnRecord) >
rd[i].data_size)
@@ -903,6 +904,11 @@ run (void *cls,
return;
}
GNUNET_free (addr_str);
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (c, "dns2gns",
+ "PORT",
+ &listen_port))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Listening on %llu\n", listen_port);
listen_socket4 = GNUNET_NETWORK_socket_create (PF_INET,
SOCK_DGRAM,
@@ -994,12 +1000,6 @@ main (int argc,
gettext_noop (
"IP of recursive DNS resolver to use
(required)"),
&dns_ip),
- GNUNET_GETOPT_option_uint ('p',
- "port",
- "UDPPORT",
- gettext_noop (
- "UDP port to listen on for inbound DNS
requests; default: 2853"),
- &listen_port),
GNUNET_GETOPT_OPTION_END
};
int ret;
diff --git a/src/namestore/perf_namestore_api_import.c
b/src/namestore/perf_namestore_api_import.c
index 698a558b7..0bc70b70b 100644
--- a/src/namestore/perf_namestore_api_import.c
+++ b/src/namestore/perf_namestore_api_import.c
@@ -72,10 +72,6 @@ static struct GNUNET_NAMESTORE_QueueEntry *qe;
static int res;
-static unsigned int left_until_next;
-
-static uint8_t seen[1 + BENCHMARK_SIZE / 8];
-
static struct GNUNET_TIME_Absolute start;
struct GNUNET_NAMESTORE_RecordInfo ri[TEST_RECORD_COUNT];
@@ -150,14 +146,6 @@ create_record (unsigned int count)
}
-static void
-fail_cb (void *cls)
-{
- res = 2;
- GNUNET_break (0);
- GNUNET_SCHEDULER_shutdown ();
-}
-
static void
publish_records_single (void *cls);
@@ -342,11 +330,8 @@ put_cont_single (void *cls,
static void
publish_records_single (void *cls)
{
- struct GNUNET_GNSRECORD_Data *rd;
struct GNUNET_TIME_Relative delay;
- char *label;
-
(void) cls;
t = NULL;
if (single_put_pos == TEST_RECORD_COUNT)
@@ -366,8 +351,6 @@ publish_records_single (void *cls)
ri[single_put_pos].a_rd,
&put_cont_single,
NULL);
- GNUNET_free (label);
- GNUNET_free (rd);
}
diff --git a/src/namestore/test_namestore_api_tx_rollback.c
b/src/namestore/test_namestore_api_tx_rollback.c
index ccfd8d701..a631160d7 100644
--- a/src/namestore/test_namestore_api_tx_rollback.c
+++ b/src/namestore/test_namestore_api_tx_rollback.c
@@ -206,7 +206,6 @@ run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- struct GNUNET_GNSRECORD_Data rd;
const char *name = "dummy";
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
diff --git a/src/namestore/test_plugin_namestore.c
b/src/namestore/test_plugin_namestore.c
index cc0703238..e35542ff0 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/namestore/test_plugin_namestore.c
@@ -108,7 +108,6 @@ test_record (void *cls,
for (unsigned int i = 0; i < trd_count; i++)
{
GNUNET_assert (rd[i].data_size == id % 10);
- printf ("%s\n", rd[i].data);
GNUNET_assert (0 == memcmp ("Hello World", rd[i].data, id % 10));
GNUNET_assert (rd[i].record_type == TEST_RECORD_TYPE);
GNUNET_assert (rd[i].flags == 0);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: -warnings; dns2gns fixes,
gnunet <=