metze/wireshark/wip.git
3 years agomake-version: Silence one diagnostic message with a verbose option
João Valverde [Wed, 3 Feb 2016 14:46:17 +0000 (14:46 +0000)]
make-version: Silence one diagnostic message with a verbose option

Change-Id: If8b9d7e356ebfe2cbb263a4cb67b18bafdd1b8ee
Reviewed-on: https://code.wireshark.org/review/13690
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agofuzz-test: Print the memory limit if ASan is enabled.
Gerald Combs [Wed, 3 Feb 2016 21:15:57 +0000 (13:15 -0800)]
fuzz-test: Print the memory limit if ASan is enabled.

Update the 'ulimit -v' FAQ URL while we're here.

Change-Id: I0e1b007295bf609d7a585087b00c97eae01501c2
Reviewed-on: https://code.wireshark.org/review/13696
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago[text2pcap] Fix parsing of hash sign at the end of the line
Vasil Velichckov [Thu, 14 Jan 2016 15:55:51 +0000 (17:55 +0200)]
[text2pcap] Fix parsing of hash sign at the end of the line

Change-Id: I4ff1ef28aba353fd7548cb5c0603fc29479aa854
Reviewed-on: https://code.wireshark.org/review/13294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoRTPS: Added custom type dissection support for RTPS batches
Juanjo Martin [Tue, 19 Jan 2016 10:48:20 +0000 (11:48 +0100)]
RTPS: Added custom type dissection support for RTPS batches

In RTPS, regular samples are serialized with the format
<encapsulation, serialized data> and thus, the dissection of the
encapsulation was suggested to be done in the custom dissector.

However, batches are serializing the encapsulation only once as
<encapsulation, sample 1, sample 2>. This makes us need to dissect
the encapsulation in the RTPS dissector and providing as (void*) data
to the custom dissector. This way we support the regular samples
dissection as well as the batches dissection.

I have defined rtps_dissector_data in packet-rtps.h and I suggest
we include that header file when we want to write a custom dissector.

Bug: 12029
Change-Id: I74ed4c31484f9a99ad6c44c6c34cc52be2adb7c8
Reviewed-on: https://code.wireshark.org/review/13413
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>
3 years agoCouchbase: Dissect multi-path mutation responses
Dave Rigby [Wed, 3 Feb 2016 12:32:25 +0000 (12:32 +0000)]
Couchbase: Dissect multi-path mutation responses

Multi-path mutation responses can have a variable number of values
encoded in them:

- Successful requests have 0..N values, one for each mutation which
  wishes to return a value (e.g. SUBDOC_COUNTER)

- Unsuccessful requests have 1 value, specifying the index and status
  of the first failing mutation

Add support for decoding a variable number of response values.

Change-Id: Ia1f682f7f701829bd808a44ee142ffe912095e15
Reviewed-on: https://code.wireshark.org/review/13688
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoFix memleaks related to get_dirname
Peter Wu [Wed, 3 Feb 2016 17:28:46 +0000 (18:28 +0100)]
Fix memleaks related to get_dirname

get_dirname may return NULL instead of the original string, so avoid
patterns like get_dirname(strdup(x)). Writing to
cf_path.toUtf8().data() is fine btw, toUtf8() returns new memory.

This fixes two memleak reported by LeakSanitizer via fileset_add_dir and
MainWindow::captureFileReadFinished (both via cf_callback_invoke).

Change-Id: I0f1528763e77e1f55b54b6674c890a9d02302ee8
Reviewed-on: https://code.wireshark.org/review/13691
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoCIP/ENIP: Enhance Info column display
D. Ulis [Mon, 1 Feb 2016 03:36:58 +0000 (22:36 -0500)]
CIP/ENIP: Enhance Info column display

1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed.
2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths.
3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic.
4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|".
5. CIP: Add preference to enable/disable "Display enhanced Info column data"

Change-Id: I7e95bc144588c0925137e01abbc814babb494d19
Reviewed-on: https://code.wireshark.org/review/13632
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>
3 years ago[airpdcap] Add support to decrypt TDLS traffic
Cedric Izoard [Tue, 2 Feb 2016 12:26:08 +0000 (13:26 +0100)]
[airpdcap] Add support to decrypt TDLS traffic

- When scanning for keys, check for TDLS action frames
  (need to have TLDS response or confirm to derive the key)
- When deriving PTK, also check MIC to ensure the key has been correctly
  computed.
- As SA is between two STAs (and not STA and AP), store highest MAC
  address in sa.bssid, and the other one in sa.sta
  => Add new function (AirPDcapGetSaAddress) that will check for TDLS
  case.
- Add test in decryption suite

Bug: 11312
Change-Id: Ieccb6a23a0ffbf3b705dac9b67c856ae2d3eeca9
Reviewed-on: https://code.wireshark.org/review/13664
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>
3 years agoOSPF: Wrong interpretation of Instance ID value in OSPFv3 packet
Alexis La Goutte [Wed, 3 Feb 2016 21:21:57 +0000 (22:21 +0100)]
OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet

Reported by Garri

Bug:12072
Change-Id: I6f35bdcd54f71138e58048086bf291e5be7967dd
Reviewed-on: https://code.wireshark.org/review/13697
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoSync ASN.1 templates and generated code (spelling fixes)
João Valverde [Wed, 3 Feb 2016 23:02:08 +0000 (23:02 +0000)]
Sync ASN.1 templates and generated code (spelling fixes)

Change-Id: Ib6ed980ecf5d5418349946c8da26f81fe1c02dd1
Reviewed-on: https://code.wireshark.org/review/13701
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoLCSAP: Sync ASN.1 template and add missing braces
João Valverde [Wed, 3 Feb 2016 22:29:46 +0000 (22:29 +0000)]
LCSAP: Sync ASN.1 template and add missing braces

Change-Id: Iaddfa41e71ea28dd935bf777214764381928baa5
Reviewed-on: https://code.wireshark.org/review/13700
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoSquelch warnings from compilers that don't know that (a%b) is always < b.
Guy Harris [Wed, 3 Feb 2016 21:50:50 +0000 (13:50 -0800)]
Squelch warnings from compilers that don't know that (a%b) is always < b.

Change-Id: I71efc87ad6931e5bbac0cbc0f5602eb7101fde54
Reviewed-on: https://code.wireshark.org/review/13699
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoGet rid of an unused variable.
Guy Harris [Wed, 3 Feb 2016 21:47:15 +0000 (13:47 -0800)]
Get rid of an unused variable.

Change-Id: I2f99327feafe95524c24718b320a8490779ad6c5
Reviewed-on: https://code.wireshark.org/review/13698
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoextcap: do not leak "version" field
Peter Wu [Wed, 3 Feb 2016 17:38:53 +0000 (18:38 +0100)]
extcap: do not leak "version" field

Caught by LeakSanitizer:

    Direct leak of 18 byte(s) in 3 object(s) allocated from:
        #0 0x55ec8c5ffec8 in __interceptor_malloc (run/wireshark+0x145dec8)
        #1 0x7f4d021e4328 in g_malloc /build/src/glib-2.46.2/glib/gmem.c:94
        #2 0x7f4d021fd0de in g_strdup /build/src/glib-2.46.2/glib/gstrfuncs.c:363
        #3 0x55ec8c6ce514 in extcap_parse_interface_sentence extcap_parser.c:670:26
        #4 0x55ec8c6ce7ad in extcap_parse_interfaces extcap_parser.c:683:13
        #5 0x55ec8c6b6781 in interfaces_cb extcap.c:313:5
        #6 0x55ec8c6b4ce6 in extcap_foreach extcap.c:206:26
        #7 0x55ec8c6b62a6 in extcap_interface_list extcap.c:415:5
        #8 0x55ec8c6b7fab in extcap_register_preferences extcap.c:437:9
        #9 0x55ec8c63104a in main wireshark-qt.cpp:847:5
        #10 0x7f4ce8f4460f in __libc_start_main (/usr/lib/libc.so.6+0x2060f)
        #11 0x55ec8c569ed8 in _start (run/wireshark+0x13c7ed8)

Change-Id: I0ef89e647b2cc9aab495a80f6c638e9b67cf3ad1
Reviewed-on: https://code.wireshark.org/review/13692
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoAdd Userlog dissector
Jun Wang [Sat, 22 Aug 2015 13:55:31 +0000 (09:55 -0400)]
Add Userlog dissector

Userlog is user flow logs of H3C device.
Flow logging records users' access to the extranet. The device classifies and
calculates flows through the 5-tuple information, which includes source IP address,
destination IP address, source port, destination port, and protocol number,
and generates user flow logs. Flow logging records the 5-tuple information of
the packets and number of the bytes received and sent. With flow logs, administrators
can track and record accesses to the network, facilitating the availability and
security of the network.

examplecapture: https://wiki.wireshark.org/SampleCaptures#UserLog

Bug: 11878
Change-Id: If3b5ca75bdd6cd8dc12af4a35401c5a6aa193a73
Reviewed-on: https://code.wireshark.org/review/8148
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>
3 years agoAdd AES-CMAC encryption support
Cedric Izoard [Mon, 1 Feb 2016 16:11:00 +0000 (17:11 +0100)]
Add AES-CMAC encryption support

-Add AES-CMAC encryption need to check MIC when deriving TDLS keys (802.11)
-Tested against NIST test vector for AES128-CMAC

Bug: 11312
Change-Id: Id4fd839bdedd3aa135823334e59d98271aea7c2b
Reviewed-on: https://code.wireshark.org/review/13663
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>
3 years agoAdd functions for SHA256 and HMAC-SHA256
Cedric Izoard [Fri, 22 Jan 2016 15:42:59 +0000 (16:42 +0100)]
Add functions for SHA256 and HMAC-SHA256

- Use same API as SHA-1
- Tested against NIST's test vectors (byte oriented implementation)

Bug: 11312
Change-Id: I7fea7d13c43da059138153b17de7084ef9d81ac5
Reviewed-on: https://code.wireshark.org/review/13662
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>
3 years agoM3AP: fix dissection of IPAddress field
Pascal Quantin [Wed, 3 Feb 2016 14:37:01 +0000 (15:37 +0100)]
M3AP: fix dissection of IPAddress field

Bug: 12070
Change-Id: Ib516cc3ea7e00a6c4fe1661b9c78b0f6c6a25da6
Reviewed-on: https://code.wireshark.org/review/13689
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: Anders Broman <a.broman58@gmail.com>
3 years agoFixed bug when the actual remaining command data is less than the size
richardk [Fri, 29 Jan 2016 08:13:13 +0000 (09:13 +0100)]
Fixed bug when the actual remaining command data is less than the size
specified in the EtherCAT mailbox header.

Change-Id: I661c62af915b9455da1df49f5746953d41dc527a
Reviewed-on: https://code.wireshark.org/review/13595
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoNo need for execute bit on setuid-root.pl.in
João Valverde [Tue, 2 Feb 2016 01:30:45 +0000 (01:30 +0000)]
No need for execute bit on setuid-root.pl.in

Change-Id: I099fbd73b5a192375c8b99f0997c7074c97d0cb9
Reviewed-on: https://code.wireshark.org/review/13673
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoOpenFlow (v1): fix exists multiple times with NOT compatible types
Alexis La Goutte [Wed, 3 Feb 2016 06:21:21 +0000 (07:21 +0100)]
OpenFlow (v1): fix exists multiple times with NOT compatible types

'openflow.ofp_match.pad' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES

Change-Id: I514bdf6a77ddbf9f8d7e614ea6f4ecf04a664453
Reviewed-on: https://code.wireshark.org/review/13677
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoMPLS : fix exists multiple times with NOT compatible types
Alexis La Goutte [Wed, 3 Feb 2016 06:39:00 +0000 (07:39 +0100)]
MPLS : fix exists multiple times with NOT compatible types

'ospf.mpls.bc' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT8
'ospf.v3.lsa.link_local_interface_address.ipv6' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6

Change-Id: I6a014c072c05bdb30ae30d56a6718062fccc75c7
Reviewed-on: https://code.wireshark.org/review/13681
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoHTTP2: fix 'http2' exists multiple times with NOT compatible types: FT_NONE and FT_PR...
Alexis La Goutte [Wed, 3 Feb 2016 06:06:07 +0000 (07:06 +0100)]
HTTP2: fix 'http2' exists multiple times with NOT compatible types: FT_NONE and FT_PROTOCOL

Change-Id: I5cb75b253c908994420107330743e808f57af2a4
Reviewed-on: https://code.wireshark.org/review/13676
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agopcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with...
Alexis La Goutte [Wed, 3 Feb 2016 06:36:57 +0000 (07:36 +0100)]
pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4

Change-Id: I9f6e713a50e0c73d0ecc7a66b62dffe270d4a35f
Reviewed-on: https://code.wireshark.org/review/13678
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoCAPWAP: fix 'capwap.control.fortinet.ebptag.ebp' exists multiple times with NOT compa...
Alexis La Goutte [Wed, 3 Feb 2016 06:37:36 +0000 (07:37 +0100)]
CAPWAP: fix 'capwap.control.fortinet.ebptag.ebp' exists multiple times with NOT compatible types: FT_ETHER and FT_UINT8

Change-Id: I844ffef50c69f06dca06569851fafe008ccc4971
Reviewed-on: https://code.wireshark.org/review/13679
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoMS NLB: fix msnlb.reserved' exists multiple times with NOT compatible types: FT_NONE...
Alexis La Goutte [Wed, 3 Feb 2016 06:41:08 +0000 (07:41 +0100)]
MS NLB: fix msnlb.reserved' exists multiple times with NOT compatible types: FT_NONE and FT_BYTES

Change-Id: Iff719dce3340c11b7fb874f323eedc0401096262
Reviewed-on: https://code.wireshark.org/review/13682
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>
3 years agosuite-decrypt: fix mixed indent (use tabs)
Alexis La Goutte [Wed, 3 Feb 2016 09:29:12 +0000 (10:29 +0100)]
suite-decrypt: fix mixed indent (use tabs)

Change-Id: I80f2afb6e0cc44af6466fa255e91a40b29c4ca13
Reviewed-on: https://code.wireshark.org/review/13685
Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agosuite-mergecap: fix indent (use tabs)
Alexis La Goutte [Wed, 3 Feb 2016 09:27:46 +0000 (10:27 +0100)]
suite-mergecap: fix indent (use tabs)

Change-Id: I9b3fb7d09d8dc90366167b1072dcdd4efc6f0516
Reviewed-on: https://code.wireshark.org/review/13684
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoSuite test: fix modelines for bash script (emac)
Alexis La Goutte [Wed, 3 Feb 2016 09:27:09 +0000 (10:27 +0100)]
Suite test: fix modelines for bash script (emac)

c-basic-offset -> sh-basic-offset

Change-Id: I16b19b608fbdb7f0408f7c31871fae746c8c4f50
Reviewed-on: https://code.wireshark.org/review/13683
Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoGTP session tracker removing frame info fix
Gloria Pozuelo [Wed, 3 Feb 2016 09:40:57 +0000 (10:40 +0100)]
GTP session tracker removing frame info fix

Change-Id: I55e4a7a70e61d2178ee75dfeb3a201de8b12e34d
Reviewed-on: https://code.wireshark.org/review/13686
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoFix Qt4 moc option argument and add build parametrization
João Valverde [Tue, 2 Feb 2016 19:00:37 +0000 (19:00 +0000)]
Fix Qt4 moc option argument and add build parametrization

Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2
Reviewed-on: https://code.wireshark.org/review/13671
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoAdds calculation of preamble length and frame duration.
Simon Barber [Thu, 7 Jan 2016 01:23:00 +0000 (17:23 -0800)]
Adds calculation of preamble length and frame duration.

Change-Id: Ie7077b675a242a60ee859098a504707cc61345db
Reviewed-on: https://code.wireshark.org/review/13090
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoTHRIFT: add dissection of T_MAP
Jason Heimann [Tue, 2 Feb 2016 08:40:28 +0000 (00:40 -0800)]
THRIFT: add dissection of T_MAP

Change-Id: I58192af77c8e9af94183e5d82d282e22dc91b49e
Reviewed-on: https://code.wireshark.org/review/13659
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>
3 years agoPass smb2_info_t structure to heuristic subdissectors.
Michael Mann [Wed, 3 Feb 2016 00:04:01 +0000 (19:04 -0500)]
Pass smb2_info_t structure to heuristic subdissectors.

Bug: 11933
Change-Id: I7ac03166c4c69a2366da26c44a89aee60116ac7f
Reviewed-on: https://code.wireshark.org/review/13674
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agolemon: Use automake rules
João Valverde [Mon, 1 Feb 2016 17:09:13 +0000 (17:09 +0000)]
lemon: Use automake rules

Change-Id: I5110e3781682e003cc4e60a592694dc9e8930456
Reviewed-on: https://code.wireshark.org/review/13641
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoBGP-LS: fix 'TE Default Metric TLV' and 'IGP Metric TLV' length
Francesco Fondelli [Tue, 2 Feb 2016 08:46:15 +0000 (09:46 +0100)]
BGP-LS: fix 'TE Default Metric TLV' and 'IGP Metric TLV' length
parsing

Change-Id: I55d0b435ae1b12e14a20dd9ea18ba05188b0e378
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/13666
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoRemove GNU make extension
João Valverde [Tue, 2 Feb 2016 01:47:16 +0000 (01:47 +0000)]
Remove GNU make extension

Only marginally useful in this case.

Change-Id: I62eace56128b10f409b6139599f098e6604675cd
Reviewed-on: https://code.wireshark.org/review/13672
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoUpdate list of field types compatible for comparisons
Pascal Quantin [Tue, 2 Feb 2016 21:52:09 +0000 (22:52 +0100)]
Update list of field types compatible for comparisons

Change-Id: Ic356773f780b88f0a7d8735167dec240fa5bdbc2
Reviewed-on: https://code.wireshark.org/review/13670
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoHiQnet parameters and Wireshark fields have data types; use them.
Guy Harris [Tue, 2 Feb 2016 19:54:16 +0000 (11:54 -0800)]
HiQnet parameters and Wireshark fields have data types; use them.

Don't just display every field that's not a STRING as a lump of hex
bytes; display them (and make them filterable) according to their data
type.

Change-Id: I5717c45bc970616ba9438277e1bcaae46c3cbdf8
Reviewed-on: https://code.wireshark.org/review/13669
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoDisplay Filter Expression dialog updates.
Gerald Combs [Mon, 1 Feb 2016 21:30:51 +0000 (13:30 -0800)]
Display Filter Expression dialog updates.

De Morganize an expression.

Clear the selection at start. Selecting the first item (104apci) seems
to confuse people.

Change-Id: I8fcd1f068f1801042a2658940175b46bdfb2b462
Reviewed-on: https://code.wireshark.org/review/13647
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agousb: don't THROW() an exception from a dissector
Martin Kaiser [Sun, 31 Jan 2016 14:58:34 +0000 (15:58 +0100)]
usb: don't THROW() an exception from a dissector

the code in question deals with the scenario where the length field's
value is larger than the number of remaining bytes

we can simply stop the dissection if truncation of the data is expected

if not, we continue disecting and we'll get an exception when we reached
the end of the data...

Change-Id: I3f29df694d9ea7d41f19511d267ef6b785527e3c
Reviewed-on: https://code.wireshark.org/review/13624
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
3 years ago[GSM MAP] Update to V13.2.0 (2015-12)
AndersBroman [Tue, 2 Feb 2016 14:07:14 +0000 (15:07 +0100)]
[GSM MAP] Update to V13.2.0 (2015-12)

Change-Id: I2cc8b1c4094f2781c7674a22836ec8de4e24ca0d
Reviewed-on: https://code.wireshark.org/review/13665
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoprefs: Add missing newline for filter expressions heading
Stig Bjørlykke [Tue, 2 Feb 2016 11:18:42 +0000 (12:18 +0100)]
prefs: Add missing newline for filter expressions heading

Change-Id: I005904ffddf4542248c1994a0786340383b62192
Reviewed-on: https://code.wireshark.org/review/13660
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years agoGTP: Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Sun, 31 Jan 2016 10:41:35 +0000 (11:41 +0100)]
GTP: Fix Dereference of null pointer found by Clang analyzer

Change-Id: Idfa4d114f39c3fe9a84f9b551488127c51aa66aa
Reviewed-on: https://code.wireshark.org/review/13621
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gloria Pozuelo <gloria.pozuelo@bics.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoframe: Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Sun, 31 Jan 2016 11:04:09 +0000 (12:04 +0100)]
frame: Fix Dereference of null pointer found by Clang analyzer

Change-Id: I37323975c1fa4ba5c08afb73d72159c7c36fdb9a
Reviewed-on: https://code.wireshark.org/review/13623
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoQUIC: fix some display field typo...
Alexis La Goutte [Mon, 1 Feb 2016 20:41:41 +0000 (21:41 +0100)]
QUIC: fix some display field typo...

Change-Id: I5dbfe657db29b131b2ed5c6233becbc4f328157f
Reviewed-on: https://code.wireshark.org/review/13645
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoproto.c: fix indent (use tabs)
Alexis La Goutte [Mon, 1 Feb 2016 20:50:07 +0000 (21:50 +0100)]
proto.c: fix indent (use tabs)

Change-Id: I1ebd31a694fde845e1ca4e125c1ed31bda7c00a8
Reviewed-on: https://code.wireshark.org/review/13646
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoCreate an extended converstaion hastable taking more address information
AndersBroman [Mon, 1 Feb 2016 12:00:29 +0000 (13:00 +0100)]
Create an extended converstaion hastable taking more address information
into consideration.
This makes it possible to differentiate between packets on different
vlans and can be expanded to handle tunnels.

Change-Id: Id36e71028702d1ba4b6b3047e822e5a62056a1e2
Reviewed-on: https://code.wireshark.org/review/13637
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoAdd to the Info column for the stuff in COTP CR and CC PDUs.
Guy Harris [Tue, 2 Feb 2016 05:01:45 +0000 (21:01 -0800)]
Add to the Info column for the stuff in COTP CR and CC PDUs.

Change-Id: I581ce1e670c3e1e13a871d3111335e3647165d49
Reviewed-on: https://code.wireshark.org/review/13658
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoAdd proto_tree_add_item_ret_string() routine.
Guy Harris [Tue, 2 Feb 2016 04:56:56 +0000 (20:56 -0800)]
Add proto_tree_add_item_ret_string() routine.

It adds string-type fields to the protocol tree and returns the value of
the string.

Add the new bitmask-adding routines to the Debian symbol list while
we're at it.

Change-Id: Idaeec44c9cd373588cadce85010f3eaf1f3febb5
Reviewed-on: https://code.wireshark.org/review/13657
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoQt: Make moc less chatty
João Valverde [Wed, 20 Jan 2016 00:06:17 +0000 (00:06 +0000)]
Qt: Make moc less chatty

Change-Id: Ide644647271663517ddc6a84ffe61d58dabd6bd2
Reviewed-on: https://code.wireshark.org/review/13629
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>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoAdd silent build rules for setuid-root.pl
João Valverde [Wed, 20 Jan 2016 00:36:31 +0000 (00:36 +0000)]
Add silent build rules for setuid-root.pl

Change-Id: Id99c8d545b8ae53cf4dac0ccf54226df07f596bd
Reviewed-on: https://code.wireshark.org/review/13627
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoAdd configure-time synchronous DNS warnings.
Gerald Combs [Wed, 6 Jan 2016 18:48:53 +0000 (10:48 -0800)]
Add configure-time synchronous DNS warnings.

In CMake and Autotools, warn the user when neither c-ares nor ADNS is
present. Note that we might want to make asynchronous DNS a requirement.

Change-Id: Ia9cce56cc2286cdc72303fc1410f899f9c320d84
Reviewed-on: https://code.wireshark.org/review/13080
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoQuick fix for the build.
Guy Harris [Mon, 1 Feb 2016 23:50:45 +0000 (15:50 -0800)]
Quick fix for the build.

(The routing token/cookie needs to be dissected better.)

Change-Id: I33464a846cda711aa430ba8f71dfe1959de3b7f9
Reviewed-on: https://code.wireshark.org/review/13651
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoGet rid of unused redundant OSI COTP dissector.
Guy Harris [Mon, 1 Feb 2016 23:35:10 +0000 (15:35 -0800)]
Get rid of unused redundant OSI COTP dissector.

packet-ositp.c is more complete and is what's used, so we don't need
packet-x224.c.

Change-Id: Id3409d7b2af0e4ecbc64c74bb6d1ed9ea8f31738
Reviewed-on: https://code.wireshark.org/review/13650
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoRemove trailing whitespace.
Guy Harris [Mon, 1 Feb 2016 23:21:16 +0000 (15:21 -0800)]
Remove trailing whitespace.

Change-Id: I3a684d47fe0263dc1453eab85704e725bab673a5
Reviewed-on: https://code.wireshark.org/review/13649
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoAdd heuristic dissectors for the variable part of COTP CR and CC PDUs.
Guy Harris [Mon, 1 Feb 2016 23:19:10 +0000 (15:19 -0800)]
Add heuristic dissectors for the variable part of COTP CR and CC PDUs.

Add tables for heuristic dissectors, and add dissectors for the stuff
Microsoft puts there for RDP; they're violating the COTP spec, but I
guess they're stuck because they're using TP0, which doesn't support
user data.

While we're at it, add variants of proto_tree_add_bitmask() and
proto_tree_add_bitmask_flags() that return the bitmask, for use by
callers.

A side-effect of the change is that the proto_tree_add_bitmask routines
no longer treat the encoding as a Boolean, so we have to pass
ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN, not just some non-zero or zero
value.  Do so.

Rename ositp_decode_CC() to ositp_decode_CR_CC(), to note that it
decodes both CR and CC PDUs.

Bug: 2626
Change-Id: If5fa2a6dfecd9eb99c1cb8104f2ebceccf1e57c2
Reviewed-on: https://code.wireshark.org/review/13648
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoFix leaks when spawning extcap processes
Mikael Kanstrup [Sun, 31 Jan 2016 19:55:55 +0000 (20:55 +0100)]
Fix leaks when spawning extcap processes

Valgrind reports leaks like these when spawning extcap processes (for
example when displaying or refreshing interface list with extcap
interfaces present):

3,917 (464 direct, 3,453 indirect) bytes in 29 blocks are definitely lost in loss record 58,301 of 58,638
   at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0xA6D2610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA6E822D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA6B913B: g_error_new_valist (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA6B94ED: g_set_error (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA710B03: ??? (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA710E17: g_spawn_sync (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0x44C677: extcap_foreach (extcap.c:199)
   by 0x44CCAD: extcap_interface_list (extcap.c:413)
   by 0x72B548: capture_interface_list (capture_ifinfo.c:126)
   by 0x7336FA: scan_local_interfaces (iface_lists.c:141)
   by 0x55F01F: WiresharkApplication::refreshLocalInterfaces() (wireshark_application.cpp:898)
   ...

Change-Id: If8f750f5f8fa42a6f0884bb0e6bbbd71bd8f68aa
Reviewed-on: https://code.wireshark.org/review/13631
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agomain_toolbar: fix redundant redeclaration of ‘cfile’ [-Wredundant-decls]
Alexis La Goutte [Mon, 1 Feb 2016 11:14:13 +0000 (12:14 +0100)]
main_toolbar: fix redundant redeclaration of ‘cfile’ [-Wredundant-decls]

Change-Id: I25d88852f87fdd8f760f29f9e5fdeb7a63391b87
Reviewed-on: https://code.wireshark.org/review/13636
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>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agopre-commit: ignore ASN.1 template files
Pascal Quantin [Mon, 1 Feb 2016 14:14:36 +0000 (15:14 +0100)]
pre-commit: ignore ASN.1 template files

They trigger false positives

Change-Id: I0cc22e0600461475e67610ac7e9dc687822c87f2
Reviewed-on: https://code.wireshark.org/review/13639
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoPIM: fix IPv4/IPv6 filters using the same name for different address type
Pascal Quantin [Mon, 1 Feb 2016 17:30:52 +0000 (18:30 +0100)]
PIM: fix IPv4/IPv6 filters using the same name for different address type

Bug: 12061
Change-Id: I42828e1f87abebd6d9a4f893ff28aa50ca7ccbff
Reviewed-on: https://code.wireshark.org/review/13640
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>
3 years agoBGP: Link-State extensions for Segment Routing as per
Francesco Fondelli [Thu, 28 Jan 2016 15:35:20 +0000 (16:35 +0100)]
BGP: Link-State extensions for Segment Routing as per
draft-gredler-idr-bgp-ls-segment-routing-ext-01

Bug: 12060
Change-Id: I53c837ac5c195bdee716a48d8494633b663e751d
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/13579
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoLTE RRC: add system info modification for eDRX UEs in info column
Pascal Quantin [Mon, 1 Feb 2016 14:09:10 +0000 (15:09 +0100)]
LTE RRC: add system info modification for eDRX UEs in info column

Change-Id: I8041bf74c37665f1fd70f0d8c39157e09f79d96c
Reviewed-on: https://code.wireshark.org/review/13638
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoIP: Don't check length if in a ICMP error packet
Stig Bjørlykke [Fri, 29 Jan 2016 09:59:18 +0000 (10:59 +0100)]
IP: Don't check length if in a ICMP error packet

Change-Id: I5fd81aec13655b9c53df9f0002441c3afc51c6e9
Reviewed-on: https://code.wireshark.org/review/13597
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Jaap Keuter <jaap.keuter@xs4all.nl>
3 years agobtatt: Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Sun, 31 Jan 2016 10:51:17 +0000 (11:51 +0100)]
btatt: Fix Dereference of null pointer found by Clang analyzer

Change-Id: I3c55af73ba989080cf6dfe206d25a6d4923ac7f1
Reviewed-on: https://code.wireshark.org/review/13622
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoextcap: Correct save for file arguments
Roland Knall [Mon, 1 Feb 2016 08:53:31 +0000 (09:53 +0100)]
extcap: Correct save for file arguments

Also add check to has_configuration

Change-Id: Ia0ffbd3bf68ad51c26bc75b5ee179db179e22bd4
Reviewed-on: https://code.wireshark.org/review/13635
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoextcap: Add Save functionality to options dialog
Roland Knall [Tue, 29 Dec 2015 06:57:36 +0000 (07:57 +0100)]
extcap: Add Save functionality to options dialog

This patch creates the functionality of saving all parameters
for extcap devices in the general preference section.

For now, multiselect and fileselect do not save their values
but patches for this will be provided in the future

Also, all preferences are stored as strings to make handling
easier. This might change in the future, but for the first version
it will stick.

Restore to Defaults is not implemented as of yet, and will be
in a future version, once the preference storing is finalized

Bug: 11666
Change-Id: I178346405146d2e43f4f3481c05c92c0b3595af5
Reviewed-on: https://code.wireshark.org/review/13451
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoandroiddump: fix printf format warning.
Dario Lombardo [Fri, 29 Jan 2016 16:53:21 +0000 (17:53 +0100)]
androiddump: fix printf format warning.

Found by clang. Compiler warning:

warning: format specifies type 'void *' but the argument has type 'char *' [-Wformat-pedantic]

Change-Id: I7f370b06f98490cd6e363a9679a449420c8c8021
Reviewed-on: https://code.wireshark.org/review/13602
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
3 years ago[Automatic update for 2016-01-31]
Gerald Combs [Sun, 31 Jan 2016 16:05:46 +0000 (08:05 -0800)]
[Automatic update for 2016-01-31]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I7e8ade92cce819240ee8e40cfc63363185d9d944
Reviewed-on: https://code.wireshark.org/review/13625
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agosshdump: fix documentation issues.
Dario Lombardo [Wed, 27 Jan 2016 09:55:38 +0000 (10:55 +0100)]
sshdump: fix documentation issues.

Change-Id: I338842e8e66faf883e2533be195a79f34d5d1ee6
Reviewed-on: https://code.wireshark.org/review/13560
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoaim: allow SSL decryption
Peter Wu [Wed, 13 Jan 2016 00:48:34 +0000 (01:48 +0100)]
aim: allow SSL decryption

Very weak form of heuristics has been added based on the FLAP id byte,
but disabled by default. Make it possible to use this protocol in the
RSA keys list dialog.

Bug: 11990
Change-Id: I61f24ae9679c738194393bed0d012d2a752171b2
Reviewed-on: https://code.wireshark.org/review/13195
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>
3 years agoSwitch from QLibrary to ws_load_library.
Gerald Combs [Fri, 29 Jan 2016 18:26:28 +0000 (10:26 -0800)]
Switch from QLibrary to ws_load_library.

From the comments in qlibrary_win.cpp:

// We make the following attempts at locating the library:
[ ... ]
// Windows
// if (absolute)
//     fileName
//     fileName + ".dll"
// else
//     fileName + ".dll"
//     fileName

We were passing "riched20.dll" to QLibrary, which meant that it searched
for "riched20.dll.dll" first.

Switch to ws_load_library, which we use elsewhere and which has much
safer default behavior.

Change-Id: Ic8f0cf5686c9b1856d37e76be4404d6236c076e5
Reviewed-on: https://code.wireshark.org/review/13607
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoplugins: do not import symbols globally
Peter Wu [Wed, 13 Jan 2016 12:04:24 +0000 (13:04 +0100)]
plugins: do not import symbols globally

Clang's ASAN reported an ODR violation when plugins were loaded. Sure
enough, symbols did actually get loaded twice:

    ==5898==ERROR: AddressSanitizer: odr-violation (0x7fffd95a35e0):
      [1] size=7 'version' plugins/mate/plugin.c:19:31
      [2] size=6 'version' plugins/opcua/plugin.c:19:31

After this change, plugins cannot insert new symbols in the global
namespace.

Change-Id: Ib11f7263e9c586f8e7c1f8f5fb239b20d46ddd2f
Reviewed-on: https://code.wireshark.org/review/13260
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>
3 years agolemon: fix leak.
Dario Lombardo [Thu, 28 Jan 2016 17:26:20 +0000 (18:26 +0100)]
lemon: fix leak.

Found by clang's ccc-analyzer.

Change-Id: I04eaad73486a43a77c4f08cf519bbfe7d2d8c838
Reviewed-on: https://code.wireshark.org/review/13581
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoRLC LTE: upgrade dissector to v13.0.0
Pascal Quantin [Sun, 31 Jan 2016 10:39:14 +0000 (11:39 +0100)]
RLC LTE: upgrade dissector to v13.0.0

Change-Id: Ibe4586925ffe49f5aaab72956c40e123855a1a1e
Reviewed-on: https://code.wireshark.org/review/13620
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoFix memleaks on interface refresh when extcap configs exists
Mikael Kanstrup [Sun, 31 Jan 2016 06:40:33 +0000 (07:40 +0100)]
Fix memleaks on interface refresh when extcap configs exists

If there are extcap interfaces present then each time the capture
interfaces list is displayed or refreshed a number of extcap related
allocations are leaked.

Valgrind reports leaks like these:

2,007 (144 direct, 1,863 indirect) bytes in 6 blocks are definitely lost in loss record 64,328 of 65,138
   at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0xA6D2610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA6E822D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA6C94F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0x44C9AF: search_cb (extcap.c:451)
   by 0x44C6FC: extcap_foreach (extcap.c:204)
   by 0x44CDFF: extcap_get_if_configuration (extcap.c:473)
   by 0x44CE3C: extcap_has_configuration (extcap.c:489)
   by 0x654356: InterfaceTree::display() (interface_tree.cpp:199)
   by 0x6547DF: InterfaceTree::getInterfaceList() (interface_tree.cpp:252)
   by 0xBFCF2A5: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.2.1)
   by 0x563F9A: WiresharkApplication::allSystemsGo() (wireshark_application.cpp:914)
   by 0x4478D9: main (wireshark-qt.cpp:1373)

9,126 (432 direct, 8,694 indirect) bytes in 18 blocks are definitely lost in loss record 58,524 of 58,638
   at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
   by 0xA6D2610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA6E822D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0xA6C94F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
   by 0x44C9AF: search_cb (extcap.c:451)
   by 0x44C6FC: extcap_foreach (extcap.c:204)
   by 0x44CDFF: extcap_get_if_configuration (extcap.c:473)
   by 0x44CE3C: extcap_has_configuration (extcap.c:489)
   by 0x654356: InterfaceTree::display() (interface_tree.cpp:199)
   by 0xBFCF2A5: QMetaObject::activate(QObject*, int, int, void**) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.2.1)
   by 0x4A3214: MainWindow::on_actionCaptureRefreshInterfaces_triggered() (main_window_slots.cpp:3605)
   ...

Change-Id: I9433b8e36813cbef9dca5ab08074e985793f4d0d
Reviewed-on: https://code.wireshark.org/review/13617
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoRLC LTE: fix dissection of RLC AM PDUs with odd number of 15 bits LI
Pascal Quantin [Sun, 31 Jan 2016 10:25:53 +0000 (11:25 +0100)]
RLC LTE: fix dissection of RLC AM PDUs with odd number of 15 bits LI

There is no padding in that case

Change-Id: Ib0ce37c4fea76435b4cedfbd7d3d72420e4860eb
Reviewed-on: https://code.wireshark.org/review/13618
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoautotools: Add '-Qunused-arguments' to build flags (clang only).
João Valverde [Sun, 31 Jan 2016 05:02:18 +0000 (05:02 +0000)]
autotools: Add '-Qunused-arguments' to build flags (clang only).

CMake build is already using it.

Change-Id: Id0df316d41133bdb0483f3aa4c67d7a6b53aaf0c
Reviewed-on: https://code.wireshark.org/review/13616
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoautotools: Fix 'make dumpabi'
João Valverde [Sun, 31 Jan 2016 03:09:02 +0000 (03:09 +0000)]
autotools: Fix 'make dumpabi'

Broken by g265a41e.

Change-Id: I54069cbc3ca8151038f59f77cb2d0ec71635fb45
Reviewed-on: https://code.wireshark.org/review/13615
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoCAPWAP: fix indent typo
Alexis La Goutte [Thu, 28 Jan 2016 10:23:04 +0000 (11:23 +0100)]
CAPWAP: fix indent typo

Change-Id: Iae736048a17d2aae75f7ec7dcc516e86aa05f6bc
Reviewed-on: https://code.wireshark.org/review/13574
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoLCSAP: fix indent (use 2 spaces and add modelines)
Alexis La Goutte [Fri, 29 Jan 2016 18:58:37 +0000 (19:58 +0100)]
LCSAP: fix indent (use 2 spaces and add modelines)

Change-Id: I2aa1a2d0e20cca6c979d51135e7fe9ea7a084847
Reviewed-on: https://code.wireshark.org/review/13609
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>
3 years agoFixed Cisco Vendor IDs in IKEv2 dissector.
Xavier Brouckaert [Fri, 29 Jan 2016 18:18:58 +0000 (10:18 -0800)]
Fixed Cisco Vendor IDs in IKEv2 dissector.

Change-Id: Idb8fce8fae1b2b580f9ca7a9c71e430bfa7dfb44
Reviewed-on: https://code.wireshark.org/review/13606
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
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>
3 years agoCIP: fix no previous prototype for 'dissect_segment_network_production_inhibit_us...
Alexis La Goutte [Fri, 29 Jan 2016 19:09:37 +0000 (20:09 +0100)]
CIP: fix no previous prototype for 'dissect_segment_network_production_inhibit_us' [-Wmissing-prototypes]

Change-Id: Ic23b26f87f38db0a40213ce7c954c8618dc966eb
Reviewed-on: https://code.wireshark.org/review/13610
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>
3 years agoMEGACO: fix dissection of packets
Pascal Quantin [Sat, 30 Jan 2016 21:38:40 +0000 (22:38 +0100)]
MEGACO: fix dissection of packets

Bug introduced in g841f636

Bug: 12059
Change-Id: I02a33f95baf2670fb491c951ba85a1bacdeb6386
Reviewed-on: https://code.wireshark.org/review/13613
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: Michael Mann <mmann78@netscape.net>
3 years agoUpdate filter bookmark icons.
Gerald Combs [Sat, 30 Jan 2016 00:45:04 +0000 (16:45 -0800)]
Update filter bookmark icons.

Separate the capture and display filter bookmark icons. Make the capture
icon green to match(-ish) the active capture icon. Tested on nice+new
and janky+old displays.

Change-Id: I6ed532c8a49da50fe2a7de3d8fbd0b1af7623b4a
Reviewed-on: https://code.wireshark.org/review/13612
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years agoNo need for a routine to return a GSList of extensions for compressed files.
Guy Harris [Fri, 29 Jan 2016 21:15:41 +0000 (13:15 -0800)]
No need for a routine to return a GSList of extensions for compressed files.

Just use the table - or an empty table if we're not including the
compressed file extensions.

Change-Id: I0b3ef3987e1986953f2957c27c84b2ee59b90bc0
Reviewed-on: https://code.wireshark.org/review/13611
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoAdd a note about Dell Backup and Recovery.
Gerald Combs [Fri, 29 Jan 2016 17:03:52 +0000 (09:03 -0800)]
Add a note about Dell Backup and Recovery.

Change-Id: I5600b1aabb8bb4c1dc2135ae01b1a5070d2a2ccb
Reviewed-on: https://code.wireshark.org/review/13603
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agogsm_map: decode SRISM v1 and v2 result
Luke Mewburn [Thu, 28 Jan 2016 06:19:13 +0000 (17:19 +1100)]
gsm_map: decode SRISM v1 and v2 result

Fix decoding of sendRoutingInfoForSM (SRISM)
application contexts version 1 and version 2.
Use a (slightly modified) version of the ASN.1 from
  ETS 300 599: December 2000 (GSM 09.02 version 4.19.1), clause 14.7.6
which has LocationInfoWithLMSI that is incompatible with
application context version 3 in
  3GPP TS 29.002 version 3.20.0 Release 1999, clause 17.7.6.

Bug: 9622
Ping-Bug: 9704
Change-Id: Icc9a0a1743a6eb4c907f4cab3fb2137db139ad74
Reviewed-on: https://code.wireshark.org/review/13572
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agotools: improve debian-setup with optional packages.
Dario Lombardo [Fri, 29 Jan 2016 09:13:57 +0000 (10:13 +0100)]
tools: improve debian-setup with optional packages.

Change-Id: Ie7480b0c5297039aadfa253fce84c66b0e217814
Reviewed-on: https://code.wireshark.org/review/13596
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
3 years agolemon: Have Makefile.am handle warnings as errors correctly
João Valverde [Fri, 29 Jan 2016 02:41:29 +0000 (02:41 +0000)]
lemon: Have Makefile.am handle warnings as errors correctly

Change-Id: If0d59eb109802a799c33e439e607178102678f7d
Reviewed-on: https://code.wireshark.org/review/13580
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoRoHC: fix an assert when dissecting partially an IR-DYN packet
Pascal Quantin [Fri, 29 Jan 2016 12:18:24 +0000 (13:18 +0100)]
RoHC: fix an assert when dissecting partially an IR-DYN packet

Change-Id: Ibcb0a109a38524481bc8639bc73ab73acd07ca1a
Reviewed-on: https://code.wireshark.org/review/13598
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoGTP session ID generated tree item for tracking GTPv1 sessions
Gloria Pozuelo [Thu, 3 Dec 2015 16:35:26 +0000 (17:35 +0100)]
GTP session ID generated tree item for tracking GTPv1 sessions

Change-Id: I9192a58a9ec6676b2cba0f30bb45b4eaa8d82655
Reviewed-on: https://code.wireshark.org/review/11577
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agotds: don't THROW() an exception from a dissector
Martin Kaiser [Thu, 28 Jan 2016 22:16:43 +0000 (23:16 +0100)]
tds: don't THROW() an exception from a dissector

return the error to the caller, exit the loop and the dissection...

Change-Id: Iba64a5d5e4f79bc33c2b1c91b937c9726e15a802
Reviewed-on: https://code.wireshark.org/review/13587
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
3 years agoQt: No capture filter bookmarks in capture interfaces list
Stig Bjørlykke [Fri, 29 Jan 2016 06:55:03 +0000 (07:55 +0100)]
Qt: No capture filter bookmarks in capture interfaces list

Change-Id: I4f53758c0fa4448656daac3ad186a6b0e687fc5c
Reviewed-on: https://code.wireshark.org/review/13593
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>
3 years agoAdd A-MPDU reassembly information to the radio metadata.
Guy Harris [Fri, 29 Jan 2016 07:55:49 +0000 (23:55 -0800)]
Add A-MPDU reassembly information to the radio metadata.

Change-Id: I338e7fb60ff62d1d26ca0b32468ada4294d52d8d
Reviewed-on: https://code.wireshark.org/review/13594
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoTry to fix 'make distcheck'
João Valverde [Fri, 29 Jan 2016 00:25:48 +0000 (00:25 +0000)]
Try to fix 'make distcheck'

Change-Id: I1656ca8e86e506f39ef7f7600bd9d5a21670ad1e
Reviewed-on: https://code.wireshark.org/review/13589
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoAnother fix for g265a41e
João Valverde [Thu, 28 Jan 2016 23:22:32 +0000 (23:22 +0000)]
Another fix for g265a41e

Disable -Werror as before.

Change-Id: Iec27be6eba742555bce28bb1c81c2e15153db566
Reviewed-on: https://code.wireshark.org/review/13588
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoLCSAP: improve dissection
Pascal Quantin [Thu, 28 Jan 2016 21:49:58 +0000 (22:49 +0100)]
LCSAP: improve dissection

- add PLMN info in a subtree
- dissect Horizontal Accuracy
- dissect Vertical Accuracy
- dissect IMSI

Bug: 12054
Change-Id: Ic069d78f23fcf956e4aa5eb19f4d39af0f529757
Reviewed-on: https://code.wireshark.org/review/13585
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoQt: Enable capture filter bookmarks
Stig Bjørlykke [Wed, 27 Jan 2016 20:33:24 +0000 (21:33 +0100)]
Qt: Enable capture filter bookmarks

Update the code handling capture filter bookmarks and enable the
bookmark button and clear button in CaptureFilterEdit().

Disable the apply button (which starts a capture) for now.

Bug: 11836
Change-Id: Ia33cbb8c9bb839be037112eef26daf744c4ea8f8
Reviewed-on: https://code.wireshark.org/review/13568
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years agoMATE: Disable Werror as before g265a41e
João Valverde [Thu, 28 Jan 2016 19:35:37 +0000 (19:35 +0000)]
MATE: Disable Werror as before g265a41e

Change-Id: Ia89f40245e5b7eab2dc23ce7b37d5107863bbfdd
Reviewed-on: https://code.wireshark.org/review/13583
Reviewed-by: João Valverde <j@v6e.pt>