Commit Graph

22084 Commits

Author SHA1 Message Date
Pascal Quantin a2beef95db Fix assertion when applying conversation color
Packet scoped memory cannot be used here; let's use the pinfo pool

Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f
Reviewed-on: https://code.wireshark.org/review/6061
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26 22:18:09 +00:00
Pascal Quantin ea6a5780c5 Try to fix compilation broken by g3d3f973
Change-Id: I26833e9a4f7557b5824effaff16b38d2c4367772
Reviewed-on: https://code.wireshark.org/review/6059
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26 21:50:24 +00:00
Michael Mann 3d3f97320b Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26 21:17:10 +00:00
Bill Meier b68fb9b659 Fix some dissectors doing termio (fprintf(stderr,..), g_warning()).
- Use report_...failure() (in most cases).
- Also: Do some misc fixes in certain disectors
  - re-arrange order of #includes
  - Fixup preferences help text

Change-Id: I385f6f97257f365f53ce611df02f57f9257dc5f9
Reviewed-on: https://code.wireshark.org/review/6039
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26 20:55:25 +00:00
Michael Mann 4cf6583b9e Remove proto_tree_add_text from ZigBee dissectors.
Change-Id: I0488cb0ab33f2cc6dee227f1bfacec58eafc4190
Reviewed-on: https://code.wireshark.org/review/6055
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26 20:41:49 +00:00
Pascal Quantin a442a1c0e8 WCCP: initialize address table to 0
It prevents an uninitialized access later on if an exception is triggered before filling the table

Bug: 10806
Change-Id: I8f75fb18cd8d033013c34093f9d6c8762f23452b
Reviewed-on: https://code.wireshark.org/review/6056
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26 18:58:07 +00:00
Bill Meier f2224bc578 rpc: Prevent "malformed" for RPC 'NULL proc' packets.
Bug: 10646
Change-Id: Ifb96768969a43c59367b73e7bb940ceeb02cf6b0
Reviewed-on: https://code.wireshark.org/review/5700
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-26 07:26:33 +00:00
Martin Mathieson adb81f335d Deleting unnecessary #includes from dissectors.
Fifth batch (packet-rtp.c -> end).

Will look at cleaning up and committing script afterwards.

Change-Id: I8ed61dc941d98d3f7259a9d1f74e214eb7b4bfa2
Reviewed-on: https://code.wireshark.org/review/6052
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-25 22:43:20 +00:00
Ilya Gavrilov b6f70ed3f8 NBAP: fix ddi missed for non first macdflow_id in E-DCH channel
Change-Id: Ib93cac8a4b186114f50ef4a26bdace2d72219644
Reviewed-on: https://code.wireshark.org/review/6022
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>
2014-12-25 00:28:50 +00:00
Alexis La Goutte 499a7d0f0a TCP: TCP Fast Open Cookie is now standardised
The kind for TFO is 34

Split dissect TFO option in dedicated function (Using also in TCP Option Experimental with Magic 0xf989)

Change-Id: I18ff9ba110fba708a955f448f272ec7c4a7e264e
Reviewed-on: https://code.wireshark.org/review/6033
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-24 23:02:58 +00:00
Stephen Fisher 59bdad31ad packet-git.c says it was copied from packet-pop, but that doesn't mean
packet-git is for "RFC 1939" (POP3), so remove that comment.

Change-Id: Ia78ea18beb1a13ab0ad1ad5a87f7b5a887fad918
Reviewed-on: https://code.wireshark.org/review/6041
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-24 23:02:29 +00:00
Alexis La Goutte 1bbe6e6411 TCP: fix indent and reorder Multipath TCP
Change-Id: I4ebe474f2a2787c350fe8c4a2de5c35d94d9b064
Reviewed-on: https://code.wireshark.org/review/6032
Reviewed-by: Matthieu Coudron <mattator@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-24 22:59:54 +00:00
Hadriel Kaplan 4b6141bf22 GIOP dissector doesn't handle two packets in a row
Make the GIOP TCP-based dissector correctly handle multiple GIOP
messages in a TCP segment, and when the second is malformed.

Bug: 10760
Change-Id: Ie82a1d72a43218e50c6856028a5ef25ad1f0c340
Reviewed-on: https://code.wireshark.org/review/6025
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24 21:26:55 +00:00
Michael Mann e03ffe2583 Replace fc_to_str with address_to_str or tvb_fc_to_str.
Change-Id: I69bf25f5abb9d6ad325f922fab73b6f0cf8ca2ea
Reviewed-on: https://code.wireshark.org/review/6035
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>
2014-12-24 18:59:14 +00:00
Alexis La Goutte d3888ff69f RSVP: fix display of unknown Juniper Attribut
Get "Trying to fetch an unsigned integer with length" when length > 4

Change-Id: If5e53b826d98f2c30253ea852754f856e1d29088
Reviewed-on: https://code.wireshark.org/review/6038
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24 17:44:08 +00:00
Alexis La Goutte 762bb18b9d RSVP: Conversations / Endpoint: wrong filter when select a RSVP conversations / endpoint (INVALID == a.x.y.z ...)
Change-Id: I70f6afd41eefddb42829c3d5f890ea67dcd65537
Reviewed-on: https://code.wireshark.org/review/6037
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24 17:42:37 +00:00
Enrico Jorns 29d02a3134 canopen: Verbosity for INFO column
Display basic information about what is going on in the INFO column to
ease protocol debugging.

Change-Id: I2a3aba8008bf65ab9e236a3d81335cf723b2edd0
Reviewed-on: https://code.wireshark.org/review/5521
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-24 14:57:49 +00:00
Alexis La Goutte a0e9fe5f43 TDS: Missing break in switch (CID 280475 & 281377)
Change-Id: I9416e07f497081f7117e8c3ccb741ea601de9cdd
Reviewed-on: https://code.wireshark.org/review/5993
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-24 13:16:20 +00:00
Stephen Fisher 7d87adf5cd packet-reload needs conversation.h still
Change-Id: I75415dfcfa1c63bd9c43b7bedab2ac3873a60326
Reviewed-on: https://code.wireshark.org/review/6024
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 20:43:54 +00:00
Martin Mathieson 7e8a4b0927 Deleting unnecessary #includes from dissectors.
Fourth batch (packet-mac-lte.c -> packet-rtp.c).

Will look at cleaning up and committing script afterwards.

Change-Id: Id921f07f4b274f0cfb77ce81abe4a285fdb8b644
Reviewed-on: https://code.wireshark.org/review/6023
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 17:16:40 +00:00
Martin Mathieson 9d7709e7b7 Restore prefs.h for ipv6 too
Change-Id: Ibdc7098532c1aff7ec6135b8e4460056049f9089
Reviewed-on: https://code.wireshark.org/review/6020
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 15:16:04 +00:00
Martin Mathieson 78edcffdd0 Adding back epan/prefs.h to try to fix build
Change-Id: Ie532d81817653edfb20b7afefb28be21a627b239
Reviewed-on: https://code.wireshark.org/review/6019
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 15:03:39 +00:00
Martin Mathieson 86ed26f0b8 Deleting unnecessary #includes from dissectors.
Third batch (packet-icmpv6.c -> packet-mac-lte.c).

Will look at cleaning up and committing script afterwards.

Change-Id: Ib91e36ad200db01c3000605f6a7a21125b96a640
Reviewed-on: https://code.wireshark.org/review/6018
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 14:44:28 +00:00
Martin Mathieson 35949f3c89 Restore stdlib.h (should not have been deleted - mispelt in script)
Change-Id: I43387489ed29beff5a523e78cabcfb9e3ea8a182
Reviewed-on: https://code.wireshark.org/review/6015
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:57:33 +00:00
Martin Mathieson 28e24adadd epan/llcsaps.h was needed, so restore include
Change-Id: I443db244bde04af9397bcb5bfa3a1888b0560bf0
Reviewed-on: https://code.wireshark.org/review/6014
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:39:06 +00:00
Martin Mathieson 48db2548a9 Deleting unneccessary #includes from dissectors.
Second batch (packet-eth.c -> packet-icmpv6.d).

Will look at cleaning up and committing script afterwards.

Change-Id: I14295758b81a59115d8c88899f166cc3d5d17594
Reviewed-on: https://code.wireshark.org/review/6013
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:22:54 +00:00
Alexis La Goutte 0e78f7eb0e RTPS: Missing break in switch (CID 996922)
Change-Id: I2b8a12d54414a1b2d878285b8c840de9586fcb5e
Reviewed-on: https://code.wireshark.org/review/5992
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:54:07 +00:00
Alexis La Goutte b87b3db7b4 NetScaler Trace: Missing break in switch (CID 281457, 727776 & 1021060)
Change-Id: I575114ba364da1b1d63eea8fc7b48c8c0e0bc99d
Reviewed-on: https://code.wireshark.org/review/5991
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:52:54 +00:00
Alexis La Goutte 216cc12ff4 NASDAQ ITCH: Missing break in switch (CID 280465)
Change-Id: I0f3ef7a39d9659b14ff472d2d3e59565db43ec3e
Reviewed-on: https://code.wireshark.org/review/5990
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:51:02 +00:00
Alexis La Goutte 4df23062b6 ISNS: Missing break in switch (CID 280460)
Change-Id: Iaaa56e17e49cd42e18e55e316c691a22bbbdf8f1
Reviewed-on: https://code.wireshark.org/review/5989
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:49:29 +00:00
Alexis La Goutte f1038652c6 RSVP: RECORD_ROUTE IPv4 Subobject Flags field incorrect decoding
The Flags field within RSVP RECORD_ROUTE IPv4_Subobject is decoded incorrectly.
Wireshark thinks that 0x10 bit represents Node-ID, but actually the Node-ID is encoded by bit 0x20 (per RFC 4561)

Issue reported by  Alexander Okonnikov

Bug:10799
Change-Id: I48f6aa35c08945aacf8f2bb871a72b5927511948
Reviewed-on: https://code.wireshark.org/review/5944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:44:58 +00:00
Alexis La Goutte f1562e283c NDPS: Missing break in switch (CID 281286)
Change-Id: I2363370249d7beb2ed8a29987ac2cb602979d0a3
Reviewed-on: https://code.wireshark.org/review/5988
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:29:59 +00:00
Alexis La Goutte c3d7080485 Makefile (epan/dissectors): fix indent (use tabs)
Change-Id: I72d2dbc05f7cfbd7adf05ed66be81946942cef3b
Reviewed-on: https://code.wireshark.org/review/5984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:09:44 +00:00
Bill Meier 3d05935f74 kerberos: Re-add needed #include <stdio.h>
Change-Id: I85c0e5f022b5c04df6079e118e376e8d598675aa
Reviewed-on: https://code.wireshark.org/review/6011
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 06:03:04 +00:00
Bill Meier dd859eada4 asn1 generated dissectors: cleanup #include usage
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
Reviewed-on: https://code.wireshark.org/review/6008
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 05:39:00 +00:00
Stephen Fisher ae6df38436 packet-dtls.c still needs conversation.h
Change-Id: I1e6a55c41cbab74790880da2b3691cd7d82bc276
Reviewed-on: https://code.wireshark.org/review/6004
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:23:31 +00:00
Stephen Fisher 3d62d2c396 Move popcount() to an optionally built part of wsutil for systems that
provide their own popcount().

Change-Id: Ic26f3b50cf0bd2b4af0d42e9c27488ebbac1ab33
Reviewed-on: https://code.wireshark.org/review/5998
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:22:23 +00:00
Guy Harris 59b4ab53fc Include <math.h> or <stdlib.h> as necessary to declare functions.
Various floating-point math functions require <math.h>, and abs()
requires <stdlib.h>.

Change-Id: I6831cfdb17eac3ce129b6800f0fe82fbcfef2d28
Reviewed-on: https://code.wireshark.org/review/6002
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 21:52:08 +00:00
Guy Harris d541774a61 Include <math.h> or <stdlib.h> as necessary to declare functions.
Various floating-point math functions require <math.h>, and abs()
requires <stdlib.h>.

Change-Id: Iadba9e0d7168bba6e67d9221e757a85960507742
Reviewed-on: https://code.wireshark.org/review/5999
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 21:24:15 +00:00
Martin Mathieson 596669f921 First batch of unincludes. Last attempt...
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-22 21:03:13 +00:00
Stephen Fisher b0181288e2 Cast a parameter in the kerberos dissector so it compiles without
warnings on NetBSD.

Change-Id: Id1ab5020fa53656065b0b2438071342eae4f7adb
Reviewed-on: https://code.wireshark.org/review/5987
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-22 19:43:30 +00:00
Alexis La Goutte 30c3d394ad Revert "Move packet-kerberos.c to the dirty dissectors because it generates warnings (at least on NetBSD), presumably due to our use of -Wc++-compat:"
This reverts commit d4ff430b4d.

Change-Id: Icb0907e649555237b4a86f9f651ec4df8d79d99b
Reviewed-on: https://code.wireshark.org/review/5975
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-22 17:11:28 +00:00
Sergey Avseyev 352bd87486 packet-couchbase.c: remove field which does not exists
Change-Id: Ia4a2a6127edbb6a92becf22cd6ee689e5e2a7966
Reviewed-on: https://code.wireshark.org/review/5981
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-22 16:17:25 +00:00
Alexis La Goutte 5248c0df21 Fix unknown command tag name [-Wdocumentation-unknown-command]
Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976
Reviewed-on: https://code.wireshark.org/review/5979
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:24:28 +00:00
Alexis La Goutte f8720a6e44 ANSI MAP: Remove from Dirty ASN1 list
Change-Id: I192c447919ee9c3f430f058c2e5285501af962bf
Reviewed-on: https://code.wireshark.org/review/5977
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:25 +00:00
Alexis La Goutte 414701dfcb ANSI_MAP: Fix unused function (by add to .OMIT list)
Change-Id: I4e2278d563659db6acc6c02b9e66d58c67939e30
warning: unused function 'dissect_ansi_map_InvokeData' [-Wunused-function]
warning: unused function 'dissect_ansi_map_ReturnData' [-Wunused-function]
Reviewed-on: https://code.wireshark.org/review/5976
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:17 +00:00
Alexis La Goutte 3cb816ccb7 PTP: Fix ptp_tree may be used uninitialized in this function [-Werror=maybe-uninitialized]
Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545
Reviewed-on: https://code.wireshark.org/review/5974
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:22:36 +00:00
Martin Kaiser 67cbafaa46 remove unnecessary integer overflow checks
... and don't call THROW() from a dissector

If we have a guint32 a and interpret 2*a as gint, we'll always end up
with a negative value if 2*a overflows. Both tvb_get_string_enc() and
proto_tree_add_item() handle this case and throw an exception.

Change-Id: Ibb142328837b6a583057531c76d08631fc731848
Reviewed-on: https://code.wireshark.org/review/5948
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-22 08:17:40 +00:00
Doug Brown 37940ee5ad Fix AARP AppleTalk address parsing
AppleTalk addresses are 3 bytes long and stored in AARP packets as 4 bytes.
The high byte should be 0, followed by 2-byte network number, followed by
1-byte node number.

The previous code was assuming that the high two bytes were the network number,
followed by the 1-byte node number, followed by 0.

Change-Id: I467ec6edac353796db0b96fbac65658d5c5491d3
Reviewed-on: https://code.wireshark.org/review/5968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 06:57:42 +00:00
Guy Harris 7b721a1c0e Squelch a compiler warning.
("Can't happen", but that requires more dataflow analysis than some
compilers do.)

Change-Id: I5c6acbff64ea88f9b43d5580522bc144465dc9ac
Reviewed-on: https://code.wireshark.org/review/5972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 06:42:59 +00:00