Changeset 5cdb37d for libpacketdump

Timestamp:

02/13/19 10:32:17 (2 years ago)

Author:

GitHub <noreply@…>

Branches:

develop

Children:

33c9a91, fc85f33

Parents:

1c3f8d2 (diff), 4e5a51f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Shane Alcock <salcock@…> (02/13/19 10:32:17)

git-committer:

GitHub <noreply@…> (02/13/19 10:32:17)

Message:

Merge pull request #101 from jacobvw/meta-api

Meta API

Location:

libpacketdump

Files:

• Makefile.am (modified) (2 diffs)
• libpacketdump.cc (modified) (7 diffs)
• libpacketdump.h (modified) (1 diff)
• link_21.c (added)
• link_23.c (added)

libpacketdump/Makefile.am

@@ -61 +61 @@
 TXT_PROTOCOLS+=link_17.protocol
 
+#22: ERF META
+BIN_PROTOCOLS+=link_21.la
+
 # 22: ETSI LI
 if HAVE_WANDDER
 BIN_PROTOCOLS+=link_22.la
 endif
+
+#23: PCAPNG
+BIN_PROTOCOLS+=link_23.la
 
 # Decoders for various ethertypes (in decimal)
@@ -140 +146 @@
 link_11_la_LDFLAGS=$(modflags)
 link_15_la_LDFLAGS=$(modflags) 
+link_21_la_LDFLAGS=$(modflags)
 if HAVE_WANDDER
 link_22_la_LDFLAGS=$(modflags) 
 endif
+link_23_la_LDFLAGS=$(modflags)
 eth_0_la_LDFLAGS=$(modflags)
 eth_2048_la_LDFLAGS=$(modflags)

libpacketdump/libpacketdump.cc

@@ -41 +41 @@
 #ifdef HAVE_NETINET_IF_ETHER_H
 #  include <netinet/if_ether.h>
-#endif 
+#endif
 #include <dlfcn.h>
 #include <map>
@@ -57 +57 @@
 
 typedef void (*decode_norm_t)(uint16_t type,const char *packet,int len);
+typedef void (*decode_norm_meta)(uint16_t type,const char *packet,int len,libtrace_packet_t *p);
 typedef void (*decode_parser_t)(uint16_t type,const char *packet,int len, element_t* el);
+
+libtrace_packet_t *p;
 
 typedef union decode_funcs {
     decode_norm_t decode_n;
+    decode_norm_meta decode_meta;
     decode_parser_t decode_p;
 } decode_funcs_t;
@@ -130 +134 @@
                         (int)trace_get_wire_length(packet),
                         (int)trace_get_direction(packet));
-        
 
         formatted_hexdump(pkt_ptr, (int)length);
@@ -138 +141 @@
 void trace_dump_packet(struct libtrace_packet_t *packet)
 {
+        p = packet;
+
         time_t sec = (time_t)trace_get_seconds(packet);
         libtrace_linktype_t linktype;
         uint32_t length;
         const char *link=(char *)trace_get_packet_buffer(packet,&linktype,NULL);
-        
+
         length = trace_get_capture_length(packet);
-
         printf("\n%s",ctime(&sec));
         printf(" Capture: Packet Length: %i/%i Direction Value: %i\n",
@@ -150 +154 @@
                         (int)trace_get_wire_length(packet),
                         (int)trace_get_direction(packet));
+
         if (!link) 
                 printf(" [No link layer available]\n");
         else
-                decode_next(link,length, "link",
-                        linktype);
+                decode_next(link,length, "link", linktype);
 }
 
@@ -223 +227 @@
                 hdl = open_so_decoder(sname.c_str(),type);
                 if (hdl) {
-                        void *s=dlsym(hdl,"decode");
+
+                        /* PCAPNG format requires the libtrace_packet_t structure in order
+                         * to determine the byte ordering */
+                        void *s;
+                        if (type == TRACE_TYPE_PCAPNG_META || type == TRACE_TYPE_ERF_META) {
+                                s=dlsym(hdl,"decode_meta");
+                                if (s) { func->decode_meta = (decode_norm_meta)s; }
+                        } else {
+                                s=dlsym(hdl,"decode");
+                                if (s) { func->decode_n = (decode_norm_t)s; }
+                        }
+
                         if (s) {
-                                // use the shared library
-                                func->decode_n = (decode_norm_t)s;
                                 dec.style = DECODE_NORMAL;
                                 dec.el = NULL; 
@@ -294 +307 @@
         {
                 case DECODE_NORMAL:
-                        decoders[sname][type].func->decode_n(type,packet,len);
+                        /* If this is a pcapng packet call the correct function and pass the
+                         * libtrace_packet_t structure. We need this to determine the byte ordering */
+                        if (type == TRACE_TYPE_PCAPNG_META || type == TRACE_TYPE_ERF_META) {
+                                decoders[sname][type].func->decode_meta(type,packet,len,p);
+                        } else {
+                                decoders[sname][type].func->decode_n(type,packet,len);
+                        }
                         break;
 

libpacketdump/libpacketdump.h

@@ -55 +55 @@
 
 void decode(int link_type, const char *pkt, unsigned len);
+void decode_meta(int link_type, const char *pkt, unsigned len, libtrace_packet_t *p);
 
 #ifdef __cplusplus