bugfixed !( stuff

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

diff --git a/src/network.c b/src/network.c
index c7425ef..66314f9 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -53,6 +53,12 @@ int network_init(t_net *net) {
 
 int network_shutdown(t_net *net) {
 
+  int channel;
+
+  for(channel=0;channel<MAX_CONNECTIONS;channel++)
+    if(net->connection[channel].status&C_SOCKET)
+      close(net->connection[channel].fd);
+
   if(close(net->l_fd)==-1) {
     perror("[network] close call");
     return N_ERROR;
@@ -90,14 +96,16 @@ int network_manage_connection(t_net *net) {
 
       if(net->connection[i].status&C_INFO_A) {
 
-        if(!net->connection[i].status&C_SOCKET) {
+        if(!(net->connection[i].status&C_SOCKET)) {
           if((net->connection[i].fd=socket(AF_INET,SOCK_STREAM,0))==-1) {
             perror("[network] socket call");
             return N_ERROR;
           }
+          net->connection[i].status|=C_SOCKET;
         }
 
-        if(!net->connection[i].status&C_ESTABL) {
+        if((!(net->connection[i].status&C_ESTABL))&&
+           (net->connection[i].status&C_SOCKET)) {
 
           memset(&addr,0,sizeof(struct sockaddr));
           addr.sin_family=AF_INET;
@@ -115,6 +123,7 @@ int network_manage_connection(t_net *net) {
 
           printf("[network] established connection to %s port %d on channel %d\n",
                  net->connection[i].ip,net->connection[i].port,i);
+          net->connection[i].status|=C_ESTABL;
 
         }
 
@@ -134,7 +143,7 @@ int network_manage_incoming(t_net *net) {
   int len;
 
   for(channel=0;channel<MAX_CONNECTIONS;channel++) {
-    if(!net->connection[channel].status&C_IN_USE) {
+    if(!(net->connection[channel].status&C_IN_USE)) {
       if((net->connection[channel].fd=accept(net->l_fd,
                                        (struct sockaddr *)&addr,
                                        &len))==-1) {
@@ -183,71 +192,3 @@ int network_receive(int fd,unsigned char *data,int datasize) {
 
   return count;
 }
-
-int send_info(int channel,t_net *net,char *name) {
-
-  char data[SEND_N_MAX];
-  int size;
-
-  size=strlen(name);
-
-  data[0]=SEND_N_NAME;
-  data[1]=size;
-  strncpy(data+2,name,size);
-  size+=2;
-
-  data[size]=SEND_N_G_CAP;
-  data[size+1]=sizeof(unsigned char);
-  data[size+1+sizeof(unsigned char)]=net->cap;
-  size+=(sizeof(unsigned char)+2);
-
-  data[size]=SEND_N_AV_CAP;
-  data[size+1]=sizeof(unsigned short);
-  data[size+1+sizeof(unsigned short)]=net->avcap;
-  size+=(sizeof(unsigned short)+2);
-
-  if(network_send(net->connection[channel].fd,data,size)==N_ERROR) {
-    puts("[network] send_info failed");
-    return N_ERROR;
-  }
-
-  return N_SUCCESS;
-}
-
-int receive_info(int channel,t_net *net) {
-
-  char data[CHAR_N_UNAME+2];
-  int count,length;
-
-  count=0;
-
-  if((length=network_receive(net->connection[channel].fd,
-                             data,SEND_N_MAX))==N_ERROR) {
-    puts("[network] receive_info failed");
-    return N_ERROR;
-  }
-
-  while(length-count) {
-    switch(data[count]) {
-      case SEND_N_NAME:
-        strncpy(net->connection[channel].name,&data[count+2],data[count+1]);
-        net->connection[channel].name[(int)data[count+2]]='\0';
-        count+=(data[count+2]+2);
-        break;
-      case SEND_N_G_CAP:
-        net->connection[channel].cap=data[count+4];
-        count+=(sizeof(unsigned char)+2);
-        break;
-      case SEND_N_AV_CAP:
-        net->connection[channel].avcap=data[count+3]<<8;
-        net->connection[channel].avcap|=data[count+4];
-        count+=(sizeof(unsigned short)+2);
-        break;
-      default:
-        puts("[network] receive_info, unknown character");
-        return N_ERROR;
-    }
-  }
-    
-  return N_SUCCESS;
-}