Commit Graph

26172 Commits

Author SHA1 Message Date
Joerg Mayer 0f76609237 Remove unneeded include <sys/stat.h>
Change-Id: I3be8f29d2b4fba2cb1d7ee2f29bdb27e42dd40a5
Reviewed-on: https://code.wireshark.org/review/2607
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24 02:32:26 +00:00
Joerg Mayer 836feeb559 Remove unneeded sys/types.h
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516
Reviewed-on: https://code.wireshark.org/review/2604
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24 02:08:07 +00:00
Michael Mann 4976d67184 Restore correct tree assignment.
Change-Id: Id06bd486114a80fb899f8dc148d48928e99e775e
Reviewed-on: https://code.wireshark.org/review/2602
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 02:01:05 +00:00
Peter Wu e22d3c9b74 ssl: fix ClientKeyExchange, fix TLSv1.2 SKE for DH
Since DTLS and TLS do not differ in handling ClientKeyExchange and
ServerKeyExchange, its dissection got moved to ssl-utils. The code is
based on the SSL dissector, with header field names adjusted to the
DTLS ones (those got capitalized). Besides a version difference (for
signatures), the header field and function names, the DTLS and SSL code
are equal (this is verified).

This patch refactors the dissectors for DHE_RSA and ECDHE to make use of
a common function to dissect the signed_params field. All offset
tracking is also removed in favor of exception handling by the
proto_tree_add_item function. Occurrences of proto_tree_add_uint are
also replaced by proto_tree_add_item for simplicity.

After those changes, the SKE dissector for DH key exchanges is updated
to handle the mandatory signature field in TLSv1.2, using the newly
added function. (bug 9208)

Another bug occurred after the length check removal, pre-TLS and
OpenSSL's old DTLS implemenation do not include a vector length in
the CKE. This is now also fixed. (bug 10222)

Other minor changes: comments added/corrected, renamed
keyex_dh -> keyex_dhe (includes DHE_RSA and DHE_DSS).

Bug: 9208
Bug: 10222
Change-Id: I76e835d56a65c91facce46840d79c1c48ce8d5dd
Reviewed-on: https://code.wireshark.org/review/2542
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23 23:31:40 +00:00
Joerg Mayer 8702a6b827 Remove some unneeded includes
Change-Id: I4327ead0451244daa0d876ae3a770cbbf80760c8
Reviewed-on: https://code.wireshark.org/review/2590
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23 23:19:28 +00:00
Guy Harris 1d92195de8 Have individual programs get libpcap and libz version info.
That way, the code that constructs the runtime version string doesn't
itself have to call libpcap and libz, and could be usable in programs
that don't call them.

While we're at it, add "with" to the run-time version information for
GnuTLS and libgcrypt, to match the compile-time version information, and
add the version information from libwireshark to TShark.

Change-Id: I3726a027d032270b032292da9314c1cec535dcd2
Reviewed-on: https://code.wireshark.org/review/2587
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23 21:56:42 +00:00
Pascal Quantin dd7134d907 Initialize whole buffer in GPRS Mobility and Session Management dissector
Bug: 10216
Change-Id: I572a7a6ce0f816063f02397b667dd46c990cf73e
Reviewed-on: https://code.wireshark.org/review/2583
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-23 20:13:00 +00:00
Michal Labedzki 59e860cf2f [WIP] qt: Add support for Polish language
Change-Id: Ib63937e741b737f171a9b383a9cbabb55dfdd8ef
Reviewed-on: https://code.wireshark.org/review/2553
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23 19:10:21 +00:00
Joerg Mayer 54cc0d86da Replace AF_ values by COMMON_AF_ values.
Remove no longer needed system includes

Change-Id: Id9ffffaa7da5185041db63fa7611d348a1cc4b68
Reviewed-on: https://code.wireshark.org/review/2577
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23 16:48:26 +00:00
Joerg Mayer cb04fd57e9 Add all AF_ types for Windows that are in WinSock.h or WinSock2.h
Change-Id: Ia45f4aaea75d8cb08bb9016f9147f47db4434b06
Reviewed-on: https://code.wireshark.org/review/2576
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23 16:48:16 +00:00
Evan Huus 02edc3369b Revert "Optimize sip_is_known_sip_header()"
This reverts commit c9a5fbeb1d.

Change-Id: Ic2e5d531f719ed1107ef7bb1de12175d4601fd6d
Reviewed-on: https://code.wireshark.org/review/2574
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23 16:22:30 +00:00
Evan Huus 520190c77b Revert "Cheat and try to fix the generated file manually."
This reverts commit 9079e3ad1d.

Change-Id: I0430408e139ff8de068c970d02e36122552614fe
Reviewed-on: https://code.wireshark.org/review/2575
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23 16:22:08 +00:00
AndersBroman 9079e3ad1d Cheat and try to fix the generated file manually.
Change-Id: Iabf1821aa0ef676ac4d1d7f2983460b2e671a98a
Reviewed-on: https://code.wireshark.org/review/2573
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23 15:30:39 +00:00
Jakub Zawadzki c9a5fbeb1d Optimize sip_is_known_sip_header()
Profling SIP shows that gperf generated hashing code, is
3 times faster than using GHashTable & g_str_hash/_equal()

This result in about 1% improve of whole dissection (sip traffic with filter).

Change-Id: Id6bf64bacd872e2d1c30a1b6356db444b25ba326
Reviewed-on: https://code.wireshark.org/review/2116
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23 14:42:20 +00:00
AndersBroman eaf6e551fe Fix a typo.
Change-Id: I6874a6f4a340c2b8e82d1ca5333cbeb31ff27f2d
Reviewed-on: https://code.wireshark.org/review/2570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23 08:24:49 +00:00
Jakub Zawadzki 6e0be0173b Add col_append_lstr(), speedup column generation for TCP.
When dissecting with columns TCP dissector spends
around 1/4 time in col_append_fstr(), add col_append_lstr()
and do formatting by ourselves.

Change-Id: If90bc26242761884b4991e8db0db62c8f9e32690
Reviewed-on: https://code.wireshark.org/review/2527
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-23 03:33:59 +00:00
Guy Harris ab6a45aec6 Get rid of set-but-not-used variable.
Change-Id: Ic0f2c79b4bd9fc737bf33ef64512f4142d74de6b
Reviewed-on: https://code.wireshark.org/review/2568
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 22:18:12 +00:00
Guy Harris 6896def6da Get rid of some unused variables.
Change-Id: I2a806af639e5f0519ba93b0048ec7a4624fa33fc
Reviewed-on: https://code.wireshark.org/review/2567
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 21:49:26 +00:00
Guy Harris 9c35a5d8fd Make dissect_lltd() a new-style dissector and register it as such.
Presumably that was the intent.

Change-Id: Icf8529a23a9a36e7f12e446d67f3867771b221d8
Reviewed-on: https://code.wireshark.org/review/2566
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 21:42:43 +00:00
Michael Mann 9356d5c689 convert to proto_tree_add_subtree[_format] for ASN.1 dissectors
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef
Reviewed-on: https://code.wireshark.org/review/2509
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 21:08:21 +00:00
Michael Mann 2c0214efff LLTD dissector
bug: 6071
Change-Id: If7b544a762df10ffc13aeaf8886cf74a1757c37c
Reviewed-on: https://code.wireshark.org/review/2512
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 21:07:43 +00:00
Michael Mann 188aa9a80e convert to proto_tree_add_subtree[_format]
Change-Id: Ib60ca75b7da8cfa21cfe2999c9b9448a02c332df
Reviewed-on: https://code.wireshark.org/review/2560
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 21:07:16 +00:00
Evan Huus 3fc441e7a5 Initialize whole buffer in GTP dissector
Bug:10216
Change-Id: Ib7de616d50937eb43b16daa4067ee0de9edc8ec7
Reviewed-on: https://code.wireshark.org/review/2562
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22 20:54:28 +00:00
Evan Huus ce99d8a205 Fix leak in nbap init function
Change-Id: I9a70d4da936ad5fd847fc1ba0b29b7220030b977
Reviewed-on: https://code.wireshark.org/review/2558
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22 20:23:52 +00:00
Evan Huus dfe7e71ec5 Fix a leak in the SCTP dissector
use wmem instead of glib

Change-Id: I326d2dd71b13ae45b4434c86fdacf9f3cec6c069
Reviewed-on: https://code.wireshark.org/review/2557
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-22 20:23:36 +00:00
Michal Labedzki 0a960872d7 Logcat: Set data-text-lines dissectors for log
Some binary logcat packets has more then one line, show them in
a convenient form.

Change-Id: I008aac6fe5589f2b10db51f7221853f9d79bbc7a
Reviewed-on: https://code.wireshark.org/review/2549
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-22 16:57:35 +00:00
Michal Labedzki 10fc6e2531 Bluetooth: A2DP: Fix fuzz failture
Fix invalid structure casting by using defaults values,
this also fix DecodeAs for A2DP.

Do the same for VDP.

Change-Id: I360787af648ed65205eb54732ab6d88f8532cf15
Reviewed-on: https://code.wireshark.org/review/2551
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-22 16:56:48 +00:00
Michal Labedzki 164af0050d Bluetooth: Complete sessions
Some interfaces support multiple Bluetooth adapters with events like
add/remove. We must support that to distinquish adapters streams
in case that new adapter has the same id that old one.

Next one is create session for "Connection Handle", so
next layer will now when it is connected and disconnected.
This is also used to distinguish streams.

Change-Id: I9e062c8e4cc9c033b75f1a596e8351a215169843
Reviewed-on: https://code.wireshark.org/review/2548
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-22 16:56:31 +00:00
Guy Harris 58bbfa5ee3 When setting entry_tree, set entry_item as well.
Hopefully, this will fix the warnings from the buildbot that entry_item
was used without being set.

Change-Id: Ibfd921bfbbad68cd8eafd1e3ad3d178cfca03d6e
Reviewed-on: https://code.wireshark.org/review/2547
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 16:42:05 +00:00
Gerald Combs b587740034 [Automatic manuf, services and enterprise-numbers update for 2014-06-22]
Change-Id: Idb1ac02fe97a2d6b3603467d482a9a9040843704
Reviewed-on: https://code.wireshark.org/review/2543
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-22 15:04:41 +00:00
Michael Mann f5e2b4293d convert to proto_tree_add_subtree[_format]
Change-Id: I358bfaa4e5d40cd01b766f614f8bd0dbaf611dd0
Reviewed-on: https://code.wireshark.org/review/2508
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 14:34:17 +00:00
Martin Kaiser 08bd0128ed minor cleanups
Change-Id: Ieaa0fa5cdbe8dc8f50cf5b9ee432c786a8f9fc9a
Reviewed-on: https://code.wireshark.org/review/2540
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22 04:11:04 +00:00
Martin Kaiser 4c740dc8f5 the tree that we use in the iso transfer function in is the urb_tree
Change-Id: Ia32c2f24df9392d1102fa1121ac93b1071bae7ca
Reviewed-on: https://code.wireshark.org/review/2538
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22 03:53:00 +00:00
Martin Kaiser 6b90679284 no need to check the parent tree when we create the iso descriptor tree
Change-Id: I6cbc5047b8d58ecbe41bf5392d31dc0adc81d5d5
Reviewed-on: https://code.wireshark.org/review/2537
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22 03:52:35 +00:00
Martin Kaiser 2b6ce23271 rename the ti variable
Change-Id: Iec3bdfcb3cb14e97045789aec1e11288357d379d
Reviewed-on: https://code.wireshark.org/review/2536
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22 03:52:13 +00:00
Martin Kaiser 2aae7caa5d create the iso descriptor tree's title in a simpler way
Change-Id: I4e60295208c2ac35a452f5fb3dffd090cc151473
Reviewed-on: https://code.wireshark.org/review/2535
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22 03:51:53 +00:00
Martin Kaiser dfa7337b3a create a new function that dissects the usb linux iso transfer
(just copied the existing code)

Change-Id: Ia6dd9be9b39c3c16408e22181225c18d56ac6016
Reviewed-on: https://code.wireshark.org/review/2534
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-22 03:51:26 +00:00
Guy Harris c46329c27b Add a routine to return a version string including VCS information.
Add a routine get_ws_vcs_version_info() that, for builds from a tree
checked out from Wireshark's version control system, returns a string
that includes both the Wireshark version number and an indication of
what particular VCS version was checked out, and just returns
Wireshark's version number for other builds.

Use that routine rather than manually gluing VERSION and the Git version
number together.

("vcs", not "git", just in case we do something bizarre or mercurial
some day. :-))

Change-Id: Ie5c6dc83b9d3f56655eaef30fec3ec9916b6320d
Reviewed-on: https://code.wireshark.org/review/2529
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 01:06:25 +00:00
Anish Bhatt e02c66f157 Check constraints for OSPFv2 LSAs:
1 Router LSA: >= 24 bytes (>= 0 link descriptor(s) required)
2 Network LSA: >= 28 bytes (>= 1 router-ID(s) required)
3 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required)
4 Summary LSA: >= 28 bytes (>= 1 TOS metric block(s) required)
5 AS-External LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required)
7 NSSA LSA: >= 36 bytes (>= 1 TOS forwarding block(s) required)
9 Opaque Link LSA: >= 20 bytes
10 Opaque Area LSA: >= 20 bytes
11 Opaque AS LSA: >= 20 bytes

as described in Bug 6302

for all other types including unknown, check for minimum length of 20

Change-Id: I93451d99a93213b4ded8157cecd54b0a6221d351
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2292
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21 18:17:08 +00:00
Evan Huus 37b903d7ab batch of tvb-length conversions
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498
Reviewed-on: https://code.wireshark.org/review/2507
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21 04:01:52 +00:00
Joerg Mayer c11ae8ac82 Add .rc files to the sources to have them included in the build
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee
Reviewed-on: https://code.wireshark.org/review/2506
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20 23:58:22 +00:00
Pascal Quantin 6808afd017 TCP: update the list of options and put Kind and Length items in the right subtree
Bug: 10211
Change-Id: Ide37f2a2b33f0d6d7cdff897eed02a8c1ea24f7d
Reviewed-on: https://code.wireshark.org/review/2488
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-20 18:51:27 +00:00
Stig Bjørlykke 2ab2921c7d Revert part of svn revision 52045 (git b38ee917)
This fix does change the format printed for values using bitmasks
(because the bit values are printed first) and is not always wanted
in this dissectors (because of readability).

We should have a better way of doing what I want in this dissectors,
so I'll have a look at this later.

Change-Id: I2477aa6b1d0c42a7ad5848bba3cb74dce3bba1f0
Reviewed-on: https://code.wireshark.org/review/2485
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-20 17:04:49 +00:00
Guy Harris ce3d2ff3de Rename dissector_add_handle() to dissector_add_for_decode_as().
Hopefully that name makes it clear what the routiner's purpose is, and
will encourage people to use it rather than using dissector_add_uint()
with a bogus integer value.

Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8
Reviewed-on: https://code.wireshark.org/review/2483
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-20 16:43:56 +00:00
Martin Kaiser 4df6b51784 remove duplicate offset=0
Change-Id: I6653b733dfd2c587909371e50fd0c2efc4649dcd
Reviewed-on: https://code.wireshark.org/review/2482
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-20 16:22:58 +00:00
Martin Kaiser ffccb9c069 no need for if(tree)
Change-Id: I5762fb30f57d0f9bc3e5fc786577ed1cc49b64d7
Reviewed-on: https://code.wireshark.org/review/2481
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-20 16:22:52 +00:00
Evan Huus d91953f58f fix printf argument index
Change-Id: I56aae95d61930c74ac9962225e1bcda72079595e
Reviewed-on: https://code.wireshark.org/review/2477
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20 07:13:35 +00:00
Michael Mann 28e8ce59cc Add proto_tree_add_subtree and proto_tree_add_subtree_format
This is intended as a replacement for all of the proto_tree_add_text followed by proto_item_add_subtree calls.

Change-Id: I892136d7b9d8b4e100996097eff62ce7af9512d2
Reviewed-on: https://code.wireshark.org/review/2472
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-20 06:58:12 +00:00
Evan Huus ee2885f9e8 add cast to fix buildbot
Change-Id: I945830a6dd9c34adf9802fa9e9948e2e90d8aba8
Reviewed-on: https://code.wireshark.org/review/2476
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20 06:14:16 +00:00
Evan Huus 80c070fb51 Don't hide tcp option kind/len fields
Hidden fields are deprecated, and we were hiding them inconsistently anyways.

Bug:10211
Change-Id: Iaf1576ae7bc04c0c0bd896c096b117f1b8af2e9e
Reviewed-on: https://code.wireshark.org/review/2474
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20 06:07:41 +00:00
Evan Huus 980f5f6711 batch of tvb-length conversions
Change-Id: I5e40df8af6841e3dad71c41d7e43c7971611b15f
Reviewed-on: https://code.wireshark.org/review/2473
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20 05:33:04 +00:00
Michael Mann 4560881070 Cleanup display filters reported by checkfiltername.pl
Also ensured some files have their correct names at the top so they are more easily grepped

Change-Id: Ib0f5ddf14eb1616a93dee496107dc0eb09048825
Reviewed-on: https://code.wireshark.org/review/2452
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-20 04:09:31 +00:00
Bill Meier 728e5a1ab3 packet-vnc.c: Improve re-assembly.
Essentially:

  When more data is needed to continue dissecting a PDU, use
  DESEGMENT_ONE_MORE_SEGMENT instead of repeatedly requesting
  additional bytes (for one or a few more fields).

  - Improves the efficiency of the dissection;

  - Prevents 'one-pass' tshark dissection from redissecting
    the PDU repeatedly many, many times with each time dissecting
    the PDU with one or a few more additional fields.
    This generated *lots* of (repeated) output since a reassembled
    VNC PDU can contain many fields (each of short length).

  - (A comment in packet-tcp.c states, in effect, that repeatedly
     requesting a specific amount of more bytes to dissect a PDU
     will "break reassembly" although I note that the reassembly did
     seem to work (in-efficiently)).

Note: Although this patch improves the handling of reassembly, the
      dissector has significant issues. For example. see Bug #5366.

I expect this fixes the Bug #10134 issue: "Cannot allocate memory";

Before the fix, 'tshark -nVxr' for the input file generated trees with
multiple hundreds of thousands of entries and generated reassembled
PDUs consisting of many, many small fragments.

Change-Id: I970037c346fbaa4bffa5726fd5bee5f69396eabf
Reviewed-on: https://code.wireshark.org/review/2471
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-20 02:58:11 +00:00
Evan Huus 0c3e1a243b Add casting and license info to fix buildbots
Change-Id: Iea53b17480d758c16822d80778fa4f186a188a91
Reviewed-on: https://code.wireshark.org/review/2470
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 23:55:47 +00:00
Jakub Zawadzki b6d20a27a1 Optimize reseting epan_dissect_t when filtering.
Don't destroy interesting_hfids hash table, just remove all values.

Change-Id: I119aaebf91aca8916aea0f15376ff2cb9d3fbc35
Reviewed-on: https://code.wireshark.org/review/2467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 23:33:14 +00:00
Dario Lombardo 84777a682d Removed SVN Id tag
Change-Id: I41931121ab8854e4737aeb565b4f51be87426fa9
Reviewed-on: https://code.wireshark.org/review/2375
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 22:23:05 +00:00
Michael Mann e9bce9dd7e Add dissectors to match the groups of display filters they represent instead of all coming from proto_zbee_nwk.
Change-Id: I8049e84af4670b3dec436d2bab143d59557c07aa
Reviewed-on: https://code.wireshark.org/review/2450
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 22:21:37 +00:00
Michael Mann f5e072a2c3 Remove "pkg" prefix from display filters.
Also rename base protocol filter name to match prefix of all other fields

Change-Id: Iff234c1443252b9f8e6d87fd7a76925746b5e513
Reviewed-on: https://code.wireshark.org/review/2449
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 22:19:58 +00:00
Michael Mann b98dc77cde Cleanup filter fields that checkdisplayfilter.pl was complaining about.
Cleaned up filter names that were shared, but had different types (which can cause problems in a display filter compare)

Also cleaned up many [FIELDDESCR] that effectively mimicked the field name.  Even more could probably be done (and/or rename field name to be more descriptive), but I was being conservative.

Change-Id: I2e072b4f411c390b9430a0a0d903133d6decae5e
Reviewed-on: https://code.wireshark.org/review/2448
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 22:18:35 +00:00
Jakub Zawadzki a45ce57a1a Optimize dissect_sip_route_header()
Don't manually fetch each character to find ',' use tvb_find_guint8()

Change-Id: I29711421469e868a86bf2edd7adf8dcc85ed26eb
Reviewed-on: https://code.wireshark.org/review/2446
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 22:16:43 +00:00
Michael Mann 8b12768551 calling subdissectors shouldn't be conditional on a tree
Change-Id: I59ad726c16d4a85dd065f4a21bdf5d86e47c82cd
Reviewed-on: https://code.wireshark.org/review/2451
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 22:16:41 +00:00
Martin Kaiser 1e9bc6e483 handle TS packet reassembly for PES packets with 0 length field
(unknown length)

this fixes bug 9527

Change-Id: I255ae9662dfeea06e61e4b0891e0ea8eaa254d0f
Reviewed-on: https://code.wireshark.org/review/2462
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-19 21:52:44 +00:00
Martin Kaiser 0c0bd541a1 no need to initialize these two vars
Change-Id: Ie1a71046b791bcbbf3cf02ddd1c4ddc88b388302
Reviewed-on: https://code.wireshark.org/review/2461
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-19 21:52:25 +00:00
Guy Harris b936dbd7ee Protocols sending the OS's AF_INET6 value are OS-specific or broken.
Check for all the different AF_INET6 values that are on various OSes.
If Totem is, and will forever be, used *ONLY* on one particular OS, feel
free to remove the uses of other _AF_INET6 values (but do *not* change
back to using the OS's AF_INET6; this should dissect the protocol
correctly on *all* OSes).

Add a common AF_INET definition to epan/aftypes.h while we're at it, and
use that; as most OSes picked up 4.2BSD's AF_INET value, most if not all
of them use 2, but IPv6 came out after 4.2BSD, and various OSes all
picked their own values for AF_INET6.

Change-Id: Iae15dfdd15203ed3ecd078a6499821dc09139a98
Reviewed-on: https://code.wireshark.org/review/2458
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 21:23:33 +00:00
Alexis La Goutte 9e81d5820a Fix indent (use 4 spaces) and add modelines
Change-Id: Ieb231d9f551f3e157197f56378088fb0069388d3
Reviewed-on: https://code.wireshark.org/review/2455
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 19:56:33 +00:00
Evan Huus 15a0a63156 batch of manual tvb_length conversions
Change-Id: Ifea45514bdba8be5f62b9dc560027077297f631e
Reviewed-on: https://code.wireshark.org/review/2456
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 19:56:32 +00:00
Evan Huus 5ed05dd747 batch of manual tvb_length conversions
Change-Id: Ib3a1ddc4342a7a8648d6ed8bfcb35aa229c56a27
Reviewed-on: https://code.wireshark.org/review/2445
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 19:55:31 +00:00
Dario Lombardo 627de38a80 Removed SVN Id from epan dir.
Change-Id: I487a3451344796447f0d5621b993cc89c29e93b5
Reviewed-on: https://code.wireshark.org/review/2383
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 19:46:22 +00:00
Pascal Quantin 0a3b1d8beb Kerberos: fix dissection of packets when Record Mark is present
Bug: 10200
Change-Id: Ied8db64120131c029e276d66aeff8b81a45a7286
Reviewed-on: https://code.wireshark.org/review/2447
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 19:44:15 +00:00
Guy Harris 12574468e1 address_to_str() *does* take a const pointer.
At least now it does.  (So does ep_address_to_str().)

Change-Id: I5fdf15ca42faac802fd21b4b6f5b750ed402bd05
Reviewed-on: https://code.wireshark.org/review/2442
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 19:10:00 +00:00
Evan Huus 592c3673c6 Fix underflow causing infinite loop in openflow dissector
Bug:10208
Change-Id: I8aff9523fd33cf9e0802153100ea032139966b26
Reviewed-on: https://code.wireshark.org/review/2440
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 19:08:21 +00:00
Guy Harris 08a318a4df Those address_to_str() calls were in packet scope, and were safe.
Change-Id: Ic727eca800a1b8972cf1a09cf2cf4ef8cfe4d0ba
Reviewed-on: https://code.wireshark.org/review/2439
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 19:05:23 +00:00
Guy Harris 46ecf18fbd Use address_to_str(NULL, ...) for strings allocated outside dissectors.
ep_address_to_str() doesn't crash if called outside packet scope, but
it's still not correct to use outside packet scope.  Use
address_to_str(NULL, ...) to allocate those strings, and then explicitly
free them when we're done; exceptions don't get thrown between the
allocate and free, so there's no risk of a leak.

Change-Id: Iea2af93b0757e648d399e2ba64249224eb7e9e3c
Reviewed-on: https://code.wireshark.org/review/2438
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 18:58:49 +00:00
Evan Huus 83762f9f9b Add sys/socket.h which should fix solaris
Change-Id: Ic6f9e8dce860c2bd54bb4c5e0f2d0526178fc720
Reviewed-on: https://code.wireshark.org/review/2437
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:54:53 +00:00
Pascal Quantin 39f6a8b669 Revert "Update PIDL source files with the API changes done in g021e7af"
This reverts commit e09d127a9a.

Change-Id: Id34b9f5875b1d63aaeed96b3ffdc8ece63ab4134
Reviewed-on: https://code.wireshark.org/review/2436
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 18:42:44 +00:00
Evan Huus 7398779206 rename variable to avoid shadow warning
Change-Id: I5934120da2dddf9076972ea3a471191f7dc9596a
Reviewed-on: https://code.wireshark.org/review/2434
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:27:52 +00:00
Michael Mann b0bc4d5535 Revert "Fixup: ep_address_to_str -> address_to_str"
Most (all?) of these functions are being called within GUI, so they can't have packet_scope, which is why they weren't already converted (I made this mistake once already)

This reverts commit 7fea55a054.

Change-Id: I4bf29b206e5e1f5daefcec131309a8f6e78e1eb1
Reviewed-on: https://code.wireshark.org/review/2428
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:26:57 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Evan Huus 3557ac4ec6 Fix warnings in test binaries
They aren't built with the same warning flags as normal, but if you add those
flags a bunch of warnings show up.

Change-Id: If3776fbd98cc45e473f055e07c86ea8f6a5034f7
Reviewed-on: https://code.wireshark.org/review/2432
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:24:09 +00:00
Jesse Gross c95ff6b42f Add dissector for Generic Network Virtualization Encapsulation (Geneve).
Change-Id: I3ecf655d8e49bb7b519c4ba95d4e45c7b114bdd6
Reviewed-on: https://code.wireshark.org/review/2359
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:24:03 +00:00
Michael Mann 53594f34e4 Dissectors for totemnet and totemsrp protocols implemented in corosync cluster engine. Bug 3232.
From Masatake YAMATO

changes in patch3 (Masatake YAMATO):

  * Fix a typo(s/Sequnce/Sequence/)
  * Use variable len instead of a number literal
  * Put _U_ marker to length parameter of dissect_corosync_totemsrp_ip_address
  * Use tvb_report_length instread of tvb_length

changes in patch5 (Masatake YAMATO):

  * packet-corosync-totemsrp.c: Adapt to new dissector_try_heuristic interface

    + pass hdtbl_entry argument to dissector_try_heuristic.

  * packet-corosync-totemnet.c: Initialize corosync_totemnet_port to 5405

changes in patch6 (Masatake YAMATO):

  * packet-corosync-totemsrp.c: Use tvb_reported_length instead of tvb_length.
  * packet-corosync-totemsrp.c: Remove unnecessary trailing space in string literals.

  * packet-corosync-totemnet.c: Remove SVN Id tag in a comment.

changes in patch8 (Masatake YAMATO):

  * packet-corosync-totemnet.c: Remove SVN Id tag in comment(again).
  * packet-corosync-totemsrp.c: Use val_to_str_const instead of val_to_str.

changes in patch9 (Masatake YAMATO):

  * wsutil/sober128.[ch]: New files derived from packet-corosync-totemnet.c.
    Decryption code is moved here.
  * packet-corosync-totemnet.c: Remove all decryption code from this file.

Change-Id: Id832d9c5ce1be1668c857c9bbf39e8a84c31880c
Reviewed-on: https://code.wireshark.org/review/725
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:23:09 +00:00
Anish Bhatt 0b245a4cf8 Use the same offset += rtnValue logic for all TLV types, instead of a special case for chassis, port & ttl.
I've avoided using any mathematical checks even though tlv type vals increase linearly just in case they change in the future.

Change-Id: I0ec7021df5b91543e12edf9ba8d9c4ac44ecb11c
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2193
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:22:44 +00:00
Guy Harris 3adc5b8c80 To make a dissector available for Decode As, just use dissector_add_handle().
No need to use dissector_add_uint() with a bogus value.

Change-Id: Ia5e51d199487ba14cd671c7df44231a0d407c50b
Reviewed-on: https://code.wireshark.org/review/2431
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19 17:54:38 +00:00
Michael Mann daa70feddc Revert "Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining"
See https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 021e7afc9f.

Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f
Reviewed-on: https://code.wireshark.org/review/2429
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 17:23:41 +00:00
Pascal Quantin bcff3c57cc Add the ability to dynamically add a new protocol to export PDU dialog box
Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e
Reviewed-on: https://code.wireshark.org/review/2423
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 06:48:32 +00:00
Jakub Zawadzki 5844e12989 Optimize dissect_sip_uri()
- Combine tvb_find_guint8() for comma, semicolon into one tvb_pbrk_guint8()

- Instead of fetching each character use tvb_pbrk_guint8() to fast
  forward.

- Remove not needed tvb_find_guint8() call, as the result is discarded.

Change-Id: I38d6775b187146656d47cea9b64f8e0ccad18d36
Reviewed-on: https://code.wireshark.org/review/2384
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 00:08:04 +00:00
Pascal Quantin 153793aaa8 Remove svn $Id$ keyword in Lua scripts
Change-Id: I5c5f8659338aed36ba020a771a8b8222f2f7e025
Reviewed-on: https://code.wireshark.org/review/2416
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-18 23:51:34 +00:00
Guy Harris 4d1e1e7876 Sort the Ethernet pseudo-wire types so that they're together.
Separating the "try to guess whether there's a control word" type from
the "yes, there's a control word" and "no, there's not a control word"
types is just a huge UI botch.

Make it clearer that the default is "Ethernet pseudo-wire, try to guess
whether there's a control word".

Change-Id: I91cc526fc709ad102b22ca67f5a9d7c98fffa0cc
Reviewed-on: https://code.wireshark.org/review/2414
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 21:26:04 +00:00
Joerg Mayer 13597c9363 Rename the filtername to initial_rtt
Change-Id: I64af535dc07eb4310b212077bb4c52032e97ecdb
Reviewed-on: https://code.wireshark.org/review/2413
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 20:57:53 +00:00
Guy Harris 6da6bf77b3 Get the handle for the pw_hdlc_nocw_hdlc_ppp dissector.
Change-Id: If7bc620c19e9c6511a724847e38cf0776d26b444
Reviewed-on: https://code.wireshark.org/review/2410
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 20:55:01 +00:00
Joerg Mayer 461c6a0984 Rename the Shortname of initial RTT to something short (iRTT)
Change-Id: I182f2cccae5a385572950f08fa0a6005dcf59ff1
Reviewed-on: https://code.wireshark.org/review/2409
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 19:58:37 +00:00
Joerg Mayer 67dac5985f Change the indication for out-of-order packets. This is experimental
and will be verified by Jasper next week

Change-Id: I3cda397285e8174abb9c05b7aaf7c1bfabdfc71a
Reviewed-on: https://code.wireshark.org/review/2408
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 19:55:12 +00:00
AndersBroman 681d82309a The data is actually http, call the http disector for it.
Change-Id: I58f63d79bc7f1838dd24a8dcd3e9c528648bdebd
Reviewed-on: https://code.wireshark.org/review/2407
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 19:39:27 +00:00
Evan Huus 08063d824b Build unit test binaries with Cmake
That was surprisingly easy.

Change-Id: Idda34580fd694cb0d253a121921f31d3731d3007
Reviewed-on: https://code.wireshark.org/review/2396
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 18:27:38 +00:00
Shoichi Sakane 009bebbf09 Fix copy-paste probem in COAP dissector
Bug:8070
Change-Id: I7a86a37f7de6b3e4e12fe1c47980a9a6604488d6
Reviewed-on: https://code.wireshark.org/review/2390
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:11:49 +00:00
Pascal Quantin e09d127a9a Update PIDL source files with the API changes done in g021e7af
Change-Id: I2917cbae077865f9ec171900810f85f54b349c2c
Reviewed-on: https://code.wireshark.org/review/2394
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:05:04 +00:00
Pascal Quantin f99aaf8de3 PCLI: do not register UDP port 9000 by default as it is not allocated to this protocol by IANA
Change-Id: I5f692ddf5ae5ba7366b34830bd9e99efacd66037
Reviewed-on: https://code.wireshark.org/review/2393
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:04:25 +00:00
Pascal Quantin cc37b50334 Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:03:43 +00:00
Joerg Mayer c6324a0b1e Get rid of some ancient qualityreview comments...
Change-Id: If25bdd594b20b656c345dcfe62765379f5dd9c5e
Reviewed-on: https://code.wireshark.org/review/2392
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-18 17:47:18 +00:00
Guy Harris 54819e5699 ssl_parse_key_list() gets called from the UI, so don't use packet scope.
Instead, explicitly allocate and free the address string.

Using packet scope was causing test failures.

Change-Id: Ie18d2da44d2eec8a92a6a86b0ba883a5525f49cd
Reviewed-on: https://code.wireshark.org/review/2387
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 17:03:22 +00:00
Pascal Quantin f2dd6c0a6d SABP: fix an error spotted by pre-commit hook
Change-Id: I733e2e72b52293b3c7c15f4e0c240f7e01f4b98c
Reviewed-on: https://code.wireshark.org/review/2386
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:58 +00:00
Evan Huus b5a462b087 Try to calculate the initial RTT of tcp conns
This (if it works well) will let us do much more accurate out-of-order
detection, which is currently otherwise hardcoded to 3ms. Ask Jörg for details.

Change-Id: Ie0662723946edeaea1e43958bf7f5158f09dde71
Reviewed-on: https://code.wireshark.org/review/2367
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 15:07:08 +00:00
Martin Kaiser cd56eb970f move dissection of usbpcap isochronous packets to a separate function
Change-Id: Id292fd1b0fbff3a043e64296a88c78c1a5ac00d7
Reviewed-on: https://code.wireshark.org/review/2369
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-18 15:00:06 +00:00
Dario Lombardo 7fea55a054 Fixup: ep_address_to_str -> address_to_str
Change-Id: Id49ba07e32a71357b50b32de7cecfd80e412d508
Reviewed-on: https://code.wireshark.org/review/2379
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:22:02 +00:00
Dario Lombardo 021e7afc9f Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining
Change-Id: I0228f3b6b7067bc0ce51f9d359f99fd18feb2b66
Reviewed-on: https://code.wireshark.org/review/2378
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:20:32 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Dario Lombardo 971ffd683e Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:13:58 +00:00
Yan Burman 4aad9d3b58 Fix compilation warning
Change-Id: Ia7922415d8b22ba0c5a04ad6940c7e10bc205d57
Reviewed-on: https://code.wireshark.org/review/2371
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18 07:23:38 +00:00
Pascal Quantin 666127f5f9 PDCP LTE: do not try to decipher PDCP control messages (like ROHC feedback)
Change-Id: I4a1596fd45bbc78ed8e90accf69ac048e7053161
Reviewed-on: https://code.wireshark.org/review/2366
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 06:17:54 +00:00
Evan Huus 6aa1470f10 Replace glib memory with wmem memory
Fixes potential memory leaks.

Bug:8102
Change-Id: I88f9a74e3f782232d2da0bc7d83727dc3253f376
Reviewed-on: https://code.wireshark.org/review/2364
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 05:54:53 +00:00
Evan Huus 6e6bd90754 Convert the obvious emem to wmem in lua code.
Bug:9927
Change-Id: Ibf0dd45d3b54e489b70a4fde193b825ec703379e
Reviewed-on: https://code.wireshark.org/review/2349
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 05:54:28 +00:00
Pascal Quantin 04c90090d9 TCP: do desegmentation sanity checks for all sub dissectors types
Change-Id: I02fe9827d8c1618f7dc6696e7d8667681a48d4a9
Reviewed-on: https://code.wireshark.org/review/2355
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 05:53:10 +00:00
Jakub Zawadzki 57b27ec250 Optimize tvbparse character set checking.
This patch makes tvbparse_[not_]chars() to generate
array of characters which is accepted,
later this array is checked in cond_chars_common().

This results in nice speedup of XML dissector (~33% for my file).

Change-Id: I62a5585f8bccaaea1a0c49fc70c7552531493442
Reviewed-on: https://code.wireshark.org/review/2356
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 05:52:36 +00:00
Martin Kaiser 91f58d6714 check for correct ftype
Change-Id: I2274b97c74a845e6514e8acff136e55f721f11a8
Reviewed-on: https://code.wireshark.org/review/2354
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-17 23:08:29 +00:00
Martin Kaiser c9dd677f61 make dissect_ipmi_cmd() static
Change-Id: Ie494a52fa73f7b91bc65da1bc36516f799ef4967
Reviewed-on: https://code.wireshark.org/review/2353
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-17 22:53:21 +00:00
Joerg Mayer d5e2782629 Update a comment about how to better identify retransmissions
Change-Id: Iec83f7e713a3077f1f4569aa86a55a69684b3097
Reviewed-on: https://code.wireshark.org/review/2351
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 22:37:33 +00:00
Evan Huus ba6eb5c72f Set the rlc len field before we try to use it in an expert info.
Bug:9795
Change-Id: I740a9fe36278995cf6e590206f600c037789f0eb
Reviewed-on: https://code.wireshark.org/review/2344
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 21:45:38 +00:00
Evan Huus f4b9ea4362 Initialize smb ioctl_function struct member
Bug:10020
Change-Id: I415a29dd36697887cb06485d6ed3a2b799a93464
Reviewed-on: https://code.wireshark.org/review/2342
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 21:28:29 +00:00
Evan Huus 417938310a Initialize rq_hdr.session
Bug:10168
Change-Id: Ida4d82d102421152785ce680aa47bcb5cf8692f6
Reviewed-on: https://code.wireshark.org/review/2334
Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 20:54:39 +00:00
Joerg Mayer 55cdf038a8 ip version and header-length are not full byte values. Show the
bit decoding for these values.

Change-Id: I7ab6c4badf5b66d6f434a47523e2b35730ecb65d
Reviewed-on: https://code.wireshark.org/review/2338
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-17 19:39:27 +00:00
Evan Huus 17a552666b fix underflow in BER constrained bitstrings
this can happen and cause invalid memory accesses with incorrectly-large padding
values

Bug:10187
Change-Id: Ib9b2a2fa10766efb4d95d588f57354a56373c626
Reviewed-on: https://code.wireshark.org/review/2325
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 18:17:31 +00:00
Evan Huus c30df31954 lua_pushstring takes a copy of its argument
free the value we pass it, fixing a memory leak

Change-Id: I446cb85d82a0697c24035461ad03450855b68884
Reviewed-on: https://code.wireshark.org/review/2304
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 17:25:35 +00:00
Stig Bjørlykke 8c0d3ae47e Return number of bytes dissected in dissector:call
This does not work for old-style dissectors as they always return
the number of bytes in incoming buffer and not the number of bytes
dissected.  This is noted in the documentation.

Change-Id: I5b236a73952cac3efc830e40276283bed9af1f87
Reviewed-on: https://code.wireshark.org/review/2237
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 17:16:56 +00:00
Hannes Mezger 9991f43f27 Add dissect_nt_64bit_time_ex for retrieving the created proto_item
Using dissect_nt_64bit_time it is not possible to access the created proto_item afterwards, hence the new function.

Change-Id: I39aca92536a53841045c30b601b6ec1a7d8bfb4e
Reviewed-on: https://code.wireshark.org/review/2160
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 17:09:03 +00:00
Alex Badea d1cdbd715a isakmp: add support for IKEv1 AES decryption
Select an appropriate gcrypt cipher based on ISAKMP encryption ID and
key length attribute.  Fixes bug 10128.

Bug:10128
Change-Id: Ie74fc51eb9bfe6d68340056d3ef2ef28c7677fb8
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/2296
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-17 14:49:06 +00:00
Alex Badea f9b05dc132 isakmp: allow IKEv1 decryption with non-PSK authentication
There is a check that disables decryption for non-PSK authentication. It
has been around ever since its introduction in commit acfe071e (svn
r17229). As suggested in bug 7951, remove this check to allow decryption
for e.g. certificates authentication.

Bug: 7951
Change-Id: I5e98407d0f8dbabac2cdaf632cf0af403192872b
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/2297
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 14:44:41 +00:00
Anish Bhatt 5ca64ca97b Add support for WRITE_LONG16 & REPORT_REFERRALS to scsi dissector
Picking up leftover work on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8843

Change-Id: Ie3df55ae3309cf68f64b2aa184fb2904d1200cb5
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2239
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 05:47:57 +00:00
Jakub Zawadzki 923cf412f1 Fix copy/paste errors in value_string.
Also make repetition_coding_indications[] standard terminated.

Change-Id: Ice20e1f27f5ab4d111f893608a230b83899efc9f
Reviewed-on: https://code.wireshark.org/review/2288
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-17 00:08:49 +00:00
Evan Huus e047e3a007 Convert tcap dissector to wmem
As far as I can tell these calls were just missed in the first initial pass,
they're not in a weird scope.

Close review from somebody else please to verify that!

Change-Id: Ic3188879124dcb8fdf42e79d200d4f244200aa7b
Reviewed-on: https://code.wireshark.org/review/2266
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 00:06:17 +00:00
Joerg Mayer 1567820a3a Add a FIXME referring to bug 4096
Change-Id: I4263d791e7bc7dc410d2735e94bc765aee2d84bc
Reviewed-on: https://code.wireshark.org/review/2287
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 23:37:31 +00:00
Jeff Morriss f113306e0e More Python-bindings removal.
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce
Reviewed-on: https://code.wireshark.org/review/2283
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 23:14:05 +00:00
Jeff Morriss 319ad97717 Add a cast to satisfy the buildbots.
Change-Id: I1c128db8a8b0cbbef01a26f7b3a50ed2b59af229
Reviewed-on: https://code.wireshark.org/review/2279
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 21:46:26 +00:00
Evan Huus bbc7293510 fix format string typos
Change-Id: I470463ecfdd2d8facef93e09d6265a9d7ed868c8
Reviewed-on: https://code.wireshark.org/review/2274
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 21:04:21 +00:00
Jakub Zawadzki d5fb63a8c4 Fix copy/paste errors in stun attributes value_string[] array.
Found thanks to warning:
** (process:20239): WARNING **: Extended value string 'attributes' forced to fall back to linear search:
  entry 53, value 32858 [0x805a] < previous entry, value 32861 [0x805d]

Change-Id: I12396380b42bbcb90dd139775c4b8d0bfdc79972
Reviewed-on: https://code.wireshark.org/review/2273
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 21:01:56 +00:00
Evan Huus 3a3b36f01e kill one last python remnant
Change-Id: I21ec54e59acc799ccb0799f06e95713a60f8e86d
Reviewed-on: https://code.wireshark.org/review/2272
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 21:01:19 +00:00
Evan Huus ad97c1eb87 kill unmaintained python bindings
Change-Id: I1fa4f0d76b6b29d2935723b83b5ea7165039c807
Reviewed-on: https://code.wireshark.org/review/2258
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 20:44:08 +00:00
Michael Mann a279fa7705 Have ipmi "dissectors" register through the build process instead of "manually"
Change-Id: I6d6d32e8a1bc21dee9bf52b502e1a02e9511ecb2
Reviewed-on: https://code.wireshark.org/review/2253
Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 20:38:54 +00:00
Michael Mann cf99e6b198 packet-ipdc.c: proto_tree_add_text -> something filterable.
This appears to be a TLV architecture, not sure if the T and L should be broken up and filtered separately.  Right now, just filtering on value.

Change-Id: Ic5853d2216b6b5f845587e4b789435bed5fe60ff
Reviewed-on: https://code.wireshark.org/review/2252
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 20:37:16 +00:00
Stig Bjørlykke ee137c45e1 Register P_Mul as new-style dissector
Change-Id: Ic1f85475223d5ba36d9aa4ae617d6db450940fae
Reviewed-on: https://code.wireshark.org/review/2268
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-16 20:28:44 +00:00
Stig Bjørlykke 87aed58548 Register DMP as new-style dissector
Change-Id: I0491c9c5e817e31011e64aebc9010437581ba718
Reviewed-on: https://code.wireshark.org/review/2269
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-16 20:28:21 +00:00
Stig Bjørlykke b2b7a6b080 Do not handle P_Mul packet as ASCII string when calculating checksum.
This bug was introduced when rewriting tvb_get_string() to
handle encoding (and thus handling ASCII string different).

Change-Id: Ic107d7b9e2f63aea33fdf55b9c20c22202f7b458
Reviewed-on: https://code.wireshark.org/review/2270
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
(cherry picked from commit fb0266fb244bf444a2801ee7ffc983f5a58621de)
Reviewed-on: https://code.wireshark.org/review/2267
2014-06-16 20:27:21 +00:00
Evan Huus b166553279 remove more unused code
Change-Id: I7275aafe7d7216b85bbb34ba959b74358d102a91
Reviewed-on: https://code.wireshark.org/review/2255
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 19:11:03 +00:00
Evan Huus e0aabd97d8 Convert more time_to_str functions to wmem
Change-Id: Ibaae0e79935dc62f12f713f2df5b57d0f3f799b9
Reviewed-on: https://code.wireshark.org/review/2254
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 19:10:59 +00:00
AndersBroman c607a3fa57 Add a preference to use Japanese ISUP TTC version with 13 bit CIC.
Change-Id: I98cb9f803378d69048ef94b7e3ad7d35b393733a
Reviewed-on: https://code.wireshark.org/review/2260
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 18:50:49 +00:00
Evan Huus de00c49bd8 Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 17:26:25 +00:00
Alex Badea faac494d98 isakmp: support decryption for SHA-2 hash algorithms
Simply map ISAKMP hash IDs for sha256, sha384 and sha512 to gcrypt MDs.
Fixes bug 10181.

Change-Id: I9c8265bf3c5c8f8d2fd6d251cc0f267964e3be8e
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/2250
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-16 16:24:14 +00:00
Niels de Vos 9ac8052fb1 glusterfs: correctly decode GFIDs that are passed in a dict
When a dict structure is passed by GlusterFS, the values are not encoded
normally. We now assume that the GFID in the dict is in network-order,
but this will be incorrect for Big Endian systems. The majority of
Gluster deployments are on Little Endian, and the GFID is displayed
correctly for this case. I am sorry for the few users on Big Endian
Gluster environments, they will see some GFIDs in Wireshark that don't
exist on the Gluster volume.

With this change, it is also made possible to filter on the GFID that is
contained inside of the dict.

Change-Id: I62a265eca34df23a507403397012cf652d43ca54
Reported-by: Vikhyat Umrao <vumrao@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/1856
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 15:48:44 +00:00
Evan Huus 39d7c9df0a Remove emem in SNMP UAT, use glib instead
Change-Id: Ieea8c09d6a82285b0ba20f669c35394fbf195f50
Reviewed-on: https://code.wireshark.org/review/2241
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 15:38:31 +00:00
Evan Huus 83f9cc6603 Remove last caller of se_strdup_printf
Also remove that function as it is now unused.

Fix what appeared to be a memory leak in the manual address resolution dialog
while in the neighbourhood.

Change-Id: I75128ab0f95e5a7673f92bfeea45191f00581c25
Reviewed-on: https://code.wireshark.org/review/2244
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 15:25:53 +00:00
Evan Huus e46c1af0f0 Remove emem from ssl utils, use glib instead.
No exceptions can be thrown when loading a key from a file, so it's safe.

Change-Id: I14ee8569bb516fcb45b72f07f76d28ef4b32065c
Reviewed-on: https://code.wireshark.org/review/2243
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 15:20:35 +00:00