Changeset 59 for trunk/src/get_conf.c

Show
Ignore:
Timestamp:
10/18/07 11:41:05 (15 years ago)
Author:
andreu
Message:

new aggregation method, based on SNMP index. New parameters in renetcolParam.h and new compilation options in configure.in.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/get_conf.c

    r34 r59  
    138138  char line[200]; 
    139139  unsigned short counter = 0; 
    140   unsigned short n0, n1, n2, n3, n4, n5; 
     140  unsigned short n0, n1, n2, n3, n4; 
     141#if defined(IPV4AGGIDR) 
     142  unsigned short n5; 
     143#endif 
    141144  unsigned char buffer4[4]; 
    142145  int i = 0; 
    … …  
    146149    fprintf (stderr, "error during %s opening\n", filename); 
    147150    exit(1); 
     151  } 
     152  for(i=0;i<MAX_IPV4_PREFIX;i++){ 
     153    pV4TabPtr[i].beginning = 0; 
     154    pV4TabPtr[i].end = 0; 
     155    pV4TabPtr[i].mask = 0; 
     156    pV4TabPtr[i].sampling = 0; 
     157#ifdef IPV4AGGIDR       
     158    pV4TabPtr[i].routerNb = 0; 
     159#endif 
     160    pV4TabPtr[i].flowNbIN = 0; 
     161    pV4TabPtr[i].bytesNbIN = 0; 
     162    pV4TabPtr[i].pktsNbIN = 0; 
     163    pV4TabPtr[i].flowNbOUT = 0; 
     164    pV4TabPtr[i].bytesNbOUT = 0; 
     165    pV4TabPtr[i].pktsNbOUT = 0; 
     166    pV4TabPtr[i].firstCoSIN = 0; 
     167    pV4TabPtr[i].secondCoSIN = 0; 
     168    pV4TabPtr[i].thirdCoSIN = 0; 
     169    pV4TabPtr[i].fourthCoSIN = 0; 
     170    pV4TabPtr[i].firstCoSOUT = 0; 
     171    pV4TabPtr[i].secondCoSOUT = 0; 
     172    pV4TabPtr[i].thirdCoSOUT = 0; 
     173    pV4TabPtr[i].fourthCoSOUT = 0; 
    148174  } 
    149175  while (fgets(line, 50, prefixFile) != 0) 
    … …  
    160186  for(i=0;i<counter;i++) 
    161187    { 
     188#if defined(IPV4AGGIDR) 
    162189      sscanf(prefixStrTab[i],"%hu.%hu.%hu.%hu/%hu-%hu\n", 
    163              &n0,&n1,&n2,&n3,&n4,&n5);           
     190             &n0,&n1,&n2,&n3,&n4,&n5); 
     191#else 
     192      sscanf(prefixStrTab[i],"%hu.%hu.%hu.%hu %hu\n", 
     193             &n0,&n1,&n2,&n3,&n4); 
     194#endif 
    164195      buffer4[0] = (unsigned char)n3; 
    165196      buffer4[1] = (unsigned char)n2; 
    … …  
    171202        *((unsigned long*)&buffer4[0]) +~(~0<<(32-n4)); 
    172203      pV4TabPtr[i].mask = n4; 
    173       pV4TabPtr[i].sampling = 0;       
     204      pV4TabPtr[i].sampling = 0; 
     205#ifdef IPV4AGGIDR       
    174206      pV4TabPtr[i].routerNb = n5; 
     207#endif 
    175208      pV4TabPtr[i].flowNbIN = 0; 
    176209      pV4TabPtr[i].bytesNbIN = 0;