Changeset 55cfed

Timestamp:

09/20/09 17:11:15 (3 years ago)

Author:

J. A. Bezemer <J.A.Bezemer@…>

Branches:

master

Children:

401674

Parents:

2c2dd6

git-author:

J. A. Bezemer <J.A.Bezemer@…> (09/20/09 17:11:15)

git-committer:

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

Message:

update client code #75

Location:

src

Files:

• client.h (modified) (1 diff)
• iodine.c (modified) (7 diffs)

src/client.h

@@ -27 +27 @@
 void client_set_topdomain(const char *cp);
 void client_set_password(const char *cp);
+void set_qtype(char *qtype);
+void set_downenc(char *encoding);
 
 int client_handshake(int dns_fd, int raw_mode, int autodetect_frag_size, int fragsize);

src/iodine.c

@@ -62 +62 @@
 
         fprintf(stderr, "Usage: %s [-v] [-h] [-f] [-r] [-u user] [-t chrootdir] [-d device] "
-                        "[-P password] [-m maxfragsize] [-z context] [-F pidfile] "
+                        "[-P password] [-m maxfragsize] [-T type] [-O enc] [-z context] [-F pidfile] "
                         "[nameserver] topdomain\n", __progname);
         exit(2);
@@ -73 +73 @@
         fprintf(stderr, "iodine IP over DNS tunneling client\n");
         fprintf(stderr, "Usage: %s [-v] [-h] [-f] [-r] [-u user] [-t chrootdir] [-d device] "
-                        "[-P password] [-m maxfragsize] [-z context] [-F pidfile] "
+                        "[-P password] [-m maxfragsize] [-T type] [-O enc] [-z context] [-F pidfile] "
                         "[nameserver] topdomain\n", __progname);
         fprintf(stderr, "  -v to print version info and exit\n");
@@ -84 +84 @@
         fprintf(stderr, "  -P password used for authentication (max 32 chars will be used)\n");
         fprintf(stderr, "  -m maxfragsize, to limit size of downstream packets\n");
+        fprintf(stderr, "  -T dns type: NULL (default, fastest), TXT, CNAME, A (CNAME answer), MX\n");
+        fprintf(stderr, "  -O downstream encoding (!NULL): Base32(default), Base64, or Raw (only TXT)\n");
         fprintf(stderr, "  -z context, to apply specified SELinux context after initialization\n");
         fprintf(stderr, "  -F pidfile to write pid to a file\n");
@@ -134 +136 @@
         username = NULL;
         memset(password, 0, 33);
+        srand(time(NULL));
         foreground = 0;
         newroot = NULL;
@@ -160 +163 @@
 #endif
 
-        while ((choice = getopt(argc, argv, "vfhru:t:d:P:m:F:")) != -1) {
+        while ((choice = getopt(argc, argv, "vfhru:t:d:P:m:F:T:O:")) != -1) {
                 switch(choice) {
                 case 'v':
@@ -201 +204 @@
                         pidfile = optarg;
                         break;    
+                case 'T':
+                        set_qtype(optarg);
+                        break;
+                case 'O':       /* not -D, is Debug in server */
+                        set_downenc(optarg);
+                        break;
                 default:
                         usage();
@@ -235 +244 @@
                 client_set_nameserver(nameserv_addr, DNS_PORT);
         } else {
+                warnx("No nameserver found - not connected to any network?\n");
                 usage();
                 /* NOTREACHED */