Changeset 8 for trunk/src

Timestamp:

10/20/05 15:05:40 (17 years ago)

Author:

andreu

Message:

second RENETCOL CVS Integration

Location:

trunk/src

Files:

• Makefile.in (added)
• V9Header_mgmt.c (modified) (1 diff)
• headers_mgmt.c (modified) (2 diffs)
• headers_mgmt.h (modified) (1 diff)
• msg_mgmt.c (modified) (2 diffs)
• remote_output.c (modified) (4 diffs)
• remote_output.h (modified) (3 diffs)
• renetcol.c (modified) (12 diffs)
• renetcol.h (modified) (3 diffs)
• renetcolSender.c (modified) (7 diffs)
• renetcolSender.h (modified) (2 diffs)
• rules.txt (modified) (3 diffs)
• rules_mgmt.c (modified) (26 diffs)

trunk/src/V9Header_mgmt.c

@@ -165 +165 @@
 /*   if (pcktPtr->ipH->length != 20+8+24+(pcktPtr->netflow_header->nombre_flows*48)) */
 /*     { */
-      /*      syslog(LOG_INFO,"IP length (%u), UDP length (%u) and netflow length (%u) differents",
-       *              pcktPtr->ipH->length,pcktPtr.entete_udp.longueur,
-              (pcktPtr->netflow_header->nombre_flows*48)); */
+/*       syslog(LOG_INFO,"IP length (%u), UDP length (%u) and netflow length (%u) differents", */
+/*           pcktPtr->ipH->length,pcktPtr.entete_udp.longueur, */
+/*           (pcktPtr->netflow_header->nombre_flows*48)); */
 /*       return(1); */
 /*     } */

trunk/src/headers_mgmt.c

@@ -98 +98 @@
               longCmp) == NULL ) 
     {
-      syslog(LOG_INFO,"Router Address not registered : %lu.%lu.%lu.%lu)",
-             (pP->ipH->srcAdd>>24),
-             (pP->ipH->srcAdd<<8>>24),
-             (pP->ipH->srcAdd<<16>>24),
-             (pP->ipH->srcAdd<<24>>24));
-      return(1);
+      return(2);
     }
   return(0);
@@ -137 +132 @@
  */
 unsigned short 
-checkUdpHeader(DatagramPtr pckt)
+checkUdpHeader(DatagramPtr pckt, int regRouter, unsigned short receptPort )
 {
-  if(pckt->udp_header->dstPort != 9999)
+  if(pckt->udp_header->dstPort != receptPort)
     {
-/*       syslog(LOG_INFO,"Wrong destination port (%u)", */
-/*           pckt.udp_header.port_destination); */
+      if (regRouter == 0){
+        syslog(LOG_INFO,"Wrong destination port (%u)",
+               pckt->udp_header->dstPort);
+        return (1);
+      }
+      return (1);
+    }else{
+      if (regRouter == 2)
+        {
+          syslog(LOG_INFO,"Router Address not registered : %lu.%lu.%lu.%lu)",
+                 (pckt->ipH->srcAdd>>24),
+                 (pckt->ipH->srcAdd<<8>>24),
+                 (pckt->ipH->srcAdd<<16>>24),
+                 (pckt->ipH->srcAdd<<24>>24));
+          return (1);
+        }
+      return (0);
     }
-  if(pckt->udp_header->length > 1472)
-    {
-      syslog(LOG_INFO,"UDP length > 1472");
-      return(1);
-    }
+/*   if(pckt->udp_header->length > 1472) */
+/*     { */
+/*       syslog(LOG_INFO,"UDP length > 1472"); */
+/*       return(1); */
+/*     } */
   return(0);
 }

trunk/src/headers_mgmt.h

@@ -63 +63 @@
 unsigned short checkIpHeader(DatagramPtr, unsigned long *, int);
 unsigned short getUdpHeader(DatagramPtr, unsigned char *);
-unsigned short checkUdpHeader(DatagramPtr);
+unsigned short checkUdpHeader(DatagramPtr, int, unsigned short);
 #endif /* HEADERS_MGMT_H */

trunk/src/msg_mgmt.c

@@ -71 +71 @@
       syslog(LOG_INFO,"The IPC queue is full, I don't wait");
     } else {
-      perror ("msgsnd"); /* FIXME errno to syslog */
+      syslog(LOG_ERR,"msgsnd : %s", strerror(errno)); 
       exit(1);
     }
@@ -88 +88 @@
     syslog(LOG_INFO,"msgrcv : Internal system call");
   } else {
-    perror ("msgrcv");
+    syslog (LOG_ERR,"msgrcv : %s", strerror(errno));
     exit(1);
   }

trunk/src/remote_output.c

@@ -31 +31 @@
 printHostDef(RemoteHostPtr rHPtr)
 {
+  char buf[256];
   fprintf(stderr, " socket : %d\n", rHPtr->sockId);
-  fprintf(stderr, " address : %s:%u\n", 
-          inet_ntoa(rHPtr->hostAddressPtr->sin_addr), 
-          ntohs(rHPtr->hostAddressPtr->sin_port));
+  switch (rHPtr->hostAddressPtr->ss_family){
+  case AF_INET:
+    fprintf(stderr, " address : %s\n", 
+            inet_ntop(rHPtr->hostAddressPtr->ss_family,
+                      &((struct sockaddr_in *)rHPtr->hostAddressPtr)->sin_addr,
+                      buf, 256));
+    break;
+  case AF_INET6:
+    fprintf(stderr, " address : %s\n",
+            inet_ntop(rHPtr->hostAddressPtr->ss_family,
+                      &((struct sockaddr_in6 *)rHPtr->hostAddressPtr)->sin6_addr,
+                      buf, 256));
+    break;
+  }
 }
 
@@ -43 +55 @@
 freeRemoteHost(RemoteHostPtr rHPtr)
 {
-  if (rHPtr->msgIpv4){
-    free(rHPtr->msgIpv4);
-    rHPtr->msgIpv4 = NULL;
-  }
-  if (rHPtr->msgIpv6){
-    free(rHPtr->msgIpv6);
-    rHPtr->msgIpv6 = NULL;
-  }
-  if (rHPtr->msgXcast){
-    free(rHPtr->msgXcast);
-    rHPtr->msgXcast = NULL;
+  if (rHPtr->hostAddressPtr){
+    free(rHPtr->hostAddressPtr);
+    rHPtr->hostAddressPtr = NULL;
   }
   free(rHPtr);
@@ -99 +103 @@
  */
 int 
-create_socket(char *remote_address, int remote_port, struct sockaddr_in *addr)
+create_socket(char *remote_address, char *remote_port, struct sockaddr_storage *addr)
 {
   int s;
-  s = socket(AF_INET, SOCK_DGRAM, 0);
+  struct addrinfo index, *res=NULL;
+  int code;
+
+  memset(&index, 0, sizeof index);
+  index.ai_family = AF_UNSPEC;
+  index.ai_socktype = SOCK_DGRAM;
+  index.ai_protocol = IPPROTO_UDP;  
+  code = getaddrinfo(remote_address, remote_port, &index, &res);
+  if (code!=0) {
+    syslog(LOG_ERR, "Error, %s : %s", gai_strerror(code), remote_address);
+    return 0;
+  }
+  s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
   if (s < 0)
     {
-      perror("opening datagram socket");
-      exit(1);
+      syslog(LOG_ERR,"Error during opening datagram socket %s", 
+             strerror(errno));
+      return 0;
     }
-  memset(addr, 0, sizeof(struct sockaddr_in));
-  addr->sin_addr.s_addr = inet_addr(remote_address); /* FIXME obsolete */
-  addr->sin_family = AF_INET;
-  addr->sin_port = htons(remote_port);
+  switch (res->ai_family){
+  case AF_INET6:
+    addr->ss_family = AF_INET6;
+    ((struct sockaddr_in6 *)addr)->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
+    ((struct sockaddr_in6 *)addr)->sin6_port = 
+      htons((unsigned short)atoi(remote_port));
+    break;
+  case AF_INET:
+    ((struct sockaddr_in *)addr)->sin_addr = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
+    addr->ss_family = AF_INET;
+    ((struct sockaddr_in *)addr)->sin_port = 
+      htons((unsigned short)atoi(remote_port));
+    break;
+  case AF_UNSPEC:
+    break;
+  }
+  freeaddrinfo(res);
   return s;
 }
@@ -120 +150 @@
 int 
 sendMessage(int socket_number, unsigned char *msg, int msgSize,
-            struct sockaddr_in *addr)
+            struct sockaddr_storage *addr)
 {
   int s;
+  socklen_t addrlen = sizeof(struct sockaddr_storage);
   if ((s=sendto(socket_number, msg, (size_t)msgSize, 0, 
-                (struct sockaddr *)addr,
-                sizeof(struct sockaddr_in))) < 0)
+                (struct sockaddr *)addr, addrlen)) < 0)
     {
-      fprintf(stderr, "Error ******** : %d bytes sent\n", s);
-      perror("sending packet");
+      syslog(LOG_ERR, "Error: %d bytes sent, %s",
+             s, strerror(errno));
       exit(1);
     }

trunk/src/remote_output.h

@@ -28 +28 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <syslog.h>
 #include <unistd.h>
 #include <arpa/inet.h>
@@ -38 +40 @@
 typedef struct RemoteHost {
   int sockId;
-  struct sockaddr_in *hostAddressPtr; 
-  char *msgIpv4;
-  char *msgIpv6;
-  char *msgXcast;
+  struct sockaddr_storage *hostAddressPtr; 
   RemoteHostPtr next;
 } RemoteHostType;
@@ -64 +63 @@
 void freeDb(DbPtr);
 void freeFile(FilePtr);
-int create_socket(char *, int, struct sockaddr_in *);
-int sendMessage(int, unsigned char *, int, struct sockaddr_in *);
+int create_socket(char *, char *, struct sockaddr_storage *);
+int sendMessage(int, unsigned char *, int, struct sockaddr_storage *);
 
 #endif /* REMOTE_OUTPUT_H */

trunk/src/renetcol.c

@@ -29 +29 @@
 char *configFileName; 
 char *prefixV4FileName; 
-sigjmp_buf contextSigalrm; 
-struct sigaction myAction;  /* for timer */ 
-volatile sig_atomic_t isAlarmUp = 0;
+struct sigaction myAction;
+sigjmp_buf contextSigalrm;
+/* struct sigaction myAction;  for timer */ 
+volatile sig_atomic_t sigusr1Up = 0;
 /* V9 */
 unsigned short offsetV9 = 0;
@@ -58 +59 @@
 RuleDefPtr rulesAddress[FIELD_TYPE_NUMBER+1][MAX_RULES_PER_FIELD];
 RuleDefPtr *rulesAddressPtr;
+int reInitConf = 0;
 /* ENDV9 */
 static unsigned long datagramNumber;
@@ -69 +71 @@
 static int rcv;
 static int sockBufSize = SOCKET_BUFFER_SIZE;            
-static unsigned short flowNumber;
+/* static unsigned short flowNumber; */
 static unsigned short receptPort = RECEPTION_PORT;
 static unsigned char *ptr_buffer;
@@ -91 +93 @@
     exit(1);
   }
+
   openlog(argv[0], LOG_PID, LOG_USER);
 
@@ -101 +104 @@
 
   initCache();
+  fprintf(stderr, "reading the routers list\n");
   routerNb = getRegisteredRouters(configFileName, &sortedRouterList[0], 
                                   &indexedRouterList[0]);
+  fprintf(stderr, "reading the IPv4 prefix\n");
   if ( getPrefixV4(prefixV4FileName, &prefixV4Tab[0]) < 1){
     fprintf(stderr, "Error during prefix v4 reading\n");
@@ -108 +113 @@
   }
   rulesListPtr = NULL;
+  fprintf(stderr, "reading the rules\n");
   rulesListPtr = getLightRules(rulesListPtr, rulesFileName);
   tmp = rulesListPtr;
@@ -115 +121 @@
     }
   }
+
+  fprintf(stderr, "I become a deamon, next messages via syslogd.\n");
+  if (fork () != 0)
+    exit (0);
+  if (setsid() == -1){
+    exit(4);
+  }
+
+  myAction.sa_handler = sigusr1Mgmt;
+  myAction.sa_flags = SA_RESTART;
+  sigemptyset (&(myAction.sa_mask));
+  sigaddset (&(myAction.sa_mask), SIGALRM);
+  sigaction (SIGUSR1, &myAction, NULL);
+
   setCache(rulesListPtr);
   rulesAddressPtr = (RuleDefPtr *)rulesAddress;
@@ -121 +141 @@
   myKey = createKey(argv[0]);
   myQueue = createQueue(myKey);
+  sendMyPid(myQueue);
 
   /* INIT THE CURRENTS VARIABLES*/
@@ -146 +167 @@
   datagramNumber =0;
 
-  /* INIT FROM CONFS FILES*/
-  /*initConf();*/
-
   /* TIME */
   now = time((time_t *)NULL);
@@ -156 +174 @@
   fprintf(stderr, "END\n");
   return (0);
+}
+
+/*
+ *
+ */
+void sendMyPid(int queueID)
+{
+  msgType myMsg;
+  char *msgTextIndex;
+  unsigned short tplMsgType = 12;
+  pid_t myPID;
+  
+  myPID = getpid();
+  msgTextIndex = mempcpy(mempcpy(myMsg.text,
+                                 &tplMsgType,
+                                 sizeof (unsigned short)
+                                 ),
+                         &myPID,
+                         sizeof(pid_t)
+                         );
+  myMsg.type = 1;
+  msgSend(queueID, myMsg);
+}
+
+/*
+ *
+ */
+void sendReadRulesSignal(int queueID)
+{
+  msgType myMsg;
+  char *msgTextIndex;
+  unsigned short tplMsgType = 13;
+  
+  msgTextIndex = mempcpy(myMsg.text,
+                         &tplMsgType,
+                         sizeof (unsigned short)
+                         );
+  myMsg.type = 1;
+  msgSend(queueID, myMsg);
+}
+
+/*
+ *
+ */
+void sigusr1Mgmt(int num)
+{
+  sigusr1Up = 1;
+}
+
+/*
+ *
+ */
+void 
+initRule()
+{
+  RulesPtr tmp = NULL;
+  initCache();
+  tmp = rulesListPtr;
+  for ( ; tmp; tmp=tmp->next) {
+    rulesListPtr = delRule(tmp, rulesListPtr);
+  }
+  rulesListPtr = NULL;
+  rulesListPtr = getLightRules(rulesListPtr, rulesFileName);
+  tmp = rulesListPtr;
+  for ( ; tmp; tmp=tmp->next) {
+    if (tmp->type != 2) {
+      rulesListPtr = delRule(tmp, rulesListPtr);
+    }
+  }
+  tmp = NULL;
+  initCache();
+  setCache(rulesListPtr);
+  sendReadRulesSignal(myQueue);
 }
 
@@ -223 +314 @@
   unsigned short shift;
   short version = 0;
+  int regRouter = 0;
+  
   do {
+    if (sigusr1Up == 1){
+      sigusr1Up = 0;
+      initRule();
+    } 
     socketReading();
     getIpHeader(pcktPtr, ptr_buffer);
-    checkIpHeader(pcktPtr, &sortedRouterList[0], routerNb);
+    regRouter = checkIpHeader(pcktPtr, &sortedRouterList[0], routerNb);
     getUdpHeader(pcktPtr, ptr_buffer);
-    checkUdpHeader(pcktPtr);
+    checkUdpHeader(pcktPtr, regRouter, receptPort);
     
     switch( version = 
@@ -237 +334 @@
       break;
     case 5:
-      checkNetFlowHeader(pcktPtr);
+/*       if ((currentRouterPtr=notExistRouter(routersListPtr,  */
+/*                                         pcktPtr->ipH->srcAdd))==NULL) { */
+/*      routersListPtr = addRouter(routersListPtr,  */
+/*                                 pcktPtr->ipH->srcAdd,  */
+/*                                 (unsigned long) 0); */
+/*      currentRouterPtr = routersListPtr; */
+/*       } */
+/*       currentFlowsetNumber = 0; */
+/*       shift = 0; */
+/*       while ((currentFlowsetNumber < currentHeaderV9Ptr->count)) { */
+/*      curTplFlSetPtr = NULL; */
+/*      currentFlowsetId=getFlowsetId(currentFlowsetNumber,  */
+/*                                    offsetV9Ptr, ptr_buffer); */
+        /* remplacer par creation du template v5 si pas deja fait */
+/*      shift = checkTemplateFlowSet(currentRouterPtr, offsetV9Ptr,  */
+/*                                   ptr_buffer, currentHeaderV9Ptr, */
+/*                                   curTplFlSetPtr, */
+/*                                   currentFlowsetNumberPtr, */
+/*                                   myQueue); */
+        /*        showAllTplFlSet();  */
+/*      shift = checkDataFlowSet(shift, currentRouterPtr, */
+/*                               currentHeaderV9Ptr, offsetV9Ptr, */
+/*                               ptr_buffer, currentFlowsetNumberPtr, */
+/*                               currentFlowsetIdPtr, pcktPtr, */
+/*                               rulesAddressPtr, rulesListPtr, */
+/*                               myQueue); */
+/*       } */
       break;
     case 9:

trunk/src/renetcol.h

@@ -23 +23 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+
+#define _GNU_SOURCE
 
 #include <unistd.h>
@@ -62 +64 @@
 
 #define RECEPTION_ADDRESS "" /* your collector address like 10.0.0.90 */
-#define RECEPTION_PORT 9990 /* your collector port to recept netflow export */
+#define RECEPTION_PORT 9999 /* your collector port to recept netflow export */
 
 #define TIME_OUT 300 /*MAJSCH*/
@@ -74 +76 @@
 void initCache();
 void waitingRoom();
-void catchReinit(int);
-void initConf();
+void initRule();
+void sigusr1Mgmt(int);
+void sendMyPid(int);
+void sendReadRulesSignal(int);
 void initStream();
 void catchAlarm(int);

trunk/src/renetcolSender.c

@@ -32 +32 @@
 RulesPtr rulesListPtr;
 char *rulesFileName;
-
+char *remoteHost;
 int i=0;
 int j=0;
@@ -42 +42 @@
 RulesPtr tmp = NULL;
 
+/*
+ * todo
+ */
+int
+todo(int sock, char *host)
+{
+  char buffer[256];
+  int length;
+  FILE *ruleFile;
+  FILE *tmpFile;
+  char field[4];
+  char port[6];
+  char value[40];
+  char operator[2];
+  char lines[256][256];
+  char line[256];
+  char lineCopy[256];
+  char strTok[1];
+  char strName[100];
+  int cpt = 0;
+  int i = 0;
+  int ruleToDelete = 0;
+
+  while (1){
+    length = read(sock, buffer, 256);
+    if (length < 0){
+      syslog(LOG_ERR, " read : %s", strerror(errno));
+      return 1;
+    }
+    if (length == 0)
+      break;
+    buffer[length] = '\0';
+    if (strncmp("DELETE", buffer, 6)==0){
+      if (!(ruleFile = fopen(rulesFileName, "r"))) {
+        syslog (LOG_ERR, "error during %s opening\n", rulesFileName);
+        exit(1);
+      } else {
+        while ( fgets(line, 256, ruleFile) != 0) {
+          strncpy(lineCopy, line, 256);
+          if (strncmp("N", lineCopy, 1) == 0){
+            ruleToDelete = 0;
+            if (sscanf(lineCopy, "%1s %s\n",
+                       strTok,        
+                       strName) != 0) {
+              if (strncmp(strName, host, strlen(host)) != 0){
+                strncpy(lines[cpt], lineCopy, strlen(lineCopy));
+              } else {
+                ruleToDelete = 1;
+              }
+            } else {
+              syslog (LOG_ERR, "error in file %s at line %d", 
+                      rulesFileName, cpt);
+              return 1;
+            }
+          } else {
+            if (ruleToDelete==0) {
+              strncpy(lines[cpt], lineCopy, strlen(lineCopy));
+            }
+          }
+          cpt++;
+        }
+        fclose(ruleFile);
+        if (!(tmpFile = fopen("rules.tmp", "w"))) {
+          syslog (LOG_ERR, "error during %s opening", "rules.tmp");
+          return 1;
+        } else {
+          for (i=0; i<cpt; i++){
+            fprintf(tmpFile, "%s", lines[i]);
+          }
+          fclose(tmpFile);
+          if (remove("rules.txt")!=0){
+            syslog(LOG_ERR, "rules.txt remove pb: %s", strerror(errno));
+            return 1;
+          }
+          if (rename("rules.tmp", "rules.txt")!=0){
+            syslog(LOG_ERR, "rename file pb: %s", strerror(errno));
+            return 1;
+          }
+        }
+      }
+    } else {
+      if (sscanf(buffer, "%s %s %1s %s\n",
+                 port,
+                 field,
+                 operator,
+                 value) == 0) {
+        syslog (LOG_ERR, "error in recept rule: %s", buffer);
+        return 1;
+      }
+      if (!(ruleFile = fopen(rulesFileName, "a"))) {
+        syslog (LOG_ERR, "error during %s opening", rulesFileName);
+        return 1;
+      } else {
+        fprintf(ruleFile, "N %s\n", host);
+        fprintf(ruleFile, "O socket %s %s\n", host, port);
+        fprintf(ruleFile, "C %s %s %s\n", field, operator, value);
+        fclose(ruleFile);
+      }
+    }
+  }
+  close(sock);
+  return 0;
+}
+
+/*
+ * tcpServer
+ */
+int
+tcpServer ()
+{
+  struct addrinfo index, *result;
+  struct sockaddr_storage listenAddress;
+  socklen_t listenAddressLen;
+  int listenSock;
+  int returnCode;
+  pid_t renetcolPID = 0;
+  FILE *pidFile;
+  unsigned pid;
+  char line[256];
+  int status;
+
+  memset(&index, 0, sizeof index);
+  index.ai_flags = AI_PASSIVE;
+  index.ai_family = AF_UNSPEC;
+  index.ai_socktype = SOCK_STREAM;
+  index.ai_protocol = IPPROTO_TCP;
+  returnCode = getaddrinfo(NULL, RECEPT_PORT, &index, &result);
+  if (returnCode != 0) {
+    syslog(LOG_ERR, "getaddrinfo : %s", strerror(errno));
+    return -1;
+  }
+  listenAddressLen = result->ai_addrlen;
+  memcpy(&listenAddress, result->ai_addr, (size_t) listenAddressLen);   
+  listenSock = socket(result->ai_family, result->ai_socktype,
+                      result->ai_protocol);
+  if ( listenSock < 0) {
+    syslog(LOG_ERR, "socket : %s", strerror(errno));
+    freeaddrinfo(result);
+    return -1;
+  }
+  freeaddrinfo(result);
+  
+  {
+    int on = 1;
+    setsockopt(listenSock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof on);
+  }
+  if (bind(listenSock, (struct sockaddr *) &listenAddress,
+           listenAddressLen) < 0 ||
+      listen(listenSock, 8) < 0) {
+    syslog(LOG_ERR, "bind or listen : %s", strerror(errno));
+    return -1;
+  }
+  for (;;) {            
+    int clientSock;
+    struct sockaddr_storage clientAddress;
+    socklen_t clientAddressLen;
+    char host[NI_MAXHOST];
+    
+    memset(&clientAddress, 0, sizeof clientAddress);
+    clientAddressLen = (socklen_t) sizeof clientAddress;
+    
+    if ((clientSock = 
+         accept(listenSock, (struct sockaddr *)
+                &clientAddress,
+                &clientAddressLen)) < 0) {
+      continue;
+    }
+    if (clientAddress.ss_family != AF_INET &&
+        clientAddress.ss_family != AF_INET6) {
+      close(clientSock);
+      continue;
+    }
+    if (getnameinfo((struct sockaddr *) &clientAddress,
+                    clientAddressLen, host, sizeof host,
+                    NULL, (size_t) 0, 0) == 0) {
+      syslog(LOG_INFO, 
+             "New connection from %s", host);
+    }
+    remoteHost = host;
+    switch (fork ()) {
+    case 0 :
+      close (listenSock);
+      todo(clientSock, remoteHost);
+      if (!(pidFile = fopen("/tmp/pidrenetcol.tmp", "r"))) {
+        syslog (LOG_ERR, "error during /tmp/pidrenetcol.tmp opening : %s\n",
+                strerror(errno));
+        exit(1);
+      } else {
+        fgets(line, 256, pidFile);
+        if (sscanf(line, "%u", &pid)==0)
+          syslog(LOG_ERR,"sscanf : %s", strerror(errno));
+        renetcolPID = pid;
+      }
+      fclose(pidFile);
+      if (renetcolPID==0){
+        syslog(LOG_INFO, "PID null");
+      }else{
+        if (kill(renetcolPID, SIGUSR1)<0)
+          syslog(LOG_ERR, "I can't send SIGUSR1 to renetcol process : %s",
+                 strerror(errno));
+      }
+      exit (0);
+    case -1 :
+      syslog (LOG_ERR, "fork : %s", strerror(errno));
+      return (-1);
+    default :
+      close (clientSock);
+      if (waitpid( -1, &status, WNOHANG)==-1){
+        syslog(LOG_ERR, "waitpid : %s", strerror(errno));
+        exit(1);
+      }
+    }
+  }
+  return (0);
+}
+
+/*
+ *
+ */
+void initConfSender(){
+  RulesPtr tmp = NULL;
+
+  tmp = rulesListPtr;
+  for ( ; tmp; tmp=tmp->next) {
+    rulesListPtr = delRule(tmp, rulesListPtr);
+  }
+  rulesListPtr = NULL;
+  rulesListPtr = getRules(rulesListPtr, rulesFileName);
+  tmp = rulesListPtr;
+  for ( ; tmp; tmp=tmp->next) {
+    if (tmp->type != 2) {
+      rulesListPtr = delRule(tmp, rulesListPtr);
+    }
+  }
+  tmp = NULL;
+}
+
 /* 
  * Main
@@ -51 +288 @@
   int s=0;
   unsigned short rulesID = 0;
+  FILE *pidFile;
+  pid_t renetcolPID = 0;
 
   if ( argc != 4) {
     fprintf (stderr,
-             "%s: Usage: %s <key> <msg type> <rules file>\n exp: %s colnetv9 1 rules.txt\n", 
+             "%s: Usage: %s <key> <msg type> <rules file>\n exp: %s renetcol 1 rules.txt\n", 
              argv[0], argv[0], argv[0]);
     exit(1);
   }
+  if (sscanf (argv[2], "%ld", &type) != 1){
+    fprintf(stderr, "Invalid type\n");
+    exit(1);
+  }  
+
+/*   chdir ("/"); */
+  fprintf(stderr, "I become a deamon, next messages via syslogd.\n");
+  if (fork () != 0)
+    exit (0);
+  if (setsid() == -1){
+    exit(4);
+  }
+/*   for (i = 0; i < FOPEN_MAX; i ++) */
+/*     close (i); */
 
   openlog(argv[0], LOG_PID, LOG_USER);
@@ -66 +319 @@
   /* we delete rules which are not type socket */
   tmp = rulesListPtr;
-  for ( ; tmp->next; tmp=tmp->next) {
+  for ( ; tmp; tmp=tmp->next) {
     if (tmp->type != 2) {
       rulesListPtr = delRule(tmp, rulesListPtr);
@@ -72 +325 @@
   }
   tmp = NULL;
-  printRule(rulesListPtr);
-
   /* get IPC messages queue */
   if ((myKey = ftok(argv[1], 0))== -1){
-    perror("ftok");
+    syslog(LOG_ERR, "ftok : %s", strerror(errno));
     exit(1);
   }
   if ((myQueue = msgget(myKey, 0)) == -1){
-    perror("msgget");
+    syslog(LOG_ERR, "msgget : %s", strerror(errno));
     exit(1);
   }
-  if (sscanf (argv[2], "%ld", &type) != 1){
-    fprintf(stderr, "Invalid type\n");
-    exit(1);
-  }
+  
+  /* launch a TCP server to listen remote clients */
+  switch (fork ()) {
+  case 0 : /* son */
+    tcpServer();
+  case -1 :
+    syslog (LOG_ERR, "fork : %s", strerror(errno));
+    return (-1);
+  default : /* father */
+    break;
+  }
+  /* loop on the message queue */
   while (1) {
     i=0;
@@ -112 +371 @@
         }
       }
+    } else if (12==*((unsigned short*)&buffer2)){ 
+      buffer4[0]= *(myText+i); i++;
+      buffer4[1]= *(myText+i); i++;
+      buffer4[2]= *(myText+i); i++;
+      buffer4[3]= *(myText+i); i++;
+      renetcolPID = *((pid_t *)&buffer4);
+      if (!(pidFile = fopen("/tmp/pidrenetcol.tmp", "w"))) {
+        syslog (LOG_ERR, "error during /tmp/pidrenetcol.tmp opening : %s\n",
+                strerror(errno));
+        exit(1);
+      } else {
+        if (fprintf(pidFile, "%u", renetcolPID)==0)
+          syslog(LOG_ERR,"fprintf : %s", strerror(errno));
+      }
+      fclose(pidFile);
+    } else if (13==*((unsigned short*)&buffer2)){ 
+      initConfSender();
     } else {
       syslog(LOG_INFO, "Msg type undefined ??");
@@ -117 +393 @@
     i=0;
   }
+  return(0);
 }

trunk/src/renetcolSender.h

@@ -30 +30 @@
 #include <errno.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
 #include <signal.h>
 #include <setjmp.h>
@@ -38 +41 @@
 #include "rules_mgmt.h"
 #include "remote_output.h"
+
+#define RECEPT_PORT "52571"
+#define VAR_SHARED_SIZE 4
+         
+typedef union semun
+{
+  int     val;               
+  struct  semid_ds *buf;     
+  unsigned short *array;             
+} semunType;
+
+typedef struct glob {
+  int semId;
+  int lg;
+  pid_t renetcolPID;
+} globType;
+
+int todo(int, char*);
+int tcpServer ();
+void initConfSender();

trunk/src/rules.txt

@@ -9 +9 @@
 # R: field ID to record (not present in this release), if no record all fields
 #    are recorded
+# field IDs can be found on the following url:
+# http://www.cisco.com/en/US/tech/tk648/tk362/technologies_white_paper09186a00800a3db9.shtml
+# in table 6
 
 # get all IPv6 flow seen by the collector, send it to a remote client
+# field 60 is the IP_PROTOCOL_VERSIO? 
 N test
 O socket 10.0.0.1 3234
 C 60 = 6
 
-# get all IPv4 flow, send it to a remote client
+# get all IPv4 flow of a host, send it to a remote client
+# field 8 is the IPv4_SRC_ADDR
 N test
 O socket 127.0.0.1 2222
-C 60 = 4
+C 8 = 192.68.0.1
 
 # get flows from one IPv6 address, send it to a remote client
@@ -24 +29 @@
 O socket 10.0.0.2 2222
 C 27 = 2001:620:0:4:203:baff:fe4c:d99b
-
-# get flows from one IPv6 address, send it to a remote client
-N test7
-O socket 10.0.0.3 2222
-C 8 = 193.49.159.10
 
 # This rule depends on functionnality not present in this beta release
@@ -47 +47 @@
 C 1 > 15 C 1 < 16
 
+N 141.renater.fr
+O socket 141.renater.fr 2222
+C 60 = 6

trunk/src/rules_mgmt.c

@@ -72 +72 @@
   if (rPtr!=NULL){
     fprintf(stderr, "\nid: %hu\n", rPtr->id);
+    if (rPtr->prev) { fprintf(stderr, "\nid prev: %hu\n", rPtr->prev->id);}
+    if (rPtr->next) { fprintf(stderr, "\nid next: %hu\n", rPtr->next->id);}
     fprintf(stderr, "Name: %s\n", rPtr->ruleName);    
 /*     puts (asctime (& rPtr->begin)); */
@@ -137 +139 @@
 {
   RulesPtr tmp = NULL;
-  if (rPtr->prev!=NULL) {
-    rPtr->prev->next = rPtr->next;
+  if (rPtr==firstrPtr) {
+    if (rPtr->next) {
+      tmp = rPtr->next;
+      tmp->prev = NULL;
+      freeRule(rPtr);
+      return tmp; 
+    }else{
+      freeRule(rPtr);
+      return NULL;
+    }
+  } else {
+    if (rPtr->prev->next) { rPtr->prev->next = rPtr->next;}
     if (rPtr->next) {rPtr->next->prev = rPtr->prev;}
     freeRule(rPtr);
     return firstrPtr;
-  } else {
-    if (rPtr->next) {
-      rPtr->next->prev = NULL;
-      tmp = rPtr->next;
-    }
-    freeRule(rPtr);
-    return tmp; 
-  }
-}
-
-RulesPtr 
+  }
+}
+
+RulesPtr
 getRules(RulesPtr rPtr, char *filename)
 {
   FILE *ruleFile;
   RulesPtr tmp = NULL;
+  RulesPtr tmp2 = NULL;
   time_t hour;
   char line[512];
@@ -168 +174 @@
   
   if (!(ruleFile = fopen(filename, "r"))) {
-    fprintf (stderr, "error during %s opening\n", filename);
+    syslog(LOG_ERR, "error during %s opening\n", filename);
     exit(1);
   }
@@ -184 +190 @@
                    strTok,        
                    strName) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -192 +198 @@
           tmp = (RulesPtr) malloc(sizeof(struct Rules));
           if (tmp==NULL) {
-            fprintf(stderr, "ERROR in malloc in getRule function\n");
+            syslog(LOG_ERR, "ERROR in malloc in getRule function\n");
             exit(1);
           } else {
@@ -202 +208 @@
             tmp->db = NULL;
             tmp->next = rPtr;
+            /* rPtr->prev = tmp; */
             tmp->prev = NULL;
           }
@@ -214 +221 @@
                    str1,
                    str2) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -244 +251 @@
       cptLine++;
     }
-    /*     if (rPtr!=NULL) { rPtr->prev = tmp;} */
     /*     tmp->prev = NULL; */
   }
-  return tmp;
+  tmp2 = tmp;
+  for ( ; tmp2; tmp2=tmp2->next) {
+    if (tmp2->next) {
+      tmp2->next->prev = tmp2;
+    } 
+  }
+  fclose(ruleFile);
+  return tmp; 
 }
 
@@ -255 +268 @@
   FILE *ruleFile;
   RulesPtr tmp = NULL;
+  RulesPtr tmp2 = NULL;
   time_t hour;
   char line[512];
@@ -266 +280 @@
   
   if (!(ruleFile = fopen(filename, "r"))) {
-    fprintf (stderr, "error during %s opening\n", filename);
+    syslog(LOG_ERR, "error during %s opening\n", filename);
     exit(1);
   }
@@ -282 +296 @@
                    strTok,        
                    strName) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -290 +304 @@
           tmp = (RulesPtr) malloc(sizeof(struct Rules));
           if (tmp==NULL) {
-            fprintf(stderr, "ERROR in malloc in getRule function\n");
+            syslog(LOG_ERR, "ERROR in malloc in getRule function\n");
             exit(1);
           } else {
@@ -312 +326 @@
                    str1,
                    str2) == 0) {
-          fprintf(stderr, "Error in file %s, line %d\n", 
+          syslog(LOG_ERR, "Error in file %s, line %d\n", 
                   filename, cptLine);
           exit(1);
@@ -332 +346 @@
       }
       if (strncmp("A", lineCopy, 1) == 0){
-        syslog(LOG_INFO,"Aggregation mode isn't yet implemented\n");
+        syslog(LOG_INFO,"Aggregation mode isn't yet implemented");
       }
       if (strncmp("R", lineCopy, 1) == 0){
@@ -339 +353 @@
       cptLine++;
     }
-    /*     if (rPtr!=NULL) { rPtr->prev = tmp;} */
-    /*     tmp->prev = NULL; */
-  }
+  }
+  tmp2 = tmp;
+  for ( ; tmp2; tmp2=tmp2->next) {
+    if (tmp2->next) {
+      tmp2->next->prev = tmp2;
+    } 
+  }
+  fclose(ruleFile);
   return tmp;
 }
@@ -348 +367 @@
 addFileDef(FilePtr fPtr, char *str1, char *str2)
 {
-  fprintf(stderr,"add file def: %s %s \n", str1, str2);
+/*   fprintf(stderr,"add file def: %s %s \n", str1, str2); */
   return NULL;
 }
@@ -358 +377 @@
   tmp = (RemoteHostPtr) malloc(sizeof(struct RemoteHost));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addRemoteHostDef function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addRemoteHostDef function");
     exit(1);
   } else {
-    tmp->hostAddressPtr = (struct sockaddr_in*)
-      malloc(sizeof(struct sockaddr_in));
+    tmp->hostAddressPtr = (struct sockaddr_storage*)
+      malloc(sizeof(struct sockaddr_storage));
     if (tmp->hostAddressPtr==NULL) {
-      fprintf(stderr, "ERROR in malloc in addRemoteHostDef function\n");
+      syslog(LOG_ERR, "ERROR in malloc in addRemoteHostDef function");
       exit(1);
     } else {
-      tmp->sockId = create_socket( str1, atoi(str2), tmp->hostAddressPtr);
+      if ((tmp->sockId=create_socket( str1, str2, tmp->hostAddressPtr))==0)
+        return NULL;
       tmp->next = rPtr;
     }
@@ -376 +396 @@
 DbPtr
 addDataBase(DbPtr dPtr, char *str1, char *str2){
-  fprintf(stderr,"add DB def: %s %s \n", str1, str2);
+  syslog(LOG_INFO,"DB output not in this release");
   return NULL;
 }
@@ -392 +412 @@
     unsigned short length;
     if (sscanf(fields, " %hu %hu ", &type, &length) == 0) {
-      fprintf(stderr, 
-              "Errors in definition of fields to record: wrong syntax\n");
+      syslog(LOG_ERR, 
+              "Errors in definition of fields to record: wrong syntax");
       exit(1);
     } else {
@@ -424 +444 @@
     tmp = (RuleDefPtr) malloc(sizeof(struct RuleDef));
     if (tmp==NULL) {
-      fprintf(stderr, "ERROR in malloc in addRuleDef function\n");
+      syslog(LOG_ERR, "ERROR in malloc in addRuleDef function");
       exit(1);
     } else { 
       if (sscanf(fields, " %hu %1s %s ", &ft, operator, value) == 0) {
-        fprintf(stderr, "Errors in Tests definition : wrong syntax\n");
+        syslog(LOG_ERR, "Errors in Tests definition : wrong syntax");
         exit(1);
       }
@@ -456 +476 @@
       } else {
         syslog(LOG_INFO, 
-                "You can't compare the field <%hu> currently, sorry\n",
+                "You can't compare the field <%hu> in this release, sorry",
                 ft); 
       }
@@ -479 +499 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addAddress function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addAddress function");
     exit(1);
   } else {
     if (sscanf(val, "%hu.%hu.%hu.%hu", &v0, &v1, &v2, &v3) == 0) {
-      fprintf(stderr, "Errors in Tests definition : wrong IPv4 value\n");
+      syslog(LOG_ERR, "Errors in Tests definition : wrong IPv4 value");
       exit(1);
     }
@@ -507 +527 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addV6Address function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addV6Address function");
     exit(1);
   } else {
@@ -513 +533 @@
     switch(result) {
     case 0 : 
-      printf(" inet_pton : Invalid IPv6 Address\n");
+      syslog(LOG_ERR," inet_pton : Invalid IPv6 Address");
       exit(1);
       break;
     case -1: 
-      printf(" inet_pton : AF unknown \n");
+      syslog(LOG_ERR," inet_pton : AF unknown");
       exit(1);
       break;
@@ -540 +560 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addValue function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addValue function");
     exit(1);
   } else {
     if (sscanf(val, "%s", value) == 0) {
-      fprintf(stderr, "Errors in Tests definition : wrong short value\n");
+      syslog(LOG_ERR, "Errors in Tests definition : wrong short value");
       exit(1);
     }   
@@ -562 +582 @@
   tmp = (ValuesPtr) malloc(sizeof(struct Values));
   if (tmp==NULL) {
-    fprintf(stderr, "ERROR in malloc in addValue function\n");
+    syslog(LOG_ERR, "ERROR in malloc in addValue function");
     exit(1);
   } else {
     if (sscanf(val, "%s", value) == 0) {
-      fprintf(stderr, "Errors in Tests definition : wrong char value\n");
+      syslog(LOG_ERR, "Errors in Tests definition : wrong char value");
       exit(1);
     }