aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-02-25Wireshark: Add option to choose format type of capture fileMichal Labedzki27-190/+242
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-25Change libsmi url and Lua version in macosx-setup.shHadriel Kaplan2-4/+4
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-25Delete tools/svnadd: it seems git doesn't need all this fancy properties stuff.Jeff Morriss1-93/+0
Change-Id: Ibb1c713ba9e9b09f062753c232d006b3afd682f0 Reviewed-on: https://code.wireshark.org/review/366 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25Remove trailing whitespace.Bill Meier32-191/+191
Change-Id: Ia03a1cd4590aceda30ead4aa93ad413d90c6aea6 Reviewed-on: https://code.wireshark.org/review/372 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25Fix packet-devicenet.c:619:17: error: will never be executed ↵Alexis La Goutte1-1/+0
[-Werror,-Wunreachable-code] Change-Id: I3e7cc60e1844dcb1eab87060f6338bd4ba08e9b3 Reviewed-on: https://code.wireshark.org/review/322 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-25Fix packet-ieee80211.c:13115:7: error: will never be executed ↵Alexis La Goutte1-1/+0
[-Werror,-Wunreachable-code] Change-Id: I0a87e6a2e9a819148a816ad1bc9da008b8cc1518 Reviewed-on: https://code.wireshark.org/review/324 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-25Fix packet-ipv6.c:585:13: error: will never be executed ↵Alexis La Goutte1-1/+0
[-Werror,-Wunreachable-code] Change-Id: Ic2696aac59e001db1e4f62942680150a065ebbb1 Reviewed-on: https://code.wireshark.org/review/326 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-25Fix packet-ip.c:579:9: error: will never be executed ↵Alexis La Goutte1-1/+0
[-Werror,-Wunreachable-code] Change-Id: Id368fdb7025260cb1fc261f844eae8c018c65edd Reviewed-on: https://code.wireshark.org/review/325 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-25Install git instead of subversion.Jeff Morriss1-1/+1
Change-Id: I5da2c129fa120e461d4bb3199c1ec0e0b52c28a4 Reviewed-on: https://code.wireshark.org/review/337 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-25More explanation of example heuristic code.Evan Huus1-11/+16
Approach suggested by Jeff seems right to me: https://www.wireshark.org/lists/wireshark-dev/201402/msg00198.html Change-Id: I3d54cb49e2f0027ee79f68a633f57382101241b5 Reviewed-on: https://code.wireshark.org/review/350 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Just use proto_tree_add_item() for an EBCDIC string.Guy Harris1-4/+1
Change-Id: Ic385926b5f4110253e3ab47984589d646707afa0 Reviewed-on: https://code.wireshark.org/review/353 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25Fix crash when exporting dissection summaries to a CSV file.Guy Harris1-2/+3
The while loop in question ends with tmp_str being NULL; the next loop processes the same string, so you have to set tmp_str to csv_str before looping. Fix some comments while we're at it. Change-Id: I69dd7dc276e0cb11226eceee7921be87e3cc7534 Reviewed-on: https://code.wireshark.org/review/352 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-25Remove a few wrong use of tvb_get_string()Pascal Quantin4-7/+7
Change-Id: I7095e12439fd8c0c5cd3ce14d19662efa3fd841f Reviewed-on: https://code.wireshark.org/review/339 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-25Neighbor report (802.11k) may be have no subelement (len == 13)Alexis La Goutte1-0/+5
Fix some malformed frame from sample on Bug 9724 Change-Id: I0874c2aab57799426f13e18123b05a7e73c6a75f Partialy-Bug:9724 Reviewed-on: https://code.wireshark.org/review/340 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25"tools" updates.Gerald Combs3-354/+3
Remove backport-change. It didn't work as well as I had hoped. Remove backport-rev since we don't use Subversion any more. Remove DocBook code from gen-bugnote. Change-Id: I70f39444c6cdd380301691f64d27147ac09e5cae Reviewed-on: https://code.wireshark.org/review/348 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-24Remove executable bit from a few filesPascal Quantin3-0/+0
Change-Id: Ib9be221e3d325379c8b665ab73d976254bb23bb6 Reviewed-on: https://code.wireshark.org/review/342 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-24Fix -Wunused-const-variable found by ClangAlexis La Goutte1-12/+0
Change-Id: I57cfafea0e3110553ef03a34baad217f8109942d Reviewed-on: https://code.wireshark.org/review/320 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-24Add ADB CS and Logcat dissectors to release notesPascal Quantin1-0/+2
Change-Id: I063cc38c156505922fa31eb67c176dc1cd6ecfa7 Reviewed-on: https://code.wireshark.org/review/336 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-24Fix -Wunused-const-variable found by ClangAlexis La Goutte1-0/+4
Change-Id: I7fb2e6477cea26a5ee13dcc0610f7522ce211ae2 Reviewed-on: https://code.wireshark.org/review/321 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-24Use correct hash algorithms in ISAKMP (IKEv2) dissectorTobias Brunner1-2/+2
Change-Id: Ia448f3cc5f5ffc8eafad73fdb0c3f3dd647342ef Reviewed-on: https://code.wireshark.org/review/335 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-24Fix Called C++ object pointer is null found by ClangAlexis La Goutte1-1/+1
Change-Id: I2263b4ac16945be6d87eaa8c963f7b03e437d724 Reviewed-on: https://code.wireshark.org/review/319 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-23NAS EPS: fix dissection of CS service notification messagePascal Quantin1-7/+7
Fixes bug 9789 Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee Reviewed-on: https://code.wireshark.org/review/330 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-23Fix dissection of BCD numbersPascal Quantin2-12/+8
Do not use of tvb_get_string(): what we really want is the byte string, not an ASCII string Change-Id: I8b9a8b7ccacbdaf6d9525771ff8ed883ba01ad34 Reviewed-on: https://code.wireshark.org/review/329 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-23Remove deprecated TVB APIsPascal Quantin2-19/+13
Change-Id: I87216c3bd2061c12ce486c752d4381ab722db95e Reviewed-on: https://code.wireshark.org/review/328 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-23[Automatic manuf, services and enterprise-numbers update for 2014-02-23]Gerald Combs3-12/+146
Change-Id: Ib8cee06ff9420f16566696ca7dd0efc97036c7dc Reviewed-on: https://code.wireshark.org/review/316 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-23Documentation updatesEvan Huus4-41/+36
Change-Id: I6bd7fa40726fe7ffd68b9341c640874f2a0f1c7c Reviewed-on: https://code.wireshark.org/review/314 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-23Add note to .gitignore on how to ignore locally-specific filesHadriel Kaplan1-3/+11
Also, this removes a couple locally-specific files I had previously added. Change-Id: Ib93e0dc5aeb062321e47f77a084b0581f87046c6 Reviewed-on: https://code.wireshark.org/review/315 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-22Add some simple ISAKMP heuristicsEvan Huus1-8/+31
Hopefully fixes bug 9800. Change-Id: I69e1a0e39763a6e25eb18aed6b4a6a6217e22d14 Reviewed-on: https://code.wireshark.org/review/312 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-22Fix Called function pointer is null (null dereference) found by ClangAlexis La Goutte2-9/+7
../../asn1/h248/packet-h248-template.c:1222:31: warning: Value stored to 'prop' is never read if (!prop->dissector) prop = &no_param; Change-Id: I6d380fbb5fef9dc548385b0b470aea1cb3c34df1 Reviewed-on: https://code.wireshark.org/review/301 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-22Fix clang warning regarding null pointer use in packet-sip.c.Hadriel Kaplan1-11/+22
In malformed sip-sec header fields, missing spi-c/spi-s values will cause thie 'value' pointer to remain NULL, leading to bad things. This fix checks for that and adds an expert warning about malformed sip-sec mechanism. Change-Id: Ia7d1741fc8d829dd14e5c68f21fa99282eddbeab Reviewed-on: https://code.wireshark.org/review/299 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-22TVB API deprecations and cleanupEvan Huus5-61/+59
- rename tvb_length and similar to tvb_captured_length and similar; leave #defines in place for backwards-compat, but mark them clearly as deprecated in code comments and in checkAPI - remove tvb_get_string as C code and just leave a #define in place for backwards-compat; mark it clearly as deprecated in code comment and checkAPI - update READMEs and sample dissector for all of the above - while in the neighbourhood, make checkAPI skip (and warn) for missing files instead of bailing on the whole check, so subsequent files still get checked Change-Id: I32fc437896ca86ca73e9b49d5f50400adf8ec5ad Reviewed-on: https://code.wireshark.org/review/311 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-22Add bug 9492.Guy Harris1-0/+1
Change-Id: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793 Reviewed-on: https://code.wireshark.org/review/306 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-21Cleanup the automatically-generated fields to match the rest.Guy Harris1-8/+10
Change-Id: I217d5c390c806dfa28c7e9ff155ef927ed2a9111 Reviewed-on: https://code.wireshark.org/review/303 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-21Update the "latest version" URL in manuf/manuf.tmpl.Gerald Combs2-4/+27
Regenerate manuf. I *really* wish Gitweb URLs were less ugly. Change-Id: I51eabe1a028999859499466a9369106f465dec80 Reviewed-on: https://code.wireshark.org/review/300 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-21Fix bug 9790: Lua: wslua allows duplicate field registrationHadriel Kaplan6-155/+808
As discussed in bug 3513 and 9709, one can register more than one new ProtoFields for the same field name. Of course C-code can do that too, and does a LOT apparently, but if they're not similar ftypes then things can get scrweed up in display filters. So this change prevents duplicate field registration of dissimilar ftypes. The similarity is based on the discussion on the mailing list, and the listing in README.developer has been updated to refelect that as well. Also, this change adds a testscript for Proto/ProtoFields. Change-Id: I43bd323f785245941a21289647332a19adec2a9d Reviewed-on: https://code.wireshark.org/review/285 Reviewed-by: Evan Huus <eapache@gmail.com>