1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
--- a/bin/flowtree.c
+++ b/bin/flowtree.c
@@ -467,9 +467,8 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
NodeList->last = node;
NodeList->length++;
#ifdef DEVEL
- int proto = node->proto;
printf("pushed node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n",
- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
ListCheck(NodeList);
#endif
if ( NodeList->waiting ) {
@@ -483,7 +482,6 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
struct FlowNode *Pop_Node(NodeList_t *NodeList, int *done) {
struct FlowNode *node;
-int proto;
GetTreeLock(NodeList);
while ( NodeList->length == 0 && !*done ) {
@@ -522,12 +520,11 @@ int proto;
node->left = NULL;
node->right = NULL;
- proto = node->proto;
NodeList->length--;
#ifdef DEVEL
printf("popped node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n",
- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
ListCheck(NodeList);
#endif
--- a/bin/nfexpire.c
+++ b/bin/nfexpire.c
@@ -212,12 +212,12 @@ int main( int argc, char **argv ) {
struct stat fstat;
int c, err, maxsize_set, maxlife_set;
int do_rescan, do_expire, do_list, print_stat, do_update_param, print_books, is_profile, nfsen_format;
-char *maxsize_string, *lifetime_string, *datadir;
+char *lifetime_string, *datadir;
uint64_t maxsize, lifetime, low_water;
uint32_t runtime;
channel_t *channel, *current_channel;
- maxsize_string = lifetime_string = NULL;
+ lifetime_string = NULL;
datadir = NULL;
maxsize = lifetime = 0;
do_rescan = 0;
--- a/bin/nfstat.c
+++ b/bin/nfstat.c
@@ -1670,7 +1670,7 @@ uint32_t maxindex, c;
else
printf("Top flows ordered by %s:\n", order_mode[order_index].string);
}
- if ( !record_header )
+ if ( record_header )
printf("%s\n", record_header);
}
PrintSortedFlowcache(SortList, maxindex, topN, 0, print_record, tag, DESCENDING, extension_map_list);
--- a/bin/sflow.c
+++ b/bin/sflow.c
@@ -515,11 +515,17 @@ static inline void readCountersSample_v2v4(SFSample *sample, FlowSource_t *fs);
static inline void StoreSflowRecord(SFSample *sample, FlowSource_t *fs);
+extern int verbose;
+
#ifdef DEVEL
static inline char *printTag(uint32_t tag, char *buf, int bufLen);
-#endif
-extern int verbose;
+static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
+ snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
+ return buf;
+} // End of printTag
+
+#endif
/*_________________---------------------------__________________
@@ -1410,15 +1416,11 @@ static inline uint32_t getAddress(SFSample *sample, SFLAddress *address) {
static inline void skipTLVRecord(SFSample *sample, uint32_t tag, uint32_t len, char *description) {
#ifdef DEVEL
-static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
- snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
- return buf;
-} // End of printTag
-
-char buf[51];
+ char buf[51];
+ snprintf(buf, 50, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
+ printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, buf, len);
#endif
- dbg_printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, printTag(tag, buf, 50), len);
skipBytes(sample, len);
} // End of skipTLVRecord
|
GitWeb