From 1af622ab0332f583c842cad1dd9ff9f9c5dcc42d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 08:21:42 -0700 Subject: Disable creating vlan on disabled interface Print message and fail commit if interface is disabled. --- templates/interfaces/ethernet/node.tag/vif/node.def | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index e496a7c..e8554fa 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -2,8 +2,14 @@ tag: type: u32 help: Set Virtual Local Area Network (VLAN) ID syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" -create: sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) - sudo ip link set "$VAR(../@).$VAR(@)" up +create: read flags < /sys/class/net/$VAR(../@)/flags + if [ $(( flags & 1 )) -eq 0 ] + then + echo "Can not create VLAN on disabled interface: " $VAR(../@) + exit 1 + fi + sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1 + sudo ip link set "$VAR(../@).$VAR(@)" up /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on delete: sudo ip link delete "$VAR(../@).$VAR(@)" type vlan id $VAR(@) comp_help: possible completions: -- cgit v1.2.3 From 5c348adcb1cc340b17db71176ce283ef48023f38 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 20:04:17 -0700 Subject: fix email in changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eabcbb7..bfb1092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -283,7 +283,7 @@ vyatta-cfg (0.14.13) unstable; urgency=low * Add new option for checking name validity * Remove script for vyatta-cfg-reload - -- Stephen Hemminger Wed, 11 Feb 2009 21:54:57 -0800 + -- Stephen Hemminger Wed, 11 Feb 2009 21:54:57 -0800 vyatta-cfg (0.14.12) unstable; urgency=low -- cgit v1.2.3 From 1fe53b8edbc7f5d51bf05b640eb63b8ebe183560 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 20:04:20 -0700 Subject: Block disabling interface with VIF If interface with VIF is disabled, then it would fail on next boot when VIF's were created. --- templates/interfaces/ethernet/node.tag/disable/node.def | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def index 90dd582..b7fcd49 100644 --- a/templates/interfaces/ethernet/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/disable/node.def @@ -1,5 +1,10 @@ help: Set interface disabled -update: /etc/netplug/linkdown.d/dhclient $VAR(../@) +create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show` + if [ ! -z $vif ]; then + echo "Can not disable interface " $VAR(../@) " with vif:" $vif + exit 1 + fi + /etc/netplug/linkdown.d/dhclient $VAR(../@) if ! sudo ip link set $VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../@)" /etc/netplug/linkup.d/dhclient $VAR(../@) -- cgit v1.2.3 From 205350e6adfb7548d68680cd1dea0760b1fd8bd7 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 20:34:11 -0700 Subject: Fix warnings from redefining TRUE TRUE and FALSE are already defined in glib causing warnings. --- src/cli_val.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cli_val.h b/src/cli_val.h index a753c92..e8fbe83 100644 --- a/src/cli_val.h +++ b/src/cli_val.h @@ -4,8 +4,12 @@ #define BITWISE 0 /* no partial commit */ #define boolean int -#define TRUE 1 +#ifndef FALSE #define FALSE 0 +#endif +#ifndef TRUE +#define TRUE (!FALSE) +#endif /* allocation unit for vals in valstruct */ #define MULTI_ALLOC 5 /* we have room if cnt%MULTI_ALLOC != 0 */ -- cgit v1.2.3 From e80e6a01a6396679e5293ec0b8b41c8c7378ea48 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 20:44:30 -0700 Subject: Fix compiler warnings in commit2 Add headers with prototypes to remove compiler warnings Make some obvious tables const to avoid any bugs. --- src/commit2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/commit2.c b/src/commit2.c index e6b63fa..bf5957d 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -2,16 +2,18 @@ #include #include #include +#include #include #include #include "common/common.h" +#include "cli_path_utils.h" boolean g_debug = FALSE; boolean g_display_error_node = FALSE; boolean g_coverage = FALSE; boolean g_dump_trans = FALSE; -int ActionOrder[top_act] = { +const int ActionOrder[top_act] = { 4, 5, 6, @@ -24,7 +26,7 @@ int ActionOrder[top_act] = { -char* ActionNames[top_act] = { +const char* ActionNames[top_act] = { "delete", //0 "create", //1 "activate", //2 @@ -81,7 +83,7 @@ also, the algorithm for collapsing the tree into a transaction list is: * **/ void -usage() +usage(void) { printf("commit2\n"); printf("\t-d\t\tdebug mode\n"); -- cgit v1.2.3 From b04d003bd7fe306819ddcad8398f62d6f71edb9d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 20:47:02 -0700 Subject: Fix compiler warnings in unionfs Remove unused variables Remove extra arg from sprintf Fix missing prototype for piecewise_copy. --- src/common/unionfs.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/common/unionfs.c b/src/common/unionfs.c index 7c29ad1..5e90c0c 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -43,6 +43,9 @@ copy_func(GNode *node, gpointer data); static gboolean delete_func(GNode *node, gpointer data); +static void +piecewise_copy(GNode *root_node, boolean test_mode); + /** * * @@ -528,14 +531,6 @@ common_commit_copy_to_live_config(GNode *node, boolean test_mode) static const char format1[]="cp -r -f %s/* %s"; /*mdirp, tmpp*/ static const char format2[]="sudo umount %s"; //mdirp - - static const char format4[]="rm -rf %s/{.*,*} >&/dev/null ; /bin/true"; /*cdirp*/ - - //walk up tree until diverge or skip - static const char format6[]="cp -rf %s/* -t %s";/*tmpp, adirp*/ - - static const char format7[]="rm -fr %s >&/dev/null ; /bin/true"; /*tmpp*/ - static const char format8[]="sudo mount -t unionfs -o dirs=%s=rw:%s=ro unionfs %s"; //cdirp, adirp, mdirp set_echo(TRUE); @@ -991,7 +986,7 @@ struct SrcDst { /** * **/ -void +static void piecewise_copy(GNode *root_node, boolean test_mode) { struct SrcDst sd; @@ -1046,7 +1041,7 @@ copy_func(GNode *node, gpointer data) //this is for the case where it is set by default, then unset at the node--i.e. no longer a default value. if (((struct VyattaNode*)(node->data))->_config._multi == FALSE) { //only for leaf char *parent_path = ((struct VyattaNode*)(node->parent->data))->_data._path; - sprintf(command,clear_def,sd->_dst,parent_path,sd->_dst,parent_path); + sprintf(command,clear_def,sd->_dst,parent_path); if (g_debug) { printf("%s\n",command); fflush(NULL); -- cgit v1.2.3 From 2f01fa9fc9c5f050d4840bc0db22bfaae69b86e7 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 21:09:31 -0700 Subject: Fix vif delete Need 'dev' in argument to ip link --- templates/interfaces/ethernet/node.tag/vif/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index e8554fa..bca6307 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -11,7 +11,7 @@ create: read flags < /sys/class/net/$VAR(../@)/flags sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1 sudo ip link set "$VAR(../@).$VAR(@)" up /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on -delete: sudo ip link delete "$VAR(../@).$VAR(@)" type vlan id $VAR(@) +delete: sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@) comp_help: possible completions: <0-4094> Set VLAN ID -- cgit v1.2.3 From 5116c0fdb09a7e7c34298cd80622d59742e42359 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 21:15:18 -0700 Subject: Fix argument to show-interfaces to find vif Need to do show=all --- templates/interfaces/ethernet/node.tag/disable/node.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def index b7fcd49..3d3ffef 100644 --- a/templates/interfaces/ethernet/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/disable/node.def @@ -1,6 +1,6 @@ help: Set interface disabled -create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show` - if [ ! -z $vif ]; then +create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all` + if [ ! -z "$vif" ]; then echo "Can not disable interface " $VAR(../@) " with vif:" $vif exit 1 fi -- cgit v1.2.3 From 0c0150292ca8e9657251b9198bf2fefc0b055677 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 11 Mar 2009 21:35:45 -0700 Subject: 0.14.42 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index bfb1092..8506c4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +vyatta-cfg (0.14.42) unstable; urgency=low + + * Disable creating vlan on disabled interface + * fix email in changelog + * Block disabling interface with VIF + * Fix warnings from redefining TRUE + * Fix compiler warnings in commit2 + * Fix compiler warnings in unionfs + * Fix vif delete + * Fix argument to show-interfaces to find vif + + -- Stephen Hemminger Wed, 11 Mar 2009 21:35:45 -0700 + vyatta-cfg (0.14.41) unstable; urgency=low [ slioch ] -- cgit v1.2.3 From 4135f9791f0a820513930916f42373e8390b2235 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 12 Mar 2009 16:18:26 -0700 Subject: Use create rather than update on multi-node (loopback) --- templates/interfaces/loopback/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/interfaces/loopback/node.def b/templates/interfaces/loopback/node.def index 690dc39..7351a8e 100644 --- a/templates/interfaces/loopback/node.def +++ b/templates/interfaces/loopback/node.def @@ -4,4 +4,4 @@ help: Set loopback interface syntax:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=loopback" allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=loopback -update: sudo ip link set $VAR(@) up +create: sudo ip link set $VAR(@) up -- cgit v1.2.3