X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fivac.git;a=blobdiff_plain;f=src%2Fivac.c;h=e959ef8ba6f4e0dc7bec8b8b4dc2322167d9feb7;hp=4fede22d4f8a3d9f9d549a08ce858a625c69c582;hb=40031b2d692a7b83e437535045ece6c58f8bf31e;hpb=1d24c5371e02647c8eeb4dc00ec6d667d169faa7

diff --git a/src/ivac.c b/src/ivac.c
index 4fede22..e959ef8 100644
--- a/src/ivac.c
+++ b/src/ivac.c
@@ -21,10 +21,25 @@
  *
  */
 
-// #define USE_NCURSES
-
 #include "ivac.h"
 
+int usage(void) {
+
+  puts("");
+  puts("usage: ivac <options>");
+  puts("");
+  puts("options:");
+  puts("-h \t\t show this help");
+  puts("-n <name> \t specify your name");
+  puts("-p <port> \t specify port to listen for incoming connections");
+  puts("-u <port> \t specify udp data port");
+  puts("-d <device> \t specify audio device");
+  puts("-i <iface> \t specify network interface");
+  puts("");
+
+  return SUCCESS;
+}
+
 int main(int argc,char **argv) {
 
   /* TESTING BY NOW */
@@ -32,13 +47,42 @@ int main(int argc,char **argv) {
   t_ivac ivac;
   int i;
 
-  if(argc!=2) {
-    printf("\nusage: %s <username>\n\n",argv[0]);
-    return ERROR;
+  /* default values */
+  strcpy(ivac.username,"ivac");
+  ivac.net.l_port=IVAC_LISTEN_PORT;
+  ivac.net.l_udp_port=IVAC_UDP_PORT;
+  strcpy(ivac.audio.dsp_dev,SOUND_DEVICE);
+  strcpy(ivac.net.nic,"eth0");
+ 
+  /* parse argv and change default values */
+  for(i=1;i<argc;i++) {
+    if(argv[i][0]=='-') {
+      switch(argv[i][1]) {
+        case 'h':
+          usage();
+          return SUCCESS;
+        case 'n':
+          strncpy(ivac.username,argv[++i],CHAR_USERNAME);
+          break;
+        case 'p':
+          ivac.net.l_port=atoi(argv[++i]);
+          break;
+        case 'u':
+          ivac.net.l_udp_port=atoi(argv[++i]);
+          break;
+        case 'd':
+          strncpy(ivac.audio.dsp_dev,argv[++i],MAX_CHAR_DEVICE);
+          break;
+        case 'i':
+          strncpy(ivac.net.nic,argv[++i],MAX_NIC_DEVICE);
+        default:
+          usage();
+          return ERROR;
+      }
+    }
+    else usage();
   }
 
-  /* set username */
-  strncpy(ivac.username,argv[1],CHAR_USERNAME);
   /* clear challenger struct */
   for(i=0;i<MAX_CONNECTIONS;i++)
     memset(&(ivac.challenger[i]),0,sizeof(t_challenger));
@@ -54,14 +98,19 @@ int main(int argc,char **argv) {
   ivac.event.timeout.tv_sec=IVAC_S_SEC;
   ivac.event.timeout.tv_usec=IVAC_S_USEC;
   /* event init */
-  event_init(&(ivac.event));
+  if(event_init(&(ivac.event))==E_ERROR) {
+    ivac_shutdown(&ivac);
+    return ERROR;
+  }
 
   /* input init */
   ivac.input.mode=CONTENT_BUFFER;
-  input_init(&(ivac.input));
+  ivac.input.c_count=0;
+  if(input_init(&(ivac.input))==I_ERROR) {
+    ivac_shutdown(&ivac);
+    return ERROR;
+  }
 
-  /* set listen port (futur: read from config or entered later) */
-  network_set_listen_port(&(ivac.net),IVAC_LISTEN_PORT);
   /* network init */
   if(network_init(&(ivac.net))==N_ERROR) {
     printf("[ivac] use 'fuser -n tcp %d' to determine the process to kill!\n",
@@ -70,30 +119,45 @@ int main(int argc,char **argv) {
     return ERROR;
   }
 
-  /* add listening port + stdin to (read) event system */
+  /* network udp init */
+  network_udp_listen_init(&(ivac.net));
+
+  /* add listening port(s) + stdin to (read) event system */
   event_math(ivac.net.l_fd,&(ivac.event),READ,ADD);
+  event_math(ivac.net.l_udp_fd,&(ivac.event),READ,ADD);
   event_math(0,&(ivac.event),READ,ADD);
 
+  /* use hardcoded audio settings by now */
+  ivac.audio.fmt=BIT_8;
+  ivac.audio.channels=MONO;
+  ivac.audio.speed=8000;
+  /* audio init */
+  audio_init(&(ivac.audio));
+  /* audio setup */
+  audio_setup(&(ivac.audio));
+
   /* display init */
-  // display_init(&(ivac.display));
+  display_init(&(ivac.display));
 
   /* display */
-  ivac_display(&(ivac.display));
+  ivac_display(&ivac);
+  ivac_display_content(&ivac);
+  ivac_display_draw(&ivac);
 
   /* start event system - callbacks used: ivac_event_cb + ivac_regular_cb */
   event_start(&(ivac.event),(void *)&ivac,ivac_event_cb,ivac_regular_cb);
 
-  // ivac_shutdown(&ivac);
-
   return SUCCESS;
 }
 
 int ivac_shutdown(t_ivac *ivac) {
 
+  display_shutdown(&(ivac->display));
   network_shutdown(&(ivac->net));
+  network_udp_shutdown(&(ivac->net));
   input_shutdown(&(ivac->input));
   event_stop(&(ivac->event));
-  // display_shutdown(&(ivac->display));
+  audio_shutdown(&(ivac->audio));
 
   return SUCCESS;
 }
@@ -131,7 +195,7 @@ int ivac_send_info(int channel,t_ivac *ivac) {
 
 int ivac_send_quit(int channel,t_ivac *ivac) {
 
-  char data[6];
+  char data[7]; /* one more for \0 */
 
   data[0]=IVAC_SEND_QUIT;
   data[1]=4;
@@ -148,6 +212,7 @@ int ivac_send_quit(int channel,t_ivac *ivac) {
 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;
@@ -162,7 +227,7 @@ int ivac_receive_info(int channel,t_ivac *ivac) {
     switch(data[count]) {
       case IVAC_SEND_NAME:
         strncpy(ivac->challenger[channel].name,data+count+2,data[count+1]);
-        ivac->challenger[channel].name[data[count+1]]='\0';
+        ivac->challenger[channel].name[(int)data[count+1]]='\0';
         count+=(data[count+1]+2);
         break;
       case IVAC_SEND_G_CAP:
@@ -176,18 +241,25 @@ int ivac_receive_info(int channel,t_ivac *ivac) {
         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) {
@@ -214,15 +286,23 @@ int ivac_event_cb(t_event *event,void *ptr) {
       ivac_send_info(channel,ivac);
     }
     ivac_display_content(ivac);
+    ivac_display_draw(ivac);
   }
 
   /* wait for user info */
   for(channel=0;channel<MAX_CONNECTIONS;channel++) {
     if(ivac->net.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);
+      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);
+        ivac_display_draw(ivac);
+      }
     }
   } 
 
@@ -235,6 +315,12 @@ int ivac_event_cb(t_event *event,void *ptr) {
 
 int ivac_regular_cb(t_event *event,void *ptr) {
 
+  t_ivac *ivac;
+
+  ivac=(t_ivac *)ptr;
+
+  ivac_add_to_monitor(ivac,"event HUGH");
+
   /* usual jobs like audio & video transmit ... */
 
   return SUCCESS;
@@ -249,16 +335,26 @@ int ivac_parse_command(t_input *input,void *ptr) {
   char *data,valid;
   char c_str[IVAC_CONSOLE_STRING_LEN];
   char arg[IVAC_ARG_COUNT][IVAC_ARG_LEN];
+  char debug_string[128];
 
   ivac=(t_ivac *)ptr;
   data=input->content;
   valid=0;
 
-  /* refresh prompt content only! */
+  /* refresh prompt content only */
   ivac_display_prompt_content(ivac);
+  ivac_display_draw(ivac);
+
+#ifdef DEBUG
+  ivac_add_to_monitor(ivac,"nach display refresh");
+#endif
 
   /* parse command routines */
-  if(data[input->c_count-1]=='\n') {
+  if(data[input->c_count-1]=='\n'||data[input->c_count-1]=='\r') {
+
+#ifdef DEBUG
+    ivac_add_to_monitor(ivac,"got newline or carriage return!");
+#endif
 
     /* delete console string + args */
     memset(c_str,0,IVAC_CONSOLE_STRING_LEN);
@@ -266,11 +362,11 @@ int ivac_parse_command(t_input *input,void *ptr) {
 
     /* get args */
     len=0;
-    while(data[len]!='\n') len++;
+    while(data[len]!='\n'||data[len]!='\r') len++;
     i=0; j=0;
     while((i<len) && (j<IVAC_ARG_COUNT)) {
       k=0;
-      while((data[i+k]!=' ')&&(data[i+k]!='\n')) {
+      while((data[i+k]!=' ')&&(data[i+k]!='\n'||data[i+k]!='\r')) {
         arg[j][k]=data[i+k];
         k++;
       }
@@ -281,10 +377,17 @@ int ivac_parse_command(t_input *input,void *ptr) {
       i+=k;
     }
 
+
     /* parse command  aka arg[0] */
     if(!(strncmp(arg[0],"quit",4))) {
       valid=1;
       sprintf(c_str,"ivac shutdown ...");
+      for(i=0;i<MAX_CONNECTIONS;i++) {
+        if(ivac->net.connection[i].status&C_ESTABL) {
+          ivac_send_quit(i,ivac);
+          network_close(&(ivac->net),i);
+        }
+      }
       ivac_shutdown(ivac);
     }
     if(!(strncmp(arg[0],"set",3))) {
@@ -350,7 +453,7 @@ int ivac_parse_command(t_input *input,void *ptr) {
         network_select(&(ivac->net),channel);
         sprintf(c_str,"selected channel %d",channel);
       }
-      else if(arg[1][0]='*') {
+      else if(arg[1][0]=='*') {
         network_select(&(ivac->net),MAX_CONNECTIONS);
         strcpy(c_str,"selected all channels");
       }
@@ -364,7 +467,7 @@ int ivac_parse_command(t_input *input,void *ptr) {
         network_deselect(&(ivac->net),channel);
         sprintf(c_str,"deselected channel %d",channel);
       }
-      else if(arg[1][0]='*') {
+      else if(arg[1][0]=='*') {
         network_deselect(&(ivac->net),MAX_CONNECTIONS);
         strcpy(c_str,"deselected all channels");
       }
@@ -382,181 +485,153 @@ int ivac_parse_command(t_input *input,void *ptr) {
 
     /* refresh whole display content */
     ivac_display_content(ivac);
+    ivac_display_draw(ivac);
 
-    /* delete content buffer + reset counter */
+    /* delete input content buffer + reset counter */
     memset(input->content,0,input->c_count-1);
     input->c_count=0;
 
   }
 
+  ivac_add_to_monitor(ivac,"debug: end of parse function");
+
   return SUCCESS;
 }
 
-int ivac_display_head(t_display *display) {
-
-#ifdef USE_NCURSES
-  int x,y;
-
-  move(0,0);
-  for(x=0;x<display->max_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;x<display->max_x;x++) addch('#');
-  refresh();
-#else
-  puts("#########################################################");
-  puts("##### ivac - -  Copyright (C) 2004 Frank Zirkelbach #####");
-  puts("#########################################################");
-#endif
+int ivac_display_head(t_ivac *ivac) {
+
+  display_line(&(ivac->display),0,0,ivac->display.max_x,0,'#');
+  display_string(&(ivac->display),(ivac->display.max_x-strlen(PROG_NAME))/2,1,
+                 PROG_NAME,strlen(PROG_NAME));
+  display_line(&(ivac->display),0,2,ivac->display.max_x,2,'#');
 
   return SUCCESS;
 }
 
-int ivac_display_box(t_display *display) {
- 
-#ifdef USE_NCURSES 
-  int x,y;
-
-  for(y=IVAC_PROMPT_LEN;y<display->max_y-IVAC_PROMPT_LEN;y++) {
-    mvaddch(y,0,'#');
-    mvaddch(y,display->max_x-1,'#');
-  }
-#endif
+int ivac_display_box(t_ivac *ivac) {
 
+  display_line(&(ivac->display),0,3,ivac->display.max_x,3,'-');
+  display_line(&(ivac->display),0,5,ivac->display.max_x,5,'-');
+  display_string(&(ivac->display),0,6,"connections:",12);
+  display_line(&(ivac->display),
+               0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN-1,
+               ivac->display.max_x,
+               ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN-1,'-');
+ 
   return SUCCESS;
 }
 
 int ivac_display_box_content(t_ivac *ivac) {
 
   int channel;
+  char string[MAX_BOX_CHARS];
 
   /* prepare challenger names */
   for(channel=0;channel<MAX_CONNECTIONS;channel++)
     if(ivac->challenger[channel].name[0]==0)
       strcpy(ivac->challenger[channel].name,"<empty>");
 
-#ifdef USE_NCURSES
-#else
+  sprintf(string,"username: %s, capabilities: %02x|%04x",
+          ivac->username,ivac->g_cap,ivac->av_cap);
+  display_string(&(ivac->display),0,4,string,strlen(string));
+
   for(channel=0;channel<MAX_CONNECTIONS;channel++) {
-    if(ivac->net.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);
+    if(ivac->net.connection[channel].status&C_INFO_A) {
+      snprintf(string,MAX_BOX_CHARS,
+               "channel %02d: %s:%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);
+      display_string(&(ivac->display),0,IVAC_HEAD_LEN+4+channel,
+                     string,strlen(string));
+    }
   }
-#endif
 
   return SUCCESS;
 }
 
-int ivac_display_console(t_display *display) {
+int ivac_display_console(t_ivac *ivac) {
+
+  display_string(&(ivac->display),
+                 0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN,
+                 "console messages:",17);
 
-#ifdef USE_NCURSES                                             
-  int x,y;
-         
-  move(display->max_y-IVAC_CONSOLE_LEN-IVAC_PROMPT_LEN-1,0);
-  for(x=0;x<display->max_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;y<IVAC_CONSOLE_LEN;y++) {
-    len=strlen(ivac->console[y]);
-    move(ivac->display.max_y-IVAC_CONSOLE_LEN-IVAC_PROMPT_LEN+y,2);
-    for(x=0;x<len;x++)
-       addch(((ivac->console[y][x]>' ')||(ivac->console[y][x]<='~'))
-               ?ivac->console[y][x]:' ');
-    for(x=len;x<IVAC_CONSOLE_STRING_LEN-4;x++) addch(' ');
-  }
-  refresh();
-#else
   int i;
+  char string[IVAC_CONSOLE_STRING_LEN];
 
-  for(i=0;i<IVAC_CONSOLE_LEN;i++)
-    printf("[ivac] console line %d: %s\n",i,ivac->console[i]);
-#endif
+  for(i=0;i<IVAC_CONSOLE_LEN;i++) {
+    snprintf(string,IVAC_CONSOLE_STRING_LEN,"%s\n",ivac->console[i]);
+    display_string(&(ivac->display),
+                   0,ivac->display.max_y-IVAC_PROMPT_LEN-IVAC_CONSOLE_LEN+1+i,
+                   string,strlen(string));
+  }
 
   return SUCCESS;
 }
 
-int ivac_display_prompt(t_display *display) {
+int ivac_display_prompt(t_ivac *ivac) {
 
-#ifdef USE_NCURSES
-  int x,y;
-
-  move(display->max_y-3,0);
-  for(x=0;x<display->max_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;x<display->max_x;x++) addch('#');
-  refresh();
-#endif
+  display_string(&(ivac->display),0,ivac->display.max_y-1,"prompt: ",8);
 
   return SUCCESS;
 }
 
 int ivac_display_prompt_content(t_ivac *ivac) {
 
-#ifdef USE_NCURSES
-  int x,y;
+  char string[IVAC_CONSOLE_STRING_LEN];
+  int count;
 
-  /* delete old command */
-  if(ivac->input.c_count==0) {
-    move(ivac->display.max_y-2,12);
-    for(x=12;x<ivac->display.max_x-1;x++) addch(' ');
-  }
+  for(count=0;count<ivac->input.c_count;count++)
+    string[count]=ivac->input.content[count];
+  for(;count<ivac->display.max_x-8;count++) string[count]=' ';
+  display_string(&(ivac->display),8,ivac->display.max_y-1,
+                 string,ivac->display.max_x);
+  
+  return SUCCESS;
+}
 
-  for(x=0;x<ivac->input.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
+int ivac_display_content(t_ivac *ivac) {
+
+  /* display box content */
+  ivac_display_box_content(ivac);
+
+  /* display console content */
+  ivac_display_console_content(ivac);
+
+  /* display prompt content */
+  ivac_display_prompt_content(ivac);
 
   return SUCCESS;
 }
 
-int ivac_display(t_display *display) {
-
-  int x,y;
+int ivac_display(t_ivac *ivac) {
 
-  /* display head */
-  ivac_display_head(display);
+  /* display static head */
+  ivac_display_head(ivac);
 
-  /* display box */
-  ivac_display_box(display);
+  /* display static box */
+  ivac_display_box(ivac);
 
-  /* display console */
-  ivac_display_console(display);
+  /* display static console */
+  ivac_display_console(ivac);
 
   /* display command prompt */
-  ivac_display_prompt(display);
+  ivac_display_prompt(ivac);
 
   return SUCCESS;
 }
 
-int ivac_display_content(t_ivac *ivac) {
-
-  /* display box content */
-  ivac_display_box_content(ivac);
-
-  /* display console content */
-  ivac_display_console_content(ivac);
-
-  /* display prompt content */
-  ivac_display_prompt_content(ivac);
+int ivac_display_draw(t_ivac *ivac) {
+  
+  display_draw(&(ivac->display));
+  display_set_cursor(&(ivac->display),ivac->input.c_count+8,
+                     ivac->display.max_y-1);
 
   return SUCCESS;
 }
@@ -569,5 +644,8 @@ int ivac_add_to_monitor(t_ivac *ivac,char *msg) {
     memcpy(ivac->console[i],ivac->console[i+1],IVAC_CONSOLE_STRING_LEN);
   memcpy(ivac->console[IVAC_CONSOLE_LEN-1],msg,IVAC_CONSOLE_STRING_LEN);
 
+  ivac_display_console_content(ivac);
+  ivac_display_draw(ivac);
+
   return SUCCESS;
 }