gfwleak/av-frag-rssb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-socket-and-file-descriptor-not-proper-initialized' into 'master'

Browse Source 
修复 #4 ，将sd和fd初始化为-1，并在select前判断。

See merge request AV/frag_rssb!2
This commit is contained in:
郑超
2018-12-09 14:26:32 +08:00
parent 1665395160 74b1f6d636
commit 6d59d35fa1
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@@ -1079,7 +1079,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));

10
src/message.c
View File

@@ -1081,8 +1081,14 @@ void* recv_response_msg(void *param)
while(1)
{
/*recv msg*/
FD_ZERO(&rset);
FD_SET(g_frag_run.recv_msg_fd,&rset);
FD_ZERO(&rset);
if(g_frag_run.recv_msg_fd>=0)
{
FD_SET(g_frag_run.recv_msg_fd,&rset);
}
if(g_frag_run.recv_msg_sd>=0)
{
FD_SET(g_frag_run.recv_msg_sd,&rset);
}
if(-1==select(maxfdpl,&rset,NULL,NULL,NULL))
{