Changeset 158 for trunk/src

Show
Ignore:
Timestamp:
10/18/11 16:42:15 (11 years ago)
Author:
andreu
Message:

renetcol mib update

Location:
trunk/src
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/dataFlowSet.c

    r154 r158  
    862862          } 
    863863          switch (agCache.dPort){ 
     864    case 25: 
     865            myPtrs->currentMIB->ipv4MailFlowNb += 1; 
     866            myPtrs->currentMIB->ipv4MailBytesNb += agCache.bytes; 
     867            myPtrs->currentMIB->ipv4MailPcktsNb += agCache.pkts; 
     868            break; 
    864869          case 53: 
    865870            myPtrs->currentMIB->ipv4DNSFlowNb += 1; 

  • trunk/src/renetcolAgg.h

    r154 r158  
    11/* 
    22 * File: renetcolAgg.h 
    3  *  
    4  * Authors: ANDREU Francois-Xavier  
    53 * 
    6  * Copyright (C) 2005-2011 GIP RENATER  
     4 * Authors: ANDREU Francois-Xavier 
     5 * 
     6 * Copyright (C) 2005-2011 GIP RENATER 
    77 */ 
    88 
    9 /*  This file is part of renetcol.  
     9/*  This file is part of renetcol. 
    1010 * 
    1111 *  renetcol is free software; you can redistribute it and/or modify 
    … …  
    6666#endif 
    6767  struct RenetcolMIB myMIB[2]; 
    68 };  
     68}; 
    6969 
    7070short rrdMibsUpdate(int); 
     71short rrdL7IPv4MibsUpdate(int); 

  • trunk/src/renetcol_mib.h

    r154 r158  
    11/* 
    22 * File: renetcol_mib.h 
    3  *  
    4  * Authors: ANDREU Francois-Xavier  
    5  * 
    6  * Copyright (C) 2009-2011 GIP RENATER  
     3 * 
     4 * Authors: ANDREU Francois-Xavier 
     5 * 
     6 * Copyright (C) 2009-2011 GIP RENATER 
    77 */ 
    88 
    9 /*  This file is part of renetcol.  
     9/*  This file is part of renetcol. 
    1010 * 
    1111 *  renetcol is free software; you can redistribute it and/or modify 
    … …  
    8888  unsigned long long ipv4WebPcktsNb; 
    8989  unsigned long long ipv4WebFlowNb; 
     90  unsigned long long ipv4MailBytesNb; 
     91  unsigned long long ipv4MailPcktsNb; 
     92  unsigned long long ipv4MailFlowNb; 
    9093  unsigned long long ipv4DNSBytesNb; 
    9194  unsigned long long ipv4DNSPcktsNb; 
    … …  
    134137  unsigned long long ipv6WebPcktsNb; 
    135138  unsigned long long ipv6WebFlowNb; 
     139  unsigned long long ipv6MailBytesNb; 
     140  unsigned long long ipv6MailcktsNb; 
     141  unsigned long long ipv6MailFlowNb; 
    136142  unsigned long long ipv6DNSBytesNb; 
    137143  unsigned long long ipv6DNSPcktsNb; 
    … …  
    246252#define RRD_PARAM_MIB_IPV4_AP_6 "DS:ipv4WebPcktsNb:GAUGE:600:U:U" 
    247253#define RRD_PARAM_MIB_IPV4_AP_7 "DS:ipv4WebFlowNb:GAUGE:600:U:U" 
    248 #define RRD_PARAM_MIB_IPV4_AP_8 "DS:ipv4DNSBytesNb:GAUGE:600:U:U" 
    249 #define RRD_PARAM_MIB_IPV4_AP_9 "DS:ipv4DNSPcktsNb:GAUGE:600:U:U" 
    250 #define RRD_PARAM_MIB_IPV4_AP_10 "DS:ipv4DNSFlowNb:GAUGE:600:U:U" 
    251 #define RRD_PARAM_MIB_IPV4_AP_11 "DS:ipv4OthersApBytesNb:GAUGE:600:U:U" 
    252 #define RRD_PARAM_MIB_IPV4_AP_12 "DS:ipv4OthersApPcktsNb:GAUGE:600:U:U" 
    253 #define RRD_PARAM_MIB_IPV4_AP_13 "DS:ipv4OthersApFlowNb:GAUGE:600:U:U" 
    254 #define RRD_PARAM_MIB_IPV4_AP_14 "RRA:AVERAGE:0.5:1:2100" 
    255 #define RRD_PARAM_MIB_IPV4_AP_15 "RRA:AVERAGE:0.5:24:1550" 
    256 #define RRD_PARAM_MIB_IPV4_AP_16 "RRA:AVERAGE:0.5:288:1594" 
    257 #define RRD_PARAM_MIB_IPV4_AP_17 "RRA:AVERAGE:0.5:2016:1040" 
    258 #define RRD_PARAM_MIB_IPV4_AP_18 "RRA:MAX:0.5:1:2100" 
    259 #define RRD_PARAM_MIB_IPV4_AP_19 "RRA:MAX:0.5:24:1550" 
    260 #define RRD_PARAM_MIB_IPV4_AP_20 "RRA:MAX:0.5:288:1594" 
     254#define RRD_PARAM_MIB_IPV4_AP_8 "DS:ipv4MailBytesNb:GAUGE:600:U:U" 
     255#define RRD_PARAM_MIB_IPV4_AP_9 "DS:ipv4MailPcktsNb:GAUGE:600:U:U" 
     256#define RRD_PARAM_MIB_IPV4_AP_10 "DS:ipv4MailFlowNb:GAUGE:600:U:U" 
     257#define RRD_PARAM_MIB_IPV4_AP_11 "DS:ipv4DNSBytesNb:GAUGE:600:U:U" 
     258#define RRD_PARAM_MIB_IPV4_AP_12 "DS:ipv4DNSPcktsNb:GAUGE:600:U:U" 
     259#define RRD_PARAM_MIB_IPV4_AP_13 "DS:ipv4DNSFlowNb:GAUGE:600:U:U" 
     260#define RRD_PARAM_MIB_IPV4_AP_14 "DS:ipv4OthersApBytesNb:GAUGE:600:U:U" 
     261#define RRD_PARAM_MIB_IPV4_AP_15 "DS:ipv4OthersApPcktsNb:GAUGE:600:U:U" 
     262#define RRD_PARAM_MIB_IPV4_AP_16 "DS:ipv4OthersApFlowNb:GAUGE:600:U:U" 
     263#define RRD_PARAM_MIB_IPV4_AP_17 "RRA:AVERAGE:0.5:1:2100" 
     264#define RRD_PARAM_MIB_IPV4_AP_18 "RRA:AVERAGE:0.5:24:1550" 
     265#define RRD_PARAM_MIB_IPV4_AP_19 "RRA:AVERAGE:0.5:288:1594" 
     266#define RRD_PARAM_MIB_IPV4_AP_20 "RRA:AVERAGE:0.5:2016:1040" 
     267#define RRD_PARAM_MIB_IPV4_AP_21 "RRA:MAX:0.5:1:2100" 
     268#define RRD_PARAM_MIB_IPV4_AP_22 "RRA:MAX:0.5:24:1550" 
     269#define RRD_PARAM_MIB_IPV4_AP_23 "RRA:MAX:0.5:288:1594" 
    261270 
    262271 
    … …  
    341350#define RRD_PARAM_MIB_IPV6_AP_6 "DS:ipv6WebPcktsNb:GAUGE:600:U:U" 
    342351#define RRD_PARAM_MIB_IPV6_AP_7 "DS:ipv6WebFlowNb:GAUGE:600:U:U" 
    343 #define RRD_PARAM_MIB_IPV6_AP_8 "DS:ipv6DNSBytesNb:GAUGE:600:U:U" 
    344 #define RRD_PARAM_MIB_IPV6_AP_9 "DS:ipv6DNSPcktsNb:GAUGE:600:U:U" 
    345 #define RRD_PARAM_MIB_IPV6_AP_10 "DS:ipv6DNSFlowNb:GAUGE:600:U:U" 
    346 #define RRD_PARAM_MIB_IPV6_AP_11 "DS:ipv6OthersApBytesNb:GAUGE:600:U:U" 
    347 #define RRD_PARAM_MIB_IPV6_AP_12 "DS:ipv6OthersApPcktsNb:GAUGE:600:U:U" 
    348 #define RRD_PARAM_MIB_IPV6_AP_13 "DS:ipv6OthersApFlowNb:GAUGE:600:U:U" 
    349 #define RRD_PARAM_MIB_IPV6_AP_14 "RRA:AVERAGE:0.5:1:2100" 
    350 #define RRD_PARAM_MIB_IPV6_AP_15 "RRA:AVERAGE:0.5:24:1550" 
    351 #define RRD_PARAM_MIB_IPV6_AP_16 "RRA:AVERAGE:0.5:288:1594" 
    352 #define RRD_PARAM_MIB_IPV6_AP_17 "RRA:AVERAGE:0.5:2016:1040" 
    353 #define RRD_PARAM_MIB_IPV6_AP_18 "RRA:MAX:0.5:1:2100" 
    354 #define RRD_PARAM_MIB_IPV6_AP_19 "RRA:MAX:0.5:24:1550" 
    355 #define RRD_PARAM_MIB_IPV6_AP_20 "RRA:MAX:0.5:288:1594" 
     352#define RRD_PARAM_MIB_IPV6_AP_8 "DS:ipv6MailBytesNb:GAUGE:600:U:U" 
     353#define RRD_PARAM_MIB_IPV6_AP_9 "DS:ipv6MailPcktsNb:GAUGE:600:U:U" 
     354#define RRD_PARAM_MIB_IPV6_AP_10 "DS:ipv6MailFlowNb:GAUGE:600:U:U" 
     355#define RRD_PARAM_MIB_IPV6_AP_11 "DS:ipv6DNSBytesNb:GAUGE:600:U:U" 
     356#define RRD_PARAM_MIB_IPV6_AP_12 "DS:ipv6DNSPcktsNb:GAUGE:600:U:U" 
     357#define RRD_PARAM_MIB_IPV6_AP_13 "DS:ipv6DNSFlowNb:GAUGE:600:U:U" 
     358#define RRD_PARAM_MIB_IPV6_AP_14 "DS:ipv6OthersApBytesNb:GAUGE:600:U:U" 
     359#define RRD_PARAM_MIB_IPV6_AP_15 "DS:ipv6OthersApPcktsNb:GAUGE:600:U:U" 
     360#define RRD_PARAM_MIB_IPV6_AP_16 "DS:ipv6OthersApFlowNb:GAUGE:600:U:U" 
     361#define RRD_PARAM_MIB_IPV6_AP_17 "RRA:AVERAGE:0.5:1:2100" 
     362#define RRD_PARAM_MIB_IPV6_AP_18 "RRA:AVERAGE:0.5:24:1550" 
     363#define RRD_PARAM_MIB_IPV6_AP_19 "RRA:AVERAGE:0.5:288:1594" 
     364#define RRD_PARAM_MIB_IPV6_AP_20 "RRA:AVERAGE:0.5:2016:1040" 
     365#define RRD_PARAM_MIB_IPV6_AP_21 "RRA:MAX:0.5:1:2100" 
     366#define RRD_PARAM_MIB_IPV6_AP_22 "RRA:MAX:0.5:24:1550" 
     367#define RRD_PARAM_MIB_IPV6_AP_23 "RRA:MAX:0.5:288:1594" 
    356368 
    357369#endif /* RENETCOL_MIB_H */