Print flow updats

Author: cardigliano

kernel/linux/pf_ring.h

@@ -724,16 +724,16 @@ typedef struct {
 #define PF_RING_FLOW_UPDATE_CAUSE_PROBE    4
 #define PF_RING_FLOW_UPDATE_CAUSE_UNKNOWN  5
   u_int8_t cause;
-  u_int8_t reserved0;
-  u_int16_t reserved1;
+  u_int8_t padding_0;
+  u_int16_t padding_1;
 
-  u_int16_t flags_a;
-  u_int16_t flags_b;
+  u_int16_t flags_out;
+  u_int16_t flags_in;
 
-  u_int32_t packets_a;
-  u_int32_t packets_b;
-  u_int64_t bytes_a;
-  u_int64_t bytes_b;
+  u_int32_t packets_out;
+  u_int32_t packets_in;
+  u_int64_t bytes_out;
+  u_int64_t bytes_in;
 
   struct pfring_timespec last_seen;
 } __attribute__((packed))

userland/examples/pfflow_offload.c

@@ -176,28 +176,51 @@ void sigproc(int sig) {
 /* ******************************** */
 
 void processFlow(pfring_flow_update *flow){
+
+  printf("Flow #%lu ", flow->flow_id);
+
   switch (flow->cause) {
     /* Flow stats update (periodic) */
     case PF_RING_FLOW_UPDATE_CAUSE_PERIODIC:
-      printf("Flow #%lu periodic update\n", flow->flow_id);
+      printf("periodic update");
       break;
     /* Flow unlearned */
     case PF_RING_FLOW_UPDATE_CAUSE_SW:
-      printf("Flow #%lu removed (by FlowWrite)\n", flow->flow_id);
+      printf("removed (by FlowWrite)");
       break;
     case PF_RING_FLOW_UPDATE_CAUSE_TIMEOUT:
-      printf("Flow #%lu removed (timeout)\n", flow->flow_id);
+      printf("removed (timeout)");
       break;
     case PF_RING_FLOW_UPDATE_CAUSE_TCP_TERM:
-      printf("Flow #%lu removed (TCP termination)\n", flow->flow_id);
+      printf("removed (TCP termination)");
+      break;
+    case PF_RING_FLOW_UPDATE_CAUSE_PROBE:
+      printf("removed (Software probe?)");
       break;
+    default:
+      printf("(Unknown cause)");
+      break;
+  }
+
+  switch (flow->cause) {
+    case PF_RING_FLOW_UPDATE_CAUSE_PERIODIC:
+    case PF_RING_FLOW_UPDATE_CAUSE_SW:
+    case PF_RING_FLOW_UPDATE_CAUSE_TIMEOUT:
+    case PF_RING_FLOW_UPDATE_CAUSE_TCP_TERM:
     case PF_RING_FLOW_UPDATE_CAUSE_PROBE:
-      printf("Flow #%lu removed (Software probe?)\n", flow->flow_id);
+      printf(" flags=%02x/%02x packets=%u/%u bytes=%ju/%ju",
+             flow->flags_out,
+             flow->flags_in,
+             flow->packets_out,
+             flow->packets_in,
+             flow->bytes_out,
+             flow->bytes_in);
       break;
     default:
-      printf("Flow #%lu removed: unknown cause\n", flow->flow_id);
       break;
   }
+
+  printf("\n");
 }
 
 /* ******************************** */