Commit Graph

56085 Commits

Author SHA1 Message Date
AndersBroman dab9f76204 [ISUP] Add dissection of Japan TTC EMERGENCY CALL INDICATOR
Change-Id: I63cdb7eead49207cf66ea36d1da966d1bbec4320
Reviewed-on: https://code.wireshark.org/review/5774
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-15 15:33:31 +00:00
Michal Labedzki a89c17fb52 Bluetooth: BTLE: Add src/dst addresses when they are known
Generally where it is not connection then on LinkLayer protocol level
addresses for Source and Destination device are known.

Change-Id: I28da88381a26826ad4897b56da993909130683d3
Reviewed-on: https://code.wireshark.org/review/5768
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:27:05 +00:00
Michal Labedzki afacb1c070 Bluetooth: Fix CRC Init length in Ubertooth
Change-Id: If4292c85598e2449eff54d6680274edc3c3e4fa2
Reviewed-on: https://code.wireshark.org/review/5770
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:25:53 +00:00
Michal Labedzki 79d6a157ba Bluetooth: BTLE: SN, NESN should be numbers not booleans
SN = Sequence Number, so it is not bool.

Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7
Reviewed-on: https://code.wireshark.org/review/5769
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:25:36 +00:00
Michal Labedzki 657e42bc40 cmake: Do not hide possible options for other platforms
Change-Id: I408620cb39a25a4104e9ea562f6512f4196ae32f
Reviewed-on: https://code.wireshark.org/review/5766
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:25:00 +00:00
Michal Labedzki fddbbdd212 Translates: Update Polish translation
Also fix typo.

Change-Id: If494e7ae8e24cf394b4c67208799e6fb358cf8f0
Reviewed-on: https://code.wireshark.org/review/5767
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:23:58 +00:00
Alexis La Goutte 691973469f HTTP2: Update nghttp2 lib (0.6.7)
lot of change but it is majority reindent change (Using clang-format)

Change-Id: Idcd0fa79ca977e25d69eb80a89d3c61d228885e9
Reviewed-on: https://code.wireshark.org/review/5764
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-15 07:58:36 +00:00
maisheri 9815dc19fb Add support for EAPOL-MKA (802.1x-2010)
Use by MACSec

Change-Id: I27eee40ddc476435aecd57711c1b3597c2049901
Reviewed-on: https://code.wireshark.org/review/5751
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-14 22:36:59 +00:00
Pascal Quantin 16f38e9ab2 Kerberos: import KRB5_AD_WIN2K_PAC dissection from old non ASN.1 based dissector
Bug: 10539
Change-Id: I06d1179210bdcc63800ef9580bb274c714a77c6e
Reviewed-on: https://code.wireshark.org/review/5761
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-14 18:43:38 +00:00
Pascal Quantin e9f96832bd GSM SMS: fix dissection of Character Set IE
Also do not display a 8bits data SMS as an expert error
Those 2 points led me to a wrong analysis yesterday

Change-Id: Ib319e2ef8f0e7297cd2e119b6d0d98638e6a3d61
Reviewed-on: https://code.wireshark.org/review/5763
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-14 18:03:11 +00:00
Gerald Combs 44e14b7805 Qt: Defer startup messages.
Wait until we've completely started up to show accumulated warnings and
errors.

Replace three periods with an ellipsis.

Change-Id: Ic3b268836e4e4429786c5eba4862cbc0458a19b5
Reviewed-on: https://code.wireshark.org/review/5762
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-14 17:53:22 +00:00
Gerald Combs 85ed008287 [Automatic manuf, services and enterprise-numbers update for 2014-12-14]
Change-Id: Ic1cf4600f35ca5e573c88e758971c578489ab673
Reviewed-on: https://code.wireshark.org/review/5758
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-14 16:04:59 +00:00
Bill Meier 1725eee48e Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
Change-Id: Ie8cb993bb9dd3e8dbfa1876a4e731bca10ee0507
Reviewed-on: https://code.wireshark.org/review/5754
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 21:59:55 +00:00
Bill Meier 5992ef414e plugins: replace ENC_NA by ENC_..._ENDIAN when fetching integral types
Change-Id: I3958bbd0eadd4472a003ea272e596026ad8731d1
Reviewed-on: https://code.wireshark.org/review/5753
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 21:59:25 +00:00
Bill Meier 94d7e8d838 Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_LITTLE_ENDIAN).

Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd
Reviewed-on: https://code.wireshark.org/review/5752
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 21:58:59 +00:00
Bill Meier ff46ac56ca rfid-pn532.c: Use FT_UINT24 to display complete hex value for three 3-byte fields.
Specifically: the fields are fetched as 3 bytes, but had a
 type, display of FT_UINT8, BASE_HEX so only that the LO byte was
 displayed.

Change-Id: I06ea7b9527ae788be7f19278e8ba4dc2d34b2777
Reviewed-on: https://code.wireshark.org/review/5747
Reviewed-by: maisheri <maisheri.hitesh@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 21:27:54 +00:00
Bill Meier ae844d90e9 gsm_sms: Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields
Change-Id: If41cf6c10e4af8554cd8f6a69bd8654ad7262c85
Reviewed-on: https://code.wireshark.org/review/5749
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 18:53:15 +00:00
Bill Meier f412c9a01a Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_BIG_ENDIAN).

Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
Reviewed-on: https://code.wireshark.org/review/5748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 18:45:56 +00:00
Pascal Quantin 7592d39d46 GSM SMS: fix 'msg_class' may be used uninitialized in this function warning
Change-Id: Ie1c53929df2dfec1b4935ca1088f375c666d3b36
Reviewed-on: https://code.wireshark.org/review/5746
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-13 17:17:00 +00:00
Martin Kaiser 21d6ed40ad fix compile error
packet-gsm_sms.c: In function 'dis_field_dcs':
packet-gsm_sms.c:694:12: error: 'msg_class' may be used uninitialized in
this function [-Werror=maybe-uninitialized]
cc1: all warnings being treated as errors
make[5]: *** [libdissectors_la-packet-gsm_sms.lo] Error 1

I suppose that 0xff is an invalid message class and therefore a
reasonable default value.

Change-Id: Iab3d3f50144b24bee4972063c2170d7a9f9b7c25
Reviewed-on: https://code.wireshark.org/review/5745
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-13 17:15:04 +00:00
Pascal Quantin 758ec16287 GSM SMS: fix (U)SIM Data Download Class 2 dissection
Change-Id: Id4ea574e34c0bd35bc757fdc68d0e6b72129ef04
Reviewed-on: https://code.wireshark.org/review/5744
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-13 16:42:07 +00:00
Pascal Quantin 80d44af6b2 dissector_try_uint(_new) and dissector_try_string now return the number of bytes consumed
Change-Id: I528ad736caee1f29e2f0abfc0afcca6587d74eca
Reviewed-on: https://code.wireshark.org/review/5743
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-13 16:36:13 +00:00
Pascal Quantin cc12c726b8 Riemann: add support for TCP transport
Bug: 10770
Change-Id: I101d0152f41c0ab3d7f0fa0ccab6dec3b9e68f0d
Reviewed-on: https://code.wireshark.org/review/5741
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-13 07:17:18 +00:00
Martin Mathieson 5d6eb80c14 Use g_direct_ functions for hash tables where possible
Change-Id: Ie364cbdcf500d7a04e64d7adcdd03bd1926dda86
Reviewed-on: https://code.wireshark.org/review/5736
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-13 00:17:23 +00:00
Alexis La Goutte b0cdee67da DNS: Remove whitespace on DNS Col info before type name
Change-Id: I33a9a54a318a1a3ea106f4531db4e79a6b6d42ac
Reviewed-on: https://code.wireshark.org/review/5716
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-13 00:16:22 +00:00
Pascal Quantin 33c26a09f4 doc: remove some references to the now defunct python support
Change-Id: Ibba3168516ef28ad050f5f70045acf3935f2b233
Reviewed-on: https://code.wireshark.org/review/5738
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12 21:25:00 +00:00
Gerald Combs 56697c244e Qt: Add name resolution menu items.
Change the text from "Enable for" to "Resolve". Make the tooltips more
descriptive. List them in OSI model order.

Change-Id: Ie671ba9d55c609ce475f1681add0ad7d975f19cd
Reviewed-on: https://code.wireshark.org/review/5737
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-12 20:40:53 +00:00
Bill Meier 2898f13a99 cip: Access FT_UINT16 hf_cip_sc_create_instance with proper encoding-arg.
Specifically: Use ENC_LITTLE_ENDIAN (not ENC_NA) to match all
              other integral fetches in the cip dissector.

Change-Id: I5d330084168493f53135dbb97674a2dba9ed7477
Reviewed-on: https://code.wireshark.org/review/5732
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-12 16:30:05 +00:00
Bill Meier 64cb5104d6 Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields.
Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e
Reviewed-on: https://code.wireshark.org/review/5734
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-12 15:33:36 +00:00
Bill Meier 29c1b58f3c rsvp: Convert encoding-arg ENC_NA to ENC_BIG_ENDIAN for all integer fields
Change-Id: Ib0f863f08a3ef420832cc05e988b5bc64ff0b121
Reviewed-on: https://code.wireshark.org/review/5731
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-12 15:31:51 +00:00
Pascal Quantin 76c5568e28 Riemann: fix compilation
Change-Id: I0cf069860715fd6781a613478c29a7e7ed224733
Reviewed-on: https://code.wireshark.org/review/5735
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12 15:31:21 +00:00
Pascal Quantin 8e96830156 LPP: avoid doing an out of bound access in case the PER decoding gives an invalid value
Bug: 10773
Change-Id: I4fcde84d7be1e42729b6ec0763064e9885951468
Reviewed-on: https://code.wireshark.org/review/5729
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12 14:26:05 +00:00
Pascal Quantin a2a6e31532 Riemann: fix "Decode as" feature
the UDP port value check seems useless when the port is configured in the preferences, and prevents "Decode as" to work as expected

Change-Id: I5a059d05a9e980c2c60d8f84deae1b5bd9d466d3
Reviewed-on: https://code.wireshark.org/review/5727
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12 12:56:31 +00:00
Alexis La Goutte bd4d291d1b Qt: Move Follow TCP, UDP, SSL to a Follow folder (like when right click)
Change-Id: I24213aa4f9f134a05b1344e160e5688ce9c495cf
Reviewed-on: https://code.wireshark.org/review/5508
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 23:15:11 +00:00
Gerald Combs 1ce64e75ab CMake: Make it easier to generate the release notes & NEWS.
Add convenience targets for generating the release notes and the NEWS
file. Make sure we don't run multiple instances of a2x + AsciiDoc at the
same time.

Add the docbook directory to the build by default unless we're running
Windows. Explain why we don't yet build docs on Windows. Make each
docbook makefile target optional.

Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and
ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on.
Remove the Debian patch that hacked around the PDF requirement.

Copy ws.css to the docbook build directory. Don't build PDF release
notes. I'm not sure we ever used them and I don't want to install Java
and FOP just to make a release.

Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553
Reviewed-on: https://code.wireshark.org/review/5712
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-11 21:41:44 +00:00
Bill Meier 425bc304fe eth,mp2t: Rename ei[] filter names duplicating hf[] filter names.
Change-Id: I1a9e8344866ce5a5bbd48b07c49baa398ce161f7
Reviewed-on: https://code.wireshark.org/review/5724
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-11 19:08:17 +00:00
Bill Meier 8f56378a79 rsvp: Fix dup display-filter name possibly leading to crash if used.
Change-Id: I8b903fb1137800a84473a82cff9c45f965cb869f
Reviewed-on: https://code.wireshark.org/review/5723
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-11 19:07:42 +00:00
Yann Lejeune 0ef1aef2df BGP: add support of RFC6368 - Internal BGP as the Provider/Customer Edge
Protocol for BGP/MPLS IP Virtual Private Networks (VPNs).

Bug: 10762
Change-Id: Ifbe2af639ee5a2d96ec3546708060cadcc349df2
Reviewed-on: https://code.wireshark.org/review/5664
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-11 13:55:22 +00:00
Yann Lejeune 9036f09335 BGP: extract the bgp path attribute dissection to a dedicated function.
Change-Id: I228f1402007d8570bfdeb0105ce5e89c48357481
Reviewed-on: https://code.wireshark.org/review/5721
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-11 13:55:13 +00:00
Alexis La Goutte 7d905beb6e GSM BSSMAP LE: fix indent (use tabs)
Change-Id: Ic05a52d095fd581150fc69ca8d2a0e05eaddf81a
Reviewed-on: https://code.wireshark.org/review/5722
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:18:45 +00:00
Alexis La Goutte 772fbfb98b GSM a BSSMAP : fix warning: no previous prototype for 'dissect_bssmap' [-Wmissing-prototypes]
Change-Id: Ibc03864498cb88e93cb3f774d1f4987aa10dd32e
Reviewed-on: https://code.wireshark.org/review/5720
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:16:21 +00:00
Alexis La Goutte 230ce3030b GSM bssmap le: fix warning: no previous prototype for 'dissect_bssmap_le' [-Wmissing-prototypes]
Change-Id: Ifa8c7a15dfb37cf1dbd2f539dd0bbc87e6da1aea
Reviewed-on: https://code.wireshark.org/review/5719
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:09:45 +00:00
Alexis La Goutte def4313380 6lowpan : fix warning: no previous prototype for 'lowpan_context_free' [-Wmissing-prototypes]
Change-Id: I3fa66aa0713a0455639b04ecf129f48baa8c096f
Reviewed-on: https://code.wireshark.org/review/5718
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 12:09:05 +00:00
Martin Kaiser b7f8cd8a5d skip the extra field in the gzip header
it consists of two bytes xsize + xsize bytes of data

use an unsigned type for xsize

fail gracefully if the field is present but truncated

tvb_length_remaining > tvb_captured_length_remaining

Change-Id: I7f5138743c2d88abdd4f5f18d3c0292612ddb559
Reviewed-on: https://code.wireshark.org/review/5654
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 09:39:18 +00:00
AndersBroman 5570f8e24b [SIP] Try to fix another corner case of reassembly.
Change-Id: I38a80ebcadf0ef6d7fada692753188f2a6c3515b
Reviewed-on: https://code.wireshark.org/review/5717
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-11 09:33:50 +00:00
Guy Harris 339df3d96d Add a heur_dissector_table_foreach() function.
This is, for heuristic dissector tables, the equivalent of
dissector_table_foreach() for keyed dissector tables.

Change-Id: I4b2f870e1c1179fda1adddd93930b83aaaaf8763
Reviewed-on: https://code.wireshark.org/review/5715
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 04:16:33 +00:00
Guy Harris 151164d414 Give dissector_all_heur_tables_foreach_table() a sort function.
This makes it a bit more like dissector_all_tables_foreach_table.

Improve comments and clean up whitespace while we're at it.

Change-Id: I5147427f864add285e3bb6cb35ad9fa83bea516c
Reviewed-on: https://code.wireshark.org/review/5714
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 03:05:22 +00:00
Guy Harris 9855beff31 Make the type of the second argument to a DATFunc_heur_table explicit.
It's always pased a heur_dissector_list_t *, so give it that type,
rather than having it be a generic pointer.

Change-Id: Ia6a045bb1b96c2f6ef3e23f27928e0b52f7cfb9f
Reviewed-on: https://code.wireshark.org/review/5713
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 01:51:07 +00:00
Guy Harris 144855ce6d Fix a comment.
Change-Id: I46885d028fe9ff5254baefc15283626b9bdb6bce
Reviewed-on: https://code.wireshark.org/review/5711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-11 00:23:06 +00:00
Pascal Quantin 2f8030f85a LCSAP: fix dissection of negative longitude and latitude
Bug: 10767
Change-Id: I4ab0ffd3bd22f1884895f3118673b433d980de2f
Reviewed-on: https://code.wireshark.org/review/5704
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-10 20:03:41 +00:00