Changeset 950c08

Timestamp:

06/12/09 07:44:34 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

c92ed9

Parents:

3eef14

git-author:

Erik Ekman <yarrick@…> (06/12/09 07:44:34)

git-committer:

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

Message:

Added CMC to I and S packet types

Files:

• doc/proto_00000501.txt (modified) (1 diff)
• src/iodine.c (modified) (2 diffs)
• src/iodined.c (modified) (1 diff)

doc/proto_00000501.txt

@@ -55 +55 @@
         5 bits coded as Base32 char, with value 5 or 6, representing number of raw
         bits per encoded byte
+        CMC
 Server sends:
         Name of codec if accepted. After this all upstream data packets must 
         be encoded with the new codec.
         BADCODEC if not accepted. Client must then revert to Base32
+        BADLEN if length of query is too short
 
 Probe downstream fragment size:

src/iodine.c

@@ -477 +477 @@
 send_ip_request(int fd, int userid)
 {
-        char buf[512] = "I_.";
+        char buf[512] = "I____.";
         buf[1] = b32_5to8(userid);
         
+        buf[2] = b32_5to8((rand_seed >> 10) & 0x1f);
+        buf[3] = b32_5to8((rand_seed >> 5) & 0x1f);
+        buf[4] = b32_5to8((rand_seed ) & 0x1f);
+        rand_seed++;
+
         strncat(buf, topdomain, 512 - strlen(buf));
         send_query(fd, buf);
@@ -499 +504 @@
 send_codec_switch(int fd, int userid, int bits)
 {
-        char buf[512] = "S__.";
+        char buf[512] = "S_____.";
         buf[1] = b32_5to8(userid);
         buf[2] = b32_5to8(bits);
         
+        buf[3] = b32_5to8((rand_seed >> 10) & 0x1f);
+        buf[4] = b32_5to8((rand_seed >> 5) & 0x1f);
+        buf[5] = b32_5to8((rand_seed ) & 0x1f);
+        rand_seed++;
+
         strncat(buf, topdomain, 512 - strlen(buf));
         send_query(fd, buf);

src/iodined.c

@@ -426 +426 @@
                 int codec;
                 struct encoder *enc;
-                if (domain_len != 4) { /* len = 4, example: "S15." */
+                if (domain_len < 3) { /* len at least 3, example: "S15" */
                         write_dns(dns_fd, q, "BADLEN", 6);
                         return;