X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fivac.git;a=blobdiff_plain;f=src%2Fivac.c;h=55188ec45feba4c12d51d0d39691c696acaa85cd;hp=9d2b216894d2f7ee35d8ef87a743f02f7c846b67;hb=050a55681aaf01024a475eb4e68880040af758bd;hpb=8ada0b2c57ad21e9b3bcbd10328faedf996f5c22

diff --git a/src/ivac.c b/src/ivac.c
index 9d2b216..55188ec 100644
--- a/src/ivac.c
+++ b/src/ivac.c
@@ -21,8 +21,6 @@
  *
  */
 
-// #define USE_GTK
-
 #include "ivac.h"
 
 int usage(void) {
@@ -34,7 +32,9 @@ int usage(void) {
   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;
@@ -50,7 +50,9 @@ int main(int argc,char **argv) {
   /* 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++) {
@@ -65,9 +67,14 @@ int main(int argc,char **argv) {
         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;
@@ -104,9 +111,11 @@ int main(int argc,char **argv) {
     ivac_shutdown(&ivac);
     return ERROR;
   }
+  network_udp_listen_init(&(ivac.net));
 
-  /* add listening port + stdin to (read) event system */
+  /* 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);
 
   /* display init */
@@ -121,7 +130,8 @@ int main(int argc,char **argv) {
   audio_setup(&(ivac.audio));
 
   /* display */
-  ivac_display(&(ivac.display));
+  ivac_display(&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);
@@ -132,6 +142,7 @@ int main(int argc,char **argv) {
 int ivac_shutdown(t_ivac *ivac) {
 
   network_shutdown(&(ivac->net));
+  network_udp_shutdown(&(ivac->net));
   input_shutdown(&(ivac->input));
   event_stop(&(ivac->event));
   audio_shutdown(&(ivac->audio));
@@ -264,6 +275,7 @@ 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 */
@@ -278,6 +290,7 @@ int ivac_event_cb(t_event *event,void *ptr) {
           ivac_add_to_monitor(ivac,c_str);
         }
         ivac_display_content(ivac);
+        ivac_display_draw(ivac);
       }
     }
   } 
@@ -310,7 +323,7 @@ int ivac_parse_command(t_input *input,void *ptr) {
   data=input->content;
   valid=0;
 
-  /* refresh prompt content only! */
+  /* refresh prompt content only */
   ivac_display_prompt_content(ivac);
 
   /* parse command routines */
@@ -444,6 +457,7 @@ 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 */
     memset(input->content,0,input->c_count-1);
@@ -454,16 +468,27 @@ int ivac_parse_command(t_input *input,void *ptr) {
   return SUCCESS;
 }
 
-int ivac_display_head(t_display *display) {
+int ivac_display_head(t_ivac *ivac) {
 
-  puts("#########################################################");
-  puts("##### ivac - -  Copyright (C) 2004 Frank Zirkelbach #####");
-  puts("#########################################################");
+  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) {
+int ivac_display_box(t_ivac *ivac) {
+
+  display_line(&(ivac->display),0,3,ivac->display.max_x,3,'-');
+  printf("username: %s, capabilities: %02x|%04x\n",ivac->username,ivac->g_cap,
+                                                   ivac->av_cap);
+  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;
 }
@@ -471,16 +496,34 @@ int ivac_display_box(t_display *display) {
 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>");
 
+  for(channel=0;channel<MAX_CONNECTIONS;channel++) {
+    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));
+    }
+  }
+
   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);
 
   return SUCCESS;
 }
@@ -488,55 +531,70 @@ int ivac_display_console(t_display *display) {
 int ivac_display_console_content(t_ivac *ivac) {
 
   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]);
+  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) {
+
+  /* simply a printf - dirty! */
+  printf("prompt: ");
+  fflush(NULL);
 
   return SUCCESS;
 }
 
 int ivac_display_prompt_content(t_ivac *ivac) {
 
+  /* simply a printf - dirty! */
   printf("%c",ivac->input.content[ivac->input.c_count-1]);
   fflush(NULL);
 
   return SUCCESS;
 }
 
-int ivac_display(t_display *display) {
+int ivac_display_content(t_ivac *ivac) {
+
+  /* display box content */
+  ivac_display_box_content(ivac);
+
+  /* display console content */
+  ivac_display_console_content(ivac);
+
+  return SUCCESS;
+}
+
+int ivac_display(t_ivac *ivac) {
 
   int x,y;
 
-  /* 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_until_line(&(ivac->display),ivac->display.max_y-1);
+  ivac_display_prompt(ivac);
 
   return SUCCESS;
 }