aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-xmpp-utils.h
AgeCommit message (Collapse)AuthorFilesLines
2015-08-18Eliminate proto_tree_add_text from XMPP dissectors.Michael Mann1-1/+1
Change-Id: I32fdf085ef484d147d9f0b27c56efba41bb827bf Reviewed-on: https://code.wireshark.org/review/10086 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-09Fix STARTTLS handling in various dissectorsPeter Wu1-1/+0
This patch lets a dissector hand over control to the SSL dissector which simplifies dissector code ("TCP | App | SSL | App" becomes "TCP | SSL | App"). After this patch, all of the affected dissectors will now be dissected as SSL with its Application Data being treated as the protocol before STARTTLS. This was previously not the case because the port was not registered for dissection via ssl_dissector_add. The desegmentation issue within the MySQL dissector is now also gone. Convert some tvb_length[_remaining] users in pop and smtp as well. Tested against mysql-ssl.pcapng and mysql-ssl-larger.pcapng(*1), Tested against pop-ssl.pcapng (note: only first stream is decrypted, either the key after negotiation is wrong or there is a bug), Tested against smtp-ssl.pcapng and smtp2525-ssl.pcapng (with Decode As) and smtp-ssl.pcapng with filter "tcp.len>0", Tested against xmpp-ssl.pcapng, http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys *1) mysql-ssl-larger has MySQL dissector errors for the fragmented SSL packet, but reassembly seems to work. Needs further investigation. Bug: 9515 Change-Id: I408ef8ff30d9edc8954dab9b3615900666dfa932 Reviewed-on: https://code.wireshark.org/review/6981 Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
2013-12-14xmpp_attr_info, xmpp_attr_info_ext: Pass pointer to hfJakub Zawadzki1-3/+3
This should fix most of warnings: initializer element is not computable at load time svn path=/trunk/; revision=54097
2013-08-25Convert XMPP dissector suite to wmem.Evan Huus1-8/+9
svn path=/trunk/; revision=51514
2013-04-30A few more doxygen fix-ups.Evan Huus1-0/+2
svn path=/trunk/; revision=49092
2013-03-29Add some missing #includes to hopefully fix check-abi buildbot.Evan Huus1-0/+2
svn path=/trunk/; revision=48641
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-0/+2
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2012-12-26Fix a bunch of warnings.Guy Harris1-9/+9
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-07-28Decode SSL streams in XMPP sessions. Fixes:Evan Huus1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3177 The logic is rather conservative for now, but I imagine false negatives are better than false positives for this sort of thing. svn path=/trunk/; revision=44088
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-04Revert previous change as it did not compile.Anders Broman1-1/+1
svn path=/trunk/; revision=43062
2012-06-04Try to get rid of a couple of warnings.Anders Broman1-1/+1
svn path=/trunk/; revision=43061
2011-11-16Move FI_RESET_FLAG and PROTO_ITEM_SET_VISIBLE macros to proto.h and fix the ↵Chris Maynard1-12/+0
FI_RESET_FLAG macro, being sure to use the 1's complement operator, '~', instead of the logical negation operator, '!'. (Fixes Coverity CID 1326). svn path=/trunk/; revision=39888
2011-11-13Don't use generic shared function/typedef/struct names;Bill Meier1-72/+72
Remove unneeded #includes; Cleanup trailing whitespace. svn path=/trunk/; revision=39823
2011-11-12From Mariusz Okrój and Sebastien Vincent via ↵Alexis La Goutte1-0/+287
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6225 Enhance XMPP Dissector XMPP is communication protocol that is based on XML. Existing Jabber dissector has only few filtering possibilities and displays packets in inconvenient way. This dissector is a result of cooperation with Jitsi community as Google Summer of Code project (http://www.jitsi.org/index.php/GSOC2011/XmppWireshark). From me : Add Mariusz Okrój in AUTHORS File Add Modelines information svn path=/trunk/; revision=39799