aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki16-0/+18
svn path=/trunk/; revision=53230
2013-11-10Move struct _ftype_t + callback typedefs + free macro to ftypes-int.hJakub Zawadzki1-0/+2
svn path=/trunk/; revision=53223
2013-11-09Add data parameter to tcp_dissect_pdus() as well as convert it to using ↵Michael Mann2-21/+23
"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-11-09include <wsutil/pint.h> only when needed.Jakub Zawadzki1-0/+2
svn path=/trunk/; revision=53196
2013-11-09Include <epan/to_str.h> only when needed.Jakub Zawadzki2-0/+2
svn path=/trunk/; revision=53189
2013-11-06Remove pinfo->private_data from DCERPC dissectors and instead have ↵Michael Mann3-622/+601
dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences). The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few. The "dcerpc_info* di" parameter is used in almost every function. svn path=/trunk/; revision=53100
2013-11-05Remove setting of pinfo->private_data to ETHERCAT_MBOX_HEADER structure as ↵Michael Mann1-1/+0
it's not used anywhere in the Wireshark source. If it's used by a third-party plugin, please submit a patch that passes the ETHERCAT_MBOX_HEADER structure through the data parameter of the "new" style dissector function. svn path=/trunk/; revision=53094
2013-11-02Pass struct tcpinfo into all TCP subdissectors instead of through ↵Michael Mann1-4/+6
pinfo->private_data. svn path=/trunk/; revision=53036
2013-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier29-37/+10
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-25Add a very small hack to make the UAT update callback error string freeable, andEvan Huus1-1/+1
convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854
2013-10-24Minor cleanup.Michael Mann2-5/+1
svn path=/trunk/; revision=52809
2013-10-24Make WiMax CDMA Code Attribute its own protocol with it's own filter.Michael Mann1-10/+8
svn path=/trunk/; revision=52808
2013-10-24Create a single array of ett_ variables, instead of individual etts + array ↵Michael Mann1-587/+17
of pointers. Other minor cleanup. svn path=/trunk/; revision=52807
2013-10-24Remove profinet_conv member of struct _packet_info and turn it into proto_data.Michael Mann1-6/+5
svn path=/trunk/; revision=52806
2013-10-23Fix (using '#if 0') a few more [-Wunused-const-variable] warningsBill Meier7-3/+26
svn path=/trunk/; revision=52799
2013-10-23Fix (using '#if 0') various [-Wunused-const-variable] warningsBill Meier8-2/+65
svn path=/trunk/; revision=52794
2013-10-18Don't allow invalid ranges to be specified for the stats tree. Bug 9130 ↵Michael Mann1-1/+13
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9130) Not sure which memory allocation should be used here (using wmem caused crash), but this revision can at least be easily backported to 1.10 where the bug was reported. Also allow a single number to be used in the stats range since it's considered a valid "range" by the UAT. svn path=/trunk/; revision=52679
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice15-0/+15
using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+2
svn path=/trunk/; revision=52290
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-3/+3
svn path=/trunk/; revision=52289
2013-09-30Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=52288
2013-09-28Fix various warnings in (hopefully) the right ways.Evan Huus7-12/+5
svn path=/trunk/; revision=52236
2013-09-281. Remove PITEM_FINFO from add_tlv_subtree and add_protocol_subtree (as well ↵Michael Mann16-2017/+1427
as some other minor cleanup) and adjust the calling functions accordingly. 2. Converted several add_protocol_subtree calls to add_tlv_subtree to get true filterability. Many of the add_protocol_subtree are effectively being (ab)used as proto_tree_add_text with different highlighting. 3. Convert tvb_new_subset into tvb_new_subset_length. Still looks like some of the remaining "protocols" need more specific filters, and should just be regular FT_BYTES fields. svn path=/trunk/; revision=52235
2013-09-24Prevent crashing as a result of tree removal in r52208. Tree removal + this ↵Michael Mann1-2/+2
patch should be the "quick" fix to bug 5349 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5349). I knew the tree check was preventing some dissection/column data/etc, but from the comments in bug 5349, the tree check was also protecting this (and maybe other) crashes (due to missed NULL checking). I want to follow up with some massive cleanup (remove PITEM_FINFO calls), but this with r52208 should be good enough to backport to 1.8 and 1.10 to fix bug 5349. Cleanup shouldn't need to be backported. svn path=/trunk/; revision=52209
2013-09-24You are in a twisty little maze of code paths, all different. Get ridGuy Harris1-416/+407
of the if (tree) tests in dissect_mac_header_generic_decoder(), as some of the stuff done inside there should be done even if we're not building a protocol tree, e.g. CRC stuff and calling subdissectors. Get rid of a gratuitous pair of curly braces, and fix the indentation of one line, while we're at it. svn path=/trunk/; revision=52208
2013-09-24Stuff used when checking the CRC needs to be done regardless of whetherGuy Harris1-9/+14
we're building a protocol tree or not. svn path=/trunk/; revision=52207
2013-09-24Get rid of unused variable.Guy Harris1-3/+0
svn path=/trunk/; revision=52206
2013-09-24Fix copy-and-pasteo(?).Guy Harris1-2/+2
svn path=/trunk/; revision=52205
2013-09-24One advantage of making as many things as possible static is that, ifGuy Harris1-1/+4
they're not being used, the compiler can be made to warn about that. In this case, Broadcast_Control_Pointer_IE() was used because of a missing case in a switch statement; put that case in. svn path=/trunk/; revision=52204
2013-09-24Wimax dissector improvements:Michael Mann29-1193/+467
1. Remove message type field from all MAC Management "sub"dissectors and place it in Mac Management subdissector itself. This may cause backwards-compatibility issues (malformed packets) with third-party subdissectors of the MAC Management dissector, but it didn't make sense to have so many filters for a single enumerated value, especially when the various "protocol" filters covers many of them. 2. Removed some if(tree) checks as column info and calling other dissectors are sometimes executed underneath. Some of this is in preparation for addressing bug 5349. 3. Make all dissector functions (and a few others) static, and use register_dissector() when necessary. 4. Convert generic decoder CRC errors into expert info, rather than have it be a "protocol" filter (it just looks funny that way) In general, these dissectors seem "over-protocolized". I understand the need for all of the dissectors, but I don't know if they all need "protocol" status. svn path=/trunk/; revision=52203
2013-09-22More emem -> wmem conversion:Pascal Quantin1-1/+1
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz() - tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc() - tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz() - tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str() - update docs accordingly svn path=/trunk/; revision=52180
2013-09-22emem -> wmem conversion:Pascal Quantin3-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-22Don't declare proto_mac_mgmt_msg_ucd_decoder twice.Jeff Morriss1-1/+0
svn path=/trunk/; revision=52168
2013-09-22Make dissectors register for their MAC Management Message Type and use ↵Michael Mann31-902/+603
dissector_try_uint to do any dissection. Many "outside" (third-party) message types appear to exist. Have the makefiles do all the work setting up proto_register_<dissector> and proto_reg_handoff_<dissector>, rather than sprinkled throughout the dissectors with extern declarations. More is coming to make more functions static (because of current makefile fixes) and cleanup MAC Management dissectors to remove unnecessary/duplicative code, but I wanted to get the build issues squared away. svn path=/trunk/; revision=52167
2013-09-20Enhance DOCSIS dissector with new fields. Bug 9149 ↵Michael Mann1-5/+86
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9149) From Jerry Negele svn path=/trunk/; revision=52158
2013-09-17emem -> wmemPascal Quantin11-72/+77
svn path=/trunk/; revision=52130
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann6-130/+130
svn path=/trunk/; revision=51850
2013-09-08Convert profinet dissector to use filterable expert info.Michael Mann3-153/+197
NOTE: Some of the expert group values may need to be checked, PI_UNDECODED doesn't always seem like the right choice. I thought PI_PROTOCOL should be used more. This concludes the conversion expert_add_info_format for all dissectors (where the function isn't commented or #defined out). Onto the "internal" (epan/lua) uses of the call. svn path=/trunk/; revision=51841
2013-09-02Fix Function call argument is an uninitialized value Warning found by ClangAlexis La Goutte1-1/+1
packet-dcerpc-pn-io.c:9101:29: warning: Function call argument is an uninitialized value tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, u32RecDataLen, u32RecDataLen); ^ ~~~~~~~~~~~~~ svn path=/trunk/; revision=51687
2013-09-02Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+0
svn path=/trunk/; revision=51680
2013-09-02Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=51679
2013-09-02Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+0
svn path=/trunk/; revision=51678
2013-08-27Enhance Profinet MRP (Merge LinkUp and LinkDown)Alexis La Goutte1-74/+23
svn path=/trunk/; revision=51548
2013-08-16packet-dcerpc-pn-io.c: In function 'dissect_PNIO_C_SDU':Anders Broman1-1/+1
packet-dcerpc-pn-io.c:9220: warning: unused parameter 'drep' svn path=/trunk/; revision=51390
2013-08-16From Wido Kelling:Anders Broman1-1/+2
wrong interpretation of first byte in userdata of profinet data. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9039 svn path=/trunk/; revision=51389
2013-08-15As suggested by Volcke Mario, fixingEvan Huus1-1/+0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9036 Don't change the length *and* the offset when adjusting for the ethercat header, just the offset is enough (the length is then right). svn path=/trunk/; revision=51360
2013-08-13Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9035 :Pascal Quantin1-5/+11
Indicate the right direction in info column svn path=/trunk/; revision=51333
2013-08-06Replace hfinfo pointer to same_name_prev, with same_name_prev_id.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=51175
2013-08-06Remove hfinfo->bitshift member, add hfinfo_bitshift() to get it.Jakub Zawadzki2-2/+2
svn path=/trunk/; revision=51174
2013-07-22Revert removed line in r50774, we can update pinfo->rel_ts not sure if it ↵Jakub Zawadzki1-0/+1
makes sense, but why not? svn path=/trunk/; revision=50795