output to stder, added list.* api which is still in work

[my-code/api.git] / network / network.c

diff --git a/network/network.c b/network/network.c
index 053e309..2bd7ce3 100644 (file)
--- a/network/network.c
+++ b/network/network.c
@@ -11,7 +11,7 @@ int network_init(t_net *net) {
   struct sockaddr_in addr;
   int true;
  
-  puts("[network] initializing network ...");
+  fprintf(stderr,"[network] initializing network ...");
 
   memset(net->connection,0,MAX_CONNECTIONS*sizeof(t_connection));
   net->c_count=0;
@@ -35,7 +35,7 @@ int network_init(t_net *net) {
       perror("[network] setsockopt call");
       return N_ERROR;
     }
-    puts("[network] reused address");
+    fprintf(stderr,"[network] reused address");
   }
 
   if(listen(net->l_fd,MAX_LISTEN_QUEUE)==-1) {
@@ -43,8 +43,8 @@ int network_init(t_net *net) {
     return N_ERROR;
   }
 
-  printf("[network] listen on %s port %d\n",inet_ntoa(addr.sin_addr),
-                                          net->l_port);
+  fprintf(stderr,"[network] listen on %s port %d\n",inet_ntoa(addr.sin_addr),
+                                                    net->l_port);
 
   return N_SUCCESS;
 }
@@ -62,7 +62,7 @@ int network_shutdown(t_net *net) {
     return N_ERROR;
   }
 
-  puts("[network] shutdown");
+  fprintf(stderr,"[network] shutdown");
 
   return N_SUCCESS;
 }
@@ -88,7 +88,7 @@ int network_manage_connection(t_net *net) {
           perror("[network] close call");
           return N_E_CLOSE;
         }
-        printf("[network] connection %d closed\n",i);
+        fprintf(stderr,"[network] connection %d closed\n",i);
         net->connection[i].status=0;
       }
 
@@ -119,9 +119,9 @@ int network_manage_connection(t_net *net) {
             return N_E_CONNECT;
           }
 
-          printf("[network] established connection to ");
-          printf("%s port %d on channel %d\n",net->connection[i].ip,
-                                              net->connection[i].port,i);
+          fprintf(stderr,"[network] established connection to ");
+          fprintf(stderr,"%s port %d on channel %d\n",net->connection[i].ip,
+                                                     net->connection[i].port,i);
           net->connection[i].status|=C_ESTABL;
 
         }
@@ -138,12 +138,11 @@ int network_manage_connection(t_net *net) {
 int network_connect(t_net *net,int channel) {
 
   if(net->connection[channel].status&C_IN_USE) {
-    printf("[network] connect failed, channel %02d in use\n",channel);
+    fprintf(stderr,"[network] connect failed, channel %02d in use\n",channel);
     return N_E_IN_USE;
   }
   if(!(net->connection[channel].status&C_INFO_A)) {
-    printf("[network] connect failed, missing configuration for channel %02d\n",
-           channel);
+    fprintf(stderr,"[network] connect failed, missing configuration for channel %02d\n",channel);
     return N_E_NO_INFO;
   }
 
@@ -155,7 +154,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\n",channel);
+    fprintf(stderr,"[network] close failed, channel %02d not active\n",channel);
     return N_E_NC;
   }
   
@@ -176,7 +175,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) {
-    printf("[network] set connection failed, channel %02d in use\n",channel);
+    fprintf(stderr,"[network] set connection failed, channel %02d in use\n",
+                   channel);
     return N_E_IN_USE;
   }
 
@@ -226,13 +226,12 @@ 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;
-      printf("[network] established connection from %s port %d on channel %d\n",
-             net->connection[channel].ip,net->connection[channel].port,channel);
+      fprintf(stderr,"[network] established connection from %s port %d on channel %d\n",net->connection[channel].ip,net->connection[channel].port,channel);
       return channel;
     }
   }
 
-  puts("[network] maximum connections reached");
+  fprintf(stderr,"[network] maximum connections reached");
   return N_E_MAXC;
 }
  
@@ -288,10 +287,10 @@ int network_udp_listen_init(t_net *net) {
       perror("[network] setsockopt call (udp)");
       return N_ERROR;
     }
-    puts("[network] reused address (udp)");
+    fprintf(stderr,"[network] reused address (udp)");
   }
 
-  printf("[network] listening on port %d (udp)\n",net->l_udp_port);
+  fprintf(stderr,"[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)");
@@ -313,7 +312,8 @@ 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)) {
-    printf("[network] packet from unknown: %s\n",inet_ntoa(addr.sin_addr));
+    fprintf(stderr,"[network] packet from unknown: %s\n",
+            inet_ntoa(addr.sin_addr));
     return N_UDP_WRONG_SENDER;
   }