Changeset 27fc03

Timestamp:

06/11/09 21:52:42 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

3eef14

Parents:

894ca2

git-author:

Erik Ekman <yarrick@…> (06/11/09 21:52:42)

git-committer:

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

Message:

#36, add way to request ip address from server

Files:

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

src/iodined.c

@@ -390 +390 @@
                 }
                 return;
+        } else if(in[0] == 'I' || in[0] == 'i') {
+                /* Request for IP number */
+                in_addr_t replyaddr;
+                unsigned addr;
+                char reply[5];
+                
+                userid = b32_8to5(in[1]);
+                if (check_user_and_ip(userid, q) != 0) {
+                        write_dns(dns_fd, q, "BADIP", 5);
+                        return; /* illegal id */
+                }
+
+                if (ns_ip != INADDR_ANY) {
+                        /* If set, use assigned external ip (-n option) */
+                        replyaddr = ns_ip;
+                } else {
+                        /* otherwise return destination ip from packet */
+                        memcpy(&replyaddr, &q->destination.s_addr, sizeof(in_addr_t));
+                }
+
+                addr = htonl(replyaddr);
+                reply[0] = 'I';
+                reply[1] = (addr >> 24) & 0xFF;
+                reply[2] = (addr >> 16) & 0xFF;
+                reply[3] = (addr >>  8) & 0xFF;
+                reply[4] = (addr >>  0) & 0xFF;
+                write_dns(dns_fd, q, reply, sizeof(reply));
         } else if(in[0] == 'Z' || in[0] == 'z') {
                 /* Check for case conservation and chars not allowed according to RFC */
@@ -601 +628 @@
 
         if (ns_ip != INADDR_ANY) {
+                /* If ns_ip set, overwrite destination addr with it.
+                 * Destination addr will be sent as additional record (A, IN) */
                 memcpy(&q->destination.s_addr, &ns_ip, sizeof(in_addr_t));
         }

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 0x00000500
+#define VERSION 0x00000501
 
 #endif /* _VERSION_H_ */