Changeset 113 for trunk/src

Timestamp:

06/23/09 17:42:00 (14 years ago)

Author:

andreu

Message:

ticket#27 : new global structure for counters.
some bug correction in renetcol.c

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• V9Header_mgmt.h (modified) (1 diff)
• dataFlowSet.c (modified) (4 diffs)
• engine_mgmt.h (added)
• renetcol.c (modified) (10 diffs)
• renetcol.h (modified) (3 diffs)
• renetcolAgg.h (modified) (1 diff)
• renetcolParam.h (modified) (2 diffs)
• renetcol_mib.h (added)
• routers_mgmt.c (modified) (2 diffs)
• routers_mgmt.h (modified) (4 diffs)
• template.c (modified) (9 diffs)
• template.h (modified) (1 diff)

trunk/src/Makefile.am

@@ -6 +6 @@
         dataFlowSet.h get_conf.c get_conf.h rules_mgmt.c rules_mgmt.h \
         remote_output.h remote_output.c prefix_mgmt.h prefix_mgmt.c \
-        pop.h renetcolParam.h as.h as.c
+        pop.h renetcolParam.h as.h as.c engine_mgmt.h renetcol_mib.h
 renetcolSender_SOURCES = renetcolSender.c renetcolSender.h msg_mgmt.h \
         msg_mgmt.c rules_mgmt.c rules_mgmt.h remote_output.h \
         remote_output.c fields_mgmt.h fields_mgmt.c pop.h renetcolParam.h\
-        as.h as.c
+        as.h as.c engine_mgmt.h renetcol_mib.h
 renetcolMsgCtl_SOURCES = renetcolMsgCtl.c
-renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h pop.h renetcolParam.h as.h
+renetcolAgg_SOURCES = renetcolAgg.c renetcolAgg.h pop.h renetcolParam.h as.h \
+        engine_mgmt.h renetcol_mib.h
 BUILT_SOURCES = renetcol.o renetcolSender.o renetcolAgg.o
 renetcol_LDADD = -ldl -lc_p

trunk/src/V9Header_mgmt.h

@@ -4 +4 @@
  * Authors: ANDREU Francois-Xavier 
  *
- * Copyright (C) 2005 2006 2007 GIP RENATER 
+ * Copyright (C) 2005 - 2009 GIP RENATER 
  */
 

trunk/src/dataFlowSet.c

@@ -112 +112 @@
                        myPtrs->currentHeaderV9Ptr->sourceId, 
                        (*myPtrs->currentFlowsetIdPtr)))!=NULL ) {
+    myPtrs->currentMIB->dataFlowSetNb += 1;
 #ifdef DEBUG
     fprintf(stderr,
@@ -654 +655 @@
          * end of one flow (not the flowset) 
          */
+        myPtrs->currentMIB->realFlowNb += 1;
 #ifdef DEBUG
         flowCpt++;
@@ -1271 +1273 @@
     if ((tmpOpt=existTplOptId(myPtrs->currentRouterPtr, myPtrs->currentHeaderV9Ptr->sourceId, 
                               (*myPtrs->currentFlowsetIdPtr)))!=NULL) {        
+
+      myPtrs->currentMIB->optDataFlowSetNb += 1;
 #ifdef DEBUG
       fprintf(stderr,"<d id: %hu, lg %hu", (*myPtrs->currentFlowsetIdPtr), data_length);
@@ -1342 +1346 @@
       fprintf(stderr,">");
 #endif
+      myPtrs->currentMIB->realFlowNb += 1;
       return (data_length+shift);
     } else {

trunk/src/renetcol.c

@@ -55 +55 @@
 TplFlowSetPtr curTplFlSetPtr; /* current template flowset pointer */
 TplOptionPtr curTplOptionPtr;
-RouterPtr routersListPtr; 
+RouterPtr routersListPtr;
+NDEEnginePtr enginePtrTmp;
 
 unsigned long sortedRouterList[ROUTER_INDEX_MAX];
@@ -278 +279 @@
   myPtrs.pcktPtr = (DatagramPtr) malloc(sizeof(struct Datagram));
   myPtrs.currentFlowsetNumberPtr = &currentFlowsetNumber;
+  myPtrs.currentMIB = shmForAgg->myMIB[shmForAgg->currentTable];
+  myPtrs.secondMIB = shmForAgg->myMIB[shmForAgg->secondTable];
+  if (initMIB(myPtrs.currentMIB)!=1) {
+    fprintf(stderr, "ERROR in MIB initialisation\n"); 
+    exit(1);}
+  if (initMIB(myPtrs.secondMIB)!=1) {
+    fprintf(stderr, "ERROR in second MIB initialisation\n"); 
+    exit(1);}
 #ifdef IPV4AGGIDR
   myPtrs.routersID = &indexedRouterList;
@@ -561 +570 @@
       }
       shmForAgg->readed = 1;
+      myPtrs.currentMIB = shmForAgg->myMIB[shmForAgg->currentTable];
+      myPtrs.secondMIB = shmForAgg->myMIB[shmForAgg->secondTable];
 #ifdef ASACC
       myPtrs.currentASTab = shmForAgg->ASTab[shmForAgg->currentTable];
@@ -570 +581 @@
       myPtrs.currentV6IndexTab = &(shmForAgg->indexV6Tab[shmForAgg->currentTable][0][0]);
       myPtrs.secondV6IndexTab = &(shmForAgg->indexV6Tab[shmForAgg->secondTable][0][0]);
+      /* FIXME : to delete : */
       if (!(TPLFILE = fopen("/tmp/IPV6LINKAGG.txt", "w"))) {
         syslog (LOG_ERR, "error during %s opening", "/tmp/IPV6LINKAGG.txt");
@@ -596 +608 @@
         }
       }
-      fclose(TPLFILE);
+      fclose(TPLFILE); /* <-- */
 #endif
     }
@@ -610 +622 @@
     getIpHeader(myPtrs.pcktPtr, myPtrs.ptr_buffer);
     regRouter = checkIpHeader(myPtrs.pcktPtr, &sortedRouterList[0], routerNb);
+    myPtrs.currentMIB->ipPacketNb += 1;
     getUdpHeader(myPtrs.pcktPtr, myPtrs.ptr_buffer);
     if ( checkUdpHeader(myPtrs.pcktPtr, regRouter, receptPort) == 1 ){
       continue;
     }
-    
+    myPtrs.currentMIB->udpPacketNb += 1;
     switch( version = 
             getNetFlowHeader(myPtrs.pcktPtr, myPtrs.ptr_buffer, 
@@ -625 +638 @@
                myPtrs.currentHeaderV9Ptr->package_sequence);
 #endif
+      myPtrs.currentMIB->v9PacketNb += 1;
+      myPtrs.currentMIB->flowNb += myPtrs.currentHeaderV9Ptr->count;
       if ((myPtrs.currentRouterPtr=notExistRouter(routersListPtr, 
                                                   myPtrs.pcktPtr->ipH->srcAdd))==NULL) {
         myPtrs.currentRouterPtr = routersListPtr;
       }
+      if ((enginePtrTmp = existEngId(myPtrs.currentRouterPtr,myPtrs.currentHeaderV9Ptr->sourceId))==NULL) {
+        /* add new engineID */
+        enginePtrTmp = newRouterEngineList();
+        enginePtrTmp->next = myPtrs.currentRouterPtr->engineList;
+        if (myPtrs.currentRouterPtr->engineList!=NULL) {
+          myPtrs.currentRouterPtr->engineList->prev=enginePtrTmp;}
+        myPtrs.currentRouterPtr->engineList = enginePtrTmp;
+        enginePtrTmp->engineId = myPtrs.currentHeaderV9Ptr->sourceId;
+        enginePtrTmp->package_sequence = myPtrs.currentHeaderV9Ptr->package_sequence;
+      } else {
+        enginePtrTmp->engineId = myPtrs.currentHeaderV9Ptr->sourceId;
+        if (enginePtrTmp->package_sequence != (myPtrs.currentHeaderV9Ptr->package_sequence-1)) {
+          myPtrs.currentMIB->v9UnSeqNb += 1;
+        }
+        enginePtrTmp->package_sequence = myPtrs.currentHeaderV9Ptr->package_sequence;
+      }
       currentFlowsetNumber = 0;
       shift = 0;
       gardeFou=0;
-      while ((currentFlowsetNumber < myPtrs.currentHeaderV9Ptr->count) && (shift <= 1456)) {
+      while ((currentFlowsetNumber < myPtrs.currentHeaderV9Ptr->count) 
+             && (shift+48 < myPtrs.pcktPtr->udp_header->length)) {
         gardeFou++;
         curTplFlSetPtr = NULL;
         currentFlowsetId=getFlowsetId(currentFlowsetNumber, 
                                       myPtrs.offsetV9Ptr, myPtrs.ptr_buffer);
+        myPtrs.currentMIB->flowSetNb += 1;
         if ( currentFlowsetId == 0 ) {
-          if ( (shift = checkTemplateFlowSet(myPtrs.currentRouterPtr, 
+          if ( (shift = checkTemplateFlowSet(shift, myPtrs.currentRouterPtr,
+                                             myPtrs.currentMIB,
                                              myPtrs.offsetV9Ptr, 
                                              myPtrs.ptr_buffer, 
@@ -649 +683 @@
 #endif
             currentFlowsetNumber = myPtrs.currentHeaderV9Ptr->count + 1;
-          };
-          writeAllTplFlSet();
+          }
+          /* writeAllTplFlSet(); */
         } else if (currentFlowsetId == 1) {
-          if ( (shift = checkTemplateOption(myPtrs.currentRouterPtr, 
+          if ( (shift = checkTemplateOption(shift, myPtrs.currentRouterPtr,
+                                            myPtrs.currentMIB,
                                             myPtrs.offsetV9Ptr, 
                                             myPtrs.ptr_buffer, 
@@ -714 +749 @@
 #ifdef DEBUG    
     fprintf (stderr, "]\n");
+    fprintf (stderr, "IP: %llu , UDP: %llu, NDEv9: %llu, drops: %llu, FS: %llu, Flows: %llu, realFl: %llu Diff:%llu\n",
+             myPtrs.currentMIB->ipPacketNb,
+             myPtrs.currentMIB->udpPacketNb,
+             myPtrs.currentMIB->v9PacketNb,
+             myPtrs.currentMIB->v9UnSeqNb,
+             myPtrs.currentMIB->flowSetNb,
+             myPtrs.currentMIB->flowNb,
+             myPtrs.currentMIB->realFlowNb,
+             myPtrs.currentMIB->flowNb - myPtrs.currentMIB->realFlowNb
+             );
 #endif
   } while (1);
@@ -929 +974 @@
   fclose(TPLFILE);
 }
+
+/*
+ * initMIB
+ */
+int initMIB(struct RenetcolMIB *theMIB)
+{
+  theMIB->ipPacketNb = 0;
+  theMIB->udpPacketNb = 0;
+  theMIB->v9PacketNb = 0;
+  theMIB->v9UnSeqNb = 0;
+  theMIB->flowSetNb = 0;
+  theMIB->dataFlowSetNb = 0;
+  theMIB->defFlowSetNb = 0;
+  theMIB->optDataFlowSetNb = 0;
+  theMIB->optDefFlowSetNb = 0;
+  theMIB->flowNb = 0;          
+  theMIB->realFlowNb = 0; 
+  theMIB->ipv4BytesIn = 0;
+  theMIB->ipv4BytesOut = 0;
+  theMIB->ipv4PcktsIn = 0;
+  theMIB->ipv4PcktsOut = 0;
+  theMIB->ipv4FlowIn = 0;
+  theMIB->ipv4FlowOut = 0;    
+  theMIB->ipv4IcmpFlowNb = 0;
+  theMIB->ipv4IcmpBytesNb = 0;
+  theMIB->ipv4IcmpPktsNb = 0;
+  theMIB->ipv4UDPFlowNb = 0;
+  theMIB->ipv4UDPBytesNb = 0;
+  theMIB->ipv4UDPPktsNb = 0;
+  theMIB->ipv4TCPFlowNb = 0;
+  theMIB->ipv4TCPBytesNb = 0;
+  theMIB->ipv4TCPPktsNb = 0;
+  theMIB->ipv4OthersFlowNb = 0;
+  theMIB->ipv4OthersBytesNb = 0;
+  theMIB->ipv4OthersPktsNb = 0;
+  theMIB->ipv4FlowSizePcktsE1 = 0;   
+  theMIB->ipv4FlowSizePcktsLT10 = 0; 
+  theMIB->ipv4FlowSizePcktsLT100 = 0;
+  theMIB->ipv4FlowSizePcktsLT1k = 0; 
+  theMIB->ipv4FlowSizePcktsLT10k = 0;
+  theMIB->ipv4FlowSizePcktsMT10k = 0;
+  theMIB->ipv4FlowSizeBytesLT50 = 0; 
+  theMIB->ipv4FlowSizeBytesLT100 = 0;
+  theMIB->ipv4FlowSizeBytesLT1k = 0; 
+  theMIB->ipv4FlowSizeBytesLT10k = 0;
+  theMIB->ipv4FlowSizeBytesLT100k = 0;
+  theMIB->ipv4FlowSizeBytesLT1M = 0;  
+  theMIB->ipv4FlowSizeBytesLT10M = 0; 
+  theMIB->ipv4FlowSizeBytesLT100M = 0; 
+  theMIB->ipv4FlowSizeBytesMT100M = 0; 
+  theMIB->ipv4WebBytesNb = 0;
+  theMIB->ipv4WebPcktsNb = 0;
+  theMIB->ipv4WebFlowNb = 0;
+  theMIB->ipv4DNSBytesNb = 0;
+  theMIB->ipv4DNSPcktsNb = 0;
+  theMIB->ipv4DNSFlowNb = 0;
+  theMIB->ipv4OthersApBytesNb = 0;
+  theMIB->ipv4OthersApPcktsNb = 0;
+  theMIB->ipv4OthersApFlowNb = 0;
+  theMIB->ipv6BytesIn = 0;
+  theMIB->ipv6BytesOut = 0;
+  theMIB->ipv6PcktsIn = 0;
+  theMIB->ipv6PcktsOut = 0;
+  theMIB->ipv6FlowIn = 0;
+  theMIB->ipv6FlowOut = 0;
+  theMIB->ipv6IcmpFlowNb = 0;
+  theMIB->ipv6IcmpBytesNb = 0;
+  theMIB->ipv6IcmpPktsNb = 0;
+  theMIB->ipv6UDPFlowNb = 0;
+  theMIB->ipv6UDPBytesNb = 0;
+  theMIB->ipv6UDPPktsNb = 0;
+  theMIB->ipv6TCPFlowNb = 0;
+  theMIB->ipv6TCPBytesNb = 0;
+  theMIB->ipv6TCPPktsNb = 0;
+  theMIB->ipv6OthersFlowNb = 0;
+  theMIB->ipv6OthersBytesNb = 0;
+  theMIB->ipv6OthersPktsNb = 0;
+  theMIB->ipv6FlowSizePcktsE1 = 0;     
+  theMIB->ipv6FlowSizePcktsLT10 = 0;   
+  theMIB->ipv6FlowSizePcktsLT100 = 0;  
+  theMIB->ipv6FlowSizePcktsLT1k = 0;   
+  theMIB->ipv6FlowSizePcktsLT10k = 0;  
+  theMIB->ipv6FlowSizePcktsMT10k = 0;  
+  theMIB->ipv6FlowSizeBytesLT50 = 0;   
+  theMIB->ipv6FlowSizeBytesLT100 = 0;  
+  theMIB->ipv6FlowSizeBytesLT1k = 0;   
+  theMIB->ipv6FlowSizeBytesLT10k = 0;  
+  theMIB->ipv6FlowSizeBytesLT100k = 0; 
+  theMIB->ipv6FlowSizeBytesLT1M = 0;   
+  theMIB->ipv6FlowSizeBytesLT10M = 0;  
+  theMIB->ipv6FlowSizeBytesLT100M = 0; 
+  theMIB->ipv6FlowSizeBytesMT10M = 0;  
+  theMIB->ipv6WebBytesNb = 0;
+  theMIB->ipv6WebPcktsNb = 0;
+  theMIB->ipv6WebFlowNb = 0;
+  theMIB->ipv6DNSBytesNb = 0;
+  theMIB->ipv6DNSPcktsNb = 0;
+  theMIB->ipv6DNSFlowNb = 0;
+  theMIB->ipv6OthersApBytesNb = 0;
+  theMIB->ipv6OthersApPcktsNb = 0;
+  theMIB->ipv6OthersApFlowNb = 0;
+  return 1;
+}

trunk/src/renetcol.h

@@ -66 +66 @@
 #include "renetcolParam.h"
 #include "as.h"
+#include "renetcol_mib.h"
+#include "engine_mgmt.h"
 
 struct SHMForAgg {/* if you change it, you must change renetcolAgg.h struct */
@@ -87 +89 @@
   struct IndexV6 indexV6Tab[2][ROUTER_INDEX_MAX][MAX_INDEX_BY_ROUTER];
 #endif
+  struct RenetcolMIB myMIB[2][1];
 };
 
@@ -107 +110 @@
 void showAllTplFlSet();
 void writeAllTplFlSet();
-
+int initMIB(struct RenetcolMIB *);

trunk/src/renetcolAgg.h

@@ -64 +64 @@
   struct IndexV6 indexV6Tab[2][ROUTER_INDEX_MAX][MAX_INDEX_BY_ROUTER];
 #endif
+  struct RenetcolMIB myMIB[2];
 }; 

trunk/src/renetcolParam.h

@@ -95 +95 @@
 
 /*
- * Path to the rrd file
+ * RRD files paths
  */
 #define PREFIX_RRD_LOCATION "/mnt/data/RRD/RENATER/IPv4_SUBNET/"
@@ -101 +101 @@
 #define AS_RRD_LOCATION "/mnt/data/RRD/RENATER/AS/"
 #define SNMP_INDEX_RRD_LOCATION "/mnt/data/RRD/RENATER/SNMP_INDEX/"
+#define MIB_RRD_LOCATION "/mnt/data/RRD/RENATER/RENETCOL_MIB/"
 
 /*

trunk/src/routers_mgmt.c

@@ -50 +50 @@
     tmp->tplList = NULL;
     tmp->tplOptList = NULL;
+    tmp->engineList = NULL;
 #if defined(MULTISAMPLING)
     tmp->sampled = 1;
@@ -112 +113 @@
     free(ptpl);
     ptpl = NULL;
+  }
+  return NULL;
+}
+
+NDEEnginePtr newRouterEngineList()
+{
+  NDEEnginePtr tmp = (NDEEnginePtr) malloc(sizeof(struct NDEEngine));
+  tmp->package_sequence = 0;
+  tmp->engineId = 0;
+  tmp->prev = NULL;
+  tmp->next = NULL;
+  return tmp;
+}
+
+/*
+ * existEngId
+ *
+ * return:
+ *    - a pointer on the EngineId or NULL
+ */
+NDEEnginePtr existEngId(RouterPtr cr, unsigned long sid)
+{
+  NDEEnginePtr tmp=cr->engineList;
+  for (; tmp; tmp=tmp->next) {
+    if (tmp->engineId==sid) {
+      return tmp;
+    }
   }
   return NULL;

trunk/src/routers_mgmt.h

@@ -41 +41 @@
 #include "headers_mgmt.h"
 #include "rules_mgmt.h"
+#include "renetcol_mib.h"
+#include "engine_mgmt.h"
 
 typedef struct Router * RouterPtr;
@@ -47 +49 @@
   TplFlowSetPtr tplList;   /* list of the template definition */
   TplOptionPtr tplOptList; /* list of the optional template definitions */
+  NDEEnginePtr engineList;    /* list of engines */
   unsigned long sampled;   /* sampling value: (one for) 10, 100 or 1(full mode)*/
   unsigned short ID;       /* internal ID, create during routers file reading */
@@ -71 +74 @@
   unsigned long *routersID;
 #endif
+  struct RenetcolMIB *currentMIB;
+  struct RenetcolMIB *secondMIB;
   struct PrefixV4 *currentV4Tab;
   struct PrefixV4 *secondV4Tab;
@@ -98 +103 @@
 TplFlowSetPtr newRouterTplList();
 TplFlowSetPtr deleteTplFlSet(TplFlowSetPtr);
+NDEEnginePtr newRouterEngineList();
+NDEEnginePtr existEngId(RouterPtr, unsigned long);
 TplOptionPtr newRouterTplOptList();
 TplOptionPtr deleteTplOption(TplOptionPtr);

trunk/src/template.c

@@ -54 +54 @@
  */
 short 
-checkTemplateFlowSet(RouterPtr cr, unsigned short *offV9, 
+checkTemplateFlowSet(short shift, 
+                     RouterPtr cr, 
+                     struct RenetcolMIB *myMIB,
+                     unsigned short *offV9, 
                      unsigned char *buf, 
                      NetFlowV9HeaderPtr v9Ptr,
@@ -212 +215 @@
 #endif
           }
-#ifdef DEBUG  
-          syslog (LOG_INFO, 
-                  "New template: field nb, field lg or too many fields, bad template def possibility SId: %lu",
-                  v9Ptr->sourceId);
-#endif
           ptpltmp = cTFSPtr;
           if (ptpltmp->prev == NULL) {
@@ -313 +311 @@
           }
 #ifdef DEBUG
-          syslog (LOG_INFO, 
-                  "in update template function: too many fields, bug collector or wrong template def in template update");
           fprintf(stderr, 
                   "\nin update template function: too many fields, bug collector or wrong template def in template update\n"); 
@@ -374 +370 @@
     msgSend( myQueue, myMsg);
     /* end send */
-    (*cFNPtr)++;    
+    (*cFNPtr)++;  
+#ifdef DEBUG
+    fprintf (stderr, "}");
+#endif
+    myMIB->defFlowSetNb += 1;
+    myMIB->realFlowNb += 1;    
   } while ( (cpt) < (length-2) ); /*length-2*/
-#ifdef DEBUG
-  fprintf (stderr, "}");
-#endif
-  return length;
+  return length+shift;
 }
 
@@ -387 +385 @@
  */
 short 
-checkTemplateOption(RouterPtr cr, unsigned short *offV9, 
-                    unsigned char *buf, NetFlowV9HeaderPtr v9Ptr,
+checkTemplateOption(short shift, 
+                    RouterPtr cr,
+                    struct RenetcolMIB *myMIB,
+                    unsigned short *offV9, 
+                    unsigned char *buf, 
+                    NetFlowV9HeaderPtr v9Ptr,
                     TplOptionPtr cTOPtr,
                     short *cFNPtr)
@@ -467 +469 @@
              || badFieldLength == 1) {
 #ifdef DEBUG  
-          fprintf(stderr,"\n IP: %lu.%lu.%lu.%lu\n",
+          fprintf(stderr,"\n IP: %lu.%lu.%lu.%lu Opt Templ\n",
                   cr->IpAddress>>24,
                   cr->IpAddress<<8>>24,
@@ -474 +476 @@
           syslog (LOG_INFO, 
                   "in option template function: too many fields, bug collector or wrong template def in template update");
-          fprintf(stderr,
-                  "\nin option template function: too many fields, bug collector or wrong template def in template update\n");
 #endif
           while ( ((*offV9))> (index)){
@@ -569 +569 @@
           syslog (LOG_INFO, 
                   "in update option tpl function: too many fields, bug collector or wrong template def in template update");
-          fprintf(stderr,
-                  "\nin update option tpl function: too many fields, bug collector or wrong template def in template update\n");
 #endif
           ptplotmp = cTOPtr;
@@ -597 +595 @@
     }
     (*cFNPtr)++;
+#ifdef DEBUG
+    fprintf (stderr, ">");
+#endif
+    myMIB->optDefFlowSetNb += 1;
+    myMIB->realFlowNb += 1;    
   } while ((cpt) < (length-2));
   /*   show_all_tplFlSet(); */
-#ifdef DEBUG
-  fprintf (stderr, ">");
-#endif
-  return length;
+  return length+shift;
 }
 

trunk/src/template.h

@@ -32 +32 @@
 #include "V9Header_mgmt.h"
 #include "msg_mgmt.h"
+#include "renetcol_mib.h"
 
 short getFlowsetId(short, unsigned short *, unsigned char *);
-short checkTemplateFlowSet(RouterPtr, unsigned short *,
+short checkTemplateFlowSet(short, 
+                           RouterPtr, 
+                           struct RenetcolMIB *,
+                           unsigned short *,
                            unsigned char *,
                            NetFlowV9HeaderPtr,
                            TplFlowSetPtr, short *, int);
-short checkTemplateOption(RouterPtr, unsigned short *, 
+short checkTemplateOption(short, 
+                          RouterPtr,
+                          struct RenetcolMIB *, 
+                          unsigned short *, 
                           unsigned char *, 
                           NetFlowV9HeaderPtr,
-                          TplOptionPtr, short *);
+                          TplOptionPtr, 
+                          short *);
 TplFlowSetPtr existId(RouterPtr, unsigned long, short);
 TplFlowSetPtr existTplId(RouterPtr, unsigned long, short);