Changeset da8b03e for lib

Timestamp:

08/04/05 17:42:41 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

df2dff9

Parents:

77bd94f

Message:

used macros to improve readability

File:

• lib/format_erf.c (modified) (11 diffs)

lib/format_erf.c

@@ -64 +64 @@
 #define CONNINFO libtrace->format_data->conn_info
 #define INPUT libtrace->format_data->input
+#define OUTPUT libtrace->format_data->output
 #define DAG libtrace->format_data->dag
+#define OPTIONS libtrace->format_data->options
 struct libtrace_format_data_t {
         union {
@@ -275 +277 @@
                 calloc(1,sizeof(struct libtrace_format_data_out_t));
 
-        libtrace->format_data->options.erf.level = 1;
-        asprintf(&filemode,"wb%d",libtrace->format_data->options.erf.level);
+        OPTIONS.erf.level = 1;
+        asprintf(&filemode,"wb%d",OPTIONS.erf.level);
 
         if (!strncmp(libtrace->uridata,"-",1)) {
@@ -314 +316 @@
         // extract conn_info from uridata
         if (strlen(uridata) == 0) {
-                libtrace->conn_info.rt.hostname = NULL;
-                libtrace->conn_info.rt.port = COLLECTOR_PORT;
+                CONNINFO.rt.hostname = NULL;
+                CONNINFO.rt.port = COLLECTOR_PORT;
         }
         else {
                 if ((scan = strchr(uridata,':')) == NULL) {
-                        libtrace->conn_info.rt.hostname =
+                        CONNINFO.rt.hostname =
                                 NULL;
-                        libtrace->conn_info.rt.port =
+                        CONNINFO.rt.port =
                                 atoi(uridata);
                 } else {
-                        libtrace->format_data->conn_info.rt.hostname =
+                        CONNINFO.rt.hostname =
                                 (char *)strndup(uridata,
                                                 (scan - uridata));
-                        libtrace->format_data->conn_info.rt.port =
+                        CONNINFO.rt.port =
                                 atoi(++scan);
                 }
@@ -333 +335 @@
         
         
-        libtrace->format_data->output.rtserver = 
-                rtserver_create(libtrace->format_data->conn_info.rt.hostname,
-                                libtrace->format_data->conn_info.rt.port);
-        if (!libtrace->format_data->output.rtserver)
+        OUTPUT.rtserver = 
+                rtserver_create(CONNINFO.rt.hostname,
+                                CONNINFO.rt.port);
+        if (!OUTPUT.rtserver)
                 return 0;
         
@@ -343 +345 @@
 static int erf_config_output(struct libtrace_out_t *libtrace, int argc, char *argv[]) {
         int opt;
-        int level = libtrace->format_data->options.erf.level;
+        int level = OPTIONS.erf.level;
         optind = 1;
 
@@ -357 +359 @@
                 }
         }
-        if (level != libtrace->format_data->options.erf.level) {
+        if (level != OPTIONS.erf.level) {
                 if (level > 9 || level < 0) {
                         // retarded level choice
@@ -363 +365 @@
                         
                 } else {
-                        libtrace->format_data->options.erf.level = level;
+                        OPTIONS.erf.level = level;
                         return gzsetparams(libtrace->format_data->output.file, level, Z_DEFAULT_STRATEGY);
                 }
@@ -533 +535 @@
 
 static int rtclient_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
-        int numbytes;
-        int size;
+        int numbytes = 0;
+        int size = 0;
         char buf[RP_BUFSIZE];
-        dag_record_t *erfptr;
+        dag_record_t *erfptr = 0;
         int read_required = 0;
         
         void *buffer = 0;
+
+        packet->trace = libtrace;
         buffer = packet->buffer;
 
@@ -548 +552 @@
                                 return numbytes;
                         }
-                        assert(libtrace->fifo);
                         fifo_write(libtrace->fifo,buf,numbytes);
                         read_required = 0;
@@ -568 +571 @@
                 }
                 size = ntohs(((dag_record_t *)buffer)->rlen);
-
+                
                 // read in the full packet
                 if ((numbytes = fifo_out_read(libtrace->fifo, 
@@ -666 +669 @@
         dag_record_t *erfptr = 0;
         erfptr = (dag_record_t *)packet->buffer;
-        printf("%d\n",erfptr->type);
         switch (erfptr->type) {
                 case TYPE_ETH: return TRACE_TYPE_ETH;