Changeset 4e582e

Timestamp:

07/12/07 01:10:08 (6 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

iodine-0.5, iodine-0.6

Children:

17c41d

Parents:

11748b

git-author:

Erik Ekman <yarrick@…> (07/12/07 01:10:08)

git-committer:

Erik Ekman <yarrick@…> (07/12/07 01:10:08)

Message:

use common send_query function

File:

• src/iodine.c (modified) (4 diffs)

src/iodine.c

@@ -76 +76 @@
 
 static void
-send_packet(int fd, char cmd, const char *data, const size_t datalen)
+send_query(int fd, char *hostname)
 {
         char packet[4096];
         struct query q;
-        char buf[4096];
         size_t len;
 
@@ -86 +85 @@
         q.type = T_NULL;
 
+        len = dns_encode(packet, sizeof(packet), &q, QR_QUERY, hostname, strlen(hostname));
+
+        sendto(fd, packet, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+}
+
+static void
+send_packet(int fd, char cmd, const char *data, const size_t datalen)
+{
+        char buf[4096];
+
         buf[0] = cmd;
         
-        len = build_hostname(buf + 1, sizeof(buf) - 1, data, datalen, topdomain, b32);
-        len = dns_encode(packet, sizeof(packet), &q, QR_QUERY, buf, strlen(buf));
-
-        sendto(fd, packet, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+        build_hostname(buf + 1, sizeof(buf) - 1, data, datalen, topdomain, b32);
+        send_query(fd, buf);
 }
 
@@ -266 +273 @@
 {
         char hex[] = "0123456789ABCDEF";
-        char data[4096];
-        struct query q;
         char buf[4096];
         int avail;
         int code;
         char *p;
-        int len;
-
-        q.id = ++chunkid;
-        q.type = T_NULL;
 
         p = packet.data;
@@ -290 +291 @@
         code |= (userid << 1);
         buf[0] = hex[code];
-        len = dns_encode(data, sizeof(data), &q, QR_QUERY, buf, strlen(buf));
-
-        sendto(fd, data, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+
+        send_query(fd, buf);
 }