IPFire-SCM July 2011

ipfire-scm@lists.ipfire.org

1 participants
91 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6eaca7da6340c72499e184c35307eeb160ef7b33
by git＠ipfire.org 10 Jul '11

10 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 3.x development tree". The branch, master has been updated via 6eaca7da6340c72499e184c35307eeb160ef7b33 (commit) from b6ccb195d6a325fd3bf4eb90fa20de9cd49c5573 (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 6eaca7da6340c72499e184c35307eeb160ef7b33 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 10 17:32:43 2011 +0200 samba: Enable support for avahi. References #218. ----------------------------------------------------------------------- Summary of changes: pkgs/samba/samba.nm | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/pkgs/samba/samba.nm b/pkgs/samba/samba.nm index e2f66f9..df03fb5 100644 --- a/pkgs/samba/samba.nm +++ b/pkgs/samba/samba.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = samba PKG_VER = 3.5.8 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = Christian Schmidt <christian.schmidt(a)ipfire.org> PKG_GROUPS = Networking/Daemons @@ -34,8 +34,9 @@ PKG_URL = http://www.samba.org/ PKG_LICENSE = GPLv3+ and LGPLv3+ PKG_SUMMARY = Server and Client software to interoperate with Windows machines. -PKG_BUILD_DEPS+= autoconf automake cups-devel ncurses-devel libcap-devel \ - openldap-devel openssl-devel pam-devel popt-devel readline-devel which +PKG_BUILD_DEPS+= autoconf automake avahi-devel cups-devel ncurses-devel \ + libcap-devel openldap-devel openssl-devel pam-devel popt-devel \ + readline-devel which define PKG_DESCRIPTION Samba is the suite of programs by which a lot of PC-related machines \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b6ccb195d6a325fd3bf4eb90fa20de9cd49c5573
by git＠ipfire.org 09 Jul '11

09 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 3.x development tree". The branch, master has been updated via b6ccb195d6a325fd3bf4eb90fa20de9cd49c5573 (commit) from 8181644c841f7751e01a337717d683356b4884f2 (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 b6ccb195d6a325fd3bf4eb90fa20de9cd49c5573 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 10 00:42:00 2011 +0200 curl: Update to 7.21.7. ----------------------------------------------------------------------- Summary of changes: pkgs/curl/curl.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/curl/curl.nm b/pkgs/curl/curl.nm index 74e8eb4..6ce119b 100644 --- a/pkgs/curl/curl.nm +++ b/pkgs/curl/curl.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = curl -PKG_VER = 7.21.2 +PKG_VER = 7.21.7 PKG_REL = 1 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8181644c841f7751e01a337717d683356b4884f2
by git＠ipfire.org 08 Jul '11

08 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 3.x development tree". The branch, master has been updated via 8181644c841f7751e01a337717d683356b4884f2 (commit) from ba6ae15dc0298db9a50fd53e4955163be9914768 (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 8181644c841f7751e01a337717d683356b4884f2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Jul 8 19:30:06 2011 +0200 libpng: Update to 1.5.4. Fixes #216 ----------------------------------------------------------------------- Summary of changes: pkgs/libpng/libpng.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/libpng/libpng.nm b/pkgs/libpng/libpng.nm index 2275f91..f8a035b 100644 --- a/pkgs/libpng/libpng.nm +++ b/pkgs/libpng/libpng.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libpng -PKG_VER = 1.5.2 +PKG_VER = 1.5.4 PKG_REL = 1 PKG_MAINTAINER = hooks/post-receive -- IPFire 3.x development tree

1 0

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

08 Jul '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, openvpn-n2n, updated. 91a0a2217ac1591584c27eb8ce056e977f2b6a80
by git＠ipfire.org 08 Jul '11

08 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 91a0a2217ac1591584c27eb8ce056e977f2b6a80 (commit) from 1129c37a95009f8f4ee3222a09c12c3f9d374d9d (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 91a0a2217ac1591584c27eb8ce056e977f2b6a80 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 8 17:40:59 2011 +0200 openvpnctrl: Fix initialization of the program. Firewall rules are now set properly and a detection for the connection type was added. ----------------------------------------------------------------------- Summary of changes: src/misc-progs/openvpnctrl.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) Difference in files: diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 00b35e1..23924d4 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -8,7 +8,7 @@ #include "setuid.h" #include "libsmooth.h" -#define noovpndebug +#define ovpndebug // global vars struct keyvalue *kv = NULL; @@ -29,6 +29,7 @@ char WRAPPERVERSION[STRING_SIZE] = "ipfire-2.1.2"; struct connection_struct { char name[STRING_SIZE]; + char type[STRING_SIZE]; char proto[STRING_SIZE]; int port; struct connection_struct *next; @@ -106,6 +107,8 @@ connection *getConnections() { while (result) { if (count == 2) { strcpy(conn_curr->name, result); + } else if (count == 4) { + strcpy(conn_curr->type, result); } else if (count == 12) { strcpy(conn_curr->proto, result); } else if (count == 13) { @@ -343,9 +346,6 @@ void setFirewallRules(void) { } freekeyvalues(kv); - // read connection configuration - connection *conn = getConnections(); - // Flush all chains. flushChain(OVPNRED); flushChain(OVPNBLUE); @@ -359,11 +359,18 @@ void setFirewallRules(void) { if (!strcmp(enableorange, "on") && strlen(orangeif)) setChainRules(OVPNORANGE, orangeif, protocol, dport); + // read connection configuration + connection *conn = getConnections(); + // set firewall rules for n2n connections - char port[STRING_SIZE]; + char command[STRING_SIZE]; while (conn != NULL) { - sprintf(port, "%d", conn->port); - setChainRules(OVPNRED, redif, conn->proto, port); + if (strcmp(conn->type, "net") == 0) { + sprintf(command, "/sbin/iptables -A %sINPUT -i %s -p %s --dport %d -j ACCEPT", + OVPNRED, redif, conn->proto, conn->port); + executeCommand(command); + } + conn = conn->next; } } @@ -404,7 +411,7 @@ void startNet2Net(char *name) { conn_iter = getConnections(); while (conn_iter) { - if (strcmp(conn_iter->name, name) == 0) { + if ((strcmp(conn_iter->type, "net") == 0) && (strcmp(conn_iter->name, name) == 0)) { conn = conn_iter; break; } @@ -487,6 +494,8 @@ int main(int argc, char *argv[]) { usage(); if(argc == 3) { + ovpnInit(); + if( (strcmp(argv[1], "-sn2n") == 0) || (strcmp(argv[1], "--start-net-2-net") == 0) ) { startNet2Net(argv[2]); return 0; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6970b26252acfd41e43f323f5fc121e1c8fa775e
by git＠ipfire.org 07 Jul '11

07 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 6970b26252acfd41e43f323f5fc121e1c8fa775e (commit) via fe8324f4518988ed0dec28f6493332a2efc22626 (commit) from 10ad048deccf8a42b5850e9197619a91756d3906 (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 6970b26252acfd41e43f323f5fc121e1c8fa775e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 7 22:03:12 2011 +0200 started core51. ----------------------------------------------------------------------- Summary of changes: make.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 1d760a2..f42082c 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="50" # Core Level (Filename) -PAKFIRE_CORE="49" # Core Level (PAKFIRE) +CORE="51" # Core Level (Filename) +PAKFIRE_CORE="50" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.9-core50, created. d52c5930012c2616d10cf811c5b99ee772fe18d1
by git＠ipfire.org 07 Jul '11

07 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 tag, v2.9-core50 has been created at d52c5930012c2616d10cf811c5b99ee772fe18d1 (commit) - Log ----------------------------------------------------------------- commit d52c5930012c2616d10cf811c5b99ee772fe18d1 Merge: cbb914a fe8324f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 7 22:00:19 2011 +0200 Merge branch 'master' into core50 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core50, created. d52c5930012c2616d10cf811c5b99ee772fe18d1
by git＠ipfire.org 07 Jul '11

07 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, core50 has been created at d52c5930012c2616d10cf811c5b99ee772fe18d1 (commit) - Log ----------------------------------------------------------------- commit d52c5930012c2616d10cf811c5b99ee772fe18d1 Merge: cbb914a fe8324f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 7 22:00:19 2011 +0200 Merge branch 'master' into core50 commit fe8324f4518988ed0dec28f6493332a2efc22626 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 7 21:59:50 2011 +0200 finished core50. commit cbb914abe8dd48de5c055ba88d4d906e972a3c5a Merge: 601099d 10ad048 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 7 21:57:36 2011 +0200 Merge branch 'master' into core50 Conflicts: config/rootfiles/core/50/filelists/icons ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. ba6ae15dc0298db9a50fd53e4955163be9914768
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 3.x development tree". The branch, master has been updated via ba6ae15dc0298db9a50fd53e4955163be9914768 (commit) via f30eba1969c7187c0d8ea62086af486eb4926049 (commit) via 837311002dfeb02682d624f153af12fdda8ca7f1 (commit) via 20c47b224454f76ea3ed0b0ca6a34031252fcd2a (commit) from 063749e48c928aae1fa3d40ea3fe952f9e212d1a (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 ba6ae15dc0298db9a50fd53e4955163be9914768 Merge: f30eba1 8373110 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 6 22:05:37 2011 +0200 Merge remote-tracking branch 'stevee/newt' commit f30eba1969c7187c0d8ea62086af486eb4926049 Merge: 20c47b2 063749e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 6 22:05:33 2011 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 837311002dfeb02682d624f153af12fdda8ca7f1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Jul 6 22:01:26 2011 +0200 newt: Exclude python module from package. Fixes #210. commit 20c47b224454f76ea3ed0b0ca6a34031252fcd2a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 6 21:39:41 2011 +0200 build-essentials: Add /usr/lib/python* to possibly orphaned directories. ----------------------------------------------------------------------- Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem-tools/cleanup | 7 +++++++ .../buildsystem-tools/functions-constants | 1 + .../buildsystem-tools/functions-directories | 18 +++++++++++------- pkgs/newt/newt.nm | 10 +++++++--- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100755 pkgs/build-essentials/buildsystem-tools/cleanup Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 3164b8e..1034d6b 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 18 +PKG_REL = 19 PKG_EPOCH = 1 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem-tools/cleanup b/pkgs/build-essentials/buildsystem-tools/cleanup new file mode 100755 index 0000000..49e7c1b --- /dev/null +++ b/pkgs/build-essentials/buildsystem-tools/cleanup @@ -0,0 +1,7 @@ +#!/bin/bash + +dirname=$(dirname ${0}) + +. ${dirname}/common-functions + +directory_remove_orphans $@ diff --git a/pkgs/build-essentials/buildsystem-tools/functions-constants b/pkgs/build-essentials/buildsystem-tools/functions-constants index 396e045..80256f9 100644 --- a/pkgs/build-essentials/buildsystem-tools/functions-constants +++ b/pkgs/build-essentials/buildsystem-tools/functions-constants @@ -17,4 +17,5 @@ for i in $(seq 0 9); do ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/share/man/man${i}" done ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/lib/pkgconfig" +ORPHAN_CANDIDATES="${ORPHAN_CANDIDATES} /usr/lib/python*" diff --git a/pkgs/build-essentials/buildsystem-tools/functions-directories b/pkgs/build-essentials/buildsystem-tools/functions-directories index 5b0867b..e779d75 100644 --- a/pkgs/build-essentials/buildsystem-tools/functions-directories +++ b/pkgs/build-essentials/buildsystem-tools/functions-directories @@ -10,15 +10,19 @@ function directory_remove_orphans() { log DEBUG "Removing orphans in ${basedir}" local dir - for dir in ${ORPHAN_CANDIDATES}; do - dir="${basedir}/${dir}" + local dir_pattern + for dir_pattern in ${ORPHAN_CANDIDATES}; do + dir=$(echo ${basedir}/${dir_pattern}) - [ -d "${dir}" ] || continue + for dir in ${dir}; do + echo "DIR ${dir}" >&2 + [ -d "${dir}" ] || continue - if dir_is_empty ${dir}; then - log DEBUG " Found orphaned directory: ${dir}" - rm -rf ${dir} - fi + if dir_is_empty ${dir}; then + log DEBUG " Found orphaned directory: ${dir}" + rm -rf ${dir} + fi + done done } diff --git a/pkgs/newt/newt.nm b/pkgs/newt/newt.nm index 9e5f3e5..65d41d0 100644 --- a/pkgs/newt/newt.nm +++ b/pkgs/newt/newt.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = newt PKG_VER = 0.52.10 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = System/Libraries @@ -34,8 +34,14 @@ PKG_URL = https://fedorahosted.org/releases/n/e/newt/ PKG_LICENSE = LGPLv2 PKG_SUMMARY = A library for text mode user interfaces. +PKG_PACKAGES += newt-devel newt-python PKG_BUILD_DEPS+= popt-devel python-devel slang-devel +PKG_SUMMARY-newt-python = Python bindings for newt. +PKG_DESCRIPTION-newt-python = $(PKG_SUMMARY-newt-python) +PKG_PROVIDES-newt-python += python-newt python-snack +PKG_FILES-newt-python = /usr/lib/python*/site-packages/*snack* + define PKG_DESCRIPTION Newt is a programming library for color text mode, widget based user \ interfaces. Newt can be used to add stacked windows, entry widgets, \ @@ -48,8 +54,6 @@ endef PKG_TARBALL = $(THISAPP).tar.gz -PKG_PACKAGES += $(PKG_NAME)-devel - CONFIGURE_OPTIONS += \ --without-gpm-support \ --without-tcl hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] A implementation of the rapid spanning tree protocol for linux. branch, dump, updated. da8e8eb84d51edb4069fdf3cecd03599ce055ada
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, dump has been updated via da8e8eb84d51edb4069fdf3cecd03599ce055ada (commit) via 43a0ac239b23cb5c9ff12a5e39c67a4e72072d8c (commit) via 968d3d40984d0279bce51259ce0e969adc7bda79 (commit) via d19d0e359b26f0935e66b0c19b98c7e66fac9f34 (commit) via 394cd57d336cb2ab1429b2ba2a3c90415ef8d8dc (commit) via b27ab0efa4ecf7a839f750ec1e9b9092c577ebbb (commit) from 04a3cc98732428acb0bb74138f7ce158f4e37958 (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 da8e8eb84d51edb4069fdf3cecd03599ce055ada Merge: 04a3cc9 43a0ac2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 6 21:09:37 2011 +0200 Merge branch 'master' into dump ----------------------------------------------------------------------- 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

← 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