aboutsummaryrefslogtreecommitdiffstats
path: root/packet-socks.c
AgeCommit message (Collapse)AuthorFilesLines
2004-02-12Eliminate a compiler warning.Guy Harris1-4/+5
Use "guint8" for 8-bit binary data, and use "%u" to print unsigned values. svn path=/trunk/; revision=10049
2004-02-12From Yaniv Kaul: the response to an V5 authentication response is a V5Guy Harris1-27/+38
authentication response, not a V5 command. Clean up white space. svn path=/trunk/; revision=10047
2004-01-22Use the length field in the UDP header:Guy Harris1-2/+2
if it's < 8, don't dissect anything past the length field (the length must be >= 8); otherwise, if it's less than the data or reported length from the tvbuff, use the length from the header; otherwise, don't checksum the packet (if it's greater than the reported length, and the packet isn't fragmented, we should somehow report that as an error). svn path=/trunk/; revision=9782
2004-01-10Eliminate "alignment.h" header - the stuff in it is no longer used.Guy Harris1-2/+1
svn path=/trunk/; revision=9625
2003-12-30Update another URL and other stuff in that comment.Guy Harris1-4/+4
svn path=/trunk/; revision=9491
2003-12-30Update a URL.Guy Harris1-2/+6
svn path=/trunk/; revision=9490
2003-12-30Export a "dissect_tcp_payload()" routine from the TCP dissector, for useGuy Harris1-5/+15
by pass-through proxying dissectors such as the SOCKS dissector; it does the work of processing a TCP segment, including desegmentation. Export the "next sequence number" value to subdissectors, so they can use it when calling "dissect_tcp_payload()". Use that in the SOCKS dissector. svn path=/trunk/; revision=9489
2003-12-29Make sure the "we're in the middle of dissecting SOCKS" flag getsGuy Harris1-2/+8
cleared even if we throw an exception when dissecting the payload. svn path=/trunk/; revision=9473
2003-12-04Add {0, NULL} to the reply_table_v5 value_string array.Gilbert Ramirez1-2/+3
svn path=/trunk/; revision=9166
2003-11-08"decode_tcp_ports()" is for use by protocols that proxy transport-layerGuy Harris1-2/+2
packets/sessions, e.g. MSProxy and SOCKS. It should not cause any of the TCP-specific stuff such as sequence number analysis or PDU tracking to be done. (Actually, MSProxy and SOCKS should offer desegmentation services *themselves* and do their *own* PDU tracking, rather than just passing stuff on to "decode_tcp_ports()", but that's another matter.) Make "tcp_tree" once again be a local variable to "dissect_tcp()", and pass it as an argument to those functions that use it. svn path=/trunk/; revision=8912
2003-10-15Put back a missing comment.Guy Harris1-11/+14
Get rid of some extra blanks at the end of the text for some protocol tree items. Use %u, not %d, to format unsigned quantities. Make the "Client Authentication Methods" item's length cover all the authentication methods, not just the count of methods. svn path=/trunk/; revision=8709
2003-10-15From David E. Weekly: move the code to put the SOCKS version up, so it'sGuy Harris1-15/+3
done in common code. svn path=/trunk/; revision=8708
2003-09-17Fix recursive heap overflow problem.Jeff Foster1-26/+26
When a socks connection was used to create a second socks connection the socks dissector would be called recursively until a heap overflow occurred. svn path=/trunk/; revision=8487
2003-04-23Update to TCP to handle hints from dissectors where the next PDU may start.Ronnie Sahlberg1-2/+2
ONCRPC dissector updated to provide hint to TCP where the next RPCoverTCP PDU starts as example. Trivial updates to the other TCP based protocols required to amke them handle this as well. See the updates to packet-rpc.c as an example. This is enabled by activating tcp analysis and provides hints to TCP to know where PDUs starts when not aligned to the start of the segment. svn path=/trunk/; revision=7543
2003-02-26From Georgi Guninski: Fix a format string problem.Gerald Combs1-2/+2
svn path=/trunk/; revision=7201
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-96/+96
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-11/+3
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-17From Joerg Mayer:Guy Harris1-5/+1
dftest.c: Remove #if-0-ed includes packet-ieee80211.c, packet-wtls.c, packet-afp.c, packet-wsp.c, packet-wtp.c, ethereal_gen.py: Remove redundant include varargs (already in snprintf.h, and required only for snprintf.h) Remove unused include of snprintf.h from files not using "snprintf()". svn path=/trunk/; revision=5889
2002-06-07Don't call "tvb_strsize(tvb, offset)" if we know there's nothing *at*Guy Harris1-6/+15
"offset". svn path=/trunk/; revision=5650
2002-06-07Use "tvb_memcpy()" rather than "strncpy()" with a "tvb_get_ptr()"Guy Harris1-7/+6
argument to copy a counted string, and use "tvb_strsize()" rather tan "strlen()" with a "tvb_get_ptr()" argument to get the length of a null-terminated string, so that we throw an exception if we go past the end of the tvbuff, rather than processing bytes past the end. svn path=/trunk/; revision=5649
2002-04-14From Joerg Mayer:Guy Harris1-2/+2
Declares some variables static. Creates a new include file packet-rsvp.h, and make use of it (change some extern decls to #inlcude). Move the file packet-pgm.h into packet-pgm.c as it is not used by anything outside packet-pgm.c. svn path=/trunk/; revision=5162
2002-04-11From Joerg Mayer: get rid of some unused arguments, and make someGuy Harris1-15/+15
routines not used outside the file in which they're defined static. svn path=/trunk/; revision=5144
2002-03-09Fix some "proto_tree_add_uint()" and "proto_tree_add_uint_hidden()"Guy Harris1-5/+6
calls that passed TRUE or FALSE, rather than an integer value, as the last argument. A SOCKS command is one byte, so make the "socks.command" field an FT_UINT8. svn path=/trunk/; revision=4904
2002-01-24Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls inGuy Harris1-7/+6
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-21Include files from the "epan" directory and subdirectories thereof withGuy Harris1-5/+5
"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-11Fixed the response code display for version 5 socks per Mark S. Allen.Jeff Foster1-25/+73
Fixed some of the filter fields. svn path=/trunk/; revision=4383
2001-12-10Move the pointer to the "column_info" structure in the "frame_data"Guy Harris1-37/+37
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-03Make "dissector_add()", "dissector_delete()", and "dissector_change()"Guy Harris1-3/+2
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-27Thou shalt not use C++-style comments in C code, for they upset some CGuy Harris1-2/+2
compilers. svn path=/trunk/; revision=4284
2001-11-27Change "conversation_set_dissector()" to take a dissector handle, ratherGuy Harris1-3/+12
than a pointer to a dissector function, as an argument. This means that the conversation dissector is called through "call_dissector()", so the dissector itself doesn't have to worry about checking whether the protocol is enabled or setting "pinfo->current_proto", so get rid of the code that does that in conversation dissectors. Also, make the conversation dissectors static. Get rid of some direct calls to dissectors; replace them with calls through handles, and, again, get rid of code to check whether a protocol is enabled and set "pinfo->current_proto" where that code isn't needed. Make those dissectors static if they aren't already static. Add a routine "create_dissector_handle()" to create a dissector handle without registering it by name, if the dissector isn't used outside the module in which it's defined. svn path=/trunk/; revision=4281
2001-11-21Remove the global packet_info called "pi". Dissectors now onlyGilbert Ramirez1-2/+2
access their own "pinfo". A packet_info is stored in epan_dissect_t, which is created for the dissection of a single packet. GUI functions which need to access the packet_info of the currently selected packet used to use "pi"; now they use cfile.edt->pi. cfile's "edt" member is the epan_dissect_t of the currently-selected packet. The functionality of blank_packetinfo() was moved into dissect_packet(), as that's the only place that called blank_packetinfo(), after a spurious call to blank_packetinfo() was removed from packet_list_select_cb(). svn path=/trunk/; revision=4246
2001-10-31Get rid of a bunch of stuff that was there to support non-tvbuffifiedGuy Harris1-2/+3
dissectors and that's no longer needed. svn path=/trunk/; revision=4112
2001-10-30IPv4 addresses should be entered in host byte order, not forcedGuy Harris1-33/+44
little-endian byte order. Use "proto_tree_add_item()" wherever possible. Get rid of line commented out with a C++ comment, as not all C compilers accept C++ comments. Don't put the user name into the protocol tree if it's not there (we really should do TCP segment reassembly for this, but this is at least a good first cut). When checking whether data exists in the packet, use "tvb_offset_exists()", don't compare the offset in the tvbuf with "pinfo->len" - "pinfo->len" is the length of the entire packet, not of the tvbuff. Fix some references to "pi" to refer to "*pinfo" instead. svn path=/trunk/; revision=4108
2001-10-29Dissector converted to TVBuffers. The changes are originally fromJeff Foster1-253/+205
Pia Sahlberg <piabar@hotmail.com. svn path=/trunk/; revision=4100
2001-10-26Fix the rest of the signed/unsigned comparison warnings.Gilbert Ramirez1-5/+5
svn path=/trunk/; revision=4088
2001-09-03Instead of having a single datum attached to a conversation, have a listGuy Harris1-17/+16
of protocol-id-plus-datum pairs, so that multiple protocols can attach information to the same conversation. Dissectors that attach information to a conversation should not assume that if they find a conversation it has one of its data attached to it; the conversation might've been created by another dissector. svn path=/trunk/; revision=3901
2001-09-03Squelch some compiler warnings.Guy Harris1-2/+2
svn path=/trunk/; revision=3900
2001-06-18From Joerg Mayer: explicitly fill in all members of aGuy Harris1-7/+7
"header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-06-08There's no need to include "globals.h" - don't include it.Guy Harris1-4/+2
svn path=/trunk/; revision=3529
2001-04-19FT_UINTn and FT_INTn fields must always have a base selected for them;Guy Harris1-2/+2
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-01-10Change from Jeff Foster to keep the dissector from crashing if theGuy Harris1-4/+15
conversation it found has no data associated with it; this is a workaround for a problem that shows up if a conversation is between two ports both of which have protocols associated with them - in that case, frames going in one direction might be dissected by one of those dissectors, and frames going in the other direction might be dissected by the other dissector, causing untold confusion. We really need to associate dissectors with conversations as soon as the conversation is created, so that all packets will be handled by the same dissector. (The SOCKS dissector now does that.) svn path=/trunk/; revision=2862
2001-01-09Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris1-2/+3
"{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-2/+2
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-11-19For each column, have both a buffer into which strings for that columnGuy Harris1-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
2000-11-18Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSIGuy Harris1-3/+7
ESIS dissectors. Register the IP dissector and have dissectors that call it directly (rather than through a port table) call it through a handle. Add a routine "tvb_set_reported_length()" which a dissector can use if it was handed a tvbuff that contains more data than is actually in its part of the packet - for example, handing a padded Ethernet frame to IP; the routine sets the reported length of the tvbuff (and also adjusts the actual length, as appropriate). Then use it in IP. Given that, "ethertype()" can determine how much of the Ethernet frame was actually part of an IP datagram (and can do the same for other protocols under Ethernet that use "tvb_set_reported_length()"; have it return the actual length, and have "dissect_eth()" and "dissect_vlan()" use that to mark trailer data in Ethernet II frames as well as in 802.3 frames. svn path=/trunk/; revision=2658
2000-10-21Support for conversations with "wildcard" destination addresses, fromGuy Harris1-5/+5
Jeff Foster. svn path=/trunk/; revision=2523
2000-09-11Move format_text(), get_token_len(), and fine_line_end(), into strutil.cGilbert Ramirez1-1/+2
This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-08-21Change from Andreas Sikkema to change the "old" and "new" members of theGuy Harris1-3/+2
"dissector" union in the "conversation_t" structure to "old_d" and "new_d", to avoid using a C++ reserved word. Add "old_conversation_set_dissector()" and "conversation_set_dissector()" routines to set the dissector for a conversation, to hide the details of how that's done (e.g., details such as whether there's a union at all - eventually, when all dissectors have been tvbuffified, there won't be a need for the union - and what the names of the union members are, and so on). Convert all dissectors to use those routines (they had to be changed anyway, due to the name change). svn path=/trunk/; revision=2324
2000-08-13Add the "Edit:Protocols..." feature which currently only implementsLaurent Deniel1-1/+2
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
2000-08-11Miscellaneous code cleaningLaurent Deniel1-11/+6
- add <stdarg.h> or <varargs.h> in snprintf.h and remove those inclusions in the other #ifdef NEED_SNPRINTF_H codes - remove the check of multiple inclusions in source (.c) code (there is a bit loss of _cpp_ performance, but I prefer the gain of code reading and maintenance; and nowadays, disk caches and VM are correctly optimized ;-). - protect all (well almost) header files against multiple inclusions - add header (i.e. GPL license) in some include files - reorganize a bit the way header files are included: First: #include <system_include_files> #include <external_package_include_files (e.g. gtk, glib etc.)> Then #include "ethereal_include_files" with the correct HAVE_XXX or NEED_XXX protections. - add some HAVE_XXX checks before including some system header files - add the same HAVE_XXX in wiretap as in ethereal Please forgive me, if I break something (I've only compiled and regression tested on Linux). svn path=/trunk/; revision=2254