Commit Graph

51871 Commits

Author SHA1 Message Date
Bill Meier 1dff4e309d Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 19:38:21 +00:00
Bill Meier b4850149dd Remove a trailing space from a line of generated code.
Change-Id: Ib95c0db932c54f5664905bde9286aad7a195570f
Reviewed-on: https://code.wireshark.org/review/411
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 19:37:20 +00:00
Bill Meier 0d2f290d48 Create/use an extended value_string.
Change-Id: I1cd20d68ebb50d11ecfa00bf76e9be7c47a45860
Reviewed-on: https://code.wireshark.org/review/410
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 18:29:15 +00:00
Bill Meier 15a3a4436e (Minor) Use col_add_str() iso col_set_str().
Change-Id: I3d430e7e6a6bbdcb518f0110bd81ab32f88c17f0
Reviewed-on: https://code.wireshark.org/review/409
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 18:28:33 +00:00
Bill Meier 5ae7c2ffc0 Create/use some extended value-strings. Do some whitespace changes.
Change-Id: Iee5cb12d3b6669c7e45e18352ebcd151db721ad3
Reviewed-on: https://code.wireshark.org/review/408
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 18:27:46 +00:00
Hadriel Kaplan 2c09745406 Fix capture_sync: Assigned value is garbage or undefined (clang analyzer)
I'm not 100% positive this fix is the right way to handle this condition,
but it seems the safest way without changing a lot of other code.

Change-Id: Icaa8d6f38bc03177162f046d1e7ca55d87bad6a6
Reviewed-on: https://code.wireshark.org/review/373
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-02-26 11:32:52 +00:00
Guy Harris ea1d5c151e Use proto_tree_add_item() for most string encodings.
We support ISO 8859-1 and 8859-8, so use proto_tree_add_item() for them.
That leaves only EUC-KR.

Change-Id: Ie61f69af43be03e5abeb84b95601a407900fb79b
Reviewed-on: https://code.wireshark.org/review/403
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 10:17:22 +00:00
Guy Harris 85885f4509 Use tvb_get_string_enc(..., ENC_ASCII|ENC_NA) for 8-bit encoding.
If there are 8-bit "extended ASCII" encodings, either one should be
wired in or there should be a preference for them.

Change-Id: Id62381b2579e8edf3719bd92959821c21f7ba223
Reviewed-on: https://code.wireshark.org/review/402
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 10:14:09 +00:00
Pascal Quantin 985d334f9b Replace tabs by spaces
Change-Id: Ib7b97c415fdf924783637bfe566f1e7d21e28369
Reviewed-on: https://code.wireshark.org/review/401
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26 09:23:23 +00:00
Stefan Metzmacher b84d6bebcb packet-smb-direct: register as a infiniband subdissector
This is implemented based on the documentation, I sadly don't
have a capture to verify this.

Change-Id: Ia7dc371cb5b17ea42be0e686c97797f8c06ccabd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/358
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26 09:14:57 +00:00
Stefan Metzmacher 8242756aed packet-infiniband: pass a struct infinibandinfo to subdissectors
Change-Id: I187a1a91f34b1b758cad03bd9902ba132272cd3a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/357
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26 09:12:20 +00:00
Stefan Metzmacher f012f1d087 packet-smb-direct: only handle RDMA_SEND_* messages
Change-Id: I08fa1092e2722c108bf6f847f8fc230f131e584b
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/356
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26 09:09:26 +00:00
Stefan Metzmacher 6efd2c732a packet-iwarp-ddp-rdmap: pass struct rdmapinfo with opcode to the subdissectors
Change-Id: I51bb8a3047bbc16d55d0c089fe869c7534d4c0b5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/355
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26 09:08:47 +00:00
Guy Harris 98cc3d61dc We don't use EBCDIC_to_ASCII(), so we don't need to include <epan/charsets.h>.
Change-Id: Ief609f48493f406ba0818ed3e6febe9a8ef0aaf2
Reviewed-on: https://code.wireshark.org/review/400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 07:57:22 +00:00
Guy Harris f8f4ebbc91 Use tvb_get_string_enc() to get UCS-2 strings.
Also, note that the "8-bit" encoding is "user-defined".

Change-Id: Ic4786873150d837d8793d2d3d20af50cd0003cc7
Reviewed-on: https://code.wireshark.org/review/399
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 07:50:57 +00:00
Joerg Mayer 136b730657 As long as the NEWS file is part of the source distribution it really
needs to be updated every time the file docbook/release-notes.asciidoc
get changed.

Change-Id: Idea130c883b3b3645d696b830e25fe052f889860
Reviewed-on: https://code.wireshark.org/review/398
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-02-25 23:59:05 +00:00
Gerald Combs d75d5a197e Fix indentation and numbering.
Change-Id: Ic1b528db9128420e106affcc8b3639d2d5fc65c0
Reviewed-on: https://code.wireshark.org/review/397
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25 23:42:01 +00:00
Joerg Mayer 65bac032e4 Remove the line that causes the following message:
asciidoc: WARNING: developer-guide.asciidoc: line 25: include file not found: /home/jmayer/work/wireshark/git/docbook/wsdg_src/WSDG_chapter_.asciidoc

Change-Id: I65c035da7e44e0bca7aa9fe26a9d77da5238e205
Reviewed-on: https://code.wireshark.org/review/394
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-02-25 23:22:53 +00:00
Gerald Combs bac680caf5 Get Windows build working again.
Change 16 / g579e7e1 introduced a breaking change in
capture_file_dialog.cpp on Windows. This works around the problem
temporarily until we come up with a proper fix.

Fix a Q_OS_WIN check while we're at it.

Change-Id: I552d60720e4a45c5144e0047ee3c1fcc7e64f4eb
Reviewed-on: https://code.wireshark.org/review/396
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25 22:49:18 +00:00
Pascal Quantin a7de0128b1 Add a few more dissectors to release notes
Change-Id: I9d3262fe8205d21baf46b7a7389ca0154a16d165
Reviewed-on: https://code.wireshark.org/review/395
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-25 22:39:33 +00:00
Stefan Metzmacher fcb0837d0c packet-smb: register a dissector on top of smb_direct
Change-Id: I316b958c6a91dc333bcdb468368f2c19fe8845d6
Old-Change-Id: I26a3088df12de9d74cf6c224b938003417b758f5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/58
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit d0d83e5b85)
Reviewed-on: https://code.wireshark.org/review/389
2014-02-25 22:00:04 +00:00
Stefan Metzmacher 5d0be58cb5 packet-smb2: register a dissector on top of smb_direct
Change-Id: I6a87c57d513af9c8ce9dff783988f7242f5257d0
Old-Change-Id: If52130f7f9e9783a8ecc8b8b3c01d86a02e4f946
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/57
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit cd9f6e077f)
Reviewed-on: https://code.wireshark.org/review/390
2014-02-25 21:59:58 +00:00
Stefan Metzmacher 8fe9187b98 packet-smb-direct.c: add initial implementation
See [MS-SMBD] http://msdn.microsoft.com/en-us/library/hh536346.aspx

Change-Id: If2cf719bdf5da82bc5f5e086dd69d02caff2166a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/55
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 21:58:26 +00:00
Gerald Combs 621a9c5023 Add back an anchor removed in gc55c57a.
Change-Id: I9795278b759d1a965abd9b22dc023c70fce19b77
Reviewed-on: https://code.wireshark.org/review/391
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25 21:58:20 +00:00
Stefan Metzmacher 9db0e02fb3 packet-kerberos: remember in what frame a key was learned
Change-Id: Icd05d4941fdacac44094fafbad07f08ec4cbe976
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/364
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:47:27 +00:00
Stefan Metzmacher 98e6bb18d3 asn1/kerberos: remember in what frame a key was learned
Change-Id: I8e64e1d02ee8b4dff3845e1b9ec8f56174e76fbf
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/363
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:47:10 +00:00
Evan Huus d5c437e8e5 Fix function prototypes.
Functions with no parameters must be written func(void). Fixes (some) of the
buildbots.

Change-Id: I1a6e5c0553e032e99419fe67eb4b573bbdfe7fe6
Reviewed-on: https://code.wireshark.org/review/388
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 21:46:55 +00:00
Hadriel Kaplan 7955654911 Fix mergecap.c: Dereference of null pointer (clang analyzer)
Change-Id: I89076388db8522c5fbdf72505f50e1380f1ab391
Reviewed-on: https://code.wireshark.org/review/369
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:11:25 +00:00
Hadriel Kaplan bd36fe1bcb Fix bug 6357: Lua all_field_infos() broken within tap/listener
The current API for Lua provides a global function
"all_field_infos()" which returns all the populated field_info nodes
in the current proto_tree.

By default all_field_infos() "works", in the literal sense: it returns
exactly the fields the previous dissectors of the packet have
populated at that instant of time.  But of course dissectors don't
populate all the applicable fields most of the time, because of the
TRY_TO_FAKE_THIS_ITEM optimization where they don't fill in things
that aren't needed at the time by a display, color, or tap's dfilter.

So this commit offers a way to force the dissectors to populate
all the applicable field_infos in the tree, by setting the proto_tree
to be visible.  Obviously that is going to impact performance, since
it basically bypasses the TRY_TO_FAKE_THIS_ITEM optimization; so the
patch only does this if the Lua script author told it to explicitly,
by adding an argument to Listener.new() and register_postdissector().

Change-Id: I11d3559fbe8c14fbadf1b51415a3701dc1200b7b
Reviewed-on: https://code.wireshark.org/review/286
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:06:50 +00:00
Hadriel Kaplan 860747e1e7 Adds some Lua helper functions: some commonly used functions, and to help troubleshooting Lua scripts
There are some common things people need to do, such as convert to/from hex or get
the raw binary string in a ByteArray/Tvb/TvbRange. These have been added, as well
as some tests for them in the testsuites. Also, functions have been added to allow
a script to get all the available tap types and filter fields, since they are
not exactly what one can see in the Wireshark gui.

Change-Id: I92e5e4eae713bb90d79b0c024eaa4e55b99cc96b
Reviewed-on: https://code.wireshark.org/review/249
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 21:06:21 +00:00
Hadriel Kaplan 907a825986 Fix file.c: Dereference of null pointer (clang analyzer)
Change-Id: Ib96e5ffb284234562c2883c13e93109173e22179
Reviewed-on: https://code.wireshark.org/review/368
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 20:52:48 +00:00
Jeff Morriss 5478483eef Install git-review too.
Change-Id: I65c98fe8e120ac3b416ca6749eb2b44c47664fb5
Reviewed-on: https://code.wireshark.org/review/386
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 20:47:33 +00:00
Bill Meier 11b5c15fdb Remove trailing whitespace
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0
Reviewed-on: https://code.wireshark.org/review/385
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25 20:46:49 +00:00
Gerald Combs c55c57ad72 Add Git+Gerrit command line instructions.
Add a Git+Gerrit command line example to the Developer's Guide. Convert
some Subversion text to Git.

Skip building the Developer's Guide if we don't have a2x.

Change-Id: I62e9e71eb3ffc07d8677df35b4b197f53f77b4f2
Reviewed-on: https://code.wireshark.org/review/384
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25 20:26:50 +00:00
Alexis La Goutte 34933eb805 802.11 : Add channel number custom (to display info when report channel number is 0 or 255)
Fix also indent for other custom...

Change-Id: Ic95b65d5217a0d1e967892ac2694f3ba749242fb
Reviewed-on: https://code.wireshark.org/review/379
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 20:16:14 +00:00
Alexis La Goutte f5ebc083c6 802.11: Regulatory Class => Operating Class (changed in 802.11-2012)
Fix also typo for hf_ieee80211_tag_measure_request_regulatory_class wrong hf name...

Change-Id: I49e582c7683e58abb8785958dcc043789fd79a26
Reviewed-on: https://code.wireshark.org/review/378
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 20:15:53 +00:00
Michael Pergament 2da9162402 Enhance BGP Dissector
Add 
* BGP MPLS Based Ethernet VPN dissector (draft-ietf-l2vpn-evpn-05)
* PMSI Tunnel Attribut dissector (RFC6514)

Change-Id: I02caa67fc371bbc9666f343e20fa678e8b029a59
Reviewed-on: https://code.wireshark.org/review/296
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 20:12:13 +00:00
Guy Harris 75015e4351 Can't register in a non-existent dissector table.
This will have to wait until the SMB Direct dissector is actually
committed.  There's no point in getting a bunch of "OOPS: dissector
table "smb_direct" doesn't exist" messages every time you run Wireshark
or TShark.

Change-Id: I9772eb3f119822fbeaa78876570798d49bb4cab9
Reviewed-on: https://code.wireshark.org/review/382
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25 19:55:25 +00:00
Guy Harris 1084b88719 Fix indentation.
Change-Id: I2105c24a196ddd108925fd3ea29180aa8245dc1b
Reviewed-on: https://code.wireshark.org/review/381
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25 19:04:28 +00:00
Guy Harris 1b046b76f3 The UMTS GTP QoS Profile is a UTF-8-encoded string.
So use tvb_get_string_enc() with ENC_UTF_8|ENC_NA.

Use tvb_reported_length() while we're at it.

Change-Id: I75bfa9abb23ca411dca5844dd56fe062d16319e0
Reviewed-on: https://code.wireshark.org/review/380
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25 19:00:03 +00:00
Evan Huus 95e5a1d954 Use correct macro to really fix MacOSX buildbot
Change-Id: Ibb7b13c0c9c5699642cda48522b34ace34c28b46
Reviewed-on: https://code.wireshark.org/review/377
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 18:39:00 +00:00
Evan Huus 8ce395d92a Include old-gtk-compat.h to fix build.
Change-Id: I3614e11fb0e76625b2b9686be423bf421c295e6f
Reviewed-on: https://code.wireshark.org/review/376
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 18:12:02 +00:00
Jeff Morriss 5a1aa01af2 Get rid of a few more Subversion remnants.
Change-Id: I35ff651017e355f92b4f9e6388e90d446f245d0a
Reviewed-on: https://code.wireshark.org/review/361
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 18:05:08 +00:00
Jeff Morriss cd02def632 Clean up some more subversion references in the documentation.
Change-Id: Id6cf1a617bff3e09e47933a69d505393502874d1
Reviewed-on: https://code.wireshark.org/review/370
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 18:04:55 +00:00
Stefan Metzmacher cd9f6e077f packet-smb2: register a dissector on top of smb_direct
Change-Id: If52130f7f9e9783a8ecc8b8b3c01d86a02e4f946
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/57
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 17:58:54 +00:00
Stefan Metzmacher d0d83e5b85 packet-smb: register a dissector on top of smb_direct
Change-Id: I26a3088df12de9d74cf6c224b938003417b758f5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/58
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 17:58:34 +00:00
Stefan Metzmacher 04bd19d3c2 packet-dcerpc-nt.c: fix a crash bug
Change-Id: Ia8d167afc79c4fa1b2fa05b78152120203462b67
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/362
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25 17:56:09 +00:00
Michal Labedzki 579e7e19ce Wireshark: Add option to choose format type of capture file
The best heuristic can fail, so add possibility to manually choose
capture file format type, so not correctly recognize file format can be
loaded in Wireshark.

On the other side now it is possible to open capture file
as file format to be dissected.

Change-Id: I5a9f662b32ff7e042f753a92eaaa86c6e41f400a
Reviewed-on: https://code.wireshark.org/review/16
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-25 17:43:13 +00:00
Hadriel Kaplan b6aae8d5c4 Change libsmi url and Lua version in macosx-setup.sh
The libsmi url in macosx-setup.sh was dead, it's now an https site not ftp.
Also we were pulling down Lua 5.1.5 but should be pullsing down 5.2.3.
Lastly, macosx-setup cerates macosx-support-libs directory, which needs
to be ignored.

Change-Id: I79dc833dbc54fda8b237c5ada64f3564ce4f4cde
Reviewed-on: https://code.wireshark.org/review/360
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 17:28:04 +00:00
Jeff Morriss 605d9bb8e2 Delete tools/svnadd: it seems git doesn't need all this fancy properties stuff.
Change-Id: Ibb1c713ba9e9b09f062753c232d006b3afd682f0
Reviewed-on: https://code.wireshark.org/review/366
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 17:20:53 +00:00