Changeset 6dbc47a for lib/rt_protocol.h

Timestamp:

02/21/06 15:48:53 (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:

9ff68ff

Parents:

1b4901a

Message:

Updated all formats to use TRACE_FORMAT_* instead of nasty strings
format_rt is in a state where it provides basic client services
Added trace_get_format() function
libtrace_packet_t has a type field for storing format now

File:

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

lib/rt_protocol.h

@@ -7 +7 @@
 #define COLLECTOR_PORT 3435
 
+#define RT_MAX_HDR_SIZE 256
+#define MAX_SEQUENCE 2147483647 
+
 /* Type field definitions */
+/* NOTE: RT_DATA should always be zero */
 enum rt_field_t {
- RT_HELLO       =0,     /* Connection accepted */
- RT_DATA        =1,     /* Libtrace data packet */
+ RT_DATA        =0,     /* Libtrace data packet */
+ RT_HELLO       =1,     /* Connection accepted */
  RT_START       =2,     /* Request for data transmission to begin */
  RT_ACK         =3,     /* Data acknowledgement */
@@ -23 +27 @@
 };
 
-/* Format field definitions */
-enum rt_format_t {
- RT_FORMAT_ERF          =1,
- RT_FORMAT_PCAP         =2,
- RT_FORMAT_WAG          =3
-};
-
-typedef struct fifo_state {
+typedef struct fifo_info {
         uint64_t in;
         uint64_t out;
@@ -36 +33 @@
         uint64_t length;
         uint64_t used;
-} fifo_state_t;
+} fifo_info_t;
 
 /* RT packet header */
@@ -46 +43 @@
 typedef struct rt_data {
         uint16_t format;
-        char *data;
+        uint32_t sequence;
 } rt_data_t;
 
+/* TODO: Reorganise this struct once more hello info is added */
 typedef struct rt_hello {
-
+        uint8_t reliable;
 } rt_hello_t;
 
@@ -58 +56 @@
 
 typedef struct rt_ack {
-        uint64_t timestamp;
+        uint32_t sequence;
 } rt_ack_t;
 
 typedef struct rt_status {
-        fifo_state_t fifo_status;
+        fifo_info_t fifo_status;
 } rt_status_t;