Merge the work in Novell_NCP_branch into the mainline code.
authorgram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 9 May 2002 23:50:34 +0000 (23:50 +0000)
committergram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 9 May 2002 23:50:34 +0000 (23:50 +0000)
commit806d53470c084dc18baf05428b01171efb51bdc7
tree46737517f86dbb9ec37210737dd521c9c3920608
parentd76272ca47f5c7bb0db089e56563db480074643a
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5432 f5534014-38df-0310-8fa8-9805f1628bb7
20 files changed:
Makefile.am
Makefile.nmake
epan/dfilter/dfilter.c
epan/dfilter/dfilter.h
epan/dfilter/dfvm.c
epan/dfilter/dfvm.h
epan/dfilter/semcheck.c
epan/epan.c
epan/ftypes/ftype-bytes.c
epan/ftypes/ftypes.h
epan/packet.c
epan/packet.h
epan/proto.c
ncp2222.py
packet-ncp-int.h
packet-ncp.c
packet-ncp2222.inc
ptvcursor.c
ptvcursor.h
wiretap/Makefile