From c38c6c0a8e066cbb7179920fc2402c060e452598 Mon Sep 17 00:00:00 2001 From: zhanglianghy Date: Wed, 21 Aug 2019 15:04:55 +0800 Subject: [PATCH] =?UTF-8?q?MOD=20aaa-12=20=E8=A7=A3=E5=86=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8A=A0=E5=85=A5=E7=A6=BB=E5=BC=80=E6=A1=A5=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E9=80=9A=E7=9F=A5=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20SOL=20=20=E8=A7=A3=E5=86=B3=E6=8E=A5=E5=8F=A3=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E7=A6=BB=E5=BC=80=E6=A1=A5=E4=BA=8B=E4=BB=B6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=BA=EF=BC=9Azhangliang=20=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E4=BA=BA=EF=BC=9Azhangliang?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config-server/netconfig/bridge/brconfig.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Platform/user/configm/config-server/netconfig/bridge/brconfig.c b/Platform/user/configm/config-server/netconfig/bridge/brconfig.c index 8613879b3..0f14844c1 100644 --- a/Platform/user/configm/config-server/netconfig/bridge/brconfig.c +++ b/Platform/user/configm/config-server/netconfig/bridge/brconfig.c @@ -275,8 +275,12 @@ ret_code br_if_bridge_add(char *br_name, char *port_list, int cnt, int *sys_err) for(i = 0; i < cnt; i++) { - br_invoke_event(BR_IF_JOIN_EVENT_PRE, event_arg); port_name = port_list + INTERFACE_NAMSIZ * i; + + event_arg.br_name = br_name; + event_arg.if_name = port_name; + + br_invoke_event(BR_IF_JOIN_EVENT_PRE, event_arg); err = br_add_interface(br_name, port_name); if(err != 0) { @@ -285,8 +289,6 @@ ret_code br_if_bridge_add(char *br_name, char *port_list, int cnt, int *sys_err) continue; } - event_arg.br_name = br_name; - event_arg.if_name = port_name; br_invoke_event(BR_IF_JOIN_EVENT, event_arg); @@ -306,8 +308,11 @@ ret_code br_if_bridge_del(char * br_name, char *port_list, int cnt, int *sys_err for(i = 0; i < cnt; i++) { - br_invoke_event(BR_IF_LEAVE_EVENT_PRE, event_arg); port_name = port_list + INTERFACE_NAMSIZ * i; + event_arg.br_name = br_name; + event_arg.if_name = port_name; + + br_invoke_event(BR_IF_LEAVE_EVENT_PRE, event_arg); err = br_del_interface(br_name, port_name); if(err != 0) { @@ -316,9 +321,6 @@ ret_code br_if_bridge_del(char * br_name, char *port_list, int cnt, int *sys_err continue; } - event_arg.br_name = br_name; - event_arg.if_name = port_name; - br_invoke_event(BR_IF_LEAVE_EVENT, event_arg); br_save_file(BR_IF_LEAVE_EVENT, br_name, port_name);