aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-s7comm.c
AgeCommit message (Collapse)AuthorFilesLines
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann1-1/+1
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann1-1/+1
This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-23Added syntax id 0x82 for NCK data accessThomas Wiens1-0/+184
Change-Id: Iaff4551f87fa8d74a09a99c3c772c8abbdf60198 Reviewed-on: https://code.wireshark.org/review/8168 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-23Added decoding of BSEND/BRECV communicationThomas Wiens1-0/+53
Change-Id: Ie02f809e69cf9e7980d90ab02a2d4f34a465e0cd Reviewed-on: https://code.wireshark.org/review/8170 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-23Added display and filteroptions for byte- and bitaddressThomas Wiens1-1/+21
Change-Id: I48f39c148006e25fa98b75656cbb11496bce9d25 Reviewed-on: https://code.wireshark.org/review/8169 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-22Added transport size double-integerThomas Wiens1-0/+2
Change-Id: I3b5452ef8cfd4fac414b2c5bdd7926ea679b8029 Reviewed-on: https://code.wireshark.org/review/8167 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-1/+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-09-09Fix some spelling & grammar.Bill Meier1-5/+5
Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907 Reviewed-on: https://code.wireshark.org/review/4054 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-04Fix Mac OS X buildbotAlexis La Goutte1-20/+20
packet-s7comm.c:962: warning: declaration of 'time' shadows a global declaration Change-Id: I4020b780e787a91c42f08f7b7b1c7feabcabdc62 Reviewed-on: https://code.wireshark.org/review/3987 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-04s7comm: Add dissector for S7 CommunicationThomas Wiens1-0/+3216
S7 Communication is a Siemens proprietary protocol that runs between programmable logic controllers (PLC) of the Siemens S7-300/400 family. Dissector T.125 has to be disabled to let this dissector work. Change-Id: I578cf270a4ae567f8e20dbabec1ce1e13fc08e6e Reviewed-on: https://code.wireshark.org/review/3777 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>