X-Git-Url: https://www.hackdaworld.org/gitweb/?a=blobdiff_plain;f=network%2Fnetwork.c;h=1160e7c227802d8124b47e48daaeb7c325595ac0;hb=163431149f68f6d8e50665d74e7e31c45d662698;hp=4cb539de8d0b9918476d5b41dae2d986cdca1d7d;hpb=b8458ffac23aab55ba5316d28dd803dd34297181;p=my-code%2Fapi.git

diff --git a/network/network.c b/network/network.c
index 4cb539d..1160e7c 100644
--- a/network/network.c
+++ b/network/network.c
@@ -6,16 +6,17 @@
 
 #include "network.h"
 
-int network_init(t_net *net) {
+int network_init(t_net *net,int outfd) {
   
   struct sockaddr_in addr;
   int true;
  
-  fprintf(stderr,"[network] initializing network ...\n");
+  dprintf(outfd,"[network] initializing network ...\n");
 
   memset(net->connection,0,MAX_CONNECTIONS*sizeof(t_connection));
   net->c_count=0;
   net->sendmask=0;
+  net->outfd=outfd;
 
   if((net->l_fd=socket(AF_INET,SOCK_STREAM,0))==-1) {
     perror("[network] socket call");
@@ -35,7 +36,7 @@ int network_init(t_net *net) {
       perror("[network] setsockopt call");
       return N_ERROR;
     }
-    fprintf(stderr,"[network] reused address\n");
+    dprintf(event->outfd,"[network] reused address\n");
   }
 
   if(listen(net->l_fd,MAX_LISTEN_QUEUE)==-1) {
@@ -43,8 +44,8 @@ int network_init(t_net *net) {
     return N_ERROR;
   }
 
-  fprintf(stderr,"[network] listen on %s port %d\n",inet_ntoa(addr.sin_addr),
-                                                    net->l_port);
+  dprintf(event->outfd,"[network] listen on %s port %d\n",
+          inet_ntoa(addr.sin_addr),net->l_port);
 
   return N_SUCCESS;
 }
@@ -62,7 +63,7 @@ int network_shutdown(t_net *net) {
     return N_ERROR;
   }
 
-  fprintf(stderr,"[network] shutdown\n");
+  dprintf(event->outfd,"[network] shutdown\n");
 
   return N_SUCCESS;
 }
@@ -88,7 +89,7 @@ int network_manage_connection(t_net *net) {
           perror("[network] close call");
           return N_E_CLOSE;
         }
-        fprintf(stderr,"[network] connection %d closed\n",i);
+        dprintf(event->outfd,"[network] connection %d closed\n",i);
         net->connection[i].status=0;
       }
 
@@ -119,9 +120,9 @@ int network_manage_connection(t_net *net) {
             return N_E_CONNECT;
           }
 
-          fprintf(stderr,"[network] established connection to ");
-          fprintf(stderr,"%s port %d on channel %d\n",net->connection[i].ip,
-                                                     net->connection[i].port,i);
+          dprintf(event->outfd,"[network] established connection to ");
+          dprintf(event->outfd,"%s port %d on channel %d\n",
+                  net->connection[i].ip,net->connection[i].port,i);
           net->connection[i].status|=C_ESTABL;
 
         }
@@ -138,11 +139,13 @@ int network_manage_connection(t_net *net) {
 int network_connect(t_net *net,int channel) {
 
   if(net->connection[channel].status&C_IN_USE) {
-    fprintf(stderr,"[network] connect failed, channel %02d in use\n",channel);
+    dprintf(event->outfd,"[network] connect failed, channel %02d in use\n",
+            channel);
     return N_E_IN_USE;
   }
   if(!(net->connection[channel].status&C_INFO_A)) {
-    fprintf(stderr,"[network] connect failed, missing configuration for channel %02d\n",channel);
+    dprintf(event->outfd,
+            "[network] connect failed, missing config for chan %02d\n",channel);
     return N_E_NO_INFO;
   }
 
@@ -154,7 +157,8 @@ int network_connect(t_net *net,int channel) {
 int network_close(t_net *net,int channel) {
 
   if(!(net->connection[channel].status&C_ESTABL)) {
-    fprintf(stderr,"[network] close failed, channel %02d not active\n",channel);
+    dprintf(event->outfd,"[network] close failed, channel %02d not active\n",
+            channel);
     return N_E_NC;
   }
   
@@ -175,8 +179,8 @@ int network_close_all(t_net *net) {
 int network_set_connection_info(t_net *net,int channel,char *ip,int port) {
 
   if(net->connection[channel].status&C_IN_USE) {
-    fprintf(stderr,"[network] set connection failed, channel %02d in use\n",
-                   channel);
+    dprintf(event->outfd,
+            "[network] set connection failed, channel %02d in use\n",channel);
     return N_E_IN_USE;
   }
 
@@ -226,12 +230,15 @@ int network_manage_incoming(t_net *net) {
       strncpy(net->connection[channel].ip,inet_ntoa(addr.sin_addr),IP_DIGITS);
       net->connection[channel].port=ntohs(addr.sin_port);
       net->connection[channel].status=C_IN_USE|C_INFO_A|C_SOCKET|C_ESTABL;
-      fprintf(stderr,"[network] established connection from %s port %d on channel %d\n",net->connection[channel].ip,net->connection[channel].port,channel);
+      dprintf(event->outfd,
+              "[network] established connection from %s:%d, channel %d\n",
+              net->connection[channel].ip,net->connection[channel].port,
+              channel);
       return channel;
     }
   }
 
-  fprintf(stderr,"[network] maximum connections reached\n");
+  dprintf(event->outfd,"[network] maximum connections reached\n");
   return N_E_MAXC;
 }
  
@@ -287,10 +294,11 @@ int network_udp_listen_init(t_net *net) {
       perror("[network] setsockopt call (udp)");
       return N_ERROR;
     }
-    fprintf(stderr,"[network] reused address (udp)\n");
+    dprintf(event->outfd,"[network] reused address (udp)\n");
   }
 
-  fprintf(stderr,"[network] listening on port %d (udp)\n",net->l_udp_port);
+  dprintf(event->outfd,"[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)");
@@ -312,7 +320,7 @@ int network_udp_receive(t_net *net,int channel, unsigned char *data,int count) {
   }
 
   if(strncmp(net->connection[channel].ip,inet_ntoa(addr.sin_addr),IP_DIGITS)) {
-    fprintf(stderr,"[network] packet from unknown: %s\n",
+    dprintf(event->outfd,"[network] packet from unknown: %s\n",
             inet_ntoa(addr.sin_addr));
     return N_UDP_WRONG_SENDER;
   }