Commit Graph

33035 Commits

Author SHA1 Message Date
Joakim Karlsson f269290252 gtp: decoding correlation-id
Change-Id: Ie9d399c10b6599bfc463e27ca3cfcb3c06d8b588
Reviewed-on: https://code.wireshark.org/review/18605
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>
2016-11-01 21:01:23 +00:00
AndersBroman 9a187cca74 [GTPv2] Basic dissection of IE Integer Number and value_string updates.
Change-Id: I4b5fa57121b56daf55ac2ae3a966679c5ab874fb
Reviewed-on: https://code.wireshark.org/review/18602
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-01 15:42:53 +00:00
Alexis La Goutte b54347127d gsm_dtap: fix spelling typo found by lintian
Change-Id: I4f3895195c61b908dd081dd6950b16832d62519f
Reviewed-on: https://code.wireshark.org/review/18600
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-01 10:05:18 +00:00
Pascal Quantin 959b13b423 GPRSCDR: remove obsolete ASN.1 files
Change-Id: I4264f594a9c60c07a400187148d6c68120986c3c
Reviewed-on: https://code.wireshark.org/review/18597
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>
2016-10-31 22:03:00 +00:00
Jan Spevak a3f5f3e461 GPRS_CDR: update record definitions
Records defined according to 3GPP TS release 14 in new .asn files.
Updated Makefiles and dissector files generated via asn2ws

Change-Id: I6da2782c58178550962f63dbd526b827e0d8394b
Reviewed-on: https://code.wireshark.org/review/18552
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-31 18:07:18 +00:00
Jaap Keuter d7e874c5d0 PW_ACH: Use proper symbolic names
Collect all used PW Associated Channel Types and use them in the
subdissector table registrations.

Change-Id: I5d196bceefdb4560b1f4388ff86898e316e5e2ae
Reviewed-on: https://code.wireshark.org/review/18590
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: Michael Mann <mmann78@netscape.net>
2016-10-31 11:38:55 +00:00
Thomas Wiens b61cfd7ec1 bitmask: add missing break statement
Change-Id: Ia9cb54431c8c274c46e299b6a6da8cac14bda88e
Reviewed-on: https://code.wireshark.org/review/18591
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-31 10:22:32 +00:00
Guy Harris 5aacafba8e Handle -K, -n, -N, and -u in the common dissection option code.
Also update tfshark to use that code.

Change-Id: Ic03fb8ff48c8bfc460298d180b436e53f0076cbe
Reviewed-on: https://code.wireshark.org/review/18588
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-31 05:05:50 +00:00
Guy Harris 45a023f3d0 Don't use proto_tree_add_{uint,uint64}() to add signed integer values.
Change-Id: I8c5506b746f16e5b79d024be5594cb71f95eced1
Reviewed-on: https://code.wireshark.org/review/18584
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-30 23:06:54 +00:00
Pascal Quantin e3b2b2fdc3 POP: replace wmem_strndup by tvb_memcpy
gdd3b977 introduced the use of wmem_strndup to ensure that the string is
NULL terminated.
But it also stops as soon as it finds a NULL character, which can happen
with malformed packets. So let's copy all the bytes with tvb_memcpy and
add manually a NULL character at the end of the buffer for safeness.

Bug: 13074
Change-Id: I9ae65d739a92bc6167e4acfc275e1909f3890815
Reviewed-on: https://code.wireshark.org/review/18582
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>
2016-10-30 20:51:18 +00:00
Gerald Combs e3b751f79e [Automatic update for 2016-10-30]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I192e3989204931901b9890366860abdfddf990a4
Reviewed-on: https://code.wireshark.org/review/18577
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-30 15:12:46 +00:00
Graham Bloice 670a373369 dnp3: improve data link layer dissection
Improve the dissection of the data chunks.

Change-Id: Ic87c84f0c3ea2ccceecb376698eed6b2f6a4e614
Reviewed-on: https://code.wireshark.org/review/18566
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: Roland Knall <rknall@gmail.com>
2016-10-30 08:49:02 +00:00
erikdejong f184dff876 sip: fix Authorization header with mixed quoted parameters
Fix to correctly read unquoted parameter values in Authorization lines.
Code in master branch will look for double quotes as the end of a
parameter value even in case the value is not enclosed in double quotes.
This fix checks if the first character in a value is a double quote in
which case it will scan until a non-escaped finishing double quote is
found to determine the end of the value string. If no double quote is
found as the start of the parameter value it will scan for a comma as
the end of the value string.

Change-Id: I5322caa146d3213bc94ad24528c2fa23cdea10f2
Bug: 13035
Reviewed-on: https://code.wireshark.org/review/18344
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30 08:48:24 +00:00
Dario Lombardo c9b5b6c13b hpfeeds: restore channel name in tree.
The channel name is also set in pinfo->match_string to be printed
by the json subdissector.

Change-Id: I9a1c4576ce6d253ef415bda7392b37f2c063c2db
Reviewed-on: https://code.wireshark.org/review/18560
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: Roland Knall <rknall@gmail.com>
2016-10-30 08:47:43 +00:00
Michael Mann b86d72a0d1 Allow ampq messages to be bigger than 64k
Also fix a field type conflict noticed in provided capture

Bug: 13050
Change-Id: I3d2643299b6db2729641c72b2e1f054f170b4907
Reviewed-on: https://code.wireshark.org/review/18571
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: Roland Knall <rknall@gmail.com>
2016-10-30 08:47:20 +00:00
Alexis La Goutte b8a766a8e6 DHCPv6: Remove check for Relay Data option about Bulk Leasequery reply
Bug: 13025
Change-Id: Ie9c12d4f013b5b88b9cce6a09577bc017a3ed655
Reviewed-on: https://code.wireshark.org/review/18480
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-30 00:45:17 +00:00
Pascal Quantin d1a7ed109b OpenFlow 1.4: check length to avoid rewinding offset
Bug: 13071
Change-Id: Ia9d55212fe8423311222330ed516da35ee9f53de
Reviewed-on: https://code.wireshark.org/review/18565
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>
2016-10-30 00:31:54 +00:00
Pascal Quantin 929ad3805f DCERPC: save strings in wmem file scope
Bug: 13072
Change-Id: Ib5f3d91be822a3d7180d95e3299dec978941c1d5
Reviewed-on: https://code.wireshark.org/review/18564
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>
2016-10-30 00:29:31 +00:00
Graham Bloice 1e1679db46 dnp3: fix indent and variable names
Change-Id: I86339a47f78c7b54e57896cc42184a27b5326cb0
Reviewed-on: https://code.wireshark.org/review/18563
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-10-29 16:58:01 +00:00
Yasuyuki Tanaka 23b79f9304 ieee802154: avoid extra dissection on Payload IEs & Cmd ID
Bug:13068
Change-Id: I4db500030ac2608e57bab4281f44576de9792076
Reviewed-on: https://code.wireshark.org/review/18558
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-29 10:51:22 +00:00
Yasuyuki Tanaka 0420dc1e7b ieee802154: handle multiple slotframe descriptors properly
Bug: 13069
Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651
Reviewed-on: https://code.wireshark.org/review/18559
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-29 10:50:20 +00:00
Mirko Parthey 183856f724 ISAKMP: Rename identifiers for readability
Rename attribute dissecting functions and their local variables to
improve code readability, and adjust white space.

old                               new
------------------------------------------------------------------
dissect_rohc_supported            dissect_rohc_attribute
dissect_transform_ike2_attribute  dissect_ike2_transform_attribute
option                            attribute
optlen                            value_len

rohc                              attr_type
transform_attr_type               attr_type
cfg_attr_type                     attr_type

rohc_tree                         tree
transform_attr_type_tree          tree
cfg_attr_type_tree                tree

sub_rohc_tree                     attr_tree
sub_transform_attr_type_tree      attr_tree
sub_cfg_attr_type_tree            attr_tree

rohc_item                         attr_item
transform_attr_type_item          attr_item
cfg_attr_type_item                attr_item
------------------------------------------------------------------

Change-Id: I135e5deb802edc575e7fddd1bb397272aac0888c
Reviewed-on: https://code.wireshark.org/review/18553
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-28 22:00:07 +00:00
Dario Lombardo d36a0c9adc hpfeeds: don't pass channel name to heuristic dissector.
Change-Id: Id7dd6e680b1bf798970c513561139bf19891129c
Reviewed-on: https://code.wireshark.org/review/18554
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-28 19:18:12 +00:00
Yasuyuki Tanaka 882a6ac1ee ICMPv6: resolve type errors on proto_tree_add_bitmask()
Bug: 13066
Change-Id: Ia00441a6eea49c56f75f1757041bc7732ff32d00
Reviewed-on: https://code.wireshark.org/review/18555
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-28 18:43:51 +00:00
João Valverde d47551982b Implement registration of capture dissectors by name
Mirror it after protocol dissector API.

Change-Id: I7985bcfa9e07654c7cf005efec94efc205d7a304
Reviewed-on: https://code.wireshark.org/review/18496
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-28 17:39:04 +00:00
Alexis La Goutte 01147f8369 LACP: Add HP IRF vendor TLV
Change-Id: I8c0d18f104bf37686b9b53ad9e7d1b9f8a709f5c
Reviewed-on: https://code.wireshark.org/review/18519
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>
2016-10-28 13:52:19 +00:00
Alexis La Goutte fa0e6adbc4 LACP: Add field for extra bytes (vendor specific)
Change-Id: I0b9725ed8972de3cb84215face3bae65eb27d575
Reviewed-on: https://code.wireshark.org/review/18518
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-28 13:51:31 +00:00
Alexis La Goutte b92292b48a LACP: Remove if(tree) check
and reindent

Change-Id: I3c8835f03e52858e7cb3262043a3fc895b1c4d19
Reviewed-on: https://code.wireshark.org/review/18517
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-28 13:50:32 +00:00
Jaap Keuter 8c1a5505de MPLS: Mark only Bottom-of-Stack label as flow label
When preference 'Assume bottom of stack label as flow label' is set
all labels are shown as flow labels. This has to be limited to that
MPLS label where Bottom-of-Stack is TRUE.

Change-Id: Iaa8abd095edb7de7f745a78c742a9347d4dbf3d9
Reviewed-on: https://code.wireshark.org/review/18516
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>
2016-10-28 13:47:09 +00:00
Harald Welte 77005d32b6 gsm_abis_om2000: Issue Expert Info when Enable Result != ENABLED
The point of sending an Enable Request is to enable the respective MO.
If the MO responds with any MO state != ENABLED there is something
fishy.  Let's inform the user with some Expert Info about it.

Change-Id: Ib33e5dbc37894049b93bb71782787b8c96c04326
Reviewed-on: https://code.wireshark.org/review/18454
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>
2016-10-28 13:44:56 +00:00
Jeff Morriss 64b5ae0892 automake: separate crypt C and header files.
Only pass the C files files to checkAPIs (to match cmake and to allow
checkAPIs to pass this directory).

Change-Id: I305aeaaf1882061bad166957ae83383a0f35dfb7
Reviewed-on: https://code.wireshark.org/review/18513
Petri-Dish: Jeff Morriss <jeff.morriss.ws@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>
2016-10-28 13:43:49 +00:00
Pascal Quantin 3b1d991371 ANSI IS-637 A: fix decoding of IA5 SMS
Give the right buffer to the decoding function

Bug: 13065
Change-Id: I0e41e04fb68602d95ea6f060c1a37c8b8596134d
Reviewed-on: https://code.wireshark.org/review/18548
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-28 12:47:01 +00:00
Joakim Karlsson 3c55e120db diameter: improvement of AVP 18
Will now show country and operator

Change-Id: Ic16623c226228ab0c3e31d33cda81953c80551d6
Reviewed-on: https://code.wireshark.org/review/18512
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 11:05:51 +00:00
Alexis La Goutte bdf99169cc btavdtp: fix fix spelling typo found by lintian
Change-Id: I15d4343787a7c6b1c16ca8aa77ef2ddd159e6ef0
Reviewed-on: https://code.wireshark.org/review/18543
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-10-28 07:42:04 +00:00
Alexis La Goutte 9f564e69a2 btatt: fix fix spelling typo found by lintian
Change-Id: I405e73d15badfa98c311391f22c57314e83bb9d0
Reviewed-on: https://code.wireshark.org/review/18542
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-10-28 07:41:56 +00:00
Alexis La Goutte c553cb19b1 bthci_cmd: fix fix spelling typo found by lintian
Change-Id: Ic7fd85db374df24358e53be66cd2432dca6a23d2
Reviewed-on: https://code.wireshark.org/review/18541
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-10-28 07:41:38 +00:00
Alexis La Goutte 90720b3dc1 carp: fix fix spelling typo found by lintian
Change-Id: I6a6b305863d5ecf2de7acad485d8079dca6993f4
Reviewed-on: https://code.wireshark.org/review/18540
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:41:15 +00:00
Alexis La Goutte 8881c607bf glusterfs: fix fix spelling typo found by lintian
Change-Id: I8f9f7b237b0191bbccfd65e3f70bf3f638a7c5ad
Reviewed-on: https://code.wireshark.org/review/18539
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:40:44 +00:00
Alexis La Goutte bb85c6bbd1 diameter_3gpp: fix fix spelling typo found by lintian
Change-Id: Ibee969abd9d393a7d5b4c6ab5b2eb204f54654a1
Reviewed-on: https://code.wireshark.org/review/18538
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:40:21 +00:00
Alexis La Goutte 78c051625a FIX: fix fix spelling typo found by lintian
Change-Id: I090457663759a5ee012402ef746d358aacfbe08c
Reviewed-on: https://code.wireshark.org/review/18537
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:39:55 +00:00
Alexis La Goutte 12611c631a RSVP: fix fix spelling typo found by lintian
Change-Id: I191473b1b95b293665b5617721c33ce978f5ce08
Reviewed-on: https://code.wireshark.org/review/18536
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:38:37 +00:00
Alexis La Goutte 1f1c16ebf7 gsm_rlcmac: fix fix spelling typo found by lintian
Change-Id: I949067c5f18f48ba954e54e6ca0c224744f85e41
Reviewed-on: https://code.wireshark.org/review/18535
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:38:10 +00:00
Alexis La Goutte 8f92ca709e hartip: fix fix spelling typo found by lintian
Change-Id: I89798a1dc1931ce44bc511da90726ff27ddfe583
Reviewed-on: https://code.wireshark.org/review/18534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:37:24 +00:00
Alexis La Goutte 8ab6d8ba82 usb-audio: fix fix spelling typo found by lintian
Change-Id: I853bc068cfca477c2ec5968d8b9a17873ec8011c
Reviewed-on: https://code.wireshark.org/review/18533
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:37:02 +00:00
Alexis La Goutte 63b6eabed8 ieee802154: fix fix spelling typo found by lintian
Change-Id: I0d3d56447aab6f012338016875bc05a9eaf3a2be
Reviewed-on: https://code.wireshark.org/review/18532
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:36:26 +00:00
Alexis La Goutte 236f25dfac RADIUS: fix fix spelling typo found by lintian
Change-Id: Iea8c96064c39d0e4aee5db6c72a8c120c56e495e
Reviewed-on: https://code.wireshark.org/review/18531
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:36:03 +00:00
Alexis La Goutte 120e515bf0 homeplug-av: fix fix spelling typo found by lintian
Change-Id: If75ea5e7e9ce16d270244f2a5aac86ad3abb30eb
Reviewed-on: https://code.wireshark.org/review/18529
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:35:32 +00:00
Alexis La Goutte 4eb3f7fe78 NTLMSSP: fix fix spelling typo found by lintian
Change-Id: I1f4c9340fcb33e2d92fc3d85d2e212da0ab6e1e2
Reviewed-on: https://code.wireshark.org/review/18528
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:35:01 +00:00
Alexis La Goutte 1fd33fd459 WAI: fix fix spelling typo found by lintian
Change-Id: I3d468c3b1ff0eb79136bc07859442ebd184c456f
Reviewed-on: https://code.wireshark.org/review/18527
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:29:32 +00:00
Alexis La Goutte d3290b58cf SSL: fix fix spelling typo found by lintian
Change-Id: Ied94f5fa5858fd6d9da7183eb05e32430554ec33
Reviewed-on: https://code.wireshark.org/review/18526
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-28 07:28:56 +00:00