diff --git a/config/vcpe.cfg b/config/vcpe.cfg index 2458966..7292984 100644 --- a/config/vcpe.cfg +++ b/config/vcpe.cfg @@ -13,7 +13,7 @@ application: }; agent: { - iptv_report_url = ""; # IPTV 设备上报接口 + iptv_report_url = "http://10.0.0.1:50012/vcpe/dhcp/info"; # IPTV 设备上报接口 moniter_rep_url = ""; # vCPE设备上下线接口 }; diff --git a/srcs/vcpe_main.c b/srcs/vcpe_main.c index 65d8979..409781b 100644 --- a/srcs/vcpe_main.c +++ b/srcs/vcpe_main.c @@ -4,12 +4,11 @@ #include #include #include +#include #include "cmdline.h" #include "task_manager.h" #include "init.h" -#ifdef NOTIFY_VCPE_STATUS #include "inet_misc.h" -#endif #include "config.h" #include "zlog_module.h" @@ -50,7 +49,6 @@ static void lwip_init_env() { } #endif -#ifdef NOTIFY_VCPE_STATUS cJSON *create_app_process_status(int isStart) { cJSON *pRspMsg = cJSON_CreateObject(); #ifdef USERVNI_ON @@ -77,10 +75,11 @@ static void on_http_response_cb(void *pData, free(pUserData); } -#endif int main(int argc, char **argv) { - int ret; + int ret; + const char *pRspUrl; + #ifdef OPENDHCPDDNS_ON return dual_server_main(argc, argv); #else @@ -107,17 +106,19 @@ int main(int argc, char **argv) { pppoe_session_init(); #endif -#ifdef NOTIFY_VCPE_STATUS - const char *pStrSetup = proto_create_new(create_app_process_status(1), 200); - inet_http_post_async(config_get_agent_moniter_report_url(), pStrSetup, on_http_response_cb, (void *)pStrSetup); -#endif + pRspUrl = config_get_agent_moniter_report_url(); + + if (pRspUrl && strlen(pRspUrl) > 0) { + const char *pStrSetup = proto_create_new(create_app_process_status(1), 200); + inet_http_post_async(config_get_agent_moniter_report_url(), pStrSetup, on_http_response_cb, (void *)pStrSetup); + } task_manager_run(); -#ifdef NOTIFY_VCPE_STATUS - const char *pStrExit = proto_create_new(create_app_process_status(0), 200); - inet_http_post_async(config_get_agent_moniter_report_url(), pStrSetup, on_http_response_cb, (void *)pStrExit); -#endif + if (pRspUrl && strlen(pRspUrl) > 0) { + const char *pStrExit = proto_create_new(create_app_process_status(0), 200); + inet_http_post_async(config_get_agent_moniter_report_url(), pStrExit, on_http_response_cb, (void *)pStrExit); + } while (!is_system_cleanup()) { sleep(1);