X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fivac.git;a=blobdiff_plain;f=src%2Fivac.c;h=9d2b216894d2f7ee35d8ef87a743f02f7c846b67;hp=23d59b19cd498ec8ecd603cfe716c261b15e84f6;hb=8ada0b2c57ad21e9b3bcbd10328faedf996f5c22;hpb=9c1916712be5882b728b5e54e6716272ce0678a5 diff --git a/src/ivac.c b/src/ivac.c index 23d59b1..9d2b216 100644 --- a/src/ivac.c +++ b/src/ivac.c @@ -21,10 +21,25 @@ * */ -// #define USE_NCURSES +// #define USE_GTK #include "ivac.h" +int usage(void) { + + puts(""); + puts("usage: ivac "); + puts(""); + puts("options:"); + puts("-h \t\t show this help"); + puts("-n \t specify your name"); + puts("-p \t specify port to listen for incoming connections"); + puts("-d \t specify audio device"); + puts(""); + + return SUCCESS; +} + int main(int argc,char **argv) { /* TESTING BY NOW */ @@ -32,13 +47,35 @@ int main(int argc,char **argv) { t_ivac ivac; int i; - if(argc!=2) { - printf("\nusage: %s \n\n",argv[0]); - return ERROR; + /* default values */ + strcpy(ivac.username,"ivac"); + ivac.net.l_port=IVAC_LISTEN_PORT; + strcpy(ivac.audio.dsp_dev,SOUND_DEVICE); + + /* parse argv and change default values */ + for(i=1;inet)); input_shutdown(&(ivac->input)); event_stop(&(ivac->event)); - // display_shutdown(&(ivac->display)); + audio_shutdown(&(ivac->audio)); + display_shutdown(&(ivac->display)); return SUCCESS; } @@ -129,9 +171,26 @@ int ivac_send_info(int channel,t_ivac *ivac) { return SUCCESS; } +int ivac_send_quit(int channel,t_ivac *ivac) { + + char data[7]; /* one more for \0 */ + + 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]; + char c_str[IVAC_CONSOLE_STRING_LEN]; int count,length; count=0; @@ -158,39 +217,68 @@ 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]))) + sprintf(c_str,"channel %02d: connection closed by remote host", + channel); + event_math(ivac->net.connection[channel].fd,&(ivac->event), + READ,REMOVE); + network_close(&(ivac->net),channel); + memset(&(ivac->challenger[channel]),0,sizeof(t_challenger)); + ivac_add_to_monitor(ivac,c_str); + count+=6; + break; default: - puts("[ivac] ivac_receive_info, unknown character"); + sprintf(c_str,"ivac_receive_info, unknown character: 0x%02x\n", + data[count]); + ivac_add_to_monitor(ivac,c_str); return ERROR; break; } } - return SUCCESS; + return length; } 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); } + /* wait for user info */ for(channel=0;channelnet.connection[channel].status&C_ESTABL) { - /* receive info */ - if(FD_ISSET(ivac->net.connection[channel].fd,&(event->rfds))) - ivac_receive_info(channel,ivac); - /* sync network/event api */ - if(!(FD_ISSET(ivac->net.connection[channel].fd,&(event->rfds_o)))) - event_math(ivac->net.connection[channel].fd,event,READ,ADD); + /* remote is sending info */ + if(FD_ISSET(ivac->net.connection[channel].fd,&(event->rfds))) { + if(ivac_receive_info(channel,ivac)==0) { + event_math(ivac->net.connection[channel].fd,event,READ,REMOVE); + network_close(&(ivac->net),channel); + sprintf(c_str,"channel %02d: broken pipe - disconnected",channel); + ivac_add_to_monitor(ivac,c_str); + } + ivac_display_content(ivac); + } } } @@ -198,9 +286,6 @@ int ivac_event_cb(t_event *event,void *ptr) { if(FD_ISSET(0,&(event->rfds))) input_get_event(&(ivac->input),ivac_parse_command,ivac); - /* display ivac gui */ - // ivac_display_content(ivac); - return SUCCESS; } @@ -256,6 +341,12 @@ int ivac_parse_command(t_input *input,void *ptr) { if(!(strncmp(arg[0],"quit",4))) { valid=1; sprintf(c_str,"ivac shutdown ..."); + for(i=0;inet.connection[i].status&C_ESTABL) { + ivac_send_quit(i,ivac); + network_close(&(ivac->net),i); + } + } ivac_shutdown(ivac); } if(!(strncmp(arg[0],"set",3))) { @@ -267,15 +358,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]); } @@ -284,17 +371,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]); @@ -304,12 +391,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]); } @@ -318,11 +409,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]); @@ -332,11 +423,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]); @@ -365,37 +456,15 @@ int ivac_parse_command(t_input *input,void *ptr) { int ivac_display_head(t_display *display) { -#ifdef USE_NCURSES - int x,y; - - move(0,0); - for(x=0;xmax_x;x++) addch('#'); - mvaddstr(1,0,"##"); - mvaddstr(1,(display->max_x-4)/2-4,"- ivac -"); - mvaddstr(1,(display->max_x-2),"##"); - move(2,0); - for(x=0;xmax_x;x++) addch('#'); - refresh(); -#else puts("#########################################################"); puts("##### ivac - - Copyright (C) 2004 Frank Zirkelbach #####"); puts("#########################################################"); -#endif return SUCCESS; } int ivac_display_box(t_display *display) { -#ifdef USE_NCURSES - int x,y; - - for(y=IVAC_PROMPT_LEN;ymax_y-IVAC_PROMPT_LEN;y++) { - mvaddch(y,0,'#'); - mvaddch(y,display->max_x-1,'#'); - } -#endif - return SUCCESS; } @@ -408,93 +477,33 @@ int ivac_display_box_content(t_ivac *ivac) { if(ivac->challenger[channel].name[0]==0) strcpy(ivac->challenger[channel].name,""); -#ifdef USE_NCURSES -#else - for(channel=0;channelnet.connection[channel].status&C_INFO_A) - printf("channel %02d: ip:%s port:%d status: %02x - name: %s\n",channel, - ivac->net.connection[channel].ip, - ivac->net.connection[channel].port, - ivac->net.connection[channel].status, - ivac->challenger[channel].name); - } -#endif - return SUCCESS; } int ivac_display_console(t_display *display) { -#ifdef USE_NCURSES - int x,y; - - move(display->max_y-IVAC_CONSOLE_LEN-IVAC_PROMPT_LEN-1,0); - for(x=0;xmax_x;x++) addch('#'); -#endif - return SUCCESS; } int ivac_display_console_content(t_ivac *ivac) { -#ifdef USE_NCURSES - int x,y; - int len; - - for(y=0;yconsole[y]); - move(ivac->display.max_y-IVAC_CONSOLE_LEN-IVAC_PROMPT_LEN+y,2); - for(x=0;xconsole[y][x]>' ')||(ivac->console[y][x]<='~')) - ?ivac->console[y][x]:' '); - for(x=len;xconsole[i]); -#endif return SUCCESS; } int ivac_display_prompt(t_display *display) { -#ifdef USE_NCURSES - int x,y; - - move(display->max_y-3,0); - for(x=0;xmax_x;x++) addch('#'); - mvaddstr(display->max_y-2,0,"## command: "); - mvaddstr(display->max_y-2,display->max_x-2,"##"); - move(display->max_y-1,0); - for(x=0;xmax_x;x++) addch('#'); - refresh(); -#endif - return SUCCESS; } int ivac_display_prompt_content(t_ivac *ivac) { -#ifdef USE_NCURSES - int x,y; - - /* delete old command */ - if(ivac->input.c_count==0) { - move(ivac->display.max_y-2,12); - for(x=12;xdisplay.max_x-1;x++) addch(' '); - } - - for(x=0;xinput.c_count;x++) - mvaddch(ivac->display.max_y-2,x+12,ivac->input.content[x]); - refresh(); -#else printf("%c",ivac->input.content[ivac->input.c_count-1]); fflush(NULL); -#endif return SUCCESS; }