aboutsummaryrefslogtreecommitdiffstats
path: root/packet-nbipx.c
Commit message (Collapse)AuthorAgeFilesLines
* Removed trailing whitespaces from .h and .c files using theJörg Mayer2002-08-281-5/+5
| | | | | | | winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
* Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer2002-08-021-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
* Include files from the "epan" directory and subdirectories thereof withGuy Harris2002-01-211-2/+2
| | | | | | | | | | | | | "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
* Allow a length of -1 to be specified when adding FT_NONE and FT_PROTOCOLGuy Harris2002-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | items to the protocol tree; it's interpreted as "the rest of the data in the tvbuff". This can be used if 1) the item covers the entire packet or the remaining payload in the packet or 2) the item's length won't be known until it's dissected, and will be then set with "proto_item_set_len()" - if an exception is thrown in the dissection, it means the item ran *past* the end of the tvbuff, so saying it runs to the end of the tvbuff is reasonable. Convert a number of "proto_tree_add_XXX()" calls using "tvb_length_remaining()", values derived from the result of "tvb_length()", or 0 (in the case of items whose length is unknown) to use -1 instead (using 0 means that if an exception is thrown, selecting the item highlights nothing; using -1 means it highlights all the data for that item that's available). In some places where "tvb_length()" or "tvb_length_remaining()" was used to determine how large a packet is, use "tvb_reported_length()" or "tvb_reported_length_remaining()", instead - the first two calls indicate how much captured data was in the packet, the latter two calls indicate how large the packet actually was (and the fact that using the latter could cause BoundsError exceptions to be thrown is a feature - if such an exception is thrown, the frame really *was* short, and it should be tagged as such). Replace some "proto_tree_add_XXX()" calls with equivalent "proto_tree_add_item()" calls. Fix some indentation. svn path=/trunk/; revision=4578
* Move the pointer to the "column_info" structure in the "frame_data"Guy Harris2001-12-101-27/+27
| | | | | | | | | | | | | | | 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
* Make "dissector_add()", "dissector_delete()", and "dissector_change()"Guy Harris2001-12-031-5/+10
| | | | | | | | 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
* Hopefully the last time I have to change my e-mail address.Gilbert Ramirez2001-11-131-2/+2
| | | | svn path=/trunk/; revision=4199
* Start the process of tvbuffifying the SMB dissector - give it aGuy Harris2001-09-291-2/+1
| | | | | | | | | | | tvbuffified heuristic-dissector interface, but have it immediately turn its arguments into an old-style buffer pointer and offset. Register the SMB dissector as a heuristic NetBIOS dissector, and have "dissect_netbios_payload()" just try the heuristics, as it no longer has to call the SMB dissector explicitly. svn path=/trunk/; revision=3973
* Have "dissect_netbios_payload()" take as an argument a tvbuff containingGuy Harris2001-09-291-5/+7
| | | | | | | | only the NetBIOS payload, and have the NBSS dissector construct tvbuffs of that sort (i.e., stop at the end of the NBSS session message, not at the end of the data handed to the NBSS dissector). svn path=/trunk/; revision=3972
* From Todd Sabin: dissect the auth info in connection oriented dcerpcGuy Harris2001-09-281-16/+5
| | | | | | | | | | | | | | | | | | | packets. Make a "dissect_netbios_payload()" routine, called from the NetBIOS-over-802.2 (NBF), NetBIOS-over-IPX, and NetBIOS-over-TCP dissectors. Take Todd Sabin's changes to add a heuristic dissector list to the NBSS dissector, and apply them to "dissect_netbios_payload()" instead. Make the SMB dissector heuristic, returning FALSE if it doesn't see 0xFF S M B at the beginning of the packet, and have "dissect_netbios_payload()" first try the heuristic dissector list, then try the SMB dissector if no other heuristic dissector claims the packet, then just dissect the payload as data. From Todd Sabin: have the DCE/RPC dissector register as a heuristic dissector for NetBIOS. svn path=/trunk/; revision=3969
* Fix Gerald's address.Guy Harris2001-04-231-2/+2
| | | | svn path=/trunk/; revision=3369
* Fix up the handling of NBIPX packets, and of Microsoft "direct hosting"Guy Harris2001-02-271-286/+607
| | | | | | | 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
* "get_netbios_name()" can never return a negative number as the nameGuy Harris2001-01-151-31/+27
| | | | | | | | | | | | | | | type, so "netbios_add_name()" doesn't need to check for it doing so (yes, the tvbuff stuff *does* catch "get_netbios_name()" running past the end of the packet, and causes an exception to be thrown). Get rid of the check, and get rid of "netbios_add_name()"s return value. In "dissect_nbipx_dg()", always call the SMB dissector if there's data left in the packet, regardless of whether the "tree" argument is null or not; subdissectors should always be called, so they can build any internal state on the first pass through the capture, and so that they can fill in the Protocol and Info columns. svn path=/trunk/; revision=2899
* Put in some XXX comments.Guy Harris2001-01-101-1/+8
| | | | svn path=/trunk/; revision=2860
* Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris2001-01-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | "{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
* Have "proto_register_protocol()" build a list of data structures forGuy Harris2001-01-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* If we get an exception when dissecting a packet, append "[Short Frame]"Guy Harris2000-12-291-1/+3
| | | | | | | | | | | | or "[Malformed Frame]" to the Info column. Make some dissectors set the Protocol column and clear the Info column before fetching anything from the tvbuff they were handed, so that if the frame is short or malformed, it'll be marked as being the right top-level protocol, and the Info column won't have cruft left over from the previous protocol. svn path=/trunk/; revision=2800
* Break out the bits in the NBIPX "connection control" field.Guy Harris2000-12-061-3/+24
| | | | svn path=/trunk/; revision=2746
* Register "dissect_nbipx()", and have the IPX dissector look up itsGuy Harris2000-12-031-2/+4
| | | | | | | | | | | 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
* For each column, have both a buffer into which strings for that columnGuy Harris2000-11-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add #include <string.h>, to get prototypes for mem* and str* functions.Gilbert Ramirez2000-11-171-1/+2
| | | | svn path=/trunk/; revision=2654
* Tvbuffify the STP dissector, have it register itself and have the LLCGuy Harris2000-11-161-2/+2
| | | | | | | | | | | dissector call it through a handle, and make it static. Give "dissect_data()" an "offset" argument, so dissectors can use it to dissect part of the packet without having to cook up a new tvbuff. Go back to using "dissect_data()" to dissect the data in an IPP request. svn path=/trunk/; revision=2651
* Use "tvb_offset_exists()" rather than "tvb_length_remaining()" to checkGuy Harris2000-11-131-3/+3
| | | | | | | whether there's any data left in the tvbuff starting at a specified offset. svn path=/trunk/; revision=2636
* Set pinfo->current_protoGilbert Ramirez2000-11-101-1/+3
| | | | svn path=/trunk/; revision=2603
* Fix "packet-netbios.h" to match the new "packet-netbios.c", so that itGuy Harris2000-11-101-92/+100
| | | | | | | | | | compiles. Doing so reveals that the NBIPX dissector needs to be fixed, as it calls routines in "packet-netbios.c" whose calling sequence changed; doing so involves tvbuffifying it. svn path=/trunk/; revision=2602
* Add the "Edit:Protocols..." feature which currently only implementsLaurent Deniel2000-08-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the following: It is now possible to enable/disable a particular protocol decoding (i.e. the protocol dissector is void or not). When a protocol is disabled, it is displayed as Data and of course, all linked sub-protocols are disabled as well. Disabling a protocol could be interesting: - in case of buggy dissectors - in case of wrong heuristics - for performance reasons - to decode the data as another protocol (TODO) Currently (if I am not wrong), all dissectors but NFS can be disabled (and dissectors that do not register protocols :-) I do not like the way the RPC sub-dissectors are disabled (in the sub-dissectors) since this could be done in the RPC dissector itself, knowing the sub-protocol hfinfo entry (this is why, I've not modified the NFS one yet). Two functions are added in proto.c : gboolean proto_is_protocol_enabled(int n); void proto_set_decoding(int n, gboolean enabled); and two MACROs which can be used in dissectors: OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree) CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree) See also the XXX in proto_dlg.c and proto.c around the new functions. svn path=/trunk/; revision=2267
* Allow either old-style (pre-tvbuff) or new-style (tvbuffified)Guy Harris2000-08-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dissectors to be registered as dissectors for particular ports, registered as heuristic dissectors, and registered as dissectors for conversations, and have routines to be used both by old-style and new-style dissectors to call registered dissectors. Have the code that calls those dissectors translate the arguments as necessary. (For conversation dissectors, replace "find_conversation_dissector()", which just returns a pointer to the dissector, with "old_try_conversation_dissector()" and "try_conversation_dissector()", which actually call the dissector, so that there's a single place at which we can do that translation. Also make "dissector_lookup()" static and, instead of calling it and, if it returns a non-null pointer, calling that dissector, just use "old_dissector_try_port()" or "dissector_try_port()", for the same reason.) This allows some dissectors that took old-style arguments and immediately translated them to new-style arguments to just take new-style arguments; make them do so. It also allows some new-style dissectors not to have to translate arguments before calling routines to look up and call dissectors; make them not do so. Get rid of checks for too-short frames in new-style dissectors - the tvbuff code does those checks for you. Give the routines to register old-style dissectors, and to call dissectors from old-style dissectors, names beginning with "old_", with the routines for new-style dissectors not having the "old_". Update the dissectors that use those routines appropriately. Rename "dissect_data()" to "old_dissect_data()", and "dissect_data_tvb()" to "dissect_data()". svn path=/trunk/; revision=2218
* Add routines for adding items to a protocol tree that take arguments ofGuy Harris2000-05-311-4/+4
| | | | | | | | | | | | | | | | | a particular type, rather than taking a varargs list, along the lines of the "proto_tree_add_XXX_format()" routines. Replace most calls to "proto_tree_add_item()" and "proto_tree_add_item_hidden()" with calls to those routines. Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to "proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()" routines that don't take the item to be added as an argument - instead, they fetch the argument from the packet whose tvbuff was handed to them, from the offset handed to them. svn path=/trunk/; revision=2031
* Give the IPX dissector dissector hash tables for the IPX type and socketGuy Harris2000-05-301-2/+8
| | | | | | | number, and have the protocols encapsulated inside IPX register themselves with that table. svn path=/trunk/; revision=2028
* Add tvbuff class.Gilbert Ramirez2000-05-111-24/+24
| | | | | | | | | | | | | | | Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
* Create a header file for every packet-*.c file. Prune the packet.h file.Gilbert Ramirez2000-02-151-2/+3
| | | | | | | | | | | | | This change allows you to add a new packet-*.c file and not cause a recompilation of everything that #include's packet.h Add the plugin_api.[ch] files ot the plugins/Makefile.am packaging list. Add #define YY_NO_UNPUT 1 to the lex source so that the yyunput symbol is not defined, squelching a compiler complaint when compiling the generated C file. svn path=/trunk/; revision=1637
* Fix files that had Gilbert's old e-mail address or that didn't have myGuy Harris2000-01-221-2/+2
| | | | | | forwarding e-mail address. svn path=/trunk/; revision=1522
* Make the NetBIOS dissecting routines all take a pointer to the beginningGuy Harris1999-11-301-29/+54
| | | | | | | | | | | of the frame, plus at most one offset from the beginning of the frame, to make it clearer what the offset is. Then use that offset in at least some places to do bounds checking. If a packet has no payload, don't hand it to the SMB dissector. svn path=/trunk/; revision=1165
* Replace the ETT_ "enum" members, declared in "packet.h", withGuy Harris1999-11-161-6/+14
| | | | | | | | | | | | | | | | | dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
* Stuff to IPX socket 0x0455 (NetBIOS), and to sockets 0x0551 and 0x0553Guy Harris1999-09-031-147/+216
| | | | | | | | | (NWLink), are sufficiently different that they should be handled in different routines. Change the decode to match NetMon a bit more. svn path=/trunk/; revision=631
* Dissect the name type flag in NBIPX name service packets (at leastGuy Harris1999-09-031-5/+25
| | | | | | according to what NetMon thinks the bits are). svn path=/trunk/; revision=629
* Add a bunch more NetBIOS name types.Guy Harris1999-09-031-45/+35
| | | | | | | | | | | | | | | | | That makes the space of name types even more sparse; use "val_to_str()" to decode them, rather than an indexed table. Make a "process_netbios_name()" routine that shows non-printable characters in NetBIOS names as <XX>, where "XX" is the value of the character in hex (the way Network Monitor does), and have "get_netbios_name()" use it (NetBIOS-over-TCP will be made to use it in the future). When displaying NetBIOS names, include the name type character at the end, in angle brackets, the way Network Monitor does (show it in hex even if it *is* printable - 0x20 is 0x20, not "space", in that context). svn path=/trunk/; revision=628
* Have the IPX code set "pi.len" and "pi.captured_len" based on the lengthGuy Harris1999-09-021-47/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the IPX header, and have the dissectors it calls use it rather than being passed the length as an argument. Treat both packet type 20 ("WAN Broadcast") and 4 ("IPX", although 3 is also "IPX", according to Network Monitor) as potentially being NetBIOS packets. The packet types for the IPX NetBIOS socket (0x0455) and the NWLink sockets (0x0551 and 0x0553) are different (perhaps because there's one socket for the 0x0455 NBIPX, so you have to do name service and datagram service and have the packet types distinguish them, but NWLink has separate sockets for name service and datagram service). The packet type for name service and for datagram service are at *different locations* in the packet, which is unfortunate if you want to use the packet type to distinguish name service and datagram service packets. Use the packet length, for now, to distinguish them, with socket 0x0455. Dissect datagram packets differently from name service packets. Export "packet-netbios.c"'s "netbios_add_name()" routine, and use it when dissecting NBIPX packets as well. Label NBIPX packets as "NBIPX" rather than "NetBIOS". svn path=/trunk/; revision=627
* NBIPX packet type 3 appears to be the equivalent, in NBIPXland, of theGuy Harris1999-08-251-18/+28
| | | | | | | | | | | | | | | | | NetBIOS Datagram Service in NBTland; a capture Gilbert sent had a pile of those packets containing what looked like SMB browser announcements, which are sent out as broadcast datagrams. Label them as such, and treat them as such. Might packet type 2 be the equivalent of the NetBIOS Session Service - both of them contain SMBs, but the former is a connection-oriented service (LLC I frames, presumably, in NBF, and TCP in NBT), and the latter is a datagram-oriented service (LLC UI frames, presumably, in NBF, and UDP in NBT)? For now, we leave type 2 as "SMB (over NBIPX)", but we might want to label it as "NetBIOS session" or whatever the appropriate term is. svn path=/trunk/; revision=574
* Made the protocol (but not the fields) use the new proto_tree routine,Gilbert Ramirez1999-07-291-6/+14
| | | | | | | allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
* Created a new protocol tree implementation and a new display filterGilbert Ramirez1999-07-071-11/+10
| | | | | | | mechanism that is built into ethereal. Wiretap is now used to read all file formats. Libpcap is used only for capturing. svn path=/trunk/; revision=342
* This small change lets me read SMBtrans packets that come over NBIPX.Gilbert Ramirez1999-05-101-9/+24
| | | | svn path=/trunk/; revision=262
* Removed all references to gtk objects from packet*.[ch] files. They nowGilbert Ramirez1999-03-231-26/+19
| | | | | | | | | | reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223
* * Added column formatting functionality.Gerald Combs1998-11-171-7/+8
| | | | | | | | * Added check_col(), add_col_str() and add_col_fmt() to replace references to ft->win_info. * Added column prefs handling code. svn path=/trunk/; revision=97
* A lengthy patch to add the wiretap library. Wiretap is not used by defaultGilbert Ramirez1998-11-121-2/+1
| | | | | | | | | | because it is still in its infancy, but it can be compiled in optionally. The library exists in its own subdirectory ethereal/wiretap. This patch also edits all the packet-*.c files to remove the #include <pcap.h> line which is unnecessary in these files. In the ethereal code, file.c is the most heavily modified with #ifdef WITH_WIRETAP lines for the optional library. svn path=/trunk/; revision=82
* I've started to figure out the difference between NetBIOS over IPX forGilbert Ramirez1998-10-141-19/+71
| | | | | | Netware, and NetBIOS over IPX for WinNT (NWLink). svn path=/trunk/; revision=53
* I rename the single dissect() function in packet-nbipx.c, and had packet-ipx.cGilbert Ramirez1998-10-141-2/+2
| | | | | | call it under fewer circumstances. svn path=/trunk/; revision=52
* Added preliminary support for NetBIOS Name Services over IPX and UDP. NoteGilbert Ramirez1998-10-141-0/+140
that these are two very different implementations of NetBIOS name services and at the protocol level are not similar. I have put the UDP protocol in packet-nbns.c, since it will be a very big module. I have all of rfc 1002 to read and implement. I am planning on putting many different NetBIOS over IPX functions in packet-nbipx.c, however, since there is no RFC or published standard. I have to hack the protocol, and as such, I do not expect it to be as full-featured as the IP-world equivalents. svn path=/trunk/; revision=50
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 11:39:50 +0000