usr/lib/perl5/5.8.8/IO/Socket/INET.pm
usr/lib/perl5/5.8.8/IO/Socket/UNIX.pm
#usr/lib/perl5/5.8.8/IPC
-#usr/lib/perl5/5.8.8/IPC/Open2.pm
-#usr/lib/perl5/5.8.8/IPC/Open3.pm
+usr/lib/perl5/5.8.8/IPC/Open2.pm
+usr/lib/perl5/5.8.8/IPC/Open3.pm
#usr/lib/perl5/5.8.8/List
usr/lib/perl5/5.8.8/List/Util.pm
#usr/lib/perl5/5.8.8/Locale
-#!/bin/sh
-/usr/bin/squidGuard | /usr/sbin/updxlrator
+#!/usr/bin/perl
+
+###############
+#
+# This is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# It is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with SquiVi2; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Copyright 2004 Steffen Schoch (sschoch@users.sourceforge.net)
+# Modified by Michael Tremer for www.ipfire.org (mitch@ipfire.org, 2007)
+#
+###############
+
+# Version
+my $VERSION = '1.0';
+
+use strict;
+use IPC::Open2;
+use IO::Handle;
+
+# define here your redirectors (use a comma sperated list)
+my $redirectors = [ '/usr/bin/squidGuard', '/usr/sbin/updxlrator', ];
+
+# Attention: keep in mind that the order of your redirectors is important.
+# It doesn't make sense to scan for viruses on pages you restrict access to...
+# So place first your tools which restrict access, then the tools which do the
+# content filtering!
+
+
+##### no need to change anything below this line #####
+
+# init
+$| = 1;
+STDOUT->autoflush(1);
+my $line;
+my $return;
+my $i;
+
+# open progamms
+my $pidlist = [];
+my $rlist = [];
+my $wlist = [];
+for($i = 0; $i < @$redirectors; $i++) {
+ $pidlist->[$i] = open2($rlist->[$i], $wlist->[$i], $redirectors->[$i]);
+}
+
+# wait for data...
+while($line = <>) {
+ for($i = 0; $i < @$redirectors; $i++) {
+ $wlist->[$i]->print($line);
+ $return = $rlist->[$i]->getline;
+ last if($return ne "\n" and $return ne $line);
+ # break if redirector changes data
+ }
+ print $return;
+}
+exit 0;
/sbin/iptables -A REDINPUT -p udp --source-port 67 --destination-port 68 -i ${1} -j ACCEPT
fi
- DHCP_START="-N -R -L /var/ipfire/dhcpc "
+ DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
if [ -n "${DHCP_HOSTNAME}" ]; then
DHCP_START+="-h ${DHCP_HOSTNAME} "
# Do nothing with the client daemon if we have an infinate
# lease time as the client exits when started in this case,
# just echo OK.
- DHCP_STOP="-k"
+ DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
if [ -e $LEASEINFO ]
then
. $LEASEINFO
VARCHARS='A-Za-z0-9=/,._@#+-'
VARVAL="[${VARCHARS}]*"
-sed -ne "s/^\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1
+sed -ne "s/\(${VARNAME}\)=\(${VARVAL}\)$/\1=\2/p" $1
# Accept space only if it's quoted
-sed -ne "s/^\(${VARNAME}\)=\('[ ${VARCHARS}]*'\)$/\1=\2/p" $1
+sed -ne "s/\(${VARNAME}\)=\('[ ${VARCHARS}]*'\)$/\1=\2/p" $1