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

OCT:增加port参数

This commit is contained in:
zhanglianghy 2022-08-18 16:11:06 +08:00
parent 035b3ad531
commit fefb5c4b89
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
l2tp/pppd/pppd/plugins/pppol2tp/nt_msg.h
View File

@ -20,6 +20,8 @@ typedef struct _notify_msg {
int remote_tunnel; int remote_tunnel;
int local_session; int local_session;
int remote_session; int remote_session;
int local_port;
int remote_port;
struct in_addr local_addr; struct in_addr local_addr;
struct in_addr remote_addr; struct in_addr remote_addr;
struct in_addr va_addr; struct in_addr va_addr;

4
l2tp/pppd/pppd/plugins/pppol2tp/pppnotify.c
View File

@ -117,6 +117,8 @@ char* notify_format_cjson(notify_msg_t *msg, char *remote_addr, char*local_addr)
cJSON_AddNumberToObject(cjson_params, "remote_tunnel", msg->remote_tunnel); cJSON_AddNumberToObject(cjson_params, "remote_tunnel", msg->remote_tunnel);
cJSON_AddNumberToObject(cjson_params, "local_session", msg->local_session); cJSON_AddNumberToObject(cjson_params, "local_session", msg->local_session);
cJSON_AddNumberToObject(cjson_params, "remote_session", msg->remote_session); cJSON_AddNumberToObject(cjson_params, "remote_session", msg->remote_session);
cJSON_AddNumberToObject(cjson_params, "local_port", msg->local_port);
cJSON_AddNumberToObject(cjson_params, "remote_port", msg->remote_port);
cJSON_AddStringToObject(cjson_params, "local_addr", local_addr); cJSON_AddStringToObject(cjson_params, "local_addr", local_addr);
cJSON_AddStringToObject(cjson_params, "remote_addr", remote_addr); cJSON_AddStringToObject(cjson_params, "remote_addr", remote_addr);
cJSON_AddStringToObject(cjson_params, "va_addr", inet_ntoa(msg->va_addr)); cJSON_AddStringToObject(cjson_params, "va_addr", inet_ntoa(msg->va_addr));
@ -155,6 +157,8 @@ int notify_ppp_status(char *remote, char*local, int status)
msg.remote_tunnel = remote_tunnel_id; msg.remote_tunnel = remote_tunnel_id;
msg.local_session = pppol2tp_session_id; msg.local_session = pppol2tp_session_id;
msg.remote_session = remote_session_id; msg.remote_session = remote_session_id;
msg.local_port = local_port;
msg.remote_port = remote_port;
//inet_aton(local, &msg.local_addr); //inet_aton(local, &msg.local_addr);
//inet_aton(remote, &msg.remote_addr); //inet_aton(remote, &msg.remote_addr);