aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-08-02 06:45:51 +0000
committerGuy Harris <guy@alum.mit.edu>2012-08-02 06:45:51 +0000
commit4fc130af79b89a98e8779cb1dec70bb16b1a5c9d (patch)
tree6559450c87b7f6eac1f455575b5d05b7d6af933e /wiretap/wtap.c
parent3e09bb9bf1b3187e1c706597c55c05be522a8884 (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/wtap.c')
-rw-r--r--wiretap/wtap.c5
1 files changed, 4 insertions, 1 deletions
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);