Commit graph

22100 commits

Author SHA1 Message Date
Alexis La Goutte
fce9da32be Zebra: Fix some indent typo
Change-Id: I41869fe46e6867333d14f6f86953ff01e2d112a8
Reviewed-on: https://code.wireshark.org/review/6114
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29 16:34:34 +00:00
Alexis La Goutte
211789cfe0 OpenFlow: Capatilize O and F of OpenFlow (when use Decode as)
Remove also a trailing whitespace in OpenFlow TCP port preference

Change-Id: I5c3f42e634e0fee4fecf1a7f2dd1c75a68165b45
Reviewed-on: https://code.wireshark.org/review/6113
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29 16:33:39 +00:00
Bill Meier
10bfe2c43f dcerpc: Replace g_warning() by expert...() (dissectors shouldn't do termio).
Change-Id: If51a9acbb3b5a5b1623c72651c8a3ef2dd8ad068
Also: Replace (one of many) proto_tree_add_text() instances.
Reviewed-on: https://code.wireshark.org/review/6117
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29 16:18:57 +00:00
Michael Mann
5b088af31f Eliminate proto_tree_add_text from packet-spice.c
Also do some cleanup in dissect_spice() and replace g_warning calls.

Change-Id: I4dc6f6496bb5ae54157aa6f7f27f21c396da623c
Reviewed-on: https://code.wireshark.org/review/6106
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-29 13:57:30 +00:00
Stig Bjørlykke
5e16157de5 p_mul: Added checksum from ACP 142(A)
Bug: 10807
Change-Id: Ifd1ea5d67b65a7e7997458785fff95cc471e0dbc
Reviewed-on: https://code.wireshark.org/review/6076
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-12-28 21:00:26 +00:00
Michael Mann
71c02b20eb Create FT_FCWWN field type.
Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type.

Change-Id: I4ca77870499fd8239584a70874998b5d194a7167
Reviewed-on: https://code.wireshark.org/review/6036
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28 20:05:29 +00:00
Martin Kaiser
f3fd6b5528 The symbol rate in the Cable Delivery System Descriptor is in Mega-Symbols/s
Change-Id: I1446500f1c5c89b8ed94c04b04bb6985ae827731
Reviewed-on: https://code.wireshark.org/review/6095
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-28 17:46:07 +00:00
Michael Mann
1d598bbff7 Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28 14:09:27 +00:00
Dario Lombardo
63ebe918d9 Removed duplicated #include lines
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
Reviewed-on: https://code.wireshark.org/review/6065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-28 00:02:39 +00:00
Hadriel Kaplan
ea6f5a3c7e Zebra dissector highlights wrong byte for version and is missing some fields
Bug: 10809
Change-Id: I916d3ee0644570b689b35575e7277fc7d5ee3396
Reviewed-on: https://code.wireshark.org/review/6081
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-12-27 19:40:46 +00:00
Pascal Quantin
25c7e0d9df OpenFlow: fix dissection of async_config_prop structure
Bug: 10808
Change-Id: I5ef46cd6b85c415e23dfdbe7a56c8b332eaae5a3
Reviewed-on: https://code.wireshark.org/review/6078
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>
2014-12-27 17:03:24 +00:00
Pascal Quantin
0ea310dd2f SRVLOC: fix some fields registration (regression introduced in ga1c6341)
Change-Id: I318f4889b94021ece1e61ae080b77b1fb21eae7b
Reviewed-on: https://code.wireshark.org/review/6077
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-27 15:36:30 +00:00
Michael Mann
a1c634180e Eliminate proto_tree_add_text from packet-srvloc.c
Change-Id: I73a2270e259414f21a695d2b279df5b3cac27bb8
Reviewed-on: https://code.wireshark.org/review/6067
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-27 14:46:22 +00:00
Guy Harris
c04aebd761 Declare cur_rt in the narrowest possible scope.
Change-Id: I0604d6f9f4bb2c58bb74a9b375f644474b68c28f
Reviewed-on: https://code.wireshark.org/review/6074
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-27 10:58:11 +00:00
Pascal Quantin
ca6f84916f IP: try to fix OSX 10.5 x86 compilation
packet-ip.c: In function 'dissect_ip':
packet-ip.c:2297: warning: 'cur_rt' may be used uninitialized in this function
packet-ip.c:2297: note: 'cur_rt' was declared here

Change-Id: I97fe33d2a01e982f057cce6d68f64378727be2da
Reviewed-on: https://code.wireshark.org/review/6073
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>
2014-12-27 10:44:45 +00:00
Pascal Quantin
2c6d2bb1e5 UDP: fix 'Follow Stream' button from conversations tab
Add stream index to conversation table

Change-Id: Id63b2cc0000d89297c8638b9a89315096fc5458b
Reviewed-on: https://code.wireshark.org/review/6062
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26 22:37:33 +00:00
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