aboutsummaryrefslogtreecommitdiffstats
path: root/packet-icq.c
AgeCommit message (Collapse)AuthorFilesLines
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-24/+24
winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-03We don't use anything from <arpa/inet.h>, so we don't need to includeGuy Harris1-5/+1
it. svn path=/trunk/; revision=5938
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer1-19/+11
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-04Get rid of the "data_src" member of the "frame_data" structure; put itGuy Harris1-2/+2
in the "packet_info" structure instead, as we don't need a pointer for every single frame in the capture file, just for each frame for which we currently have an open "epan_dissect_t". svn path=/trunk/; revision=5614
2002-05-02Put the protocol version into the ICQ v2/v3/v4 tree.Guy Harris1-4/+34
svn path=/trunk/; revision=5359
2002-05-02From Joerg Mayer: get rid of some unused arguments.Guy Harris1-23/+83
Put a minimal protocol tree in for ICQ v2, v3, and v4. Add some length checks. Properly handle the captured and the actual size of the ICQ packet. svn path=/trunk/; revision=5358
2002-04-08More static-ization. In util.c, I commented out the ASCII-to-EBCDICGilbert Ramirez1-2/+2
functions, until that time that we need them. svn path=/trunk/; revision=5130
2002-02-25Get rid of a bunch of initializations of variables that aren'tGuy Harris1-24/+23
necessary; most of them also provoke compiler warning with some compilers, as they assign -1 to unsigned variables. Also use "guint8" instead of "unsigned char" for 8-bit unsigned integer variables. Get rid of one "tvb_get_letohl()"/"proto_tree_add_uint_format()" combination in favor of "proto_tree_add_item()". svn path=/trunk/; revision=4802
2002-02-18Don't give tvbuffs names; instead, give data sources names, where aGuy Harris1-4/+3
"data source" has a name and a top-level tvbuff, and frames can have a list of data sources associated with them. Use the tvbuff pointer to determine which data source is the data source for a given field; this means we don't have to worry about multiple data sources with the same name - the only thing the name does is label the notebook tab for the display of the data source, and label the hex dump of the data source in print/Tethereal output. Clean up a bunch of things discovered in the process of doing the above. svn path=/trunk/; revision=4749
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-25/+25
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-2/+5
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-07-03Use "val_to_str()" to translate numerical values to strings, don'tGuy Harris1-289/+229
invent something that's almost like "value_string" and almost like "val_to_str()". Split the command-code field into client and server command code fields, make them enumerated fields, and put that field into the tree when dissecting it in the header, not when putting the body into the tree. Put the body of both unknown client and server requests into the tree, and just label it as "Body", as is done with the body of known requests. Display the status code in the same fashion in all places where it's put into the protocol tree. When dissecting a SRV_MULTI message, keep dissecting until we run out of submessages - don't quit when we run out of data in the packet, as that means we won't throw an exception and won't take the frame as short. svn path=/trunk/; revision=3646
2001-06-18Fix up the buffer size calculation - the starting offset isn't aGuy Harris1-6/+9
multiple of 4, so making the size of the buffer a multiple of 4 isn't the right thing to do. svn path=/trunk/; revision=3566
2001-06-18The ICQ decryption code works on 4 bytes at a time, so the amount ofGuy Harris1-5/+14
data it decrypts must be a multiple of 4; round the size of the ICQ data to a multiple of 4, and use that as the size of the buffer into which to put the decrypted data and as the byte count passed to the decryption routine. svn path=/trunk/; revision=3564
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-05-27We can't use a single static buffer for decrypted ICQ data - you mightGuy Harris1-15/+10
have more than one decrypted ICQ packet visible at a time, as you might have popped up additional single-packet windows for those packets. Allocate the buffer for the decrypted data when you decrypt, and arrange that it be freed when the tvbuff that refers to it is freed. Fix the copyright notice to reflect the fact that Gerald holds the copyright on Ethereal as a whole. svn path=/trunk/; revision=3472
2001-04-27Make the "pktsize" argument to "dissect_icqv5Server()" an "int", as itGuy Harris1-6/+6
can either be a 16-bit unsigned) packet size, or -1. svn path=/trunk/; revision=3387
2001-04-27More signed-vs-unsigned changes from Joerg Mayer.Guy Harris1-3/+3
svn path=/trunk/; revision=3386
2001-03-27Added the created tvbuff into the original tvbuff chain so clean-up isGuy Harris1-2/+7
performed. svn path=/trunk/; revision=3193
2001-03-25Tvbuffify the ICQ dissector.Guy Harris1-1004/+698
svn path=/trunk/; revision=3187
2001-01-09Add an additional "protocol index" argument to "{old_}dissector_add()",Guy Harris1-2/+2
"{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-21Fix infinite loop in reallocation of memory for decryption buffer.Gilbert Ramirez1-6/+11
svn path=/trunk/; revision=2688
2000-11-19Dynamically resize decr_pd in dissect_icqv5Client() in order to avoidGerald Combs1-3/+10
a possible buffer overflow on media with frame sizes greater than 1600 bytes. According to http://www.student.nada.kth.se/~d95-mih/icq/ there isn't an upper bound to the size of a v5 packet, so we grow dynamically to fit what we've been handed. svn path=/trunk/; revision=2672
2000-11-19For each column, have both a buffer into which strings for that columnGuy Harris1-9/+9
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-08-13Add the "Edit:Protocols..." feature which currently only implementsLaurent Deniel1-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
2000-08-11Miscellaneous code cleaningLaurent Deniel1-6/+1
- 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
2000-08-07Allow either old-style (pre-tvbuff) or new-style (tvbuffified)Guy Harris1-2/+2
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
2000-08-06Don't use "fd->pkt_len" when checking to see if you've run off the endGuy Harris1-2/+2
of the packet, use "pi.captured_len" - "fd->pkt_len" may include data that isn't in the capture, due to a short snapshot length. Don't use "fd->cap_len" when checking to see if you've run off the end of the packe, use "pi.captured_len" - "fd->cap_len" isn't adjusted to reflect any length fields, but "pi.captured_len" is (removing, for example, Ethernet padding from the packet). Use "END_OF_FRAME" rather than "pi.captured_len - offset", to make it a bit clearer what's being done. In the V.120 dissector, use "tvb_length()" when adding the top-level protocol tree entry for V.120, as it's a tvbuffified dissector. svn path=/trunk/; revision=2214
2000-08-05More changes from Peter Kjellerstedt.Guy Harris1-10/+8
svn path=/trunk/; revision=2209
2000-08-04ICQ improvements from Peter Kjellerstedt.Guy Harris1-32/+83
svn path=/trunk/; revision=2208
2000-05-11Add tvbuff class.Gilbert Ramirez1-80/+112
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
2000-04-08Move calls to "dissector_add()" out of the register routines for TCP andGuy Harris1-10/+18
UDP and into the handoff registration routines for the protocols in question. Make the dissectors for those protocols static if they're not called outside the dissector's source file. Get rid of header files if all they did was declare dissectors that are now static; remove declarations of now-static dissectors from header files that do more than just declare the dissector. svn path=/trunk/; revision=1823
2000-03-14Convert two instances of proto_tree_add_uint_format() toGilbert Ramirez1-5/+5
proto_tree_add_protocol_format(). I had converted them incorrectly when I changed them from their original proto_tree_add_item_format(). svn path=/trunk/; revision=1717
2000-03-12Break proto_tree_add_item_format() into multiple functions:Gilbert Ramirez1-33/+33
proto_tree_add_protocol_format() proto_tree_add_uint_format() proto_tree_add_ipxnet_format() proto_tree_add_ipv4_format() proto_tree_add_ipv6_format() proto_tree_add_bytes_format() proto_tree_add_string_format() proto_tree_add_ether_format() proto_tree_add_time_format() proto_tree_add_double_format() proto_tree_add_boolean_format() If using GCC 2.x, we can check the print-format against the variable args passed in. Regardless of compiler, we can now check at run-time that the field type passed into the function corresponds to what that function expects (FT_UINT, FT_BOOLEAN, etc.) Note that proto_tree_add_protocol_format() does not require a value field, since the value of a protocol is always NULL. It's more intuitive w/o the vestigial argument. Fixed a proto_tree_add_item_format-related bug in packet-isis-hello.c Fixed a variable usage bug in packet-v120.c. (ett_* was used instead of hf_*) Checked in Guy's fix for the function declearation for proto_tree_add_text() and proto_tree_add_notext(). svn path=/trunk/; revision=1713
2000-03-07Fix some "proto_tree_add_text()" calls.Guy Harris1-64/+73
Reorganize "icqv5_cmd_send_text_code()" a bit so that it only puts an item into the tree if it's present in the packet. svn path=/trunk/; revision=1697
2000-01-24Fix a bunch of dissectors to use "pi.captured_len" rather thanGuy Harris1-5/+2
"fd->cap_len" for the frame length - or to use macros such as "BYTES_ARE_IN_FRAME()", "IS_DATA_IN_FRAME()", and "END_OF_FRAME", which use "pi.captured_len" - so that they correctly handle frames where the actual data length of the packet is less than the size of the raw frame, e.g. with encapsulations such as ISL. svn path=/trunk/; revision=1530
1999-12-05Updates from Kojak.Guy Harris1-144/+312
svn path=/trunk/; revision=1221
1999-12-01Fix the "proto_tree_add_item_format()" call for CMD_STATUS_CHANGE.Guy Harris1-1/+2
svn path=/trunk/; revision=1176
1999-11-18Clean up some ANSI C nits pointed out by "gcc -pedantic".Guy Harris1-2/+2
svn path=/trunk/; revision=1060
1999-11-16Replace the ETT_ "enum" members, declared in "packet.h", withGuy Harris1-37/+52
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
1999-11-06Updates to the ICQ decoder, from Kojak.Guy Harris1-229/+1433
svn path=/trunk/; revision=981
1999-11-03Include <time.h>, so as to declare "ctime()" on systems whereGuy Harris1-1/+2
<sys/time.h> doesn't include <time.h>. svn path=/trunk/; revision=968
1999-10-25Ensure that "password" is '\0'-terminated.Guy Harris1-2/+3
svn path=/trunk/; revision=925
1999-10-25Update from Kojak to dissect ICQ login packets and text messages.Guy Harris1-55/+499
svn path=/trunk/; revision=924
1999-10-24Kojak's ICQ dissector.Guy Harris1-0/+563
svn path=/trunk/; revision=919