Changeset 473bb9

Timestamp:

08/15/09 14:43:02 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

0e81cd

Parents:

7e4ee6

git-author:

Erik Ekman <yarrick@…> (08/15/09 14:43:02)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:03)

Message:

#36, Send ping message every 20 seconds

Location:

src

Files:

• common.h (modified) (1 diff)
• iodine.c (modified) (6 diffs)
• iodined.c (modified) (3 diffs)

src/common.h

@@ -24 +24 @@
 #define RAW_HDR_CMD_LOGIN 0x10
 #define RAW_HDR_CMD_DATA  0x20
+#define RAW_HDR_CMD_PING  0x30
 
 #define RAW_HDR_CMD_MASK  0xF0

src/iodine.c

@@ -59 +59 @@
 #endif
 
+#define PING_TIMEOUT(t) ((t) >= (conn == CONN_DNS_NULL ? 1 : 20))
+
 static void send_ping(int fd);
 static void send_chunk(int fd);
@@ -133 +135 @@
 
         memcpy(packet, raw_header, RAW_HDR_LEN);
-        memcpy(&packet[RAW_HDR_LEN], buf, len);
+        if (len) {
+                memcpy(&packet[RAW_HDR_LEN], buf, len);
+        }
 
         len += RAW_HDR_LEN;
@@ -346 +350 @@
         int rv;
         int i;
+        int seconds;
 
         rv = 0;
+        seconds = 0;
 
         while (running) {
@@ -368 +374 @@
                         err(1, "select");
 
-                if (i == 0 && conn == CONN_DNS_NULL) /* timeout */
-                        send_ping(dns_fd);
-                else {
+                if (i == 0) { /* timeout */
+                        seconds++;
+                } else {
                         if (FD_ISSET(tun_fd, &fds)) {
+                                seconds = 0;
                                 if (tunnel_tun(tun_fd, dns_fd) <= 0)
                                         continue;
@@ -380 +387 @@
                         } 
                 }
+
+                if (PING_TIMEOUT(seconds)) {
+                        send_ping(dns_fd);
+                        seconds = 0;
+                }
         }
 
@@ -446 +458 @@
 send_ping(int fd)
 {
-        char data[4];
-        
-        if (is_sending()) {
-                outpkt.sentlen = 0;
-                outpkt.offset = 0;
-                outpkt.len = 0;
-        }
-
-        data[0] = userid;
-        data[1] = ((downstream_seqno & 7) << 4) | (downstream_fragment & 15);
-        data[2] = (rand_seed >> 8) & 0xff;
-        data[3] = (rand_seed >> 0) & 0xff;
-        
-        down_ack_seqno = downstream_seqno;
-        down_ack_fragment = downstream_fragment;
-        
-        rand_seed++;
-
-        send_packet(fd, 'P', data, sizeof(data));
+        if (conn == CONN_DNS_NULL) {
+                char data[4];
+                
+                if (is_sending()) {
+                        outpkt.sentlen = 0;
+                        outpkt.offset = 0;
+                        outpkt.len = 0;
+                }
+
+                data[0] = userid;
+                data[1] = ((downstream_seqno & 7) << 4) | (downstream_fragment & 15);
+                data[2] = (rand_seed >> 8) & 0xff;
+                data[3] = (rand_seed >> 0) & 0xff;
+                
+                down_ack_seqno = downstream_seqno;
+                down_ack_fragment = downstream_fragment;
+                
+                rand_seed++;
+
+                send_packet(fd, 'P', data, sizeof(data));
+        } else {
+                send_raw(fd, NULL, 0, userid, RAW_HDR_CMD_PING);
+        }
 }
 

src/iodined.c

@@ -146 +146 @@
 
         memcpy(packet, raw_header, RAW_HDR_LEN);
-        memcpy(&packet[RAW_HDR_LEN], buf, len);
+        if (len) {
+                memcpy(&packet[RAW_HDR_LEN], buf, len);
+        }
 
         len += RAW_HDR_LEN;
@@ -930 +932 @@
 }
 
+static void
+handle_raw_ping(struct query *q, int dns_fd, int userid)
+{
+        if (check_user_and_ip(userid, q) != 0) {
+                return;
+        }
+
+        /* Update query and time info for user */
+        users[userid].last_pkt = time(NULL);
+        memcpy(&(users[userid].q), q, sizeof(struct query));
+
+        /* Send ping reply */
+        send_raw(dns_fd, NULL, 0, userid, RAW_HDR_CMD_PING, q);
+}
+
 static int
 raw_decode(char *packet, int len, struct query *q, int dns_fd, int tun_fd)
@@ -949 +966 @@
                 /* Data packet */
                 handle_raw_data(&packet[RAW_HDR_LEN], len - RAW_HDR_LEN, q, dns_fd, tun_fd, raw_user);
+                break;
+        case RAW_HDR_CMD_PING:
+                /* Keepalive packet */
+                handle_raw_ping(q, dns_fd, raw_user);
                 break;
         default: