Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 71539ef42b939af0f01e8e6f5d93650dcae718c2..f37f97e212195be003d0396a14db76e2f5f0c765 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -94,7 +94,6 @@ var/ipfire/logging
 var/ipfire/mac
 #var/ipfire/mac/settings
 var/ipfire/main
-#var/ipfire/main/disable_nf_sip
 #var/ipfire/main/hosts
 #var/ipfire/main/routing
 #var/ipfire/main/settings

diff --git a/config/rootfiles/core/101/filelists/files b/config/rootfiles/core/101/filelists/files
index 0f75ac841d11ee44ee48d9bf29fe960aede66a4f..c04cff617bc5bc99b7f716c9138522699f32df1e 100644 (file)
--- a/config/rootfiles/core/101/filelists/files
+++ b/config/rootfiles/core/101/filelists/files
@@ -1,5 +1,7 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/firewall
 srv/web/ipfire/cgi-bin/chpasswd.cgi
 srv/web/ipfire/cgi-bin/ipinfo.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi

diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh
index f44847465eab4635b4e2f6b8a313f68646379cb2..eb81d6106b36a761bf6e23820955c60b0d56caa2 100644 (file)
--- a/config/rootfiles/core/101/update.sh
+++ b/config/rootfiles/core/101/update.sh
@@ -50,6 +50,22 @@ extract_files
 # update linker config
 ldconfig
 
+# Fix conntrack configuration
+for i in CONNTRACK_H323 CONNTRACK_FTP CONNTRACK_PPTP CONNTRACK_TFTP CONNTRACK_IRC; do
+       if ! grep -q "^${i}" /var/ipfire/optionsfw/settings; then
+               echo "${i}=on"
+       fi
+done >> /var/ipfire/optionsfw/settings
+
+# Special handling for SIP
+if ! grep -q "^CONNTRACK_SIP" /var/ipfire/optionsfw/settings; then
+       if [ -e "/var/ipfire/main/disable_nf_sip" ]; then
+               echo "CONNTRACK_SIP=off" >> /var/ipfire/optionsfw/settings
+               rm -f /var/ipfire/main/disable_nf_sip
+       else
+               echo "CONNTRACK_SIP=on" >> /var/ipfire/optionsfw/settings
+       fi
+fi
 
 # Update Language cache
 #/usr/local/bin/update-lang-cache

diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 7a0e8e0c4ebc4cc455a239e84455c808e41b2e45..1ab3c7d7987f0efb0098506a81c2d33f18cc3db3 100644 (file)
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -129,6 +129,9 @@ $checked{'CONNTRACK_H323'}{$settings{'CONNTRACK_H323'}} = "checked='checked'";
 $checked{'CONNTRACK_IRC'}{'off'} = '';
 $checked{'CONNTRACK_IRC'}{'on'} = '';
 $checked{'CONNTRACK_IRC'}{$settings{'CONNTRACK_IRC'}} = "checked='checked'";
+$checked{'CONNTRACK_PPTP'}{'off'} = '';
+$checked{'CONNTRACK_PPTP'}{'on'} = '';
+$checked{'CONNTRACK_PPTP'}{$settings{'CONNTRACK_PPTP'}} = "checked='checked'";
 $checked{'CONNTRACK_SIP'}{'off'} = '';
 $checked{'CONNTRACK_SIP'}{'on'} = '';
 $checked{'CONNTRACK_SIP'}{$settings{'CONNTRACK_SIP'}} = "checked='checked'";
@@ -239,21 +242,59 @@ END
 <tr><td align='left' width='60%'>$Lang::tr{'fw settings dropdown'}</td><td align='left'>on <input type='radio' name='SHOWDROPDOWN' value='on' $checked{'SHOWDROPDOWN'}{'on'} />/
                                                                                                                                                                                <input type='radio' name='SHOWDROPDOWN' value='off' $checked{'SHOWDROPDOWN'}{'off'} /> off</td></tr>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
 </table>
+
 <br />
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'application layer gateways'}</b></td></tr>
-<tr><td align='left' width='60%'>FTP</td><td align='left'>on <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} />/
-                                                                                                                                                                               <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>H.323</td><td align='left'>on <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} />/
-                                                                                                                                                                               <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>IRC</td><td align='left'>on <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} />/
-                                                                                                                                                                               <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>SIP</td><td align='left'>on <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} />/
-                                                                                                                                                                               <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>TFTP</td><td align='left'>on <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} />/
-                                                                                                                                                                               <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> off</td></tr>
 
+<table width='95%' cellspacing='0'>
+       <tr bgcolor='$color{'color20'}'>
+               <td colspan='2' align='left'>
+                       <b>$Lang::tr{'application layer gateways'}</b>
+               </td>
+       </tr>
+       <tr>
+               <td align='left' width='60%'>FTP</td>
+               <td align='left'>
+                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} /> /
+                       <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> $Lang::tr{'off'}
+               </td>
+       </tr>
+       <tr>
+               <td align='left' width='60%'>H.323</td>
+               <td align='left'>
+                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} /> /
+                       <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> $Lang::tr{'off'}
+               </td>
+       </tr>
+       <tr>
+               <td align='left' width='60%'>IRC</td>
+               <td align='left'>
+                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} /> /
+                       <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> $Lang::tr{'off'}
+               </td>
+       </tr>
+       <tr>
+               <td align='left' width='60%'>PPTP</td>
+               <td align='left'>
+                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_PPTP' value='on' $checked{'CONNTRACK_PPTP'}{'on'} /> /
+                       <input type='radio' name='CONNTRACK_PPTP' value='off' $checked{'CONNTRACK_PPTP'}{'off'} /> $Lang::tr{'off'}
+               </td>
+       </tr>
+       <tr>
+               <td align='left' width='60%'>SIP</td>
+               <td align='left'>
+                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} /> /
+                       <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> $Lang::tr{'off'}
+               </td>
+       </tr>
+       <tr>
+               <td align='left' width='60%'>TFTP</td>
+               <td align='left'>
+                       $Lang::tr{'on'} <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} /> /
+                       <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> $Lang::tr{'off'}
+               </td>
+       </tr>
 </table>
+
 <br />
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw default drop'}</b></td></tr>

diff --git a/lfs/configroot b/lfs/configroot
index f8e9ce417197f5d1acbcd110465eb1575f2469e1..f02894ee90b9cd4338514e6ce57143b786a1359e 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -66,7 +66,7 @@ $(TARGET) :
            dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \
            fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \
-           isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
+           isdn/settings mac/settings main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            qos/tosconfig snort/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index cb52670d6a5e42c5dbf7fd809fd1350d66a8a00d..1d6309c1b0d50a8b26013362669a1e6e797a0c40 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -128,7 +128,7 @@ iptables_init() {
        if [ "${CONNTRACK_PPTP}" = "on" ]; then
                iptables -A CONNTRACK -m conntrack --ctstate RELATED \
                        -m helper --helper pptp -j ACCEPT
-               iptables -t raw -A CONNTRACK -p udp --dport 1723 -j CT --helper pptp
+               iptables -t raw -A CONNTRACK -p tcp --dport 1723 -j CT --helper pptp
        fi
 
        # TFTP