summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2016-12-14Remove add_item_textMichael Mann2-112/+53
It's a manual attempt at what proto_tree_add_bitmask can do anyway. Change-Id: If551e8afa346a33b8e15dc441aae75ba0752ab46 Reviewed-on: https://code.wireshark.org/review/19257 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-14packet-lsc.c: Use proto_tree_add_item instead of manually fetching field values.Michael Mann1-37/+21
Change-Id: I60740615de02bc5047eaca618973064513ac7b56 Reviewed-on: https://code.wireshark.org/review/19256 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-14packet-kerberos4.c: Use encodings instead of boolean little vs big endian.Michael Mann1-17/+16
Also use proto_tree_add_item_ret_length for string handling. Change-Id: Id1eae2e51460a3b7f4c3385b9b1fd7f12398a227 Reviewed-on: https://code.wireshark.org/review/19255 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-14packet-nbt.c: General cleanupMichael Mann1-146/+54
1. Remove functionality that was replaced by a proto_tree_add_bitmask 2. Remove use of nbdgm_header structure which is just a useless placeholder 3. Remove some if (tree) over single fields. Change-Id: I0879043685686eb5b861cf77ec38bbf25ed6044e Reviewed-on: https://code.wireshark.org/review/19254 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-14file-jpeg.c - Pacify pre-commit hooks by removing macroMichael Mann1-55/+53
IMG_JFIF was trying to be a macro for all display and expert info filters. This messed with the pre-commit scripts ability to ensure protocol filter name was being used as the prefix for display and expert info filters. So replaced IMG_JFIF with the proper prefix - "image-jfif" Change-Id: I1fe3dc8797529c9d17f75c511bc279824e7e69b0 Reviewed-on: https://code.wireshark.org/review/19253 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-14cmake: add semicolon to file list.Dario Lombardo1-1/+1
The file list contains semicolon-separated list of files to check. When merging the lists we need to separate them properly. Error: No such file: "packet-ncp2222.cpacket-coseventcomm.c" at wireshark/tools/checkAPIs.pl line 2050. Change-Id: I19702ab85408caf69ed922732fce74c3058be640 Reviewed-on: https://code.wireshark.org/review/19237 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>
2016-12-13Adjust proto_tree_add_uint_format_value calls to use unit stringMichael Mann67-609/+415
Several calls to proto_tree_add_uint_format_value could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field. There also a few cases where proto_tree_add_uint_format_value could just be proto_tree_add_uint. Added a few more "common" unit string values to unit_strings.[ch] Change-Id: Iaedff82c515269c9c31ab9100dff19f5563c932d Reviewed-on: https://code.wireshark.org/review/19242 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-13Adjust proto_tree_add_[float|double]_format_value calls to use unit stringMichael Mann9-49/+56
Several calls to proto_tree_add_[float|double]_xxx could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field. Added a few more "common" unit string values to unit_strings.[ch] Change-Id: Id0da7b579403898d20c2667d6c4abcd59d5a48d4 Reviewed-on: https://code.wireshark.org/review/19241 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-13imf: fix no newline at end of file [-Wnewline-eof]Alexis La Goutte1-1/+1
Change-Id: Ibddfbb049fdf8510ffc14fbadba7484300821888 Reviewed-on: https://code.wireshark.org/review/19236 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>
2016-12-13Add support for adding unit names to hf_ fields.Michael Mann9-76/+335
This was inspired by the https://www.wireshark.org/lists/wireshark-dev/201505/msg00029.html thread. Used TCP and NTP dissectors as the guinea pig with sample use. Documentation updates includes some unrelated cleanup just because it was noticed. Change-Id: I59b26e1ca3b95e3473e4757f1759d7ad82976965 Reviewed-on: https://code.wireshark.org/review/19211 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>
2016-12-13bthci_acl: Set src/dst addresses before reassembly.Stig Bjørlykke1-8/+7
Set all addresses before we do reassembly because sub-dissectors may set their own addresses, and we don't want to override them again. This fixes "Follow TCP Stream" and shows the correct IP addresses in the Source and Destination columns when transporting IP packets. Allocate the addresses in pinfo pool to avoid possible stack buffer overflow. Bug: 13230 Change-Id: I3b81ccb02b38331add4773d9bb3d5e0f6dcf025e Reviewed-on: https://code.wireshark.org/review/19201 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-12-13ssh: add dissection for Elliptic Curve Diffie-Hellman KEXРоман Донченко1-0/+71
The protocol is actually nearly identical to ordinary Diffie-Hellman, but the names are different, and the ephemeral keys are bytestrings rather than integers. Change-Id: I261b6426137dae12fe53686e74517080abd80bb3 Reviewed-on: https://code.wireshark.org/review/19210 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>
2016-12-13Add BGP dissector support for draft-ietf-idr-shutdown-01Arjen Zonneveld1-1/+21
Parse the communication bits of a BGP Cease NOTIFICATION: Border Gateway Protocol - NOTIFICATION Message Marker: ffffffffffffffffffffffffffffffff Length: 146 Type: NOTIFICATION Message (3) Major error Code: Cease (6) Minor error Code (Cease): Administratively Shutdown (2) BGP Shutdown Communication Length: 124 Shutdown Communication: NTT will perform maintenance on this router. This is tracked in TICKET-1-24824294. Contact noc@ntt.net for more information. Draft at https://tools.ietf.org/html/draft-ietf-idr-shutdown-01, sample file taken from from http://instituut.net/~job/shutdown.pcap Change-Id: I2ab633883cc69e560ff79cb6239e02fcffd71e10 Reviewed-on: https://code.wireshark.org/review/19144 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: Anders Broman <a.broman58@gmail.com>
2016-12-13Bluetooth: BTLE: Add new commands parsingJakub Pawlowski2-0/+113
Add "LE Set Extended Advertising Parameters" and "LE Set Extended Advertising Parameters" commands parsing. Change-Id: Ibcc9f145694e54710da3a11ade237f7132674366 Reviewed-on: https://code.wireshark.org/review/19234 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>
2016-12-13Bluetooth: BTLE: Add BT5.0 command and event name parsingJakub Pawlowski2-1/+74
Change-Id: I830551959965896451ddc08f3e843b61f22eed67 Reviewed-on: https://code.wireshark.org/review/19233 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>
2016-12-13packet-infiniband: Update conversation src port for exact lookupParav Pandit1-3/+23
Dissectors above infiniband (such as RPC dissector) performs exact lookup on saddr, daddr, sport, dport. They are unaware that underlying transport is infiniband which doesn't have src_qp in packets. Due to which srcport remains uninitialized and exact lookup fails. In order to get them work seemlessly, this fix updates the sport to src_qp (similar to destport to dest_qp). With this upper level dissectors can perform direct lookup similar to TCP. Those which need to access private data of unidirectional CM messages, can still continue to perform unidirectional lookup as before. It also fixes the issue where req_qp and resp_qp were swapped during bidirectional conversation creation. This was caught during testing with packet-rpc.c by Chuck Lever. Tested protocols: 1. nfs-rdma over Infiniband with trace of Bug 13213 2. ICMP packets over Infiniband 3. NVMe fabrics over RDMA Tested with trace of Bug 13201 for Nvme. Bug: 13202 Bug: 13213 Change-Id: Ica1b6aae3ccaa6642dc3b3edfa9a5a4c335cc5da Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/19190 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-12[RTP] In case no conversation is found, check if we have a dissecor forAndersBroman1-0/+12
the dynamic payload type defined. If so set the dynamic payload_type_string to that dissectors name. This is for RTP analysis to work if there is no setup information in the file. Change-Id: I7ae7b957cfa9eb6013f7d32d50563e2034210af6 Reviewed-on: https://code.wireshark.org/review/19220 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>
2016-12-12Rename non-EBCDIC-specific routines.Guy Harris3-10/+10
Those routines can handle any single-byte character set whose characters map to characters in the Basic Multilingual Plane; it could be used for extended ASCII, but we have another routine for that, mapping only characters with code points > 0x7f, so we just say "nonascii" rather than "ebcdic". Change-Id: I3d55b5d58e3e7ab08f3dfbfdb57a0301a30e71d4 Reviewed-on: https://code.wireshark.org/review/19214 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-12Fix handling of EBCDIC string fields.Guy Harris4-51/+155
Have a routine that takes a 256-element translation table and uses it to map various flavors of EBCDIC to Unicode. Have separate translation tables for "common" EBCDIC (everything that's the same in all EBCDIC code pages that include the original EBCDIC characters) and EBCDIC code page 037. Add ENC_EBCDIC_CP037 for code page 037. Change-Id: Ia882b3c0abef9e30eb54cd47396e6fa0d6342044 Reviewed-on: https://code.wireshark.org/review/19212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-11ssh: correct inaccurate field names/abbrevs/id variable namesРоман Донченко1-30/+30
* kex_first_packet_follows -> first_kex_packet_follows That's the name the spec (RFC 4253) uses. * DH H signature -> H signature, DH host key -> host key Neither the host key nor the H signature have much to do with Diffie-Hellman. They're used in the same way in every key exchange method that I know of, so their names should be more generic. * mpint_[ef] -> dh_[ef], mpint_[pg] -> dh_gex_[pg] This is to make all key exchange method-specific fields follow a consistent pattern with all names/abbrevs being prepended by the method name. Change-Id: Ic887fb92d8cbb6042e9b8e553cb5804db0ba4db8 Reviewed-on: https://code.wireshark.org/review/19199 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>
2016-12-11smb/tftp: fix no previous prototype for ‘tftp/smb_eo_cleanup’ ↵Alexis La Goutte2-2/+2
[-Wmissing-prototypes] Change-Id: I22ce7c49eab9232d38ace51a39fee098786f981d Reviewed-on: https://code.wireshark.org/review/19206 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>
2016-12-11[Automatic update for 2016-12-11]Gerald Combs3-16/+337
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ie1a890ea3d5cfab844bc486806303e0ea4417ec3 Reviewed-on: https://code.wireshark.org/review/19203 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-11Cleanup dissection of endpoint addresses.Guy Harris1-17/+17
All the pseudo-headers encode the endpoint as per a bEndpointAddress in sections 9.6.6 "Endpoint" of the USB 2.0 spec and the USB 3.1 spec, with a 4-bit endpoint number at the bottom and a 1-bit direction at the top with 0 = OUT and 1 = IN. Show the FreeBSD endpoint address the same way the other endpoint addresses are shown; the FreeBSD one is shown as a 4-byte little-endian value, but only the low-order (first) byte is used, so just show that byte. Call that field the "endpoint address", with the lower 4 bits being the "endpoint number" and the uppermost bit the "endpoint direction". Change-Id: Ic7358c7fb6b6df2502315b590eb5178cecb321d9 Reviewed-on: https://code.wireshark.org/review/19200 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-11ssh: remove uninformative blurbsРоман Донченко1-45/+45
For most of the fields, the blurb is just the name with "SSH" prepended, which is not particularly useful. Replace a few of them with more informative descriptions and remove the rest. Change-Id: I15e95a42e897d09d3b6334022b32dd36f29e86a4 Reviewed-on: https://code.wireshark.org/review/19198 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-10Add a preference to control whether string and byte lengths appear in ↵Martin Mathieson1-14/+39
protocol tree Change-Id: I6be13d9adb8871cbbf4604155e8e7175a74ddaa3 Reviewed-on: https://code.wireshark.org/review/19188 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dmitry Lazurkin <dilaz03@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-12-10gsmtap: Introduce a new packet-gsmtap.h header fileHarald Welte4-133/+174
Move the GSMTAP protocol related #defines to packet-gsmtap.h, as there are other dissectors (like packet-gsm_sim.c and future dissectors) need access to some of those #defines. Change-Id: Ibb3517bd773be63b7e3cd30104a5351427e22ebf Reviewed-on: https://code.wireshark.org/review/19185 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-10Initialize fd_head->frame in all cases where we allocate fd_head.Guy Harris1-4/+5
Also, sort the initializations of structure members by the order in the structure, to make it easier to check that we've initialized them all. Bug: 13231 Change-Id: Id2819940d916a5fd5a3f1bf2fc20bd3ee34a75f4 Reviewed-on: https://code.wireshark.org/review/19195 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-10ssh: organize header field IDsРоман Донченко1-174/+190
The header field ID variables are listed in a somewhat chaotic order, making the list hard to comprehend and update. Group them according to the part of the protocol the corresponding fields occur in, and order the groups and the IDs within groups to roughly match the protocol flow and message formats. Change-Id: I915f508fd78ff89819c96d246c79d335de6a172e Reviewed-on: https://code.wireshark.org/review/19154 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>
2016-12-09[ICMP] use abs() in detecting timestamp heuristicsMichael Mann1-2/+3
The code was making the assumption that the ICMP data time will always be greater than or equal to the frame time, but not earlier, but that is not always the case and the heuristics can fail. Bug: 13161 Change-Id: I4bc7bd8d22d717d3b1f08afdd651f8a70cb7aef2 Reviewed-on: https://code.wireshark.org/review/19157 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-09[RTP] Don't call p_get_proto_data() twiceAndersBroman1-8/+8
Change-Id: Ie13e23232e183818b813e391274d75415b3fee83 Reviewed-on: https://code.wireshark.org/review/19181 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-09packet-windows-common.h: Fix "Warning: this decimal constant is unsigned ↵Thomas Dreibholz1-2927/+2927
only in ISO C90" Bug: 12824 Change-Id: I4b857f3cc488867d8ee7487c1f978edf639988f8 Reviewed-on: https://code.wireshark.org/review/19182 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-09[RTP]Rearrange the logic in process_rtp_payload() to make it a bit clearerAndersBroman1-29/+30
what happens. Change-Id: Ib64c127ef5e2ba3fe57301c7ac7c75fd1d0e0d27 Reviewed-on: https://code.wireshark.org/review/19176 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-09Set a Libgcrypt log handler on Windows.Gerald Combs1-0/+34
Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 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: Michael Mann <mmann78@netscape.net>
2016-12-08Fix a mis-merging.Guy Harris1-16/+22
Also, remove the "make sure we're not fetching a bogus structure" tests. Add a comment explaining how a compiler bug where it's overly optimizing a combination of tests could cause the valgrind errors we were seeing, so we're zeroing the entire structure, padding included, to avoid that. Change-Id: I24f94b2cbceec5234c1da82b891f609648075839 Reviewed-on: https://code.wireshark.org/review/19149 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-08tns: reduce variable scope.Dario Lombardo1-1/+1
Change-Id: Ie187692143b5866bb52b7daf1def2e36ce202a86 Reviewed-on: https://code.wireshark.org/review/19146 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08[GTP] Add dissection of Extended Common Flags II IEAndersBroman1-25/+110
while at it extend IE value_strings. Change-Id: Iea592aca088384c381843be7255922db2ade393a Reviewed-on: https://code.wireshark.org/review/19145 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08sdp: decode pt for more RTP transport protocolsPeter Wu1-23/+32
Do not just decode the payload type for RTP/AVP, but also all RTP transport types. Add RTP/AVPF (same as normal RTP/AVP, but with additional RTCP formats). Similarly, add RTP/SAVPF and the two DTLS variants. Add references to the relevant specifications and order per IANA registry. Tested with dtls-srtp-ws-sip.pcapng, now the payload types under the "m=" tree have names and frames that were previously reported as RTP show up as SRTP. Frame 442 now shows "Encrypted RTCP Payload" warning instead of decoding it as garbage. Change-Id: I06893f385ec270391f8891e72a364d08d2354a0a Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/19139 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>
2016-12-08Revert "Revert "Don't use a local variable's address in set_address().""Guy Harris1-1/+1
This reverts commit 92a2c184b09ce41a1ab717963750bb5543099742. Actually, that address *is* attached to a pinfo structure. Change-Id: I183135f9cf10a6714045091d2ae02d2799093bae Reviewed-on: https://code.wireshark.org/review/19143 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-08packet-rpcrdma: Select correct size of transport headerChuck Lever1-0/+4
Nit: Make it easier to see the transition between the end of the RPC-over-RDMA transport header and the start of the RPC header. Calculate the selection size of the RPC-over-RDMA header properly, including the size of the chunk lists. Change-Id: I84bc7d970a95e8f50a21a45ded386322711b6512 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19034 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>
2016-12-08Fix ZigBee End Device Timeout enumerationChris Brandson1-1/+1
Value 1 incorrect. Remaining enumerations correct Change-Id: I31939fabded6c4eab13c5b61bbdd4f61b962f0e0 Reviewed-on: https://code.wireshark.org/review/19137 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-07Revert "Don't use a local variable's address in set_address()."Guy Harris1-1/+1
This reverts commit e2c26ff90c6aee381c3af0c33253dcfa5631bb43. *That* address isn't attached to a pinfo structure, it's used to create a conversation, and a copy is made of it, using file scope. So that's not the cause of this problem. Change-Id: I07ce091e678c42c30080cd00fd17cd1584f473ad Reviewed-on: https://code.wireshark.org/review/19138 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-07Don't use a local variable's address in set_address().Guy Harris1-1/+1
The address data is supposed to outlive the current routine's scope, so you can't pass it a pointer to an argument to the routine; you have to allocate pinfo-scoped memory and copy the variable to that. Bug: 13219 Change-Id: Id3fdb52b614036d4d24d0676e798a2524fbe916c Reviewed-on: https://code.wireshark.org/review/19136 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-07Revert "Temporarily break up complicated expression into a bunch of separate ↵Peter Wu1-63/+0
ifs." This reverts commit db7c6286169015a727024e86eb270722127125bb. As pointed out in bug 13044, the warning is really coming from checking "cops_call->solicited", no need to expand the whole expression. Ping-Bug: 13044 Change-Id: Ib376ce6d0ec9fcf896e6081adae7664f19d9f759 Reviewed-on: https://code.wireshark.org/review/19115 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-07The version lists are sequences of 1-byte integers, not strings.Guy Harris1-14/+59
Show each version in the list independently as an item. Perhaps the Set Protocol response version lists seen have only one version, but the presence of a version-0 terminator suggests that it could contain multiple versions, so dissect it as such. For FT_STRINGZ values, let proto_tree_add_item() determine the length - pass a length of -1. If we need the length, use proto_tree_add_item_ret_length(). Change-Id: I5954ccac34f9e462c6d43e9a213974cf818f4d0d Reviewed-on: https://code.wireshark.org/review/19134 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-07packet-tns: add Set Protocol dissection.Alexandr Savca1-34/+42
Set Protocol is a SQLNET (NET8) message of Data packet type. At the moment, request message is fully implemented, response partly. Also, remove unused href entry(s). Change-Id: I1814ce867cf4f03fa70f05552bfe870ed8f7737c Reviewed-on: https://code.wireshark.org/review/19051 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: Michael Mann <mmann78@netscape.net>
2016-12-07Bluetooth: SMP: Use bitmask fieldsMichal Labedzki1-66/+59
And try to improve column output readability by using separators. Change-Id: I274f47275519c2a87def483f8f857a98edc341d1 Reviewed-on: https://code.wireshark.org/review/19109 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-07Fix: Allocate new string for export object entry to prevent crash when ↵bwhitn1-1/+1
memory is freed Change-Id: Ied9f267b28144ea6069388d2d739d07955642863 Reviewed-on: https://code.wireshark.org/review/19129 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-07packet-rpcrdma: Fix selection size in chunk list dissectorsChuck Lever1-13/+11
Use proto_item_set_len instead of walking the packet ahead of time trying to compute the size. Change-Id: I5eb3da1fef45895853cb5b6b198d0310394e4176 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19120 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>
2016-12-07RTCP: Bugfix MS Video Source Request dissectionMichael Mann1-3/+3
Bug: 13212 Change-Id: I249d38e843f737bbd0773828f24980d148fbaa00 Reviewed-on: https://code.wireshark.org/review/19126 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>
2016-12-07sdp: replace bitmask by enum for transport protocolPeter Wu1-28/+28
Previously the bitmask also stored whether the type of media (video) and address type (IPv4/IPv6). Now that these are gone, it makes more sense to use enums. There is no functional change (only debugging output is different). Change-Id: Idc9659cd21e36489a3f5720bbf13640c4beecc02 Reviewed-on: https://code.wireshark.org/review/19124 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>