Changeset 285a41

Timestamp:

07/12/07 10:31:29 (6 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

f932e5

Parents:

861da5

git-author:

Erik Ekman <yarrick@…> (07/12/07 10:31:29)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:33:55)

Message:

#16 Do case preservation check after login

Files:

• CHANGELOG (modified) (1 diff)
• src/iodine.c (modified) (5 diffs)
• src/iodined.c (modified) (1 diff)
• src/version.h (modified) (1 diff)

CHANGELOG

@@ -13 +13 @@
         - Fixed bug denying access if relay uses varying source ports
         - All received error messages (RCODE field) are echoed
+        - Top domain limited to 128 chars
+        - Case preservation check sent after login to decide codec
 
 2007-03-25: 0.4.0 "Run Home"

src/iodine.c

@@ -50 +50 @@
         const char *topdomain, struct encoder *encoder);
 
-int running = 1;
-char password[33];
-
-struct sockaddr_in peer;
+static int running = 1;
+static char password[33];
+
+static struct sockaddr_in peer;
 static char *topdomain;
 
-uint16_t rand_seed;
+static uint16_t rand_seed;
 
 /* Current IP packet */
 static struct packet packet;
+
+/* My userid at the server */
 static char userid;
+
+/* DNS id for next packet */
 static uint16_t chunkid;
 
 /* Base32 encoder used for non-data packets */
 static struct encoder *b32;
+
 /* The encoder used for data packets
  * Defaults to Base32, can be changed after handshake */
 static struct encoder *dataenc;
+
+/* result of case preservation check done after login */
+static int case_preserved;
 
 static void
@@ -350 +358 @@
 }
 
+void
+send_case_check(int fd)
+{
+        char buf[512] = "zZaAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyY123-4560789.";
+
+        strcat(buf, topdomain);
+        send_query(fd, buf);
+}
+
 static int
 handshake(int dns_fd)
@@ -387 +404 @@
                         if (read >= 9) {
                                 payload =  (((in[4] & 0xff) << 24) |
-                                                        ((in[5] & 0xff) << 16) |
-                                                        ((in[6] & 0xff) << 8) |
-                                                        ((in[7] & 0xff)));
+                                                ((in[5] & 0xff) << 16) |
+                                                ((in[6] & 0xff) << 8) |
+                                                ((in[7] & 0xff)));
 
                                 if (strncmp("VACK", in, 4) == 0) {
@@ -447 +464 @@
                                         if (tun_setip(client) == 0 && 
                                                 tun_setmtu(mtu) == 0) {
-                                                return 0;
+                                                goto perform_case_check;
                                         } else {
                                                 warnx("Received handshake with bad data");
@@ -459 +476 @@
                 printf("Retrying login...\n");
         }
-
-        return 1;
-}
-
-static void 
+        errx(1, "couldn't login to server");
+        /* NOTREACHED */
+
+perform_case_check:
+        case_preserved = 0;
+        for (i=0; running && i<5 ;i++) {
+                tv.tv_sec = i + 1;
+                tv.tv_usec = 0;
+
+                send_case_check(dns_fd);
+                
+                FD_ZERO(&fds);
+                FD_SET(dns_fd, &fds);
+
+                r = select(dns_fd + 1, &fds, NULL, NULL, &tv);
+
+                if(r > 0) {
+                        read = read_dns(dns_fd, in, sizeof(in));
+                        
+                        if(read <= 0) {
+                                warn("read");
+                                continue;
+                        }
+
+                        if (read > 0) {
+                                if (in[0] == 'z' || in[0] == 'Z') {
+                                        if (read < (26 * 2)) {
+                                                printf("Received short case reply...\n");
+                                        } else {
+                                                int k;
+
+                                                case_preserved = 1;
+                                                for (k = 0; k < 26 && case_preserved; k += 2) {
+                                                        if (in[k] == in[k+1]) {
+                                                                /* test string: zZaAbBcCdD... */
+                                                                case_preserved = 0;
+                                                        }
+                                                }
+                                                return 0;
+                                        }
+                                } else {
+                                        printf("Received bad case check reply\n");
+                                }
+                        }
+                }
+
+                printf("Retrying case check...\n");
+        }
+
+        printf("No reply on case check, continuing\n");
+        return 0;
+}
+
+static void
 set_target(const char *host) 
 {

src/iodined.c

@@ -237 +237 @@
                         users[userid].last_pkt = time(NULL);
                 }
+        } else if(in[0] == 'Z' || in[0] == 'z') {
+                /* Case conservation check */
+
+                /* Reply with received hostname as data */
+                write_dns(dns_fd, &(dummy.q), in, read);
+                return 0;
         } else if((in[0] >= '0' && in[0] <= '9')
                         || (in[0] >= 'a' && in[0] <= 'f')

src/version.h

@@ -20 +20 @@
 /* This is the version of the network protocol
    It is usually equal to the latest iodine version number */
-#define VERSION 0x00000401
+#define VERSION 0x00000402
 
 #endif /* _VERSION_H_ */