aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ui: move filesystem code to wsutil/filesystem.cDario Lombardo2016-12-095-37/+37
| | | | | | | | | | | This function can be used by code outside ui (eg. extcap). Ping-Bug: 13218 Change-Id: Ic11f7acebefeaf777692df044ebff9b1bc387aa3 Reviewed-on: https://code.wireshark.org/review/19178 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* [RTP]Rearrange the logic in process_rtp_payload() to make it a bit clearerAndersBroman2016-12-091-29/+30
| | | | | | | | what happens. Change-Id: Ib64c127ef5e2ba3fe57301c7ac7c75fd1d0e0d27 Reviewed-on: https://code.wireshark.org/review/19176 Reviewed-by: Anders Broman <a.broman58@gmail.com>
* Set a Libgcrypt log handler on Windows.Gerald Combs2016-12-091-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>
* extcap: add new option type (timestamp).Dario Lombardo2016-12-099-2/+141
| | | | | | | | | | Bug: 12787 Change-Id: I941833c55fb607c8af2ef832082af58d7b94e965 Reviewed-on: https://code.wireshark.org/review/18721 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* transum: plugin codePaul Offord2016-12-0912-0/+2524
| | | | | | | | | | | | | | | A plugin to calculate response, service and spread time values based on the RTE model. Bug: 12892 Change-Id: I47d7e5354fc269916851a318fef10b826897eaf8 Reviewed-on: https://code.wireshark.org/review/17750 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
* .mailmap: Update (of november)Alexis La Goutte2016-12-092-4/+5
| | | | | | | Change-Id: I643825baa09bf1b6b54515dc109669c0cb1e2cd7 Reviewed-on: https://code.wireshark.org/review/18800 Reviewed-by: Franklin Mathieu <snaipe@diacritic.io> Reviewed-by: Michael Mann <mmann78@netscape.net>
* extcap: Whitespace cleanup.Stig Bjørlykke2016-12-083-300/+474
| | | | | | | | | | | | | | Cleanup code to use uniform whitespace to make it more readable. Also added brackets to unbracketed one line conditional statements. This was done using "astyle -A1cHjk3pU". Change-Id: Iebe96c488c843ce1d790ede0016eb9df025e98a5 Reviewed-on: https://code.wireshark.org/review/19133 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Fix a mis-merging.Guy Harris2016-12-081-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>
* tns: reduce variable scope.Dario Lombardo2016-12-081-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>
* [GTP] Add dissection of Extended Common Flags II IEAndersBroman2016-12-081-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>
* sdp: decode pt for more RTP transport protocolsPeter Wu2016-12-081-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>
* Qt: Fix currentOutputDeviceName() without QtMultimediaMichal Labedzki2016-12-081-0/+2
| | | | | | | | | | | | Fix build error: ui/qt/moc_rtp_player_dialog.cxx:87:76: error: ‘currentOutputDeviceName’ was not declared in this scope case 0: *reinterpret_cast< QString*>(_v) = currentOutputDeviceName(); break; Change-Id: I065862540e775c3e965cb5d3ae4c53bd8d505bdd Reviewed-on: https://code.wireshark.org/review/19142 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>
* Revert "Revert "Don't use a local variable's address in set_address().""Guy Harris2016-12-081-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>
* packet-rpcrdma: Select correct size of transport headerChuck Lever2016-12-081-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>
* Fix ZigBee End Device Timeout enumerationChris Brandson2016-12-081-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>
* Revert "Don't use a local variable's address in set_address()."Guy Harris2016-12-071-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>
* Don't use a local variable's address in set_address().Guy Harris2016-12-071-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>
* Revert "Temporarily break up complicated expression into a bunch of separate ↵Peter Wu2016-12-071-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>
* Qt: don't append a second extension to save file namesРоман Донченко2016-12-071-2/+1
| | | | | | | | | | | | | | When checking if the file already has one of the possible extensions, MainWindow::fileAddExtension reuses file_suffix between iterations and appends to it each time, so it ends up checking for the wrong suffix for all extensions except the first one. Scope file_suffix to the for loop to fix that. Change-Id: Idbc5a619a4793d8c477bfd88305cdb44ea844e13 Reviewed-on: https://code.wireshark.org/review/19123 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
* The version lists are sequences of 1-byte integers, not strings.Guy Harris2016-12-071-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>
* Qt: Fixup the currentOutputDeviceName Q_PROPERTY.Gerald Combs2016-12-072-3/+3
| | | | | | | | | | | | The CONSTANT attribute indicates that the same value will be returned every time. That isn't the case here so remove it. Change-Id: Ie7451e6aabcb4fa1a6960762d96ad190f32b3d7a Reviewed-on: https://code.wireshark.org/review/19130 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>
* extcap: Separate dirname and file with G_DIR_SEPARATOR_S.Stig Bjørlykke2016-12-071-5/+1
| | | | | | | | Change-Id: I9e1e9b1a10a15ca95519392a7a19ba77f460141e Reviewed-on: https://code.wireshark.org/review/19131 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* packet-tns: add Set Protocol dissection.Alexandr Savca2016-12-071-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>
* Bluetooth: SMP: Use bitmask fieldsMichal Labedzki2016-12-071-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>
* Fix: Allocate new string for export object entry to prevent crash when ↵bwhitn2016-12-071-1/+1
| | | | | | | | memory is freed Change-Id: Ied9f267b28144ea6069388d2d739d07955642863 Reviewed-on: https://code.wireshark.org/review/19129 Reviewed-by: Michael Mann <mmann78@netscape.net>
* packet-rpcrdma: Fix selection size in chunk list dissectorsChuck Lever2016-12-071-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>
* RTCP: Bugfix MS Video Source Request dissectionMichael Mann2016-12-071-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>
* sdp: replace bitmask by enum for transport protocolPeter Wu2016-12-071-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>
* Throw in another tweak to check for uninitialized cops_call_t structures.Guy Harris2016-12-071-0/+16
| | | | | | | | | | | | | Temporariy add a "magic" field, initialize it when we allocate it, and whenever we fetch a structure from the array, make sure the "magic" field has the right value. (If this all turns out to be a valgrind bug, I'm not going to be very happy.) Change-Id: I29becc715367fdc305504b38d48be05dc516132a Reviewed-on: https://code.wireshark.org/review/19128 Reviewed-by: Guy Harris <guy@alum.mit.edu>
* packet-rpcrdma: Prepare dissector for RPC-over-RDMA on iWARP or RoCEChuck Lever2016-12-071-152/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Infiniband-centric QP filtering. This filtering attempted to create conversations to allow the heuristic dissector to be bypassed once it was established that a QP was carrying RPC-over-RDMA traffic. However, it was preventing proper identification of RPC-over-RDMA traffic when a CM connection establishment exchange doesn't appear in the capture (which is frequently the case for captures of NFS traffic). Also, without this conversation logic, loading a capture file appears to be significantly faster, at least for capture files I have on hand. Later, some form of conversation management will be needed in order to associate RPC-over-RDMA transport headers with RDMA Read and Write operations that go along with them. But it will need to be agnostic about the underlying link layer. Bug: 13199 Bug: 13202 Change-Id: Ie6b7a4c65979dac036306f7367ce18836713ab4d Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19032 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* packet-tns: add TNS_TYPE_DATA functions dissection.Alexandr Savca2016-12-072-391/+421
| | | | | | | | | | | | | | | | | | Those functions also known as NET8 commands or SQLNET layer of TNS protocol. Also added a lot of sub-functions for one NET8 command, also known as OCI (Oracle Call Interface). Do other cleanup while in the neighbor hood including: 1. Use proto_tree_add_bitmask where applicable 2. Remove individual "hidden" command fields. Filtering should use "tns.type" 3. Remove unnecessary if (tree)s Change-Id: Ib7cc5cf307179d5d252c334949a4e77d9d396ba4 Reviewed-on: https://code.wireshark.org/review/19050 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>
* reformatted IMF export objectsbwhitn2016-12-071-2/+11
| | | | | | | | | Change-Id: I3d8da3f481d6808d374c2a906652370a46a4c088 Reviewed-on: https://code.wireshark.org/review/19121 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Moshe Kaplan <me@moshekaplan.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Change SpanDSP capitalizationPascal Quantin2016-12-077-21/+21
| | | | | | | | | Many capitalization can be found for this library (spandsp, Spandsp, SpanDSP), let's use the one found in the library README and in its spec file. Change-Id: Ia66b723e5d582a6218da1b6366b7d4859272f80c Reviewed-on: https://code.wireshark.org/review/19122 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* cops: try to avoid uninitialized warning errorPeter Wu2016-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind 3.11.0 on the Ubuntu 16.04 buildbot reports that cops_call->solicited is not initialized: pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value)); /* ... */ for (i=0; i < pdus_array->len; i++) { cops_call = (cops_call_t*)g_ptr_array_index(pdus_array, i); if ( /* ... */ ( (cops_call->op_code == COPS_MSG_KA && !(cops_call->solicited)) && ^^^^^^^^^^^^^^^^^^^^ which is clearly bogus since the only place where cops_call could be created is a few lines up: ver_flags = tvb_get_guint8(tvb, offset); is_solicited = (lo_nibble(ver_flags) == 0x01); /* ... */ pdus_array = (GPtrArray *)wmem_map_lookup(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value)); if (pdus_array == NULL) { pdus_array = g_ptr_array_new(); wmem_map_insert(cops_conv_info->pdus_tree, GUINT_TO_POINTER(handle_value), pdus_array); } /* ... */ cops_call = wmem_new(wmem_file_scope(), cops_call_t); cops_call->op_code = op_code; cops_call->solicited = is_solicited; /* ... */ g_ptr_array_add(pdus_array, cops_call); Try to zero the whole structure to avoid this bogus warning. Change-Id: I1ec4d23e99c987849af580a1c8134610c383e55e Ping-Bug: 13044 Ping-Bug: 13203 Reviewed-on: https://code.wireshark.org/review/19119 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* Bluetooth: SMP: Indicate when keys are DebugMichal Labedzki2016-12-061-4/+24
| | | | | | | | | | | | Debug mode keys are described by Bluetooth Core4 specification. Inform user if any of keys are debug. Debug mode is only if both keys are debug. Change-Id: Id7f58c2445614dc386a67b91cbe6f78ffbeda880 Reviewed-on: https://code.wireshark.org/review/19083 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* Qt: Make the RTP player output device selectable.Gerald Combs2016-12-066-11/+128
| | | | | | | | | | | | | | Add a combobox for selecting the output device and populate it with our available devices. Let the user know if our output format isn't supported. Ping-Bug: 13105 Change-Id: I299c7d0f191bb66d93896338036000e2c377781f Reviewed-on: https://code.wireshark.org/review/19046 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
* Bluetooth: SMP: Dissect remaining Key Distribution bitsMichal Labedzki2016-12-061-3/+26
| | | | | | | | | | | Add "Linkkey" and "Reserved" fields. Change-Id: I21a23824348500bbcf8366c947fe2d6599b015d4 Reviewed-on: https://code.wireshark.org/review/19081 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>
* packet-rpcrdma: Add filter variable for Write chunk segment countChuck Lever2016-12-061-0/+8
| | | | | | | | | | | | | | Allow the Write segment count field to be selected and filtered on. In many Write chunks there is just one segment. However in some special cases there can be multiple segments in a Write or Reply chunk. Change-Id: Ic4a4104e3a44bf4f2c96e4e5353a10e7547350c9 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19102 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Add udpdump to the macOS package.Gerald Combs2016-12-061-1/+7
| | | | | | Change-Id: I9d16a8291efdd564a905b2f8bc1ded4fa1aa718d Reviewed-on: https://code.wireshark.org/review/19118 Reviewed-by: Gerald Combs <gerald@wireshark.org>
* codecs: Add support for G.722 and G.726Peter Wu2016-12-0622-73/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 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: Peter Wu <peter@lekensteyn.nl>
* Autotools: Disable Qt4 on macOS.Gerald Combs2016-12-061-7/+8
| | | | | | | | | | | | Add a check for macOS+Qt4 to configure.ac in order to roughly match the CMake behavior in ge858829. Change-Id: I37de95d5db515d28dd88f13d818531bf6e94d07e Reviewed-on: https://code.wireshark.org/review/19036 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: Peter Wu <peter@lekensteyn.nl>
* SDP: Fix compiler warningMichael Mann2016-12-061-2/+2
| | | | | | | | | Change-Id: I5d415ba9ce7ae62eff43d47ceaa96e6282eaad1a Reviewed-on: https://code.wireshark.org/review/19113 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: Peter Wu <peter@lekensteyn.nl>
* DOF: fix UAT update callbacksPascal Quantin2016-12-061-69/+72
| | | | | | | | | | | | | - update callback must return a boolean to indicate success / failure - error message must be allcoated in glib memory as GUI will g_free it Bug: 13209 Change-Id: Ibb9690034d66dae85e775d0010aadeb192c76b4a Reviewed-on: https://code.wireshark.org/review/19111 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
* Bluetooth: Sync "Classic" color rulesMichal Labedzki2016-12-061-19/+19
| | | | | | | Change-Id: Ic64f9b71eba4ba8c79c28e10fe4eac983ca98f22 Reviewed-on: https://code.wireshark.org/review/19085 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
* sdp: refactor session/media level handling of attributesPeter Wu2016-12-061-404/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The media_count meaning is horrendous. -1 means "none", a count of "0" actually means "1". This led to various bugs in the past, so just rip it out and use a (wmem) array from which the length can be determined. That also means that a hard-coded limit on the media can now easily be lifted without affecting the size of the transport_info_t structure. (This limit, SDP_MAX_RTP_CHANNELS, is unchanged in this patch though.) Refactor the SDP dissector such that: - Media and related attributes are no longer a bunch of fixed array fields, but grouped in one structure. This results in the largest changes all over the place since "transport_info->media[n]" is now transformed into "media_desc->media" where "media_desc" is an element of the "transport_info->media_descriptions" wmem array. - Simplify protocol (in "m=") parsing (lots of ifs -> array + loop). - Remove convert_disposable_media and disposable_media_info_t, parse fields (media protocol from "m=", connection address from "c=", etc.) while parsing the SDP instead of parsing it at the end. - Have two distinct structures for keeping the info for the session and media level. Emphasize that new media descriptions are inherited from session level attributes (via sdp_new_media_description). - Delay creation of dynamic payload type information table until we actually create the media description. Create function clean_unused_media_descriptions to handle the common of freeing unused dynamic pt. - Remove SDP_IPv4/SDP_IPv6, these are replaced by checking the type member of the address structure. Changes to MSRP part: - Move MSRP attributes to the media-level attributes. - Remove msrp_transport_address_set attribute, rely on the AT_NONE address type for detecting bad addresses. - Remove SDP_MSRP_IPv4 check, this never worked as the flag was never set. Now it relies on the address family from the host in a=path:. Tested with these capture files with no change in PDML output nor improvements/regressions with memleaks (as reported by ASAN): capture sip call wireshark 1.8.2.pcap NOringback.pcapng rtp_not_parsed_by_1_10_1.pcap rtsp_interleaved_coreplayer.cap SIP_CALL_RTP_G711.pcapng srtpincorrectlyselected.pcap tdnwifitontwifi_withnatting_clientAbhopati_03082015.pcapng Change-Id: Ia0dbc63f8bd78cc84dad2e18174540e31b78a80d Reviewed-on: https://code.wireshark.org/review/19072 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>
* rtp: add function to duplicate rtp_dyn_payload_tPeter Wu2016-12-062-0/+24
| | | | | | | | | | | | There is no way to iterate through the contents. For a future patch to the SDP dissector (where the session-level info is copied to the media-level), it would be nice to duplicate the dynamic payload info. Change-Id: I79b8349e5e157298a28fc608e20c2c2e03e76400 Reviewed-on: https://code.wireshark.org/review/19106 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>
* DTLS: add support for use_srtp extension (RFC 5764)Peter Wu2016-12-065-9/+114
| | | | | | | | | | | | | Decryption support will be added later. Tested with dtls-srtp-ws-sip.pcapng from the linked bug. Change-Id: Ida1a2da754ef9aef16ad15ff64455b6f8e703ffd Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/18996 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
* ssh: add dissection for ECDSA host keysРоман Донченко2016-12-061-0/+29
| | | | | | | | Change-Id: Ic9851976bfa25fc61c708ee08e5a26ad01769f06 Reviewed-on: https://code.wireshark.org/review/19097 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
* SDP: reduce code duplicationPeter Wu2016-12-061-230/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Observe that some code in setup_sdp_transport is effectively the same code as a part from dissect_sdp with these differences: - Removal of these two conditions (setup_sdp_transport already returns early when a packet is visited): (!pinfo->fd->flags.visited) && (transport_info == &local_transport_info) - "establish_frame" in setup_sdp_transport is replaced by "pinfo->num" in dissect_sdp. dissect_sdp further has two additional blocks that add information to the VoIP calls dialog. This is preserved. Freeing of the RTP payload information has also been simplified. Instead of checking it inside the main loop that adds addresses (now moved to a new function, "apply_sdp_transport"), let the caller do it outside the loop. The transformation in this patch is rather mechanical: 0. Add a comment on what the new function is supposed to do. 1. Move code from setup_sdp_transport into a new function, apply_sdp_transport and reduce indentation level. 2. Copy all variables to the new function and populate the parameter list. 3. Compile result, remove unused variables that the compiler warns for. 4. Move freeing of unused media outside the loop to the caller. 5. Create a new conditional statement before the duplicated loop, which checks whether setup_sdp_transport has been used before. (SIP first calls setup_sdp_transport, then it invokes the media type dissector which calls dissect_sdp to populate the tree.) 6. Remove the duplicated code from the dissect_sdp loop until only the VoIP Calls dialog info remains. There is no functional change intended. Change-Id: I928379466af56ef1729cccbf4a5b60895ddb3227 Reviewed-on: https://code.wireshark.org/review/19047 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>
* SDP: add basic ICE candidate attribute dissection (RFC 5245)Peter Wu2016-12-061-2/+151
| | | | | | | | | | | | | Dissect the first, fixed part of a=candidate. The candidate type is also unabbreviated for easier understanding. Tested with dtls-srtp-ws-sip.pcapng from the linked bug. Change-Id: I9950c8f066becea86f1fe8e9ffab2dc07ae0f425 Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/18997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 09:21:13 +0000