Skip to content

Enable proto_mode handling code #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Enable proto_mode handling code #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions stp/stp_intf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,12 +594,20 @@ int stp_intf_event_mgr_init(void)
STP_LOG_CRITICAL("netlink init failed");
sys_assert(0);
}

if (stp_netlink_recv_all(g_stpd_netlink_handle) == -1)
do
{
STP_LOG_CRITICAL("error in intf db creation");
sys_assert(0);
if (stp_netlink_recv_all(g_stpd_netlink_handle) == -1)
{
STP_LOG_CRITICAL("error in intf db creation");
sys_assert(0);
}
if(!g_max_stp_port)
{
STP_LOG_INFO("Max port is 0,retry after 1 sec");
sleep(1);
}
}
while(g_max_stp_port == 0 );

g_max_stp_port = g_max_stp_port * 2; // Phy Ports + LAG
STP_LOG_INFO("intf db done. max port %d", g_max_stp_port);
Expand Down
13 changes: 6 additions & 7 deletions stp/stp_mgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1899,15 +1899,14 @@ static void stpmgr_process_ipc_msg(STP_IPC_MSG *msg, int len, struct sockaddr_un
}
case STP_BRIDGE_CONFIG:
{
stpmgr_process_bridge_config_msg(msg->data);
/*if(msg->proto_mode == L2_PVSTP)
if(msg->proto_mode == L2_PVSTP)
{
stpmgr_process_bridge_config_msg(msg->data);
}
else if(msg->proto_mode == L2_MSTP)
{
mstpmgr_process_bridge_config_msg(msg->data);
}*/
}
break;
}
case STP_VLAN_CONFIG:
Expand All @@ -1922,15 +1921,14 @@ static void stpmgr_process_ipc_msg(STP_IPC_MSG *msg, int len, struct sockaddr_un
}
case STP_PORT_CONFIG:
{
stpmgr_process_intf_config_msg(msg->data);
/*if(msg->proto_mode == L2_PVSTP)
if(msg->proto_mode == L2_PVSTP)
{
stpmgr_process_intf_config_msg(msg->data);
}
else if(msg->proto_mode == L2_MSTP)
{
mstpmgr_process_intf_config_msg(msg->data);
}*/
}
break;
}
case STP_VLAN_MEM_CONFIG:
Expand Down Expand Up @@ -1964,7 +1962,8 @@ static void stpmgr_process_ipc_msg(STP_IPC_MSG *msg, int len, struct sockaddr_un
}
case STP_MST_VLAN_PORT_LIST_CONFIG:
{
mstpmgr_process_vlan_mem_config_msg(msg->data);
if (msg->proto_mode == L2_MSTP)
mstpmgr_process_vlan_mem_config_msg(msg->data);
break;
}
case STP_MST_INST_PORT_CONFIG:
Expand Down