Merge the work in Novell_NCP_branch into the mainline code.

A little work still needs to be done on the new NCP dissector -- make
some of the COL_INFO texts more useful, handle a Unicode issue, and
modify some of the cases that use "request conditions".
But the NCP dissector as it stands is very usable now.

Note: I didn't merge in the PROTO_LENGTH_UNTIL_END macro... I wanted
to think about the various possible macros and review an email conversation
I had with Guy on the subject.

svn path=/trunk/; revision=5432

1 files changed, 95 insertions, 136 deletions

diff --git a/wiretap/Makefile b/wiretap/Makefile
index 4f98949098..9c5645b9e4 100644
--- a/wiretap/Makefile
+++ b/wiretap/Makefile
@@ -1,5 +1,5 @@
 # Generated automatically from Makefile.in by configure.
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -11,6 +11,31 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Makefile.am
+# Automake file for Wiretap
+#
+# $Id: Makefile,v 1.13 2002/05/09 23:50:34 gram Exp $
+#
+# Ethereal - Network traffic analyzer
+# By Gerald Combs <gerald@zing.org>
+# Copyright 1998 Gerald Combs
+#
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
 SHELL = /bin/sh
 
 srcdir = .
@@ -45,10 +70,9 @@ AUTOMAKE = automake
 AUTOHEADER = autoheader
 
 INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL}
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_FLAG =
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 transform = s,x,x,
 
 NORMAL_INSTALL = :
@@ -57,17 +81,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-AMTAR = gtar
-AMTARFLAGS = o
+host_alias = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
 CC = gcc
 CPP = gcc -E
 FLEX_PATH = 
-GLIB_CFLAGS = -I/usr/lib/glib/include
+GLIB_CFLAGS = -I/usr/include/glib-1.2 -I/usr/lib/glib/include
 GLIB_CONFIG = /usr/bin/glib-config
 GLIB_LIBS = -L/usr/lib -lglib
-GTK_CFLAGS = 
-GTK_CONFIG = 
-GTK_LIBS = 
 LEX = /usr/bin/flex
 MAKEINFO = makeinfo
 PACKAGE = libwtap.a
@@ -75,71 +96,19 @@ RANLIB = ranlib
 VERSION = 0.0.0
 YACC = bison -y
 
-# Makefile.am
-# Automake file for Wiretap
-#
-# $Id: Makefile,v 1.12 1999/09/11 04:50:43 gerald Exp $
-#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@zing.org>
-# Copyright 1998 Gerald Combs
-#
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
+ACLOCAL_AMFLAGS = `../aclocal-flags`
 
 noinst_LIBRARIES = libwiretap.a
 
 #EXTRA_LIBRARIES = libwiretap.a
 
-CLEANFILES = \
-	libwiretap.a		\
-	*~
-
-
-libwiretap_a_SOURCES = \
-	ascend-grammar.y	\
-	ascend-scanner.l	\
-	ascend.c		\
-	ascend.h		\
-	buffer.c		\
-	buffer.h		\
-	file.c			\
-	iptrace.c		\
-	iptrace.h		\
-	lanalyzer.c		\
-	lanalyzer.h		\
-	libpcap.c		\
-	libpcap.h		\
-	netmon.c		\
-	netmon.h		\
-	netxray.c		\
-	netxray.h		\
-	ngsniffer.c		\
-	ngsniffer.h		\
-	radcom.c		\
-	radcom.h		\
-	snoop.c			\
-	snoop.h			\
-	wtap.c			\
-	wtap.h
-
-
-EXTRA_DIST = \
-	config.h.win32		\
-	Makefile.nmake
+CLEANFILES =  	libwiretap.a			*~
+
+
+libwiretap_a_SOURCES =  	ascend-grammar.y		ascend-scanner.l		ascend.c			ascend.h			ascend-int.h			atm.c				atm.h				buffer.c			buffer.h			csids.c				csids.h				dbs-etherwatch.c		dbs-etherwatch.h		etherpeek.c             	etherpeek.h             	file.c				file_wrappers.c			file_wrappers.h			i4btrace.c			i4btrace.h			i4b_trace.h			iptrace.c			iptrace.h			lanalyzer.c			lanalyzer.h			libpcap.c			libpcap.h			netmon.c			netmon.h			nettl.c				nettl.h				netxray.c			netxray.h			ngsniffer.c			ngsniffer.h			pppdump.c			pppdump.h			radcom.c			radcom.h			snoop.c				snoop.h				toshiba.c			toshiba.h			visual.c			visual.h			vms.c				vms.h				wtap.c				wtap.h				wtap-int.h
+
+
+EXTRA_DIST =  	ascend-grammar.c		ascend-grammar.h		ascend-scanner.c		config.h.win32			Makefile.nmake			wtap.def
 
 
 # Any POSIX-compatible YACC should honor the -p flag
@@ -152,42 +121,44 @@ LIBRARIES =  $(noinst_LIBRARIES)
 
 
 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I.
-CPPFLAGS = 
-LDFLAGS = 
-LIBS =  -L/usr/lib -lglib
+CPPFLAGS =  -I/usr/local/include
+LDFLAGS =  -L/usr/local/lib
+LIBS = -lz  -L/usr/lib -lglib
 libwiretap_a_LIBADD = 
-am_libwiretap_a_OBJECTS =  ascend-grammar.o ascend-scanner.o ascend.o \
-buffer.o file.o iptrace.o lanalyzer.o libpcap.o netmon.o netxray.o \
-ngsniffer.o radcom.o snoop.o wtap.o
-libwiretap_a_OBJECTS =  $(am_libwiretap_a_OBJECTS)
+libwiretap_a_OBJECTS =  ascend-grammar.o ascend-scanner.o ascend.o atm.o \
+buffer.o csids.o dbs-etherwatch.o etherpeek.o file.o file_wrappers.o \
+i4btrace.o iptrace.o lanalyzer.o libpcap.o netmon.o nettl.o netxray.o \
+ngsniffer.o pppdump.o radcom.o snoop.o toshiba.o visual.o vms.o wtap.o
 AR = ar
 LEX_OUTPUT_ROOT = lex.yy
 LEXLIB = -lfl
-CFLAGS = -Wall -g -O2 -I/usr/lib/glib/include
+CFLAGS = -D_U_="__attribute__((unused))" -Wall -W -g -O2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/local/include
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES =  $(libwiretap_a_SOURCES)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
 Makefile.am Makefile.in NEWS acconfig.h acinclude.m4 aclocal.m4 \
-ascend-grammar.c ascend-grammar.h ascend-scanner.c config.h.in \
-configure configure.in
+ascend-grammar.c ascend-scanner.c config.h.in configure configure.in
 
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
+TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/ascend-grammar.P .deps/ascend-scanner.P \
-.deps/ascend.P .deps/buffer.P .deps/file.P .deps/iptrace.P \
-.deps/lanalyzer.P .deps/libpcap.P .deps/netmon.P .deps/netxray.P \
-.deps/ngsniffer.P .deps/radcom.P .deps/snoop.P .deps/wtap.P
+.deps/ascend.P .deps/atm.P .deps/buffer.P .deps/csids.P \
+.deps/dbs-etherwatch.P .deps/etherpeek.P .deps/file.P \
+.deps/file_wrappers.P .deps/i4btrace.P .deps/iptrace.P \
+.deps/lanalyzer.P .deps/libpcap.P .deps/netmon.P .deps/nettl.P \
+.deps/netxray.P .deps/ngsniffer.P .deps/pppdump.P .deps/radcom.P \
+.deps/snoop.P .deps/toshiba.P .deps/visual.P .deps/vms.P .deps/wtap.P
 SOURCES = $(libwiretap_a_SOURCES)
-OBJECTS = $(am_libwiretap_a_OBJECTS)
+OBJECTS = $(libwiretap_a_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .c .l .o .y
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/$(altdir)configure.in $(ACLOCAL_M4) 
+.SUFFIXES: .S .c .l .o .s .y
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -195,12 +166,12 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4):  configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/$(altdir)configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF) 
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
 
 config.h: stamp-h
 	@if test ! -f $@; then \
@@ -208,22 +179,18 @@ config.h: stamp-h
 		$(MAKE) stamp-h; \
 	else :; fi
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h stamp-hT
-	@echo timestamp > stamp-hT 2> /dev/null
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
-	@mv stamp-hT stamp-h
-$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in
+	@echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
 	@if test ! -f $@; then \
-		rm -f $(srcdir)/./stamp-h.in; \
-		$(MAKE) $(srcdir)/./stamp-h.in; \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
 	else :; fi
-$(srcdir)/./stamp-h.in: $(top_srcdir)/$(altdir)configure.in $(ACLOCAL_M4) acconfig.h
-	@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
-	@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
-	cd $(top_srcdir) && $(AUTOHEADER) 
-	@mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 
 mostlyclean-hdr:
 
@@ -243,6 +210,12 @@ distclean-noinstLIBRARIES:
 
 maintainer-clean-noinstLIBRARIES:
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
 	-rm -f *.o core *.core
 
@@ -252,20 +225,6 @@ distclean-compile:
 	-rm -f *.tab.c
 
 maintainer-clean-compile:
-ascend-grammar.o:
-ascend-scanner.o:
-ascend.o:
-buffer.o:
-file.o:
-iptrace.o:
-lanalyzer.o:
-libpcap.o:
-netmon.o:
-netxray.o:
-ngsniffer.o:
-radcom.o:
-snoop.o:
-wtap.o:
 
 libwiretap.a: $(libwiretap_a_OBJECTS) $(libwiretap_a_DEPENDENCIES)
 	-rm -f libwiretap.a
@@ -318,7 +277,7 @@ top_distdir = $(distdir)
 # tarfile.
 distcheck: dist
 	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
@@ -338,11 +297,11 @@ distcheck: dist
 	echo "$$dashes"
 dist: distdir
 	-chmod -R a+r $(distdir)
-	$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 	-rm -rf $(distdir)
 dist-all: distdir
 	-chmod -R a+r $(distdir)
-	$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 	-rm -rf $(distdir)
 distdir: $(DISTFILES)
 	-rm -rf $(distdir)
@@ -379,22 +338,22 @@ maintainer-clean-depend:
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $<
-	@-cp .deps/$(*D)/$(*F).pp .deps/$(*D)/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
 	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*D)/$(*F).P; \
-	rm .deps/$(*D)/$(*F).pp
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
 
 %.lo: %.c
 	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*D)/$(*F).pp -c $<
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*D)/$(*F).pp > .deps/$(*D)/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*D)/$(*F).pp \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
 	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*D)/$(*F).P; \
-	rm -f .deps/$(*D)/$(*F).pp
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -420,7 +379,7 @@ uninstall: uninstall-am
 all-am: Makefile $(LIBRARIES) config.h
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 
 
@@ -434,7 +393,7 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-	-test -z "ascend-scanner.cascend-grammar.hascend-grammar.c" || rm -f ascend-scanner.c ascend-grammar.h ascend-grammar.c
+	-test -z "ascend-scannerlascend-grammarhascend-grammarc" || rm -f ascend-scannerl ascend-grammarh ascend-grammarc
 mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
 		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
@@ -473,13 +432,13 @@ clean-tags maintainer-clean-tags distdir mostlyclean-depend \
 distclean-depend clean-depend maintainer-clean-depend info-am info \
 dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
 install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all install-strip \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 ascend-scanner.c : ascend-scanner.l
-	$(LEX) -Pascend -t $(srcdir)/ascend-scanner.l > ascend-scanner.c
+	$(LEX) -Pascend -oascend-scanner.c $(srcdir)/ascend-scanner.l
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.