Changeset 11748b

Timestamp:

07/12/07 00:39:56 (6 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

iodine-0.5, iodine-0.6

Children:

4e582e

Parents:

5f6b71

git-author:

Erik Ekman <yarrick@…> (07/12/07 00:39:56)

git-committer:

Erik Ekman <yarrick@…> (07/12/07 00:39:56)

Message:

converted iodine.c to use packet struct

Location:

src

Files:

• common.h (modified) (1 diff)
• iodine.c (modified) (9 diffs)

src/common.h

@@ -31 +31 @@
 struct packet 
 {
-        int len;
-        int offset;
-        char data[64*1024];
+        int len;                /* Total packet length */
+        int sentlen;            /* Length of chunk currently transmitted */
+        int offset;             /* Current offset */
+        char data[64*1024];     /* The data */
 };
 

src/iodine.c

@@ -59 +59 @@
 
 /* Current IP packet */
-static char activepacket[4096];
+static struct packet packet;
 static char userid;
-static int lastlen;
-static int packetpos;
-static int packetlen;
 static uint16_t chunkid;
 
@@ -132 +129 @@
 is_sending()
 {
-        return (packetlen != 0);
+        return (packet.len != 0);
 }
 
@@ -139 +136 @@
 {
         struct sockaddr_in from;
-        char packet[64*1024];
+        char data[64*1024];
         socklen_t addrlen;
         struct query q;
@@ -146 +143 @@
 
         addrlen = sizeof(struct sockaddr);
-        if ((r = recvfrom(fd, packet, sizeof(packet), 0, 
-                                          (struct sockaddr*)&from, &addrlen)) == -1) {
+        if ((r = recvfrom(fd, data, sizeof(data), 0, 
+                          (struct sockaddr*)&from, &addrlen)) == -1) {
                 warn("recvfrom");
                 return 0;
         }
 
-        rv = dns_decode(buf, buflen, &q, QR_ANSWER, packet, r);
+        rv = dns_decode(buf, buflen, &q, QR_ANSWER, data, r);
 
         if (is_sending() && chunkid == q.id) {
                 /* Got ACK on sent packet */
-                packetpos += lastlen;
-                if (packetpos == packetlen) {
+                packet.offset += packet.sentlen;
+                if (packet.offset == packet.len) {
                         /* Packet completed */
-                        packetpos = 0;
-                        packetlen = 0;
-                        lastlen = 0;
+                        packet.offset = 0;
+                        packet.len = 0;
+                        packet.sentlen = 0;
                 } else {
                         /* More to send */
@@ -187 +184 @@
         compress2((uint8_t*)out, &outlen, (uint8_t*)in, inlen, 9);
 
-        memcpy(activepacket, out, MIN(outlen, sizeof(activepacket)));
-        lastlen = 0;
-        packetpos = 0;
-        packetlen = outlen;
+        memcpy(packet.data, out, MIN(outlen, sizeof(packet.data)));
+        packet.sentlen = 0;
+        packet.offset = 0;
+        packet.len = outlen;
 
         send_chunk(dns_fd);
@@ -269 +266 @@
 {
         char hex[] = "0123456789ABCDEF";
-        char packet[4096];
+        char data[4096];
         struct query q;
         char buf[4096];
@@ -280 +277 @@
         q.type = T_NULL;
 
-        p = activepacket;
-        p += packetpos;
-        avail = packetlen - packetpos;
-
-        lastlen = build_hostname(buf + 1, sizeof(buf) - 1, p, avail, topdomain, dataenc);
-
-        if (lastlen == avail)
+        p = packet.data;
+        p += packet.offset;
+        avail = packet.len - packet.offset;
+
+        packet.sentlen = build_hostname(buf + 1, sizeof(buf) - 1, p, avail, topdomain, dataenc);
+
+        if (packet.sentlen == avail)
                 code = 1;
         else
@@ -293 +290 @@
         code |= (userid << 1);
         buf[0] = hex[code];
-        len = dns_encode(packet, sizeof(packet), &q, QR_QUERY, buf, strlen(buf));
-
-        sendto(fd, packet, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+        len = dns_encode(data, sizeof(data), &q, QR_QUERY, buf, strlen(buf));
+
+        sendto(fd, data, len, 0, (struct sockaddr*)&peer, sizeof(peer));
 }
 
@@ -321 +318 @@
         
         if (is_sending()) {
-                lastlen = 0;
-                packetpos = 0;
-                packetlen = 0;
+                packet.sentlen = 0;
+                packet.offset = 0;
+                packet.len = 0;
         }