aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
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-191.99.4 → 1.99.5.Gerald Combs2-2/+2
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 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() whichAndersBroman3-14/+127
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-19Netflow/Ipfix: Add Citrix Netscaler AppFlowUli Heilmeier2-2/+1499
This commit adds dissection of Citrix Ntscaler Appflow templates to Netflow/Ipfix. The documenation for the templates was found at: https://raw.githubusercontent.com/splunk/ipfix/master/app/Splunk_TA_IPFIX/bin/IPFIX/information-elements/5951.xml Due to non-disclosure I can't provide any sample pcap. Change-Id: I1d34ad4298a51c71986bc8565cc5f3802b0df3c2 Reviewed-on: https://code.wireshark.org/review/7740 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-19Replace enumerated preference for choosing subdissector with a subdissector ↵Michael Mann4-54/+63
table and Decode As functionality. This makes it much easier for other subdissectors (and plugins) to associate themselves with CAN. Change-Id: I49dd832af51651d0c91f9850c100e544d178b8c4 Reviewed-on: https://code.wireshark.org/review/7734 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-03-19Eliminate decode_bitfield_value from "public" use.Michael Mann3-13/+11
This "encourages" (forces) dissectors to use the bitmask field of the header_field_info structure to get "bitmask formatting" of a field. other_decode_bitfield_value should be treated the same (eventually eliminated), but there are still replacements to be made in the dissectors. Change-Id: I8a0d829c3fef2d5e5a588667a259e231bca559e6 Reviewed-on: https://code.wireshark.org/review/7736 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-03-18Complete the fix from g6b5c71a.Gerald Combs1-1/+0
Change-Id: I18360cbc50d790a22e69e85dcc16363f8c682c64 Reviewed-on: https://code.wireshark.org/review/7739 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-18Don't cache existing IPv4 and IPv6 hostnames.Gerald Combs1-13/+14
In the Qt UI redrawing the packet list redissects our visible packets, which might call add_ipv{4,6}_name, which sets new_resolved_objects = TRUE, which emits the addressResolutionChanged signal, which redraws the packet list, which ... Break out of the loop by checking to see if we've already cached an IPv4 or IPv6 hostname. Change-Id: Icb2841e3453fb98d4cf0ea06a0f49737e2b8f25e Reviewed-on: https://code.wireshark.org/review/7738 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-18Eliminate decode_bitfield_value from dissectors.Michael Mann2-106/+140
Change-Id: I37f5dbd5e88fd4dd8f736b014d36aae926082d1f Reviewed-on: https://code.wireshark.org/review/7735 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-18[BOOTP] Try to fix the build boot by casting a variable to 32bits while atAndersBroman1-17/+18
it replace tvb_length() with tvb_reported_length(). Change-Id: Ic2a0c99c20320ddd15d2f4ec173d73229dcf41f6 Reviewed-on: https://code.wireshark.org/review/7733 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18DNS: fix Coverity scan (1238867: Missing Break in switch)Alexis La Goutte1-0/+2
Change-Id: I4f1042cebe527874c3f890411f5e44aa71da5d28 Reviewed-on: https://code.wireshark.org/review/7732 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18[H248] Use hf fields from the SDP dissector to make it possible to findAndersBroman1-6/+65
related SDP in other protocols such as SIP. Change-Id: I5fb01128e6070f21b09b4f8364b5650f71fa305e Reviewed-on: https://code.wireshark.org/review/7719 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18[Reassembly] Fix a reassembly case where the two fragments are in the sameAndersBroman2-20/+30
frame but in different SCTP DATA chunks, whitout the patch the message is reassembled in both chunks leading to duplicated upper layer PDU:s in the frame. Change-Id: Ie31142c38c728018178947544b571622447d8e8f Reviewed-on: https://code.wireshark.org/review/7716 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18Remove proto_tree_add_text from packet-bootp.cMichael Mann1-276/+682
Change-Id: I651211cbe7365409e6c42ef1840122a03460aa42 Reviewed-on: https://code.wireshark.org/review/7731 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-03-18Remove proto_tree_add_text from packet-gtp.cMichael Mann1-57/+125
Change-Id: I53dcee56565e2a82bf0789199ce1c552f622840b Reviewed-on: https://code.wireshark.org/review/7730 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-18Remove proto_tree_add_text from packet-x25.cMichael Mann1-171/+109
Change-Id: I8b08c922515d16350f6f80256564389ae3e408c4 Reviewed-on: https://code.wireshark.org/review/7729 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-17MIP6: Add Localized Routing for Proxy Mobile IPv6 (RFC6705)Alexis La Goutte1-4/+170
* Add LRI and LRA Mobility Header * Add MAG IPv6 Mobility Option * Remove one proto_tree_add_text Change-Id: Ib96eddc0a349214d0a112cdd92efe129f97be1ab Reviewed-on: https://code.wireshark.org/review/7717 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: Anders Broman <a.broman58@gmail.com>
2015-03-17IP: fix soft-deprecated APIs (tvb_length)Alexis La Goutte1-1/+1
Change-Id: Ifcf70a3eb9fb603e5ba06f90a71184533736c69d Reviewed-on: https://code.wireshark.org/review/7718 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-17packet-dcerpc-*: fix alignment of dissect_ndr_ctx_hnd()Stefan Metzmacher2-1/+4
Change-Id: I9685f37580d1def6c0956d786398e3e70e819cee Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/7714 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-17Fix Wai dissectorCedric Izoard1-7/+52
- Add description for attribute type, verification and authentication results - Fix Certificate Authentication Response The second signature is optional - Fix Access WAI Authentication Response The Multiple Certificate Verification Result field is actually the content of Certificate Authentication Response : result plus one or two signature - FIx CErtificate Authentication request THe last filed is optional and it is a identity list bug: 11061 Change-Id: Ia6710046d8d28ca3c53354f7a997a3d76f09373d Reviewed-on: https://code.wireshark.org/review/7708 Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-16DNS: Add CSYNC (Child-to-Parent Synchronization in DNS RFC7477)Alexis La Goutte1-3/+60
Change-Id: Ida53904b4db1ca982055de267ce6f4fdcedd248b Reviewed-on: https://code.wireshark.org/review/7701 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-03-16Add dissection of E-UTRAN Description in Cell selection indicator afterLars Sundström1-1/+49
release of all TCH and SDCCH IE Change-Id: I552c436fe8bea5971863fd7ba023a86aa08f2f0c Reviewed-on: https://code.wireshark.org/review/7700 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-16PCEP, support new drafts:Francesco Fondelli1-12/+234
Conveying path setup type in PCEP messages, draft-ietf-pce-lsp-setup-type-00 PCEP Extensions for Segment Routing, draft-ietf-pce-segment-routing-01 Bug: 11046 Change-Id: Ib2ea9a96079324377fa65ef8c3ab37a98f530793 Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-on: https://code.wireshark.org/review/7618 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: Michael Mann <mmann78@netscape.net>
2015-03-16Remove proto_tree_add_text from packet-ssl.cMichael Mann1-73/+172
Change-Id: Icb81649363725c92f94dde5cb28cbba0f6ab5099 Reviewed-on: https://code.wireshark.org/review/7687 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-03-15Remove proto_tree_add_text from packet-synphasor.cMichael Mann1-40/+94
Change-Id: If7cf7ab42ca6a886deb1eab6bc1f391d993e1dad Reviewed-on: https://code.wireshark.org/review/7677 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-15Remove proto_tree_add_text from packet-edonkey.cMichael Mann1-214/+234
Change-Id: I42a06b728d807853d2c9b87a18ed36e1e0321085 Reviewed-on: https://code.wireshark.org/review/7685 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-15Added MPLS over UDP supportRemi Vichery2-0/+7
Change-Id: Ifdffdf042908c5b4b25704c56d734e9c942d24f4 Reviewed-on: https://code.wireshark.org/review/7690 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-03-15SRVLOC: always intialize prot before calling sscanfPascal Quantin1-0/+10
It prevents using an uninitialized variable if sscanf fails Bug: 11060 Change-Id: I3866d35ae05e8114263fd13a8ccc5e20c3a0d63a Reviewed-on: https://code.wireshark.org/review/7683 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-15[Automatic manuf, services and enterprise-numbers update for 2015-03-15]Gerald Combs3-23/+306
Change-Id: Ia77e5cac3d0c79f10d87f21bd4e19bd8187a01ff Reviewed-on: https://code.wireshark.org/review/7691 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-15Fix copy/pasteo of packet-eigrp.cMichael Mann1-2/+2
Change-Id: I2721086221c435d228bf27aef62f9dc5f6d9ee10 Reviewed-on: https://code.wireshark.org/review/7684 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-14Support gtpp data record format version older than 6Mato1-1/+1
Bug: 11051 Change-Id: I04b1f1c852b60182ef7f5405716c0b6733d0f44a Reviewed-on: https://code.wireshark.org/review/7679 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-14Correct comm_type length field.Michael Mann1-0/+2
Change-Id: Ia0cbb36e9962c762648ead8dddd3bb0a794cec74 Reviewed-on: https://code.wireshark.org/review/7678 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-14Qt: Fix DecodeAsMichal Labedzki2-5/+46
Previously DecodeAs neither save its changes nor changes dissector tables. Do that and redissect packets to refresh view. Bug: 10553 Change-Id: Icd8453c9650f0265852f6b6b58bc483b35570a15 Reviewed-on: https://code.wireshark.org/review/7676 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-14802.11: Fix MAC header Address mappingCedric Izoard1-56/+64
A1,A2,A3 and A4 in 802.11 MAC header were not correctly mapped to SA/TA/DA/RA/BSSID Change-Id: I050cbb544500d8c3bf3d545f85144ca853079dde Reviewed-on: https://code.wireshark.org/review/7655 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-03-14Remove proto_tree_add_text from packet-eigrp.cMichael Mann1-62/+141
Change-Id: Idb2d9e070c7f65540ad27b011bd4a3dcaa3dd7e4 Reviewed-on: https://code.wireshark.org/review/7667 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-13Add a test-programs target everywhere.Gerald Combs5-16/+27
Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-13LTE RRC: enhance dissection of Extended Access Barring CategoryPascal Quantin1-12/+12
Change-Id: I6e13ae8c4e95f5915541bc33d89faa61dade2058 Reviewed-on: https://code.wireshark.org/review/7674 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-13Add packet-opensafety.h to the distribution.Gerald Combs1-0/+1
Change-Id: Ifde4b7c276e8e2163a4a5e77bc036393e9e4493a Reviewed-on: https://code.wireshark.org/review/7668 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-13Make epan/iana_snap_pid.h the header file of packet-iana-oui.cMichael Mann5-4/+4
Change-Id: I123c591cb0eb83b561163119a4b00c616bcd0990 Reviewed-on: https://code.wireshark.org/review/7666 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-12MP2T: restore addresses once fragments are added to the hash tablePascal Quantin1-0/+6
It allows to have "Follow UDP stream" context menu working again Bug: 11055 Change-Id: I8eae15bfddb45ea033eb8dd2e3f7ca038057421a Reviewed-on: https://code.wireshark.org/review/7662 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12Use FT_FRAMENUM_ACK in SCTP too.Jeff Morriss1-1/+1
Also fix up the hf description to make it clearer (to me) that this frame number is pointing *to* the ACK, not *from* it. Change-Id: Ic60e949e65f3988f9ac34fff39d4addc28a1fdbc Reviewed-on: https://code.wireshark.org/review/7658 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12PER: fix dissection of known-multiplier character strings with ub less or ↵Pascal Quantin1-16/+16
equal to 2^b-1 See ITU-T X.691 chapter 30.5 for details Change-Id: I6ac31494997349c6bff19b196e72859a31634af4 Ping-Bug: 11039 Reviewed-on: https://code.wireshark.org/review/7633 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-03-12One check mark for ACKs, two check marks for dup ACKs.Gerald Combs2-3/+5
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-12openSAFETY: Separate definitions into headerRoland Knall2-387/+435
To allow future tap interfaces as well as analysis plugins to use the same definitions the dissector used, all defines are being separated into a header file Change-Id: Iec38e361ded46aab6684c2713ba9a047193a6694 Reviewed-on: https://code.wireshark.org/review/7468 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: Anders Broman <a.broman58@gmail.com>
2015-03-12CMake: Update wslua build and test.Gerald Combs5-74/+100
Process wslua/CMakeLists.txt using add_subdirectory instead of include. Generate files in the build directory instead of the source directory. Copy lua scripts to DATAFILE_DIR instead of DATAFILE_DIR/lua. That's where init.lua looks for console.lua. Always set WIRESHARK_RUN_FROM_BUILD_DIRECTORY when testing. We presumably want to test our source files and not files which may or may not be in the system path. When we're running from the build directory look for lua scripts in both the Autotools and CMake build locations. Change-Id: Ic15ab8c58ff1b170d000c9b3e0a329af2ec44b7b Reviewed-on: https://code.wireshark.org/review/7590 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12GSM_A-BCC: dissector for BCC ProtocolMikhail Koreshkov2-1/+603
Added dissector for Broadcast call control protocol (3GPP TS 44.069 version 11.0.0 Release 11) Change-Id: I179801d30fc2d32d8c4187a92dd0b1c9709711c7 Reviewed-on: https://code.wireshark.org/review/7627 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12Don't pass a t4-non-ecm-sig-end to the tap if we didn't see the start of theJeff Morriss1-3/+5
data: the invalid frame number will crash Wireshark. Bug: 10885 Change-Id: I3ae278b77a9449136fbaaac52f2bbaa8a510bf76 Reviewed-on: https://code.wireshark.org/review/7651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12Export CLIENT_RANDOM with Export SSL Session KeysPeter Wu3-2/+10
This allows for exporting the SSL session keys for captures which were decrypted using a RSA certificate, but where the server does not support session resumption. To avoid frequent reallocations, the expected length is used as initial string size. Tested against a nginx server with ssl_session_cache off. Note that all keys loaded via ssl.keylog_file are exported, not just the displayed ones! Change-Id: Ie3a93d3692885502f46442953fa53303d16672d7 Reviewed-on: https://code.wireshark.org/review/7175 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: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 23:05:22 +0000