Changeset 8013711 for lib/rt_protocol.h

Timestamp:

11/01/05 13:34:32 (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:

77509e9

Parents:

d18312c

Message:

Fixed rt_protocol.h so that it is no longer dependent on libfifo.
Updated format for rt protocol header - it is now 1 byte for a
packet type, 1 byte reserved and then 2 bytes to specify
any messages.
Updated various formats to use the new rt protocol header correctly.

File:

• lib/rt_protocol.h (modified) (1 diff)

lib/rt_protocol.h

@@ -39 +39 @@
 #endif
 
-#include <libfifo.h>
-
-#define CAPTURE_PORT 3434
-#define COLLECTOR_PORT 3435
-
 #define MAXDATASIZE 65536
 
-// Server status codes
-#define S_KEYCHANGE 1 // Encryption key has changed, flush collection to disk
-#define S_DISKWARN 2 // Disk-backed fifo is > 75% used
-#define S_DISKCRIT 4 // Disk-backed fifo  is > 90% used
-#define S_DISKFULL 8 // Disk-backed fifo is > 95% used
-#define S_STATUS 16 // Packet is a fifo_status packet
-#define S_LOSTDATA 32 // capture restarted, flush collection to disk
-#define S_LOSTCONN 64 // connection to collector restarted, flush collection to disk
-/* ----------------------*/ 
-/* Codes for messages that cannot be parsed by libtrace */ 
-#define S_ALLCONN 128 // Already someone connected. Go away
-#define S_DUCKINFO 256 // Duck information packet
-#define S_FINISH 512 // No more data - close connection
-#define S_ACCEPT 1024 // Connection accepted
+#define RT_DATA 1
+#define RT_MSG 2
 
-#define S_MESSAGE_ONLY S_ALLCONN
+typedef struct rt_status {
+        uint8_t type;
+        uint8_t reserved;
+        uint16_t message;
+} rt_status_t;
 
-// fifo_state_t is a tricky data type to transmit and receive so
-// it's easier to create a specialised structure
-typedef struct fifo_info {
-        fifo_offset_t length;
-        fifo_offset_t used;
-        fifo_offset_t in;
-        fifo_offset_t out;
-        fifo_offset_t ack;
-} fifo_info_t;
-
-typedef struct fifo_status {
-        fifo_info_t fifo;
-} fifo_status_t;
-
-typedef struct duck_info {
-        duck_inf duck;
-} duck_info_t;
 
 typedef struct packet_header {
-        uint32_t message;
+        rt_status_t header;
         dag_record_t erf;
 } packet_header_t;
 
 typedef struct ack_packet {
-        uint32_t header;
+        rt_status_t header;
         long long int ts;
 } ack_packet_t;
 
-// Client message codes
-#define M_HALT_CAPTURE 1        // Request to halt capture
-#define M_START_CAPTURE 2       // Request to restart capture
-#define M_CONFIGURE 4           // Configuration info follows
-#define M_ACK 8                 // Ack
-
 #endif // _RT_PROTOCOL_H_