Changeset da34e20 for lib/rt_protocol.h

Timestamp:

05/12/06 17:07:59 (15 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:

cd7eec7

Parents:

83445f0

Message:

dag_read_packet now returns a DUCK packet occasionally in place of a regular packet - changing the DUCK frequency will *soon* be a config option
wag_start and wag_pause will now turn the radio on and off, respectively
Added DUCK structures to rt_protocol.h for use with RT_DUCK_* packets
Updated format_rt to deal with RT_DUCK properly
Removed erroneous free(packet->buffer) when packet is not under our control in format_pcap.
Added check for DAG 2.4 in configure

File:

• lib/rt_protocol.h (modified) (9 diffs)

lib/rt_protocol.h

@@ -3 +3 @@
 
 #include "libtrace.h"
+#include <time.h>
 
 #define CAPTURE_PORT 3434
@@ -17 +18 @@
  *
  * Add type to the enum list
- * Add a struct below (even if it is empty)
+ * Add a struct below (even if it is empty - wrap it in an #if 0)
  * Update rt_get_capture_length
  * If type is intended to be sent TO clients, update rt_read_packet
@@ -37 +38 @@
  */
 
-/* Type field definitions */
+/** Type field definitions */
 enum rt_field_t {
- RT_HELLO       =1,     /* Connection accepted */
- RT_START       =2,     /* Request for data transmission to begin */
- RT_ACK         =3,     /* Data acknowledgement */
- RT_STATUS      =4,     /* Fifo status packet */
- RT_DUCK        =5,     /* Dag duck info packet */
- RT_END_DATA    =6,     /* Server is exiting message */
- RT_CLOSE       =7,     /* Client is exiting message */
- RT_DENY_CONN   =8,     /* Connection has been denied */
- RT_PAUSE       =9,     /* Request server to suspend sending data */
- RT_PAUSE_ACK   =10,    /* Server is paused message */
- RT_OPTION      =11,    /* Option request */
- RT_KEYCHANGE   =12,    /* Anonymisation key has changed */ 
+ RT_HELLO       =1,     /**< Connection accepted */
+ RT_START       =2,     /**< Request for data transmission to begin */
+ RT_ACK         =3,     /**< Data acknowledgement */
+ RT_STATUS      =4,     /**< Fifo status packet */
+ RT_DUCK        =5,     /**< Dag duck info packet */
+ RT_END_DATA    =6,     /**< Server is exiting message */
+ RT_CLOSE       =7,     /**< Client is exiting message */
+ RT_DENY_CONN   =8,     /**< Connection has been denied */
+ RT_PAUSE       =9,     /**< Request server to suspend sending data */
+ RT_PAUSE_ACK   =10,    /**< Server is paused message */
+ RT_OPTION      =11,    /**< Option request */
+ RT_KEYCHANGE   =12,    /**< Anonymisation key has changed */ 
+ RT_DUCK_2_4    =13,    /**< Dag 2.4 Duck */
+ RT_DUCK_2_5    =14,    /**< Dag 2.5 Duck */
  
  RT_DATA_ERF            =RT_DATA_SIMPLE + TRACE_FORMAT_ERF, 
@@ -76 +79 @@
 } fifo_info_t;
 
-/* RT packet header */
+/** RT packet header */
 typedef struct rt_header {
         enum rt_field_t type;
@@ -84 +87 @@
 
 /* TODO: Reorganise this struct once more hello info is added */
+/** RT Hello packet sub-header */
 typedef struct rt_hello {
         uint8_t reliable;
@@ -94 +98 @@
 #endif
 
+/** RT Ack sub-header */
 typedef struct rt_ack {
         uint32_t sequence;
 } rt_ack_t;
 
+/** RT Status sub-header */
 typedef struct rt_status {
         fifo_info_t fifo_status;
@@ -120 +126 @@
 #endif
 
-/* Connection denied reasons */
+/** Connection denied reasons */
 enum rt_conn_denied_t {
  RT_DENY_WRAPPER        =1,
@@ -127 +133 @@
 };
 
+/** RT Denied Connection sub-header */
 typedef struct rt_deny_conn {
         enum rt_conn_denied_t reason;
@@ -155 +162 @@
 #endif
 
-#endif
+/** Specifications of duck structures - duck2_4 and duck2_5 match Endace's
+ * duck_inf and duckinf_t respectively */
+
+/** DAG 2.4 DUCK */
+typedef struct duck2_4 {
+        uint32_t        Command;
+        uint32_t        Config;
+        uint32_t        Clock_Inc;
+        uint32_t        Clock_Wrap;
+        uint32_t        DDS_Rate;
+        uint32_t        Crystal_Freq;
+        uint32_t        Synth_Freq; 
+        uint32_t        Sync_Rate;
+        uint64_t        Last_Ticks;
+        uint32_t        Resyncs;
+        uint32_t        Bad_Diffs;
+        uint32_t        Bad_Offs;
+        uint32_t        Bad_Pulses;
+        uint32_t        Worst_Error;
+        uint32_t        Worst_Off;
+        uint32_t        Off_Limit;
+        uint32_t        Off_Damp;
+        uint32_t        Pulses;
+        uint32_t        Single_Pulses_Missing;
+        uint32_t        Longest_Pulse_Missing;
+        uint32_t        Health;
+        uint32_t        Sickness;
+        int32_t         Error;
+        int32_t         Offset;
+        time_t          Stat_Start;
+        time_t          Stat_End;   
+        uint32_t        Set_Duck_Field;
+} duck2_4_t;
+
+/** DAG 2.5 DUCK */
+typedef struct duck2_5 {
+        uint32_t        Crystal_Freq;
+        uint32_t        Synth_Freq;
+        uint64_t        Last_Ticks;
+        uint32_t        Resyncs;
+        uint32_t        Bad_Pulses;
+        uint32_t        Worst_Freq_Err;
+        uint32_t        Worst_Phase_Err;
+        uint32_t        Health_Thresh;
+        uint32_t        Pulses;
+        uint32_t        Single_Pulses_Missing;
+        uint32_t        Longest_Pulse_Missing;
+        uint32_t        Health;
+        uint32_t        Sickness;
+        int32_t         Freq_Err;
+        int32_t         Phase_Err;
+        uint32_t        Set_Duck_Field;
+        time_t          Stat_Start;
+        time_t          Stat_End;
+        uint64_t        Last_TSC;
+} duck2_5_t;
+
+typedef struct rt_duck_2_4 {
+        duck2_4_t duck;
+} rt_duck_2_4_t;
+
+typedef struct rt_duck_2_5 {
+        duck2_5_t duck;
+} rt_duck_2_5_t;
+
+#endif