Changeset 866

Timestamp:

12/09/07 11:49:43 (1 year ago)

Author:

mbr

Message:

- Added --Save-dst argument to the fwknop client to add a priority file to

store client command line arguments (~/.fwknop.save). This file is only
overwritten when --Save-dst is used.

Files:

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

fwknop/trunk/ChangeLog

@@ -42 +42 @@
-    - Bugfix in fwknopd to account for non-Ethernet link layer header over
-      *BSD loopback interfaces.
+    - Added --Save-dst argument to the fwknop client to add a priority file to
+      store client command line arguments (~/.fwknop.save). This file is only
+      overwritten when --Save-dst is used.
-
-fwknop-1.8.3 (11/17/2007):

fwknop/trunk/fwknop

@@ -89 +89 @@
-my $cmdline_pcap_cmd   = '';
-my $no_save_last_args  = 0;
+my $save_destination   = 0;
-my $server_auth_method = '';
-my $spa_established_tcp  = 0;
@@ -96 +97 @@
-my $knock_dst_pre_resolve = '';
-
-we don't
-advertise the fwknop client (can 
+(can
+
-my $ext_resolve_user_agent = "Fwknop/$version";
-$ext_resolve_user_agent =~ s|-pre\d+||;
@@ -1203 +1204 @@
-    close S;
-
+    if ($save_destination) {
+        open D, "> $homedir/.fwknop.save"
+            or die "[*] Could not open $homedir/.fwknop.save";
+        print D "@args_cp\n";
+        close D;
+    }
+
-    my @host_lines = ();
-    my $matched_dst = 0;
@@ -1244 +1252 @@
-        'Save-packet'    => \$save_packet_mode,
-        'Save-packet-file=s'  => \$save_packet_file,
+        'Save-dst'       => \$save_destination,
-        'user-rc=s'      => \$user_rc_file,
-        'knock-dst=s'    => \$knock_dst,
@@ -1284 +1293 @@
-
-sub run_last_cmdline() {
-
-
+
+
+
+
+
+
-        open S, "< $save_file" or die "[*] Could not open $save_file: $!";
-        my $arg_line = <S>;
@@ -1299 +1312 @@
-        @ARGV = split /\s+/, $arg_line;
-
-
+m
-        &handle_command_line();
-
-
-
+
+
+
+
+
+
+
+
-    }
-    return;
@@ -1310 +1329 @@
-sub run_last_host_cmdline() {
-    my $hosts_file = "$homedir/.fwknop.hosts";
-
+
+
+
+
+
+
-        my $arg_line = '';
-        open H, "< $hosts_file" or die "[*] Could not open $hosts_file: $!";
@@ -1336 +1360 @@
-            &handle_command_line();
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return;
@@ -1423 +1456 @@
-                                 (requires the -R option). The default user
-                                 agent is: $ext_resolve_user_agent
+    --Save-dst                 - Save the command line args for this
+                                 invocation against the destination to the
+                                 special file ~/.fwknop.save (this file
+                                 provides a priority location that is only
+                                 overwritten with --Save-dst and is useful
+                                 for an fwknop client command that you want
+                                 to always preserve).
-    --Save-packet              - Save a copy of an encrypted SPA packet to
-$$
+<pid>
-                                 default).
-    --Save-packet-file         - Specify the path to the file where the