Changeset a62ae8

Timestamp:

07/16/09 10:44:04 (3 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

23dc3f

Parents:

d5acb5

git-author:

Erik Ekman <yarrick@…> (07/16/09 10:44:04)

git-committer:

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

Message:

Allow bind port and listen port to be the same if listenip doesnt include localhost. Also remove newlines from warnx

File:

• src/iodined.c (modified) (5 diffs)

src/iodined.c

@@ -1173 +1173 @@
         
         if (my_ip == INADDR_NONE) {
-                warnx("Bad IP address to use inside tunnel.\n");
+                warnx("Bad IP address to use inside tunnel.");
                 usage();
         }
@@ -1180 +1180 @@
         if(strlen(topdomain) <= 128) {
                 if(check_topdomain(topdomain)) {
-                        warnx("Topdomain contains invalid characters.\n");
+                        warnx("Topdomain contains invalid characters.");
                         usage();
                 }
         } else {
-                warnx("Use a topdomain max 128 chars long.\n");
+                warnx("Use a topdomain max 128 chars long.");
                 usage();
         }
@@ -1191 +1191 @@
 #ifndef WINDOWS32
                 if ((pw = getpwnam(username)) == NULL) {
-                        warnx("User %s does not exist!\n", username);
+                        warnx("User %s does not exist!", username);
                         usage();
                 }
@@ -1198 +1198 @@
 
         if (mtu <= 0) {
-                warnx("Bad MTU given.\n");
+                warnx("Bad MTU given.");
                 usage();
         }
         
         if(port < 1 || port > 65535) {
-                warnx("Bad port number given.\n");
+                warnx("Bad port number given.");
                 usage();
         }
         
         if(bind_enable) {
-                if (bind_port < 1 || bind_port > 65535 || bind_port == port) {
-                        warnx("Bad DNS server port number given.\n");
+                if (bind_port < 1 || bind_port > 65535) {
+                        warnx("Bad DNS server port number given.");
+                        usage();
+                        /* NOTREACHED */
+                }
+                /* Avoid forwarding loops */
+                if (bind_port == port && (listen_ip == INADDR_ANY || listen_ip == htonl(0x7f000001L))) {
+                        warnx("Forward port is same as listen port (%d), will create a loop!", bind_port);
+                        fprintf(stderr, "Use -l to set listen ip to avoid this.\n");
                         usage();
                         /* NOTREACHED */
@@ -1229 +1236 @@
 
         if (listen_ip == INADDR_NONE) {
-                warnx("Bad IP address to listen on.\n");
+                warnx("Bad IP address to listen on.");
                 usage();
         }
         
         if (ns_ip == INADDR_NONE) {
-                warnx("Bad IP address to return as nameserver.\n");
+                warnx("Bad IP address to return as nameserver.");
                 usage();
         }
         if (netmask > 30 || netmask < 8) {
-                warnx("Bad netmask (%d bits). Use 8-30 bits.\n", netmask);
+                warnx("Bad netmask (%d bits). Use 8-30 bits.", netmask);
                 usage();
         }