/**
*
- * @file gns/gns_interceptor.c
+ * @file gns/gnunet-service-gns_interceptor.c
* @brief GNUnet GNS interceptor logic
* @author Martin Schanzenbach
*/
*/
struct InterceptLookupHandle
{
- /* the request handle to reply to */
+ /**
+ * the request handle to reply to
+ */
struct GNUNET_DNS_RequestHandle *request_handle;
- /* the dns parser packet received */
+ /**
+ * the dns parser packet received
+ */
struct GNUNET_DNSPARSER_Packet *packet;
- /* the query parsed from the packet */
+ /**
+ * the query parsed from the packet
+ */
struct GNUNET_DNSPARSER_Query *query;
};
/**
* Our handle to the DNS handler library
*/
-struct GNUNET_DNS_Handle *dns_handle;
+static struct GNUNET_DNS_Handle *dns_handle;
/**
* The root zone for this interceptor
*/
-static GNUNET_HashCode our_zone;
+static struct GNUNET_CRYPTO_ShortHashCode our_zone;
+
+/**
+ * Our priv key
+ */
+static struct GNUNET_CRYPTO_RsaPrivateKey *our_key;
+
+/**
+ * Default timeout
+ */
+static struct GNUNET_TIME_Relative default_lookup_timeout;
+
/**
* Reply to dns request with the result from our lookup.
*
* @param cls the closure to the request (an InterceptLookupHandle)
- * @param rh the request handle of the lookup
* @param rd_count the number of records to return
* @param rd the record data
*/
reply_to_dns(void* cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- int i;
+ uint32_t i;
size_t len;
int ret;
char *buf;
{
answer_records[i].name = ilh->query->name;
answer_records[i].type = rd[i].record_type;
- answer_records[i].data.raw.data_len = rd[i].data_size;
- answer_records[i].data.raw.data = (char*)rd[i].data;
- answer_records[i].expiration_time = rd[i].expiration;
+ switch(rd[i].record_type)
+ {
+ case GNUNET_GNS_RECORD_NS:
+ case GNUNET_GNS_RECORD_CNAME:
+ case GNUNET_GNS_RECORD_PTR:
+ answer_records[i].data.hostname = (char*)rd[i].data;
+ break;
+ case GNUNET_GNS_RECORD_SOA:
+ answer_records[i].data.soa =
+ (struct GNUNET_DNSPARSER_SoaRecord *)rd[i].data;
+ break;
+ case GNUNET_GNS_RECORD_MX:
+ answer_records[i].data.mx =
+ (struct GNUNET_DNSPARSER_MxRecord *)rd[i].data;
+ break;
+ default:
+ answer_records[i].data.raw.data_len = rd[i].data_size;
+ answer_records[i].data.raw.data = (char*)rd[i].data;
+ }
+ GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+ answer_records[i].expiration_time.abs_value = rd[i].expiration_time;
answer_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
}
else
{
additional_records[i].name = ilh->query->name;
additional_records[i].type = rd[i].record_type;
- additional_records[i].data.raw.data_len = rd[i].data_size;
- additional_records[i].data.raw.data = (char*)rd[i].data;
- additional_records[i].expiration_time = rd[i].expiration;
+ switch(rd[i].record_type)
+ {
+ case GNUNET_GNS_RECORD_NS:
+ case GNUNET_GNS_RECORD_CNAME:
+ case GNUNET_GNS_RECORD_PTR:
+ additional_records[i].data.hostname = (char*)rd[i].data;
+ break;
+ case GNUNET_GNS_RECORD_SOA:
+ additional_records[i].data.soa =
+ (struct GNUNET_DNSPARSER_SoaRecord *)rd[i].data;
+ break;
+ case GNUNET_GNS_RECORD_MX:
+ additional_records[i].data.mx =
+ (struct GNUNET_DNSPARSER_MxRecord *)rd[i].data;
+ break;
+ default:
+ additional_records[i].data.raw.data_len = rd[i].data_size;
+ additional_records[i].data.raw.data = (char*)rd[i].data;
+ }
+ GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+ additional_records[i].expiration_time.abs_value = rd[i].expiration_time;
additional_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
}
}
packet->num_additional_records = 0;
packet->additional_records = NULL;
GNUNET_DNSPARSER_free_packet(packet);
- //FIXME free resolver handle in resp functions in resolver!
- //GNUNET_free((struct RecordLookupHandle*)rh->proc_cls);
- //free_resolver_handle(rh);
GNUNET_free(ilh);
}
ilh->request_handle = request;
/* Start resolution in our zone */
- gns_resolver_lookup_record(our_zone, q->type, q->name, &reply_to_dns, ilh);
+ gns_resolver_lookup_record(our_zone, our_zone, q->type, q->name,
+ our_key,
+ default_lookup_timeout,
+ GNUNET_NO,
+ &reply_to_dns, ilh);
}
const char *request)
{
struct GNUNET_DNSPARSER_Packet *p;
- int i;
- char *tldoffset;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hijacked a DNS request...processing\n");
p = GNUNET_DNSPARSER_parse (request, request_length);
if (p->num_queries > 1)
{
- /* Note: We could also look for .gnunet */
+ /* Note: We could also look for .gads */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
">1 queriy in DNS packet... odd. We only process #1\n");
}
/**
- * Check for .gnunet
+ * Check for .gads/.zkey
*/
- tldoffset = p->queries[0].name + strlen(p->queries[0].name) - 1;
-
- for (i=0; i<strlen(p->queries[0].name); i++)
- {
- if (*(tldoffset-i) == '.')
- break;
- }
-
- i--;
- if ((i==strlen(GNUNET_GNS_TLD)-1)
- && (0 == strcmp(tldoffset-i, GNUNET_GNS_TLD)))
+ if ((is_gnunet_tld(p->queries[0].name) == GNUNET_YES) ||
+ (is_zkey_tld(p->queries[0].name) == GNUNET_YES) ||
+ (strcmp(p->queries[0].name, GNUNET_GNS_TLD) == 0))
{
start_resolution_for_dns(rh, p, p->queries);
}
}
+/**
+ * Initialized the interceptor
+ *
+ * @param zone the zone to work in
+ * @param key the prov key of the zone (can be null, needed for caching)
+ * @param c the configuration
+ * @return GNUNET_OK on success
+ */
int
-gns_interceptor_init(GNUNET_HashCode zone,
+gns_interceptor_init(struct GNUNET_CRYPTO_ShortHashCode zone,
+ struct GNUNET_CRYPTO_RsaPrivateKey *key,
const struct GNUNET_CONFIGURATION_Handle *c)
{
+ unsigned long long default_lookup_timeout_secs = 0;
+
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
"DNS hijacking enabled... connecting to service.\n");
our_zone = zone;
+ our_key = key;
/**
* Do gnunet dns init here
*/
GNUNET_DNS_FLAG_PRE_RESOLUTION,
&handle_dns_request, /* rh */
NULL); /* Closure */
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number(c, "gns",
+ "DEFAULT_LOOKUP_TIMEOUT",
+ &default_lookup_timeout_secs))
+ {
+ default_lookup_timeout = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ default_lookup_timeout_secs);
+ }
+
if (NULL == dns_handle)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
return GNUNET_YES;
}
+/**
+ * Disconnect from interceptor
+ */
+void
+gns_interceptor_stop(void)
+{
+ if (dns_handle)
+ GNUNET_DNS_disconnect(dns_handle);
+}
+
/* end of gns_interceptor.c */
projects / oweals / gnunet.git / blobdiff