diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | ethereal.c | 3 | ||||
| -rw-r--r-- | wiretap/iptrace.c | 8 |
3 files changed, 13 insertions, 2 deletions
@@ -113,6 +113,10 @@ Johan Feyaerts <Johan.Feyaerts@siemens.atea.be> { RADIUS } +Olivier Abad <Olivier.Abad@capway.com> { + X.25 support in iptrace files +} + Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/ethereal.c b/ethereal.c index 5121e83e00..12501f0ed0 100644 --- a/ethereal.c +++ b/ethereal.c @@ -1,6 +1,6 @@ /* ethereal.c * - * $Id: ethereal.c,v 1.64 1999/07/27 02:04:35 guy Exp $ + * $Id: ethereal.c,v 1.65 1999/07/28 01:35:25 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -166,6 +166,7 @@ about_ethereal( GtkWidget *w, gpointer data ) { "Aaron Hillegass <aaron@classmax.com>\n" "Jason Lango <jal@netapp.com>\n" "Johan Feyaerts <Johan.Feyaerts@siemens.atea.be>\n" + "Olivier Abad <Olivier.Abad@capway.com>\n" "\nSee http://ethereal.zing.org for more information", VERSION, comp_info_str); 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; } |