aboutsummaryrefslogtreecommitdiffstats
path: root/tools/wireshark_gen.py
AgeCommit message (Collapse)AuthorFilesLines
2019-07-26HTTPS (almost) everywhere.Guy Harris1-2/+2
Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-06idl2wrs: clean up and add python3 compatibilityYannik Enss1-1115/+687
Clean up the python scripts using PEP-8 as a guide, with exceptions made where necessary. Includes: - Move comments to docstrings - Remove unnecessary whitespace - Remove brackets from if statements where this improves readability - Change the debug print statements to output comments - Remove semicolons - Prefix debug output with '//' - Break long lines Python 3 compatibility changes are mostly converting print statements and moving away from the string module in favor of `str` methods. By including the "future" import, compatibility with python 2 is maintained. The changes were tested using both omniORB 4.2.2/Python 3.6 and omniORB 4.1.7/Python 2.7 Change-Id: I8126a49b2fde13982d34e462fced16b9d7b88306 Reviewed-on: https://code.wireshark.org/review/33850 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-06idl2wrs: extend aggressive modeYannik Enss1-0/+4
Add a "_loop" header field also when processing attributes Change-Id: I109b34d8f6cb8fbf3c38dc09f58b740b4d96436b Reviewed-on: https://code.wireshark.org/review/33460 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-06-05idl2wrs: fix 'undeclared identifier' errorYannik Enss1-7/+7
the 'x_octetx' variables were removed a few years back, replace them with get_CDR_xxx() Change-Id: I8cf3410d8a152c834e7019f7d1d80de3798530c3 Reviewed-on: https://code.wireshark.org/review/33457 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-05idl2wrs: add aggressive modeYannik Enss1-4/+7
add a mode to ignore a few optimisations in favor of working output Change-Id: I875cec5a80e9449e9fd954d4ff6a21e5b128db5e Reviewed-on: https://code.wireshark.org/review/33459 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-05idl2wrs: fix recursion loopYannik Enss1-2/+3
wireshark_gen goes into an infinite recursion if it encounters a multi-level alias, this is prevented Change-Id: Icec678fb326b7c14344dc6df51015dad980587a9 Reviewed-on: https://code.wireshark.org/review/33458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-05idl2wrs: add debug command line parameterYannik Enss1-8/+3
convert the "DEBUG" constant to a command line parameter Change-Id: I7f873d85fa053cb9298bd03444125d0160ef4640 Reviewed-on: https://code.wireshark.org/review/33456 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-17Clean up some signed vs. unsigned warnings.Guy Harris1-1/+1
Octet arrays are octets of guint8s, not gchars/chars. Make some strings arrays of chars/gchars, not guint8s; this needs more thought (throughout Wireshark). Offsets into tvbuffs are signed, not unsigned. (This is to support negative offsets, which are offsets from the end of the tvbuff. We might want to remove that and go with unsigned offsets, and have the few, if any, places where that feature is used explicitly calculate the offset from the end based on the tvbuff's length; most if not all of our handling of trailers/end-of-packet FCSes/etc. does so, and makes sure it handles the case where the end-of-packet information isn't present, to better report errors and dissect the stuff before it.) Change-Id: Ia46ed3fc7c2d8ac97cd14824d521cbc461fb7f45 Reviewed-on: https://code.wireshark.org/review/33239 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-17Update the warning-suppression statements in idl2wrs.Guy Harris1-3/+8
Update them to use ws_diag_control.h and ws_compiler_tests.h, and the DIAG_OFF() macros therein. Regenerate the CORBA dissectors. Change-Id: I26f0add0ec8dd920bfe80571b4141c1b0e2f0640 Reviewed-on: https://code.wireshark.org/review/33238 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-04epan: Convert our PROTO_ITEM_ macros to inline functions.Gerald Combs1-1/+1
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07spdx: more licenses converted.Dario Lombardo1-13/+1
Change-Id: I3861061ec261e63b23621799e020e811ed78a343 Reviewed-on: https://code.wireshark.org/review/26333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-19dissectors (and tools): fix typo dependant -> dependentAlexis La Goutte1-2/+2
found by lintian Change-Id: I50907b9721f3941c291cf322916f553ab3b4b168 Reviewed-on: https://code.wireshark.org/review/20638 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-07Spelling fixes for errors found by lintianBalint Reczey1-1/+1
Change-Id: I889283902875193f4d3f3fd59788f59f8d9bcc20 Reviewed-on: https://code.wireshark.org/review/11945 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-28idl2wrs: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangMichael Mann1-14/+33
It looks like "items" could have contributed to fields/data being at an incorrect level off of a tree. Change-Id: I93616ef8b6b364c578f989882045dee42cb6d3c3 Reviewed-on: https://code.wireshark.org/review/8558 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-07Need to generate hf_ variable for aliases in structs.Michael Mann1-1/+2
Change-Id: I6bd995d42cf54aaf2ad90d0322056c7ff0830ea9 Ping-Bug: 11156 Reviewed-on: https://code.wireshark.org/review/8324 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-07Remove proto_tree_add_text from idl2wrs generation.Michael Mann1-13/+27
Change-Id: Iab9df3e68d2a3878c3081c6352c45f7c329b983e Reviewed-on: https://code.wireshark.org/review/8323 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06Fix the need to manually adjust packet-gias.c (take 2)Michael Mann1-10/+61
Need to have packet-gias.c in the DIRTY_CORBA_IDL_DISSECTOR_SRC grouping to work around the warnings still generated. Change-Id: I08ea1f7d90577cc112b85e7fc00171827f58d6d2 Reviewed-on: https://code.wireshark.org/review/8266 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-01Revert "Fix the need to manually adjust packet-gias.c"Alexis La Goutte1-60/+9
This reverts commit 3ca9318d8215738b8d4edcde0598226cfc6cf031. Mac OS X buildbot are not happy packet-gias.c:356: warning: 'hf_UCO_InvalidInputParameter_details' defined but not used packet-gias.c:359: warning: 'hf_UCO_ProcessingFault_details' defined but not used packet-gias.c:360: warning: 'hf_UCO_SystemFault_details' defined but not used packet-gias.c:5275: warning: 'decode_UCO_Ratio_st' defined but not used packet-gias.c:5303: warning: 'decode_UCO_DirectAccessLocation_st' defined but not used packet-gias.c:5588: warning: 'decode_UCO_Coordinate3d_st' defined but not used packet-gias.c:5612: warning: 'decode_UCO_Circle_st' defined but not used packet-gias.c:5625: warning: 'decode_UCO_Ellipse_st' defined but not used packet-gias.c:5656: warning: 'decode_UCO_SimpleGSImage_st' defined but not used packet-gias.c:5671: warning: 'decode_UCO_SimpleCImage_st' defined but not used packet-gias.c:5694: warning: 'decode_UCO_CompressedImage_st' defined but not used packet-gias.c:5836: warning: 'decode_GIAS_ImageSpec_st' defined but not used Change-Id: Iee076c00eb4e48571a99f6b854b7e3e52983c2f8 Reviewed-on: https://code.wireshark.org/review/8265 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-01Fix the need to manually adjust packet-gias.cMichael Mann1-9/+60
Change-Id: I11beada78d2f2b4359d3638cdbcb6f43623fd10c Reviewed-on: https://code.wireshark.org/review/8262 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-23idl2wrs: don't use -1 for the protocol-item length.Jeff Morriss1-1/+1
It doesn't work any more for empty (length==0) PDUs. Similar to bug 10646/Ifb96768969a43c59367b73e7bb940ceeb02cf6b0 (for RPC). Untested as I'm not set up to build IDL dissectors now. Bug: 11134 Change-Id: I77aacc2590acbacbe02edb1768e754f92f87bc23 Reviewed-on: https://code.wireshark.org/review/8163 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-25Cleanup "excess" from trying to support sequence of "native types". Last ↵Michael Mann1-40/+38
installment of bug 9532. Cleaned up wireshark_gen.py so that it no longer generates duplicate fields and greatly minimized the number of useless hf_ variables generated. Change-Id: I26b2ddb5b65fcde99787cc2771348aa1b37f919f Reviewed-on: https://code.wireshark.org/review/1329 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-23Continuation of bug 9532.Michael Mann1-0/+14
Ie4d1edfd67a8e6f02834573f29f07baf79058534 created a several duplicate hf_ registrations. That led to the exposure of some other potential problems with generating sequences. Still not quite complete, but want to pacify the buildbots, so there is a small amount of manual editing to comment out a few duplicated hfs in packet-parlay.c. Change-Id: I0ff8a9795e213ab966db8d6333b9477bad06250b Reviewed-on: https://code.wireshark.org/review/1302 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-23Bugfix generating a sequence of "native" types. Bug 9532.Michael Mann1-3/+66
Previously a sequence of "native" types (int, float, etc) generated a proto_tree_add_uint (for the loop over the sequence) and a proto_tree_add_XXX (for the "native" type), but only 1 hf variable was created for the "loop" field, so DISSECTOR_ASSERT_NOT_REACHED would be generated if "native" type != uint. Now a separate hf_ variable is generated for the "loop" and "native" type. Also update existing IDL dissectors with new generator logic. Change-Id: Ie4d1edfd67a8e6f02834573f29f07baf79058534 Reviewed-on: https://code.wireshark.org/review/1274 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-23Fix generator to remove Dead Store (Dead assignement/Dead increment) warning ↵Michael Mann1-2/+13
found by Clang. (not sure why, but regeneration also "moved" some hf_ variables from previous version) Change-Id: I197eacbb3f892dbdca6e6bc354fc88240c1bfb34 Reviewed-on: https://code.wireshark.org/review/1291 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-14Remove $Id$ and other Subversion leftovers from the tools.Jeff Morriss1-4/+0
There are a few things in here which could still use attention. Don't regenerate anything now. Change-Id: I283c224d3523212144707fca3d6265916cb11792 Reviewed-on: https://code.wireshark.org/review/205 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-10Fix warnings in packet-parlay.cAlexis La Goutte1-1/+1
packet-parlay.c:53643:9: warning: passing argument 2 of 'get_CDR_wchar' from incompatible pointer type [enabled by default] packet-parlay.c:53667:9: warning: passing argument 2 of 'get_CDR_wstring' from incompatible pointer type [enabled by default] Change-Id: I027809139e74b563e759f28e2e141951166e53d0 Reviewed-on: https://code.wireshark.org/review/170 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2013-12-04From Anders request Add prototype for corba/idl dissectorAlexis La Goutte1-0/+17
svn path=/trunk/; revision=53778
2013-12-03Add modelines info to idl generate fileAlexis La Goutte1-2/+36
svn path=/trunk/; revision=53754
2013-12-03Fix indent for generated file (Use 4 space)Alexis La Goutte1-39/+39
svn path=/trunk/; revision=53753
2013-12-03Fix generator don't generate trailing whitespaceAlexis La Goutte1-4/+6
svn path=/trunk/; revision=53752
2013-12-03Add #pragma to idl generator...Alexis La Goutte1-1/+5
svn path=/trunk/; revision=53746
2013-12-01Use 4-space (PEP 8) indentation. Add modelines.Gerald Combs1-16/+27
svn path=/trunk/; revision=53685
2013-09-08expert_add_info_format_text -> expert_add_info_textMichael Mann1-4/+4
svn path=/trunk/; revision=51849
2013-07-03WS_DLL_PUBLIC is now always WS_DLL_PUBLIC_NOEXTERN with "extern" added;Guy Harris1-2/+2
just define WS_DLL_PUBLIC_NOEXTERN inside the ifdefs, and define WS_DLL_PUBLIC as WS_DLL_PUBLIC_NOEXTERN followed by "extern". Then rename WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, to clarify that it's what should be used for definitions; at least on Windows, you *have* to use it when declaring arrays without a size, and, whilst you might be able to use WS_DLL_PUBLIC for definitions of functions and perhaps data definitions other than no-size arrays, it might be clearer to rename WS_DLL_PUBLIC to WS_DLL_PUBLIC_DECL and use it only for declarations. svn path=/trunk/; revision=50334
2013-05-24Use new expert info API in idl dissectors. These generated about 50% of the ↵Michael Mann1-11/+41
add_expert_info_format() calls. svn path=/trunk/; revision=49561
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-2/+6
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-01-22Fix for CID 761911-761984 and CID 761985-761994.Jaap Keuter1-0/+2
Try to convince Coverity that the passed in item pointer is appreciated, but not used. This time see if it pleases the Windows compiler too. svn path=/trunk/; revision=47217
2013-01-22Revert 47201 it does not compile on Windows.Anders Broman1-4/+1
svn path=/trunk/; revision=47208
2013-01-21Fix for CID 761911-761984 and CID 761985-761994.Jaap Keuter1-1/+4
Try to convince Coverity that the passed in item pointer is appreciated, but not used. svn path=/trunk/; revision=47201
2013-01-18Try and see if we can suppress about half of the Coverity issues.Jaap Keuter1-0/+2
svn path=/trunk/; revision=47157
2012-12-26Change wireshark_gen.py to make the operation argument to routines aGuy Harris1-11/+11
"const char *", as it is now expected to be. Regenerate the dissectors. Update the URL for OmniOrb. In README.parlay, use idl2wrs in the sample command. svn path=/trunk/; revision=46765
2012-11-13Use proto_tree_add_<signed integer> functions for signed giop datatypesMichael Mann1-4/+4
svn path=/trunk/; revision=46021
2012-11-05Add a few more expert_add_info_format calls to giop dissector which requires ↵Michael Mann1-170/+94
packet_info* structure and proto_item* to be filtered down through the generated functions. Also removed some excessive whitespace. svn path=/trunk/; revision=45911
2012-10-11Make idl2wrs dissectors filterable - Part 1Michael Mann1-198/+622
Updated wireshark_gen.py to generate hf_ variables for all of the IDL "types". The "simple" types use proto_tree_add_* (not text), while the "complex" types use the GIOP dissector API. checkhf.pl generates some warnings because (some of) the hf_ variables are being generated for the "complex" types, but are not being used. That will be done in Part 2. expert_add_info_format now linked to a real item instead of being attached to a duplicative proto_tree_add_text(). This cleaned up literally thousands of unnecessary proto_tree_add_text()s svn path=/trunk/; revision=45472
2012-09-19We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=44997
2012-09-05Replace process_RequestOperation macro by a real function to speedup ↵Pascal Quantin1-6/+14
compilation time svn path=/trunk/; revision=44779
2012-08-14Bug 3725 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3725)Michael Mann1-9/+0
Have giop dissector use more ephemeral memory. Update idl2wrs dissector generator accordingly. svn path=/trunk/; revision=44498
2012-08-08From Michael Mann on -dev:Jeff Morriss1-1/+1
The idl2wrs generated dissectors don't follow the convention of using the filter name registered with the protocol as the start of any display filter name. This patch fixes that. svn path=/trunk/; revision=44325
2012-08-08Use expert infos instead of g_warning when something unexpected is found.Jeff Morriss1-11/+25
svn path=/trunk/; revision=44324
2012-07-08Add a function to packet-giop.c that does what the code that Jeff Morriss1-10/+1
template_get_CDR_string (in wireshark_gen.py) did. This eliminates another whole pile of function-local variables in packet-parlay.c. Unfortunately it doesn't seem to speed up compilation (or eliminate the variable tracking size limit problem). But it does eliminate a lot of lines of code... svn path=/trunk/; revision=43610
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 16:09:09 +0000