diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-12 20:27:37 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-12 20:27:37 +0900 |
commit | 342ab049a74a951d30584ee88ae12765846ee38d (patch) | |
tree | 2f88af505f9c1e0a7ff8190ec23bcf56807ee604 | |
parent | 49030ceea9aa1761649d17fe688421d7b95a8fc7 (diff) | |
download | gnunet-342ab049a74a951d30584ee88ae12765846ee38d.tar.gz gnunet-342ab049a74a951d30584ee88ae12765846ee38d.zip |
-warnings; dns2gns fixes
-rw-r--r-- | src/gns/gns.conf.in | 7 | ||||
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 16 | ||||
-rw-r--r-- | src/namestore/perf_namestore_api_import.c | 17 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_tx_rollback.c | 1 | ||||
-rw-r--r-- | 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 | |||
39 | [dns2gns] | 39 | [dns2gns] |
40 | BINARY = gnunet-dns2gns | 40 | BINARY = gnunet-dns2gns |
41 | START_ON_DEMAND = NO | 41 | START_ON_DEMAND = NO |
42 | RUN_PER_USER = YES | 42 | RUN_PER_USER = NO |
43 | BIND_TO=127.0.0.1 | 43 | BIND_TO=127.0.0.1 |
44 | BIND_TO6=::1 | 44 | BIND_TO6=::1 |
45 | 45 | ||
46 | # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use, -p port to use | 46 | # -d: DNS resolver to use |
47 | OPTIONS = -d 8.8.8.8 -p 5353 | 47 | OPTIONS = -d 9.9.9.9 |
48 | 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; | |||
193 | /** | 193 | /** |
194 | * UDP Port we listen on for inbound DNS requests. | 194 | * UDP Port we listen on for inbound DNS requests. |
195 | */ | 195 | */ |
196 | static unsigned int listen_port = 53; | 196 | static unsigned long long listen_port = 53; |
197 | 197 | ||
198 | /** | 198 | /** |
199 | * Configuration to use. | 199 | * Configuration to use. |
@@ -561,7 +561,8 @@ result_processor (void *cls, | |||
561 | if ((GNUNET_DNSPARSER_TYPE_A != request->packet->queries[0].type) && | 561 | if ((GNUNET_DNSPARSER_TYPE_A != request->packet->queries[0].type) && |
562 | (GNUNET_DNSPARSER_TYPE_AAAA != request->packet->queries[0].type)) | 562 | (GNUNET_DNSPARSER_TYPE_AAAA != request->packet->queries[0].type)) |
563 | break; | 563 | break; |
564 | af = (GNUNET_DNSPARSER_TYPE_A == request->packet->queries[0].type) ? AF_INET : | 564 | af = (GNUNET_DNSPARSER_TYPE_A == request->packet->queries[0].type) ? |
565 | AF_INET : | ||
565 | AF_INET6; | 566 | AF_INET6; |
566 | if (sizeof(struct GNUNET_TUN_GnsVpnRecord) > | 567 | if (sizeof(struct GNUNET_TUN_GnsVpnRecord) > |
567 | rd[i].data_size) | 568 | rd[i].data_size) |
@@ -903,6 +904,11 @@ run (void *cls, | |||
903 | return; | 904 | return; |
904 | } | 905 | } |
905 | GNUNET_free (addr_str); | 906 | GNUNET_free (addr_str); |
907 | if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (c, "dns2gns", | ||
908 | "PORT", | ||
909 | &listen_port)) | ||
910 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
911 | "Listening on %llu\n", listen_port); | ||
906 | 912 | ||
907 | listen_socket4 = GNUNET_NETWORK_socket_create (PF_INET, | 913 | listen_socket4 = GNUNET_NETWORK_socket_create (PF_INET, |
908 | SOCK_DGRAM, | 914 | SOCK_DGRAM, |
@@ -994,12 +1000,6 @@ main (int argc, | |||
994 | gettext_noop ( | 1000 | gettext_noop ( |
995 | "IP of recursive DNS resolver to use (required)"), | 1001 | "IP of recursive DNS resolver to use (required)"), |
996 | &dns_ip), | 1002 | &dns_ip), |
997 | GNUNET_GETOPT_option_uint ('p', | ||
998 | "port", | ||
999 | "UDPPORT", | ||
1000 | gettext_noop ( | ||
1001 | "UDP port to listen on for inbound DNS requests; default: 2853"), | ||
1002 | &listen_port), | ||
1003 | GNUNET_GETOPT_OPTION_END | 1003 | GNUNET_GETOPT_OPTION_END |
1004 | }; | 1004 | }; |
1005 | int ret; | 1005 | 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; | |||
72 | 72 | ||
73 | static int res; | 73 | static int res; |
74 | 74 | ||
75 | static unsigned int left_until_next; | ||
76 | |||
77 | static uint8_t seen[1 + BENCHMARK_SIZE / 8]; | ||
78 | |||
79 | static struct GNUNET_TIME_Absolute start; | 75 | static struct GNUNET_TIME_Absolute start; |
80 | 76 | ||
81 | struct GNUNET_NAMESTORE_RecordInfo ri[TEST_RECORD_COUNT]; | 77 | struct GNUNET_NAMESTORE_RecordInfo ri[TEST_RECORD_COUNT]; |
@@ -151,14 +147,6 @@ create_record (unsigned int count) | |||
151 | 147 | ||
152 | 148 | ||
153 | static void | 149 | static void |
154 | fail_cb (void *cls) | ||
155 | { | ||
156 | res = 2; | ||
157 | GNUNET_break (0); | ||
158 | GNUNET_SCHEDULER_shutdown (); | ||
159 | } | ||
160 | |||
161 | static void | ||
162 | publish_records_single (void *cls); | 150 | publish_records_single (void *cls); |
163 | 151 | ||
164 | static void | 152 | static void |
@@ -342,11 +330,8 @@ put_cont_single (void *cls, | |||
342 | static void | 330 | static void |
343 | publish_records_single (void *cls) | 331 | publish_records_single (void *cls) |
344 | { | 332 | { |
345 | struct GNUNET_GNSRECORD_Data *rd; | ||
346 | struct GNUNET_TIME_Relative delay; | 333 | struct GNUNET_TIME_Relative delay; |
347 | 334 | ||
348 | char *label; | ||
349 | |||
350 | (void) cls; | 335 | (void) cls; |
351 | t = NULL; | 336 | t = NULL; |
352 | if (single_put_pos == TEST_RECORD_COUNT) | 337 | if (single_put_pos == TEST_RECORD_COUNT) |
@@ -366,8 +351,6 @@ publish_records_single (void *cls) | |||
366 | ri[single_put_pos].a_rd, | 351 | ri[single_put_pos].a_rd, |
367 | &put_cont_single, | 352 | &put_cont_single, |
368 | NULL); | 353 | NULL); |
369 | GNUNET_free (label); | ||
370 | GNUNET_free (rd); | ||
371 | } | 354 | } |
372 | 355 | ||
373 | 356 | ||
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, | |||
206 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 206 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
207 | struct GNUNET_TESTING_Peer *peer) | 207 | struct GNUNET_TESTING_Peer *peer) |
208 | { | 208 | { |
209 | struct GNUNET_GNSRECORD_Data rd; | ||
210 | const char *name = "dummy"; | 209 | const char *name = "dummy"; |
211 | 210 | ||
212 | endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | 211 | 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, | |||
108 | for (unsigned int i = 0; i < trd_count; i++) | 108 | for (unsigned int i = 0; i < trd_count; i++) |
109 | { | 109 | { |
110 | GNUNET_assert (rd[i].data_size == id % 10); | 110 | GNUNET_assert (rd[i].data_size == id % 10); |
111 | printf ("%s\n", rd[i].data); | ||
112 | GNUNET_assert (0 == memcmp ("Hello World", rd[i].data, id % 10)); | 111 | GNUNET_assert (0 == memcmp ("Hello World", rd[i].data, id % 10)); |
113 | GNUNET_assert (rd[i].record_type == TEST_RECORD_TYPE); | 112 | GNUNET_assert (rd[i].record_type == TEST_RECORD_TYPE); |
114 | GNUNET_assert (rd[i].flags == 0); | 113 | GNUNET_assert (rd[i].flags == 0); |