Changeset 1088

Timestamp:

05/28/08 21:50:17 (6 months ago)

Author:

mbr

Message:

minor update to let the user know about NAT access ports (so 'ssh -p <port>' can be used); this is mostly needed with the --NAT-rand-port option

Files:

• fwknop/trunk/fwknop (modified) (5 diffs)

fwknop/trunk/fwknop

@@ -824 +824 @@
-        print
-"\n[+] Sending $msg_len byte message to $knock_dst over $spoof_proto",
-\n
+
-        my $rand_src_port = int(rand(65535));
-        $rand_src_port = 65001 if $rand_src_port > 65535;
@@ -887 +887 @@
-                }
-            });
-
-
-
+
-                $rawpkt->send();
-            }
@@ -897 +895 @@
-        if ($spa_established_tcp) {  ### useful for Tor
-            print "\n[+] Sending $msg_len byte message to $knock_dst ",
-\n
+
-                unless $quiet;
-
-
-
-
+
-                my $socket = IO::Socket::INET->new(
-                    PeerAddr => $knock_dst,
@@ -916 +912 @@
-        } else {
-            print "\n[+] Sending $msg_len byte message to $knock_dst ",
-
-
-
-
-
+
+
+
-                my $socket = IO::Socket::INET->new(
-                    PeerAddr => $knock_dst,
@@ -931 +925 @@
-                undef $socket;
-            }
+        }
+    }
+    unless ($quiet) {
+        if ($NAT_access_str and $NAT_access_str =~ /($ip_re),(\d+)/) {
+            my $internal_ip = $1;
+            my $nat_port    = $2;
+            print "    Requesting NAT access to $access_str on $internal_ip via ",
+                "port $nat_port\n\n";
+        } else {
+            print "\n";
+        }
+        if ($test_mode) {
+            print "    --Test-mode enabled, SPA packet not sent.\n\n";
-        }
-    }