git Service of IN-Ulm e.V. Explore Help
Sign In
cbiedl
/
softflowd
1
0
Fork 0
Files
Browse Source

Apply changeset 201:e416c63c4e01: "Swap nf9 last/first switched. They were reversed in the struct" (Closes: #611458)

Christoph Biedl 14 years ago
parent
a68f2f1fae
commit
f2f8903efa
2 changed files with 6 additions and 1 deletions
Unified View Show Diff Stats
  1. 5 0
      ChangeLog
  2. 1 1
      netflow9.c

+ 5 - 0
ChangeLog
View File 

@@ -1,3 +1,8 @@
 
+20100504
 
+ - (djm) Swap nf9 last/first switched. They were reversed in the struct
 
+   vs our template flowset. Patch from stephen AT sfnelson.org.
 
+   https://bugzilla.mindrot.org/show_bug.cgi?id=1760
 
+
 
 20061101
 
 20061101
 
  - (djm) Collect licenses into LICENSE file
 
  - (djm) Collect licenses into LICENSE file
 
  - (djm) malloc(x*y) -> calloc(x, y)
 
  - (djm) malloc(x*y) -> calloc(x, y)

+ 1 - 1
netflow9.c
View File 

@@ -84,7 +84,7 @@ struct NF9_SOFTFLOWD_TEMPLATE {
 
 
 
 /* softflowd data flowset types */
 
 /* softflowd data flowset types */
 
 struct NF9_SOFTFLOWD_DATA_COMMON {
 
 struct NF9_SOFTFLOWD_DATA_COMMON {
 
-	u_int32_t first_switched, last_switched;
 
+	u_int32_t last_switched, first_switched;
 
 	u_int32_t bytes, packets;
 
 	u_int32_t bytes, packets;
 
 	u_int16_t src_port, dst_port;
 
 	u_int16_t src_port, dst_port;
 
 	u_int8_t protocol, tcp_flags, ipproto;
 
 	u_int8_t protocol, tcp_flags, ipproto;