Changeset 1081

Timestamp:

05/28/08 08:15:48 (6 months ago)

Author:

mbr

Message:

updated to allow --NAT-access to not be specified if --NAT-local is used, minor bugfix for exiting if the symmetric key is not long enough

Files:

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

fwknop/trunk/fwknop

@@ -327 +327 @@
-}
-
+if ($NAT_local and not $NAT_access_str) {
+    $NAT_access_str = "$knock_dst,55000";
+    print
+"[-] Requesting NAT support for port 55,000; use --NAT-rand-port for a\n",
+"    random port.\n";
+}
+
-&validate_access_str() if $access_str;
-&validate_NAT_access_str() if $NAT_access_str;
-
-if (lc($server_mode) eq 'pcap' or lc($server_mode) eq 'knock') {
-knock 
+
-        unless $knock_dst;
-
@@ -1226 +1233 @@
-                    last KEY;
-                } else {
-print
+die
-                        "8 characters long.\n";
-                }
@@ -1568 +1575 @@
-
-    if ($NAT_rand_port) {
+
+        $NAT_access_str =~ s/,\d+$//;
+        $NAT_access_str =~ s/:\d+$//;
+
-        unless ($NAT_access_str =~ /^$ip_re$/) {
-            die "[*] Must specify '<internal_IP>'";