diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-08-02 06:45:51 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-08-02 06:45:51 +0000 |
| commit | 4fc130af79b89a98e8779cb1dec70bb16b1a5c9d (patch) | |
| tree | 6559450c87b7f6eac1f455575b5d05b7d6af933e /wiretap | |
| parent | 3e09bb9bf1b3187e1c706597c55c05be522a8884 (diff) | |
From Richard Stearn: AX.25 KISS protocol support.
Part 1 of the fix for bug 7529.
svn path=/trunk/; revision=44202
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 88ee1461b3..b43a504326 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -339,6 +339,8 @@ static const struct { { 199, WTAP_ENCAP_IPMB }, /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */ { 201, WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR }, + /* AX.25 packet with a 1-byte KISS header */ + { 202, WTAP_ENCAP_AX25_KISS }, /* LAPD frame */ { 203, WTAP_ENCAP_LAPD }, /* PPP with pseudoheader */ diff --git a/wiretap/wtap.c b/wiretap/wtap.c index bab54455a5..9431af403b 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -591,7 +591,10 @@ static struct encap_type_info encap_table_base[] = { { "SDH", "sdh" }, /* WTAP_ENCAP_DBUS */ - { "D-Bus", "dbus" } + { "D-Bus", "dbus" }, + + /* WTAP_ENCAP_AX25_KISS */ + { "AX.25 with KISS header", "ax25-kiss" }, }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 2c9538cb5f..9a55ce543f 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -237,6 +237,7 @@ extern "C" { #define WTAP_ENCAP_IEEE_802_11_AIROPEEK 145 #define WTAP_ENCAP_SDH 146 #define WTAP_ENCAP_DBUS 147 +#define WTAP_ENCAP_AX25_KISS 148 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |