Changeset ebc1b2

Timestamp:

08/15/09 12:45:07 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

7e4ee6

Parents:

e5370a

git-author:

Erik Ekman <yarrick@…> (08/15/09 12:45:07)

git-committer:

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

Message:

#36, Use -r to skip raw mode

File:

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

src/iodine.c

@@ -713 +713 @@
         struct in_addr server;
 
-        fprintf(stderr, "Testing raw UDP data to the server");
-        fflush(stderr);
+        fprintf(stderr, "Testing raw UDP data to the server (skip with -r)\n");
         for (i=0; running && i<3 ;i++) {
                 tv.tv_sec = i + 1;
@@ -750 +749 @@
                 return 0;
         }
-        fprintf(stderr, " at %s: ", inet_ntoa(server));
+        fprintf(stderr, "Server is at %s, trying login: ", inet_ntoa(server));
         fflush(stderr);
 
@@ -1032 +1031 @@
 
 static int
-handshake(int dns_fd, int autodetect_frag_size, int fragsize)
+handshake(int dns_fd, int raw_mode, int autodetect_frag_size, int fragsize)
 {
         int seed;
@@ -1048 +1047 @@
         }
 
-        if (handshake_raw_udp(dns_fd, seed)) {
+        if (raw_mode && handshake_raw_udp(dns_fd, seed)) {
                 conn = CONN_RAW_UDP;
         } else {
+                if (raw_mode == 0) {
+                        fprintf(stderr, "Skipping raw mode\n");
+                }
                 case_preserved = handshake_case_check(dns_fd);
 
@@ -1195 +1197 @@
         int autodetect_frag_size;
         int retval;
+        int raw_mode;
 
         memset(password, 0, 33);
@@ -1209 +1212 @@
         autodetect_frag_size = 1;
         max_downstream_frag_size = 3072;
+        raw_mode = 1;
 
         b32 = get_base32_encoder();
@@ -1231 +1235 @@
 #endif
 
-        while ((choice = getopt(argc, argv, "vfhu:t:d:P:m:")) != -1) {
+        while ((choice = getopt(argc, argv, "vfhru:t:d:P:m:")) != -1) {
                 switch(choice) {
                 case 'v':
@@ -1244 +1248 @@
                         /* NOTREACHED */
                         break;
+                case 'r':
+                        raw_mode = 0;
                 case 'u':
                         username = optarg;
@@ -1342 +1348 @@
         signal(SIGTERM, sighandler);
 
-        if (handshake(dns_fd, autodetect_frag_size, max_downstream_frag_size)) {
+        if (handshake(dns_fd, raw_mode, autodetect_frag_size, max_downstream_frag_size)) {
                 retval = 1;
                 goto cleanup2;