[Ipcop-svn] SF.net SVN: ipcop:[4975] ipcop/trunk

[<ow...@us...>]

Revision: 4975
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4975&view=rev
Author:   owes
Date:     2010-09-26 20:43:49 +0000 (Sun, 26 Sep 2010)

Log Message:
-----------
Remove pluto KLIPS debugging option, add DPD and NAT-T debugging options

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/ipsec.cgi
    ipcop/trunk/src/libs/vpn-functions.pl
    ipcop/trunk/updates/1.9.16/ROOTFILES.i486-1.9.16

Modified: ipcop/trunk/html/cgi-bin/ipsec.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/ipsec.cgi	2010-09-26 16:14:16 UTC (rev 4974)
+++ ipcop/trunk/html/cgi-bin/ipsec.cgi	2010-09-26 20:43:49 UTC (rev 4975)
@@ -81,8 +81,11 @@
 $cgiparams{'DBG_PARSING'} = 'off';
 $cgiparams{'DBG_EMITTING'} = 'off';
 $cgiparams{'DBG_CONTROL'} = 'off';
+# we currently do not use KLIPS, keep the code in case we want to reuse KLIPS in the future
 $cgiparams{'DBG_KLIPS'} = 'off';
 $cgiparams{'DBG_DNS'} = 'off';
+$cgiparams{'DBG_DPD'} = 'off';
+$cgiparams{'DBG_NAT_T'} = 'off';
 $cgiparams{'KEY'} = '';
 $cgiparams{'TYPE'} = '';
 $cgiparams{'ADVANCED'} = '';
@@ -168,7 +171,7 @@
     map ($vpnsettings{$_} = $cgiparams{$_},
         ('ENABLED_BLUE_1','ENABLED_RED_1',
          'DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
-         'DBG_KLIPS','DBG_DNS'));
+         'DBG_KLIPS','DBG_DNS','DBG_DPD','DBG_NAT_T'));
 
     $vpnsettings{'VPN_IP'} = $cgiparams{'VPN_IP'};
     $vpnsettings{'VPN_DELAYED_START'} = $cgiparams{'VPN_DELAYED_START'};
@@ -1717,7 +1720,7 @@
 $checked{'ENABLED_RED_1'}{$cgiparams{'ENABLED_RED_1'}} = "checked='checked'";
 map ($checked{$_} = $cgiparams{$_} eq 'on' ? "checked='checked'" : '',
     (   'DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
-        'DBG_KLIPS','DBG_DNS'));
+        'DBG_KLIPS','DBG_DNS','DBG_DPD','DBG_NAT_T'));
 
 
 &Header::showhttpheaders();
@@ -1775,8 +1778,9 @@
 parsing:<input type='checkbox' name='DBG_PARSING' $checked{'DBG_PARSING'} />,&nbsp;
 emitting:<input type='checkbox' name='DBG_EMITTING' $checked{'DBG_EMITTING'} />,&nbsp;
 control:<input type='checkbox' name='DBG_CONTROL' $checked{'DBG_CONTROL'} />,&nbsp;
-klips:<input type='checkbox' name='DBG_KLIPS' $checked{'DBG_KLIPS'} />,&nbsp;
-dns:<input type='checkbox' name='DBG_DNS' $checked{'DBG_DNS'} />
+dns:<input type='checkbox' name='DBG_DNS' $checked{'DBG_DNS'} />,&nbsp;
+dpd:<input type='checkbox' name='DBG_DPD' $checked{'DBG_DPD'} />,&nbsp;
+nat-t:<input type='checkbox' name='DBG_NAT_T' $checked{'DBG_NAT_T'} />
     </td>
 </tr>
 </table>

Modified: ipcop/trunk/src/libs/vpn-functions.pl
===================================================================
--- ipcop/trunk/src/libs/vpn-functions.pl	2010-09-26 16:14:16 UTC (rev 4974)
+++ ipcop/trunk/src/libs/vpn-functions.pl	2010-09-26 20:43:49 UTC (rev 4975)
@@ -198,7 +198,7 @@
     my $plutodebug = '';            # build debug list
     map ($plutodebug .= $lvpnsettings{$_} eq 'on' ? lc (substr($_,4)).' ' : '',
         ('DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
-         'DBG_KLIPS','DBG_DNS','DBG_NAT_T'));
+         'DBG_KLIPS','DBG_DNS','DBG_DPD','DBG_NAT_T'));
     $plutodebug = 'none' if $plutodebug eq '';  # if nothing selected, use 'none'.
     print CONF "\tklipsdebug=\"none\"\n";
     print CONF "\tplutodebug=\"$plutodebug\"\n";

Modified: ipcop/trunk/updates/1.9.16/ROOTFILES.i486-1.9.16
===================================================================
--- ipcop/trunk/updates/1.9.16/ROOTFILES.i486-1.9.16	2010-09-26 16:14:16 UTC (rev 4974)
+++ ipcop/trunk/updates/1.9.16/ROOTFILES.i486-1.9.16	2010-09-26 20:43:49 UTC (rev 4975)
@@ -14,6 +14,7 @@
 /var/ipcop/traffic/empty-aggregate.db
 /var/ipcop/traffic/empty-ulogd.db
 /usr/lib/ipcop/traffic-lib.pl
+/usr/lib/ipcop/vpn-functions.pl
 /usr/local/bin/accountingctrl
 /usr/local/bin/aggregatetraffic.pl
 /usr/local/bin/ipcopbkcfg


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.