Changeset a82a9e8

Timestamp:

05/18/18 11:39:59 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, etsilive, master, rc-4.0.4, ringdecrementfix, ringperformance

Children:

044d8bc

Parents:

fa555ec

git-author:

Shane Alcock <salcock@…> (03/19/18 17:06:31)

git-committer:

Shane Alcock <salcock@…> (05/18/18 11:39:59)

Message:

Fix bad link ID for ETSI headers in libpacketdump.

The recent merge with the ERF provenance support had bumped ETSI
from linktype 21 to linktype 22, causing libpacketdump decoding
to fail because there was no module for linktype 22.

Location:

libpacketdump

Files:

• Makefile.am (modified) (2 diffs)
• link_22.c (moved) (moved from libpacketdump/link_21.c)

libpacketdump/Makefile.am

@@ -61 +61 @@
 TXT_PROTOCOLS+=link_17.protocol
 
-# 21: ETSI LI
-BIN_PROTOCOLS+=link_21.la
+# 22: ETSI LI
+BIN_PROTOCOLS+=link_22.la
 
 # Decoders for various ethertypes (in decimal)
@@ -138 +138 @@
 link_11_la_LDFLAGS=$(modflags)
 link_15_la_LDFLAGS=$(modflags) 
-link_21_la_LDFLAGS=$(modflags) 
+link_22_la_LDFLAGS=$(modflags) 
 eth_0_la_LDFLAGS=$(modflags)
 eth_2048_la_LDFLAGS=$(modflags)