IPFire-SCM July 2011

ipfire-scm@lists.ipfire.org

1 participants
91 discussions

[IPFire-SCM] [git.ipfire.org] A implementation of the rapid spanning tree protocol for linux. branch, master, updated. 43a0ac239b23cb5c9ff12a5e39c67a4e72072d8c
by git＠ipfire.org 06 Jul '11

06 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "A implementation of the rapid spanning tree protocol for linux.". The branch, master has been updated via 43a0ac239b23cb5c9ff12a5e39c67a4e72072d8c (commit) via 968d3d40984d0279bce51259ce0e969adc7bda79 (commit) via d19d0e359b26f0935e66b0c19b98c7e66fac9f34 (commit) via 394cd57d336cb2ab1429b2ba2a3c90415ef8d8dc (commit) via b27ab0efa4ecf7a839f750ec1e9b9092c577ebbb (commit) from 8551b0db50a02ca829be03ed6d1e86d09b9828b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 43a0ac239b23cb5c9ff12a5e39c67a4e72072d8c Merge: 8551b0d 968d3d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 6 21:08:28 2011 +0200 Merge remote-tracking branch 'upstream/master' Conflicts: bridge_track.c commit 968d3d40984d0279bce51259ce0e969adc7bda79 Author: Stephen Hemminger <shemminger(a)vyatta.com> Date: Mon Jul 4 14:37:25 2011 -0700 Ignore carrier state on bridge device The carrier of bridge device reflects underlying devices in later kernels. Therefor RSTP daemon should ignore carrier (IFF_RUNNING) and only look at IFF_UP on bridge device. commit d19d0e359b26f0935e66b0c19b98c7e66fac9f34 Author: Stephen Hemminger <shemminger(a)vyatta.com> Date: Mon Jul 4 14:14:36 2011 -0700 Make local functions static commit 394cd57d336cb2ab1429b2ba2a3c90415ef8d8dc Author: Stephen Hemminger <shemminger(a)vyatta.com> Date: Mon Jul 4 14:13:53 2011 -0700 Remove variable set and never used commit b27ab0efa4ecf7a839f750ec1e9b9092c577ebbb Author: Alexander Stein <alexander.stein(a)systec-electronic.com> Date: Tue Jun 28 17:19:15 2011 +0200 bridge-stp: Fix variable name used to generate pid_file Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> ----------------------------------------------------------------------- Summary of changes: bridge-stp | 2 +- bridge_ctl.h | 2 +- bridge_track.c | 49 ++++++++++++++++++++++++++++++++++--------------- brmon.c | 7 +------ libnetlink.c | 3 +-- 5 files changed, 38 insertions(+), 25 deletions(-) Difference in files: diff --git a/bridge-stp b/bridge-stp index 5e663a9..e699b87 100755 --- a/bridge-stp +++ b/bridge-stp @@ -14,7 +14,7 @@ if [ $# -ne 2 ]; then fi bridge=$1 service=rstpd -pid_file=/var/run/${servicename}.pid +pid_file=/var/run/${service}.pid # Set $pid to pids from /var/run* for {program}. $pid should be declared # local in the caller. diff --git a/bridge_ctl.h b/bridge_ctl.h index 2838330..b0449ca 100644 --- a/bridge_ctl.h +++ b/bridge_ctl.h @@ -33,7 +33,7 @@ void bridge_get_configuration(void); int bridge_set_state(int ifindex, int state); -int bridge_notify(int br_index, int if_index, int newlink, int up); +int bridge_notify(int br_index, int if_index, int newlink, unsigned flags); void bridge_bpdu_rcv(int ifindex, const unsigned char *data, int len); diff --git a/bridge_track.c b/bridge_track.c index f5efa3f..10e13f7 100644 --- a/bridge_track.c +++ b/bridge_track.c @@ -249,12 +249,15 @@ static int stp_enabled(struct ifdata *br) return enabled == 2; /* ie user mode STP */ } -void set_br_up(struct ifdata *br, int up) +static void set_br_up(struct ifdata *br, int up) { int stp_up = stp_enabled(br); - INFO("%s was %s stp was %s", br->name, br->up ? "up" : "down", br->stp_up ? "up" : "down"); + INFO("%s was %s stp was %s", br->name, + up ? "up" : "down", + br->stp_up ? "up" : "down"); INFO("Set bridge %s %s stp %s" , br->name, - up ? "up" : "down", stp_up ? "up" : "down"); + up ? "up" : "down", + stp_up ? "up" : "down"); int changed = 0; @@ -280,7 +283,7 @@ void set_br_up(struct ifdata *br, int up) (br->up && br->stp_up)?1:0); } -void set_if_up(struct ifdata *ifc, int up) +static void set_if_up(struct ifdata *ifc, int up) { INFO("Port %s : %s", ifc->name, (up ? "up" : "down")); int speed = -1; @@ -332,14 +335,14 @@ void set_if_up(struct ifdata *ifc, int up) /*------------------------------------------------------------*/ -int bridge_notify(int br_index, int if_index, int newlink, int up) +int bridge_notify(int br_index, int if_index, int newlink, + unsigned flags) { - if (up) - up = 1; - LOG("br_index %d, if_index %d, newlink %d, up %d", - br_index, if_index, newlink, up); - struct ifdata *br = NULL; + + LOG("br_index %d, if_index %d, up %d running %d", + br_index, if_index, (flags & IFF_UP), flags & IFF_RUNNING); + if (br_index >= 0) { br = find_if(br_index); if (br && !br->is_bridge) { @@ -395,7 +398,10 @@ int bridge_notify(int br_index, int if_index, int newlink, int up) delete_if(ifc); return 0; } - set_if_up(ifc, up); /* And speed and duplex */ + int up = (flags & (IFF_UP|IFF_RUNNING)) == (IFF_UP|IFF_RUNNING); + + if (ifc->up != up) + set_if_up(ifc, up); /* And speed and duplex */ } else { /* No br_index */ if (!newlink) { /* DELLINK not from bridge means interface unregistered. */ @@ -417,11 +423,24 @@ int bridge_notify(int br_index, int if_index, int newlink, int up) } } } + if (ifc && !ifc->is_bridge && + !is_bridge_slave(ifc->master->name, ifc->name)) { + /* Interface might have left bridge and we might have missed deletion */ + delete_if(ifc); + return 0; + } + if (ifc) { - if (ifc->is_bridge) - set_br_up(ifc, up); - else - set_if_up(ifc, up); + if (ifc->is_bridge) { + int up = (flags & IFF_UP) != 0; + if (ifc->up != up) + set_br_up(ifc, up); + } else { + int up = (flags & (IFF_UP|IFF_RUNNING)) == (IFF_UP|IFF_RUNNING); + + if (ifc->up != up) + set_if_up(ifc, up); + } } } } diff --git a/brmon.c b/brmon.c index fd4dacd..4c4e490 100644 --- a/brmon.c +++ b/brmon.c @@ -30,11 +30,6 @@ static const char SNAPSHOT[] = "v0.1"; -static int is_up(const struct ifinfomsg *ifi) -{ - return (ifi->ifi_flags & IFF_UP) && (ifi->ifi_flags & IFF_RUNNING); -} - static int dump_msg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) { @@ -95,7 +90,7 @@ static int dump_msg(const struct sockaddr_nl *who, struct nlmsghdr *n, bridge_notify(master, ifi->ifi_index, (n->nlmsg_type == RTM_NEWLINK), - is_up(ifi)); + ifi->ifi_flags); return 0; } diff --git a/libnetlink.c b/libnetlink.c index 7752236..62e47a9 100644 --- a/libnetlink.c +++ b/libnetlink.c @@ -449,7 +449,7 @@ int rtnl_from_file(FILE * rtnl, rtnl_filter_t handler, void *jarg) nladdr.nl_groups = 0; while (1) { - int err, len, type; + int err, len; int l; status = fread(&buf, 1, sizeof(*h), rtnl); @@ -464,7 +464,6 @@ int rtnl_from_file(FILE * rtnl, rtnl_filter_t handler, void *jarg) return 0; len = h->nlmsg_len; - type = h->nlmsg_type; l = len - sizeof(*h); if (l < 0 || len > sizeof(buf)) { hooks/post-receive -- A implementation of the rapid spanning tree protocol for linux.

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3717a205a61b582ba5426da008a548bf98085742
by git＠ipfire.org 06 Jul '11

06 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 3717a205a61b582ba5426da008a548bf98085742 (commit) via daf9669080f7b03530bdebcfee822697c89242c5 (commit) via aba9ac599fe3ba8657a2a35519ee0e8266def38b (commit) via bfd77eaf70f5112da41c9ae379c130fc8bceed76 (commit) from e1b8a853237eb16a3cfc1a98ddd9b3ef2bdfe095 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3717a205a61b582ba5426da008a548bf98085742 Merge: e1b8a85 daf9669 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 6 19:38:29 2011 +0200 Merge branch 'static-routing' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/misc-progs | 1 + lfs/iproute2 | 4 ++ src/initscripts/init.d/static-routes | 67 ++++++++++++++++++++++++++++++++++ src/misc-progs/Makefile | 4 ++- src/misc-progs/rebuildroutes.c | 17 +++++++++ 5 files changed, 92 insertions(+), 1 deletions(-) create mode 100644 src/initscripts/init.d/static-routes create mode 100644 src/misc-progs/rebuildroutes.c Difference in files: diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index 6e5d7ca..adab51b 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -18,6 +18,7 @@ usr/local/bin/outgoingfwctrl usr/local/bin/pakfire usr/local/bin/qosctrl usr/local/bin/rebuildhosts +usr/local/bin/rebuildroutes usr/local/bin/redctrl #usr/local/bin/sambactrl usr/local/bin/setaliases diff --git a/lfs/iproute2 b/lfs/iproute2 index 3cc6844..50ccf40 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -76,5 +76,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin cd $(DIR_APP) && make SBINDIR=/sbin install cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin + + # Add table for static routing + echo "200 static" >> /etc/iproute2/rt_tables + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/init.d/static-routes new file mode 100644 index 0000000..970083c --- /dev/null +++ b/src/initscripts/init.d/static-routes @@ -0,0 +1,67 @@ +#!/bin/bash + +. /etc/sysconfig/rc +. ${rc_functions} + + +function init_table() { + # Check if table does already exist. If not we add it. + if (ip rule | grep -q "static" >/dev/null 2>&1); then + return + fi + + ip rule add table static +} + +function create_all_routes() { + local file=${1} + shift + + # Remote all routes. + ip route flush table static >/dev/null 2>&1 + + local status + local network + local gateway + local remark + + # Read all routes from the configuration file and add the enabled ones + # immediately. + while IFS=, read status network gateway remark; do + [ "${status}" = "on" ] || continue + + if [ -z "${network}" -o -z "${gateway}" ]; then + # Silently skipping invalid routes. + continue + fi + + ip route add ${network} via ${gateway} table static + done < ${file} +} + +CONFIGFILE="/var/ipfire/main/routing" + +case "${1}" in + start) + boot_mesg "Adding static routes..." + + # First, initialize the table + init_table + + # Add all routes + create_all_routes ${CONFIGFILE} + + evaluate_retval + ;; + + stop) + boot_mesg "Removing static routes..." + ip route flush table static >/dev/null 2>&1 + evaluate_retval + ;; + + *) + echo "Usage: ${0} {start|stop}" + exit 1 + ;; +esac diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index 348f91c..9f1e3f0 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -32,7 +32,7 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \ wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ - setaliases urlfilterctrl updxlratorctrl fireinfoctrl + setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes SUID_UPDX = updxsetperms install : all @@ -158,3 +158,5 @@ updxsetperms: updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ +rebuildroutes: rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o -o $@ diff --git a/src/misc-progs/rebuildroutes.c b/src/misc-progs/rebuildroutes.c new file mode 100644 index 0000000..3655692 --- /dev/null +++ b/src/misc-progs/rebuildroutes.c @@ -0,0 +1,17 @@ +/* IPFire helper program - rebuildroutes + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + */ + +#include "libsmooth.h" +#include "setuid.h" + +int main(int argc, char *argv[]) { + if (!(initsetuid())) + exit(1); + + safe_system("/etc/init.d/static-routes start >/dev/null 2>&1"); + + return 0; +} hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e1b8a853237eb16a3cfc1a98ddd9b3ef2bdfe095
by git＠ipfire.org 06 Jul '11

06 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via e1b8a853237eb16a3cfc1a98ddd9b3ef2bdfe095 (commit) via a5b0d8bf9eba230f06f2b09810cc04e0a39c58ae (commit) from 85cbc0a08f8f0125602244b91beb1b8e45a36e3f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e1b8a853237eb16a3cfc1a98ddd9b3ef2bdfe095 Merge: a5b0d8b 85cbc0a Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jul 6 19:30:11 2011 +0200 Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next commit a5b0d8bf9eba230f06f2b09810cc04e0a39c58ae Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Wed Jul 6 19:29:36 2011 +0200 Added new routing cgi. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 1 + html/cgi-bin/{hosts.cgi => routing.cgi} | 180 ++++++++++++++----------------- langs/de/cgi-bin/de.pl | 2 + langs/en/cgi-bin/en.pl | 2 + langs/es/cgi-bin/es.pl | 2 + langs/fr/cgi-bin/fr.pl | 2 + langs/pl/cgi-bin/pl.pl | 2 + 7 files changed, 93 insertions(+), 98 deletions(-) copy html/cgi-bin/{hosts.cgi => routing.cgi} (72%) Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 970598e..2eab3b5 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1404,6 +1404,7 @@ srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/remote.cgi +srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/speed.cgi srv/web/ipfire/cgi-bin/system.cgi diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi new file mode 100644 index 0000000..86e0429 --- /dev/null +++ b/html/cgi-bin/routing.cgi @@ -0,0 +1,446 @@ +#!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +use strict; + +# enable only the following on debugging purpose +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; + +require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/lang.pl"; +require "${General::swroot}/header.pl"; + +#workaround to suppress a warning when a variable is used only once +my @dummy = ( ${Header::colouryellow} ); +undef (@dummy); + +# Files used +my $setting = "${General::swroot}/main/settings"; +our $datafile = "${General::swroot}/main/routing"; #(our: used in subroutine) + +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + +our %settings = (); + +$settings{'EN'} = ''; # reuse for dummy field in position zero +$settings{'IP'} = ''; +$settings{'GATEWAY'} = ''; +$settings{'REMARK'} = ''; +my @nosaved=('EN','IP','GATEWAY','REMARK'); # List here ALL setting2 fields. Mandatory + +$settings{'ACTION'} = ''; # add/edit/remove +$settings{'KEY1'} = ''; # point record for ACTION + +#Define each field that can be used to sort columns +my $sortstring='^IP|^GATEWAY|^REMARK'; +$settings{'SORT_GATEWAYLIST'} = 'GATEWAY'; +my $errormessage = ''; +my $warnmessage = ''; + +&Header::showhttpheaders(); + +#Get GUI values +&Header::getcgihash(\%settings); + +############### +# DEBUG DEBUG +#&Header::openbox('100%', 'left', 'DEBUG'); +#my $debugCount = 0; +#foreach my $line (sort keys %settings) { +#print "$line = $settings{$line}<br />\n"; +# $debugCount++; +#} +#print " Count: $debugCount\n"; +#&Header::closebox(); +# DEBUG DEBUG +############### + +# Load multiline data +our @current = (); +if (open(FILE, "$datafile")) { + @current = <FILE>; + close (FILE); +} + +## Settings1 Box not used... +&General::readhash("${General::swroot}/main/settings", \%settings); + + +## Now manipulate the multi-line list with Settings2 +# Basic actions are: +# toggle the check box +# add/update a new line +# begin editing a line +# remove a line + + +# Toggle enable/disable field. Field is in second position +if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { + #move out new line + chomp(@current[$settings{'KEY1'}]); + my @temp = split(/\,/,@current[$settings{'KEY1'}]); + + $temp[0] = $temp[0] ne '' ? '' : 'on'; # Toggle the field + @current[$settings{'KEY1'}] = join (',',@temp)."\n"; + $settings{'KEY1'} = ''; # End edit mode + + &General::log($Lang::tr{'routing config changed'}); + + #Save current + open(FILE, ">$datafile") or die 'routing datafile error'; + print FILE @current; + close(FILE); + + # Rebuild configuration file + &BuildConfiguration; +} + +if ($settings{'ACTION'} eq $Lang::tr{'add'}) { + +# Validate inputs + if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ + $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'}; + } + + if ($settings{'IP'} =~ /0.0.0.0/){ + $errormessage = $Lang::tr{'invalid ip'}." - 0.0.0.0"; + } + + if( !&General::validip($settings{'GATEWAY'}) ) { + $errormessage = $Lang::tr{'invalid ip'}. " - ".$Lang::tr{'gateway ip'}; + } + + unless ($errormessage) { + if ($settings{'KEY1'} eq '') { #add or edit ? + unshift (@current, "$settings{'EN'},$settings{'IP'},$settings{'GATEWAY'},$settings{'REMARK'}\n"); + &General::log($Lang::tr{'routing config added'}); + } else { + @current[$settings{'KEY1'}] = "$settings{'EN'},$settings{'IP'},$settings{'GATEWAY'},$settings{'REMARK'}\n"; + $settings{'KEY1'} = ''; # End edit mode + &General::log($Lang::tr{'routing config changed'}); + } + + # Write changes to config file. + &SortDataFile; # sort newly added/modified entry + &BuildConfiguration; # then re-build routing + + #map ($settings{$_}='' ,@nosaved); # Clear fields + } +} + +if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { + #move out new line + my $line = @current[$settings{'KEY1'}]; # KEY1 is the index in current + chomp($line); + my @temp = split(/\,/, $line); + $settings{'EN'}=$temp[0]; # Prepare the screen for editing + $settings{'IP'}=$temp[1]; + $settings{'GATEWAY'}=$temp[2]; + $settings{'REMARK'}=$temp[3]; + &BuildConfiguration; +} + +if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { + splice (@current,$settings{'KEY1'},1); # Delete line + open(FILE, ">$datafile") or die 'route datafile error'; + print FILE @current; + close(FILE); + $settings{'KEY1'} = ''; # End remove mode + &General::log($Lang::tr{'route config changed'}); + + &BuildConfiguration; # then re-build conf which use new data +} + +## Check if sorting is asked +# If same column clicked, reverse the sort. +if ($ENV{'QUERY_STRING'} =~ /$sortstring/ ) { + my $newsort=$ENV{'QUERY_STRING'}; + my $actual=$settings{'SORT_GATEWAYLIST'}; + #Reverse actual sort ? + if ($actual =~ $newsort) { + my $Rev=''; + if ($actual !~ 'Rev') { + $Rev='Rev'; + } + $newsort.=$Rev; + } + $settings{'SORT_GATEWAYLIST'}=$newsort; + map (delete ($settings{$_}) ,(@nosaved,'ACTION','KEY1'));# Must never be saved + &General::writehash($setting, \%settings); + &SortDataFile; + $settings{'ACTION'} = 'SORT'; # Create an 'ACTION' + map ($settings{$_} = '' ,@nosaved,'KEY1'); # and reinit vars to empty +} + +if ($settings{'ACTION'} eq '' ) { # First launch from GUI + # Place here default value when nothing is initialized + $settings{'EN'} = 'on'; + $settings{'GATEWAY'} = ''; + $settings{'IP'} = ''; +} + +&Header::openpage($Lang::tr{'routing table entries'}, 1, ''); +&Header::openbigbox('100%', 'left', '', $errormessage); +my %checked=(); # Checkbox manipulations + +if ($errormessage) { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "<font class='base'>$errormessage </font>"; + &Header::closebox(); +} + +# + +$checked{'EN'}{'on'} = ($settings{'EN'} eq '' ) ? '' : "checked='checked'"; + +my $buttontext = $Lang::tr{'add'}; +if ($settings{'KEY1'} ne '') { + $buttontext = $Lang::tr{'update'}; + &Header::openbox('100%', 'left', $Lang::tr{'Edit an existing route'}); +} else { + &Header::openbox('100%', 'left', $Lang::tr{'Add a route'}); +} + +#Edited line number (KEY1) passed until cleared by 'save' or 'remove' or 'new sort order' +print <<END +<form method='post' action='$ENV{'SCRIPT_NAME'}'> +<input type='hidden' name='KEY1' value='$settings{'KEY1'}' /> +<table width='100%'> +<tr> + <td class='base'>$Lang::tr{'host ip'} / $Lang::tr{'network'}: </td> + <td><input type='text' name='IP' value='$settings{'IP'}' size='25'/></td> +</tr><tr> + <td class='base'>$Lang::tr{'gateway'}: </td> + <td><input type='text' name='GATEWAY' value='$settings{'GATEWAY'}' size='25'/></td> + <td class='base'>$Lang::tr{'enabled'}</td> + <td><input type='checkbox' name='EN' $checked{'EN'}{'on'} /></td> +</tr> +</tr> + <td class='base'>$Lang::tr{'remark'}: </td> + <td><input type='text' name='REMARK' value='$settings{'REMARK'}' size='25'/></td> +</tr> +</table> +<hr /> +<table width='100%'> +<tr> + <td width='50%' align='center'><input type='hidden' name='ACTION' value='$Lang::tr{'add'}' /><input type='submit' name='SUBMIT' value='$buttontext' /></td> +</tr> +</table> +</form> +END +; +&Header::closebox(); + +&Header::openbox('100%', 'left', $Lang::tr{'routing table'}); +print <<END +<hr /> +<table width='100%'> +<tr> + <td width='30%' align='center'><a href='$ENV{'SCRIPT_NAME'}?IP'><b>$Lang::tr{'host ip'} / $Lang::tr{'network'}</b></a></td> + <td width='30%' align='center'><a href='$ENV{'SCRIPT_NAME'}?GATEWAY'><b>$Lang::tr{'gateway'}</b></a></td> + <td width='30%' align='center'><a href='$ENV{'SCRIPT_NAME'}?REMARK'><b>$Lang::tr{'remark'}</b></a></td> + <td width='10%' colspan='3' class='boldbase' align='center'><b>$Lang::tr{'action'}</b></td> +</tr> +END +; + +# +# Print each line of @current list +# + +my $key = 0; +foreach my $line (@current) { + chomp($line); # remove newline + my @temp=split(/\,/,$line); + $temp[2] ='' unless defined $temp[2]; # not always populated + $temp[3] ='' unless defined $temp[2]; # not always populated + + #Choose icon for checkbox + my $gif = ''; + my $gdesc = ''; + if ($temp[0] ne '' ) { + $gif = 'on.gif'; + $gdesc = $Lang::tr{'click to disable'}; + } else { + $gif = 'off.gif'; + $gdesc = $Lang::tr{'click to enable'}; + } + + #Colorize each line + if ($settings{'KEY1'} eq $key) { + print "<tr bgcolor='${Header::colouryellow}'>"; + } elsif ($key % 2) { + print "<tr bgcolor='$color{'color22'}'>"; + } else { + print "<tr bgcolor='$color{'color20'}'>"; + } + print <<END +<td align='center'>$temp[1]</td> +<td align='center'>$temp[2]</td> +<td align='center'>$temp[3]</td> +<td align='center'> +<form method='post' action='$ENV{'SCRIPT_NAME'}'> +<input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' /> +<input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$gdesc' title='$gdesc' /> +<input type='hidden' name='KEY1' value='$key' /> +</form> +</td> + +<td align='center'> +<form method='post' action='$ENV{'SCRIPT_NAME'}'> +<input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' /> +<input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> +<input type='hidden' name='KEY1' value='$key' /> +</form> +</td> + +<td align='center'> +<form method='post' action='$ENV{'SCRIPT_NAME'}'> +<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' /> +<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /> +<input type='hidden' name='KEY1' value='$key' /> +</form> +</td> +</tr> +END +; + $key++; +} +print "</table>"; + +# If table contains entries, print 'Key to action icons' +if ($key) { +print <<END +<table> +<tr> + <td class='boldbase'> <b>$Lang::tr{'legend'}: </b></td> + <td><img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> + <td class='base'>$Lang::tr{'click to disable'}</td> + <td>  </td> + <td><img src='/images/off.gif' alt='$Lang::tr{'click to enable'}' /></td> + <td class='base'>$Lang::tr{'click to enable'}</td> + <td>  </td> + <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td> + <td class='base'>$Lang::tr{'edit'}</td> + <td>  </td> + <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> + <td class='base'>$Lang::tr{'remove'}</td> +</tr> +</table> +END +; +} + +&Header::closebox(); + +my $output = `/sbin/ip route show table static`; +$output = &Header::cleanhtml($output,"y"); + +if ( $output != "" ) { + &Header::openbox('100%', 'left', $Lang::tr{'routing table entries'}); + print "<pre>$output</pre>\n"; + &Header::closebox(); +} + +&Header::closebigbox(); +&Header::closepage(); + +## Ouf it's the end ! + +# Sort the "current" array according to choices +sub SortDataFile +{ + our %entries = (); + + # Sort pair of record received in $a $b special vars. + # When IP is specified use numeric sort else alpha. + # If sortname ends with 'Rev', do reverse sort. + # + sub fixedleasesort { + my $qs=''; # The sort field specified minus 'Rev' + if (rindex ($settings{'SORT_GATEWAYLIST'},'Rev') != -1) { + $qs=substr ($settings{'SORT_GATEWAYLIST'},0,length($settings{'SORT_GATEWAYLIST'})-3); + if ($qs eq 'IP') { + my @a = split(/\./,$entries{$a}->{$qs}); + my @b = split(/\./,$entries{$b}->{$qs}); + ($b[0]<=>$a[0]) || + ($b[1]<=>$a[1]) || + ($b[2]<=>$a[2]) || + ($b[3]<=>$a[3]); + } else { + $entries{$b}->{$qs} cmp $entries{$a}->{$qs}; + } + } else { #not reverse + $qs=$settings{'SORT_GATEWAYLIST'}; + if ($qs eq 'IP') { + my @a = split(/\./,$entries{$a}->{$qs}); + my @b = split(/\./,$entries{$b}->{$qs}); + ($a[0]<=>$b[0]) || + ($a[1]<=>$b[1]) || + ($a[2]<=>$b[2]) || + ($a[3]<=>$b[3]); + } else { + $entries{$a}->{$qs} cmp $entries{$b}->{$qs}; + } + } + } + + #Use an associative array (%entries) + my $key = 0; + foreach my $line (@current) { + chomp( $line); #remove newline because can be on field 5 or 6 (addition of REMARK) + my @temp = ( '','','', ''); + @temp = split (',',$line); + + # Build a pair 'Field Name',value for each of the data dataline. + # Each SORTABLE field must have is pair. + # Other data fields (non sortable) can be grouped in one + + my @record = ('KEY',$key++,'EN',$temp[0],'IP',$temp[1],'GATEWAY',$temp[2],'REMARK',$temp[3]); + my $record = {}; # create a reference to empty hash + %{$record} = @record; # populate that hash with @record + $entries{$record->{KEY}} = $record; # add this to a hash of hashes + } + + open(FILE, ">$datafile") or die 'routing datafile error'; + + # Each field value is printed , with the newline ! Don't forget separator and order of them. + foreach my $entry (sort fixedleasesort keys %entries) { + print FILE "$entries{$entry}->{EN},$entries{$entry}->{IP},$entries{$entry}->{GATEWAY},$entries{$entry}->{REMARK}\n"; + } + + close(FILE); + # Reload sorted @current + open (FILE, "$datafile"); + @current = <FILE>; + close (FILE); +} + +# +# Build the configuration file +# +sub BuildConfiguration { + system '/usr/local/bin/rebuildroutes'; +} \ No newline at end of file diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d97dee0..34d7b03 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2,6 +2,8 @@ %tr, 'Act as' => 'Konfiguriert als', +'Edit an existing route' => 'Eine existierende Route editieren', +'Add a route' => 'Eine Route hinzufÃŒgen', 'Add Level7 rule' => 'Level7-Regel hinzufÃŒgen', 'Add Port Rule' => 'Port Regel hinzufÃŒgen', 'Add Rule' => 'Regel hinzufÃŒgen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 67451be..46b10a1 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -4,6 +4,8 @@ 'Act as' => 'Act as:', 'Add Level7 rule' => 'Add Level7 rule', 'Add Port Rule' => 'Add port rule', +'Edit an existing route' => 'Edit an existing route', +'Add a route' => 'Add a route', 'Add Rule' => 'Add rule', 'Async logging enabled' => 'Enable asynchronous writing of the syslog file', 'Choose Rule' => 'Choose <u>one</u> of the following rules.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 41c0917..3f0fe78 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -5,6 +5,8 @@ 'Add Level7 rule' => 'aÃ±adir regla de Nivel 7', 'Add Port Rule' => 'AÃ±adir Regla de Puerto', 'Add Rule' => 'AÃ±adir Regla', +'Edit an existing route' => 'Editar una route existente', +'Add a route' => 'AÃ±adir una route', 'Choose Rule' => 'Seleccione <u>una</u> de las siguientes reglas.', 'Class' => 'Clase', 'Class was deleted' => 'con subclases potenciales fuÃ© eliminado', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 62bfb28..bfc2cc5 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -5,6 +5,8 @@ 'Add Level7 rule' => 'Ajouter une rÃšgle Level7', 'Add Port Rule' => 'Ajouter une rÃšgle de port', 'Add Rule' => 'Ajouter une rÃšgle', +'Edit an existing route' => 'Modifier une route existante', +'Add a route' => 'Ajouter une route', 'Async logging enabled' => 'Activer l\'Ã©criture asynchrone du fichier syslog', 'Choose Rule' => 'Choisissez <u>une</u> des rÃšgles suivantes.', 'Class' => 'Classe', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 8283fa3..31bff32 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -8,6 +8,8 @@ 'Async logging enabled' => 'WÅÃcz asynchroniczny zapis do pliku syslog', 'Choose Rule' => 'Wybierz <u>jednÃ</u> z poniÅŒszych reguÅ.', 'Class' => 'Klasa', +'Edit an existing route' => 'Edytuj istniejaca trase', +'Add a route' => 'Dodaj trase', 'Class was deleted' => 'wraz z ewentualnymi podklasami zostaÅa usuniÃta', 'Client status and controlc' => 'Client status and control:', 'ConnSched action' => 'Zadanie:', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, static-routing, updated. daf9669080f7b03530bdebcfee822697c89242c5
by git＠ipfire.org 05 Jul '11

05 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, static-routing has been updated via daf9669080f7b03530bdebcfee822697c89242c5 (commit) via aba9ac599fe3ba8657a2a35519ee0e8266def38b (commit) from bfd77eaf70f5112da41c9ae379c130fc8bceed76 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit daf9669080f7b03530bdebcfee822697c89242c5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 5 19:10:31 2011 +0200 Add binary "rebuildroutes" to setup routes from the webif. commit aba9ac599fe3ba8657a2a35519ee0e8266def38b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 5 18:57:33 2011 +0200 Update static routing script to actually add the routes. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/misc-progs | 1 + src/initscripts/init.d/static-routes | 54 +++++++++++++++++++++++++-------- src/misc-progs/Makefile | 4 ++- src/misc-progs/rebuildroutes.c | 17 ++++++++++ 4 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 src/misc-progs/rebuildroutes.c Difference in files: diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index 6e5d7ca..adab51b 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -18,6 +18,7 @@ usr/local/bin/outgoingfwctrl usr/local/bin/pakfire usr/local/bin/qosctrl usr/local/bin/rebuildhosts +usr/local/bin/rebuildroutes usr/local/bin/redctrl #usr/local/bin/sambactrl usr/local/bin/setaliases diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/init.d/static-routes index 184f97d..970083c 100644 --- a/src/initscripts/init.d/static-routes +++ b/src/initscripts/init.d/static-routes @@ -6,34 +6,62 @@ function init_table() { # Check if table does already exist. If not we add it. - if (ip rule | grep -qeE static >/dev/null 2>&1); then + if (ip rule | grep -q "static" >/dev/null 2>&1); then return fi ip rule add table static } +function create_all_routes() { + local file=${1} + shift + + # Remote all routes. + ip route flush table static >/dev/null 2>&1 + + local status + local network + local gateway + local remark + + # Read all routes from the configuration file and add the enabled ones + # immediately. + while IFS=, read status network gateway remark; do + [ "${status}" = "on" ] || continue + + if [ -z "${network}" -o -z "${gateway}" ]; then + # Silently skipping invalid routes. + continue + fi + + ip route add ${network} via ${gateway} table static + done < ${file} +} + +CONFIGFILE="/var/ipfire/main/routing" case "${1}" in start) - boot_mesg "Adding static routes..." + boot_mesg "Adding static routes..." # First, initialize the table - init_table + init_table - ### ADD ALL ROUTES + # Add all routes + create_all_routes ${CONFIGFILE} evaluate_retval - ;; + ;; - stop) - boot_mesg "Removing static routes..." - ip route flush table static >/dev/null 2>&1 + stop) + boot_mesg "Removing static routes..." + ip route flush table static >/dev/null 2>&1 evaluate_retval - ;; + ;; - *) - echo "Usage: ${0} {start|stop}" - exit 1 - ;; + *) + echo "Usage: ${0} {start|stop}" + exit 1 + ;; esac diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index 348f91c..9f1e3f0 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -32,7 +32,7 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \ wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ - setaliases urlfilterctrl updxlratorctrl fireinfoctrl + setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes SUID_UPDX = updxsetperms install : all @@ -158,3 +158,5 @@ updxsetperms: updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ +rebuildroutes: rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ rebuildroutes.c setuid.o ../install+setup/libsmooth/varval.o -o $@ diff --git a/src/misc-progs/rebuildroutes.c b/src/misc-progs/rebuildroutes.c new file mode 100644 index 0000000..3655692 --- /dev/null +++ b/src/misc-progs/rebuildroutes.c @@ -0,0 +1,17 @@ +/* IPFire helper program - rebuildroutes + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + */ + +#include "libsmooth.h" +#include "setuid.h" + +int main(int argc, char *argv[]) { + if (!(initsetuid())) + exit(1); + + safe_system("/etc/init.d/static-routes start >/dev/null 2>&1"); + + return 0; +} hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. 1129c37a95009f8f4ee3222a09c12c3f9d374d9d
by git＠ipfire.org 05 Jul '11

05 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, openvpn-n2n has been updated via 1129c37a95009f8f4ee3222a09c12c3f9d374d9d (commit) from 7d653d51f8ed7aa6198aa724d6e68750642b588f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1129c37a95009f8f4ee3222a09c12c3f9d374d9d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 5 12:45:51 2011 +0200 openvpnctrl: Fix SEGV in sprintf() call. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/openvpnctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 6191fde..00b35e1 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -360,7 +360,7 @@ void setFirewallRules(void) { setChainRules(OVPNORANGE, orangeif, protocol, dport); // set firewall rules for n2n connections - char *port; + char port[STRING_SIZE]; while (conn != NULL) { sprintf(port, "%d", conn->port); setChainRules(OVPNRED, redif, conn->proto, port); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 85cbc0a08f8f0125602244b91beb1b8e45a36e3f
by git＠ipfire.org 04 Jul '11

04 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 85cbc0a08f8f0125602244b91beb1b8e45a36e3f (commit) from 264c0195fbd8a897d37c81d5d74e6502ab7212a8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 85cbc0a08f8f0125602244b91beb1b8e45a36e3f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 23:09:05 2011 +0200 ipsec: fix ike firewall rule to support nat traversal. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/ipsecctrl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index c500e58..a018289 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -59,9 +59,9 @@ void open_physical (char *interface, int nat_traversal_port) { // safe_system(str); // IKE - sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT >/dev/null 2>&1", interface); + sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface); safe_system(str); - sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface); + sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface); safe_system(str); if (! nat_traversal_port) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 264c0195fbd8a897d37c81d5d74e6502ab7212a8
by git＠ipfire.org 04 Jul '11

04 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 264c0195fbd8a897d37c81d5d74e6502ab7212a8 (commit) from ec238128df8a41644501c9620c03103e93c89afd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 264c0195fbd8a897d37c81d5d74e6502ab7212a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:41:31 2011 +0200 ipsec: change grep for ikev2 status display. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/index.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index eec3f9b..b325250 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -370,7 +370,7 @@ END } else { foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || - ($line =~/ $confighash{$key}[1]\{.*INSTALLED/ )) + ($line =~/$confighash{$key}[1]\{.*INSTALLED/ )) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 1fa40a8..177cdf4 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2540,7 +2540,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; foreach my $line (@status) { if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || - ($line =~ / $confighash{$key}[1]\{.*INSTALLED/)) + ($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) { $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; } hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec238128df8a41644501c9620c03103e93c89afd
by git＠ipfire.org 04 Jul '11

04 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via ec238128df8a41644501c9620c03103e93c89afd (commit) via 10ad048deccf8a42b5850e9197619a91756d3906 (commit) via 7180ae3897fecf7366f1e465f90048cd8174ca78 (commit) via e8bae96337cc79c86388f805bfc637d67cd0c362 (commit) via b651a44dba1874126f43da03b33e46cea55b2895 (commit) via 61e1585f054ee47cf78d21abed09769c9482efc4 (commit) from 4912df2ff60c3bf0d8dff3093bac58c892801c6b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ec238128df8a41644501c9620c03103e93c89afd Merge: 7180ae3 10ad048 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:09:54 2011 +0200 Merge branch 'master' into next commit 7180ae3897fecf7366f1e465f90048cd8174ca78 Merge: e8bae96 4912df2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:05:46 2011 +0200 Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next commit e8bae96337cc79c86388f805bfc637d67cd0c362 Merge: 641baa8 b651a44 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 12:53:27 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/50/filelists/files | 1 + .../{oldcore/32 => core/50}/filelists/squid | 0 html/cgi-bin/portfw.cgi | 2 +- lfs/squid | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/32 => core/50}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index 9d39707..034310c 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -3,6 +3,7 @@ var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup var/ipfire/graphs.pl +srv/web/ipfire/cgi-bin/portfw.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat usr/local/share/GeoIP/GeoIP.dat usr/share/hwdata/pci.ids diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/50/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi index 5583fb8..199682f 100644 --- a/html/cgi-bin/portfw.cgi +++ b/html/cgi-bin/portfw.cgi @@ -1038,7 +1038,7 @@ sub disallowreserved { # port 67 and 68 same for tcp and udp, don't bother putting in an array my $msg = ""; - my @tcp_reserved = (81,222,444); + my @tcp_reserved = (); my $prt = $_[0]; # the port or range my $ryn = $_[1]; # tells us whether or not it is a port range my $prot = $_[2]; # protocol diff --git a/lfs/squid b/lfs/squid index bdc1646..ef676a2 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.11 +VER = 3.1.13 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 +$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 10ad048deccf8a42b5850e9197619a91756d3906
by git＠ipfire.org 04 Jul '11

04 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 10ad048deccf8a42b5850e9197619a91756d3906 (commit) via b651a44dba1874126f43da03b33e46cea55b2895 (commit) from 61e1585f054ee47cf78d21abed09769c9482efc4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 10ad048deccf8a42b5850e9197619a91756d3906 Merge: b651a44 61e1585 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 21:06:10 2011 +0200 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x commit b651a44dba1874126f43da03b33e46cea55b2895 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 4 12:52:43 2011 +0200 squid: update to 3.1.13. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{44 => 50}/filelists/squid | 0 lfs/squid | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/core/{44 => 50}/filelists/squid (100%) Difference in files: diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/50/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/lfs/squid b/lfs/squid index bdc1646..ef676a2 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.11 +VER = 3.1.13 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1 +$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4912df2ff60c3bf0d8dff3093bac58c892801c6b
by git＠ipfire.org 04 Jul '11

04 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4912df2ff60c3bf0d8dff3093bac58c892801c6b (commit) from 641baa86e04b6c5e8d6275f62c2b933585087b5a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4912df2ff60c3bf0d8dff3093bac58c892801c6b Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon Jul 4 19:36:53 2011 +0200 OutgoingFW Groups added syntax checks. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/outgoinggrp.cgi | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Difference in files: diff --git a/html/cgi-bin/outgoinggrp.cgi b/html/cgi-bin/outgoinggrp.cgi index e757ca0..1c3d695 100644 --- a/html/cgi-bin/outgoinggrp.cgi +++ b/html/cgi-bin/outgoinggrp.cgi @@ -87,6 +87,8 @@ if ($outgrpsettings{'ACTION'} eq 'newipgroup') if ( -e "$configpath/macgroups/$outgrpsettings{'ipgroup'}" ){ $errormessage = "$Lang::tr{'outgoing firewall group error'}"; + } elsif ( $outgrpsettings{'ipgroup'} =~ /\W/ ){ + $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'ipgroup'}; } elsif ( $outgrpsettings{'ipgroup'} eq "all" || $outgrpsettings{'ipgroup'} eq "red" || $outgrpsettings{'ipgroup'} eq "blue" || $outgrpsettings{'ipgroup'} eq "green" || $outgrpsettings{'ipgroup'} eq "orange" || $outgrpsettings{'ipgroup'} eq "ip" || $outgrpsettings{'ipgroup'} eq "mac" || $outgrpsettings{'ipgroup'} eq "ovpn" || $outgrpsettings{'ipgroup'} eq "ipsec" ) { @@ -112,6 +114,8 @@ if ($outgrpsettings{'ACTION'} eq 'newmacgroup') if ( -e "$configpath/ipgroups/$outgrpsettings{'macgroup'}" ){ $errormessage = "$Lang::tr{'outgoing firewall group error'}"; + } elsif ( $outgrpsettings{'macgroup'} =~ /\W/ ){ + $errormessage = $Lang::tr{'name must only contain characters'}." - ".$outgrpsettings{'macgroup'}; } elsif ( $outgrpsettings{'macgroup'} eq "all" || $outgrpsettings{'macgroup'} eq "red" || $outgrpsettings{'macgroup'} eq "blue" || $outgrpsettings{'macgroup'} eq "green" || $outgrpsettings{'macgroup'} eq "orange" || $outgrpsettings{'macgroup'} eq "ip" || $outgrpsettings{'macgroup'} eq "mac" || $outgrpsettings{'macgroup'} eq "ovpn" || $outgrpsettings{'macgroup'} eq "ipsec" ) { hooks/post-receive -- IPFire 2.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2011