Commit Graph

1609 Commits

Author SHA1 Message Date
Jeff Morriss 3a42b55ac9 idl2wrs: don't use -1 for the protocol-item length.
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>
2015-04-23 02:09:16 +00:00
Jeff Morriss 97499c1f25 Add VALS_EXT_PTR to decorate pointers to value_string_ext's in hfinfo.
This allows checkAPIs to continue checking the 'convert' field for correctness
when dissectors use value_string_ext_new() to build their value_string_ext's
(without resorting to tricks like getting the address of the dereferenced
pointer).

This will be used to resolve the checkAPIs failure in patch set 3 of
Ia5c96b1f6f1fe3a9521b3d70142889e3881fae5e .

Change-Id: I700d86b9076f077706d34000f5a6aa5c96351f69
Reviewed-on: https://code.wireshark.org/review/8162
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-22 06:08:58 +00:00
Gerald Combs 1404605513 Start moving win-setup to PowerShell.
Add win-setup.ps1, which duplicates the following tasks performed by
config.nmake + Makefile.nmake + win-setup.sh:

- Create the windows library directory.
- Download files.
- Download and unpack zip files.
- Check and set current-tag.txt

Don't verify applications or libraries. CMakeLists.txt does that.

Update the Developer's Guide.

Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which
appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript".

This removes our dependencies on unzip and wget and reduces our dependency
on bash.

Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614
Reviewed-on: https://code.wireshark.org/review/7990
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14 19:09:30 +00:00
Gerald Combs 7b60d2bb48 Pass HTTP URLs to wget.
Not all wgets are equal. Revert part of 7787c1b so that wget fetches
over HTTP instead of HTTPS.

Change-Id: Iced263380429795975cf239cba7dac54bd729d38
Reviewed-on: https://code.wireshark.org/review/8005
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-09 19:56:19 +00:00
Michal Labedzki b99cf21c25 extcap: Add support for Android - androiddump
androiddump is extcap program that can be used with Android devices
(need Android SDK in system PATH). Supported is Logcat/Logger logs and
Bluetooth interfaces for all Android to this day (Lollipop).

Please note that it will work also for FirefoxOS.

Interfaces:
1. Logcat Main (binary or text)
2. Logcat System (binary or text)
3. Logcat Events (binary or text)
4. Logcat Radio (binary or text)
5. Logcat Crash (text; Lollipop)
6. Bluetooth Hcidump (<Kitkat)
7. Bluetooth Bluedroid External Parser (Kitkat)
8. Bluetooth BtsnoopNet (Lollipop)

Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80
Reviewed-on: https://code.wireshark.org/review/7475
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-08 09:57:24 +00:00
Gerald Combs f90699c676 Don't commit translation updates for now.
Doing so conflicts with the weekly update script.

Change-Id: I3ffbe9cbae9b8efdc8369de2054d9f8b8a8d5c5e
Reviewed-on: https://code.wireshark.org/review/7921
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-05 15:56:30 +00:00
Alexis La Goutte f1803dbbb7 Add update-tx tools (Resync translation between repo and Transifex)
Change-Id: Ica2902fbc8a089b3b877b00c1fd72397f2c08146
Reviewed-on: https://code.wireshark.org/review/7314
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-04 17:06:20 +00:00
Gerald Combs 7787c1b464 Fixup our anonsvn URLs.
Change-Id: Id18d392bf7ff948fc78b684d8222c5c3725d302a
Reviewed-on: https://code.wireshark.org/review/7886
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-02 19:21:41 +00:00
Pascal Quantin 9aa624d117 LTE RRC: upgrade dissector to v12.5.0
Change-Id: I9e3dfb17b4b7f96be999ccea88fec754a936d312
Reviewed-on: https://code.wireshark.org/review/7869
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-31 21:40:10 +00:00
Peter Wu 13c486c33f html2text.py: Python 2.5 compatibility, improve Unicode support
Add support for Python 2.5 (remove unicode_literals import which does
not seem to be necessary), check before using break_on_hyphens (without
this option in Python 2.5, the output is uglier though) and avoid the
'with' keyword.

While at it, fix reading Unicode text from file in Python 2 (tested
with: echo € | tools/html2text.py) and support reading from stdin using
the '-' filename.

Tested against Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 with the
commands from the previous html2text.py commit message, and additionally
with the Unicode character € as input (instead of the faq.py output).

Change-Id: I3de3f7a4e7cf7d702463c3a59758803843338a54
Reviewed-on: https://code.wireshark.org/review/7823
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-26 07:14:20 +00:00
Peter Wu dbef80f5c7 dfilter-test.py: add OOT support and Python 3 compat
Support WS_BIN_PATH and SOURCE_DIR (modelled after test/config.sh) to
support out-of-tree builds (including cmake). Add Python 3 support and
mention this in the documentation.

Tested with Python 2.7.9, 3.2.6, 3.4.3:

    WS_BIN_PATH=/tmp/wsbuild/run SOURCE_DIR=/tmp/wireshark \
        tools/dfilter-test.py testBytesIPv6

(2.7.9 and 3.4.3 were also tested fully, but some cases seem to fail
even before this patch. 2.5.6 and 2.6.6 do not work because the unittest
module is outdated.)

Change-Id: I13074579f6f74206edb5cd7be8e7a8406de49c56
Reviewed-on: https://code.wireshark.org/review/7793
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25 07:15:36 +00:00
Peter Wu 1ba4191c70 indexcap.py: fix tmpdir handling, python 3 compat
Add Python 3 compatibility to indexcap.py and only create a tmpdir for
actions that need it. Only remove tmpdir for the compare action and
try to remove the temp dir even if an exception occurs.

In list_protos_in_cap.sh, rename BIN_DIR to WS_BIN_PATH (matching
test/config.sh) and allow it to be overridden from the environment.

Tested with Python 2.6.6, 2.7.9, 3.2.6, 3.4.3 as follows (with tshark
built using cmake and '-b /tmp/wsbuild/run'):

    tools/indexcap.py out pop-ssl.pcapng;
    tools/indexcap.py out pop-ssl.pcapng --list-all-proto;
    tools/indexcap.py out pop-ssl.pcapng --list-all-files;
    tools/indexcap.py out pop-ssl.pcapng --list-all-proto-files=ssl;
    rm out;

Python 2.5.6 does not work (there is no multiprocessing module). The
dict output in Python 3.4.3 is different (has the hash function
changed?)

Change-Id: I592d8c4458a20d5088d815c6dd1cf90c9d3df9d3
Reviewed-on: https://code.wireshark.org/review/7792
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25 07:09:41 +00:00
Peter Wu 68698db8cc Always use html2text.py for FAQ, improve output
A recent commit broke compilation with Python 3. The original author of
html2text.py is deceased and the fork has increased the number of files
for this "simple" helper.

The html2text.py script in this patch was rewritten and its output
matches with lynx (except for a few newlines around lists). This means
that indentation has been added for headings, paragraphs and lists.
Also, since it was written from scratch, a new license could be chosen
that matches Wireshark.

Since now the in-tree html2text.py script provides nicer output, remove
detection of the alternative programs (elinks, links). lynx/w3m is
somehow still necessary for asciidoc though.

(I also looked into reusing html2text.py for the release notes to
replace asciidoc, but the --format=html output produces different output
(HTML adds a ToC and section numbers). For now still require lynx for
release notes)

Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and
LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing
to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch
Linux x86_64. Test:

    # For each $PATH per python version, execute (with varying LC_ALL)
    help/faq.py -b | tools/html2text.py /dev/stdin | md5sum
    help/faq.py -b | tools/html2text.py | md5sum
    help/faq.py -b | tools/html2text.py
    help/faq.py -b | tools/html2text.py >/dev/null

Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd
Reviewed-on: https://code.wireshark.org/review/7779
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25 07:08:52 +00:00
Michael Mann 004cafd82b Replace HF_EMPTY and ETT_EMPTY with -1
Change-Id: If3e89f8e46edd4eef82037b6b348fd70a9a3033d
Reviewed-on: https://code.wireshark.org/review/7811
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-25 01:05:02 +00:00
Peter Wu cc4bce537b ftsanity.py: make it work with modern tshark
Broken since 4ac2441d7c ("Coalesce "-G
fields2" and "-G fields3" into "-G fields").

This patch fixes Python3 compatibility, fixes handling of the changed
output and option and prints the faulting line on assertion error. It
also updates two dissectors which had tabs in their description,
breaking the output.

Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3.

Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c
Reviewed-on: https://code.wireshark.org/review/7791
Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-24 05:13:46 +00:00
Peter Wu 693304bf53 checklicenses.py: add python3 compatibility
Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3.

Change-Id: I5893bb32d339118ec968edc7de0e185e39ab4f81
Reviewed-on: https://code.wireshark.org/review/7789
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: Anders Broman <a.broman58@gmail.com>
2015-03-24 05:10:39 +00:00
Peter Wu 355e913f91 delete_includes.py: Python 3 compatibility
While improving python 3 compatibility, fix whitespaces and remove the
useless try/except block as these modules are part of core.

Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 (with "make"
replaced by "true" and by comparing stdout).

Change-Id: I9c585da89aef76f01672c8f7320ac4a13c6cc7d7
Reviewed-on: https://code.wireshark.org/review/7790
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-03-22 16:33:47 +00:00
AndersBroman b307ffe0f9 Implement proto_tree_add_item_ret_int() and proto_tree_add_item_ret_uint() which
works as proto_tree_add_item(), but also returns the value of (u)ints
of 8,16,24 and 32 bits length in a 32 bit variable. It's based on Hadriels
previous work.

Change-Id: If3b4b8588b63251f1ee9b954a202acde7c02ce86
Reviewed-on: https://code.wireshark.org/review/7230
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>
2015-03-19 16:06:18 +00:00
Pascal Quantin 17b57ecbf8 checklicenses.py: check the first 150 lines of a file
It should solve the recent failure seen since gdf164df

Change-Id: If86bff18fcd9157941ea843ad5029c9d0b2f0b32
Reviewed-on: https://code.wireshark.org/review/7659
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-12 21:50:58 +00:00
Gerald Combs cac102eee3 Change a lot of http:// URLs to https://.
Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.

Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10 19:30:50 +00:00
Gerald Combs f2b35a180f Qt: Add extra related packet indicator types.
Add the ability to set frame number types: none, request, or response.
Use the types to draw different related packet indicators in the packet
list.

Track the conversation in PacketListRecord. Use it to draw dashed lines
for unrelated frames.

Set frame number types for DNS and ICMP.

Instead of drawing a transparent QImage, alpha blend our foreground
color and draw directly in our painter. Blend more toward the foreground
color.

Add FRAMENUM_TYPE to checkAPIs.

Change-Id: I2495945bb436413e05d6ec697184a0b4fd5ad214
Reviewed-on: https://code.wireshark.org/review/7436
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-05 16:45:04 +00:00
Alexis La Goutte efd53ad5c9 Fuzz test : Add -a(SAN) option to disable ulimit when fuzzing
from https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer#ulimit_-v
The ulimit -v command makes little sense with ASan-ified binaries because ASan consumes 20 terabytes of virtual memory (plus a bit).

Change-Id: I8c8c77dd51d5440fb2f9bd95f90873e59a64d409
Reviewed-on: https://code.wireshark.org/review/7204
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-04 01:52:21 +00:00
Guy Harris 499d95964d Eliminate e_uuid_t in favor of e_guid_t.
That eliminates a redundant and confusing data type, and avoids issues
with one piece of code using e_uuid_t but wanting to use routines
expecting an e_guid_t.

Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60
Reviewed-on: https://code.wireshark.org/review/7506
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-03 10:55:29 +00:00
Martin Mathieson 618eaecee6 delete_includes.py: add target for ui/qt
Change-Id: I9dc51fbef50941f04ccf5b0b5a8cd71f3693ade4
Reviewed-on: https://code.wireshark.org/review/7389
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-02-25 15:58:10 +00:00
Peter Wu c1b672cf23 checkAPIs: match packet-*.[ch], independent of locale
In perl, the \w character group seems to match '-' depending on the
locale. On Linux (with the C or en_US.UTF-8 locale), packet-ssl-utils.c
does not match.

This patch makes the regex match anything except for the path separator.

Change-Id: I27543072295af5f2bd5ea8ab36e5d913bebf7d85
Reviewed-on: https://code.wireshark.org/review/7266
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-21 13:19:38 +00:00
Gerald Combs 3f765b3ef9 Add a CF_FUNC macro for casting BASE_CUSTOM functions.
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid
the following warning:

    warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic]

We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be
more consistent with the other macros in proto.h. Update each instance
of BASE_CUSTOM to use CF_FUNC.

Adjust a dummy variable name generated by asn2wrs.py that was triggering
an invalid error in checkhf.pl.

Fix an encoding arguement in packet-elasticsearch.c found by
fix-encoding-args.pl.

Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22
Reviewed-on: https://code.wireshark.org/review/7150
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18 00:05:38 +00:00
Pascal Quantin 0ed1b0f194 Add ws_mempbrk_sse42_compile to Valgrind suppression list
When running Valgrind 3.10.0 on an Ubuntu 10.10 x64 guest with Virtualbox 4.3.22, ws_cpuid_sse42() call triggers a false positive when checking ECX bit 20
Guy kindly verified the assembler code and confirmed that everything seems fine
Let's remove the error to avoid noise when running Valgrind on a capture
Change-Id: I357633950249a0c781482865c3221a1babdc74e2
Reviewed-on: https://code.wireshark.org/review/7124
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-02-15 18:46:54 +00:00
Gerald Combs f80a720a88 WSUG and image updates.
Update the protocol hierarchy, conversation, and endpoint sections of
the User's Guide. When everything is an admonition nothing stands out.
Make a series of "NOTE"s plain old paragraphs. Scale the new
conversation and endpoint images to fit the page width. This looks funny
in my browser but I'm not sure about the best way to fix it.

Move image/compress-pngs to the tools directory. Use it to reduce the
size of the WSUG and WSDG images.

Fixup traffic table column names and window titles.

Change-Id: I674342ed901fc64563b384ee5e1f35413736cb19
Reviewed-on: https://code.wireshark.org/review/7122
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-14 19:47:03 +00:00
Martin Mathieson d5f0df44fb Add script to automatically remove includes that appear not be needed
Change-Id: I5474d8a906e96c688020737ca4bd4c3319ae279f
Reviewed-on: https://code.wireshark.org/review/7058
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-02-10 16:00:06 +00:00
Jeff Morriss 0b0f7fa091 More emem removal.
Remove emem's 8-byte-memory-alignment configure check as well as references
to all the environment variables emem used.

Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66
Reviewed-on: https://code.wireshark.org/review/6950
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-06 08:11:49 +00:00
Michael Mann 7ced085550 emem is dead! Long live wmem!
Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77
Reviewed-on: https://code.wireshark.org/review/6939
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-04 06:59:55 +00:00
Anders f011af2222 Add files missing from the tarball.
Change-Id: I126f40ac122a7b9236e8718a89d35ad12fc89c04
Reviewed-on: https://code.wireshark.org/review/6834
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-28 12:45:25 +00:00
Diederik de Groot c4297e6391 Skinny: packet-skinny.c
Changes: Number of small changes to the xml file:
	- some fields being connected to the wrong message version
	- some header field naming

Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352
Reviewed-on: https://code.wireshark.org/review/6602
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 02:57:49 +00:00
Guy Harris 59155d1d1c Eliminate ep_strdup(), as it's no longer used.
Also, remove some no-longer-existent functions from checkAPIs.pl.

Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1
Reviewed-on: https://code.wireshark.org/review/6645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19 01:49:24 +00:00
Guy Harris 7940bbc192 Nobody uses se_ allocations, so remove the code for them.
Don't check for se_ routines in checkAPIs; the failure to compile or
link will suffice to catch attempts to use them.

Update comments in another test script to reflect the disappearance of
the session allocator.

Change-Id: If50d953c7130f48b696bc2dd9d327bea2af49bd4
Reviewed-on: https://code.wireshark.org/review/6638
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 21:28:04 +00:00
Guy Harris 233dc643a6 Remove some apparently-unnecessary includes of emem.h.
Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5
Reviewed-on: https://code.wireshark.org/review/6632
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 19:36:36 +00:00
Pascal Quantin e7593ea19d asn2wrs: autodetect if 64 bits variant is required for constrained integers
It does not work with defines, but is already a great step forward

Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e
Reviewed-on: https://code.wireshark.org/review/6617
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 13:30:56 +00:00
Michael Mann ef7e8aa065 Remove ep_strndup
Change-Id: Id336dc16f97a0973754993094aa637813c0ca31c
Reviewed-on: https://code.wireshark.org/review/6604
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18 04:14:55 +00:00
Michael Mann b5eb9710db Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope.
Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1
Reviewed-on: https://code.wireshark.org/review/6595
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-17 23:22:46 +00:00
Evan Huus 3f575120ea Kill more unused emem functions
Change-Id: Ib81410b6d760886f2ae585f44ac58fc135da62c7
Reviewed-on: https://code.wireshark.org/review/6568
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-16 17:36:15 +00:00
Evan Huus 0b271aa867 Remove ep_strbuf code
Thanks to Michael's work, it is now totally unused.

Change-Id: I67b5f7c69535a08f96f449c36c429e2548f4ea11
Reviewed-on: https://code.wireshark.org/review/6505
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-12 17:11:34 +00:00
Graham Bloice d7bce33140 Fix Cygwin path
Fix the Cygwin path added for tests so that Cygwin comes after the
existing path and that the correct link command is found for exntest.

Same change to runa2x.sh to be consistent.

Change-Id: I177a5e7d17a0077b0e8ca7d264d7e725a5312e24
Reviewed-on: https://code.wireshark.org/review/6503
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-12 12:40:04 +00:00
Graham Bloice 0385d1557d Fix Cygwin path in runa2x.sh
As I don't have Cygwin on the path, the uname -o call failed.
The method used here seems to work reliably without needing Cygwin
on the path.

Change-Id: I206db542b5e89895a43c48626e2d14fff380fc8f
Reviewed-on: https://code.wireshark.org/review/6497
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-12 10:23:00 +00:00
Pascal Quantin 7d004dc887 Revert "Lemon: Update lemon tools"
This reverts commit 5855dd8d53.

This Lemon update fails to compile on OSX and triggers asserts on other platforms

Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91
Reviewed-on: https://code.wireshark.org/review/6496
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 19:57:45 +00:00
Alexis La Goutte 5855dd8d53 Lemon: Update lemon tools
Fix warning: declaration shadows a variable in the global scope [-Wshadow]

Add include <config.h>

Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)

Fix implicit conversion loses integer precision

Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]

Fix function declaration isn’t a prototype [-Wstrict-prototypes]

Fix warning: old-style function definition [-Wold-style-definition]

Fix trailing whitespace

Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake

Fix -Wmissing-prototypes

Remove unused function (acttab_free)

Add basename the filename with only filename (no path...)

Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d
Reviewed-on: https://code.wireshark.org/review/3976
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-11 18:56:08 +00:00
Evan Huus 3a9869d81a Remove/replace ep_strsplit()
Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0
Reviewed-on: https://code.wireshark.org/review/6448
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-10 01:56:08 +00:00
Gerald Combs 4f658999e6 CMake: Migrate to hhc.cmake.
Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the
hhc.cmd wrapper.

Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c
Reviewed-on: https://code.wireshark.org/review/6449
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 17:49:37 +00:00
Gerald Combs cd7408e526 CMake: Enable DocBook on Windows.
Add a wrapper script and CMake macros which lets us run Cygwin's a2x
from Windows. Add *another* wrapper script that ignores the return value
of hhc.exe.

Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake.
Add hints to FindFOP.cmake.

Use unique file names in the HTML Help chain in an attempt to avoid a
race condition.

To do:
- Fix curly quote in HHC title.

Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d
Reviewed-on: https://code.wireshark.org/review/6379
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-08 22:05:38 +00:00
Michael Mann 64a7bac641 tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:16:23 +00:00
Michael Mann 47d670d3d7 Add tvb_address_to_str.
This is intended to handle ALL address types retrieved from a tvbuff.

One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string.

A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str.  Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str.

Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43
Reviewed-on: https://code.wireshark.org/review/6333
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 04:25:07 +00:00
Gerald Combs e3eab8391d checkAPIs: C++ comments are allowed in Windows resource files.
Change-Id: I3885278bf293b1fd7db812ce265734bcdc904c6f
Reviewed-on: https://code.wireshark.org/review/6354
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:11:17 +00:00
Michael Mann 55de46f317 Replace ep_address_to_str with address_to_str.
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b
Reviewed-on: https://code.wireshark.org/review/6323
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-01-06 07:38:18 +00:00
Michael Mann b90f7846f4 Add sanity check to ensure integer types don't get set to BASE_NONE.
This is checked by Wireshark, but the script should catch it earlier in case Wireshark/TShark isn't run after the script is executed (a mistake I've made several times).

Change-Id: I1d113871b10fcae5a6d3e9036cc80d7b1ec1ae57
Reviewed-on: https://code.wireshark.org/review/6245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02 17:38:18 +00:00
Bill Meier 5c529c95c5 Add '*.nativecodeanalysis.xml' to 'clean' targets
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6
Reviewed-on: https://code.wireshark.org/review/6220
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02 01:45:16 +00:00
Michael Mann 06a1f4670e Have hf variables outputted in the order they were found in the file.
Previously they were "randomly sorted" in the hash table.  The hf "array" is outputted in the order found, so have the hf variable declaration match.

Change-Id: I4b078a6328ba7c2781f07bb41d701412fc74ba22
Reviewed-on: https://code.wireshark.org/review/6219
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02 01:37:56 +00:00
Bill Meier 9e7d69fd86 checkAPIs.pl: Error/warnings output goes to STDERR
Change-Id: Ib6f460147c26c4fbfb9bd0fd8dd0dd12561be9ea
Reviewed-on: https://code.wireshark.org/review/6177
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-31 15:35:49 +00:00
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