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

OCT 

REM:
1. 增加获取BASE MAC地址功能
This commit is contained in:
huangxin 2022-06-13 11:35:48 +08:00
parent cfa665e9b6
commit 78e1d2ba55
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srcs/lwip/src/arch_linux/netif/pcapif.c
View File

@ -330,6 +330,21 @@ static err_t netif_input_data(struct pbuf *p, struct netif *inp) {
if (ebuf == NULL) { if (ebuf == NULL) {
return ERR_IF; return ERR_IF;
} else {
struct eth_hdr* eth = (struct eth_hdr*)ebuf->payload;
if(strlen(pContext->session.data.svrBaseMac) == 0) {
if (strlen(pContext->session.data.svrBaseMac) == 0) {
sprintf(pContext->session.data.svrBaseMac,
"%02X:%02X:%02X:%02X:%02X:%02X",
eth->src.addr[0],
eth->src.addr[1],
eth->src.addr[2],
eth->src.addr[3],
eth->src.addr[4],
eth->src.addr[5]);
}
}
} }
if ((err = pContext->session.nicif->input(ebuf, pContext->session.nicif)) != ERR_OK) { if ((err = pContext->session.nicif->input(ebuf, pContext->session.nicif)) != ERR_OK) {

4
srcs/pppoe/vcpe_pppoe.c
View File

@ -263,9 +263,9 @@ int pppoe_session_init() {
g_rawSocketIf = bind_pcap_if(config_get_vxlan_nic_name(), config_get_vxlan_pkg_filter(), cfg_get_support_vxlan()); g_rawSocketIf = bind_pcap_if(config_get_vxlan_nic_name(), config_get_vxlan_pkg_filter(), cfg_get_support_vxlan());
if (g_rawSocketIf) { if (g_rawSocketIf) {
dzlog_info("Create Raw Socket netif: <%p>\n", (void *)g_rawSocketIf); dzlog_info("Create hardware netif: <%p>\n", (void *)g_rawSocketIf);
} else { } else {
dzlog_info("Create Raw Socket error: <%p>\n", (void *)g_rawSocketIf); dzlog_info("Create hardware error: <%p>\n", (void *)g_rawSocketIf);
} }
// 启动Session状态机线程 // 启动Session状态机线程

2
srcs/user/user_info.c
View File

@ -20,7 +20,7 @@ void user_info_init() {
uv_rwlock_init(&g_userLock); uv_rwlock_init(&g_userLock);
user_info_add(0, &g_userInfo[0]); user_info_add(0, &g_userInfo[0]);
user_info_add(1, &g_userInfo[1]); //user_info_add(1, &g_userInfo[1]);
//user_info_add(2, &g_userInfo[2]); //user_info_add(2, &g_userInfo[2]);
//user_info_add(3, &g_userInfo[3]); //user_info_add(3, &g_userInfo[3]);
} }