Commit Graph

137 Commits

Author SHA1 Message Date
Ronnie Sahlberg beb5e5e4e6 Update ipx and conversation list to make it possible to select and filter for ipx conversations from the conversation list popup menu
svn path=/trunk/; revision=8599
2003-10-03 09:09:35 +00:00
Ronnie Sahlberg 38e52de283 Add endpoint talker support for IPX
svn path=/trunk/; revision=8240
2003-08-24 05:38:23 +00:00
Ronnie Sahlberg ffa253abd0 Minor update to IPX. Move a lot of proto_tree_add_items outside of the if(tree) where the subtree is (optionally) created.
svn path=/trunk/; revision=8239
2003-08-24 05:21:01 +00:00
Ronnie Sahlberg 48cb09e9b2 Add a tap to the IPX protocol
svn path=/trunk/; revision=8238
2003-08-24 05:17:51 +00:00
Guy Harris 2e5aa10e16 The source and destination networks are FT_IPXNET, not an integral type,
so use "proto_tree_add_ipxnet" routines, not "proto_tree_add_uint"
routines.

svn path=/trunk/; revision=8135
2003-08-05 05:45:04 +00:00
Guy Harris a6e6a7a364 From Greg Morris, with some changes: add "ipx.net", "ipx.node", and
"ipx.socket" hidden fields, which appear both for the source and
destination addresses and socket numbers.

svn path=/trunk/; revision=8131
2003-08-04 23:55:39 +00:00
Guy Harris 43189e4e44 Add support for some additional SAPs for Netware and OSI.
svn path=/trunk/; revision=7824
2003-06-10 05:38:52 +00:00
Guy Harris d8fd06424e Don't show a string for datastream types other than the ones known to
SPX.

For the datastream types known to SPX, display it in the Info column.

svn path=/trunk/; revision=7451
2003-04-14 01:26:57 +00:00
Guy Harris e1e43d42dc Some packets (the ones I've seen have a datastream type of
"End-of-Connection Acknolwedgment") have none of the connection control
bits set; describe them as "Data, No Ack Required" rather than
"Unknown".

svn path=/trunk/; revision=7443
2003-04-12 07:48:36 +00:00
Guy Harris 4f697a69f3 An SPX packet is not a retransmission of an earlier packet unless the
two packets have the same sequence number; use the sequence number in
the hash key.

The sequence number is not incremented for system packets, and system
packets probably don't get ACKed and thus presumably don't get
retransmitted, so don't do retransmission checks for system packets.

svn path=/trunk/; revision=7442
2003-04-12 07:35:52 +00:00
Guy Harris 6f8439dc1b You can't put an FT_FRAMENUM into the tree with a length of -1, so, for
a retransmitted SPX frame, just put the number of the original frame in
as an item not referring to any data (offset and length of 0), and, if
there is any remaining data, put it into the tree as a separate item.

svn path=/trunk/; revision=7440
2003-04-12 05:36:10 +00:00
Guy Harris 5311e02789 Make the individual flag bits in the Connection Control field of the SPX
header be filterable fields.

Don't hand retransmitted SPX frames to subdissectors - just show the
payload as a retransmission of the original frame.

Instead of handing a retransmission indicator to SPX subdissectors, hand
them a structure containing the datastream type (under the assumption
that it's data for the protocol running atop SPX, and that the dissector
for that protocol might use it) and the state of the end-of-message bit
(under the assumption that it's data for the protocol running atop SPX).

svn path=/trunk/; revision=7433
2003-04-09 22:33:19 +00:00
Guy Harris 0cb78e6508 Instead of using passing the SPX hash value to subdissectors, attach to
frames that are retransmissions a data structure containing the frame
number of the original frame, and pass that to subdissectors (or, if not
present, pass NULL).

That means we can free the hash values when we're done with the first
pass through the packets.

svn path=/trunk/; revision=7432
2003-04-09 20:45:04 +00:00
Guy Harris 072e149f3c Move the definition of the structure constructed for each SPX
transmission (and shared by all retransmissions), and passed to SPX
subdissectors, to "packet-ipx.h", and use the same structure in the SPX
dissector and the NDPS dissector.

Set up conversations and those structures without checking whether we've
seen the packet before or not; just check whether we find the
conversation before creating a new one, and check whether we find a
structure for the packet before creating a new one.  Pass it to the
subdissector regardless of whether we've seen the packet before or not,
and check it in the NDPS dissector regardless of whether we've seen it
before or not.

Don't store a "retransmission" flag in the structure - the initial
transmission and the retransmissions all share a single data structure,
but they don't all have the same value for the "retransmission" flag,
and you can tell whether a packet is a retransmission or not by
comparing its frame number with the frame number from the structure; if
they're different, it's a retransmission.

svn path=/trunk/; revision=7418
2003-04-08 02:00:54 +00:00
Guy Harris 8f3dc97d59 From Greg Morris: update the introductory comment, and flag SPX
retransmissions in the Info column.

svn path=/trunk/; revision=7414
2003-04-08 00:39:27 +00:00
Guy Harris 7cf778fe23 Choosing the lower-numbered socket in an IPX packet as the first one to
try as a port number doesn't always give the right answer, as you might
have a name query packet from an SMB-over-IPX server, meaning it's from
IPX_SOCKET_NWLINK_SMB_SERVER to IPX_SOCKET_NWLINK_SMB_NAMEQUERY, and,
unfortunately, IPX_SOCKET_NWLINK_SMB_SERVER is less than
IPX_SOCKET_NWLINK_SMB_NAMEQUERY and it'll now be dissected as an SMB
packet rather than an NMPI name query packet.

So if the higher-numbered socket is IPX_SOCKET_NWLINK_SMB_NAMEQUERY, we
just try that, we don't try the other port.

svn path=/trunk/; revision=7409
2003-04-06 22:50:00 +00:00
Guy Harris 6974083659 Add a dissector for the IPX WAN protocol. "IPX WAN 2" is just some
compatible additions to the RFC 1362 IPX WAN protocol, so call it "IPX
WAN", not "IPX WAN 2".

svn path=/trunk/; revision=7407
2003-04-06 02:32:38 +00:00
Guy Harris 19616a2b5f Add dissector for NetWare Link Services Protocol.
Socket 0x9001 is for NLSP - it supports LANs as well as WANs, at least
as I read the specification.

Socket 0x9004 is for "IPX WAN 2".

svn path=/trunk/; revision=7387
2003-03-31 08:10:08 +00:00
Guy Harris 4c3b13dd11 Get rid of the "sap_server_ident" structure - just fetch stuff from that
structure in the packet as required.

The server name in that structure is not necessarily null-terminated;
use "%.48s", not "%s", to print it.

svn path=/trunk/; revision=7038
2003-01-30 05:21:34 +00:00
Guy Harris 94aa5a707c Support BACNET over ARCNET, under the assumption that no fragmentation
is done.

Support "Novell EC" over ARCNET, under the assumption that it's just
another way of sending IPX over ARCNET.

svn path=/trunk/; revision=6988
2003-01-23 09:54:54 +00:00
Guy Harris 59932f2722 Don't cast away constness, and fix variable and structure member
qualifiers as necessary to ensure that we don't have to.

"strcmp()", "strcasecmp()", and "memcmp()" don't return booleans; don't
test their results as if they did.

Use "guint8", not "guchar", for a pointer to (one or more) 8-bit bytes.

Update Michael Tuexen's e-mail address.

svn path=/trunk/; revision=6726
2002-12-02 23:43:30 +00:00
Guy Harris ff9dc1e77b Only hand off the SPX payload to a subdissector if there's payload to
hand off.

svn path=/trunk/; revision=6457
2002-10-19 01:17:13 +00:00
Guy Harris 27df774d0b From Peter Fales: ARCNET support.
Sort the lists of dissectors in the DISSECTOR_SRC macros in
"Makefile.am" and "Makefile.nmake".

svn path=/trunk/; revision=6450
2002-10-18 21:00:01 +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 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 138a12ce60 Set the Info column in the SPX dissector regardless of whether we're
building a protocol tree or not.

Fix up white space.

svn path=/trunk/; revision=6378
2002-10-08 09:29:48 +00:00
Jörg Mayer 37c599b47d Dissector for Novell Distributed Print Services by Greg Morris.
NDPS runs on top of SPX and TCP.

svn path=/trunk/; revision=6323
2002-09-23 17:14:54 +00:00
Guy Harris 810fd98f01 From Greg Morris: handle watchdog packets on socket 4003 as well as
socket 4001.

svn path=/trunk/; revision=6264
2002-09-10 23:47:07 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Jörg Mayer 173fe5aef4 Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.

svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
Guy Harris 9743031080 Update a comment.
svn path=/trunk/; revision=5817
2002-07-04 20:47:28 +00:00
Guy Harris 9d3dbbba72 Add signature characters for IPX message watchdog positive replies and
"broadcast message waiting" indications.

When handing off dissection from the IPX dissector:

	Check the socket numbers before we check the packet type;
	we've seen IPX message packets with a type of NCP and a
	destination socket of IPX_SOCKET_IPX_MESSAGE, and SAP
	packets with a type of NCP and a destination socket of
	IPX_SOCKET_SAP.

	Assume the lower-numbered socket number is more likely
	to be the right one, along the lines of what we do for
	TCP and UDP.  We've seen NCP packets with a type of NCP,
	a source socket of IPX_SOCKET_NCP, and a destination
	socket of IPX_SOCKET_IPX_MESSAGE, and we've seen NCP
	packets with a type of NCP, a source socket of
	IPX_SOCKET_IPX_MESSAGE, and a destination socket of
	IPX_SOCKET_NCP.

svn path=/trunk/; revision=5810
2002-07-02 07:32:04 +00:00
Guy Harris bb6d838f6f Fix the capitalization of NetWare.
svn path=/trunk/; revision=5767
2002-06-26 07:39:48 +00:00
Guy Harris b0c474a84e From Markus Steinmann: add IPX SAP for SEH's InterCon Printserver.
svn path=/trunk/; revision=5764
2002-06-25 20:31:22 +00:00
Guy Harris 8a5d5f9bde From Joerg Mayer: get rid of extra arguments to capture routines.
svn path=/trunk/; revision=5233
2002-04-24 06:03:34 +00:00
Guy Harris d92a1cd8e1 With the tvbuffication of all dissectors, the "packet_info" structure no
longer contains length fields, so there's no need to pass a "packet_info
*" argument to "set_actual_length()".

svn path=/trunk/; revision=4748
2002-02-17 00:51:21 +00:00
Guy Harris eb2d6593dc Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls in
arguments to "proto_tree_add_text()", and to "proto_tree_add_XXX()" calls
that add FT_NONE or FT_PROTO items to the protocol tree, with -1.

Replace some calls to "tvb_length()" or "tvb_length_remaining()" with
calls to "tvb_reported_length()" and "tvb_reported_length_remaining()",
as those give the actual length of the data in the packet, not just the
data that happened to be captured.

svn path=/trunk/; revision=4605
2002-01-24 09:20:54 +00:00
Guy Harris 961e0cdfa2 Convert some "col_add_str()" calls to "col_set_str()".
svn path=/trunk/; revision=4592
2002-01-21 23:35:32 +00:00
Guy Harris ee5ca25d31 Include files from the "epan" directory and subdirectories thereof with
"epan/..." pathnames, so as to avoid collisions with header files in any
of the directories in which we look (e.g., "proto.h", as some other
package has its own "proto.h" file which it installs in the top-level
include directory).

Don't add "-I" flags to search "epan", as that's no longer necessary
(and we want includes of "epan" headers to fail if the "epan/" is left
out, so that we don't re-introduce includes lacking "epan/").

svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
Guy Harris 23319ff023 Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.

That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.

svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
Guy Harris 75cc056222 Attach a descriptive name field type and base to dissector tables; that
specifies how the selector values used as keys in those tables are to be
displayed, and the title to use when displaying the table.

Use that information in the code to display the initial and current
entries of various dissector tables.

Have the dissector for BACnet APDUs register itself by name, and have
the BACnet NPDU dissector call it iff the BAC_CONTROL_NET bit isn't set,
rather than doing it with a dissector table.

svn path=/trunk/; revision=4358
2001-12-08 06:41:48 +00:00
Guy Harris bced8711f6 Make "dissector_add()", "dissector_delete()", and "dissector_change()"
take a dissector handle as an argument, rather than a pointer to a
dissector function and a protocol ID.  Associate dissector handles with
dissector table entries.

svn path=/trunk/; revision=4308
2001-12-03 04:00:26 +00:00
Ed Warnicke 34dbc86e65 Moved from using dissect_data to using call_dissector()
svn path=/trunk/; revision=4264
2001-11-25 22:51:14 +00:00
Guy Harris 7844e88862 Remove a duplicate entry from the SAP table, and move an entry in that
table to the proper sorted location.

svn path=/trunk/; revision=4261
2001-11-25 01:28:00 +00:00
Guy Harris 0083eb5f81 Throw in a large pile of additional SAP values.
svn path=/trunk/; revision=4260
2001-11-25 01:13:27 +00:00
Guy Harris e8d4f4f0ac Make the capture routines take an additional argument giving the amount
of packet data captured.

Make the "BYTES_ARE_IN_FRAME()" macro take a "captured length of the
packet" argument.

Add some length checks to capture routines.

svn path=/trunk/; revision=4235
2001-11-20 21:59:18 +00:00
Gilbert Ramirez f14a6b8b91 Hopefully the last time I have to change my e-mail address.
svn path=/trunk/; revision=4199
2001-11-13 23:55:44 +00:00
Guy Harris 959334aecd Use "val_to_str()", rather than "match_strval()", in "socket_text()".
Make the source and destination socket fields enumerated types, so we
don't have to use "proto_tree_add_uint_format()" on them, and so that
you can match on them by service name.

Use lower-case letters when formatting the hex value of sockets; that's
what's done with fields not added with "proto_tree_add_XXX_format".

svn path=/trunk/; revision=4046
2001-10-20 18:10:39 +00:00
Nathan Neulinger c33977e21f add a couple of socket numbers that seem to be consistently allocated for these services
svn path=/trunk/; revision=4012
2001-10-08 18:20:01 +00:00
Guy Harris 541af0c740 Use the "pinfo" argument, rather than the global "pi", to refer to the
packet information in tvbuffified dissectors.

svn path=/trunk/; revision=3645
2001-07-03 04:56:46 +00:00