static GNUNET_SCHEDULER_TaskIdentifier t6;
/**
- * DNS suffix
+ * DNS suffix, suffix of this gateway in DNS; defaults to '.zkey.eu'
*/
static char *dns_suffix;
/**
- * FCFS suffix
+ * FCFS suffix, suffix of FCFS-authority in DNS; defaults to 'fcfs.zkey.eu'.
*/
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.
*
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
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 = rd[i].expiration_time;
+ 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)
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received request for %s with flags %u, #answers %d, #auth %d, #additional %d\n",
- packet->queries[0].name,
+ "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,
(0 == strcasecmp (dns_suffix,
&name[name_len - strlen (dns_suffix)])) )
{
- /*
- * FIXME: Here we want to query fcfs. But what is fcfs in our
- * context?? -> we need a PKEY or name
- */
- if ( (name_len >= strlen (fcfs_suffix)) &&
- (0 == strcasecmp (fcfs_suffix,
- &name[name_len - strlen (fcfs_suffix)])) )
+ /* 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 (fcfs_suffix)] = '\0';
- if (0 == strcmp (name, ""))
- strcpy (name, GNUNET_GNS_TLD);
- else
- {
- if (sizeof (name) < (strlen (GNUNET_GNS_TLD)+strlen (name)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Name %s.%s is too long!\n",
- name,
- GNUNET_GNS_TLD);
- GNUNET_DNSPARSER_free_packet (request->packet);
- return;
- }
- sprintf (name, "%s.%s", name, GNUNET_GNS_TLD);
- }
+ /* valid '.zkey' name */
+ GNUNET_asprintf (&nname,
+ "%s.%s",
+ name,
+ GNUNET_GNS_TLD_ZKEY);
+ GNUNET_free (name);
+ name = nname;
}
else
- {
- name[name_len - strlen (dns_suffix)] = '\0';
- if (0 == strcmp (name, ""))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No zkey given!\n");
- GNUNET_DNSPARSER_free_packet (request->packet);
- return;
- }
- if (sizeof (name) < (strlen (GNUNET_GNS_TLD_ZKEY)+strlen (name)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Name %s.%s is too long!\n",
- name,
- GNUNET_GNS_TLD);
- GNUNET_DNSPARSER_free_packet (request->packet);
- return;
- }
- sprintf (name, "%s.%s", name, GNUNET_GNS_TLD_ZKEY);
+ {
+ /* try '.gads' name */
+ GNUNET_asprintf (&nname,
+ "%s.%s",
+ name,
+ GNUNET_GNS_TLD);
+ GNUNET_free (name);
+ name = nname;
}
name_len = strlen (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_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);
}
#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);
char *const *argv)
{
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'d', "dns", NULL,
- gettext_noop ("IP of recursive dns resolver to use (required)"), 1,
+ {'d', "dns", "IP",
+ gettext_noop ("IP of recursive DNS resolver to use (required)"), 1,
&GNUNET_GETOPT_set_string, &dns_ip},
- {'s', "suffix", NULL,
+ {'s', "suffix", "SUFFIX",
gettext_noop ("Authoritative DNS suffix to use (optional); default: zkey.eu"), 1,
&GNUNET_GETOPT_set_string, &dns_suffix},
- {'f', "fcfs", NULL,
+ {'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