Commit graph

51883 commits

Author SHA1 Message Date
Evan Huus
54cccefef6 Fix build with recent lua changes.
Use FT_NONE instead of 0 to initialize an enum.
Drop use of lround/llround since they are not available on Windows.

Change-Id: I3961c1921304bafc090c763f0d6de8532f0b3510
Reviewed-on: https://code.wireshark.org/review/425
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27 22:00:49 +00:00
Hadriel Kaplan
655f2e4dd4 Fix prefs.c: Argument with 'nonnull' attribute passed null (redux)
Change-Id: I795df36039278283008132d647aaf51e76dbe218
Reviewed-on: https://code.wireshark.org/review/424
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-27 21:23:32 +00:00
Hadriel Kaplan
c826191be0 Fix coverity warnings for all wslua files. (redux)
This fixes/addresses all the coverity warnings shown by
the buildbots. (I hope)

Change-Id: Ic2722df97c577d274e3cf3f0cbdca1902edde047
Reviewed-on: https://code.wireshark.org/review/423
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-27 21:23:09 +00:00
Hadriel Kaplan
c875dc8597 Fix dumpcap.c: Assigned value is garbage or undefined (clang analyzer)
Change-Id: I61dbf5e1e206b1c0d2e594bfba38e83e51e8f09c
Reviewed-on: https://code.wireshark.org/review/371
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-27 17:57:02 +00:00
Evan Huus
1828c34519 Ensure ieee802154_packet struct is initialized.
A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be
called with an incompletely-initialized structure, leading to valgrind errors.

Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159
Closes-Bug: #9735
Reviewed-on: https://code.wireshark.org/review/418
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27 03:34:46 +00:00
Guy Harris
9733917e28 Sherman, set the Wayback Machine for 1997.
The URLs for the CRC-10 code are dead; use Wayback Machine URLs.

Change-Id: I3924e9cabb3b49b0e1abb31fbffa9b89f95cd0ce
Reviewed-on: https://code.wireshark.org/review/419
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-27 00:59:23 +00:00
Guy Harris
46d8abe252 Document tvb_memdup() in more detail.
Change-Id: Iec94342b7d033fb6e8597bbffea563128182316b
Reviewed-on: https://code.wireshark.org/review/417
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 22:28:48 +00:00
Evan Huus
df77e26485 Fix some wmem-related documentation.
Discovered while reviewing Ibd3efb92a203861f507ce71bc8d04d19d9d38a93

Change-Id: Ie4dfc1b9b7a99f14657148ed5a935bbb079c2b4e
Reviewed-on: https://code.wireshark.org/review/415
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-26 22:25:22 +00:00
Guy Harris
a8ef66f250 Regularize the formatting of some comments.
Change-Id: I1009c75d5a4f074767dbc3600e7a6edfd0031460
Reviewed-on: https://code.wireshark.org/review/416
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 22:25:00 +00:00
Guy Harris
5de2dacde8 Fix a copy-and-pasteo.
Change-Id: Ied8830e2e7a689197870a4d839fd08b36546c75f
Reviewed-on: https://code.wireshark.org/review/414
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 22:23:04 +00:00
Guy Harris
910949ce84 Some g_free() -> wmem_free() changes missed in earlier checkins.
Change-Id: I5858e0ee8fc8584b35145c943e19e8e5f7dba77c
Reviewed-on: https://code.wireshark.org/review/413
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 22:15:03 +00:00
Guy Harris
8d234a0d8c More tvbuff API deprecation, comment expansion, and documentation updates.
Do with tvb_get_stringz() what was done with tvb_get_string().

Redo the comments for the string get routines to try to give more detail
in a fashion that's a bit less hard to read.

Warn, in comments, of the problems with using
tvb_get_string()/tvb_get_stringz() (i.e., if your strings are non-ASCII,
all bytes with the 8th bit set are going be replaced by the Unicode
REPLACEMENT CHARACTER, and displayed as such).

Warn, in a comment, of the problems with tvb_get_const_stringz() (i.e.,
it gives you raw bytes, rather than guaranteed-to-be-valid UTF-8).

Update documentation and release notes appropriately.

Change-Id: Ibd3efb92a203861f507ce71bc8d04d19d9d38a93
Reviewed-on: https://code.wireshark.org/review/327
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26 22:04:08 +00:00
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