#include <gnunet_util_lib.h>
#include <gnunet_dnsparser_lib.h>
#include <gnunet_gns_service.h>
+#include <gnunet_dnsstub_lib.h>
+#include "gns.h"
/**
* Timeout for DNS requests.
*/
#define TIMEOUT GNUNET_TIME_UNIT_MINUTES
+/**
+ * Default suffix
+ */
+#define DNS_SUFFIX ".zkey.eu"
+
+/**
+ * FCFS suffix
+ */
+#define FCFS_SUFFIX "fcfs.zkey.eu"
+
/**
* Data kept per request.
*/
*/
struct GNUNET_GNS_LookupRequest *lookup;
+ /**
+ * Our DNS request handle
+ */
+ struct GNUNET_DNSSTUB_RequestSocket *dns_lookup;
+
/**
* Task run on timeout or shutdown to clean up without
* response.
*/
struct GNUNET_GNS_Handle *gns;
+/**
+ * Stub resolver
+ */
+struct GNUNET_DNSSTUB_Context *dns_stub;
+
/**
* Listen socket for IPv4.
*/
*/
static GNUNET_SCHEDULER_TaskIdentifier t6;
+/**
+ * DNS suffix, suffix of this gateway in DNS; defaults to '.zkey.eu'
+ */
+static char *dns_suffix;
+
+/**
+ * FCFS suffix, suffix of FCFS-authority in DNS; defaults to 'fcfs.zkey.eu'.
+ */
+static char *fcfs_suffix;
+
+/**
+ * IP of DNS server
+ */
+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.
}
GNUNET_GNS_disconnect (gns);
gns = NULL;
+ GNUNET_DNSSTUB_stop (dns_stub);
+ dns_stub = NULL;
}
GNUNET_DNSPARSER_free_packet (request->packet);
if (NULL != request->lookup)
GNUNET_GNS_cancel_lookup_request (request->lookup);
+ if (NULL != request->dns_lookup)
+ GNUNET_DNSSTUB_resolve_cancel (request->dns_lookup);
GNUNET_free (request);
}
+/**
+ * Iterator called on obtained result for a DNS
+ * lookup
+ *
+ * @param cls closure
+ * @param rs the request socket
+ * @param dns the DNS udp payload
+ * @param r size of the DNS payload
+ */
+static void
+dns_result_processor (void *cls,
+ struct GNUNET_DNSSTUB_RequestSocket *rs,
+ const struct GNUNET_TUN_DnsHeader *dns,
+ size_t r)
+{
+ struct Request *request = cls;
+
+ request->packet = GNUNET_DNSPARSER_parse ((char*)dns, r);
+ send_response (request);
+}
+
+
/**
* Iterator called on obtained result for a GNS
* lookup
//packet->flags.opcode = GNUNET_DNSPARSER_OPCODE_STATUS; // ???
for (i=0;i<rd_count;i++)
{
+ rec.expiration_time.abs_value_us = rd[i].expiration_time;
switch (rd[i].record_type)
{
case GNUNET_DNSPARSER_TYPE_A:
struct Request *request;
struct GNUNET_DNSPARSER_Packet *packet;
char *name;
+ char *dot;
+ char *nname;
size_t name_len;
- enum GNUNET_GNS_RecordType type;
+ int type;
int use_gns;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
packet = GNUNET_DNSPARSER_parse (udp_msg, udp_msg_size);
if (NULL == packet)
GNUNET_a2s (addr, addr_len));
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "%d, %d, %d, %d\n",
- packet->flags.query_or_response,
- packet->num_answers,
- packet->num_authority_records,
- packet->num_additional_records);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received request for `%s' with flags %u, #answers %d, #auth %d, #additional %d\n",
+ packet->queries[0].name,
+ (unsigned int) packet->flags.query_or_response,
+ (int) packet->num_answers,
+ (int) packet->num_authority_records,
+ (int) packet->num_additional_records);
if ( (0 != packet->flags.query_or_response) ||
(0 != packet->num_answers) ||
(0 != packet->num_authority_records))
name = GNUNET_strdup (packet->queries[0].name);
name_len = strlen (name);
use_gns = GNUNET_NO;
- if ( (name_len > strlen (".zkey.eu")) &&
- (0 == strcasecmp (".zkey.eu",
- &name[name_len - strlen (".zkey.eu")])) )
+ if ( (name_len > strlen (dns_suffix)) &&
+ (0 == strcasecmp (dns_suffix,
+ &name[name_len - strlen (dns_suffix)])) )
{
- if (0 == strcasecmp ("fcfs.zkey.eu",
- &name[name_len - strlen ("fcfs.zkey.eu")]))
+ /* Test if '.zkey' was requested */
+ name[name_len - strlen (dns_suffix)] = '\0';
+ dot = strrchr (name, (int) '.');
+ if ( (NULL != dot) &&
+ (GNUNET_OK ==
+ GNUNET_CRYPTO_short_hash_from_string (dot + 1, &zone)) )
{
- name[name_len - strlen ("zkey.eu")] = '\0';
- strcat (name, ".gnunet");
+ /* valid '.zkey' name */
+ GNUNET_asprintf (&nname,
+ "%s.%s",
+ name,
+ GNUNET_GNS_TLD_ZKEY);
+ GNUNET_free (name);
+ name = nname;
}
else
- name[name_len - strlen (".eu")] = '\0';
+ {
+ /* try '.gads' name */
+ GNUNET_asprintf (&nname,
+ "%s.%s",
+ name,
+ GNUNET_GNS_TLD);
+ GNUNET_free (name);
+ name = nname;
+ }
name_len = strlen (name);
}
- if ( (name_len > strlen (".gnunet")) &&
- (0 == strcasecmp (".gnunet",
- &name[name_len - strlen (".gnunet")])) )
+ if ( (name_len >= strlen ((GNUNET_GNS_TLD))) &&
+ (0 == strcasecmp (GNUNET_GNS_TLD,
+ &name[name_len - strlen (GNUNET_GNS_TLD)])) )
use_gns = GNUNET_YES;
- if ( (name_len > strlen (".zkey")) &&
- (0 == strcasecmp (".zkey",
- &name[name_len - strlen (".zkey")])) )
+ if ( (name_len > strlen (GNUNET_GNS_TLD_ZKEY)) &&
+ (0 == strcasecmp (GNUNET_GNS_TLD_ZKEY,
+ &name[name_len - strlen (GNUNET_GNS_TLD_ZKEY)])) )
use_gns = GNUNET_YES;
if (GNUNET_YES == use_gns)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Calling GNS\n");
type = packet->queries[0].type;
request->lookup = GNUNET_GNS_lookup (gns,
name,
}
else
{
- /* FIXME: do traditional *DNS* lookup; note that
- gnunet-service-dns already has code to do this;
- factor into library to share! Why not use GNUNET_RESOLVER here?*/
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Calling DNS at %s\n", dns_ip);
+ GNUNET_DNSPARSER_free_packet (request->packet);
+ request->packet = NULL;
+ request->dns_lookup = GNUNET_DNSSTUB_resolve2 (dns_stub,
+ udp_msg,
+ udp_msg_size,
+ &dns_result_processor,
+ request);
}
GNUNET_free (name);
}
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- gns = GNUNET_GNS_connect (cfg);
- if (NULL == gns)
+ if (NULL == dns_ip)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No DNS server specified!\n");
+ return;
+ }
+
+ if (NULL == dns_suffix)
+ dns_suffix = DNS_SUFFIX;
+ if (NULL == fcfs_suffix)
+ fcfs_suffix = FCFS_SUFFIX;
+ if (NULL == (gns = GNUNET_GNS_connect (cfg)))
return;
+ if (NULL == (dns_stub = GNUNET_DNSSTUB_start (dns_ip)))
+ {
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
+ return;
+ }
listen_socket4 = GNUNET_NETWORK_socket_create (PF_INET,
SOCK_DGRAM,
IPPROTO_UDP);
#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);
#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);
}
if ( (NULL == listen_socket4) &&
(NULL == listen_socket6) )
- return;
+ {
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
+ GNUNET_DNSSTUB_stop (dns_stub);
+ dns_stub = NULL;
+ return;
+ }
if (NULL != listen_socket4)
t4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
listen_socket4,
char *const *argv)
{
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ {'d', "dns", "IP",
+ gettext_noop ("IP of recursive DNS resolver to use (required)"), 1,
+ &GNUNET_GETOPT_set_string, &dns_ip},
+ {'s', "suffix", "SUFFIX",
+ gettext_noop ("Authoritative DNS suffix to use (optional); default: zkey.eu"), 1,
+ &GNUNET_GETOPT_set_string, &dns_suffix},
+ {'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;
_("GNUnet DNS-to-GNS proxy (a DNS server)"),
options,
&run, NULL)) ? 0 : 1;
-
+ GNUNET_free ((void*) argv);
return ret;
}
projects / oweals / gnunet.git / blobdiff