aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aim.c
AgeCommit message (Collapse)AuthorFilesLines
2015-05-26AIM: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-10/+1
remove also orig_offset (no longer needed) Change-Id: Idc65b45fb67bae6acdca33962f3352a50296a6e5 Reviewed-on: https://code.wireshark.org/review/8650 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26Revert "[AIM] Fix string length"Michael Mann1-2/+2
It's a FT_UINT_STRING field type This reverts commit dc14e3ce0df78da52da95e7356c6e15390b191ec. Change-Id: I1185efbad459887fb9c16fb01e670bc43e6f2d84 Reviewed-on: https://code.wireshark.org/review/8623 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-25[AIM] Fix string lengthAnders1-1/+1
Change-Id: I64f73bd5cb131ad6efc64eea6a7eb66af9cee5c4 Reviewed-on: https://code.wireshark.org/review/8622 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25Remove proto_tree_add_text from AIM dissectors.Michael Mann1-32/+50
Change-Id: Ic7385d0555d72aa8ea2b9beb284ca1f6a115b174 Reviewed-on: https://code.wireshark.org/review/8616 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-14Change deprecated API tvb_length -> tvb_reported_lengthAndersBroman1-9/+9
Change-Id: I14577dccaed5aa5ed85e94b6810a94b4c8b2e437 Reviewed-on: https://code.wireshark.org/review/8059 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27Lua: Expose tcp_dissect_pdus() to LuaHadriel Kaplan1-1/+1
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() to make TCP-based dissection easier. Bug: 9851 Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 Reviewed-on: https://code.wireshark.org/review/6778 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-12-26Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.Michael Mann1-2/+1
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 Reviewed-on: https://code.wireshark.org/review/5934 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-22First batch of unincludes. Last attempt...Martin Mathieson1-1/+0
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9 Reviewed-on: https://code.wireshark.org/review/5997 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-2/+0
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-29Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.Michael Mann1-16/+9
Part 1 of many Change-Id: I77a5789ac23388e6a5f8098dc398592f39638124 Reviewed-on: https://code.wireshark.org/review/5532 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-20Get rid of unnecessary includes of ctype.h.Guy Harris1-1/+0
Change-Id: I2cf49f808558147ce77e7d086558966cfb2defca Reviewed-on: https://code.wireshark.org/review/4850 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-02Add editor modelines & adjust indentation/whitespace as needed.Bill Meier1-122/+135
Change-Id: Ice2d93632cd42dfcef3bfbf0e15f2a8a147278fc Reviewed-on: https://code.wireshark.org/review/4433 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-22convert to proto_tree_add_subtree[_format]Michael Mann1-10/+6
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df Reviewed-on: https://code.wireshark.org/review/2560 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-9/+9
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-9/+9
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann1-1/+1
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-09Don't use tvb_get_nstringz0(), use tvb_get_string_enc().Guy Harris1-6/+3
Change-Id: I8e654fa857fca6713198e3d20f2a14a0a444e935 Reviewed-on: https://code.wireshark.org/review/1037 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-01-22At least according toGuy Harris1-4/+4
http://web.archive.org/web/20080308233204/http://dev.aol.com/aim/oscar/#SNAC "In general strings are not NULL terminated and are encoded using UTF8." It also says Authentication Over the years, the AIM backend has supported several different methods for authentication. ... When a client collects the loginId and password for the user it should not normalize them in any manner. It also should not prevent the user from entering certain characters as the AIM name space is constantly changing. For example, currently the AIM name space is ASCII based, but in the future that may change. In general, the client should not perform input checking and instead allow the backend to reject bad values. which also suggests not assuming ASCII. So use ENC_UTF_8 in most cases. For actual messages, it says: An IM can be encoded in the following different forms: Name Value Notes ASCII 0 ANSI ASCII -- ISO 646 UNICODE 2 ISO 10646.USC-2 Unicode LATIN_1 3 ISO 8859-1 so, if that's the case, the dissector should choose beween ENC_ASCII|ENC_NA, ENC_UCS_2|ENC_appropriate_ENDIAN, and ENC_ISO_8859_1|ENC_NA. Use tvb_get_string_enc() with an encoding rather than tvb_get_string(). svn path=/trunk/; revision=54908
2013-12-21Add missing includesJakub Zawadzki1-0/+1
svn path=/trunk/; revision=54332
2013-12-21Drop isprint.h use g_ascii_isprint() when this include hack was enabled.Jakub Zawadzki1-4/+2
svn path=/trunk/; revision=54327
2013-12-12In r12060, use of the "aim.family" subdissector table was eliminated, inGuy Harris1-5/+0
favor of the AIM dissector having its own private way of handing off to subdissectors. Get rid of the subdissector table. svn path=/trunk/; revision=53989
2013-11-09Add data parameter to tcp_dissect_pdus() as well as convert it to using ↵Michael Mann1-4/+5
"new" style dissectors. Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that? Should tcp_dissect_pdus return length (bytes consumed)? There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb). Seems like that could all be rolled into one. svn path=/trunk/; revision=53198
2013-10-24AIM doesn't ever use it's private_data structure, so remove it. If it ever ↵Michael Mann1-10/+0
does, just pass the data into the subdissectors. svn path=/trunk/; revision=52830
2013-09-22emem -> wmem conversion:Pascal Quantin1-3/+3
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits() - tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup() - tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode() - tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string() - tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string() - tvb_get_ephemeral_string_enc() -> tvb_get_string_enc() - update docs accordingly svn path=/trunk/; revision=52172
2013-09-09More dissector table UI name changes (a continuation of r51904).Chris Maynard1-1/+2
svn path=/trunk/; revision=51907
2013-03-12svn path=/trunk/; revision=48272Anders Broman1-1/+4
2013-01-31Comment out unused hf[] entries & etc.Bill Meier1-3/+7
(found by checkhf) svn path=/trunk/; revision=47389
2012-10-191) Use tvb_reported_length_remaining instead of tvb_reported_length_remaining.Chris Maynard1-13/+13
2) Use proto_item_append_text instead of proto_item_set_text, since this is called within a loop. 3) Increment the offset correctly using blocklen-4 instead of tvb_length_remaining, which makes no sense. svn path=/trunk/; revision=45657
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-09-10Initial commit to support yet another method of passing data between dissectors.Jakub Zawadzki1-1/+1
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
2012-06-04Try to make the buildbot happy.Anders Broman1-1/+1
svn path=/trunk/; revision=43067
2012-06-04Get rid of a couple of warnings.Anders Broman1-3/+3
svn path=/trunk/; revision=43066
2012-05-15Remove unneeded #includes (stdlib, stdio, ctypes, time);Bill Meier1-1/+0
In a few cases: do some whitespace, indentation cleanup & reformatting. svn path=/trunk/; revision=42632
2012-04-30Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=42362
2011-11-15tvb_[reported_]length_remaining can return -1Bill Meier1-1/+1
svn path=/trunk/; revision=39870
2011-10-15Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, ↵Bill Meier1-2/+2
FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426
2011-09-22Use ENC_ values in proto_tree_add_item() calls.Guy Harris1-43/+37
In the AgentX dissector, make the "flags" arguments guint8, to match what's passed in. In the AIM dissector, use val_to_str() in col_add_str() calls - it gives the same result if there's a match, and puts a note in the Info column if there isn't, and is less complicated. In the AJP13 dissector: update the URL for the protocol documentation; add #defines for message types, and use them; for "enumerated data type" fields, make the fields numerical rather than strings and give them the value_string tables; get rid of col_check() calls; make a Boolean item an FT_BOOLEAN. svn path=/trunk/; revision=39085
2011-02-17Fix various Visual C++ analysis warnings.Gerald Combs1-4/+4
svn path=/trunk/; revision=35985
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-1/+1
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) svn path=/trunk/; revision=35224
2010-10-07(Minor) Rename a few variables in the global namespace to be a bit more unique;Bill Meier1-9/+9
Also: rename additional (static) variables to be consistent with the above renames. svn path=/trunk/; revision=34412
2010-05-10Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)Bill Meier1-613/+613
svn path=/trunk/; revision=32735
2010-04-03Remove unneeded #include <stdio.h>Bill Meier1-1/+0
svn path=/trunk/; revision=32367
2010-03-03remove check_colAnders Broman1-7/+4
svn path=/trunk/; revision=32089
2009-10-07From Gregor Jasny via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4073 :Jeff Morriss1-20/+72
This patch adds the functionality to decode short capabilies. svn path=/trunk/; revision=30391
2009-10-02One of those if(check_col)'s was hiding another condition (should have been ↵Jeff Morriss1-1/+2
looking closer). Fixes the fuzz failure in bug 4074. svn path=/trunk/; revision=30248
2009-10-01From Gregor Jasny via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4065 :Jeff Morriss1-499/+547
Expose the FNAC family and subtype via a hf_ value so you can filter for specific messages. From me: Re-arrange the code a bit: put dissect_aim() at the bottom near the registration functions. Remove unnecessary forward declarations. Reindent a bunch. Remove a couple check_col() calls; leave one in since it protects several other calls. svn path=/trunk/; revision=30243
2009-08-16Switch a bunch of dissectors over to using tvb_new_subset_remaining()Kovarththanan Rajaratnam1-1/+1
svn path=/trunk/; revision=29446
2009-08-09Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-12/+4
svn path=/trunk/; revision=29345
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 17:41:59 +0000