Changeset b51edf5

Timestamp:

03/07/06 10:50:19 (16 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

8f80e87

Parents:

e4e1635

Message:

Added RT_KEYCHANGE to rt protocol
Fixed incorrect calculation in trace_get_seconds
rt_read_packet now returns sizeof(rt_header_t) + packet length
trace_get_capture_length no longer asserts for packet->size = 0

Location:

lib

Files:

• format_rt.c (modified) (3 diffs)
• rt_protocol.h (modified) (4 diffs)
• trace.c (modified) (2 diffs)

lib/format_rt.c

@@ -448 +448 @@
                                 /* FIXME: Do something useful here as well */
                                 break;
+                        case RT_KEYCHANGE:
+                                break;
                         default:
                                 printf("Bad rt type for client receipt: %d\n",
@@ -453 +455 @@
                 }
         }
-        return trace_get_capture_length(packet)+trace_get_framing_length(packet);
+        /* Return the number of bytes read from the stream */
+        return sizeof(rt_header_t) + packet->size; 
 }
 
@@ -480 +483 @@
                 case RT_OPTION:
                         return sizeof(rt_option_t);
+                case RT_KEYCHANGE:
+                        return sizeof(rt_keychange_t);
         }
         printf("Unknown type: %d\n", packet->type);

lib/rt_protocol.h

@@ -14 +14 @@
 #define RT_DATA_PCAP 2000
 
+/* Procedure for adding new RT control types
+ * -------------------------------------------
+ *
+ * Add type to the enum list
+ * Add a struct below (even if it is empty)
+ * Update rt_get_capture_length
+ * If type is intended to be sent TO clients, update rt_read_packet
+ *      Otherwise, update server implementations e.g. WDCAP
+ *
+ * Procedure for adding new RT data types
+ * ----------------------------------------
+ * 
+ * If you are adding a new format:
+ *      RT_DATA_(new format) must be equal to RT_DATA_SIMPLE + 
+ *              TRACE_FORMAT_(new_format)
+ *      Add a new dummy trace type to the rt_format_t structure
+ *      Set the dummy trace to NULL in rt_init_input
+ *      Update rt_set_format
+ *
+ * If you are adding a new PCAP DLT type:
+ *      RT_DATA_PCAP_(new DLT) must be equal to RT_DATA_PCAP + (DLT value)
+ *      
+ */
+
 /* Type field definitions */
 enum rt_field_t {
@@ -27 +51 @@
  RT_PAUSE_ACK   =10,    /* Server is paused message */
  RT_OPTION      =11,    /* Option request */
+ RT_KEYCHANGE   =12,    /* Anonymisation key has changed */ 
  
  RT_DATA_ERF            =RT_DATA_SIMPLE + TRACE_FORMAT_ERF, 
@@ -44 +69 @@
  RT_DATA_PCAP_PFLOG             =RT_DATA_PCAP + DLT_PFLOG,
 #endif
-
+ RT_LAST = 3000
 };
 
@@ -116 +141 @@
 } rt_option_t;
 
-
-
+typedef struct rt_keychange {
+        
+} rt_keychange_t;
 
 #endif

lib/trace.c

@@ -1172 +1172 @@
                 /* timeval -> seconds */
                 tv = packet->trace->format->get_timeval(packet);
-                seconds = tv.tv_sec + ((tv.tv_usec * UINT_MAX * 1.0)/1000000);
+                seconds = tv.tv_sec + ((tv.tv_usec * 1.0) / 1000000);
         }
 
@@ -1180 +1180 @@
 size_t trace_get_capture_length(const libtrace_packet_t *packet) {
 
-        assert(packet->size>0 && packet->size<65536);
+        /* Packets can be have a size of zero */
+        assert(packet->size>=0 && packet->size<65536);
 
         if (packet->trace->format->get_capture_length) {