aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-26Fix a copy-and-pasteo.Guy Harris1-2/+2
Change-Id: Ied8830e2e7a689197870a4d839fd08b36546c75f Reviewed-on: https://code.wireshark.org/review/414 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Some g_free() -> wmem_free() changes missed in earlier checkins.Guy Harris1-2/+2
Change-Id: I5858e0ee8fc8584b35145c943e19e8e5f7dba77c Reviewed-on: https://code.wireshark.org/review/413 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26More tvbuff API deprecation, comment expansion, and documentation updates.Guy Harris5-66/+123
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-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier167-824/+824
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-26Remove a trailing space from a line of generated code.Bill Meier1-1/+1
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-26Create/use an extended value_string.Bill Meier1-4/+5
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(Minor) Use col_add_str() iso col_set_str().Bill Meier2-5/+6
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-26Create/use some extended value-strings. Do some whitespace changes.Bill Meier1-179/+182
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-26Fix capture_sync: Assigned value is garbage or undefined (clang analyzer)Hadriel Kaplan1-3/+3
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-26Use proto_tree_add_item() for most string encodings.Guy Harris1-15/+15
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-26Use tvb_get_string_enc(..., ENC_ASCII|ENC_NA) for 8-bit encoding.Guy Harris1-2/+6
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-26Replace tabs by spacesPascal Quantin1-2/+2
Change-Id: Ib7b97c415fdf924783637bfe566f1e7d21e28369 Reviewed-on: https://code.wireshark.org/review/401 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26packet-smb-direct: register as a infiniband subdissectorStefan Metzmacher1-0/+39
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-26packet-infiniband: pass a struct infinibandinfo to subdissectorsStefan Metzmacher2-96/+106
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-26packet-smb-direct: only handle RDMA_SEND_* messagesStefan Metzmacher1-1/+17
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-26packet-iwarp-ddp-rdmap: pass struct rdmapinfo with opcode to the subdissectorsStefan Metzmacher3-24/+75
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-26We don't use EBCDIC_to_ASCII(), so we don't need to include <epan/charsets.h>.Guy Harris1-1/+0
Change-Id: Ief609f48493f406ba0818ed3e6febe9a8ef0aaf2 Reviewed-on: https://code.wireshark.org/review/400 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Use tvb_get_string_enc() to get UCS-2 strings.Guy Harris1-21/+8
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-25As long as the NEWS file is part of the source distribution it reallyJoerg Mayer1-48/+65
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-25Fix indentation and numbering.Gerald Combs1-2/+4
Change-Id: Ic1b528db9128420e106affcc8b3639d2d5fc65c0 Reviewed-on: https://code.wireshark.org/review/397 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25Remove the line that causes the following message:Joerg Mayer1-2/+0
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-25Get Windows build working again.Gerald Combs2-2/+3
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-25Add a few more dissectors to release notesPascal Quantin1-0/+4
Change-Id: I9d3262fe8205d21baf46b7a7389ca0154a16d165 Reviewed-on: https://code.wireshark.org/review/395 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-25packet-smb: register a dissector on top of smb_directStefan Metzmacher1-0/+1
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 d0d83e5b85173cd9fdc9001a2efb2f596124e2a2) Reviewed-on: https://code.wireshark.org/review/389
2014-02-25packet-smb2: register a dissector on top of smb_directStefan Metzmacher1-0/+1
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 cd9f6e077fdbdde2462acea6b7906e153c8c4864) Reviewed-on: https://code.wireshark.org/review/390
2014-02-25packet-smb-direct.c: add initial implementationStefan Metzmacher3-0/+490
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-25Add back an anchor removed in gc55c57a.Gerald Combs1-0/+2
Change-Id: I9795278b759d1a965abd9b22dc023c70fce19b77 Reviewed-on: https://code.wireshark.org/review/391 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25packet-kerberos: remember in what frame a key was learnedStefan Metzmacher2-0/+4
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-25asn1/kerberos: remember in what frame a key was learnedStefan Metzmacher2-0/+4
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-25Fix function prototypes.Evan Huus4-4/+4
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-25Fix mergecap.c: Dereference of null pointer (clang analyzer)Hadriel Kaplan1-2/+2
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-25Fix bug 6357: Lua all_field_infos() broken within tap/listenerHadriel Kaplan6-7/+118
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-25Adds some Lua helper functions: some commonly used functions, and to help ↵Hadriel Kaplan13-85/+439
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-25Fix file.c: Dereference of null pointer (clang analyzer)Hadriel Kaplan1-4/+4
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-25Install git-review too.Jeff Morriss1-1/+1
Change-Id: I65c98fe8e120ac3b416ca6749eb2b44c47664fb5 Reviewed-on: https://code.wireshark.org/review/386 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25Remove trailing whitespaceBill Meier231-892/+892
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-25Add Git+Gerrit command line instructions.Gerald Combs4-167/+151
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-25802.11 : Add channel number custom (to display info when report channel ↵Alexis La Goutte1-13/+26
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-25802.11: Regulatory Class => Operating Class (changed in 802.11-2012)Alexis La Goutte1-59/+59
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-25Enhance BGP DissectorMichael Pergament1-0/+387
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-25Can't register in a non-existent dissector table.Guy Harris2-2/+0
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-25Fix indentation.Guy Harris1-30/+30
Change-Id: I2105c24a196ddd108925fd3ea29180aa8245dc1b Reviewed-on: https://code.wireshark.org/review/381 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25The UMTS GTP QoS Profile is a UTF-8-encoded string.Guy Harris1-2/+2
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-25Use correct macro to really fix MacOSX buildbotEvan Huus1-3/+3
Change-Id: Ibb7b13c0c9c5699642cda48522b34ace34c28b46 Reviewed-on: https://code.wireshark.org/review/377 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Include old-gtk-compat.h to fix build.Evan Huus1-0/+1
Change-Id: I3614e11fb0e76625b2b9686be423bf421c295e6f Reviewed-on: https://code.wireshark.org/review/376 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Get rid of a few more Subversion remnants.Jeff Morriss3-8/+1
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-25Clean up some more subversion references in the documentation.Jeff Morriss3-49/+25
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-25packet-smb2: register a dissector on top of smb_directStefan Metzmacher1-0/+1
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-25packet-smb: register a dissector on top of smb_directStefan Metzmacher1-0/+1
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-25packet-dcerpc-nt.c: fix a crash bugStefan Metzmacher1-2/+2
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>