osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

* Added in Laurent's OSI/ISO CNLP and COTP support. 

* Added Laurent's changes to the man (actually pod) page.
* Copied in VERSION file so that others can make doc/Makefile

svn path=/trunk/; revision=8
daniel/osmux
Gerald Combs 1998-09-17 02:01:50 +00:00
parent 576024f903
commit 19176fbb4f
11 changed files with 1749 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AUTHORS
View File

@ -22,13 +22,22 @@ Mike Hall <mlh@io.com>{
}
Bobo Rajec <bobo@bsp-consulting.sk> {
/* add your info here */
DNS protocol support
}
Laurent Deniel <deniel@worldnet.fr> {
http://www.worldnet.fr/~deniel
Name resolution
ISO/OSI CLNP/COTP support
Miscellaneous enhancements and fixes
}
Don Lafontaine <lafont02@cn.ca> {
/* add your info here */
}
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
Makefile.am
View File

@ -20,6 +20,7 @@ ethereal_SOURCES = \
packet-ip.c \
packet-ipv6.c \
packet-ipx.c \
packet-osi.c \
packet-ospf.c \
packet-ppp.c \
packet-raw.c \

97
Makefile.in
View File

@ -89,6 +89,7 @@ ethereal_SOURCES = \
packet-ip.c \
packet-ipv6.c \
packet-ipx.c \
packet-osi.c \
packet-ospf.c \
packet-ppp.c \
packet-raw.c \
@ -144,9 +145,9 @@ LIBS = @LIBS@
ethereal_OBJECTS = capture.o ethereal.o ethertype.o file.o filter.o \
menu.o packet.o packet-arp.o packet-bootp.o packet-data.o packet-dns.o \
packet-eth.o packet-llc.o packet-lpd.o packet-ip.o packet-ipv6.o \
packet-ipx.o packet-ospf.o packet-ppp.o packet-raw.o packet-rip.o \
packet-tcp.o packet-tr.o packet-trmac.o packet-udp.o print.o ps.o \
resolv.o util.o
packet-ipx.o packet-osi.o packet-ospf.o packet-ppp.o packet-raw.o \
packet-rip.o packet-tcp.o packet-tr.o packet-trmac.o packet-udp.o \
print.o ps.o resolv.o util.o
ethereal_LDADD = $(LDADD)
ethereal_LDFLAGS =
CFLAGS = @CFLAGS@
@ -165,6 +166,15 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP = --best
DEP_FILES = .deps/capture.P .deps/ethereal.P .deps/ethertype.P \
.deps/file.P .deps/filter.P .deps/menu.P .deps/packet-arp.P \
.deps/packet-bootp.P .deps/packet-data.P .deps/packet-dns.P \
.deps/packet-eth.P .deps/packet-ip.P .deps/packet-ipv6.P \
.deps/packet-ipx.P .deps/packet-llc.P .deps/packet-lpd.P \
.deps/packet-osi.P .deps/packet-ospf.P .deps/packet-ppp.P \
.deps/packet-raw.P .deps/packet-rip.P .deps/packet-tcp.P \
.deps/packet-tr.P .deps/packet-trmac.P .deps/packet-udp.P \
.deps/packet.P .deps/print.P .deps/ps.P .deps/resolv.P .deps/util.P
SOURCES = $(ethereal_SOURCES) $(EXTRA_ethereal_SOURCES)
OBJECTS = $(ethereal_OBJECTS)
@ -173,9 +183,9 @@ all: Makefile $(PROGRAMS) $(MANS) config.h
.SUFFIXES:
.SUFFIXES: .S .c .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@ -233,9 +243,6 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
.c.o:
$(COMPILE) -c $<
.s.o:
$(COMPILE) -c $<
@ -356,6 +363,11 @@ distdir: $(DISTFILES)
-rm -rf $(distdir)
mkdir $(distdir)
-chmod 777 $(distdir)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
$(mkinstalldirs) $(distdir)/doc $(distdir)/image
@for file in $(DISTFILES); do \
d=$(srcdir); \
@ -363,41 +375,30 @@ distdir: $(DISTFILES)
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file; \
done
capture.o: capture.c config.h packet.h file.h capture.h etypes.h util.h \
image/icon-excl.xpm
ethereal.o: ethereal.c config.h packet.h file.h ethereal.h menu.h \
etypes.h print.h resolv.h
ethertype.o: ethertype.c config.h packet.h ethereal.h etypes.h
file.o: file.c config.h packet.h file.h ethereal.h util.h \
image/icon-excl.xpm
filter.o: filter.c config.h filter.h packet.h file.h menu.h
menu.o: menu.c config.h menu.h ethereal.h capture.h filter.h packet.h \
print.h
packet-arp.o: packet-arp.c config.h ethereal.h packet.h etypes.h
packet-bootp.o: packet-bootp.c config.h packet.h ethereal.h etypes.h
packet-data.o: packet-data.c config.h ethereal.h packet.h
packet-dns.o: packet-dns.c config.h packet.h
packet-eth.o: packet-eth.c config.h packet.h ethereal.h etypes.h
packet-ip.o: packet-ip.c config.h ethereal.h packet.h etypes.h resolv.h
packet-ipv6.o: packet-ipv6.c config.h ethereal.h packet.h packet-ipv6.h \
etypes.h
packet-ipx.o: packet-ipx.c config.h ethereal.h packet.h
packet-llc.o: packet-llc.c config.h packet.h ethereal.h etypes.h
packet-lpd.o: packet-lpd.c config.h packet.h ethereal.h etypes.h
packet-ospf.o: packet-ospf.c config.h ethereal.h packet.h packet-ospf.h
packet-ppp.o: packet-ppp.c config.h packet.h ethereal.h
packet-raw.o: packet-raw.c config.h packet.h ethereal.h
packet-rip.o: packet-rip.c config.h ethereal.h packet.h packet-rip.h
packet-tcp.o: packet-tcp.c config.h ethereal.h packet.h
packet-tr.o: packet-tr.c config.h packet.h ethereal.h etypes.h
packet-trmac.o: packet-trmac.c config.h packet.h ethereal.h etypes.h
packet-udp.o: packet-udp.c config.h ethereal.h packet.h resolv.h
packet.o: packet.c config.h packet.h ethereal.h etypes.h file.h
print.o: print.c config.h packet.h print.h
ps.o: ps.c ps.h
resolv.o: resolv.c config.h packet.h resolv.h
util.o: util.c config.h util.h image/icon-excl.xpm
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-include $(DEP_FILES)
mostlyclean-depend:
clean-depend:
distclean-depend:
maintainer-clean-depend:
-rm -rf .deps
%.o: %.c
@echo '$(COMPILE) -c $<'; \
$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
%.lo: %.c
@echo '$(LTCOMPILE) -c $<'; \
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
< .deps/$(*F).p > .deps/$(*F).P
@-rm -f .deps/$(*F).p
info:
dvi:
check: all
@ -435,19 +436,20 @@ maintainer-clean-generic:
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
mostlyclean: mostlyclean-hdr mostlyclean-binPROGRAMS \
mostlyclean-compile mostlyclean-tags \
mostlyclean-compile mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
clean: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
clean-generic mostlyclean
clean-depend clean-generic mostlyclean
distclean: distclean-hdr distclean-binPROGRAMS distclean-compile \
distclean-tags distclean-generic clean
distclean-tags distclean-depend distclean-generic clean
-rm -f config.status
maintainer-clean: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
maintainer-clean-compile maintainer-clean-tags \
maintainer-clean-generic distclean
maintainer-clean-depend maintainer-clean-generic \
distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-rm -f config.status
@ -458,7 +460,8 @@ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile install-man1 uninstall-man1 install-man \
uninstall-man tags mostlyclean-tags distclean-tags clean-tags \
maintainer-clean-tags distdir info dvi installcheck install-exec \
maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
clean-depend maintainer-clean-depend info dvi installcheck install-exec \
install-data install uninstall all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean

1
VERSION Normal file
View File

@ -0,0 +1 @@
0.3.16

2
config.h.in
View File

@ -1,7 +1,5 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
/* $Id: config.h.in,v 1.2 1998/09/16 03:21:53 gerald Exp $ */
/* Define if your processor stores words with the most significant
byte first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN

4
configure.in
View File

@ -1,8 +1,8 @@
# $Id: configure.in,v 1.2 1998/09/16 03:21:53 gerald Exp $
# $Id: configure.in,v 1.3 1998/09/17 02:01:46 gerald Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(etypes.h)
AM_INIT_AUTOMAKE(ethereal, 0.3.15)
AM_INIT_AUTOMAKE(ethereal, 0.3.16)
dnl Checks for programs.
AC_PROG_CC

29
doc/ethereal.pod
View File

@ -6,14 +6,18 @@ Ethereal - Interactively browse network traffic
=head1 SYNOPSYS
B<ethereal>
S<[ B<-v> ]>
S<[ B<-B> byte view height ]>
S<[ B<-b> bold font ]>
S<[ B<-c> count ]>
S<[ B<-h> ]>
S<[ B<-i> interface ]>
S<[ B<-m> font ]>
S<[ B<-n> ]>
S<[ B<-P> packet list height ]>
S<[ B<-r> infile ]>
S<[ B<-s> snaplen ]>
S<[ B<-T> tree view height ]>
S<[ B<-v> ]>
S<[ B<-w> savefile]>
=head1 DESCRIPTION
@ -30,15 +34,32 @@ you interactively browse packet data from a live network or from a B<pcap>
Sets the initial height of the byte view (bottom) pane
=item -b
The bold font name used for packet fied display.
=item -c
The default number of packets to read when capturing live data.
=item -h
Prints the version and options and exits.
=item -i
The name of the interface to use for live packet capture. It should match
one of the names listed in "B<netstat -i>" or "B<ifconfig -a>".
=item -m
The font name used by B<Ethereal>.
=item -n
Disable network object name resolution (such as hostname, TCP and UDP port
names).
=item -P
Sets the initial height of the packet list (top) pane
@ -223,10 +244,12 @@ B<http://ethereal.zing.org>.
Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
Hannes R. Boehm <hannes@boehm.org>
Mike Hall <mlh@io.com>
cpg <cpg@rocketmail.com>
Bobo Rajec <bobo@bsp-consulting.sk>
Laurent Deniel <deniel@worldnet.fr>
Don Lafontaine <lafont02@cn.ca>
Theo de Raadt <deraadt@cvs.openbsd.org> was kind enough to give his
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.
Dan Lasley <dlasley@promus.com> gave permission for his dumpit() hex-dump

44
ethereal.1
View File

@ -1,12 +1,11 @@
.rn '' }`
''' $RCSfile: ethereal.1,v $$Revision: 1.1 $$Date: 1998/09/16 02:39:18 $
''' $RCSfile: ethereal.1,v $$Revision: 1.2 $$Date: 1998/09/17 02:01:47 $
'''
''' $Log: ethereal.1,v $
''' Revision 1.1 1998/09/16 02:39:18 gerald
''' Initial revision
'''
''' Revision 1.1.1.1 1998/08/30 17:53:24 gerald
''' Imported sources
''' Revision 1.2 1998/09/17 02:01:47 gerald
''' * Added in Laurent's OSI/ISO CNLP and COTP support.
''' * Added Laurent's changes to the man (actually pod) page.
''' * Copied in VERSION file so that others can make doc/Makefile
'''
'''
.de Sh
@ -99,7 +98,7 @@
.nr % 0
.rr F
.\}
.TH ETHEREAL 1 "0.3.8" "24/Aug/98" "The Ethereal Network Analyzer"
.TH ETHEREAL 1 "0.3.16" "16/Sep/98" "The Ethereal Network Analyzer"
.UC
.if n .hy 0
.if n .na
@ -197,14 +196,18 @@
Ethereal \- Interactively browse network traffic
.SH "SYNOPSYS"
\fBethereal\fR
[\ \fB\-v\fR\ ]
[\ \fB\-B\fR\ byte\ view\ height\ ]
[\ \fB\-b\fR\ bold\ font\ ]
[\ \fB\-c\fR\ count\ ]
[\ \fB\-h\fR\ ]
[\ \fB\-i\fR\ interface\ ]
[\ \fB\-m\fR\ font\ ]
[\ \fB\-n\fR\ ]
[\ \fB\-P\fR\ packet\ list\ height\ ]
[\ \fB\-r\fR\ infile\ ]
[\ \fB\-s\fR\ snaplen\ ]
[\ \fB\-T\fR\ tree\ view\ height\ ]
[\ \fB\-v\fR\ ]
[\ \fB\-w\fR\ savefile]
.SH "DESCRIPTION"
\fBEthereal\fR is a network protocol analyzer based on the \fBGTK+\fR GUI toolkit. It lets
@ -213,11 +216,20 @@ you interactively browse packet data from a live network or from a \fBpcap\fR
.SH "OPTIONS"
.Ip "-B" 4
Sets the initial height of the byte view (bottom) pane
.Ip "-b" 4
The bold font name used for packet fied display.
.Ip "-c" 4
The default number of packets to read when capturing live data.
.Ip "-h" 4
Prints the version and options and exits.
.Ip "-i" 4
The name of the interface to use for live packet capture. It should match
one of the names listed in \*(L"\fBnetstat \-i\fR\*(R" or \*(L"\fBifconfig \-a\fR\*(R".
.Ip "-m" 4
The font name used by \fBEthereal\fR.
.Ip "-n" 4
Disable network object name resolution (such as hostname, \s-1TCP\s0 and \s-1UDP\s0 port
names).
.Ip "-P" 4
Sets the initial height of the packet list (top) pane
.Ip "-r" 4
@ -335,15 +347,17 @@ The latest version of \fBethereal\fR can be found at
\& -------- ------
\& Gerald Combs <gerald@zing.org>
.Ve
.Vb 6
.Vb 8
\& Contributors
\& ------------
\& Gilbert Ramirez Jr. <gram@verdict.uthscsa.edu>
\& Hannes R. Boehm <hannes@boehm.org>
\& Mike Hall <mlh@io.com>
\& cpg <cpg@rocketmail.com>
\& Bobo Rajec <bobo@bsp-consulting.sk>
\& Laurent Deniel <deniel@worldnet.fr>
\& Don Lafontaine <lafont02@cn.ca>
.Ve
Theo de Raadt <deraadt@cvs.openbsd.org> was kind enough to give his
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.
.Sp
Dan Lasley <dlasley@promus.com> gave permission for his \fIdumpit()\fR hex-dump
@ -363,10 +377,18 @@ routine to be used.
.IX Item "-B"
.IX Item "-b"
.IX Item "-c"
.IX Item "-h"
.IX Item "-i"
.IX Item "-m"
.IX Item "-n"
.IX Item "-P"
.IX Item "-r"

5
packet-llc.c
View File

@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@verdict.uthscsa.edu>
*
* $Id: packet-llc.c,v 1.2 1998/09/16 03:22:06 gerald Exp $
* $Id: packet-llc.c,v 1.3 1998/09/17 02:01:47 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@ -157,6 +157,9 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) {
case 0xe0: /* NetWare (IPX) */
dissect_ipx(pd, offset, fd, tree);
break;
case 0xfe: /* ISO Network Layer */
dissect_osi(pd, offset, fd, tree);
break;
default:
dissect_data(pd, offset, fd, tree);
break;

1617
packet-osi.c Normal file
View File

File diff suppressed because it is too large Load Diff

7
packet.h
View File

@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
* $Id: packet.h,v 1.2 1998/09/16 03:22:14 gerald Exp $
* $Id: packet.h,v 1.3 1998/09/17 02:01:49 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -282,9 +282,11 @@ typedef struct _e_udphdr {
#define ETT_BOOTP 31
#define ETT_BOOTP_OPTION 32
#define ETT_IPv6 33
#define ETT_CLNP 34
#define ETT_COTP 35
/* Should be the last item number plus one */
#define NUM_TREE_TYPES 34
#define NUM_TREE_TYPES 36
/* The version of pcap.h that comes with some systems is missing these
* #defines.
@ -342,6 +344,7 @@ void dissect_ipv6(const u_char *, int, frame_data *, GtkTree *);
void dissect_ipx(const u_char *, int, frame_data *, GtkTree *);
void dissect_llc(const u_char *, int, frame_data *, GtkTree *);
void dissect_lpd(const u_char *, int, frame_data *, GtkTree *);
void dissect_osi(const u_char *, int, frame_data *, GtkTree *);
void dissect_ospf(const u_char *, int, frame_data *, GtkTree *);
void dissect_ospf_hello(const u_char *, int, frame_data *, GtkTree *);
void dissect_tcp(const u_char *, int, frame_data *, GtkTree *);