aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tcp.c
AgeCommit message (Collapse)AuthorFilesLines
2015-11-06MPTCP: Use wmem_list instead of GSListJoão Valverde1-4/+5
Change-Id: Idb4e4d6d19169d6cacd98664232fd1fbd2cc2dca Reviewed-on: https://code.wireshark.org/review/11534 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: Michael Mann <mmann78@netscape.net>
2015-11-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann1-1/+1
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing. The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not. It's just ENFORCED for Decode As. Bug: 3949 Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127 Reviewed-on: https://code.wireshark.org/review/11405 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04Don't include "file.h" if you don't need it.Guy Harris1-1/+2
It ends up dragging in libwireshark headers, which programs not linking with libwireshark shouldn't do. In particular, including <epan/address.h> causes some functions that refer to libwireshark functions to be defined if the compiler doesn't handle "static inline" the way GCC does, and you end up requiring libwireshark even though you shouldn't require it. Move plurality() to wsutil/str_util.h, so that non-libwireshark code can get it without include epan/packet.h. Fix includes as necessary. Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3 Reviewed-on: https://code.wireshark.org/review/11545 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-04MPTCP: Use copy_address_wmem() instead of copy_address()João Valverde1-2/+2
Change-Id: I9f53ecf1971c96d06c1c8e3be6e5481cc453f96a Reviewed-on: https://code.wireshark.org/review/11533 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01TCP: replace some dissector asserts by a returnPascal Quantin1-4/+6
It prevents an assert in case of malformed packet Bug: 11662 Change-Id: If5d7196c7e6ecd0ffe8ed97213dbd64bc1f69cbb Reviewed-on: https://code.wireshark.org/review/11464 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: Michael Mann <mmann78@netscape.net>
2015-10-30STUN: register a new conversation dissector after receiving a ConnectionBind ↵Pascal Quantin1-2/+2
Success Response message According to RFC 6062, once the connection is established, data is sent as-is To stop the STUN dissector from interfering, add the ability to specify a starting frame for a conversation dissector and use it Bug: 11641 Change-Id: I65ca96bddacf70444009c0642ea22173fa68992e Reviewed-on: https://code.wireshark.org/review/11372 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-29"Color dissector filters" are just filters.Guy Harris1-4/+4
Rename the color_dissector_filters.[ch] files to just dissector_filters.[ch], and rename the routines not to include the string "color_", as those filters can be used as color filters *or* display filters. Remove "color_" from other places where we're not doing colorization. In the GTK+ code, combine the two loops that add menu items for filters in the dissector-provided filters list into one. Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c Reviewed-on: https://code.wireshark.org/review/11379 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-22Use address functions instead of ADDRESS macros in asn1 and epanGerald Combs1-10/+10
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: 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-10-20TCP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+1
Change-Id: Ib63d634b08da60c300e124e93399442adbde1c5e Reviewed-on: https://code.wireshark.org/review/11169 Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-15Switch ports separator from long to short arrowPascal Quantin1-1/+1
Not all systems support this glyph Change-Id: I99784101b4d462991351554e44a5618bfea42a84 Reviewed-on: https://code.wireshark.org/review/11063 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-10-14Registers an MPTCP protocol with the prefix "mptcp".Matthieu Coudron1-152/+736
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 Morriss1-2/+6
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-11Remove duplicate transport ports from proto tree summaryJoão Valverde1-25/+14
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-05Add BASE_PT_ field display typesJoão Valverde1-33/+7
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-05Move utf8_entities.h to wsutilJoão Valverde1-6/+2
Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0 Reviewed-on: https://code.wireshark.org/review/10786 Petri-Dish: 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-10-05UDP: Make port column info similar to TCP, add length informationJoão Valverde1-7/+2
Change-Id: I3f7a35db53a1ecc9d543b80f143eb6082616e458 Reviewed-on: https://code.wireshark.org/review/10702 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-09-29tcp: remove misleading, outdated commentPeter Wu1-4/+0
v1.99.1rc0-717-ga2c2f87 removed pinfo->private_data assignment, but left the comment in place. Since v1.99.1rc0-761-g6d207fe, the member is removed completely, so let's drop the comment. Change-Id: Ib36b6b979abda786202867ea1e6ef0d11487f61c Reviewed-on: https://code.wireshark.org/review/10684 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-09-16[tcp] Fix case of incorrect "[TCP ACKed unseen segment]"Bill Meier1-3/+8
The invalid message occurred for an ack of a TCP segment which included both retransmitted data and additional new data. Bug: 11506 Change-Id: Id981d04c91b9e69b6ee1e0dea85aed142bf32594 Reviewed-on: https://code.wireshark.org/review/10395 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: Bill Meier <wmeier@newsguy.com>
2015-08-15Don't clear the tcp_analysis if a conversation is not provided to ↵Michael Mann1-3/+10
get_tcp_conversation_data(). Callers may need to know information like retransmissions, etc which will be lost. Change-Id: I3f8b6b0aeb308701eb34ae6f6f735af6995ed441 Reviewed-on: https://code.wireshark.org/review/9940 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-27tcp: only reset dupACK counter when ACk# changesEvan Huus1-2/+2
Otherwise things like window changes will reset the dup-ack counter incorrectly and confusingly. Bug: 11397 Change-Id: I80b63cf989a952547bec48562a92078c8ab29081 Reviewed-on: https://code.wireshark.org/review/9802 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-10MPTCP small optionsBenjamin Hesmans1-1/+1
The minimum length of MPTCP option is 3 (MP_PRIO) Signed-off-by: Benjamin Hesmans <benjamin.hesmans@uclouvain.be> Change-Id: I9742a7923497b07b9a7c761b02d52ac541e28cc7 Reviewed-on: https://code.wireshark.org/review/9585 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-04store tcp/udp port names in epan scopeEvan Huus1-1/+1
This causes them to be freed on shutdown, cleaning up ~800KB of "reachable" memory according to valgrind. The fact that we even need to construct these as value_strings is questionable IMHO, but that's a problem for a later date. Switch epan_scope to the BLOCK allocator now that we're using it for so much more, this gives a small but measurable increase in startup time. Change-Id: I187460b769e28da3c6629abac1d9196727ae7dde Reviewed-on: https://code.wireshark.org/review/9483 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-03Call reassembly_table_destroy and move g_hash_table_destroyPeter Wu1-0/+7
This patch moves g_hash_table_destroy calls from the init routine to the cleanup routine. Besides that, the conditional check for the hash table has been removed, assuming that init is always paired with a cleanup call. If reassembly_table_init is found, a reassembly_table_destroy call is prepended to the cleanup function as well. Comments have been removed from the init function as well as these did not seem to have additional value ("destroy hash table" is clear from the context). The changes were automatically generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=4d11f07180d9c115eb14bd860e9a47d82d3d1dcd Manually edited files (for assignment auditing): dvbci, ositp, sccp, tcp. Other files that needed special attention due to the use of register_postseq_cleanup_routine: - ipx: keep call, do not add another cleanup routine. - ncp: remove empty mncp_postseq_cleanup. mncp_hash_lookup is used even if a frame is visited before (see dissect_ncp_common), hence the hash table cannot be destroyed here. Do it in cleanup instead. - ndps: add cleanup routine to kill reassembly table, but do not destroy the hash table as it is already done in ndps_postseq_cleanup. Change-Id: I95a72b3df2978b2c13fefff6bd6821442193d0ed Reviewed-on: https://code.wireshark.org/review/9223 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-25TCP: Add expert info to indicate when there is TCP Fast Open SYN (with Cookie)Alexis La Goutte1-7/+16
Coming after Jasper talk #Sharkfest15 about TCP stuff Change-Id: I2b01bc6dfe24e28454101da59720d2c74603b88f Reviewed-on: https://code.wireshark.org/review/9120 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-10Provide port names for TCP ports so they can be used in filter expressions.Jakub Zawadzki1-3/+27
Bug: 594 Change-Id: Ib41c4c753e24ac78b39463ab1daae7fd00631230 Reviewed-on: https://code.wireshark.org/review/8851 Petri-Dish: 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-06-08tcp: simplify tcp.flags.str, fix off-by-onePeter Wu1-22/+9
Observe that tcp_flags_to_str_first_letter is a copy of tcp_flags_to_str with the flags[][4] variables copied and the loop variables inverted. This misses the FIN bit, and runs past the flags buffer. Behavior change: for consistency, move the reserved bits to the front and print reserved bits individually. Old output / new output: NCEUAPRSRRR RRRNCEUAPRSF Tested with this pcap with all flag bits set (0x0fff). hexdump: d4c3b2a1020004000000000000000000ff7f000065000000b6b77455f3ac 06002800000028000000450000280001000040067ccd7f0000017f000001 0014005000000000000000005fff2000907f0000 Change-Id: I70e070808d1f0f9cd60eaf4f2b3f4ac6e3cfaada Reviewed-on: https://code.wireshark.org/review/8826 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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>
2015-06-06TCP: Add (generated) field with first letter of TCP FlagsAlexis La Goutte1-1/+39
from help TCP Troubleshooter Based on http://blog.didierstevens.com/2014/04/28/tcp-flags-for-wireshark/ Change-Id: I115717f738a77dd1b22cefa8f646bcdbe9884ec2 Reviewed-on: https://code.wireshark.org/review/8733 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-03-19Revert "Revert "TCP: tabs -> spaces""Gerald Combs1-8/+8
1.99.4 is done. This reverts commit e60b826a0131b90d4a10d3e9e5e1f45e777d3142. Change-Id: I230b12d3a83a0abcb93809321df2b4396a7f0a0b Reviewed-on: https://code.wireshark.org/review/7760 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19Revert "TCP: tabs -> spaces"Gerald Combs1-8/+8
The 1.99.4 is still in progress. This reverts commit 260c84729c8c32d6e312d0974d4d4c5966aee514. Change-Id: I8c24d301c103dd45e2ac2cdb4cda34b918ac5a37 Reviewed-on: https://code.wireshark.org/review/7758 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-19TCP: tabs -> spacesPascal Quantin1-8/+8
Change-Id: Ia95addb6b26f7eed89bbfe62baea289a50cf0523 Reviewed-on: https://code.wireshark.org/review/7756 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-19Implement proto_tree_add_item_ret_int() and proto_tree_add_item_ret_uint() whichAndersBroman1-14/+11
works as proto_tree_add_item(), but also returns the value of (u)ints of 8,16,24 and 32 bits length in a 32 bit variable. It's based on Hadriels previous work. Change-Id: If3b4b8588b63251f1ee9b954a202acde7c02ce86 Reviewed-on: https://code.wireshark.org/review/7230 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-03-12One check mark for ACKs, two check marks for dup ACKs.Gerald Combs1-2/+2
Add FT_FRAMENUM_ACK and FT_FRAMENUM_DUP_ACK and set them for tcp.analysis.acks_frame and tcp.analysis.duplicate_ack_frame. Draw a single or double check mark in the packet list accordingly. These are probably specific to TCP, but as it happens there are a lot of TCP packets. Change-Id: I35416506419159a79ad8cc2e35f8a14485edfb7e Reviewed-on: https://code.wireshark.org/review/7568 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-10TCP: use curr_num_layer as key for p_(add|get)_proto_dataPascal Quantin1-15/+14
It allows to properly handle a use case were several TCP connections would be encapsulated Note that it is safe to use the same key for struct tcp_analysis and proto_tree as they are not using the same scope (and thus list) Change-Id: I37423eca225960f2e72817f6faf543f6676cf489 Reviewed-on: https://code.wireshark.org/review/7606 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-10TCP: fix addition of tcp.pdu.size fieldPascal Quantin1-3/+3
Bug: 11007 Change-Id: I902d07f6492bffe5d44f6687be9db53b11b0acd3 Reviewed-on: https://code.wireshark.org/review/7602 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-07TCP: let's pacify the OSX 10.5 x86 buildbotPascal Quantin1-2/+2
Change-Id: Ie0655285d6e27b8a60ef5d2c4a970facac8cf4a9 Reviewed-on: https://code.wireshark.org/review/7585 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-07TCP: remove what seems to be a useless volatile attributePascal Quantin1-1/+1
It allows to get rid of the following error when compiling with gcc 4.7.2: variable 'plen' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] Change-Id: I1a647a6de7ddd25136b76237914ee7c5a8c7fa0a Reviewed-on: https://code.wireshark.org/review/7580 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: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-06tcp: support variable-length tcp_dissect_pdusPeter Wu1-18/+10
Originally suggested by Bill Meier for the MQTT protocol[1], but the Websocket protocol can also benefit from this. Since DESEGMENT_ONE_MORE_SEGMENT is a valid packet length, use the zero length instead as an indicator that the length is not yet known. Updated documentation too and remove the function documentation from packet-tcp.c since it is duplicated in packet-tcp.h. A noteworthy WSDG change is that the get_pdu_len parameter of tcp_dissect_pdus gained another void pointer since v1.99.2rc0-890-gceb8d95 ("Lua: Expose tcp_dissect_pdus() to Lua"). [1]: https://www.wireshark.org/lists/wireshark-dev/201405/msg00044.html Change-Id: I4eba380e00cd757635eb5639c2857356dae3171e Reviewed-on: https://code.wireshark.org/review/7279 Reviewed-by: Guy Harris <guy@alum.mit.edu> 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: Evan Huus <eapache@gmail.com>
2015-03-01Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and ↵Michael Mann1-2/+2
SET_ADDRESS calls for the same address. Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116 Reviewed-on: https://code.wireshark.org/review/7437 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-27Lua: Expose tcp_dissect_pdus() to LuaHadriel Kaplan1-2/+2
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() to make TCP-based dissection easier. Bug: 9851 Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 Reviewed-on: https://code.wireshark.org/review/6778 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-08Eliminate proto_tree_add_text from some dissectors.Michael Mann1-1/+1
Change-Id: Ief4c377d56748e1a8ed0ef7fe5ba03b9be00cd8d Reviewed-on: https://code.wireshark.org/review/6267 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08ep_<protocol>_port_to_display -> <protocol>_port_to_displayMichael Mann1-2/+2
Adjust any other ep_ related APIs related to the transition. Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c Reviewed-on: https://code.wireshark.org/review/6388 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04TCP: Update Multipath TCP (MPTCP) to final RFC (RFC 6824)Alexis La Goutte1-36/+68
* Add Fast Close subtype * Sender MAC => Sender HMAC * Display some reserved field * Add new flag (Checksum, Extensibility, HMAC-SHA1...) from MP Capability subtype * Use also proto_tree_add_bitmask for flag Change-Id: I2e4dfd75623d3218c574e3a112e799666adcc377 Reviewed-on: https://code.wireshark.org/review/6034 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: Evan Huus <eapache@gmail.com>
2015-01-02tshark: Add endpoints statisticsMichael Mann1-7/+1
"stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector. Change-Id: If34bcb5165b493948e784ba038ab202803a59843 Reviewed-on: https://code.wireshark.org/review/6154 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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>
2014-12-28Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.Michael Mann1-2/+2
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-26Fix assertion when applying conversation colorPascal Quantin1-2/+2
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-26Try to fix compilation broken by g3d3f973Pascal Quantin1-5/+0
Change-Id: I26833e9a4f7557b5824effaff16b38d2c4367772 Reviewed-on: https://code.wireshark.org/review/6059 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.Michael Mann1-11/+9
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 Reviewed-on: https://code.wireshark.org/review/5934 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-25Deleting unnecessary #includes from dissectors.Martin Mathieson1-3/+0
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-24TCP: TCP Fast Open Cookie is now standardisedAlexis La Goutte1-17/+55
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-24TCP: fix indent and reorder Multipath TCPAlexis La Goutte1-21/+21
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 20:35:41 +0000