aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ipx.c
AgeCommit message (Collapse)AuthorFilesLines
2003-01-30Get rid of the "sap_server_ident" structure - just fetch stuff from thatGuy Harris1-267/+252
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-23Support BACNET over ARCNET, under the assumption that no fragmentationGuy Harris1-1/+2
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
2002-12-02Don't cast away constness, and fix variable and structure memberGuy Harris1-3/+3
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-10-19Only hand off the SPX payload to a subdissector if there's payload toGuy Harris1-31/+33
hand off. svn path=/trunk/; revision=6457
2002-10-18From Peter Fales: ARCNET support.Guy Harris1-1/+8
Sort the lists of dissectors in the DISSECTOR_SRC macros in "Makefile.am" and "Makefile.nmake". svn path=/trunk/; revision=6450
2002-10-15Add a new port type, PT_IPX, for IPX socket numbers; set "pinfo->ptype",Guy Harris1-4/+40
"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-10Remove an extra blank in the Connection Control field display.Guy Harris1-17/+17
svn path=/trunk/; revision=6403
2002-10-08Set the Info column in the SPX dissector regardless of whether we'reGuy Harris1-8/+10
building a protocol tree or not. Fix up white space. svn path=/trunk/; revision=6378
2002-09-23Dissector for Novell Distributed Print Services by Greg Morris.Jörg Mayer1-9/+21
NDPS runs on top of SPX and TCP. svn path=/trunk/; revision=6323
2002-09-10From Greg Morris: handle watchdog packets on socket 4003 as well asGuy Harris1-1/+4
socket 4001. svn path=/trunk/; revision=6264
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-28/+28
winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer1-5/+1
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-07-04Update a comment.Guy Harris1-4/+3
svn path=/trunk/; revision=5817
2002-07-02Add signature characters for IPX message watchdog positive replies andGuy Harris1-7/+39
"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-06-26Fix the capitalization of NetWare.Guy Harris1-21/+21
svn path=/trunk/; revision=5767
2002-06-25From Markus Steinmann: add IPX SAP for SEH's InterCon Printserver.Guy Harris1-1/+2
svn path=/trunk/; revision=5764
2002-04-24From Joerg Mayer: get rid of extra arguments to capture routines.Guy Harris1-2/+2
svn path=/trunk/; revision=5233
2002-02-17With the tvbuffication of all dissectors, the "packet_info" structure noGuy Harris1-2/+2
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-01-24Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls inGuy Harris1-10/+13
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-21Convert some "col_add_str()" calls to "col_set_str()".Guy Harris1-5/+5
svn path=/trunk/; revision=4592
2002-01-21Include files from the "epan" directory and subdirectories thereof withGuy Harris1-3/+3
"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
2001-12-10Move the pointer to the "column_info" structure in the "frame_data"Guy Harris1-30/+30
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-08Attach a descriptive name field type and base to dissector tables; thatGuy Harris1-3/+5
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-03Make "dissector_add()", "dissector_delete()", and "dissector_change()"Guy Harris1-16/+21
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-11-25Moved from using dissect_data to using call_dissector()Ed Warnicke1-3/+6
svn path=/trunk/; revision=4264
2001-11-25Remove a duplicate entry from the SAP table, and move an entry in thatGuy Harris1-3/+2
table to the proper sorted location. svn path=/trunk/; revision=4261
2001-11-25Throw in a large pile of additional SAP values.Guy Harris1-43/+223
svn path=/trunk/; revision=4260
2001-11-20Make the capture routines take an additional argument giving the amountGuy Harris1-2/+2
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-13Hopefully the last time I have to change my e-mail address.Gilbert Ramirez1-2/+2
svn path=/trunk/; revision=4199
2001-10-20Use "val_to_str()", rather than "match_strval()", in "socket_text()".Guy Harris1-19/+11
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-08add a couple of socket numbers that seem to be consistently allocated for ↵Nathan Neulinger1-1/+7
these services svn path=/trunk/; revision=4012
2001-07-03Use the "pinfo" argument, rather than the global "pi", to refer to theGuy Harris1-5/+5
packet information in tvbuffified dissectors. svn path=/trunk/; revision=3645
2001-06-29Create a routine to do the tvbuff-length-adjusting andGuy Harris1-20/+5
"pinfo->{len,captured_len}"-adjusting currently done by the IP dissector, make the IP dissector call that rather than doing the work itself, make the IPv6 dissector call that rather than just adjusting the tvbuff length itself, and make the IPX dissector call that rather than just adjusting "pi.{len,captured_len}" itself. This cleans things up a bit, and causes trailers to be properly reported in IPX-over-Ethernet frames. svn path=/trunk/; revision=3621
2001-06-18From Joerg Mayer: explicitly fill in all members of aGuy Harris1-24/+24
"header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-05-03IPX SAP over IPX EIGRP support, and IP EIGRP authentication updates,Guy Harris1-1/+3
from Paul Ionescu. svn path=/trunk/; revision=3398
2001-04-19FT_UINTn and FT_INTn fields must always have a base selected for them;Guy Harris1-3/+3
otherwise, the filtering GUI gets very upset when you try to construct a filter expression to test the value of that field. Make them BASE_DEC. svn path=/trunk/; revision=3334
2001-04-17Move the declaration of "etype_vals[]" from "epan/packet.h" toGuy Harris1-4/+4
"etypes.h". svn path=/trunk/; revision=3314
2001-04-15"packet-ipx.c" doesn't use anything from "packet-snmp.h", so don'tGuy Harris1-3/+1
include it. svn path=/trunk/; revision=3303
2001-04-01Moved various to_str files from packet.{c,h} to a separateEd Warnicke1-75/+1
to_str.{c,h}. Resolved strange situation where ipx_addr_to_str was declared in packet.h but defined in packet-ipx.c by moving ipx_addr_to_str, ipxnet_to_str_punct, and ipxnet_to_str from packet-ipx.{c,h} to to_str.{c,h} svn path=/trunk/; revision=3219
2001-03-15Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSDGuy Harris1-2/+2
DLT_HDLC to it. Make a separate dissector for Cisco HDLC, and add a dissector for Cisco SLARP. Have the PPP dissector call the Cisco HDLC dissector if the address field is the Cisco HDLC unicast or multicast address. Use the Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type. Add a new dissector table "chdlctype", for Cisco HDLC packet types (they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example), replacing "fr.chdlc". Have a "chdlctype()" routine, similar to "ethertype()", used both by the Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]" "value_string" table for Cisco HDLC types and protocol names. Split the packet type field in the Frame Relay dissector into separate SNAP and Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type "value_string" tables, respectively. svn path=/trunk/; revision=3133
2001-03-13Make tvb_get_ptr() return 'const guint8*', and clean up all theGilbert Ramirez1-2/+2
usages of tvb_get_ptr(). packet-ieee80211.c still has one bad usage, in which it *does* modify the tvbuff's data. svn path=/trunk/; revision=3128
2001-02-27Fix up the handling of NBIPX packets, and of Microsoft "direct hosting"Guy Harris1-24/+9
name-server-over-IPX and mailslot-datagram-over-IPX packets, based on stuff dredged out of a pile of documents on the Web. svn path=/trunk/; revision=3079
2001-01-22Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="Guy Harris1-22/+14
statements. Move the setting of the Protocol column in the Appletalk ARP and IPX dissectors before anything is fetched from the packet, and also clear the Info column at that point in those and some other dissectors, so that if an exception is thrown, the columns don't reflect the previous protocol. Fix the registration of the IPX RIP dissector to use the right protocol ID. svn path=/trunk/; revision=2928
2001-01-13Make GRE use a dissector table for its protocol types, and registerGuy Harris1-1/+2
dissectors for protcools that can be encapsulated inside GRE in that table. Fix a bug in the handling of WCCPv2 IP encapsulation (it was constructing the next tvbuff before, rather than after, advancing the offset past the redirection header). svn path=/trunk/; revision=2893
2001-01-10Make the stuff to handle SNAP frames (OUI, PID, payload) a routine ofGuy Harris1-1/+2
its own; it's used not only by LLC, but by Frame Relay with RFC 2427 and ATM with RFC 2684. Support for RFC 2427-encapsulation Frame Relay packets, from Paul Ionescu. Get rid of the CISCO_IP PPP protocol type - Cisco HDLC uses, in most cases, Ethernet packet types, so use ETHERTYPE_IP instead (they're both 0x0800). svn path=/trunk/; revision=2854
2001-01-09Register the IPX dissector, make it static, and call it through aGuy Harris1-2/+4
handle. Call the IP dissector through a handle in the Frame Relay dissector. svn path=/trunk/; revision=2851
2001-01-09Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris1-10/+14
"{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) svn path=/trunk/; revision=2849
2001-01-03Have "proto_register_protocol()" build a list of data structures forGuy Harris1-6/+11
protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2000-12-03Register "dissect_nbipx()", and have the IPX dissector look up itsGuy Harris1-7/+10
handle and call it through the handle. Make it static; this renders "packet-nbipx.h" unnecessary. Get rid of the "tvb_compat()" call in the IPX dissector - it calls all dissectors through handles or lookup tables, and thus any backwards-compatibility stuff is done by the code in libethereal. svn path=/trunk/; revision=2735
2000-11-19For each column, have both a buffer into which strings for that columnGuy Harris1-8/+8
can be put, and a pointer to the string for the column, which might or might not point to that buffer. Add a routine "col_set_str()", which sets the string for the column to the string passed to it as an argument; it should only be handed a static string (a string constant would be ideal). It doesn't do any copying, so it's faster than "col_add_str()". Make the routines that append to columns check whether the pointer to the string for the column points to the buffer for the column and, if not, copy the string for the column to the buffer for the column so that you can append to it (so you can use "col_set_str()" and then use "col_append_str()" or "col_append_fstr()"). Convert a bunch of "col_add_str()" calls that take a string constant as an argument to "col_set_str()" calls. Convert some "col_add_fstr()" calls that take a string constant as the only argument - i.e., the format string doesn't have any "%" slots into which to put strings for subsequent arguments to "col_set_str()" calls (those calls are just like "col_add_str()" calls). Replace an END_OF_FRAME reference in a tvbuffified dissector with a "tvb_length(tvb)" call. svn path=/trunk/; revision=2670