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

diff --git a/src/ivac.c b/src/ivac.c
index 9d2b216..44e831c 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 */
@@ -132,6 +141,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));