Changeset de976d

Timestamp:

06/14/09 16:01:48 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

f20b3c

Parents:

1235cb

git-author:

Erik Ekman <yarrick@…> (06/14/09 16:01:48)

git-committer:

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

Message:

#36 client now reads raw reply

File:

• src/iodine.c (modified) (4 diffs)

src/iodine.c

@@ -679 +679 @@
         int i;
         int r;
-        int read;
+        int len;
         unsigned remoteaddr = 0;
         struct in_addr server;
@@ -697 +697 @@
 
                 if(r > 0) {
-                        read = read_dns(dns_fd, in, sizeof(in));
-                        if (read == 5 && in[0] == 'I') {
+                        len = read_dns(dns_fd, in, sizeof(in));
+                        if (len == 5 && in[0] == 'I') {
                                 /* Received IP address */
                                 remoteaddr = (in[1] & 0xff);
@@ -720 +720 @@
                 return 1;
         }
-        fprintf(stderr, " at %s", inet_ntoa(server));
+        fprintf(stderr, " at %s: ", inet_ntoa(server));
         fflush(stderr);
 
@@ -744 +744 @@
 
                 if(r > 0) {
-                        read = read_dns(dns_fd, in, sizeof(in));
-                } else {
-                        fprintf(stderr, ".");
-                        fflush(stderr);
-                }
-        }
-        
-
-        /* TODO */
-        fprintf(stderr, ": not implemented\n");
+                        len = read(dns_fd, in, sizeof(in));
+                        if (len >= (17 + RAW_HDR_LEN)) {
+                                char hash[16];
+                                login_calculate(hash, 16, password, seed - 1);
+                                if (memcmp(in, raw_header, RAW_HDR_IDENT_LEN) == 0
+                                        && in[RAW_HDR_CMD] == RAW_HDR_CMD_LOGIN 
+                                        && memcmp(&in[RAW_HDR_LEN], hash, sizeof(hash)) == 0
+                                        && in[16 + RAW_HDR_LEN] ==  userid) {
+
+                                        fprintf(stderr, "OK\n");
+                                        return 0;
+                                }
+                        }
+                }
+                fprintf(stderr, ".");
+                fflush(stderr);
+        }
+        
+        fprintf(stderr, "failed\n");
         return 1;
-        /* TODO and then return 0 on success */
 }