aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-10-14[ssl handshake] remove unnecessary if (tree) checksMartin Kaiser1-37/+28
Change-Id: I0c4530fb739d6d1672a624d2b8c1accea99f6fdc Reviewed-on: https://code.wireshark.org/review/10985 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>
2015-10-14Registers an MPTCP protocol with the prefix "mptcp".Matthieu Coudron2-154/+855
Similar to TCP: - Maps TCP connections to their respective MPTCP stream (mptcp.stream) based on the token/key. - Ability to distinguish master subflow and to list subsequent subflows - Can display relative MPTCP data sequence signal (DSS) sequence numbers/acks (mptcp.dss.dsn/mptcp.dss.ack), or absolute values (tcp.options.mptcp.rawdataack) - Adds an MPTCP panel in Preferences - fixes RM_ADDR analysis (i.e., it can contain several address ids) - adds an MPTCP tap to list conversations in tshark -z "conv,mptcp" Change-Id: I2766aa2f534c25b0f583ef84c20e74c7b2fa496e Reviewed-on: https://code.wireshark.org/review/10577 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>
2015-10-14TCP: only store up to 1000 unacked segments (in each direction).Jeff Morriss2-3/+9
If we're seeing only one side of a conversation (we're not seeing any ACKs) then things get really, really slow as the number of unacked segments grows. 1000 is, of course, an arbitrary limit. Bug: 11589 Change-Id: I42652965b736da50122c722e6ac386c4d481e57f Reviewed-on: https://code.wireshark.org/review/10971 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-13ssl-utils: fix anchoring matches in keylog filePeter Wu1-2/+3
Somehow "# CLIENT_RANDOM" would also be matched by the regex. It turns out that glib requires two flags to enable anchoring. This issue also causes silent truncation of keylog lines rather than reporting no match. Change-Id: Ib51265b6ec428988c222b4f3bc3cbc99ef0d72bf Reviewed-on: https://code.wireshark.org/review/10933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-13ssl-utils: Fix parsing pre-master-secrets in keylog-fileGergely Nagy1-5/+11
With "PMS_CLIENT_RANDOM xxxx yyyy" lines, only 32 byte long pre-master secrets could be entered, but they are 48 byte long for RSA and can be of any length for DHE cipher suites. When a line had the "RSA xxxx yyyy" format then yyyy was previously parsed with the <master_secret> regex group but it contains the pre-master secret, so now it is parsed with the <pms> group. This didn't cause a functional issue for RSA, but it couldn't be used where the pre-master secret isn't 48 byte long. After this change the regex will accept everything that was previously working. Change-Id: I71f43f3e9977a5e98758f387ad69893e8be0e27a Reviewed-on: https://code.wireshark.org/review/10923 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-12btatt: clear variable (CID 1268204)Dario Lombardo1-2/+1
Change-Id: Id4d057d730899fac14146845a530fae2525ba965 Reviewed-on: https://code.wireshark.org/review/10955 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-12Add BASE_PT_ types to proto_registrar_dump_fields()João Valverde2-14/+8
Change-Id: Ic6b3d71c3c9a14688b55d98f402d359f69524394 Reviewed-on: https://code.wireshark.org/review/10939 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-12IPv6: Make extension headers filterableJoão Valverde1-40/+12
Change-Id: I8d36dbbe255a58b3ca1e4059a15e993155ca9ba1 Reviewed-on: https://code.wireshark.org/review/10708 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-10-12Fix hfinfo_*_format_display() for BASE_PT_ display typesJoão Valverde1-0/+8
Change-Id: I1a2a988a737c6821db6ac3a2b9ee9ff48add28c2 Reviewed-on: https://code.wireshark.org/review/10935 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-12NTP: fix dissection of SHA1 based message authentication codePascal Quantin1-3/+3
The maximum MAC length is 160 bits, not 128. MAX_MAC_LEN can be safely increased as an extension should be > 4 bytes. Bug: 11580 Change-Id: I0ea5a1f85d644e57315f033f09241d7a79dd3a45 Reviewed-on: https://code.wireshark.org/review/10934 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-12Get rid of a void * in frame_data.Gerald Combs1-1/+2
Forward-declare struct _color_filter and use it in struct _frame_data. Change-Id: I4543206bc71ad1e088b60347e6deb6d87a573b35 Reviewed-on: https://code.wireshark.org/review/10914 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-11Remove duplicate transport ports from proto tree summaryJoão Valverde7-141/+151
Don't display duplicate ports if transport name resolution is not enabled (for UDP/TCP/DCCP). Also introduce col_append_port() to handle info column port display with name resolution in a uniform format. Change-Id: Icb8ac45f726b7c539b4534c62061473e9b582753 Reviewed-on: https://code.wireshark.org/review/10804 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-10-11IPv6: Don't call expert info under if(tree) (for options)João Valverde1-239/+237
Change-Id: I94f096a0ca487311d44a03e4183732db015605b2 Reviewed-on: https://code.wireshark.org/review/10896 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-10-11LTE RLC graphs - initial versionMartin Mathieson1-0/+4
Change-Id: Ic5f2c353ae1f787ac19cb575a938cb093ff5f6dc Reviewed-on: https://code.wireshark.org/review/10930 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-10-11[Automatic update for 2015-10-11]Gerald Combs2-20/+270
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic021a6b14deb368b9b6ee77995291c92de75426d Reviewed-on: https://code.wireshark.org/review/10936 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-11Allow TURN channeldata to be padded on both UDP and TCP.Philipp Hancke1-1/+2
Microsoft's Edge browser does this, UDP padding is a MAY in https://tools.ietf.org/html/rfc5766#section-11.5 Bug: 11584 Change-Id: I513638d8a3eb257576af3cfc8e6b81cc93b22d05 Reviewed-on: https://code.wireshark.org/review/10889 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-10IPv6: Set destination address for RPL routing headerJoão Valverde1-7/+11
Change-Id: I5d83370424cc0002a0bf965138b7fbdad69557fb Reviewed-on: https://code.wireshark.org/review/10895 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>
2015-10-10Scan into a guint32 using %u.Gerald Combs1-1/+1
Change-Id: Ic0fa25f3ad78e2a1923610a17f764e1b0623eabc Reviewed-on: https://code.wireshark.org/review/10919 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-10Support in 6lowpan for RFC4944 address generationPedro Jose Marron1-5/+81
For the conversion of a 16-bit short address in 6lowpan to an IID, there are several RFCs that produce different results. RFC 4944 section 6 specifies that the conversion uses the given PAN ID and the 16-bit short address. RFC 6282, on the other hand, specifies thta the conversion only uses the 16-bit short address and no longer uses the PAN ID. The current version of the 6lowpan dissector supports only the newer RFC 6282, but there are protocols out there that assume that the address conversion still abides to RFC 4944. In order to support these protocols and following the discussion from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8970 this patch introduces a boolean preference in the 6lowpan dissector that indicates whether or not the older RFC 4944 should be used for address conversion. By default, it is set to FALSE, thus leaving the behavior of the dissector unchanged. Besides the boolean preference, another helper function lowpan_addr16_with_panid_to_ifcid has been written that implements the expected behavior from RFC 4944 using the same hint mechanism already in place in the dissector for the support of RFC 6282. Change-Id: I8d202c69a225d7b1212080a174e0111e5203553c Reviewed-on: https://code.wireshark.org/review/10902 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-09Display of reserved octet in 6lowpan IPHC headerPedro Jose Marron1-2/+14
The 6lowpan standard specifies a reserved octet in the extended header of an IP_PROTO_FRAGMENT packet in the same place used for the header length for other extension headers. The current version of the 6lowpan dissector displays the reserved octet and the rest of the header (6 more bytes) together as data, as opposed to displaying the reserved octet by itself and then the data (using the data dissector). This patch does not change the functionality of the dissector in any way, only how the 7 bytes are displayed. Instead of displaying the header information and then 7 bytes of data, it displays the reserved octet and then the data. This is also consistent with the way the ipv6 dissector displays it (showing the reserved octet and its value). For this purpose, there is a new hf (hf_6lowpan_nhc_ext_reserved) and the corresponding proto_tree calls. Also, depending on the type of extension header, the octets sent to the general data dissector are shifted by one. Change-Id: I4c7fb58a3364307e79517b979808f3e34a2e0b94 Reviewed-on: https://code.wireshark.org/review/10908 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-10-09asn1.c: fix printf arguments used with DEBUG flagPascal Quantin1-1/+4
Bug: 11581 Change-Id: If960e45d5ed71abb3cadcb6dd83832b9098e11a7 Reviewed-on: https://code.wireshark.org/review/10904 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-09Add WS_DLL_PUBLIC for Address Type RegistrationPedro Jose Marron1-1/+1
Dissectors developed as plugins in wireshark that create new address types require the use of address_type_dissector_register. Without WS_DLL_PUBLIC, the function is not found when loading the plugin and wireshark refuses to initialize it. This very simple patch fixes this problem. Change-Id: I8594a7be525830dd4ab9e1b3ea633aac0a07938a Reviewed-on: https://code.wireshark.org/review/10899 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-09airpdcap: add free_key_string function, fix memleaksPeter Wu3-5/+26
Do not leak the key and SSID. Note that there are still some leaks in the GTK UI related to get_wireshark_keys(), but I did not track them down. Caught by LeakSanitizer. Change-Id: I639166e6ea457605d6ae0ebd58e56d7594a7b7db Reviewed-on: https://code.wireshark.org/review/10860 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-09WSP: Fix add_addresses()João Valverde1-2/+2
Change-Id: I25d84c725559f5f077dcc03fb425a89d87e90f55 Reviewed-on: https://code.wireshark.org/review/10897 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-10-09FTP: Fix EPRT IPv6 set addressJoão Valverde1-2/+1
Change-Id: I944b3e6667027b251d0f3d894294bfda331abce2 Reviewed-on: https://code.wireshark.org/review/10898 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>
2015-10-08GTPv2: display Sequence Number as BASE_HEX_DECPascal Quantin1-1/+1
As requested on https://ask.wireshark.org/questions/46393/gtpv2-teid-and-sqn-decoded-in-decimal-instead-of-hexa-in-ws-1127 Change-Id: Id0963394959eff979129470c70258323653e3fdf Reviewed-on: https://code.wireshark.org/review/10886 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-08UDP: Fix forgotten column infoJoão Valverde1-0/+3
Change-Id: I620d24c1a1cf7340d651e8840275759de860e5ef Reviewed-on: https://code.wireshark.org/review/10881 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08DCCP: Fix destination port offsetJoão Valverde1-1/+1
Regression introduced in ga459ac72 Change-Id: Ib69299280599b181f9068b3b81eb9fd74bb1d55d Reviewed-on: https://code.wireshark.org/review/10882 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-08Replace or rename "duplicate" UDP protocols shown in Decode AsMichael Mann11-95/+73
Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86 Ping-Bug: 3949 Reviewed-on: https://code.wireshark.org/review/10865 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-08epl: fix bug in g_hash_table_lookup_extended() call (CID 1254382)Dario Lombardo1-10/+5
Change-Id: Iebf0fc5d3e86fba9a2ea4da5784256d820598e39 Reviewed-on: https://code.wireshark.org/review/10744 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: Anders Broman <a.broman58@gmail.com>
2015-10-08Added ICE TCP Framing support to STUN dissectorNils Ohlmeier1-65/+97
Change-Id: I1dddb09cb1eebc3d23375aa9d2450731fa51cb90 Reviewed-on: https://code.wireshark.org/review/10643 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>
2015-10-07wslua: fix memleak in lua_prime_all_fieldsPeter Wu1-0/+1
Would leak some bytes after startup. Caught by LeakSanitizer. Change-Id: I4644f204343ce5a803a7dfdedac6a1960882807f Reviewed-on: https://code.wireshark.org/review/10859 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-07AMQP: Fix usage of p_(add|get)_proto_data.Petr Gotthard1-38/+29
The p_(add|get)_proto_data() functions are used to store data related to an AMQP frame. The stored information gets overwritten if there are multiple small AMQP frames in one TCP/IP packet. As suggested by Pascal and https://code.wireshark.org/review/#/c/10579/, we should use tvb_raw_offset as key for p_(add|get)_proto_data(). Change-Id: I860df8af51a6fbbef495985747313ae96402cc5c Reviewed-on: https://code.wireshark.org/review/10836 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-07IPv6: add changes forgotten in gbedda9bPascal Quantin1-3/+3
Bug: 11570 Change-Id: I5a8d89253becd550e0330c82ab0811c502db6d61 Reviewed-on: https://code.wireshark.org/review/10849 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-07Update last updated DNS parameters (2015-07-26)Alexis La Goutte1-15/+15
* draft-ietf-dnsop-delegation-trust-maintainance-14 => RFC 7344 Update also DNS-Based Authentication of Named Entities (DANE) Parameters ( 2014-04-23) (no change) Change-Id: I7aa7dddf8c26d2ea2ccb4a0533d835ce119737bd Reviewed-on: https://code.wireshark.org/review/10825 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>
2015-10-07DNS: Add DNS Cookie OptionAlexis La Goutte1-1/+25
draft-ietf-dnsop-cookies-05.txt Change-Id: Ife550d8fe0c6604329c78bb34e94276050148a8a Reviewed-on: https://code.wireshark.org/review/10824 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-07ssl-utils: load RSA keys based on their modulus+exponentPeter Wu5-215/+152
Load RSA private keys based on their public key instead of relying on the user to specify a valid address and port mapping. This is more reliable and prepares for simplification of the SSL Keys dialog. After this change, the "address" part of the UAT dialog will be ignored when loading the private key. The port+protocol mapping is still imported, but should probably be removed too. Change-Id: I4d7a2bfcf63d17e66e336ef770759f20510fc176 Reviewed-on: https://code.wireshark.org/review/10766 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: Anders Broman <a.broman58@gmail.com>
2015-10-07ssl-utils: simplify private key storage, fix resource leaksPeter Wu4-178/+82
The certificate and GnuTLS private key are never used except for reporting in the log file. Remove the unused certificate-related code from the PKCS#12 file parsing. Report an immediate error instead of opening key file if GnuTLS is disabled. Made ssl_load_key and ssl_load_pkcs12 static, they are not used outside the SSL dissector. If for some reason the PKCS#12 bag contains multiple private keys, then the previous one would be overwritten (leaking memory). Fix this by returning the first private key found. Simplify key_hash (dtls_key_hash/ssl_key_hash) memory management, now the table automatically frees keys/values when items are removed. Fix memory leaks: - ssldecrypt_uat_fld_password_chk_cb: release ssl_load_pkcs12 memory. - ssl_load_key: avoid leaking gnutls_x509_privkey_t on error. - ssl_load_pkcs12: fix ssl_pkey leak on error path. Change-Id: I5db6fecb0d74e5c78796392aeb17e3eb7985a2ef Reviewed-on: https://code.wireshark.org/review/10764 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: Anders Broman <a.broman58@gmail.com>
2015-10-07UDP: Refactor some dissector codeJoão Valverde2-120/+83
Add UDP length as a generated field of UDP-Lite subtree. Change-Id: I35291cc5f5b2a8909a7124cbae8c39fc91d7751d Reviewed-on: https://code.wireshark.org/review/10775 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: Anders Broman <a.broman58@gmail.com>
2015-10-07Remove heur_dissector_set_enabled.Michael Mann2-33/+0
With the adjustment to heur_dissector_add passing an enable/disable flag and "global" control of heuristic dissectors just like regular ones, this is no longer needed. Change-Id: I2d433c7bff8353421eca31f8813992e38b716911 Reviewed-on: https://code.wireshark.org/review/10848 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: Anders Broman <a.broman58@gmail.com>
2015-10-07BGP: Add BGP-Extended Message CapabilityAlexis La Goutte1-2/+4
From draft-ietf-idr-bgp-extended-messages Update BGP Capability Codes to 2015-09-30 Change-Id: I2f3b44ad8ad7a9e5444cdfbfb22bf7d0538ffbfc Reviewed-on: https://code.wireshark.org/review/10826 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-06SCTP: fix dissection of DATA chunksPascal Quantin1-1/+1
Regression introduced in gd52322e Change-Id: I57baf53d81c7e95ea8ad15e4799033d341e4ee61 Reviewed-on: https://code.wireshark.org/review/10845 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-06[NSIP] Wrong offset used for proto_tree_add_bitmask() for the reset flag.AndersBroman1-2/+2
Change-Id: Ica9ed514e593079ba4cb287d4165eb6e967ec903 Reviewed-on: https://code.wireshark.org/review/10833 Petri-Dish: Anders Broman <a.broman58@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-10-06openSAFETY: Add Producer ID to info fieldRoland Knall1-8/+28
Cosmetic change, to better distinguish if multiple SPDO packages have been detected. This should also be back-ported to 1.12 and 2.0 Change-Id: I3d0b26ecb6e0cc60b3cdc9861920c5ccaeb70cbd Reviewed-on: https://code.wireshark.org/review/10829 Reviewed-by: Roland Knall <rknall@gmail.com> 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>
2015-10-06Remove an extra commaPascal Quantin1-1/+1
Change-Id: I14e89d9db53166b43ef6bee901ba0fdc545657b1 Reviewed-on: https://code.wireshark.org/review/10831 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-06Fix SoupBinTCP sequence number tracking.David Arnold1-3/+6
Change-Id: Ia31b21894a6f0ba2da6cc2aea6babda9f37f5e09 Reviewed-on: https://code.wireshark.org/review/10579 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-06Calculate the channel if we have only the frequency.Guy Harris2-0/+14
That way, the generic 802.11 radio dissector, and any future taps if we add a tap with radio information, can get the channel for radiotap and PPI headers, as we do for some other radio headers that supply just a frequency. Change-Id: I9e3037f69938bed3b3ba563689ff00aaed486a16 Reviewed-on: https://code.wireshark.org/review/10821 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-05Initialize 2.1.Gerald Combs2-2/+2
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Add BASE_PT_ field display typesJoão Valverde8-123/+140
Avoid displaying duplicate port numbers with transport name resolution disabled and make some dissector code simpler. Introduces port_with_resolution_to_str_buf() function and amends UDP/TCP/DCCP/SCTP to use the new field display type. Change-Id: Ifb97810b9c669ccbb1a310a2c0ffd6e2b63af210 Reviewed-on: https://code.wireshark.org/review/10625 Petri-Dish: Michael Mann <mmann78@netscape.net> 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>
2015-10-05SCTP I-DATA supportruengeler2-60/+174
Change-Id: I459942b9e3287d500dda517568252d4cb56d3216 Reviewed-on: https://code.wireshark.org/review/10802 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Michael Tüxen <tuexen@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Tüxen <tuexen@wireshark.org>