Changeset 591

Timestamp:

11/05/06 15:55:00 (2 years ago)

Author:

mbr

Message:

added --Show-last-cmd and --Show-host-cmd args to fwknop

Files:

• fwknop/trunk/ChangeLog (modified) (1 diff)
• fwknop/trunk/fwknop (modified) (7 diffs)

fwknop/trunk/ChangeLog

@@ -18 +18 @@
-      the REQUIRE_SOURCE_ADDRESS criteria can be applied by the fwknopd
-      server.
+    - Added --Show-last-cmd and --Show-host-cmd args to fwknop so that the
+      last fwknop command and the last fwknop host commands can be viewed.
-    - Added the svn revision number to --Version and --help output.
-

fwknop/trunk/fwknop

@@ -73 +73 @@
-my $server_proto  = '';
-my $run_last_host = '';
+my $show_last_host_cmd = '';
+my $show_last_cmd = 0;
-my $gpg_home_dir  = '';
-my $gpg_recipient = '';
@@ -172 +174 @@
-$knock_dst_pre_resolve = $knock_dst;
-
-
+
+
-    ### run fwknop with same command line args as the previous
-    ### execution
-    &run_last_cmdline();
-
+
+
+
+
+
-    ### run fwknop with the last args for this particular knock destination
-    &run_last_host_cmdline();
@@ -264 +271 @@
-
-### save our command line args (so -l can be used next time)
-
+
+
+
+
-
-if (lc($server_mode) eq 'pcap' or lc($server_mode) eq 'knock') {
@@ -1108 +1118 @@
-        'no-save-args'   => \$no_save_last_args,
-        'Last-host=s'    => \$run_last_host,
+        'Show-last-cmd'  => \$show_last_cmd,
+        'Show-host-cmd=s' => \$show_last_host_cmd,
-        'Resolve-external-IP' => \$resolve_external_ip,
-        'whatismyip'     => \$resolve_external_ip, # for backwards compatibility
@@ -1129 +1141 @@
-        close S;
-        chomp $arg_line;
+
+        if ($show_last_cmd) {
+            print "[+] Last fwknop client command line: $arg_line\n";
+            exit 0;
+        }
-        print "[+] Running with last command line args: $arg_line\n"
-            unless $quiet;
@@ -1157 +1174 @@
-        if ($arg_line) {
-            chomp $arg_line;
+
+            if ($show_last_host_cmd) {
+                print "[+] Last command run for host: $show_last_host_cmd\n",
+                    "    $arg_line\n";
+                exit 0;
+            }
-            print "[+] Running with last command line args: $arg_line\n"
-                unless $quiet;
@@ -1281 +1304 @@
-    --no-save-args             - Do not save command line args to
-                                 ~/.fwknop.run file.
+    --Show-last-cmd            - Display the last fwknop command and exit.
+    --Show-host-cmd <host>     - Display the last fwknop command that was
+                                 executed for <host> and exit.
-    -d, --debug                - Run fwknop in debugging mode.
-    -v, --verbose              - Verbose mode.