fixed udp "addtess already used" thing + introduced nic device string (used later)

diff --git a/src/ivac.c b/src/ivac.c
index 47d1892ae77d0ca3baededd9f40310d4a5a7a9fc..44e831c8b649ad08a996269ac48ec9a27907e639 100644 (file)
--- a/src/ivac.c
+++ b/src/ivac.c
@@ -34,6 +34,7 @@ int usage(void) {
   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;
@@ -51,6 +52,7 @@ int main(int argc,char **argv) {
   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++) {
@@ -71,6 +73,8 @@ int main(int argc,char **argv) {
         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;

diff --git a/src/network.c b/src/network.c
index 3cc7c83f9e54787b5a58935e8a4e877e8956beb9..053e309f4f750403c15bec1c723dcefd3099a4c1 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -269,6 +269,7 @@ int network_receive(int fd,unsigned char *data,int datasize) {
 int network_udp_listen_init(t_net *net) {
 
   struct sockaddr_in addr;
+  int true;
 
   if((net->l_udp_fd=socket(AF_INET,SOCK_DGRAM,0))==-1) {
     perror("[network] socket call (udp-receive)");
@@ -280,8 +281,14 @@ int network_udp_listen_init(t_net *net) {
   addr.sin_port=htons(net->l_udp_port);
   addr.sin_addr.s_addr=INADDR_ANY;
   if(bind(net->l_udp_fd,(struct sockaddr *)&addr,sizeof(struct sockaddr))==-1) {
-    perror("[network] bind call (udp)");
-    return N_ERROR;
+    /* try harder ... */
+    true=1;
+    if(setsockopt(net->l_udp_fd,SOL_SOCKET,SO_REUSEADDR,
+                  &true,sizeof(true))==-1) {
+      perror("[network] setsockopt call (udp)");
+      return N_ERROR;
+    }
+    puts("[network] reused address (udp)");
   }
 
   printf("[network] listening on port %d (udp)\n",net->l_udp_port);

diff --git a/src/network.h b/src/network.h
index 60ae77363e42aabbbcffce911ea6a0bec3b3ab9a..079cea387df6e8cef3cca6113638105deed90702 100644 (file)
--- a/src/network.h
+++ b/src/network.h
@@ -17,6 +17,7 @@
 
 /* defines */
 #define MAX_CONNECTIONS 32
+#define MAX_NIC_DEVICE 32
 
 #define IP_DIGITS 16
 #define C_IN_USE (1<<0)
@@ -61,6 +62,7 @@ typedef struct s_net {
   int c_count;
   t_connection connection[MAX_CONNECTIONS];
   unsigned int sendmask; /* 32 bits for maximum of 32 connections */
+  char nic[MAX_NIC_DEVICE];
 } t_net;
 
 /* function prototypes */