aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/iptrace.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>1999-07-28 01:35:34 +0000
committerGerald Combs <gerald@wireshark.org>1999-07-28 01:35:34 +0000
commitc7e8a7e855bc3dcd4393ca600b9af81012aa2f2f (patch)
tree16d55298c9778f18b09de55668adbb9bb1e5df5c /wiretap/iptrace.c
parentb080b90479069c376bf68c3af81670533f5f2c61 (diff)
Added a patch from Olivier Abad to handle X.25 iptrace captures.
svn path=/trunk/; revision=390
Diffstat (limited to 'wiretap/iptrace.c')
-rw-r--r--wiretap/iptrace.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c
index 166d409f4f..87fc5501b7 100644
--- a/wiretap/iptrace.c
+++ b/wiretap/iptrace.c
@@ -1,6 +1,6 @@
/* iptrace.c
*
- * $Id: iptrace.c,v 1.4 1999/07/13 02:53:23 gram Exp $
+ * $Id: iptrace.c,v 1.5 1999/07/28 01:35:34 gerald Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@@ -110,6 +110,12 @@ int iptrace_read(wtap *wth)
else if (if_name1 == 'f' && if_name2 == 'd') {
wth->phdr.pkt_encap = WTAP_ENCAP_FDDI;
}
+ else if (if_name1 == 'l' && if_name2 == 'o') { /* loopback */
+ wth->phdr.pkt_encap = WTAP_ENCAP_RAW_IP;
+ }
+ else if (if_name1 == 'x' && if_name2 == 'd') { /* X.25 */
+ wth->phdr.pkt_encap = WTAP_ENCAP_RAW_IP;
+ }
else {
wth->phdr.pkt_encap = WTAP_ENCAP_NONE;
}