Commit Graph

1603 Commits

Author SHA1 Message Date
Michael Mann 71c02b20eb Create FT_FCWWN field type.
Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type.

Change-Id: I4ca77870499fd8239584a70874998b5d194a7167
Reviewed-on: https://code.wireshark.org/review/6036
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28 20:05:29 +00:00
Michael Mann 1d598bbff7 Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28 14:09:27 +00:00
Dario Lombardo 63ebe918d9 Removed duplicated #include lines
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
Reviewed-on: https://code.wireshark.org/review/6065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-28 00:02:39 +00:00
Michael Mann 3d3f97320b Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26 21:17:10 +00:00
Michael Mann e03ffe2583 Replace fc_to_str with address_to_str or tvb_fc_to_str.
Change-Id: I69bf25f5abb9d6ad325f922fab73b6f0cf8ca2ea
Reviewed-on: https://code.wireshark.org/review/6035
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24 18:59:14 +00:00
Michael Mann f002332d88 Replace ether_to_str with either address_to_str or tvb_ether_to_str.
Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260
Reviewed-on: https://code.wireshark.org/review/5933
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21 15:13:30 +00:00
Michael Mann 6f8de873c7 Allow "cba" filter prefix for hf_ fields (missed a Profinet file the first time)
Change-Id: I3ff65a8f6307a9ee08e173c0b2658d96985e0c45
Reviewed-on: https://code.wireshark.org/review/5943
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21 12:57:58 +00:00
Stephen Fisher 0df4eecd55 Add parenthesis around some generated code so it compiles. This new
code only shows up when the X11 dissector is updated from the latest
xcbproto & mesa, which I will commit real soon now (RSN).

Change-Id: Ic750df3b4406f107fd850ade891ee093054c8d6d
Reviewed-on: https://code.wireshark.org/review/5882
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 20:28:14 +00:00
Stephen Fisher 398c2cee9c Skip over the new 'switch' field in xproto/src/xinput.xml so we can
re-generate the x11 dissector again without the script breaking.

Change-Id: I6d24cf098f370f4c1ff191052e2ea67b7875b33a
Reviewed-on: https://code.wireshark.org/review/5878
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 17:05:35 +00:00
Stephen Fisher d3a4d926d0 Put a colon after the error message and before the field the error
is referring to for clarity.

Change-Id: I7930e851647c847335b91435c7b0871c6db2defe
Reviewed-on: https://code.wireshark.org/review/5847
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 04:17:19 +00:00
Stephen Fisher 23987b4ba5 Add a comment to each of these scripts to say that
epan/dissectors/README.X11 has instructions for running them.

Change-Id: Id3c1df1bf1f50b19372b9a0470822da9ca6504f7
Reviewed-on: https://code.wireshark.org/review/5846
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 03:51:12 +00:00
Michael Mann 577e6a133c Allow "cba" filter prefix for hf_ fields. Seems like something with "pn" or (abbreviated) Profinet would make more sense (with dissectors to match), but trying to satisfy pre-commit check.
Change-Id: I1db5314fdc77ab7b909c955415f66f24da7d2a0a
Reviewed-on: https://code.wireshark.org/review/5838
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-18 19:45:33 +00:00
Chris Brandson df639f509e Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector.
Removed attrID and cmdID ZCL cluster functions.
Bug in ZCL HVAC attribute registration.
Fixed bug in ZCL command ID field registration.
Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014
Fixed broken fragmented ZigBee packet collection and reassembly
Use protocol fields for Thermostat schedule transitions.
Added support for Key Establishment Cluster (CBKE) at SE 1.2a
Updated Message cluster to SE 1.2a spec
Added attribute reporting status which is common to all SE 1.2a clusters
Added SE 1.2a tunnel cluster support
ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences
The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance
ZigBee security added key display for decrypted packets
ZigBee Security Preferences fixed UAT type for Label so key label is editable again
Added definition for Retail Service profile
Added dissection for profile-wide (General Command Frame) commands when the profile is unknown
Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files

Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad
Reviewed-on: https://code.wireshark.org/review/5565
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17 11:53:26 +00:00
Gerald Combs f66de3a749 Fix filename matching.
Change-Id: I2bdfd3ad2798ed1443d06c42b05c9962b8e8041d
Reviewed-on: https://code.wireshark.org/review/5689
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-09 19:26:02 +00:00
Gerald Combs d87a9527ee It's a reasonable expectation that we will have C++ style comments in
ui/qt.

Change-Id: Iedbf2a2d3cbfee00912e6e883928836932dea566
Reviewed-on: https://code.wireshark.org/review/5678
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-08 22:14:00 +00:00
Michael Mann e172ebb3b4 Add proto_tree_add_bitmask_with_flags.
It's proto_tree_add_bitmask with the ability to control the data appended to header.

Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a
Reviewed-on: https://code.wireshark.org/review/5533
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:13:02 +00:00
Bill Meier 6e5d84f1e1 Rename some filter names to fix cases of duplicate filter names.
Note: Use of most of these filter names could have caused a Wireshark crash.

Change-Id: I393402a25dd26d174baff77f4706f6d5f43a94ae
Reviewed-on: https://code.wireshark.org/review/5610
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-04 03:44:45 +00:00
Michael Mann 86c659c272 Improve checkfiltername.pl for pre-commit script.
1. Bugfix grep statement checking if file is "autogenerated"
2. Add to the list of "whitelist" duplicates.  Many more were found after #1 was changed.

Change-Id: Idea764c0c8b5fa4f30c9acaab9ba10340834d4f5
Reviewed-on: https://code.wireshark.org/review/5547
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-01 05:43:25 +00:00
Alexis La Goutte 7f22ce7f66 pre-commit tools: Add arg option to specify the commit id to be checked
If no commit id specify, it is HEAD

Thanks to Michal for the help :-)

Change-Id: Ibf579aed47c7574f9a01d868ae0d55bbe789a8a2
Reviewed-on: https://code.wireshark.org/review/5474
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-25 13:21:41 +00:00
Michael Mann ead585fda7 Give better hints as to where the "expert info" fields go.
Change-Id: I9b1cee43ef9280504745b136b87507c2b6bb5369
Reviewed-on: https://code.wireshark.org/review/5406
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-20 12:29:10 +00:00
Guy Harris d23247e7a9 White space tweaking to match what's in Samba git.
(Samba git also needs some white space tweaking; this only changes the
cases where we're not obviously "better".)

Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac
Reviewed-on: https://code.wireshark.org/review/5403
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-20 00:55:06 +00:00
Alexis La Goutte b1c91b06dc Tools: Add fix_pragma_wdocumentation to UNKNOWN licence
Change-Id: Ib5665924b99644c52c95d408c7cff19509cf3eb2
Reviewed-on: https://code.wireshark.org/review/5241
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-11 18:37:38 +00:00
Alexis La Goutte bd9ff6bb8a Add tools for fix -Wdocumentation
Use pragma to disable -Wdocumentation when include glib.h, gmodule or gtk/gtk.h

Change-Id: I576c0d5c4a12ac3b505ac9543646356ff29ac814
Reviewed-on: https://code.wireshark.org/review/5198
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-11 17:31:43 +00:00
Michael Mann 570df7592d Add checkfiltername.pl to pre-commit script
Change-Id: I34d8aa7034a4aacc2a95b35a30f25356b33a51b9
Reviewed-on: https://code.wireshark.org/review/5187
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-08 07:23:42 +00:00
Michael Mann 09cdfe851e Fix all remaining filter name errors found with checkfiltername.pl
This should make it possible to add checkfiltername.pl to the pre-commit script.

Change-Id: Icdee7e4ea3381fa1467bb4b5caf0f60c255adec0
Reviewed-on: https://code.wireshark.org/review/5166
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>
2014-11-07 05:25:53 +00:00
Guy Harris c3c59dc2ad add the type dom_sid28 and call ad-hoc dissector
Pick up change from Samba:

    commit 87fb54b77f4b9caaf2b25635b7813e29a448aaa6
    Author: Matthieu Patou <mat@matws.net>
    Date:   Tue Oct 1 12:04:02 2013 -0700

    pidl-wireshark: add the type dom_sid28 and call ad-hoc dissector

Change-Id: Ide5041b901b5e1785b5cabd4b6320f830bbef2b8
Reviewed-on: https://code.wireshark.org/review/5108
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-04 12:37:21 +00:00
Guy Harris e41f08858b SWITCH_TYPE is not always defined, SwitchType() will try to find a fallback
Pick up change from Samba:

    commit 4b09df897803e78265fd19f6ff19be6e3d8a3944
    Author: Matthieu Patou <mat@matws.net>
    Date:   Tue Oct 1 12:10:18 2013 -0700

    pidl-wireshark: SWITCH_TYPE is not always defined, SwitchType() will try to find a fallback

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Change-Id: I1f41ece23e8fec30f9cd89a2203ad63ee6e21e36
Reviewed-on: https://code.wireshark.org/review/5105
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-04 10:08:20 +00:00
Guy Harris 1119eb692b generate ALIGN_TO_x_BYTES instructions if the element has the align_x flag
Pick up change from Samba:

    commit 93f262ee6d162bf007b79d2daf9de6c49c6163d1
    Author: Matthieu Patou <mat@matws.net>
    Date:   Fri Oct 18 00:04:28 2013 -0700

    pidl-wireshark: generate ALIGN_TO_x_BYTES instructions if the element has the align_x flag

Change-Id: I865eae69ea7a8200630d3ad69bda9ac7b1c12255
Reviewed-on: https://code.wireshark.org/review/5099
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 20:06:15 +00:00
Guy Harris 283b5cd708 if the structure has the flag no_align then set also no_align in the dceprc_info structure
commit 3f6ca430b067705d556031d52736d5a5d5ae8f55
    Author: Matthieu Patou <mat@matws.net>
    Date:   Fri Oct 11 13:18:37 2013 -0700

    pidl-wireshark: if the structure has the flag no_align then set also no_align in the dceprc_info structure

    Some dissection function will try to do alignment if the no_align flag
    is not set.

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Change-Id: Ie2377f4d6c1c4f2fde7084ba666bd417568122dd
Reviewed-on: https://code.wireshark.org/review/5098
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 20:04:02 +00:00
Guy Harris 9299bf48ae Remove casts, make some whitespace changes in generated code.
This is the part of this change from Samba:

    commit f0a6043fb201940f438f63c809df7186aa307f01
    Author: Matthieu Patou <mat@matws.net>
    Date:   Sun Oct 5 18:25:27 2014 -0700

    pidl-wireshark: handle 8 bits enum and change the signature of enum function to pass the exact type

    Instead of passing a uint32 in all cases we pass the exact type

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

that wasn't already in our version.

Change-Id: I7da99cb701c2eedadeb8acb68d32f657dfa85e5b
Reviewed-on: https://code.wireshark.org/review/5097
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:56:22 +00:00
Guy Harris 26d4fb0f39 add definition for IPV4/IPV6 types
Pick up change from Samba:

    commit 49e0dc7ad0f3c29df20badacc4294f1adc375aaf
    Author: Matthieu Patou <mat@matws.net>
    Date:   Fri Oct 25 23:11:37 2013 -0700

    pidl-wireshark: add definition for IPV4/IPV6 types

Change-Id: I514f855370c1d9355ffc6ff9b31f8aedd70b9122
Reviewed-on: https://code.wireshark.org/review/5096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:51:18 +00:00
Guy Harris d993cdd449 insure that we have an entire match for the variable name
Pick up patch from Samba:

    commit fa331f64d1a40350496c7acf68c20cb3fead6eaf
    Author: Matthieu Patou <mat@matws.net>
    Date:   Thu Oct 3 09:45:19 2013 -0700

    pidl-wireshark: insure that we have an entire match for the variable name

Change-Id: I1e730dfb3b9eb96a4cda34659297fddeac7801c8
Reviewed-on: https://code.wireshark.org/review/5095
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:46:51 +00:00
Guy Harris 0139ac87d0 generate an error for the new Pipe type in typedef
Pick up change from Samba:

    commit 5d0d45c9a71f137dc29ca79d49bd558f34bf1ff5
    Author: Matthieu Patou <mat@matws.net>
    Date:   Sun Sep 29 00:42:36 2013 -0700

    pidl-wireshark: generate an error for the new Pipe type in typedef

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Change-Id: I9e6da50b657f774fadf7c3777900d409999d4660
Reviewed-on: https://code.wireshark.org/review/5094
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:44:33 +00:00
Guy Harris 08a85b85ec add a function to change the type of a hf_field
Pick up change from Samba:

    commit 755bc4ed29c89fc15d4230ce8b828b3afcfa2912
    Author: Matthieu Patou <mat@matws.net>
    Date:   Thu Oct 3 01:10:48 2013 -0700

    pidl-wireshark: add a function to change the type of a hf_field

    We can use this to change the type FT_BYTE when we realize that the
    object dissected is an array of bytes

Change-Id: I1f24ce834b6a5be0d933b1fdfd9a0baa88c3761a
Reviewed-on: https://code.wireshark.org/review/5093
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:34:56 +00:00
Guy Harris e0c727739e Handle the case when the DATA_TYPE is not a simple type
Pick up change from Samba:

    commit 343db5326b369cbdef4b723e3056acc2a866a887
    Author: Matthieu Patou <mat@matws.net>
    Date:   Tue Sep 23 01:28:40 2014 -0700

    pidl-wireshark: Handle the case when the DATA_TYPE is not a simple type

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Change-Id: I511a60beb392e5e92701d5ace1260397fb4be851
Reviewed-on: https://code.wireshark.org/review/5092
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:30:53 +00:00
Guy Harris 58a325e282 Improve string delection in function ContainsString
Pick up patch from Samba:

    commit 5740a06b320d56840439fb7fe3b8b27f341ddaa7
    Author: Matthieu Patou <mat@matws.net>
    Date:   Sat Oct 4 21:19:12 2014 -0700

    pidl: Improve string delection in function ContainsString

Change-Id: I702c12e4275315511728d5ef6db07e03be9c2b38
Reviewed-on: https://code.wireshark.org/review/5091
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:24:52 +00:00
Guy Harris 0713d35bcd Make the compilation of PIDL produce the same results if the content hasn't changed
Pick up change from Samba:

    commit 4986359816704f38d4fad3ddd0d07a0f0a25b335
    Author: Matthieu Patou <mat@matws.net>
    Date:   Mon Sep 22 21:52:14 2014 -0700

    pidl: Make the compilation of PIDL producing the same results if the content hasn't change

    Newer perl versions don't generate stable results anymore.

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Change-Id: Ifced47229b3033d1fae494adff0dee6671304812
Reviewed-on: https://code.wireshark.org/review/5090
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:21:29 +00:00
Guy Harris f2269b4f37 Pass di to one more call to PIDL_dissect_uint8().
The case for type "char" wasn't fixed.

Change-Id: Ia745263cd4d11a3c00b1ecc72e044f4e404da283
Reviewed-on: https://code.wireshark.org/review/5088
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-03 19:08:22 +00:00
Michael Mann 54efe5dad1 Improve the "guessing" of the hf_ field and encoding values.
Change-Id: Iaa042ef8b794c265870a04f6659720c321978697
Reviewed-on: https://code.wireshark.org/review/5026
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-31 13:02:35 +00:00
Jeff Morriss cc640f03b9 Prohibit ctype APIs (except toupper() which is still used by file.c - make
that deprecated).

Also remove a few tabs that were in there.

Change-Id: I1bb2ad726828366a9f7d1a4064b1215b743ad3b5
Reviewed-on: https://code.wireshark.org/review/5000
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-30 17:57:00 +00:00
Jeff Morriss e0a352631d Tell the user which file __func__ was found in.
Change-Id: Ia69ceaf320cb97447f80a7c090efe6d36262a1c1
Reviewed-on: https://code.wireshark.org/review/5001
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-10-30 16:02:28 +00:00
Michael Mann 62831ba914 convert_proto_tree_add_text.pl - missed adding an else statement to logic.
Change-Id: I7f31e9ba47d2e94887bd01a84bab356c0c835d92
Reviewed-on: https://code.wireshark.org/review/4998
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-30 15:36:31 +00:00
Michael Mann fea733e82b Add logic to determine if a "tvb get" call is used as a parameter to a proto_tree_add_text call. convert_proto_tree_add_text.pl has an easier time determining hf_ field values with a "tvb get" call present, so it's more likely those dissectors will be picked first in eliminating their proto_tree_add_text calls.
Change-Id: I3dd57a73c8e60d8075a6bb987efd52b96b38445c
Reviewed-on: https://code.wireshark.org/review/4997
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-30 15:20:48 +00:00
Anish Bhatt 439c0b88a6 [tools] Add missing GPL license to generate-bacnet-vendors.py
Change-Id: I15336a5f759fea6b1fb4f6c5a05807d797a7f5aa
Reviewed-on: https://code.wireshark.org/review/4544
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 10:52:38 +00:00
Alexis La Goutte ceda0f9a40 Remove #pragma warning (MSVC) for PIDL generate dissector
Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c
Reviewed-on: https://code.wireshark.org/review/4479
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-08 09:45:45 +00:00
Anish Bhatt 515f09fef0 [tools] add script to automatically generate bacnet vendors
Requires beautifulsoup4 for parsing, translitcodec for converting accents/diaeresis etc to regular text

Change-Id: I4d400f15916ee3ab07fa14b09fca12beac2010f3
Reviewed-on: https://code.wireshark.org/review/4518
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07 21:28:00 +00:00
Stig Bjørlykke 683165272f asn2wrs: Added support for #.SYNTAX_NEW
This allows syntaxes to be registered as "new" dissectors.

Change-Id: Ibb76688d9d3cbf47222610956aa627fa374bcbce
Reviewed-on: https://code.wireshark.org/review/4524
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07 20:28:10 +00:00
Alexis La Goutte 683d657d49 PIDL (DCERPC): fix Assigned value is garbage or undefined found by Clang Analyzer
packet-dcerpc-dnsserver.c:1002:12: warning: Assigned value is garbage or undefined
packet-dcerpc-frstrans.c:1137:12: warning: Assigned value is garbage or undefined
packet-dcerpc-lsa.c:6345:12: warning: Assigned value is garbage or undefined
packet-dcerpc-nspi.c:7805:12: warning: Assigned value is garbage or undefined
packet-dcerpc-dfs.c:3245:11: warning: Function call argument is an uninitialized value
packet-dcerpc-dfs.c:3245:9: warning: 'level' may be used uninitialized in this function [-Wmaybe-uninitialized]

Change-Id: Ife6a2f565ae215535d0e3d72ef50800114240e3f
Reviewed-on: https://code.wireshark.org/review/4478
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07 01:13:06 +00:00
Alexis La Goutte 4110bdead7 PIDL: fix indent (use 4 tabs) and remove trailing whitespace
Change-Id: I0ee63a040867b44ac9915704f5e581483ed6f7e2
Reviewed-on: https://code.wireshark.org/review/4310
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 06:24:11 +00:00
Alexis La Goutte f6b9e7a79e PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ibae478771b30d6e9ae07315985f1e71bc6b65423
Reviewed-on: https://code.wireshark.org/review/4350
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28 19:16:17 +00:00
Alexis La Goutte 28ec9c29ea PIDL (DCERPC winreg): enhance dissector
* Fix PIDL generator for NOEMIT Element (fix -Wunused-function for DCERPC winreg dissector)
* Fix indent (use tabs)
* Remove DCERPC winreg dissector from DIRTY list

Change-Id: I5d16cbfe8481a5e5f7e5df9b51735c93ae4375a7
Reviewed-on: https://code.wireshark.org/review/4322
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-28 16:41:20 +00:00
Alexis La Goutte e759d8272b PIDL: fix -Wmissing-prototype
Change-Id: I4cae47450e8026b10bd373828f235184560e0a99
Reviewed-on: https://code.wireshark.org/review/4308
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>
2014-09-28 16:22:15 +00:00
Alexis La Goutte f0b5fb7a04 PIDL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I7f6f974732b7905f4ea4686e1a79ca6fbef78fa8
Reviewed-on: https://code.wireshark.org/review/4319
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-09-27 20:07:11 +00:00
Guy Harris 24ced90c7f White space and typo cleanups.
Change-Id: If064178a383ce805ed6f440a1a9d3642a706496c
Reviewed-on: https://code.wireshark.org/review/4320
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 20:15:03 +00:00
Guy Harris ef106f4c19 Update to latest version from Samba Git repository.
Comments from Samba Git log:

commit ee2148754e2e2604ac918343fa8769a25523eb49
Author: Stefan Metzmacher <metze@samba.org>
Date:   Tue Aug 26 21:33:05 2014 +0200

    pidl/wscript: remove --with-perl-* options

    These are not needed anymore as we have useful defaults now.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Michael Adam <obnox@samba.org>

commit b537c5a340bae2accbf35a4ec5eab7074b90f0b1
Author: Michael Adam <obnox@samba.org>
Date:   Mon Aug 25 23:57:23 2014 +0200

    pidl: fix the perl module search path (use lib ...) when installing pidl.

    This way, pidl can also run with modules installed under the $prefix.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Michael Adam <obnox@samba.org>

commit 191fc0e541e7c9d0a1095dc287402df9947ce779
Author: Michael Adam <obnox@samba.org>
Date:   Thu Sep 4 01:38:14 2014 +0200

    pidl/wscript: don't check for perl again.

    This is done at the toplevel now.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
    Signed-off-by: Michael Adam <obnox@samba.org>
    Signed-off-by: Stefan Metzmacher <metze@samba.org>

commit 9e591e3d619d127c5ec5f6ac86326c84f59878fa
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:59:45 2014 +0100

    pidl-waf: Check for system perl(Parse::Yapp::Driver).

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 410ada45b7041be6976fcfefadccbb99212a15a3
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:59:41 2014 +0100

    pidl-waf: Add a function to check for a system perl module.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 17244ef750f699b30ff7ff3a71264f4c76adad6d
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:53:10 2014 +0100

    pidl-waf: Install pidl modules to the perl vendorlib directory.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 0bb6b0102f6fa21e6c9f8010421386a660c5a5e0
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:54:09 2014 +0100

    pidl-waf: Remove unused variable pidl_src.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:46:01 2014 +0100

    Revert "pidl: Install pidl files corrently."

    This reverts commit cee11cfa4544425099268cd32393169afb4bb107.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c2d58c3c2059ef3d43f876df547cbc7256235563
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:51 2014 +0100

    Revert "waf: Add option to specify perl vendor dir."

    This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:35 2014 +0100

    Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional."

    This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838
Author: Andreas Schneider <asn@samba.org>
Date:   Thu Feb 27 13:14:56 2014 +0100

    pidl: Make perl(Parse:Yapp:Driver) installation optional.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 18:47:03 CET 2014 on sn-devel-104

commit 9b200555fec2e33da9521db388d1839375aa8d83
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 17:16:37 2014 +0100

    waf: Add option to specify perl vendor dir.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104

commit cee11cfa4544425099268cd32393169afb4bb107
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 16:04:24 2014 +0100

    pidl: Install pidl files corrently.

    Globbing is a really bad idea in installtion system. One of them is if
    you use patch -b to create a backup, you will end up installing the
    backup file too!

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

Change-Id: I9c4491f0d74c24d7c45a59e98825c789097a0c7b
Reviewed-on: https://code.wireshark.org/review/4318
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:31:15 +00:00
Guy Harris 6700a12a3c Update to current version from Samba Git repository.
Changes from Samba Git log:

commit fac24e11655c554cd3113dfb6fc918a0fd3c880c
Author: Michael Adam <obnox@samba.org>
Date:   Mon Aug 25 23:58:48 2014 +0200

    pidl: remove superfluous "use lib ...".

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Michael Adam <obnox@samba.org>

Change-Id: I8a2460a9168ef5989e9f5e95b51cca73987b80a4
Reviewed-on: https://code.wireshark.org/review/4317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:28:03 +00:00
Guy Harris 44551d39b8 Update to latest version from Samba Git repository.
Changes from Samba Git log:

commit cf75ef9f73f2cdbf2a039bbc9468f5da6a14834e
Author: Stefan Metzmacher <metze@samba.org>
Date:   Fri May 9 11:49:10 2014 +0200

    pidl/lib/wscript_build: make use of PERL_LIB_INSTALL_DIR

    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

    Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
    Autobuild-Date(master): Sat May 10 01:37:33 CEST 2014 on sn-devel-104

commit ee8f98f26a3d6f02a0d10ceeac1194675d505246
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 16:00:54 2014 +0100

    pidl-waf: Only install Yapp::Driver if it is not available.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

    Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
    Autobuild-Date(master): Thu Mar  6 23:30:47 CET 2014 on sn-devel-104

commit b7b0ca1ba9067362bb8a4b901f3a7f2f3bcbd6a1
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:55:46 2014 +0100

    pidl-waf: Do not glob to install pidl modules.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 17244ef750f699b30ff7ff3a71264f4c76adad6d
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:53:10 2014 +0100

    pidl-waf: Install pidl modules to the perl vendorlib directory.

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:46:01 2014 +0100

    Revert "pidl: Install pidl files corrently."

    This reverts commit cee11cfa4544425099268cd32393169afb4bb107.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c2d58c3c2059ef3d43f876df547cbc7256235563
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:51 2014 +0100

    Revert "waf: Add option to specify perl vendor dir."

    This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5
Author: Andreas Schneider <asn@samba.org>
Date:   Fri Feb 28 15:45:35 2014 +0100

    Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional."

    This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838.

    Reviewed-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Stefan Metzmacher <metze@samba.org>

commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838
Author: Andreas Schneider <asn@samba.org>
Date:   Thu Feb 27 13:14:56 2014 +0100

    pidl: Make perl(Parse:Yapp:Driver) installation optional.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 18:47:03 CET 2014 on sn-devel-104

commit 9b200555fec2e33da9521db388d1839375aa8d83
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 17:16:37 2014 +0100

    waf: Add option to specify perl vendor dir.

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

    Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
    Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104

commit cee11cfa4544425099268cd32393169afb4bb107
Author: Andreas Schneider <asn@samba.org>
Date:   Tue Feb 25 16:04:24 2014 +0100

    pidl: Install pidl files corrently.

    Globbing is a really bad idea in installtion system. One of them is if
    you use patch -b to create a backup, you will end up installing the
    backup file too!

    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

    Signed-off-by: Andreas Schneider <asn@samba.org>
    Reviewed-by: Kai Blin <kai@samba.org>

Change-Id: I4372f2c0854743a0339c7d85ace9e67ce9f8bd02
Reviewed-on: https://code.wireshark.org/review/4316
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:22:12 +00:00
Guy Harris 788de8d558 Update to current version from Samba Git repository.
Changes from Samba Git log:

commit d29c143fae4b67c9680a0b9773db3461f2d0d2b7
Author: Stefan Metzmacher <metze@samba.org>
Date:   Thu Mar 27 14:56:23 2014 +0100

    pidl:Samba4/Python: add interface.abstract_syntax() to each interface

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Change-Id: I9f4650c603ea8b2eff05e7b79d7f44452e1337ab
Reviewed-on: https://code.wireshark.org/review/4315
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:17:40 +00:00
Guy Harris d720fe8f77 Update to the latest version from the Samba Git repository.
Changes from the Samba Git log:

commit 2ba9453e9ff5d911a146e786ff8878ef67717366
Author: Stefan Metzmacher <metze@samba.org>
Date:   Thu Sep 26 20:38:12 2013 +0200

    pidl:NDR/Client: avoid useless memcpy()

    If the src and dest pointer of memcpy would be the same
    we should avoid it in order to avoid valgrind warnings.

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

commit f50b561336c7b6c08300e6e477859d1f9fab62c2
Author: Stefan Metzmacher <metze@samba.org>
Date:   Thu Sep 26 01:20:10 2013 +0200

    pidl:NDR/Client: fix dcerpc_function() with [out,ref] pointers

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

commit 662fc2de8c2896503026a2a4052ed1ea8ce78af5
Author: Stefan Metzmacher <metze@samba.org>
Date:   Fri Aug 30 08:54:10 2013 +0200

    pidl:NDR/Client: simplify tevent_req_nterror() usage

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

commit 02c34fe4e51b5e62157eaf2de1d0aaf9fc6b8d72
Author: Stefan Metzmacher <metze@samba.org>
Date:   Fri Aug 30 08:53:18 2013 +0200

    pidl:NDR/Client: add missing TALLOC_FREE(subreq) after dcerpc_binding_handle_call_recv()

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

Change-Id: I19017fd216df8d8d202b995305f4eb7b7a8b9a35
Reviewed-on: https://code.wireshark.org/review/4314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:11:09 +00:00
Guy Harris df685fc94e Update to the latest version from the Samba Git repository.
Changes from the Samba log:

commit 3a0fa3605b8eb995a8cc4696256129893e1f6f7e
Author: Stefan Metzmacher <metze@samba.org>
Date:   Sat Sep 21 23:46:01 2013 +0200

    pidl:Samba3/ServerNDR: skip DCERPC pipe elements and leave NULL pointers.

    We don't support them anyway, but this lets us adding them to the idl
    file and only ignore it on the server.

    Signed-off-by: Stefan Metzmacher <metze@samba.org>
    Reviewed-by: Andreas Schneider <asn@samba.org>

Change-Id: Idbe742fa13e5d3892343fde2b3943f38a6e90a8c
Reviewed-on: https://code.wireshark.org/review/4313
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:07:05 +00:00
Guy Harris bcae0488fc Update to the latest version from the Samba Git repository.
From the Samba log:

commit bfdc874e8b98c8ea147dbcc986f96ad4f73d800f
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Sat Aug 30 01:59:26 2014 +0200

    Various updates to the pidl README file.

    Remove samba3/samba4-specific comments, add comments about backends and files.

    Change-Id: Id2253ce85eab7a684b2c50d25f6f2604dc146a8e
    Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
    Reviewed-by: David Disseldorp <ddiss@samba.org>

    Autobuild-User(master): David Disseldorp <ddiss@samba.org>
    Autobuild-Date(master): Sun Aug 31 23:47:49 CEST 2014 on sn-devel-104

commit 6824f1aa67f0a75df5c94921e334c2b7c7771611
Author: Jelmer Vernooij <jelmer@samba.org>
Date:   Sat Aug 30 01:59:25 2014 +0200

    Remove trailing whitespace.

    Change-Id: I1e0948da34bac278edc62cd63dedd08112426e7a
    Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
    Reviewed-by: David Disseldorp <ddiss@samba.org>

Change-Id: Ifd445bf32aca2d30a6e501fc8c8dd030471ad284
Reviewed-on: https://code.wireshark.org/review/4312
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-26 19:02:42 +00:00
Bill Meier 19d55ca5a2 fix-encoding-args.pl: Don't use a feature available only starting with perl 5.14
Specifically: Window msys git uses an earlier version of Perl (5.8) and thus
	      invoking fix-encoding-args.pl in the pre-commit hook script
	      gives a Perl syntax error.

See https://code.wireshark.org/review/4172 for details

(Also see following for Perl info:
 http://www.perl.com/pub/2011/05/new-features-of-perl-514-non-destructive-substitution.html)

Change-Id: I95a222eaa31942cc6e873ffbde57c5fa5bd2a625
Reviewed-on: https://code.wireshark.org/review/4245
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-22 14:32:16 +00:00
Alexis La Goutte 047bd369a8 PIDL: fix trailing tabspace
Change-Id: If3b623d82d6bbbf9943a35c8885620881eedb091
Reviewed-on: https://code.wireshark.org/review/4204
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-20 20:08:01 +00:00
Michael Mann 06237e4878 proto_tree_add_text -> proto_tree_add_subtree[_format] for DCE/RPC dissectors.
Change-Id: I84755d059ef70ca98b0e7626b6425360daf0529d
Reviewed-on: https://code.wireshark.org/review/4199
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-09-20 11:59:25 +00:00
Michael Mann a58c986f62 Update generated DCE/RPC dissectors.
Now all generated dissectors can successfully compile.

Change-Id: I74728926915d5a9f1694cc49c753b80f213df767
Reviewed-on: https://code.wireshark.org/review/2598
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-19 13:07:11 +00:00
Bill Meier 4bdf514512 fix-encoding-args.pl: Add a few additional fixups;
Specifically: A number of cases of the use of the encoding arg
              "ENC_ASCII | ENC_NA" for FT_BYTES FIELDTYPEs seem to
              have crept into Wireshark source.

Also: Add a ToDo comment as to code rework needed to be able to
      better *validate* encoding args.

Change-Id: I9d4b10b869fe2aef3f20bcd2d7ad6531375aba87
Reviewed-on: https://code.wireshark.org/review/4183
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19 01:37:38 +00:00
Bill Meier 051b0000f9 fix-encoding-args.pl: Add a few fixups for FT_UINT_STRING
Change-Id: Ic22e154859877c48a85b808d0029e10e07876b73
Reviewed-on: https://code.wireshark.org/review/4174
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-18 15:08:39 +00:00
Bill Meier dbb01af72f fix-encoding-args.pl: Fix bug: certain patterns found only in 1st,3rd,... file checked
Another perl "You can't DO that" ...

Change-Id: I56e11bec19515f883f15286c6aa45018a255ab53
Reviewed-on: https://code.wireshark.org/review/4172
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-18 15:06:25 +00:00
Evan Huus 27d1b6addf Bump the time limit for valgrind fuzzing
Some captures are still hitting the limit as a false positive.

Bug: 10122
Change-Id: I12dd26ba0f96f44799f5ae642b1f9b0487f86a8a
Reviewed-on: https://code.wireshark.org/review/3982
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-04 12:54:16 +00:00
Роман Донченко 95cd6b76bd Remove make-tapreg-dotc and its uses, since Python is now mandatory
Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa
Reviewed-on: https://code.wireshark.org/review/3926
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-31 22:14:15 +00:00
Diederik de Groot 0622e3439e Skinny:
Fix: ensure that string created in dissect_skinny_displayLabel is always NULL terminated (Fixing Bug: 10429 (Pascal))
Fix: MiscCommandType should use videoFastUpdateGOB Union when command enum is videoFastUpdatePicture
Manual Merge PatchSet 4 (Me) and Patchset 7 (Pascal)
Fix Merged PatchSet 8 (Pascal)

Bug: 10429
Change-Id: I87bc7c6eaff976d7a70856f5fbe8c0ded6257064
Reviewed-on: https://code.wireshark.org/review/3893
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-29 17:44:41 +00:00
Bill Meier 1b3bc9b71e checkhf.pl: (Trivial) remove trailing whitespace.
Change-Id: I37ece54d936541b5d92e8c323ffeb429d9cc5f33
Reviewed-on: https://code.wireshark.org/review/3879
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-27 16:18:34 +00:00
Diederik de Groot d6aa77d83b Skinny:
Do not try to create a wmem_strbuf whose size is bigger than the max size allowed -> using wmem_strbuf_new instead of wmem_strbuf_sized_new (Evan Huus)
While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized -> Did not get any, can you specify which errors ? (Pascal Quantin)
FT_IPv6: 'ENC_BIG_ENDIAN | ENC_NA' -> 'ENC_NA' only (2) (Pascal Quantin)
Revert back to wmem_strbuf_sized_new instead of wmem_strbuf_new (Pascal Quantin)
Use wmem_strbuf_sized_new maxlength = 0  (Pascal Quantin)

Bug: 10409
Bug: 10410
Change-Id: Iebfcb53bc0a6289e02d10c38ecb717aa5c89389e
Reviewed-on: https://code.wireshark.org/review/3862
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-26 18:58:39 +00:00
Alexis La Goutte efd95341e8 Add custom_layer_chm.xsl to UNKNOWN (fix checklicence)
Change-Id: I4c336f21f721443e83eca7b9bf8d7a6138b367f4
Reviewed-on: https://code.wireshark.org/review/3827
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-26 15:22:28 +00:00
Pascal Quantin 7836a714ab Skinny: do not try to create a wmem_strbuf whose size is bigger than the max size allowed
While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized

Bug: 10409
Change-Id: Ic84632e0563f801239603534121e3487cf0d6d24
Reviewed-on: https://code.wireshark.org/review/3861
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-26 12:07:44 +00:00
Diederik de Groot 7749263be6 Skinny Dissector:
Source Fix: Trailing Whitespace (Reported by Graham Bloice).
Dissection Fix: ProtocolVer needed to be split up into two fields to display the protocol version correct during device registration
Segfault Fix: Null Pointer Check required after returning from tvb_memdup, before calling strlen (Reported by Evan Huus)
Fix: Whitespace (again)

Bug: 10409
Change-Id: Ib253ea843363792f678f2e724359f83f12ebfadc
Reviewed-on: https://code.wireshark.org/review/3844
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-25 23:58:24 +00:00
Bill Meier cdc80af27e checkhf.pl: (Trivial) fix two typos
Change-Id: I2a63127dcf819d671a4c814dcbd82b2dca5022d3
Reviewed-on: https://code.wireshark.org/review/3838
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-25 15:46:10 +00:00
Diederik de Groot 7fab56afb5 Skinny: packet-skinny
Add tools path to the python search path, fixing cog.py generation of package-skinny.c from packet-skinny.c.in
Add GPLv2 License to parse_xml2skinny_dissector.py

Change-Id: I91b76867b02d8cebc40bba35151db48bc2fcaeca
Reviewed-on: https://code.wireshark.org/review/3819
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-25 04:23:17 +00:00
Diederik de Groot 276a697a6b [RFC] Skinny: Rewrite using automatic code generation
Support: Protocolversion 0 - 22
Includes: Callmanager to/from Cisco Phones, Inter CallManager Messages and CallManager to/from Cisco ASA
Code Generator not included, because protocol does not evolve anymore / No newer versions to be expected
Fixed: Added more readable information for SoftKeyTemplateRes and SoftKeySetRes, Added Bitfield processing, Added Longer Field Descriptions
Fixed: message_handle array overrun, message_ids, hf_skinny fields format
Fixed: dialedNumber Message, Setting data on si->fields (tap.h)
Fixed: Comments made by Peter Wu
Added: Code Generator Sources
Fixed: hf_skinny blurp, XML Truncation, Updated ButtonTemplate, SoftKeyTemplate and SoftKeyRes presentation
Fixed: EnblocMessage, DialedNumberMessage
Added: DisplayLabels
Added: dissect_skinny_DisplayLabel function to Lookup and Translate in the phone embedded strings to human readable form
Fixed: CallInfoV2, OpenReceiveChannelAck, KeypadButton when generated by a 7912 running old firmware.
Fixed: Made changes requested by Peter Wu, in last 2 reviews
Fixed: ConfigStatV2, ServerRes
Fixed: Comment made by Michael Mann
Fixed: CheckAPI.pl / Petri Dish
Fixed: Included packet-skinny.h and epan/dissectors/packet-skinny.h.in -> Petri Dish

Change-Id: Ic2d2ead8ff0ce80668c9b2e249ce69f53e25a383
Bug: 10262
Reviewed-on: https://code.wireshark.org/review/2921
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-24 12:55:10 +00:00
Peter Harris 331d87e303 X11: Support xcb's new <case>
Change-Id: I32c6ab15d6dc7a67cdb50c4187e2752730315588
Reviewed-on: https://code.wireshark.org/review/3751
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22 00:04:52 +00:00
Graham Bloice 1c10c7b6ed Modified script to not use PS 3.0 constructs
Change-Id: I0a4a738a410f0aece9459852a51d6c96f11aae76
Reviewed-on: https://code.wireshark.org/review/3739
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-20 06:24:44 +00:00
Michael Mann 0cda27c83e "Highly discourage" use of proto_tree_add_text.
Change-Id: I2e8d18df71688c654f7acaff51fae7823c08aa6a
Reviewed-on: https://code.wireshark.org/review/3677
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: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-19 16:20:34 +00:00
Gerald Combs 4e267ba9dd Windows: Fix PowerShell 2.0 compatibility.
PowerShell 2.0's Get-ChildItem doesn't support "-File" even though
http://technet.microsoft.com/en-us/library/hh847897.aspx says otherwise.

Add a config.nmake option to test PS 2.0 compatibility.

Change-Id: I8de83cd0841d4ab0b01351c2d39084578a2c84ee
Reviewed-on: https://code.wireshark.org/review/3625
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15 16:35:41 +00:00
Graham Bloice 02187b0b8f Remove errant #! from powershell script
Change-Id: I6c94ce5983654eba20aa8c852efe300e06c957a5
Reviewed-on: https://code.wireshark.org/review/3599
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-14 21:42:36 +00:00
Evan Huus 297237b4c2 fix one last reference to textify.sh
Change-Id: I2f8bd5a69fd80d6d34a4079cd05a4f4b278274fd
Reviewed-on: https://code.wireshark.org/review/3594
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-14 13:40:27 +00:00
Gerald Combs 673247f04f Windows: Clean up text file packaging.
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending
conversion so that we don't depend on unix2dos.

Only copy the help toc and text files to the staging directory.

Add PowerShell to the Developer's Guide. Fixup some other content.

(asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not
a problem.)

Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71
Reviewed-on: https://code.wireshark.org/review/3487
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-08-14 10:26:31 +00:00
Joerg Mayer 65ac652a07 Remove make-dissector-reg and require python for autotool builds as well
Change-Id: I6239063a08ba37199a4e95302a3650a80544c750
Reviewed-on: https://code.wireshark.org/review/3562
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-12 21:31:34 +00:00
Evan Huus f25f1ea562 Don't try and run checkAPIs.pl on deleted files
It fails, for obvious reasons, and makes it impossible to commit the removal of
c/h files.

Change-Id: Ifcd067f8959684e2e0191983fd60fb94ae86bca3
Reviewed-on: https://code.wireshark.org/review/3401
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04 11:50:08 +00:00
Guy Harris 3ac49be96c Add more files to the release tarball.
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47
Reviewed-on: https://code.wireshark.org/review/3286
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 08:55:52 +00:00
Pascal Quantin 9ce04cbb09 Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM environment variable is not explicitly set
Bug: 10317
Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723
Reviewed-on: https://code.wireshark.org/review/3203
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28 18:32:24 +00:00
Peter Wu 0492921adc Replace lseek/fstat by ws_lseek64/ws_fstat64
lseek returns an off_t type which is system-dependent. Use ws_lseek64 in
favor of lseek as that supports 64-bit quanities.

Use ws_fstat64 instead of stat to support 64-bit file sizes on Windows.
For the majority of the changes, this makes no difference as they do not
apply to Windows ("ifndef _WIN32"; availability of st_blksize).

There are no other users of "struct stat" besides the portability code
in wsutil. Forbid the use of fstat and lseek in checkAPIs.

Change-Id: I17b930ab9543f21a9d3100f3795d250c9b9ae459
Reviewed-on: https://code.wireshark.org/review/3198
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-25 21:26:01 +00:00
Evan Huus ebe713223e Remove valgrind suppression for old zlib version
The fuzzbot has been upgraded, so hopefully this is no longer necessary.

Change-Id: Ia2d8ae03180c6e0b81a4f7b69b72610d047307ff
Reviewed-on: https://code.wireshark.org/review/3194
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-25 02:58:49 +00:00
Joerg Mayer 7bc24eda07 Add back a 'dummy' comment I removed with commit e91121e143
Change-Id: Ia21dc80c8b942fbc1a85a8990354bdaaf9dc8210
Reviewed-on: https://code.wireshark.org/review/3161
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-22 16:20:20 +00:00
Joerg Mayer 56a241137a Remove tools/win32-setup.sh and tools/win64-setup.sh
Change-Id: Ifdc57304a0109f60260dc73d95b0598ddca81805
Reviewed-on: https://code.wireshark.org/review/3146
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 01:13:21 +00:00
Joerg Mayer c90b642fef Pass the download tag as an argument to win-setup.sh instead as an enviroment variable
Change-Id: Id2369cec93b82f182bab9046469796f51115accb
Reviewed-on: https://code.wireshark.org/review/3143
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 00:22:26 +00:00
Joerg Mayer 622f06b2c2 WIRESHARK_TARGET_PLATFORM is only used inside --download code path:
Use it only there.
Update comments wrt DOWNLOAD_PREFIX
Remove trailing / at end of DOWNLOAD_PREFIX

Change-Id: Ia161d4226ff3d463bceaaf4e01de70b2db98bf3c
Reviewed-on: https://code.wireshark.org/review/3142
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-20 23:40:08 +00:00
Joerg Mayer e91121e143 Change a comment to be slightly easier to read
Reorder code to have all toplevel code in 'main'

Change-Id: Ia99830ce2ee6af46249f533d64a328d2da2ed9b8
Reviewed-on: https://code.wireshark.org/review/3141
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-20 22:33:08 +00:00
Evan Huus 1387f54c58 Check for __func__ in checkAPIs.pl
Change-Id: I649c69cbf545a8de32d9142c1156db6adb076b63
Reviewed-on: https://code.wireshark.org/review/3078
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-16 01:58:03 +00:00
Bill Meier b66f614e5d pre-commit: Add 'unset GREP_OPTIONS' (similar to Gerrit commit-msg)
msysgit grep is fairly old and doesn't recognize certain
  grep options, e.g., '--color=auto'.

  I imagine there may possibly be other grep option issues
  on various platforms.

  (I also note that the various git scripts in libexec/git-core
   clear out GREP_OPTIONS before calling grep).

Change-Id: I67bc148a77cfc0167064e61e8c47a5f091704eac
Reviewed-on: https://code.wireshark.org/review/2945
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-08 20:00:52 +00:00
Graham Bloice a7e616d162 Fix the flex wrapper to ensure Cygwin /bin is on the path for Windows.
This is needed for CMake, as it doesn't add Cygwin to the path for the
generated solutions.

Change-Id: I9f05f24ccc741bfc851ecbb892f080f59d2acc2c
Reviewed-on: https://code.wireshark.org/review/2938
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-08 13:14:42 +00:00
Bill Meier cdf6d62b3b tools/pre-commit: Complete all checks on all files before exiting with Ok/Fail status.
Change-Id: Iea6df6fbe5a977b282e823f87cd9f760e92a3e22
Reviewed-on: https://code.wireshark.org/review/2918
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-08 00:49:47 +00:00
Роман Донченко 4ce4e3a41e make-dissector-reg: minor tweaks
* use grep -c instead of a grep/wc combo;
* use cmp instead of diff, since we're only interested in whether the files
  are identical;
* remove the temporary file if it's the same as the existing one.

Change-Id: If61c5675535c483b9dc2aee179d7be58c7bd6e4f
Reviewed-on: https://code.wireshark.org/review/2894
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-07 07:24:24 +00:00
Роман Донченко afa8f21f56 make-dissectors-reg: optimize by factoring out the loops
Instead of calling the grep/sed pipelines for each file, build the
list of files in the beginning and call each pipeline only once,
passing the list to the first grep.

This results in a massive speedup in Cygwin; in my test, the time
it takes to run make-dissector-reg . dissectors packet-*.c in dissectors/epan
is reduced from ~116 to ~3 seconds. I also tried it on NetBSD, where
the time do to the same goes from ~6 to ~0.5 seconds.

Amend makefile comments to elide mentions of invoking multiple processes
per file.

Change-Id: Iad441e7d2b6cc3669dada57646e2f8f6b987fd34
Reviewed-on: https://code.wireshark.org/review/2826
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-06 08:08:20 +00:00
Jeff Morriss 5aa6cf9dd5 Update my email address in a couple more spots.
Change-Id: I787ae2651a8083bc3082e5cb85dbd849823a16ca
Reviewed-on: https://code.wireshark.org/review/2638
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-25 02:15:55 +00:00
Evan Huus 3a943e9254 Reduce maximum permitted leakage to 100KB
Down from 500KB. The old value only triggered once that I can recall, and the
"average" leakage I'm seeing on most captures is only a few KB now, so this
shouldn't flood us with issues (which was the original concern leaving it so
high).

Change-Id: Ie4c98696b3fb7a533a7dc4f83c7ac8c458b499c8
Reviewed-on: https://code.wireshark.org/review/2633
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 23:43:28 +00:00
Роман Донченко 2a9cc7a2b5 Correct indentation in make-dissector-reg
The indented portions are inside an if.

Change-Id: I3343a7aa7e777466ec9f40e8a02a8218bef62017
Reviewed-on: https://code.wireshark.org/review/2622
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 19:34:45 +00:00
Michael Mann df93705cc2 Improve the tolerance of checkfiltername.pl so it can be added to the pre-commit script.
1. Correctly identify ASN.1 dissectors (so checkfiltername.pl can be more lenient on them)
2. "Whitelist" known (good) filters

Change-Id: Iea662190b6655a1919bf08bc35e7978eb2693509
Reviewed-on: https://code.wireshark.org/review/2453
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-20 04:04:13 +00:00
Balint Reczey 5a6366c9b5 Generate xz compressed archives instead of .bz2-s
Change-Id: Iad47516ae617f5ecac5b03f2d7e800208c499d4a
Reviewed-on: https://code.wireshark.org/review/2403
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-19 00:35:56 +00:00
Balint Reczey 85499fbbc6 Add simple script to export release tarball right from Git
The files not to be present in the release tarballs are filetered based
on the contents of the .gitattributes files

Change-Id: If12eb00cf174f5d5b6dfffd56685b078a4593bf8
Reviewed-on: https://code.wireshark.org/review/2402
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-19 00:35:02 +00:00
Michael Mann e9dea8542b acknowledge BASE_RANGE_STRING
Change-Id: I3e899f79a3d58b8a2e72b88253a7e9ec51a314b5
Reviewed-on: https://code.wireshark.org/review/2222
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-15 03:18:14 +00:00
Peter Harris 515b78c292 X11: Support XCB's new <pad align='n' />
Change-Id: I0a45380ffcfb3be7e3190d0875626ed0fe046c4e
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-on: https://code.wireshark.org/review/2147
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-12 13:36:21 +00:00
Michał Orynicz 94dcbfd9ac Fix annoying warnings that a variable is uninitialized in checkfiltername.pl
Change-Id: Ibb291747570e48af6306357cc13fd3a149ca88c9
Reviewed-on: https://code.wireshark.org/review/2071
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-10 14:15:32 +00:00
Anish Bhatt 8878d7778e Current test for GIT_DIR introduced in changeset Ie1560c372e23e58fb0e310f681388b5e1a65ba5b doesn't seem to be working correctly on bash 4.3.18 : .git/hooks/pre-commit: line 11: .git: command not found
This test works correctly in bash/dash/zsh

Change-Id: Ic89fc2764d1a70e9e5d112c7928cee6ed783f50f
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2092
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-10 00:58:20 +00:00
Pascal Quantin ad7b5381ac Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 15:33:01 +00:00
Bill Meier e05dc825ba Add a few more ad-hoc validations of the hf[] FIELDCONVERT field.
Change-Id: Icd817a950331a2e7416a28c3d4a5a004d297e6f9
Reviewed-on: https://code.wireshark.org/review/1845
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-03 01:40:41 +00:00
Gerald Combs 0a249087c3 Build with GTK+ 2.24.23.
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460
Reviewed-on: https://code.wireshark.org/review/1665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-16 16:25:38 +00:00
Evan Huus ff466a9b92 Increase time permitted when fuzzing with valgrind.
The capture on bug 10098 times out but I don't see any culprits for bad loops or
anything - I think the capture is just too big. I'd prefer somebody else take a
look at it to verify I'm not missing anything before submitting this.

Bug:10098
Change-Id: I2cc43fd6ac9afaa345e7d31184483a9732fd6bf0
Reviewed-on: https://code.wireshark.org/review/1583
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-11 21:13:06 +00:00
Joerg Mayer 03f75ddfee It is possible to check out a source tree that is not co-located with
the .git repository. First attempts to support that setup.

Change-Id: Ie1560c372e23e58fb0e310f681388b5e1a65ba5b
Reviewed-on: https://code.wireshark.org/review/1596
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-11 19:35:33 +00:00
AndersBroman cfe3bfdc25 Add -Q for QtShark and change the dumpcap command to use number of
packets.

Change-Id: Ia4dc03e3722379d41804758feeafb655f26376e9
Reviewed-on: https://code.wireshark.org/review/1573
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-09 12:13:52 +00:00
Gerald Combs 3f247a5cee Be less aggressive about rebuilding sminmpec.c.
Instead of forcing developers to generate sminmpec.c (which will have
different results depending on the presence or absence of a working
Internet connection) add sminmpec.c back to the repository. I'll add
it to the weekly update-numbers script so that it will be updated at
the same time as manuf, services, enterprise-numbers, and usb.c.

Change the Autotools, CMake, and Nmake sminmpec.c target name to
"update-sminmpec".

Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers
and sminmpec.c while we're here.

Tested with an in-tree Autotools build and an out-of-tree CMake build.

Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026
Reviewed-on: https://code.wireshark.org/review/1516
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-09 09:03:24 +00:00
AndersBroman 379c9f25df Add a command option for dumpcap.
Change-Id: Ic9a4b35f5a6245e0100f93c890622674e44413c6
Reviewed-on: https://code.wireshark.org/review/1564
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08 19:30:18 +00:00
Jeff Morriss 343098761f Error out if someone passes the address of a pointer to a *_string to VALS() or RVALS().
Change-Id: I85021b1cba151c16bf0a2d30169cf3dec77780f5
Reviewed-on: https://code.wireshark.org/review/1540
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-07 05:37:40 +00:00
Gerald Combs 002cefc721 make-sminmpec.pl fixups.
Enforce a minimum number of entries and do our work in the epan
directory.

Change-Id: I69cc6ae3255b23706a2e67db890a9718e10568b2
Reviewed-on: https://code.wireshark.org/review/1398
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-30 16:35:55 +00:00
Stig Bjørlykke bd38b3152d Support out-of-source checkapi
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir)
from Makefile.am to allow out-of-source 'make checkapi'.

Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973
Reviewed-on: https://code.wireshark.org/review/1294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25 04:23:46 +00:00
Michael Mann 6ec73981ac Cleanup "excess" from trying to support sequence of "native types". Last 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-25 04:08:59 +00:00
Michael Mann be13690c3c Continuation of bug 9532.
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-23 15:47:33 +00:00
Michael Mann fccf62ece2 Bugfix generating a sequence of "native" types. Bug 9532.
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-23 06:24:33 +00:00
Michael Mann 0f90397d29 Fix generator to remove Dead Store (Dead assignement/Dead increment) warning 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-04-23 04:44:59 +00:00
Guy Harris 80011ec03c Don't se_ allocate strings when mapping addresses to column strings.
This should significantly reduce memory usage, without increasing the
CPU time required to process a capture file in TShark or Wireshark.

As a result, se_address_to_str() is no longer used; eliminate it.

Fixes bug #9949.

Change-Id: I65a112a426c82cc73a957b81384c765c3d14f2c3
Reviewed-on: https://code.wireshark.org/review/1213
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-19 14:20:06 +00:00
Pascal Quantin 791dd4e128 Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012
Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f
Reviewed-on: https://code.wireshark.org/review/1176
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-17 07:38:51 +00:00
Hadriel Kaplan dd002649c3 Add tvb_get and proto_tree_add for string-encoded timestamps
This commit adds tvb_get_string_time and proto_tree_add_time_item routines for
getting nstime fields from the tvb when they are encoded in ASCII string form.

The proto_tree_add_time_item routine is also usable for normal
big/little-endian encoded time_t, and has the advantage of retrieving
the value even if there's no proto tree.

It also exposes the routines to Lua, both so that a Lua script can take
advantage of this, but also so I can write a testsuite to test the functions.

Change-Id: I955da10f68f2680e3da3a5be5ad8fdce7ed6808c
Reviewed-on: https://code.wireshark.org/review/1084
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14 11:47:39 +00:00
Hadriel Kaplan 0a5572ea77 Fix Bug 9951: 'git commit hook isn't calling checkAPIs.pl with arguments for the dissectors'
I recently made a change to packet-rtp.c and inappropriately included
g_error() in it, which the builbots caught during their run of checkAPIs.pl.
But checkAPIs.pl is supposed to catch such things for us before we submit, by
being invoked in the git pre-commit hook.

Apparently though, buildbots call checkAPIs.pl with extra arguments for
different cases... and for packet dissectors it calls it with a '-g abort'
argument, which is how it caught the g_error.

So the "bug" is that the pre-commit hook should invoke checAPIs.pl with that
argument too, for epan/dissectors/packet-*.c files.

Change-Id: Ie8f9dcc55f2248918208dea85a04f67e6bf9829a
Reviewed-on: https://code.wireshark.org/review/953
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-14 00:10:20 +00:00
Michał Orynicz 0f0c079226 Add commit-msg hook to tools to spare searching for it
commit-msg script adds change id at end of commit messages.
As this script is needed for Gerrit review system to work 
and every wireshark developer will need to download it from 
somewhere, it will be better if it is downloaded with Wireshark
sources and ready to copy to .git/hooks

Copied from AOSP Gerrit.

Change-Id: Ib3705abfedd2869462eef57690a2f430037f9cc1
Reviewed-on: https://code.wireshark.org/review/1008
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-08 17:23:14 +00:00
Pascal Quantin cc3c05ed5f Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW gcc 4.3
Fixes bug 9957

Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6
Reviewed-on: https://code.wireshark.org/review/991
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-07 05:54:19 +00:00
Pascal Quantin 590fcbc66f Upgrade Windows builds to Lua 5.2.3
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0
Reviewed-on: https://code.wireshark.org/review/974
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-05 22:41:06 +00:00
Michael Mann bc40848385 Rework debug_print_hash logic so that it's supported by older versions of perl.
Change-Id: I1720681dc367e01268ffbb1f31035464fa642496
Reviewed-on: https://code.wireshark.org/review/971
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
2014-04-05 12:03:49 +00:00
Alexis La Goutte 255eca0c1c Revert Remove check and inverse code to display a error if there is a $Id$
Change-Id: I7061ad312df5079924c927ca95a8fa111c756012
Reviewed-on: https://code.wireshark.org/review/498
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-02 08:57:22 +00:00
Hadriel Kaplan 914cbc2f3c Fix checkApis perl script false positive proto_tree_add with ENC_*
In epan/proto.c in function proto_tree_add_split_bits_crumb, the
proto_tree_add_text function is called with one of its arguments
using ENC_BIG_ENDIAN, but it's not an argument for proto_tree_add_text
itself but instead a function being called inside it. checkAPIs.pl
tries to avoid this in check_proto_tree_add_XXX_encoding, by removing
parenthesis arguments, but in this acse there are newlines between
the arguments, causing the regex to not catch them. This commit
fixes the regex.

Change-Id: I70ef79d5436ba2ec04ffdc3d9939c7aa2cdf6a1f
Reviewed-on: https://code.wireshark.org/review/902
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-01 06:09:31 +00:00
Alexis La Goutte d8001e8064 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\*\* \$Id\$/,+1 d') (2 star and space)

Change-Id: I48505ffb8bfa103cd7db0117e18cdb1925a7034d
Reviewed-on: https://code.wireshark.org/review/884
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:50:19 +00:00
Alexis La Goutte 7d77d753c6 Continue to remove $Id$ from top of file
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ )

Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9
Reviewed-on: https://code.wireshark.org/review/886
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:49:26 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte 09cd306d1c Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\* \$Id\$/,+1 d') (no space before star)

Change-Id: I318968db2b8512ba1303b5fc5c624c66441658f0
Reviewed-on: https://code.wireshark.org/review/879
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:30:52 +00:00
Alexis La Goutte f2dfc39d94 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^ \t$Id\$/,+0 d') (tab before $Id$)

Also modify generator (NDR.pm)

Change-Id: I348a1d129d1d1320bd80b428038ea5ed291d6ca8
Reviewed-on: https://code.wireshark.org/review/878
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:29:18 +00:00
Alexis La Goutte 94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
Bill Meier 550e3153bf Fix fuzz-test.sh '-b' option so it works again; Do some other tools/*test*.sh changes
- Add -b option to randpkt-test.sh and test-captures.sh;
- Create/ue a common function to do '-x' tests on files/dirs;
- Rename exit_error function to ws_exit_error

Change-Id: I032c9d784bec1fb6b0717aaad08a061e4d935476
Reviewed-on: https://code.wireshark.org/review/872
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-30 21:03:15 +00:00
Pascal Quantin a1d4189c5e Upgrade Windows builds to Lua 5.2.1
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e
Reviewed-on: https://code.wireshark.org/review/863
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-29 16:30:53 +00:00
Alexis La Goutte 82f11d4204 Fix indexcap tools
Change-Id: Ib77af11975873106b7db7ac1bcd12f4a0800b59e
TypeError: extract_protos_from_file() takes exactly 6 arguments (7 given)
Reviewed-on: https://code.wireshark.org/review/779
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21 21:56:22 +00:00
Evan Huus 16e7096df3 Remove duplicate call to fix-encoding-args
Change-Id: I7067a8856ff1c431d5e5ec7ec2a51228a8613631
Reviewed-on: https://code.wireshark.org/review/743
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 17:10:17 +00:00
Alexis La Goutte 9f01daa2dc Add check of whitespace error after Wireshark check (checkhf, checAPIs...)
(Because check whitespace quit after check... and no longer launch other check...)

Change-Id: I97ee0191c3d985934e74d23576f88984ec0e9b46
Reviewed-on: https://code.wireshark.org/review/739
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 13:03:39 +00:00
Alexis La Goutte 1db0fc5c98 Enhance pre-commit tools to avoid false positive
Limit check to file with extension *.c or *.h

Patch revert by mistake in 49394d3101

Change-Id: Ifed4c833c740218e5e24b3176dc20802fa5849bb
Reviewed-on: https://code.wireshark.org/review/719
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17 17:22:23 +00:00