Commit Graph

6346 Commits

Author SHA1 Message Date
Guy Harris ddf3c6140b Fully initialize an ncp_req_hash_value after allocating it.
svn path=/trunk/; revision=6431
2002-10-15 17:31:20 +00:00
Guy Harris a03e90ad09 From Hannes Gredler: dissect the graceful restart capability in BGP OPEN
messages.

svn path=/trunk/; revision=6430
2002-10-15 17:19:06 +00:00
Guy Harris 01bd6435e4 We'll be building a protocol tree for all NDS Ping packets, so we can
just wrap the entire dissection in an "if", as was done before.
(Actually, we can just skip the "if" entirely, I guess....)

svn path=/trunk/; revision=6429
2002-10-15 07:47:57 +00:00
Guy Harris 35eba08c92 Set the "req_nds_flags" field for an NDS Ping request regardless of
whether we're building a protocol tree or not.

Set the separator if we put "Revision" into the summary.

Check for a remaining length >= 8, not > 8, to check for an NDS version
10 or later ping, and check the reported length, not the captued length.

svn path=/trunk/; revision=6428
2002-10-15 07:36:16 +00:00
Guy Harris d54e50d6a2 From Jason House: include <winsock2.h> early in "wtap-int.h" on Win32
builds with zlib - "zlib.h", alas, includes <winsock.h>, and you can't
include <winsock.h> before including <winsock2.h> (at least you can
include <winsock2.h> before including <winsock.h>; thank heaven for
small favors).

svn path=/trunk/; revision=6427
2002-10-15 05:38:01 +00:00
Guy Harris f0269dd749 Squelch some compiler warnings.
svn path=/trunk/; revision=6426
2002-10-15 05:29:48 +00:00
Guy Harris 86576ce6ac When registering a protocol, make sure there are no other protocols with
the same long name, short name, or filter name, and abort if there are.

Fix the duplicate names that found (and another name error found while
fixing one of those errors).

svn path=/trunk/; revision=6425
2002-10-15 05:21:07 +00:00
Guy Harris e0e7122674 Add a new port type, PT_IPX, for IPX socket numbers; set "pinfo->ptype",
"pinfo->srcport", and "pinfo->destport" appropriately in the IPX
dissector.  Add support for PT_IPX port types in display columns.

Have an "spx.socket" dissector table, similar to the "ipx.socket"
dissector table, and have the SPX dissector use that, with the IPX
socket numbers from "pinfo->srcport" and "pinfo->destport", so that
dissectors for protocols that run atop SPX can register with particular
socket numbers.  (Think of it as similar to what would have been the
case had the IP header had 16-bit source and destination port numbers,
and had TCP and UDP used those port numbers rather than having port
numbers in their headers.)  Also, have the SPX dissector dissect
subprotocols regardless of whether we're building a protocol tree or not.

Use the dissector handle for the IPX message dissector for both IPX
socket numbers; there's no need to create separate handles for both
registrations.

Have NDPS register as a subdissector of the SPX dissector, using
"spx.socket", and get rid of the duplicate SPX dissection in the NDPS
dissector.

Make the NDPS dissector set the columns regardless of whether a protocol
tree is being built, and clean up the dissector (fixing some bugs).

Get rid of unneeded includes in "packet-ndps.c".

svn path=/trunk/; revision=6424
2002-10-15 04:31:00 +00:00
Guy Harris ab89e89f78 Fix the file name in the initial comment.
Fix a typo in Gerald's e-mail address.

svn path=/trunk/; revision=6423
2002-10-15 04:26:24 +00:00
Guy Harris 87226d31a3 Fix a typo in Gerald's e-mail address.
svn path=/trunk/; revision=6422
2002-10-15 04:25:42 +00:00
Gerald Combs efe9c01caf Fix more typing issues. Pull the marker, length, and type individually
instead of copying them into a struct.  Remove the "bgp" struct, as it is
no longer used.  Gracefuly (more than before, at least) handle a zero
packet length.

svn path=/trunk/; revision=6421
2002-10-15 03:47:47 +00:00
Gerald Combs 9afeafe88e Fix signed/unsigned type mismatches, as pointed out by Silvio.
Add BGP output to randpkt.

svn path=/trunk/; revision=6420
2002-10-15 02:29:54 +00:00
Guy Harris e0a7988e6d From Thierry Pelle: IPv6CP support.
svn path=/trunk/; revision=6419
2002-10-14 23:23:20 +00:00
Olivier Abad ec3cb87a27 Another problem found by valgrind :
in continue_tail_cap_file, the following test :
else if (*err != 0)
sometimes reads uninitialized memory (so the test might be incorrect).

We now set *err to 0 at the beginning of the function.

svn path=/trunk/; revision=6418
2002-10-14 19:59:51 +00:00
Olivier Abad 75fb72f86e 1- We were writing 1 byte past the end of the buffer in register_tap
(bug found with valgrind) :
  td->name = malloc(strlen(name));
  strcpy(td->name, name);

Replaced with :
  td->name = g_strdup(name);

2 - Use g_malloc instead of malloc (both were used).

svn path=/trunk/; revision=6417
2002-10-14 19:45:08 +00:00
Guy Harris 63d65a3f69 From Ulf Lamping: count ARP packets in capture progress dialog box.
svn path=/trunk/; revision=6416
2002-10-14 17:33:50 +00:00
Guy Harris a236ba90d0 From Mike Frisch: fix problems with SETCLIENTID and SETCLIENTID_REPLY
decoding.

svn path=/trunk/; revision=6415
2002-10-14 17:08:53 +00:00
Guy Harris 6af349418a Create the temporary tree if we're *not* building a protocol tree
already, not if we *are*.

svn path=/trunk/; revision=6414
2002-10-14 16:47:56 +00:00
Guy Harris f58cd0bd5c Fetch the pointer to a string before allocating memory for the string,
so that if the string length is bogus and large, we'll throw an
exception in "tvb_get_ptr()" rather than crashing when we fail to
allocate the memory.

svn path=/trunk/; revision=6413
2002-10-11 21:58:25 +00:00
Guy Harris e4b32038a7 Make the flag buffer in "dissect_ping_req()" large enough to hold the
longest possible flag string.

Don't create a temporary protocol tree unless we're not filling in a
protocol tree.

The NDS version isn't present in NDS pings prior to version 10; dissect
it only if it's present.

svn path=/trunk/; revision=6412
2002-10-11 21:52:11 +00:00
Guy Harris b348f66dd4 Note that "dissect_ping_req()" duplicates a bunch of stuff in
"dissect_ncp_request()".

Fix "dissect_ping_req()" to properly put the NDS version in a ping
request into the tree (although that field isn't present in the ping
requests I've seen, so perhaps it's only in NDS version 10 and later),
as big-endian (change FALSE to TRUE if it's little-endian).

Get rid of the unused "ncp_nds_verb" variable (set, but not used) in
"dissect_ncp_common()".

Call "dissect_ping_req()" from "dissect_ncp_common()" again.

svn path=/trunk/; revision=6411
2002-10-11 19:36:13 +00:00
Guy Harris 4f471acc34 Fix some spelling errors.
svn path=/trunk/; revision=6410
2002-10-10 23:52:51 +00:00
Guy Harris cda87c4a51 Mark some fields as NDS fields.
svn path=/trunk/; revision=6409
2002-10-10 23:41:27 +00:00
Guy Harris 15c6ff4f2f Rename "ncp.nds_string" to "ncp.nds_tree_name", as it's not a generic
string, it's a tree name (as the field's display name suggests).

Get rid of the unused "ncp.nds_string_value" field.

Fix up the names of some fields, and use "proto_tree_add_uint()" rather
than "proto_tree_add_uint_format()" to add them to the protocol tree.

svn path=/trunk/; revision=6408
2002-10-10 23:32:01 +00:00
Guy Harris ce4a4b3149 Fix up the handling of bitfields in NDS messages - get rid of extra
blanks, and don't put the list of flag values in if no bits are set.

svn path=/trunk/; revision=6407
2002-10-10 23:06:00 +00:00
Guy Harris c0baecc0bb "tm_isdst" must be set to -1 before "mktime()" is called, so that
"mktime()" bases the DST-vs-non-DST decision on the date/time and on the
current time zone.

svn path=/trunk/; revision=6406
2002-10-10 21:47:12 +00:00
Guy Harris ccab7497b2 "proto_tree_add_string_format()" requires that the string value be
passed as an argument before the format string; fix some calls to do so.

svn path=/trunk/; revision=6405
2002-10-10 21:24:59 +00:00
Guy Harris d6377805f5 When deciding whether to put "NDS" into the protocol field in the packet
list, check whether the protocol field is enabled, not whether the info
field is enabled.  Update the protocol field before trying to look at
the packet, so it gets updated even for short packets.

Only parse service reply packets as NDS packets; don't parse positive
ack packets that way.

svn path=/trunk/; revision=6404
2002-10-10 21:08:45 +00:00
Guy Harris 6ea504c2e2 Remove an extra blank in the Connection Control field display.
svn path=/trunk/; revision=6403
2002-10-10 21:05:05 +00:00
Guy Harris 9cefef1869 As we are (correctly) calling the IP dissector regardless of whether a
protocol tree is being built or not, we must also construct a tvbuff to
hand to that dissector regardless of whether a protocol tree is being
built or not.

svn path=/trunk/; revision=6402
2002-10-10 20:36:37 +00:00
Ed Warnicke b1241274d3 Fixed minor error in call ordering.
svn path=/trunk/; revision=6401
2002-10-10 19:06:04 +00:00
Guy Harris b3af4098d2 Don't attach the string for an NDS error to the completion code - attach
the string for the completion code.  Do put the string for the NDS error
into the summary line, however.

Don't clear the NDS error code if we can't translate it to a string.

svn path=/trunk/; revision=6400
2002-10-10 03:58:47 +00:00
Guy Harris 9a4b466497 "#if 0" out the code in "get_string()", as it will probably cause
crashes on many platforms, and other random behavior on others.

Don't create a temporary tree with an NCP tree underneath it if we
already have an NCP tree; we don't want the results of a dissection to
be stuck in an invisible temporary tree if we're supposed to be
generating a protocol tree.

svn path=/trunk/; revision=6399
2002-10-10 03:25:47 +00:00
Guy Harris 445a6bb87c Clean up white space.
Redo the stuff to check for various NDS requests to use a switch
statement, and #if 0-out the code to handle NDS Pings specially, as the
Novell documentation on their Web site and at least one capture I've
seen suggest that there's nothing but a function and subfunction code in
the ping request.

svn path=/trunk/; revision=6398
2002-10-10 03:03:30 +00:00
Jörg Mayer 687e8d11ba Add (back) some #include <string.h>
svn path=/trunk/; revision=6397
2002-10-10 02:57:13 +00:00
Jörg Mayer 6f032efe5c Backout previous patch - the warning was left intentionally
svn path=/trunk/; revision=6396
2002-10-10 02:18:41 +00:00
Jörg Mayer 0792646ea8 Silence an unjustified warning
svn path=/trunk/; revision=6395
2002-10-10 01:53:34 +00:00
Jörg Mayer 34141201f2 Add (back) some #include <string.h>
svn path=/trunk/; revision=6394
2002-10-10 01:49:21 +00:00
Jörg Mayer 6859b2caa6 Increase addr outside of macro
svn path=/trunk/; revision=6393
2002-10-10 01:45:25 +00:00
Gerald Combs 0a0aeffdb5 Properly check the return value of decode_prefix4(). This prevents an
infinite loop caused by a malformed packet.

svn path=/trunk/; revision=6392
2002-10-10 01:36:53 +00:00
Guy Harris 57c62c7879 From Didier Gautheron: add AFP 3.1's FPEnumerateExt2 call, and add a
warning when TCP or UDP ports are reused in different conversations.

svn path=/trunk/; revision=6391
2002-10-09 23:16:46 +00:00
Jörg Mayer 1b626a140a Add a missing #include <string.h>
svn path=/trunk/; revision=6390
2002-10-09 23:03:11 +00:00
Jörg Mayer 110f9caebc Support for both old and brand new libtool versions
svn path=/trunk/; revision=6389
2002-10-09 22:58:53 +00:00
Gerald Combs 7000420817 Update formatting, library information.
svn path=/trunk/; revision=6388
2002-10-09 13:39:17 +00:00
Guy Harris 2dcc8ee1fc From Ulf Lamping: keep "Update list of packets in real time" from
crashing on Windows.

svn path=/trunk/; revision=6387
2002-10-09 08:18:37 +00:00
Gerald Combs bd4ad18aeb Zlib and Net-SNMP updates.
svn path=/trunk/; revision=6386
2002-10-09 03:17:36 +00:00
Gerald Combs ec8fd2703a Link to libsnmp under Win32.
In gtk/main.c and tethereal.c set MIBDIRS to <get_program_path()>\snmp\mibs
so that we can drop the MIB files there, instead of the default c:\usr\...
path.

Add NET_SNMP_DIR to config.nmake and modify Makefile.nmake to adjust
CFLAGs, ethereal_LIBS and tethereal_LIBS accordingly.

Define HAVE_UCD_SNMP in config.h.win32.

I tested this by creating c:\program files\ethereal\snmp\mibs and
dropping in the MIB files that come with Net-SNMP.  Ethereal resolved
system.sysDescr.0 to "iso.3.6.1.2.1.1.1.0" under Windows.  Under Linux
it resolved to "SNMPv2-MIB::sysDescr.0".

Ethereal.nsi still needs to be updated.

A compiled version of the Net-SNMP library can be found at

    http://www.ethereal.com/distribution/win32/development/

svn path=/trunk/; revision=6385
2002-10-09 03:07:34 +00:00
Jörg Mayer 6743236a10 Remove experimental (and faulty) stuff that leaked in while adding a dissecotor in 1.500
svn path=/trunk/; revision=6384
2002-10-09 00:48:10 +00:00
Ashok Narayanan 58d356ad94 - Fixed RRO flag support that got dropped in the previous commit.
- Added support for FRR as per draft-ietf-mpls-rsvp-lsp-fastreroute-00.txt

svn path=/trunk/; revision=6383
2002-10-08 23:29:15 +00:00
Guy Harris c7d181b565 From Senthil Kumar Nagappan: fix a "proto_tree_add_uint()" call that was
supposed to be a "proto_tree_add_item()" call.

svn path=/trunk/; revision=6382
2002-10-08 19:35:10 +00:00