-use valid ECC keys for testing

[oweals/gnunet.git] / src / gns / gnunet-dns2gns.c

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 4954e3b4cf91d6511c01d2ce40227fe73509eb95..ec64f0730cfdb14c68e6c831a1f32ed2e08a18df 100644 (file)
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -134,6 +134,12 @@ static char *fcfs_suffix;
  */
 static char *dns_ip;
 
+/**
+ * UDP Port we listen on for inbound DNS requests.
+ */
+static unsigned int listen_port = 53;
+
+
 /**
  * Task run on shutdown.  Cleans up everything.
  *
@@ -598,11 +604,12 @@ run (void *cls, char *const *args, const char *cfgfile,
 #if HAVE_SOCKADDR_IN_SIN_LEN
       v4.sin_len = sizeof (v4);
 #endif
-      v4.sin_port = htons (53);
+      v4.sin_port = htons (listen_port);
       if (GNUNET_OK !=
          GNUNET_NETWORK_socket_bind (listen_socket4,
                                      (struct sockaddr *) &v4,
-                                     sizeof (v4)))
+                                     sizeof (v4),
+                                      0))
        {
          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
          GNUNET_NETWORK_socket_close (listen_socket4);
@@ -621,11 +628,12 @@ run (void *cls, char *const *args, const char *cfgfile,
 #if HAVE_SOCKADDR_IN_SIN_LEN
       v6.sin6_len = sizeof (v6);
 #endif
-      v6.sin6_port = htons (53);
+      v6.sin6_port = htons (listen_port);
       if (GNUNET_OK !=
          GNUNET_NETWORK_socket_bind (listen_socket6,
                                      (struct sockaddr *) &v6,
-                                     sizeof (v6)))
+                                     sizeof (v6),
+                                      0))
        {
          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
          GNUNET_NETWORK_socket_close (listen_socket6);
@@ -678,6 +686,9 @@ main (int argc,
     {'f', "fcfs", "NAME",
       gettext_noop ("Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"), 1,
       &GNUNET_GETOPT_set_string, &fcfs_suffix},
+    {'p', "port", "UDPPORT",
+      gettext_noop ("UDP port to listen on for inbound DNS requests; default: 53"), 1,
+      &GNUNET_GETOPT_set_uint, &listen_port},
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
@@ -692,7 +703,7 @@ main (int argc,
                            _("GNUnet DNS-to-GNS proxy (a DNS server)"), 
                           options,
                            &run, NULL)) ? 0 : 1;
-
+  GNUNET_free ((void*) argv);
   return ret;
 }