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

[my-code/ivac.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 3293a57..053e309 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -27,17 +27,15 @@ int network_init(t_net *net) {
   addr.sin_port=htons(net->l_port);
   addr.sin_addr.s_addr=INADDR_ANY;
 
-  /* prevent addres in use error message */
-  true=1;
-  if(setsockopt(net->l_fd,SOL_SOCKET,SO_REUSEADDR,&true,sizeof(true))==-1) {
-    perror("[network] setsockopt call");
-    return N_ERROR;
-  }
-
   if(bind(net->l_fd,(struct sockaddr *)&addr,
           sizeof(struct sockaddr))==-1) {
-    perror("[network] bind call");
-    return N_ERROR;
+    /* try harder ... */
+    true=1;
+    if(setsockopt(net->l_fd,SOL_SOCKET,SO_REUSEADDR,&true,sizeof(true))==-1) {
+      perror("[network] setsockopt call");
+      return N_ERROR;
+    }
+    puts("[network] reused address");
   }
 
   if(listen(net->l_fd,MAX_LISTEN_QUEUE)==-1) {
@@ -144,7 +142,7 @@ int network_connect(t_net *net,int channel) {
     return N_E_IN_USE;
   }
   if(!(net->connection[channel].status&C_INFO_A)) {
-    printf("[network] connect failed, missing configuration for channel %02d",
+    printf("[network] connect failed, missing configuration for channel %02d\n",
            channel);
     return N_E_NO_INFO;
   }
@@ -157,7 +155,7 @@ int network_connect(t_net *net,int channel) {
 int network_close(t_net *net,int channel) {
 
   if(!(net->connection[channel].status&C_ESTABL)) {
-    printf("[network] close failed, channel %02d not active",channel);
+    printf("[network] close failed, channel %02d not active\n",channel);
     return N_E_NC;
   }
   
@@ -165,6 +163,16 @@ int network_close(t_net *net,int channel) {
   return(network_manage_connection(net)); /* could be other channel too */
 }
 
+int network_close_all(t_net *net) {
+
+  int channel;
+
+  for(channel=0;channel<MAX_CONNECTIONS;channel++)
+    if(net->connection[channel].status&C_ESTABL) network_close(net,channel);
+
+  return N_SUCCESS;
+}
+
 int network_set_connection_info(t_net *net,int channel,char *ip,int port) {
 
   if(net->connection[channel].status&C_IN_USE) {
@@ -257,3 +265,97 @@ int network_receive(int fd,unsigned char *data,int datasize) {
 
   return count;
 }
+
+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)");
+    return N_ERROR;
+  }
+
+  memset(&addr,0,sizeof(struct sockaddr));
+  addr.sin_family=AF_INET;
+  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) {
+    /* 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);
+
+  if((net->s_udp_fd=socket(AF_INET,SOCK_DGRAM,0))==-1) {
+    perror("[network] socket call (udp-send)");
+    return N_ERROR;
+  }
+
+  return N_SUCCESS;
+}
+
+int network_udp_receive(t_net *net,int channel, unsigned char *data,int count) {
+
+  struct sockaddr_in addr;
+  socklen_t len;
+
+  if((count=recvfrom(net->l_udp_fd,data,count,0,
+                     (struct sockaddr *)&addr,&len))==-1) {
+    perror("[network] recvfrom call");
+    return N_ERROR;
+  }
+
+  if(strncmp(net->connection[channel].ip,inet_ntoa(addr.sin_addr),IP_DIGITS)) {
+    printf("[network] packet from unknown: %s\n",inet_ntoa(addr.sin_addr));
+    return N_UDP_WRONG_SENDER;
+  }
+
+  return N_SUCCESS;
+}
+
+int network_udp_send(t_net *net,int channel, unsigned char *data,int size) {
+
+  int count,left;
+  struct sockaddr_in addr;
+
+  count=0;
+  left=count;
+
+  memset(&addr,0,sizeof(struct sockaddr));
+  addr.sin_family=AF_INET;
+  addr.sin_port=htons(net->l_udp_port);
+  inet_aton(net->connection[channel].ip,&(addr.sin_addr));
+
+  while(left) {
+    if((count=sendto(net->s_udp_fd,data+size-left,left,0,
+                     (struct sockaddr *)&addr,sizeof(struct sockaddr)))==-1) {
+      perror("[network] sendto call");
+      return N_ERROR;
+    }
+    left-=count;
+  }
+
+  return N_SUCCESS;
+}
+
+int network_udp_shutdown(t_net *net) {
+  
+  if(close(net->l_udp_fd)==-1) {
+    perror("[network] close call (udp-receive)");
+    return N_ERROR;
+  }
+
+  if(close(net->s_udp_fd)==-1) {
+    perror("[network] close call (udp-send)");
+    return N_ERROR;
+  }
+
+  return N_SUCCESS;
+}