diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-08-02 16:54:43 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-08-02 16:54:43 +0000 |
| commit | 835111692f4a1313deb4d699a376e4496f8eabb2 (patch) | |
| tree | 450e1533309ed244373923da34cafe84adca7b1c /wiretap | |
| parent | 89e6169fc56576893c9ffedc0541994b73521c0d (diff) | |
From Richard Stearn: support for AX.25, including support for
LINKTYPE_AX25.
svn path=/trunk/; revision=44211
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 1 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index b43a504326..f1655020d6 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -87,6 +87,7 @@ static const struct { */ { 0, WTAP_ENCAP_NULL }, /* null encapsulation */ { 1, WTAP_ENCAP_ETHERNET }, + { 3, WTAP_ENCAP_AX25 }, { 6, WTAP_ENCAP_TOKEN_RING }, /* IEEE 802 Networks - assume token ring */ { 7, WTAP_ENCAP_ARCNET }, { 8, WTAP_ENCAP_SLIP }, diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 9431af403b..204c1e2b00 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -595,6 +595,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_AX25_KISS */ { "AX.25 with KISS header", "ax25-kiss" }, + + /* WTAP_ENCAP_AX25 */ + { "Amateur Radio AX.25", "ax25" }, }; 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 9a55ce543f..9e0397af17 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -238,6 +238,7 @@ extern "C" { #define WTAP_ENCAP_SDH 146 #define WTAP_ENCAP_DBUS 147 #define WTAP_ENCAP_AX25_KISS 148 +#define WTAP_ENCAP_AX25 149 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |