X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=src%2Fivac.c;h=4fede22d4f8a3d9f9d549a08ce858a625c69c582;hb=1d24c5371e02647c8eeb4dc00ec6d667d169faa7;hp=9645c33f59444e0e74b66b9b85814c61e657cf9f;hpb=5f7a9e08cad9caa3aa593eba18e6a22f763ecc37;p=my-code%2Fivac.git diff --git a/src/ivac.c b/src/ivac.c index 9645c33..4fede22 100644 --- a/src/ivac.c +++ b/src/ivac.c @@ -129,6 +129,22 @@ int ivac_send_info(int channel,t_ivac *ivac) { return SUCCESS; } +int ivac_send_quit(int channel,t_ivac *ivac) { + + char data[6]; + + data[0]=IVAC_SEND_QUIT; + data[1]=4; + strcpy(data+2,"quit"); + + if(network_send(ivac->net.connection[channel].fd,data,6)==N_ERROR) { + puts("[ivac] ivac_send_quit failed"); + return ERROR; + } + + return SUCCESS; +} + int ivac_receive_info(int channel,t_ivac *ivac) { char data[SEND_N_MAX]; @@ -158,6 +174,12 @@ int ivac_receive_info(int channel,t_ivac *ivac) { ivac->challenger[channel].av_cap|=data[count+3]; count+=4; break; + case IVAC_SEND_QUIT: + if(!(strncmp(data+count+2,"quit",data[1]))) + event_math(ivac->net.connection[channel].fd,&(ivac->event), + READ,REMOVE); + network_close(&(ivac->net),channel); + memset(&(ivac->challenger[channel]),0,sizeof(t_challenger)); default: puts("[ivac] ivac_receive_info, unknown character"); return ERROR; @@ -172,30 +194,42 @@ int ivac_event_cb(t_event *event,void *ptr) { t_ivac *ivac; int channel; + char c_str[IVAC_CONSOLE_STRING_LEN]; ivac=(t_ivac *)ptr; + /* incoming connection -- first contact => send info */ if(FD_ISSET(ivac->net.l_fd,&(event->rfds))) { - /* manage incoming + send info */ - if((channel=network_manage_incoming(&(ivac->net)))!=N_ERROR) { + channel=network_manage_incoming(&(ivac->net)); + if(channel==N_E_ACCEPT) + sprintf(c_str,"accept failed"); + else if(channel==N_E_MAXC) + sprintf(c_str,"maximum connections reached"); + else { + sprintf(c_str,"connection from %s port %d on channel %d", + ivac->net.connection[channel].ip, + ivac->net.connection[channel].port,channel); + ivac_add_to_monitor(ivac,c_str); event_math(ivac->net.connection[channel].fd,event,READ,ADD); ivac_send_info(channel,ivac); } + ivac_display_content(ivac); } - /* receive info */ - for(channel=0;channelnet.connection[channel].status&C_ESTABL) + /* wait for user info */ + for(channel=0;channelnet.connection[channel].status&C_ESTABL) { + /* remote is sending info */ if(FD_ISSET(ivac->net.connection[channel].fd,&(event->rfds))) ivac_receive_info(channel,ivac); + // ivac_display_content(ivac); + } + } /* user interaction */ if(FD_ISSET(0,&(event->rfds))) input_get_event(&(ivac->input),ivac_parse_command,ivac); - /* display ivac gui */ - // ivac_display_content(ivac); - return SUCCESS; } @@ -262,15 +296,11 @@ int ivac_parse_command(t_input *input,void *ptr) { sprintf(c_str,"changed username to %s",ivac->username); } else if((channel>=0)&&(channelnet.connection[channel].status&C_IN_USE) { + i=network_set_connection_info(&(ivac->net),channel,arg[2],atoi(arg[3])); + if(i==N_E_IN_USE) sprintf(c_str,"channel %02d: connection in use",channel); - } - else { - strncpy(ivac->net.connection[channel].ip,arg[2],IP_DIGITS); - ivac->net.connection[channel].port=atoi(arg[3]); + if(i==N_SUCCESS) sprintf(c_str,"channel %02d: set connection info",channel); - ivac->net.connection[channel].status|=C_INFO_A; - } } else snprintf(c_str,IVAC_CONSOLE_STRING_LEN,"unknown argument: '%s'", arg[1]); } @@ -279,17 +309,17 @@ int ivac_parse_command(t_input *input,void *ptr) { if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]); else channel=-1; if((channel>=0)&&(channelnet.connection[channel].status&C_INFO_A)) + i=network_connect(&(ivac->net),channel); + if(i==N_E_IN_USE) + sprintf(c_str,"channel %02d: connection in use",channel); + else if(i==N_E_NO_INFO) sprintf(c_str,"channel %02d: channel not configured",channel); else { - if(ivac->net.connection[channel].status&C_IN_USE) - sprintf(c_str,"channel %02d: connection in use",channel); - else { - sprintf(c_str,"channel %02d: trying to connect to %s:%d",channel, - ivac->net.connection[channel].ip, - ivac->net.connection[channel].port); - ivac->net.connection[channel].status|=C_IN_USE; - } + sprintf(c_str,"channel %02d: connected to %s:%d",channel, + ivac->net.connection[channel].ip, + ivac->net.connection[channel].port); + event_math(ivac->net.connection[channel].fd,&(ivac->event),READ,ADD); + ivac_send_info(channel,ivac); } } else sprintf(c_str,"invalid argument: '%s'",arg[1]); @@ -299,12 +329,16 @@ int ivac_parse_command(t_input *input,void *ptr) { if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]); else channel=-1; if((channel>=0)&&(channelnet.connection[channel].status&C_ESTABL)) - sprintf(c_str,"channel %02d: no active connection",channel); - else { - ivac->net.connection[channel].status|=C_HANGUP; + if(ivac->net.connection[channel].status&C_ESTABL) { + ivac_send_quit(channel,ivac); + event_math(ivac->net.connection[channel].fd,&(ivac->event), + READ,REMOVE); + network_close(&(ivac->net),channel); sprintf(c_str,"channel %02d: connection closed",channel); + memset(&(ivac->challenger[channel]),0,sizeof(t_challenger)); } + else + sprintf(c_str,"channel %02d: no active connection",channel); } else sprintf(c_str,"invalid argument: '%s'",arg[1]); } @@ -313,11 +347,11 @@ int ivac_parse_command(t_input *input,void *ptr) { if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]); else channel=-1; if((channel>=0)&&(channelnet.sendmask|=(1<net),channel); sprintf(c_str,"selected channel %d",channel); } else if(arg[1][0]='*') { - ivac->net.sendmask=0xff; + network_select(&(ivac->net),MAX_CONNECTIONS); strcpy(c_str,"selected all channels"); } else sprintf(c_str,"invalid argument: '%s'",arg[1]); @@ -327,11 +361,11 @@ int ivac_parse_command(t_input *input,void *ptr) { if((arg[1][0]>='0')&&(arg[1][0]<='9')) channel=atoi(arg[1]); else channel=-1; if((channel>=0)&&(channelnet.sendmask&=(~(1<net),channel); sprintf(c_str,"deselected channel %d",channel); } else if(arg[1][0]='*') { - ivac->net.sendmask=0; + network_deselect(&(ivac->net),MAX_CONNECTIONS); strcpy(c_str,"deselected all channels"); } else sprintf(c_str,"invalid argument: '%s'",arg[1]);