Commit Graph

27983 Commits

Author SHA1 Message Date
Bill Meier c0a403abf3 6lowpan: Fix a few minor bugs; Also: Misc
(Bugs were introduced in gf5e2b42);
Misc:
    Localize a few variables;
    Remove some dead initializers.

Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278
Reviewed-on: https://code.wireshark.org/review/6687
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 20:49:18 +00:00
Bill Meier 5268d7f632 cattp: Minor tweaks and whitespace changes
Change-Id: I128318ffb385930f00675030227e0048306a9f4c
Reviewed-on: https://code.wireshark.org/review/6684
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-20 17:56:40 +00:00
Alexis La Goutte b2e172a238 DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities
Only display dissect of Modem Capabilites when sub option = 5
Actually, it is always display when ftype == special (like sub option = 0)

Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291
Reviewed-on: https://code.wireshark.org/review/6519
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 07:29:59 +00:00
Evan Huus f3cbee6aab NCP2222: fix possible buffer-overflow
Caught by ASAN (thanks Alexis!)

Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b
Reviewed-on: https://code.wireshark.org/review/6652
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 07:27:17 +00:00
Dario Lombardo 1af7b97927 Bug fix in json dissector that made the heuristic fail.
Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7
Reviewed-on: https://code.wireshark.org/review/6674
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>
2015-01-20 05:57:02 +00:00
Matthieu Texier 11e557a794 ISIS: Making a segregated function for sub-tlv used by multiple tlv
Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d
Reviewed-on: https://code.wireshark.org/review/6550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-20 05:43:22 +00:00
Guy Harris bea25fa0d4 The times in question are local, not UTC.
Revert to the older code, but just show the time as "Not representable"
if gmtime() fails.

Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb
Reviewed-on: https://code.wireshark.org/review/6672
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19 21:11:01 +00:00
Martin Kaiser 58d9ca80ac add some more apdus to the apdu table
Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c
Reviewed-on: https://code.wireshark.org/review/6670
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:59:40 +00:00
Martin Kaiser 6c02abf2d9 start dissecting the ZVT authentication apdu
add a length paramenter to the body dissection functions in the apdu table

Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60
Reviewed-on: https://code.wireshark.org/review/6669
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:59:06 +00:00
Martin Kaiser 4fc8286195 display the control field text in the info col
Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286
Reviewed-on: https://code.wireshark.org/review/6668
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:58:36 +00:00
Martin Kaiser c846af14b6 continue the dissection of ZVT APDUs
define an apdu table with the direction, minimum length
and a fuction to dissect the apdu payload

set the source and destination address columns depending on the apdu

add some entries to the apdu table

Change-Id: I52bd15bfab7bbe6c97dfe64084e69a51e65a8a6e
Reviewed-on: https://code.wireshark.org/review/6667
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:57:35 +00:00
Martin Kaiser 71d83aa0c3 tvb_length() -> tvb_captured_length()
Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c
Reviewed-on: https://code.wireshark.org/review/6666
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-19 20:56:57 +00:00
Bill Meier 0dcb91dd85 synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once
and not each time prefs are changed.

  Also: do minor whitespace changes.

Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1
Reviewed-on: https://code.wireshark.org/review/6663
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:51:36 +00:00
Bill Meier 7a81add848 synphasor: prevent possible crash; gmtime() can return NULL;
Don't do manual conversion of a time-field to UTC using gmtime().
Use the standard Wireshark mechanisms.

Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699
Reviewed-on: https://code.wireshark.org/review/6661
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:50:51 +00:00
Bill Meier 7e1d73d0d4 dmp, gmhdr, vssmonitoring: prevent possible crashes;
gmtime()/localtime() can return NULL.

Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6
Reviewed-on: https://code.wireshark.org/review/6660
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:50:26 +00:00
Bill Meier d1cace99e5 smb-pipe: prevent possible crash; gmtime() can return NULL.
For FT_ABSOLUTE_TIME fields:

Instead of calling gmtime()/mktime() to convert a time to UTC time
which is then displayed using proto_tree_add_time(),

Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then
display the field using proto_tree_add_item().

Change-Id: I1926c40de76a86072437902cb7621d3873827b11
Reviewed-on: https://code.wireshark.org/review/6659
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 20:49:58 +00:00
Alexis La Goutte b41065e223 BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a false error
Wrong offset (14 -> 20) to get IP Address Legnth

Issue Reported by Rui
Bug: 10873

Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc
Reviewed-on: https://code.wireshark.org/review/6657
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 20:34:21 +00:00
Alexis La Goutte 9fd507827e BGP: fix field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STRINGZPAD
Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd
Reviewed-on: https://code.wireshark.org/review/6656
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 20:33:39 +00:00
Guy Harris ab8a13dde8 Don't mix declarations and code - it's not legal C90.
Change-Id: I1a89c729255560d596e4d7701468cca3e9000357
Reviewed-on: https://code.wireshark.org/review/6655
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19 20:27:04 +00:00
Pascal Quantin c0fd5392af ZigBee: fix dissection of epoch time in OTA cluster
Bug: 10872
Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585
Reviewed-on: https://code.wireshark.org/review/6653
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-19 20:07:00 +00:00
Josip Medved c8bca4fa9a Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks.
Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a
Reviewed-on: https://code.wireshark.org/review/6647
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19 16:53:04 +00:00
Alexis La Goutte 1b5a965bab JSMN : fix typo (it will be fix make distcheck)
Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db
Reviewed-on: https://code.wireshark.org/review/6649
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 08:49:31 +00:00
Alexis La Goutte 48e90daaba Fix make dist on Ubuntu buildbot
Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f
Reviewed-on: https://code.wireshark.org/review/6648
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-19 07:38:51 +00:00
Josef Baumgartner f90a10a0d5 epl: Rework POWERLINK (EPL) dissector
With this patch we want to enable a better support of POWERLINK
 as a protocol for people who have to perform network diagnostics using
 analyzing tools. Up until now, the main tool used was Omnipeek.
 Now wireshark will be used more and more, due to the new extcap
 infrastructure, which supports debug tools to be added as capture
 devices.

 To better facilitate that change, we have adapted the textual
 representation of the Omnipeek dissector for POWERLINK, as it
 allows for a faster and simpler diagnosis routine.

 Additionally the name of the protocol has been changed to it's
 correct name "POWERLINK" as this is the official name used by
 EPSG for describing the protocol.

Changelog:
 - Add error code definitions and string values.
 - Change name for protocol column to POWERLINK which is more commonly
   used than EPL.
 - Reformat output in info column to look like output the output of
   the POWERLINK plugin for Omnipeek. This facilitates the transition
   to Wireshark. The added information and changed output improves the
   debugging of POWERLINK nerworks.

Change-Id: I795e2487f2ae7af6b90c29366a1843c9fabffa85
Reviewed-on: https://code.wireshark.org/review/5581
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-19 07:18:48 +00:00
Dario Lombardo f53be88408 JSON dissector changed into heuristic dissector.
To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT).
TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part.

HPFEEDS dissector has also been changed in order to leverage the new json dissector.

Bug: 10834
Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978
Reviewed-on: https://code.wireshark.org/review/6350
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 03:12:01 +00:00
Luke Mewburn 119416ef27 TCAP: support dialogue confirmation
TCAP permits the changing of the originating address on the first
backwards continue (i.e. the establishment of the dialogue).
See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue.
In practice, a BEGIN replied to with an END can also exhibit this behaviour.

For example, a BEGIN from GT A TID TA -> GT B,
and the reply CONTINUE from GT B2 TID TB -> GT A TID TA.
To support this, only support a single address hash in
tcaphash_begin_info_key_t and tcaphash_end_info_key_t.
The match of the first CONTINUE should find the appropriate
tcaphash_begin and create the appropriate tcaphash_end entries.

Also fix compile warning with DEBUG_TCAPSRT.

Bug: 10841
Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd
Reviewed-on: https://code.wireshark.org/review/6446
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 03:08:54 +00:00
Diederik de Groot c4297e6391 Skinny: packet-skinny.c
Changes: Number of small changes to the xml file:
	- some fields being connected to the wrong message version
	- some header field naming

Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352
Reviewed-on: https://code.wireshark.org/review/6602
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 02:57:49 +00:00
Sergio Moreno Mozota 199cb062e1 RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte
some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes.

Bug: 10513
Change-Id: I6f20073a00ed0f791fa99701534360d304060053
Reviewed-on: https://code.wireshark.org/review/6606
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
2015-01-19 02:57:13 +00:00
Michael Mann e333e4c90f Convert OID APIs to use wmem.
There are a few oid functions that are only called in oids_test.c.  I'll presume the APIs are used in proprietary dissectors rather than just remove them.

Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f
Reviewed-on: https://code.wireshark.org/review/6592
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19 02:52:11 +00:00
Guy Harris 59155d1d1c Eliminate ep_strdup(), as it's no longer used.
Also, remove some no-longer-existent functions from checkAPIs.pl.

Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1
Reviewed-on: https://code.wireshark.org/review/6645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-19 01:49:24 +00:00
Bill Meier 5162b7f146 smpp: Prevent crash if invalid date/time field.
gmtime()/localtime() can return NULL;

Bug 10868
Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb
Reviewed-on: https://code.wireshark.org/review/6644
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-19 00:07:31 +00:00
Guy Harris 4cea624bd7 This currently requires emem.h.
Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8
Reviewed-on: https://code.wireshark.org/review/6642
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 23:46:57 +00:00
Guy Harris 59702234b9 Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff.
(The se_ stuff wasn't as contiguous as I thought.)

Also fix some comments to no longer refer to #defines for se_ stuff.

Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16
Reviewed-on: https://code.wireshark.org/review/6641
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 22:17:19 +00:00
Guy Harris 820c795618 This file currently does need emem.h.
Change-Id: I27e709470d92d4be32ae42a3f4672f2070eaf65e
Reviewed-on: https://code.wireshark.org/review/6639
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 21:31:01 +00:00
Guy Harris 7940bbc192 Nobody uses se_ allocations, so remove the code for them.
Don't check for se_ routines in checkAPIs; the failure to compile or
link will suffice to catch attempts to use them.

Update comments in another test script to reflect the disappearance of
the session allocator.

Change-Id: If50d953c7130f48b696bc2dd9d327bea2af49bd4
Reviewed-on: https://code.wireshark.org/review/6638
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 21:28:04 +00:00
Guy Harris d2d4cf27e6 Remove a couple more apparently-no-longer-necessary emem.h includes.
Change-Id: I007a904613653b60a5b1a4fdc8261bc1480e41c6
Reviewed-on: https://code.wireshark.org/review/6637
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 21:10:41 +00:00
Guy Harris 050bc7d100 Update some comments to reflect reality.
Get rid of references to ep_ and se_ allocation in code that now uses
wmem allocation instead.

Fix API documentation of conversation_table.h routines to reflect that
as well - some APIs changed to pass wmem scopes.

Also, zbee_sec_key_hash() now takes the output buffer as an argument and
just returns it, and nobody actually uses the return value, so change it
to return void.

Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a
Reviewed-on: https://code.wireshark.org/review/6636
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 21:02:40 +00:00
Evan Huus 929d41c685 Replace the last THROW ep_ calls with wmem
They (should) all be strictly within the context of dissection, so can just
become packet_scope.

Change-Id: Iaaa733628132f3ee3f1597f3df956e44080734f6
Reviewed-on: https://code.wireshark.org/review/6631
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-18 20:24:26 +00:00
Evan Huus 212eb17816 replace DISSECTOR_ASSERT ep strings with wmem
the DISSECTOR_ASSERT macro and friends are all guaranteed to be called within
the scope of a dissection, so they are safe to replace with wmem_packet_scope.

Change-Id: I2684fb902da78d50aca5f4644df66c060caff625
Reviewed-on: https://code.wireshark.org/review/6629
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-18 20:24:17 +00:00
Guy Harris 44e7ce54ff Remove some apparently-unnecessary includes of emem.h.
Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80
Reviewed-on: https://code.wireshark.org/review/6635
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 20:19:05 +00:00
Bill Meier 24954d6bdf proto.c: Update some comments to reflect reality
Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec
Reviewed-on: https://code.wireshark.org/review/6634
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-18 19:49:03 +00:00
Guy Harris 233dc643a6 Remove some apparently-unnecessary includes of emem.h.
Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5
Reviewed-on: https://code.wireshark.org/review/6632
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-18 19:36:36 +00:00
Michael Mann 71c21a6a46 Remove seasonal memory from address resolution.
This is the last remaining use of se_ memory APIs.

Change-Id: Ic0508a830bc5460bc743d21eb33ffdd7f4ce2eb5
Reviewed-on: https://code.wireshark.org/review/6574
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18 18:19:34 +00:00
Martin Kaiser 90fc37e855 make things a bit easier to read...
Change-Id: I3499c2f9e07a960f8bdf83973693bdeb4fb4ebd9
Reviewed-on: https://code.wireshark.org/review/6630
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18 17:10:43 +00:00
Martin Kaiser 1722d2a5bb remove trans_info parameter from dissect_usb_hid_report_item()
Change-Id: I04eba644be7dd3e64b67c7d42c596bcdcf6a1942
Reviewed-on: https://code.wireshark.org/review/6628
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18 16:37:06 +00:00
Martin Kaiser 4399319cb5 clean up the functions that dissect the hid requests
Change-Id: Ie4d52b62824a8c0c777ffce3988fbe1fd4e5b4a4
Reviewed-on: https://code.wireshark.org/review/6627
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18 16:36:44 +00:00
Martin Kaiser 9ba910fffd remove redundant (and unused) paramter usb_trans_info
Change-Id: Ibb683f6d42125b13417aceb06949102a9821d626
Reviewed-on: https://code.wireshark.org/review/6626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-01-18 16:36:22 +00:00
Gerald Combs 2441a232ab [Automatic manuf, services and enterprise-numbers update for 2015-01-18]
Change-Id: If1c72e3b58ced6b9b86a584d96f632b2433751e8
Reviewed-on: https://code.wireshark.org/review/6623
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 16:04:44 +00:00
Pascal Quantin 0d92b99059 ISUP: add dissection of generic number qualifier indicator
Bug: 10865
Change-Id: Ib4cd60f570250490d5417c692f487711a65536b1
Reviewed-on: https://code.wireshark.org/review/6620
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>
2015-01-18 15:14:29 +00:00
Pascal Quantin b01ef11f87 HTTP: revert a change done in g0ee179c
As indicated in the comment above, the previous code was done on purpose to handle the NUL case

Bug: 10866
Change-Id: I66eb9f6fbc9477456310978b420ba30975d81b0a
Reviewed-on: https://code.wireshark.org/review/6621
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 14:38:30 +00:00