constcast
/
vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates after review

master
Emanuel Vintila 2017-12-13 13:33:54 +01:00
parent 1dd173d670
commit fa651579e3
2 changed files with 11 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/ipfix/IpfixPrinter.cpp
View File

@ -28,6 +28,7 @@
#include <string.h>
#include <stdio.h>
#include <arpa/inet.h>
#include <inttypes.h>
/**
* print functions which have formerly been in IpfixParser.cpp
@ -603,7 +604,7 @@ void IpfixPrinter::printOneLineRecord(IpfixDataRecord* record)
if (fi != NULL && fi->type.length==2) {
srcport = ntohs(*reinterpret_cast<uint16_t*>(record->data+fi->offset));
}
snprintf(buf, ARRAY_SIZE(buf), "%hhu.%hhu.%hhu.%hhu:%hu", (uint8_t)((srcip>>0)&0xFF), (uint8_t)((srcip>>8)&0xFF), (uint8_t)((srcip>>16)&0xFF), (uint8_t)((srcip>>24)&0xFF), srcport);
snprintf(buf, ARRAY_SIZE(buf), "%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ":%" PRIu16, (uint8_t)((srcip>>0)&0xFF), (uint8_t)((srcip>>8)&0xFF), (uint8_t)((srcip>>16)&0xFF), (uint8_t)((srcip>>24)&0xFF), srcport);
fprintf(fh, "%21s ", buf);
fi = dataTemplateInfo->getFieldInfo(IPFIX_TYPEID_destinationIPv4Address, 0);
@ -616,7 +617,7 @@ void IpfixPrinter::printOneLineRecord(IpfixDataRecord* record)
if (fi != NULL && fi->type.length==2) {
dstport = ntohs(*reinterpret_cast<uint16_t*>(record->data+fi->offset));
}
snprintf(buf, ARRAY_SIZE(buf), "%hhu.%hhu.%hhu.%hhu:%hu", (uint8_t)((dstip>>0)&0xFF), (uint8_t)((dstip>>8)&0xFF), (uint8_t)((dstip>>16)&0xFF), (uint8_t)((dstip>>24)&0xFF), dstport);
snprintf(buf, ARRAY_SIZE(buf), "%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 ":%" PRIu16, (uint8_t)((dstip>>0)&0xFF), (uint8_t)((dstip>>8)&0xFF), (uint8_t)((dstip>>16)&0xFF), (uint8_t)((dstip>>24)&0xFF), dstport);
fprintf(fh, "%21s ", buf);
fi = dataTemplateInfo->getFieldInfo(IPFIX_TYPEID_packetDeltaCount, 0);

84
src/osdep/linux/sysinfo.cpp
View File

@ -71,85 +71,13 @@ static char buf[1024];
* unreliable, because it doesn't return an error code when it is
* used with a kernel that doesn't support the ELF note. On some other
* architectures there may be a system call or sysctl() that will work.
*
* A more recent update: kernels older than 2.4+ are no longer supported
* by vermont.
*/
unsigned long long Hertz;
static void old_Hertz_hack(void){
unsigned long long user_j, nice_j, sys_j, other_j; /* jiffies (clock ticks) */
double up_1, up_2, seconds;
unsigned long long jiffies;
unsigned h;
char* savelocale;
savelocale = setlocale(LC_NUMERIC, NULL);
setlocale(LC_NUMERIC, "C");
do{
FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1);
/* uptime(&up_1, NULL); */
FILE_TO_BUF(STAT_FILE,stat_fd);
sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j);
FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2);
/* uptime(&up_2, NULL); */
} while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */
setlocale(LC_NUMERIC, savelocale);
jiffies = user_j + nice_j + sys_j + other_j;
seconds = (up_1 + up_2) / 2;
h = (unsigned)( (double)jiffies/seconds/smp_num_cpus );
/* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */
if ( (h >= 9 ) && (h <= 11 ) ){
/* S/390 (sometimes) */
Hertz = 10;
} else if ( (h >= 18 ) && (h <= 22 ) ){
/* user-mode Linux */
Hertz = 20; /* S/390 (sometimes) */
} else if ( (h >= 30 ) && (h <= 34 ) ){
/* ia64 emulator */
Hertz = 32;
} else if ( (h >= 48 ) && (h <= 52 ) ){
Hertz = 50;
} else if ( (h >= 58 ) && (h <= 61 ) ){
Hertz = 60;
} else if ( (h >= 62 ) && (h <= 65 ) ){
/* StrongARM /Shark */
Hertz = 64;
} else if ( (h >= 95 ) && (h <= 105 ) ){
/* normal Linux */
Hertz = 100;
} else if ( (h >= 124 ) && (h <= 132 ) ){
/* MIPS, ARM */
Hertz = 128;
} else if ( (h >= 195 ) && (h <= 204 ) ){
/* normal << 1 */
Hertz = 200;
} else if ( (h >= 253 ) && (h <= 260 ) ){
Hertz = 256;
} else if ( (h >= 393 ) && (h <= 408 ) ){
/* normal << 2 */
Hertz = 400;
} else if ( (h >= 790 ) && (h <= 808 ) ){
/* normal << 3 */
Hertz = 800;
} else if ( (h >= 990 ) && (h <= 1010) ){
/* ARM */
Hertz = 1000;
} else if ( (h >= 1015) && (h <= 1035) ){
/* Alpha, ia64 */
Hertz = 1024;
} else if ( (h >= 1180) && (h <= 1220) ){
/* Alpha */
Hertz = 1200;
} else {
#ifdef HZ
Hertz = (unsigned long long)HZ; /* <asm/param.h> */
#else
/* If 32-bit or big-endian (not Alpha or ia64), assume HZ is 100. */
Hertz = (sizeof(long)==sizeof(int) || htons(999)==999) ? 100UL : 1024UL;
#endif
fprintf(stderr, "Unknown HZ value! (%d) Assume %Ld.\n", h, Hertz);
}
}
#define NOTE_NOT_FOUND 42
//extern char** environ;
@ -184,7 +112,11 @@ static void init_libproc(void){
if(Hertz!=NOTE_NOT_FOUND) return;
fputs("2.4+ kernel w/o ELF notes? -- report this\n", stderr);
}
old_Hertz_hack();
else{
fputs("Kernels older than 2.4+ are no longer supported\n", stderr);
}
// the kernel is too old or it has no ELF notes
exit(1);
}