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

OCT 

REM:
1. 修改配置文件
2. 修改JSON打印格式
This commit is contained in:
huangxin 2022-06-22 14:59:52 +08:00
parent b3e7ea5f16
commit 22f15ab00f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
srcs/libs/config/agent.cfg
View File

@ -45,7 +45,7 @@ application:
zero_mq: zero_mq:
{ {
svr_port = 6278; # ZeroMQ 服务器端口 svr_port = 6278; # ZeroMQ 服务器端口
agent_addr = "ipc:///tmp/msg_fifo1"; # 消息通道路径 agent_addr = "ipc:///tmp/msg_fifo0"; # 消息通道路径
}; };
# vxlan 相关 # vxlan 相关
@ -55,7 +55,8 @@ application:
nic = "ens36"; # vxlan 物理网卡名称 nic = "ens36"; # vxlan 物理网卡名称
peer_ip = "192.168.20.112"; # vxlan 对端IP peer_ip = "192.168.20.112"; # vxlan 对端IP
peer_mac = "00:0C:29:49:CB:27"; # vxlan 对端 MAC 地址 peer_mac = "00:0C:29:49:CB:27"; # vxlan 对端 MAC 地址
pkg_filter = "udp port 4789 and ether src not 00:0c:29:07:cb:55"; # 包过滤器 pkg_filter = "(udp port 4789) and (ether src not 00:0c:29:07:cb:55)"; # 包过滤器
# pkg_filter = "(pppoed || pppoes || arp || icmp || port domain || (udp and (port 67 or port 68))) && inbound";
}; };
# vcpe 本地服务网络接口配置 # vcpe 本地服务网络接口配置

4
srcs/pppoe/vcpe_pppoe.c
View File

@ -289,7 +289,7 @@ _Noreturn void cacheCalcCb(void *UNUSED(pArg)) {
} }
uv_rwlock_wrunlock(&g_cacheLock); uv_rwlock_wrunlock(&g_cacheLock);
cJSON_AddItemToObject(pRoot, "params", pSession); cJSON_AddItemToObject(pRoot, "params", pSession);
pJsonString = cJSON_Print(pRoot); pJsonString = cJSON_PrintUnformatted(pRoot);
mq_data_send_msg(pJsonString); mq_data_send_msg(pJsonString);
cJSON_Delete(pRoot); cJSON_Delete(pRoot);
free((void *)pJsonString); free((void *)pJsonString);
@ -317,7 +317,7 @@ _Noreturn void cacheCalcCb(void *UNUSED(pArg)) {
} }
uv_rwlock_wrunlock(&g_cacheLock); uv_rwlock_wrunlock(&g_cacheLock);
cJSON_AddItemToObject(pRoot, "params", pSession); cJSON_AddItemToObject(pRoot, "params", pSession);
pJsonString = cJSON_Print(pRoot); pJsonString = cJSON_PrintUnformatted(pRoot);
mq_data_send_msg(pJsonString); mq_data_send_msg(pJsonString);
cJSON_Delete(pRoot); cJSON_Delete(pRoot);
free((void *)pJsonString); free((void *)pJsonString);