Commit Graph

30442 Commits

Author SHA1 Message Date
Anish Bhatt 23379ae362 NBAP : Verify conversation proto data exists before trying to access it
Bug 11841
Change-Id: Ic0dea6491a68a042ddc0f2dbee19739e4568b18c
Reviewed-on: https://code.wireshark.org/review/12576
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 12:55:13 +00:00
Alexis La Goutte 97146be883 The variable is assigned values twice successively found by PVS Studio (V519)
Change-Id: I063b0ee2dd4ed948f889c33ab458df20079a64ff
Reviewed-on: https://code.wireshark.org/review/12370
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
2015-12-13 10:35:36 +00:00
Peter Wu 252486e967 telnet: add more options, including START_TLS
Basic support of the option, no decryption support.

Change-Id: I2556954dcb8b0e79d0e2ac9f3101ae0c423bcd36
Ping-Bug: 11874
Reviewed-on: https://code.wireshark.org/review/12548
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-13 07:18:21 +00:00
Michael Mann 510f7d1f05 Register TCP ports 6000-6063 for X11 dissector.
This is done through a preference that defaults the range to 6000-6063, which corresponds to its IANA registered ports.

Bug: 11869
Change-Id: Ifafcf598417cd44545b0b4b9ac883cf1b63c9b23
Reviewed-on: https://code.wireshark.org/review/12572
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-13 07:09:01 +00:00
Gerald Combs 76dd8a27b7 Start deprecating the capture info API.
The GTK+ UI has a capture info dialog which shows a summary of captured
protocols, including IPX (!), NetBIOS (!!) and VINES (!!OMG!!). It's
been disabled by default since 2006 (g59aa9e40).

Remove the preference in the Qt UI capture pane. It's still available
via the advanced prefs. Add comments in various parts of the code noting
that the capture_info routines and structs are GTK+ only. Also note that
if we *do* want to add a Qt capture info dialog we'll probably want to
modernize the information we show.

Change-Id: I3c63f6f01b60f0767fb33602a7f0c3b537dbde51
Reviewed-on: https://code.wireshark.org/review/10991
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 04:25:13 +00:00
Martin Kaiser 58924625d3 [usb] update a comment
the byteswap function is now called pcap_byteswap_linux_usb_pseudoheader()

Change-Id: Iefceaccf4eabb96228bf8ea53fc5814f9a0ae502
Reviewed-on: https://code.wireshark.org/review/12574
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-12 16:26:34 +00:00
João Valverde 2aab706c5a Remove -Wwrite-strings compiler flag
The "-Wwrite-strings" flag produces nuisance warnings. These warnings are
not useful, they're impossible to fix in a sane way and therefore are being
handled with casts of static strings to (char *).

This just moves the warning to [-Wcast-qual] and a compiler pragma is
in turn required (and used) to squelch that warning.

Remove the Wwrite-strings warning. Let that responsibility fall on the
programmer (as is done by casting).

Change-Id: I5a44dfd9decd6d80797a521a3373593074962fb5
Reviewed-on: https://code.wireshark.org/review/12162
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-12 16:21:19 +00:00
Martin Kaiser 95142cf09d [iso14443] dissect the PCB byte and payload of I, R and S-blocks
Change-Id: Ia7c3e09d147d8e46acaf4476b82acdde88a400b9
Reviewed-on: https://code.wireshark.org/review/12567
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-12 16:02:01 +00:00
Martin Kaiser f5c50daae6 [iso14443] dissect some more components of the ATQB
and move ATQB dissection into a separate function

Change-Id: Iaa6b4aaaa70bb33ddd334ed4d5c39ffc15454e4c
Reviewed-on: https://code.wireshark.org/review/12566
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-12-12 14:43:42 +00:00
Michael Mann eb0c034f6e Increase ZBEE_ZCL_APPL_EVTALT_NUM_STRUCT_ETT to match ZBEE_ZCL_APPL_EVTALT_COUNT_NUM_MASK, to prevent invalid ett_ array access.
Change-Id: I67e79e97e13081a77bb5202cbbc1e4f1ee872c95
Reviewed-on: https://code.wireshark.org/review/12556
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-12 14:08:28 +00:00
Michael Mann 9352616ec9 Range check ett_ array access.
Bug: 11830
Change-Id: I010093f0ee6f876161de0aca24ea5037616d0039
Reviewed-on: https://code.wireshark.org/review/12555
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-12-12 14:07:08 +00:00
Michael Mann 2930d3105c [RSL] Just return rest of packet if TLV type is unknown
Bug: 11829
Change-Id: Id31ec9ee970c3a1e1fe64e3bf823f9ab78f7cd9e
Reviewed-on: https://code.wireshark.org/review/12558
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-12 08:01:28 +00:00
João Valverde 2ebfa30ffd IPv6: Dest/Hop extension header register_info fixup
Fixes 90d9710145.

Change-Id: I334c8b1816e08163fc68970b19586734b8194087
Reviewed-on: https://code.wireshark.org/review/12532
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-12-11 22:44:25 +00:00
Pascal Quantin 3d3698a671 ULP: register dissector for application/vnd.omaloc-supl-init media
Bug: 11875
Change-Id: Ifb6cdd424ef0062bebb4c4e67ad603461042f111
Reviewed-on: https://code.wireshark.org/review/12538
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 22:41:34 +00:00
Guy Harris 021a695e62 Consistently use spaces rather than tabs.
Change-Id: I9761b7ce0eb42c3b6dc39bd01179c302b2233e91
Reviewed-on: https://code.wireshark.org/review/12540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-11 19:10:20 +00:00
Stig Bjørlykke b031e538f7 Lua: Check for empty name in ProtoField
The check in tmp_fld_check_assert() does terminate with g_error
if given an empty string as name, so we have to check for this.

Change-Id: I084e3e715bd319484a52f60ef90c1a2aea30df1b
Reviewed-on: https://code.wireshark.org/review/12534
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-11 16:56:43 +00:00
João Valverde 6586926a47 MIPv6: Add support for "Home Agent Switch Message" Mobility Header
Specification in RFC 5142.

Change-Id: I30d2f4591f1659b74dce5839e4439aa86f1c5e85
Reviewed-on: https://code.wireshark.org/review/12519
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-12-11 13:32:42 +00:00
D. Ulis 1a40ce95c5 ENIP: Add sanity check when connection info not available
If the connection info is not available, ensure that enough connected data is available to meet the minimum explicit message size.

Change-Id: I6c8bf54dda4adbf23749d2a2c8c19f4ea2bc5222
Reviewed-on: https://code.wireshark.org/review/12520
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11 12:41:49 +00:00
Stig Bjørlykke f142595db7 Lua: Validate ProtoExpert.new arguments
Change-Id: I0da829041cda48a35341c315a7889b557b6334d7
Reviewed-on: https://code.wireshark.org/review/12527
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-11 09:42:50 +00:00
Stig Bjørlykke 2fd168c134 epan: Don't export deregister functions
Most of the deregister functions are used internally from Lua
while reloading plugins.  Don't export them for others to use.

Change-Id: I919dbfa807f696c38d409ca7206104a0fba1ae65
Reviewed-on: https://code.wireshark.org/review/12508
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-11 08:35:11 +00:00
Chris Brandson 9cbb646524 Changed references for IntraPAN to PAN ID Compression as per all versions 802.15.4-2006 and laterChange-Id: I99e66919c86712533cd37fef9d4c464b75444d93
Change-Id: I9ec2b1a6d457d887a7202f7fe0894c3894cb1ecb
Reviewed-on: https://code.wireshark.org/review/12514
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-12-11 07:08:20 +00:00
D. Ulis e6dc9a725b CIP: Add support for common class attributes
Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2
Reviewed-on: https://code.wireshark.org/review/12502
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-12-11 07:07:31 +00:00
João Valverde 00eb71ac32 MIPv6: Fix unknown MH Type message data length
Also improve column info for unknown MH types.

Ping-Bug: 11728
Change-Id: I4e54ae56dbb76eaf9ea4f33eb0ff497a518dbd9a
Reviewed-on: https://code.wireshark.org/review/12513
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-12-11 06:59:30 +00:00
João Valverde e8b8568b7c 6LowPAN: Check for NHC IPv6 No Next Header
Bug: 11728
Change-Id: I7b7cc72b4200e53856283e0716383d661a16fa77
Reviewed-on: https://code.wireshark.org/review/12512
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 05:30:07 +00:00
João Valverde c5f1eed1a5 MIPv6: Change name to "Mobile IPv6" (only)
Change-Id: I1955a88025c26564e7dca4dfbb811cc7265632ea
Reviewed-on: https://code.wireshark.org/review/12518
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 05:27:55 +00:00
Peter Wu c96b78f28d ssl: fix SSLv2 Client Hello dissection
Regression introduced with v1.99.4rc0-112-gf0855e0 ("Remove
proto_tree_add_text from packet-ssl.c").

While SSL decryption is not needed on the second pass, the items still
have to be added.

Bug: 11851
Change-Id: Iccb43f2ccff19bbe6d998fb08600b226ac054825
Reviewed-on: https://code.wireshark.org/review/12510
Reviewed-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-12-11 05:23:14 +00:00
Stig Bjørlykke ea1789f925 Qt: Reload Lua expert infos
Support reloading Lua plugins with expert infos.
Use the same delayed deregister logic as for fields.

Change-Id: I36efa0820050b3a7afed4de7a8b0fa16805e8dfa
Reviewed-on: https://code.wireshark.org/review/12498
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-11 05:17:58 +00:00
Alexis La Goutte 9c47cb4254 Fix Recurring check found by PVS Studio (V571)
packet-ncp2222.inc: The 'ncp_rec->func == 0x59' condition was already verified in line 7300.
packet-bgp: The 'nlri_len < 21' condition was already verified in line 3879
packet-rtp.c: The 'p_conv_data' condition was already verified in line 1460

Change-Id: I65299718b26454596e3f25665d413a17a99e4ce0
Reviewed-on: https://code.wireshark.org/review/12341
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-11 05:13:54 +00:00
Michael Mann 99028789cb Completely remove new_create_dissector_handle and new_register_dissector.
The macros are no longer needed because the conversion is complete.

Change-Id: I42c4b937986d9707eff9225c444cbcab73f8e86a
Reviewed-on: https://code.wireshark.org/review/12517
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-12-11 03:43:03 +00:00
Michael Mann 1474f49f19 new_register_dissector -> register_dissector for remaining uses.
Mostly plugins, but also LUA and generated skinny dissector.

Change-Id: Ifeb4205442f9a60875266b4e82841ff38b4fdb63
Reviewed-on: https://code.wireshark.org/review/12515
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11 03:42:37 +00:00
Guy Harris ad328d97a6 The Bridging Control Protocol is really two protocols.
RFC 3518 defines two protocols, one used to encapsulate bridged PDUs and
one used to configure the bridging process.  Make them two
separately-registered protocols.

Change-Id: I393ea31ab7ef44cae2ef2b592ffde5d53ecb113f
Reviewed-on: https://code.wireshark.org/review/12509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-10 21:10:40 +00:00
Michael Mann a33209d69e Convert ASN.1 dissectors to remove "new" from "new-style" dissector function names that were generated from asn2wrs.py
This includes:
1. new_create_dissector_handle -> create_dissector_handle
2. new_register_dissector -> register_dissector
3. new_register_ber_oid_dissector -> register_ber_oid_dissector
4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector

Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore.

Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329
Reviewed-on: https://code.wireshark.org/review/12491
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10 17:06:02 +00:00
Anders Broman 5062fe0a88 Revert "Added RTI TCP dissector"
This reverts commit 1788e2c33a.

Change-Id: Ie86aa71f92e02935663b46ca00f38e0b8d8ae411
Reviewed-on: https://code.wireshark.org/review/12494
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-10 11:43:40 +00:00
Juanjo Martin 1788e2c33a Added RTI TCP dissector
This dissector shows the information related to the RTI TCP Control
messages used to manage the TCP connections, but also dissects the
RTPS data that is sent on top of RTI TCP. This only happens with
RTI's DDS implementation.

Bug: 11640
Change-Id: I89fcb620256aeed7cae5829b70d92c6868d94929
Reviewed-on: https://code.wireshark.org/review/11305
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-10 06:00:35 +00:00
AndersBroman 3419f32266 [PPP] Add dissection of BCP NCP 0x8031
Change-Id: Ie4bb0eff6b50027df973cd438761b12408e74b3a
Reviewed-on: https://code.wireshark.org/review/12490
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-12-09 22:51:53 +00:00
D. Ulis 0a33e352f4 CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it.
This ensures:
1. Generated data shows inside brackets [], so it's obvious that the data was actually generated.
2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated.
3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced.

Bug: 11863
Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92
Reviewed-on: https://code.wireshark.org/review/12468
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-12-09 16:59:01 +00:00
Diederik de Groot 9a59cd8243 Skinny: packet-skinny
Fix messages generated by 894X phones, which do not always include all fields
Revert accidental change by using of an older packet-skinny.c.in file

Change-Id: I4c6f0ef053579cbbd0c15e90b44dda6a6b173d0d
Reviewed-on: https://code.wireshark.org/review/12478
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:40:44 +00:00
Michael Mann 31a54708f4 new_register_dissector -> register_dissector for dissector directory.
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c
Reviewed-on: https://code.wireshark.org/review/12485
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:38:06 +00:00
Michael Mann 443a7ed259 new_create_dissector_handle -> create_dissector_handle for dissector directory.
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now.

Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f
Reviewed-on: https://code.wireshark.org/review/12484
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:37:36 +00:00
Michael Mann 55fa72224a new_create_dissector_handle_with_name -> create_dissector_handle_with_name
Change-Id: I32d30ada66ee68782194905a8aa669c07f0dc204
Reviewed-on: https://code.wireshark.org/review/12482
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-12-09 03:13:04 +00:00
Michael Mann a391a70b3b "new" dissector API -> dissector API for ASN.1 dissectors.
Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220
Reviewed-on: https://code.wireshark.org/review/12480
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:12:23 +00:00
Rishi Dev Singh 632f9ff82b Adding Zigbee dissectors for Groups Cluster and Scenes Cluster.
Change-Id: Iac72e5383b623e424ff28d61ff3bdc37ac95fab7
Reviewed-on: https://code.wireshark.org/review/12369
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-08 11:06:55 +00:00
Alexis La Goutte 032c33e998 btavdtp: fix An unconditional 'break' within a loop found by PVS Studio (V612)
Change-Id: Ic96f670bd4b039e12cdd467b8cc59470dd1553f3
Reviewed-on: https://code.wireshark.org/review/12331
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-07 07:15:58 +00:00
Balint Reczey 9a9b1c9bba Spelling fixes for errors found by lintian
Change-Id: I889283902875193f4d3f3fd59788f59f8d9bcc20
Reviewed-on: https://code.wireshark.org/review/11945
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-07 07:11:54 +00:00
Alexis La Goutte b259d763a2 v5ua: The 'then' statement is equivalent to the 'else' statement found by PVS Studio (V523)
Change-Id: I0aa35944dbae45477a9db365f30cf24355f5328d
Reviewed-on: https://code.wireshark.org/review/12454
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-07 01:21:49 +00:00
Alexis La Goutte 0d2fce1189 MIP6: Don't no need to have a another subtree (with wrong lenght for LLA
Bug: 10627
Change-Id: Ia6940ef7624a92d453cada6693bcd7f4e145a5b6
Reviewed-on: https://code.wireshark.org/review/12453
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-07 01:19:12 +00:00
Gerald Combs 89594f0ef8 [Automatic update for 2015-12-06]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I70fd3f5a9f8f53ea6a086b521c8f05d33815516f
Reviewed-on: https://code.wireshark.org/review/12450
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-06 16:11:07 +00:00
Michael Tüxen d382c7d321 SCTP: It is odd that the body of dissect_heartbeat_ack_chunk' function is fully equivalent to the body of 'dissect_heartbeat_chunk' function found by PVS Studio (V524)
This is just a cosmetic change, which makes sense. No funtional
change.

Change-Id: Id24d162379093207863608e70f405e66f789276c
Reviewed-on: https://code.wireshark.org/review/12440
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Tüxen
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-06 02:59:50 +00:00
Guy Harris 4348d4dd34 Type cleanups.
dfilter_macro_apply_recurse() returns either NULL or a pointer to
freshly-allocated memory, so it doesn't return a const pointer.
dfilter_macro_apply() calls dfilter_macro_apply_recurse(), so it doesn't
return a const pointer, either.

In dfilter_compile(), have separate variables for the filter handed in
and the macro-expanded filter, the former being const gchar * and the
latter being gchar *.

Change-Id: I191549bf0ff6c09c1278a98432a907c93d5e0e74
Reviewed-on: https://code.wireshark.org/review/12446
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05 20:41:32 +00:00
Guy Harris b3fa4f34f4 Undoing base-64 encoding is not decryption.
For now, we don't change the name of the preference, but we *do* change
the description of the preference and the name of the variable.

Change-Id: I1f80b2e7187679dca787fda5f3d06e9d30536ddc
Reviewed-on: https://code.wireshark.org/review/12444
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05 17:44:55 +00:00