From 973d42debe1b628eeceaad7259befaa7ad99a81a Mon Sep 17 00:00:00 2001
From: Erik Ekman <yarrick@kryo.se>
Date: Mon, 5 Jun 2006 20:41:54 +0000
Subject: [PATCH] Integrated func dns_handle_reply into dns_read

---
 dns.c | 52 ++++++++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/dns.c b/dns.c
index a0a4805..a7f8cb7 100644
--- a/dns.c
+++ b/dns.c
@@ -177,37 +177,6 @@ dns_handle_tun(int fd, char *data, int len)
 	dns_send_chunk(fd);
 }
 
-static int
-dns_handle_reply(int fd, char *data, int len)
-{
-	uint16_t id;
-	char *p;
-
-	p = data;
-	READSHORT(id, p);
-
-	// Handle ACKing
-	if (dns_sending() && id == chunkid) {
-		// Got ACK on sent packet
-		packetpos += lastlen;
-		if (packetpos == packetlen) {
-			// Packet completed
-			printf("IP packet size %d sent successfully!\n", packetlen);
-			packetpos = 0;
-			packetlen = 0;
-			lastlen = 0;
-		} else {
-			// More to send
-			dns_send_chunk(fd);
-		}
-	}
-
-	// Detect if any data is attached
-	// TODO
-	
-	return 0;
-}
-
 void
 dns_ping(int dns_fd)
 {
@@ -357,16 +326,31 @@ dns_read(int fd, char *buf, int buflen)
 					READSHORT(port, r);
 					READNAME(packet, host, r);
 				}
-			//	printf("%s\n", name);
 			}
-			// Is any data attached?
-			return dns_handle_reply(fd, packet, r);
+			if (dns_sending() && chunkid == ntohs(header->id)) {
+				// Got ACK on sent packet
+				packetpos += lastlen;
+				if (packetpos == packetlen) {
+					// Packet completed
+					printf("IP packet size %d sent successfully!\n", packetlen);
+					packetpos = 0;
+					packetlen = 0;
+					lastlen = 0;
+				} else {
+					// More to send
+					dns_send_chunk(fd);
+				}
+			}
+
+			// TODO  is any data attached? find out and copy into buf and return length
+			return 0;
 		}
 	}
 
 	return 0;
 }
 
+
 static int
 host2dns(const char *host, char *buffer, int size)
 {