Changeset 1285

Timestamp:

10/05/08 14:30:06 (2 months ago)

Author:

mbr

Message:

more verbose debugging output for iptables commands

Files:

• fwknop/trunk/fwknopd (modified) (8 diffs)

fwknop/trunk/fwknopd

@@ -2724 +2724 @@
-    }
-
+    my $ipt_hr_num = 0;
-    for my $hr (@ipt_hrefs) {
-
+        if ($debug) {
+            $ipt_hr_num++;
+            print STDERR localtime() . " [+] ipt_href: $ipt_hr_num\n",
+                Dumper($hr);
+        }
-        my $nat_ip   = '0.0.0.0/0';
-        my $nat_port = 0;
@@ -2751 +2757 @@
-            = $ipt->create_chain($table, $to_chain);
-
-
+
+
+
+
+
+
-            &psyslog_errs($err_aref);
-            return;
@@ -2760 +2771 @@
-            $from_chain, $jump_rule_position, $to_chain);
-
-
+
+
+
+
+
+
-            &psyslog_errs($err_aref);
-            return;
@@ -2809 +2825 @@
-
-                if ($rv) {
+                    print STDERR localtime() . "     find_ip_rule() ",
+                        "returned $rv\n" if $debug;
-                    my $str = "$grant_src -> $grant_dst($proto/$port)";
-                    if ($direction eq 'dst') {
@@ -2821 +2839 @@
-                        "in chain: $to_chain", $SEND_MAIL);
-                } else {
+                    print STDERR localtime() . "     find_ip_rule() ",
+                        "returned $rv\n" if $debug;
-                    my $str = "add $to_chain $grant_src -> " .
-                        "$grant_dst($proto/$port) $target rule ";
@@ -2842 +2862 @@
-                        $target, \%extended_info);
-
-                    if ($debug) {
-                        print STDERR localtime() . " [+] Dumping $to_chain to ",
-                            "see newly added rule:\n";
-                        $ipt->run_ipt_cmd("$cmds{'iptables'} -t " .
-                            "$table -v -n -L $to_chain");
-                    }
-
-                    if ($rv) {
+
+                        if ($debug) {
+                            print STDERR localtime() . " [+] add_ip_rule() ",
+                                "returned $rv\n",
+                                 " [+] Dumping $to_chain to ",
+                                "see newly added rule:\n";
+                            $ipt->run_ipt_cmd("$cmds{'iptables'} -t " .
+                                "$table -v -n -L $to_chain");
+                        }
-
-                        ### keep track of how many times we have granted access
@@ -2875 +2897 @@
-                        );
-                    } else {
+                        print STDERR localtime() . " [-] add_ip_rule() ",
+                            "returned $rv\n" if $debug;
-                        &psyslog_errs($err_aref);
-                    }
@@ -4780 +4804 @@
-sub psyslog_errs() {
-    my $aref = shift;
+
+    if ($debug) {
+        for my $msg (@$aref) {
+            print STDERR localtime() . " $msg\n";
+        }
+    }
+
-    return if $config{'ALERTING_METHODS'} =~ /no.?syslog/i;
-