Changeset 7787d72 for libpacketdump

Timestamp:

08/18/06 17:26:13 (15 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:

09d3bef

Parents:

404210e

Message:

Remove C++ dependancies

Location:

libpacketdump

Files:

• link_0.cc (modified) (1 diff)
• link_10.cc (modified) (2 diffs)
• link_11.cc (modified) (1 diff)
• link_2.cc (modified) (1 diff)
• link_4.cc (modified) (1 diff)
• link_6.cc (modified) (1 diff)
• link_9.cc (modified) (2 diffs)

libpacketdump/link_0.cc

@@ -5 +5 @@
 #include "libpacketdump.h"
 
-extern "C"
 void decode(int link_type,char *packet,int len)
 {

libpacketdump/link_10.cc

@@ -6 +6 @@
 #include "libtrace.h"
 
-extern "C"
 void decode(int link_type,char *packet,int len)
 {
@@ -12 +11 @@
         printf(" Legacy Framing:");
         if (len>=12) {
-                uint16_t type = htons(*(uint16_t*)(packet+sizeof(libtrace_atm_cell)+4));
+                uint16_t type = htons(*(uint16_t*)(packet+sizeof(libtrace_atm_cell_t)+4));
                 printf(" %04x\n",type);
-                decode_next(packet+sizeof(libtrace_atm_cell) + 4,
-                                len-sizeof(libtrace_atm_cell) -4, 
+                decode_next(packet+sizeof(libtrace_atm_cell_t) + 4,
+                                len-sizeof(libtrace_atm_cell_t) -4, 
                                 "eth",type);
         }

libpacketdump/link_11.cc

@@ -5 +5 @@
 #include "libpacketdump.h"
 
-extern "C"
 void decode(int link_type,char *packet,int len)
 {

libpacketdump/link_2.cc

@@ -6 +6 @@
 #include "libpacketdump.h"
 
-extern "C"
 void decode(int link_type,char *packet,int len)
 {

libpacketdump/link_4.cc

@@ -32 +32 @@
 };
 
-extern "C"
 void decode(int link_type,char *packet,int len)
 {

libpacketdump/link_6.cc

@@ -1 +1 @@
 #include "libpacketdump.h"
 
-extern "C"
 void decode(int link_type,char *packet,int len)
 {

libpacketdump/link_9.cc

@@ +1 @@
+#include "libpacketdump.h"
+#include "libtrace.h"
 #include <netinet/in.h>
 #include <stdio.h>
 #include <inttypes.h>
 #include <dlfcn.h>
-#include "libpacketdump.h"
 
-extern "C"
 void decode(int link_type,char *packet,int len)
 {
@@ -13 +13 @@
         if (len>=4) {
                 uint16_t type = htons(
-                                ((libtrace_pos *)packet)->ether_type);
+                                ((libtrace_pos_t *)packet)->ether_type);
                 printf(" %04x\n",type);
-                decode_next(packet+sizeof(libtrace_pos),
-                                len-sizeof(libtrace_pos),
+                decode_next(packet+sizeof(libtrace_pos_t),
+                                len-sizeof(libtrace_pos_t),
                                 "eth",type);
         }