Changeset 8013711 for lib

Timestamp:

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

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.

Location:

lib

Files:

• format_erf.c (modified) (6 diffs)
• format_pcap.c (modified) (1 diff)
• format_wag.c (modified) (1 diff)
• libtrace.h (modified) (2 diffs)
• rt_protocol.h (modified) (1 diff)

lib/format_erf.c

@@ -486 +486 @@
         memcpy(packet->buffer, erfptr, size);
         
-        packet->status = 0;
+        packet->status.type = RT_DATA;
+        packet->status.message = 0;
         packet->size = size;
         DAG.offset += size;
@@ -526 +527 @@
                 return -1;
         }
-        packet->status = 0;
+        packet->status.type = RT_DATA;
+        packet->status.message = 0;
         packet->size = rlen;
         return rlen;
@@ -565 +567 @@
                 return -1;
         }
-        packet->status = 0;
+        packet->status.type = RT_DATA;
+        packet->status.message = 0;
         packet->size = rlen;
         return rlen;
@@ -619 +622 @@
                 // Read status byte
                 if (tracefifo_out_read(libtrace->fifo,
-                                &packet->status, sizeof(uint32_t)) == 0) {
+                                &packet->status, sizeof(rt_status_t)) == 0) {
                         read_required = 1;
                         continue;
                 }
-                tracefifo_out_update(libtrace->fifo,sizeof(uint32_t));
+                tracefifo_out_update(libtrace->fifo,sizeof(rt_status_t));
 
                 // read in the ERF header
@@ -633 +636 @@
                 }
                 
-                if (packet->status >= S_MESSAGE_ONLY) {
+                if (packet->status.type == RT_MSG) {
                         // Need to skip this packet as it is a message packet
                         tracefifo_out_update(libtrace->fifo, dag_record_size);
-                        tracefifo_ack_update(libtrace->fifo, dag_record_size + sizeof(uint32_t));
+                        tracefifo_ack_update(libtrace->fifo, dag_record_size + sizeof(rt_status_t));
                         continue;
                 }
@@ -653 +656 @@
                 tracefifo_out_update(libtrace->fifo,size);
 
-                tracefifo_ack_update(libtrace->fifo,size + sizeof(uint32_t));
+                tracefifo_ack_update(libtrace->fifo,size + sizeof(rt_status_t));
 
                 packet->size = numbytes;

lib/format_pcap.c

@@ -228 +228 @@
                 return pcapbytes;
         }
-        packet->status = 0;
+        packet->status.type = RT_DATA;
+        packet->status.message = 0;
         return (packet->size - sizeof(struct pcap_pkthdr));
 }

lib/format_wag.c

@@ -326 +326 @@
                 tracefifo_ack_update(libtrace->fifo,size);
 
-                packet->status = 0;
+                packet->status.type = RT_DATA;
+                packet->status.message = 0;
                 packet->size = numbytes;
                 return numbytes;

lib/libtrace.h

@@ -34 +34 @@
 #include <sys/types.h>
 #include <netinet/in.h>
-
+#include "rt_protocol.h"
 /** API version as 2 byte hex digits, eg 0xXXYYZZ */
 #define LIBTRACE_API_VERSION 0x020016  /* 2.0.22 */
@@ -95 +95 @@
         char buffer[LIBTRACE_PACKET_BUFSIZE];
         size_t size;
-        uint32_t status;
+        rt_status_t status;
 };
                      

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_