Changeset db62c7

Timestamp:

02/05/07 00:12:08 (6 years ago)

Author:

Bjorn Andersson <flex@…>

Branches:

master, iodine-0.4, iodine-0.5, iodine-0.6

Children:

cb66fd

Parents:

da636b

git-author:

Bjorn Andersson <flex@…> (02/05/07 00:12:08)

git-committer:

Bjorn Andersson <flex@…> (02/05/07 00:12:08)

Message:

extracted common code from send_* in iodine.c

Location:

src

Files:

• dns.c (modified) (1 diff)
• dns.h (modified) (1 diff)
• encoding.c (modified) (3 diffs)
• encoding.h (modified) (1 diff)
• iodine.c (modified) (11 diffs)

src/dns.c

@@ -198 +198 @@
 
 int
-dns_build_hostname(char *buf, size_t buflen, char *data, size_t datalen, char *topdomain)
+dns_build_hostname(char *buf, size_t buflen, 
+                                   const char *data, const size_t datalen, 
+                                   const char *topdomain)
 {
         int avail;

src/dns.h

@@ -36 +36 @@
 int dns_decode(char *, size_t, struct query *, qr_t, char *, size_t);
         
-int dns_build_hostname(char *, size_t, char *, size_t, char *);
+int dns_build_hostname(char *, size_t, const char *, const size_t, const char *);
 
 void dnsd_send(int, struct query*, char *, int);

src/encoding.c

@@ -35 +35 @@
 /* Eat 5 bytes from src, write 8 bytes to dest */
 static void
-encode_chunk(char *dest, char *src)
+encode_chunk(char *dest, const char *src)
 {
         unsigned char c;
@@ -103 +103 @@
 
 int
-encode_data(char *buf, int len, int space, char *dest)
+encode_data(const char *buf, const size_t len, int space, char *dest)
 {
         int final;
@@ -113 +113 @@
         char encoded[255];
         char padding[5];
+        const char *dp;
         char *pp;
-        char *dp;
         char *ep;
 

src/encoding.h

@@ -18 +18 @@
 #define _ENCODING_H_
 
-int encode_data(char *, int, int, char *);
+int encode_data(const char *, const size_t, int, char *);
 int decode_data(char *, int, const char *, char *);
 

src/iodine.c

@@ -66 +66 @@
 
 static void
+send_packet(int fd, char cmd, const char *data, const size_t datalen)
+{
+        char packet[4096];
+        struct query q;
+        char buf[4096];
+        size_t len;
+
+        q.id = rand_seed;
+        q.type = T_NULL;
+
+        buf[0] = cmd;
+        
+        len = dns_build_hostname(buf + 1, sizeof(buf) - 1, data, datalen, topdomain);
+        len = dns_encode(packet, sizeof(packet), &q, QR_QUERY, buf, strlen(buf));
+
+        sendto(fd, packet, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+}
+
+static void
 dns_send_chunk(int fd)
 {
-        char packet[512];
+        char packet[4096];
         struct query q;
-        char buf[256];
+        char buf[4096];
         int avail;
         char *p;
@@ -189 +208 @@
         struct timeval tv;
         fd_set fds;
+        int rv;
         int i;
-        int rv;
 
         rv = 0;
@@ -204 +223 @@
 
                 i = select(MAX(tun_fd, dns_fd) + 1, &fds, NULL, NULL, &tv);
-
-                if (running == 0 || i < 0) {
-                        rv = 1;
-                        break;
-                }
-                
+                
+                if (running == 0)
+                        break;
+
+                if (i < 0) 
+                        err(1, "select");
+
                 if (i == 0) /* timeout */
                         send_ping(dns_fd);
-                else {  
-                        if(FD_ISSET(tun_fd, &fds)) {
+                else {
+                        if (FD_ISSET(tun_fd, &fds)) {
                                 if (tunnel_tun(tun_fd, dns_fd) <= 0)
                                         continue;
                         }
-                        if(FD_ISSET(dns_fd, &fds)) {
+                        if (FD_ISSET(dns_fd, &fds)) {
                                 if (tunnel_dns(tun_fd, dns_fd) <= 0)
                                         continue;
@@ -230 +250 @@
 send_login(int fd, char *login, int len)
 {
-        char packet[512];
-        struct query q;
-        char buf[256];
         char data[18];
-
-        q.id = rand_seed;
-        q.type = T_NULL;
 
         memset(data, 0, sizeof(data));
@@ -246 +260 @@
         rand_seed++;
 
-        buf[0] = 'L';
-        len = dns_build_hostname(buf + 1, sizeof(buf) - 1, data, sizeof(data), topdomain);
-        len = dns_encode(packet, sizeof(packet), &q, QR_QUERY, buf, strlen(buf));
-
-        sendto(fd, packet, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+        send_packet(fd, 'L', data, sizeof(data));
 }
 
@@ -256 +266 @@
 send_ping(int fd)
 {
-        
-        char packet[512];
-        struct query q;
-        char buf[256];
         char data[2];
-        int len;
         
         if (dns_sending()) {
@@ -269 +274 @@
         }
 
-        q.id = rand_seed;
-        q.type = T_NULL;
-
         data[0] = (rand_seed >> 8) & 0xff;
         data[1] = (rand_seed >> 0) & 0xff;
@@ -277 +279 @@
         rand_seed++;
 
-        buf[0] = 'P';
-        len = dns_build_hostname(buf + 1, sizeof(buf) - 1, data, sizeof(data), topdomain);
-        len = dns_encode(packet, sizeof(packet), &q, QR_QUERY, buf, strlen(buf));
-
-        sendto(fd, packet, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+        send_packet(fd, 'P', data, sizeof(data));
 }
 
@@ -287 +285 @@
 send_version(int fd, uint32_t version)
 {
-        char packet[512];
-        struct query q;
-        char buf[256];
         char data[6];
-        int len;
-
-        q.id = rand_seed;
-        q.type = T_NULL;
 
         data[0] = (version >> 24) & 0xff;
@@ -306 +297 @@
         rand_seed++;
 
-        buf[0] = 'V';
-        len = dns_build_hostname(buf + 1, sizeof(buf) - 1, data, sizeof(data), topdomain);
-        len = dns_encode(packet, sizeof(packet), &q, QR_QUERY, buf, strlen(buf));
-
-        sendto(fd, packet, len, 0, (struct sockaddr*)&peer, sizeof(peer));
+        send_packet(fd, 'V', data, sizeof(data));
 }
 
@@ -353 +340 @@
                                                 memcpy(&seed, in + 4, 4);
                                                 seed = ntohl(seed);
-                                                printf("Version ok, both running 0x%08x\n", VERSION);
+                                                printf("version ok, both running 0x%08x\n", VERSION);
                                                 break;
                                         } else {
-                                                printf("Version ok but did not receive proper login challenge\n");
+                                                printf("version ok but did not receive proper login challenge\n");
                                         }
                                 } else {
                                         memcpy(&version, in + 4, 4);
                                         version = ntohl(version);
-                                        printf("You run 0x%08x, server runs 0x%08x. Giving up\n", VERSION, version);
-                                        return 1;
+                                        errx(1, "you run 0x%08x, server runs 0x%08x. giving up\n", 
+                                                        VERSION, version);
+                                        /* NOTREACHED */
                                 }
                         }