diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2010-09-24 18:00:48 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-09-24 18:00:48 +0200 |
| commit | a4008f4f12c66559789f9b83742d780f3c1a5468 (patch) | |
| tree | 2710cb7933c5b2fdaaf2e9ad94739103df5a5cd1 /plugins | |
| parent | eadb99ab231b2400ed8f7b535d7421f7ddac7eaf (diff) | |
| download | connman-a4008f4f12c66559789f9b83742d780f3c1a5468.tar.gz connman-a4008f4f12c66559789f9b83742d780f3c1a5468.tar.bz2 connman-a4008f4f12c66559789f9b83742d780f3c1a5468.zip | |
Add a protocol field to the DNS request structure
This is cleaner than checking for the client socket value.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dnsproxy.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/dnsproxy.c b/plugins/dnsproxy.c index f12fd27f..6cd2e909 100644 --- a/plugins/dnsproxy.c +++ b/plugins/dnsproxy.c @@ -90,6 +90,7 @@ struct server_data { struct request_data { struct sockaddr_in sin; int client_sk; + int protocol; socklen_t len; guint16 srcid; guint16 dstid; @@ -454,7 +455,7 @@ static gboolean tcp_server_event(GIOChannel *channel, GIOCondition condition, struct request_data *req = list->data; struct domain_hdr *hdr = (void *) (req->request + 2); - if (!req->client_sk) + if (req->protocol == IPPROTO_UDP) continue; /* @@ -492,7 +493,7 @@ static gboolean tcp_server_event(GIOChannel *channel, GIOCondition condition, for (list = request_list; list; list = list->next) { struct request_data *req = list->data; - if (!req->client_sk) + if (req->protocol == IPPROTO_UDP) continue; DBG("Sending req %s over TCP", (char *)req->name); @@ -939,6 +940,7 @@ static gboolean tcp_listener_event(GIOChannel *channel, GIOCondition condition, memcpy(&req->sin, (struct sockaddr_in *)&client_addr, sizeof(req->sin)); req->client_sk = client_sk; + req->protocol = IPPROTO_TCP; req->len = client_addr_len; request_id += 2; @@ -1039,6 +1041,7 @@ static gboolean udp_listener_event(GIOChannel *channel, GIOCondition condition, memcpy(&req->sin, &sin, sizeof(sin)); req->client_sk = 0; + req->protocol = IPPROTO_UDP; req->len = size; request_id += 2; |