From: Daniel Wagner Date: Tue, 10 Jan 2012 12:39:23 +0000 (+0100) Subject: dnsproxy: Empty lines cleanup X-Git-Tag: 2.0_alpha~725 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ffb83fdc10568aa288e1288811b233c889cce86;p=framework%2Fconnectivity%2Fconnman.git dnsproxy: Empty lines cleanup Add and remove some empty lines. --- diff --git a/src/dnsproxy.c b/src/dnsproxy.c index a92c777..adf7535 100644 --- a/src/dnsproxy.c +++ b/src/dnsproxy.c @@ -280,11 +280,13 @@ static void dummy_resolve_func(GResolvResultStatus status, static void refresh_dns_entry(struct cache_entry *entry, char *name) { int age = 1; + if (ipv4_resolve == NULL) { ipv4_resolve = g_resolv_new(0); g_resolv_set_address_family(ipv4_resolve, AF_INET); g_resolv_add_nameserver(ipv4_resolve, "127.0.0.1", 53, 0); } + if (ipv6_resolve == NULL) { ipv6_resolve = g_resolv_new(0); g_resolv_set_address_family(ipv6_resolve, AF_INET6); @@ -297,19 +299,19 @@ static void refresh_dns_entry(struct cache_entry *entry, char *name) dummy_resolve_func, NULL); age = 4; } + if (entry->ipv6 == NULL) { DBG("Refresing AAAA record for %s", name); g_resolv_lookup_hostname(ipv6_resolve, name, dummy_resolve_func, NULL); age = 4; } + entry->hits -= age; if (entry->hits < 0) entry->hits = 0; } - - static int dns_name_length(unsigned char *buf) { if ((buf[0] & NS_CMPRSFLGS) == NS_CMPRSFLGS) /* compressed name */ @@ -365,8 +367,6 @@ static void update_cached_ttl(unsigned char *buf, int len, int new_ttl) } } - - static void send_cached_response(int sk, unsigned char *buf, int len, const struct sockaddr *to, socklen_t tolen, int protocol, int id, uint16_t answers, int ttl) @@ -1178,8 +1178,6 @@ static void cache_refresh(void) g_hash_table_foreach(cache, cache_refresh_iterator, NULL); } - - static int reply_query_type(unsigned char *msg, int len) { unsigned char *c; @@ -1200,6 +1198,7 @@ static int reply_query_type(unsigned char *msg, int len) len -= l; w = (uint16_t *) c; type = ntohs(*w); + return type; }