Changeset f20b3c

Timestamp:

06/14/09 18:01:14 (4 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

e59aaa

Parents:

de976d

git-author:

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

git-committer:

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

Message:

Remove a global variable and some warnings

Location:

src

Files:

• iodine.c (modified) (10 diffs)
• iodined.c (modified) (1 diff)

src/iodine.c

@@ -94 +94 @@
 static struct encoder *dataenc;
 
-/* result of case preservation check done after login */
-static int case_preserved;
-
 #if !defined(BSD) && !defined(__GLIBC__)
 static char *__progname;
@@ -125 +122 @@
 send_raw(int fd, char *buf, int buflen, int cmd)
 {
-        unsigned char packet[4096];
+        char packet[4096];
         int len;
 
@@ -766 +763 @@
 }
 
-static void
+static int
 handshake_case_check(int dns_fd)
 {
@@ -775 +772 @@
         int r;
         int read;
+        int case_preserved;
 
         case_preserved = 0;
@@ -795 +793 @@
                                         if (read < (27 * 2)) {
                                                 fprintf(stderr, "Received short case check reply. Will use base32 encoder\n");
-                                                return;
+                                                return case_preserved;
                                         } else {
                                                 int k;
@@ -807 +805 @@
                                                         }
                                                 }
-                                                return;
+                                                return case_preserved;
                                         }
                                 } else {
@@ -814 +812 @@
                         } else {
                                 fprintf(stderr, "Got error on case check, will use base32\n");
-                                return;
+                                return case_preserved;
                         }
                 }
@@ -822 +820 @@
 
         fprintf(stderr, "No reply on case check, continuing\n");
+        return case_preserved;
 }
 
@@ -1003 +1002 @@
 {
         int seed;
+        int case_preserved;
         int r;
 
@@ -1017 +1017 @@
         handshake_raw_udp(dns_fd, seed);
 
-        handshake_case_check(dns_fd);
+        case_preserved = handshake_case_check(dns_fd);
 
         if (case_preserved) {

src/iodined.c

@@ -842 +842 @@
 send_raw(int fd, char *buf, int buflen, int cmd, struct query *q)
 {
-        unsigned char packet[4096];
+        char packet[4096];
         int len;