From d0779386d3747175df078b41c68facb1edadb0ca Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 1 Mar 2023 20:26:24 +0100 Subject: [PATCH 1/2] pcap: add new link types --- network/pcap.ksy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/network/pcap.ksy b/network/pcap.ksy index ae617af8b..e94cf9d2a 100644 --- a/network/pcap.ksy +++ b/network/pcap.ksy @@ -223,3 +223,5 @@ enums: 294: usb_2_0_full_speed 295: usb_2_0_high_speed 296: auerswald_log + 297: zwave_tap + 298: silabs_debug_channel From 75868524ad89f7164606fa2d6c757787ab231a6e Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Wed, 1 Mar 2023 22:48:16 +0100 Subject: [PATCH 2/2] pcap: full sync with linktypes from tcpdump.org --- network/pcap.ksy | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/network/pcap.ksy b/network/pcap.ksy index e94cf9d2a..fc2315be0 100644 --- a/network/pcap.ksy +++ b/network/pcap.ksy @@ -86,28 +86,52 @@ enums: # https://www.tcpdump.org/linktypes.html 0: null_linktype 1: ethernet + 2: exp_ethernet 3: ax25 + 4: pronet + 5: chaos 6: ieee802_5 7: arcnet_bsd 8: slip 9: ppp 10: fddi + 32: redback_smartedge 50: ppp_hdlc 51: ppp_ether + 99: symantec_firewall 100: atm_rfc1483 101: raw 104: c_hdlc 105: ieee802_11 + 106: atm_clip 107: frelay 108: loop + 109: enc + 112: netbsd_hdlc 113: linux_sll 114: ltalk + 115: econet + 116: ipfilter 117: pflog + 118: cisco_ios 119: ieee802_11_prism + 120: aironet_header 122: ip_over_fc 123: sunatm + 124: rio + 125: pci_exp + 126: aurora 127: ieee802_11_radiotap + 128: tzsp 129: arcnet_linux + 130: juniper_mlppp + 131: juniper_mlfr + 132: juniper_es + 133: juniper_ggsn + 134: juniper_mfr + 135: juniper_atm2 + 136: juniper_services + 137: juniper_atm1 138: apple_ip_over_ieee1394 139: mtp2_with_phdr 140: mtp2 @@ -115,6 +139,8 @@ enums: 142: sccp 143: docsis 144: linux_irda + 145: ibm_sp + 146: ibm_sn 147: user0 148: user1 149: user2 @@ -132,19 +158,43 @@ enums: 161: user14 162: user15 163: ieee802_11_avs + 164: juniper_monitor 165: bacnet_ms_tp 166: ppp_pppd + 167: juniper_pppoe + 168: juniper_pppoe_atm 169: gprs_llc 170: gpf_t 171: gpf_f + 172: gcom_t1e1 + 173: gcom_serial + 174: juniper_pic_peer + 175: erf_eth + 176: erf_pos 177: linux_lapd + 178: juniper_ether + 179: juniper_ppp + 180: juniper_frelay + 181: juniper_chdlc 182: mfr + 183: juniper_vp + 184: a429 + 185: a653_icm + 186: usb_freebsd 187: bluetooth_hci_h4 + 188: ieee802_16_mac_cps 189: usb_linux + 190: can20b + 191: ieee802_15_4_linux 192: ppi + 193: ieee802_16_mac_cps_radio + 194: juniper_ism 195: ieee802_15_4_withfcs 196: sita 197: erf + 198: raif1 + 199: ipmb_kontron + 200: juniper_st 201: bluetooth_hci_h4_with_phdr 202: ax25_kiss 203: lapd @@ -154,9 +204,19 @@ enums: 207: lapb_with_dir 209: ipmb_linux 210: flexray + 211: most 212: lin + 213: x2e_serial + 214: x2e_xoraya 215: ieee802_15_4_nonask_phy + 216: linux_evdev + 217: gsmtap_um + 218: gsmtap_abis + 219: mpls 220: usb_linux_mmapped + 221: dect + 222: aos + 223: wihart 224: fc_2 225: fc_2_with_frame_delims 226: ipnet @@ -165,9 +225,13 @@ enums: 229: ipv6 230: ieee802_15_4_nofcs 231: dbus + 232: juniper_vs + 233: juniper_srx_e2e + 234: juniper_fibrechannel 235: dvb_ci 236: mux27010 237: stanag_5066_d_pdu + 238: juniper_atm_cemic 239: nflog 240: netanalyzer 241: netanalyzer_transparent @@ -175,11 +239,13 @@ enums: 243: mpeg_2_ts 244: ng40 245: nfc_llcp + 246: pfsync 247: infiniband 248: sctp 249: usbpcap 250: rtac_serial 251: bluetooth_le_ll + 252: wireshark_upper_pdu 253: netlink 254: bluetooth_linux_monitor 255: bluetooth_bredr_bb @@ -194,7 +260,9 @@ enums: 264: iso_14443 265: rds 266: usb_darwin + 267: openflow 268: sdlc + 269: ti_lln_sniffer 270: loratap 271: vsock 272: nordic_ble @@ -202,6 +270,7 @@ enums: 274: ethernet_mpacket 275: displayport_aux 276: linux_sll2 + 277: sercos_monitor 278: openvizsla 279: ebhscr 280: vpp_dispatch @@ -218,6 +287,7 @@ enums: 288: usb_2_0 289: atsc_alp 290: etw + 291: netanalyzer_ng 292: zboss_ncp 293: usb_2_0_low_speed 294: usb_2_0_full_speed