Changeset 1fbd938 for lib/trace.c

Timestamp:

02/16/06 11:56:02 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

880aa58

Parents:

ee5e4c7

Message:

More -pedantic cleanups
Changed the format structure (again) for pause and seek support

File:

• lib/trace.c (modified) (12 diffs)

lib/trace.c

@@ -446 +446 @@
 }
 
+int trace_pause(libtrace_t *libtrace)
+{
+        assert(libtrace);
+        assert(libtrace->started && "BUG: Called trace_pause without calling trace_start first");
+        if (libtrace->format->pause_input)
+                libtrace->format->pause_input(libtrace);
+        libtrace->started=false;
+        return 0;
+}
+
 /* Parses an output options string and calls the appropriate function to deal with output options.
  *
@@ -590 +600 @@
                 case TRACE_TYPE_80211_PRISM:
                         {
-                                struct ieee_802_11_header *wifi = (char*)trace_get_link(packet)+144;
+                                struct ieee_802_11_header *wifi = 
+                                        (void*)(
+                                         (char*)trace_get_link(packet)+144);
                                 if (!wifi) {
                                         ipptr = NULL;
@@ -605 +617 @@
 
                                         if (ntohs(eth->type) == 0x0800) {
-                                            ipptr=((void*)eth) + sizeof(*eth);
+                                            ipptr=(void*)
+                                                    ((char*)eth + sizeof(*eth));
                                         } else if (ntohs(eth->type) == 0x8100) {
                                             struct libtrace_8021q *vlanhdr =
@@ -611 +624 @@
                                             if (ntohs(vlanhdr->vlan_ether_type)
                                                             == 0x0800) {
-                                                ipptr=((void*)eth) + 
-                                                        sizeof(*vlanhdr);
+                                                ipptr=(void*)(
+                                                 (char*)eth+sizeof(*vlanhdr));
                                             }
                                         }
@@ -636 +649 @@
 
                                         if (ntohs(eth->type) == 0x0800) {
-                                            ipptr=((void*)eth) + sizeof(*eth);
+                                            ipptr=(void*)((char*)eth + sizeof(*eth));
                                         } else if (ntohs(eth->type) == 0x8100) {
                                             struct libtrace_8021q *vlanhdr =
@@ -642 +655 @@
                                             if (ntohs(vlanhdr->vlan_ether_type)
                                                             == 0x0800) {
-                                                ipptr=((void*)eth) + 
-                                                        sizeof(*vlanhdr);
+                                                ipptr=(void*)((char*)eth + 
+                                                        sizeof(*vlanhdr));
                                             }
                                         }
@@ -661 +674 @@
                                 
                                 if (ntohs(eth->ether_type)==0x0800) {
-                                        ipptr = ((void *)eth) + sizeof(*eth);
+                                        ipptr = (void*)((char *)eth + sizeof(*eth));
                                 } else if (ntohs(eth->ether_type) == 0x8100) {
                                         struct libtrace_8021q *vlanhdr = 
@@ -667 +680 @@
                                         if (ntohs(vlanhdr->vlan_ether_type) 
                                                         == 0x0800) {
-                                                ipptr = ((void *)eth) + 
-                                                        sizeof(*vlanhdr);
+                                                ipptr = (void*)((char *)eth + 
+                                                        sizeof(*vlanhdr));
                                         }
                                 }
@@ -689 +702 @@
                                 }
                                 else {
-                                        ipptr = ((void*)sll)+sizeof(*sll);
+                                        ipptr = (void*)((char*)sll+
+                                                        sizeof(*sll));
                                 }
                         }
@@ -704 +718 @@
                                         ipptr = NULL;
                                 } else {
-                                        ipptr = ((void*)pflog)+sizeof(*pflog);
+                                        ipptr = (void*)((char*)pflog+
+                                                sizeof(*pflog));
                                 }
                         }
@@ -714 +729 @@
                                         trace_get_link(packet);
                                 if (ntohs(pos->ether_type) == 0x0800) {
-                                        ipptr = ((void *)pos) + sizeof(*pos);
+                                        ipptr=(void*)((char *)pos+sizeof(*pos));
                                 } else {
-                                        ipptr = NULL;
+                                        ipptr=NULL;
                                 }
                                 break;
@@ -732 +747 @@
                                  * don't have time!
                                  */
-                                llc = (void *)llc + 4;
+                                llc = (void*)((char *)llc + 4);
                                 if (ntohs(llc->type) == 0x0800) {
-                                        ipptr = ((void *)llc) + sizeof(*llc);
+                                        ipptr=(void*)((char*)llc+sizeof(*llc));
                                 } else {
                                         ipptr = NULL;