diff options
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -42,9 +42,9 @@ const char* frag_rssb_version = "2018-08-13T09:00:00"; const char* frag_rssb_version_time = "2018-08-13T09:00:00"; const char* frag_rssb_version_des = "MESA@iie rssb_maskey"; -int FRAG_RSSB_VERSION_1_0_20181207 = 0; -const char* frag_rssb_version_time_in = "2018-12-07"; -const char* frag_rssb_version_des_in = "unixsocket"; +int FRAG_RSSB_VERSION_1_0_20181210 = 0; +const char* frag_rssb_version_time_in = "2018-12-10"; +const char* frag_rssb_version_des_in = "unixsocket recv survey"; void frag_rssb_history() { //2015.11.15 v1.0 create the project @@ -224,6 +224,7 @@ void frag_rssb_history() //2018.11.05 v4.0//alter voip save_media frg_len>headerlen //2018.11.07 v4.0//alter json_log opt name for k //2018.12.07 v4.0//unixsocket set bufsize timeout in configure + //2018.12.10 v4.0//1.recv_msg_fd not unix 2.MsgPort } frag_rssb_parameter_t g_frag_run; @@ -866,10 +867,11 @@ int read_conf_and_init(const char* filename) } /*msg port:��ƴװ���ս���Ķ˿ڣ�ǰ�˽��ս���Ķ˿�*/ - MESA_load_profile_short_def(filename, "NETWORK", "MsgPort", (short*)&g_frag_cfg.msg_port, 22080); + MESA_load_profile_short_def(filename, "NETWORK", "CPZMsgPort", (short*)&g_frag_cfg.cpz_msg_port, 22080); + MESA_load_profile_short_def(filename, "NETWORK", "QDMsgPort", (short*)&g_frag_cfg.qd_msg_port, 22080); /*udp socket : response msg recv*/ - g_frag_run.recv_msg_sd = init_recv_udp_socket(htons(g_frag_cfg.msg_port)); + g_frag_run.recv_msg_sd = init_recv_udp_socket(htons(g_frag_cfg.cpz_msg_port)); if(-1==g_frag_run.recv_msg_sd) { printf("[%s] init_recv_udp_socket error.\n", FRAG_REASSEMBLY_MODULE_NAME); @@ -1065,7 +1067,7 @@ void rssb_asmis_init() info[0].nProtocolType = 6; memcpy(info[0].sPortDesc, "recv data", strlen("recv data")); info[0].sPortDesc[strlen("recv data")] = '\0'; - info[1].nPort = g_frag_cfg.msg_port; + info[1].nPort = g_frag_cfg.qd_msg_port; info[1].nPortType = 1; info[1].nProtocolType = 6; memcpy(info[1].sPortDesc, "recv survey", strlen("recv survey")); @@ -1079,7 +1081,9 @@ int main(int argc, char **argv) uint32_t i=0; void *main_conf_handle=NULL, *rssb_conf_handle=NULL; - memset(&g_frag_run, 0, sizeof(frag_rssb_parameter_t)); + memset(&g_frag_run, 0, sizeof(frag_rssb_parameter_t)); + g_frag_run.recv_msg_fd = -1; + g_frag_run.recv_msg_sd = -1; memset(&g_frag_cfg, 0, sizeof(frag_rssb_configure_t)); memset(&g_frag_stat, 0, sizeof(frag_rssb_status_t)); |