cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOD aaa-12 解决接口加入离开桥事件通知参数错误 

SOL  解决接口加入离开桥事件通知参数错误
修改人：zhangliang
检视人：zhangliang
This commit is contained in:
zhanglianghy 2019-08-21 15:04:55 +08:00
parent 7beb5c3e14
commit c38c6c0a8e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Platform/user/configm/config-server/netconfig/bridge/brconfig.c
View File

@ -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++) for(i = 0; i < cnt; i++)
{ {
br_invoke_event(BR_IF_JOIN_EVENT_PRE, event_arg);
port_name = port_list + INTERFACE_NAMSIZ * i; 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); err = br_add_interface(br_name, port_name);
if(err != 0) 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; continue;
} }
event_arg.br_name = br_name;
event_arg.if_name = port_name;
br_invoke_event(BR_IF_JOIN_EVENT, event_arg); 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++) for(i = 0; i < cnt; i++)
{ {
br_invoke_event(BR_IF_LEAVE_EVENT_PRE, event_arg);
port_name = port_list + INTERFACE_NAMSIZ * i; 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); err = br_del_interface(br_name, port_name);
if(err != 0) 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; continue;
} }
event_arg.br_name = br_name;
event_arg.if_name = port_name;
br_invoke_event(BR_IF_LEAVE_EVENT, event_arg); br_invoke_event(BR_IF_LEAVE_EVENT, event_arg);
br_save_file(BR_IF_LEAVE_EVENT, br_name, port_name); br_save_file(BR_IF_LEAVE_EVENT, br_name, port_name);