aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-01-12Extcap: Restore previously created preference from hash table, not ↵Michael Mann1-2/+2
preference pointer Change-Id: Ie68a5c6c193f362e78d4f4b1f20edf7747e2313f Reviewed-on: https://code.wireshark.org/review/19614 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-12uat: add a reset callback.Dario Lombardo51-33/+130
This function will free the resources allocated by the caller. Change-Id: Ib486c14e4fd3c321662fb71f7fd06733ce9a64a4 Reviewed-on: https://code.wireshark.org/review/19375 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>
2017-01-12X2AP: upgrade dissector to v13.6.0Pascal Quantin9-95/+189
Change-Id: Ie312d354cadadba693ea5320c5bbc0957bde6514 Reviewed-on: https://code.wireshark.org/review/19613 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>
2017-01-11S1AP: upgrade dissector to v13.5.0Pascal Quantin10-104/+112
Change-Id: Ic65ae88af37f0e82207c093827755f93934d9424 Reviewed-on: https://code.wireshark.org/review/19612 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>
2017-01-11packet-btatt.c: Use protocol information from dissector handle instead of ↵Michael Mann1-1/+37
pinfo data for attributes. Instead of using a dissector function placed in a dissector table, just use the protocol information registered with the dissector table to create the desired dissector tree. Change-Id: Ic32b15e3c05d73df6e8f69890c47172e991bda6f Reviewed-on: https://code.wireshark.org/review/19509 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-11OpenFlow (v4/1.3): rename dissect_openflow_payload_v4 to ↵Alexis La Goutte1-13/+16
dissect_openflow_message_v4 Like OpenFlow (v5/1.4) dissector and include dissect_openflow_header_v4 Ping-Bug: 13221 Change-Id: I123fad871bcb1c9d54946500505525d55a81f8f3 Reviewed-on: https://code.wireshark.org/review/19602 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>
2017-01-11Run libtoolize before aclocal.Jeff Morriss1-3/+3
libtoolize installs files in m4/ which aclocal is going to include. Prior to this change this sequence: 1) ./autogen.sh 2) ./configure 3) make Results in aclocal (and subsequently ./configure) being rerun in step 3 (because there are files in m4/ that are are newer than aclocal.m4). Change-Id: I70589ab3cede6b7cd48e089c8be4d4c98dab3b6a Reviewed-on: https://code.wireshark.org/review/19609 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>
2017-01-11iso14443: use proto_tree_add_checksum()Martin Kaiser1-50/+76
replace our own function for dissecting the CRC with the generic proto_tree_add_checksum() Change-Id: I569c877836a7b771b01a37b57b6c50fc0183e9a7 Reviewed-on: https://code.wireshark.org/review/19601 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>
2017-01-11Qt: check NULL before dereference (CID 1394324)Jaap Keuter1-1/+1
Move the NULL check before the assignment with the dereference. Change-Id: Ifcd4fb89c059ad2f4b6606fc1e83dc67a7d7373d Reviewed-on: https://code.wireshark.org/review/19605 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-10cmake: fix empty data (Global Configuration) directoryPeter Wu1-13/+16
Color filters were somehow not loaded. It turns out that the BUILD_TIME_DATAFILE_DIR macro (for filesystem.c) was empty because DATAFILE_DIR was defined after adding the wsutil directory. Fix it by defining the variable before wsutil (but after epan). Change-Id: I0d002b79499c80a90d8fcc14b06ced26c30b0453 Fixes: v2.3.0rc0-1830-gd5fdbef7f4 ("cmake,wslua,wsutil: load files from run/ instead of source tree") Reviewed-on: https://code.wireshark.org/review/19600 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-10Use tvb_new_subset_remaining() rather than tvb_new_subset_length_caplen().Guy Harris5-27/+27
Any call of the form tvb_new_subset_length_caplen(tvb, offset, -1, -1) should instead be tvb_new_subset_remaining(tvb, offset). Change-Id: I4bc95b028103ea4fc82453ef3460c147d7ccabd6 Reviewed-on: https://code.wireshark.org/review/19598 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10Rename tvb_new_subset() to tvb_new_subset_length_caplen().Guy Harris171-464/+464
This emphasizes that there is no such thing as *the* routine to construct a subset tvbuff; you need to choose one of tvb_new_subset_remaining() (if you want a new tvbuff that contains everything past a certain point in an existing tvbuff), tvb_new_subset_length() (if you want a subset that contains everything past a certain point, for some number of bytes, in an existing tvbuff), and tvb_new_subset_length_caplen() (for all other cases). Many of the calls to tvb_new_subset_length_caplen() should really be calling one of the other routines; that's the next step. (This also makes it easier to find the calls that need fixing.) Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b Reviewed-on: https://code.wireshark.org/review/19597 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10ieee80211: Add Extreme (Zebra) Vendor Specific TLVAlexis La Goutte3-0/+81
Only decode subtype 1 : AP Name with unknown data (7 bytes) Change-Id: I4fc0c6fff1a931075ab333a8527251f12acb2827 Reviewed-on: https://code.wireshark.org/review/19586 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>
2017-01-09Consistently use tvb_reported_length_remaining().Guy Harris1-10/+10
That's the amount of data left in the packet; perhaps not all of it was *captured*, and using tvb_reported_length_remaining() will throw an exception, but that's what *should* happen ("packet cut short" notification and all). Use tvb_new_subset_remaining() to get a tvbuff with everything after a certain point in the packet. Change-Id: I2512e58e23600f7e7bbce0126732b05997692a65 Reviewed-on: https://code.wireshark.org/review/19596 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-09Use tvb_new_subset_length(); no need to do its work ourselves.Guy Harris1-5/+1
Change-Id: I581e14af2981c723a81e9c0340de0229b832e51a Reviewed-on: https://code.wireshark.org/review/19595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-09Restore FCoIB frame marker handling (CID 1397701)Jaap Keuter1-2/+8
It seems that somewhere in the last few years the changes for FCoIB have caused it to loose its frame marker processing. This change puts that back. Also there is an ambiguity in EOF handling, which is solved. Change-Id: Iefbb42726e4e5491a50d7ce96626c906fb5ea857 Reviewed-on: https://code.wireshark.org/review/19594 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-01-09Fix TCP stream graph (throughput) reset axes logic (CID-1398438)Jaap Keuter1-1/+1
The code seems to be ment to latch the reset axes flag for graph update. Change-Id: I7b47346c45aa7576c98a251eb3ebcd9188407000 Reviewed-on: https://code.wireshark.org/review/19581 Reviewed-by: Kevin Hogan <kwabena@google.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09802.11(ad): Add reserved field of Grant ACK frameAlexis La Goutte1-1/+8
Change-Id: I0bb982403fb7f36ad166234b16dbe8ad9b8b8eb8 Ping-Bug: 13244 Reviewed-on: https://code.wireshark.org/review/19592 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>
2017-01-09802.11(ad): Remove comment about clang warning and set directly the valueAlexis La Goutte1-5/+5
Change-Id: Ie64608597c7d6a5b9a2fec9de8e8983233e0e10e Reviewed-on: https://code.wireshark.org/review/19591 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09802.11(ad): Fix SSW Feedback dissection when Sector Sweep Direction = ResponderAlexis La Goutte1-1/+9
For the Sector Sweep Frame in which the Sector Sweep Direction = Responder, the format of the Sector Sweep Feedback Field should be the one in the standard (Figure 8-431d—SSW Feedback field format when not transmitted as part of an ISS) i.e. similar to the one in Sector Sweep Feedback Frame and Acknowledgement. Issue reported by Hany ASSASA bug: 13244 Change-Id: Ic8c6d83fc32d017fb73116a54759608498f99452 Reviewed-on: https://code.wireshark.org/review/19590 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09802.11(ad) fix typo : ambiguous assignment (CID 1398212)Alexis La Goutte1-1/+0
Introducte in g62a54cb77 Ping-Bug: 13244 Bug: 13309 Change-Id: I2e3411cfd38685c08fd669fad1313663ba879936 Reviewed-on: https://code.wireshark.org/review/19589 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>
2017-01-09TLS(1.3): update PSK extension for draft -18Peter Wu2-87/+66
Removed ke_modes and auth_modes fields, add identity.obfuscated_ticket_age and binders fields. (Note that binders field is not dissected further at this moment due to the lack of a pcap for verification.) Ping-Bug: 12779 Change-Id: I9af7d93feb2352a494be2d5bda66d124267cf464 Reviewed-on: https://code.wireshark.org/review/19462 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>
2017-01-09profinet: Skip comments in GSD fileGraham Bloice4-8/+75
Bug: 13303 Change-Id: I9ab17ec25917723be06b36ab4c11fe67e6792715 Reviewed-on: https://code.wireshark.org/review/19593 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-08[Automatic update for 2017-01-08]Gerald Combs11-1080/+1370
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I91668647c50e78b29bbb28f2348dc8e52c3a66c5 Reviewed-on: https://code.wireshark.org/review/19585 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-08Restore some MPLS registered dissectors.Michael Mann8-27/+26
Per https://ask.wireshark.org/questions/58532/missing-dissector-pw_eth_cw it appears some MPLS dissectors are still referenced by name and not just for the dissector table created in I1e0c3ae784b71c0145b1f1730a97feae8e9f488f. Change-Id: I27be132f56c879be16f78f76ac0e9688673a47c1 Reviewed-on: https://code.wireshark.org/review/19582 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>
2017-01-08Fix exit code for non-existent file.Dario Lombardo3-3/+3
The patched command line utilities have been aligned to tshark behavior. Change-Id: I0cb764b37792e882e182681124341893b3958c59 Reviewed-on: https://code.wireshark.org/review/19580 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>
2017-01-08Qt: fix crash on undecodable RTP streamPeter Wu2-1/+9
When the sample rate is zero, a floating point exception (FPE) occurs in QAudioDeviceInfo::nearestFormat. Detect the error condition instead and show an error. Change-Id: Ie2eaa57847938fe15607fa26d0f4e08e7ddd23d1 Fixes: v2.3.0rc0-1664-gd59653f8d5 ("Qt: Make the RTP player output device selectable.") Reviewed-on: https://code.wireshark.org/review/19569 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>
2017-01-08Comments on the first nibble stuff.Guy Harris1-3/+42
If you don't have control words - and several MPLS pseudo-wire RFCs say "in these cases, a control word isn't necessary, and isn't useful, so you might want to leave it out" - the first nibble values of 0, 1, 4, and 6 could just be part of the packet header. Explain some other stuff as well. Change-Id: I2f1aae2ab8653bdd7f8b3b52ef450f6d43a1afcd Reviewed-on: https://code.wireshark.org/review/19583 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-07extcap: fix memleak via data_file_urlPeter Wu5-5/+20
Commit v2.1.0rc0-2181-ga4e2263ac4 introduced a helppage parameter, but all callers were NULL. In a later change, callers would use the data_file_url() function, but this needs to be freed, so do that. Fixes: v2.3.0rc0-1825-ge5596b74bd ("extcap: set help page for all extcaps.") Change-Id: I967c0f8c6b50d9e78ac227575de24a81f97d376a Reviewed-on: https://code.wireshark.org/review/19570 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-07Add MUD-URL manufacturer usage description certificate extension.Eliot Lear11-0/+397
See draft-ietf-opsawg-mud for details. File changes include addition of new asn1 directory and associated files, as well as edits to various other files to support the change. Change-Id: Ib910980e1ddcafaa31aa07cf049562520b61a3aa Reviewed-on: https://code.wireshark.org/review/19505 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-07Refactor range preference.Michael Mann12-439/+423
Refactored so that all handling of ranges in struct preference can be internal to prefs.c Change-Id: I68577909f9c07b23a16ab3443a523355d4645314 Reviewed-on: https://code.wireshark.org/review/19577 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07DVB-S2 BB: Fix BB header CRC checksMustBeArt1-9/+4
Fix problem with baseband header CRC check that caused almost all baseband frames to show a spurious CRC error, introduced with proto_tree_add_checksum. Change-Id: I6b2f9680507eeb79e59b825f3ac9e4cee1033976 Reviewed-on: https://code.wireshark.org/review/19567 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-01-07Make column size sanity check more sensible.Noel Power1-1/+3
The existing sanity check on column_size makes incorrect assumptions about the size of the CTableColumn structure (which is an internal dissector structure that contains optional data). The sanity check test *always* fails. This change uses the minimum size of CTableColumn structure instead which should prevent excessive allocation during fuzz testing. Bug: 13299 Change-Id: Id9fcbc15a4df4c74bb7576c6fdca1000890947fd Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-on: https://code.wireshark.org/review/19566 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>
2017-01-07Add support for RROCE(v2) over IPv4 (without UDP).Jeff Morriss1-2/+6
This isn't standard but has been seen in the wild, see: https://ask.wireshark.org/questions/58521/cannot-decode-rocev2-traffic With this change users can Decode-As an IP Protocol as RROCE (by selecting Infiniband (IB) as the protocol). Change-Id: Iec865478d056f687f2f66124d6e936f67707d2c4 Reviewed-on: https://code.wireshark.org/review/19572 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-07packet-nvme: Dissect read/write cmd and SGLParav Pandit1-4/+268
1. Added support to dissect read and write commands. 2. Added support to dissect SGL fields addr, len, key. 3. Changed long reserved fields to decimal presentation. 4. Fixed typo for cqe reserved field. Change-Id: I63c674c68143c9c61610bada0410b49a134361d4 Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/19565 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07packet: fix memleak of "short_name" for heuristics dissectorsPeter Wu1-1/+3
Change-Id: I3b954e3623473899b6039f0ff572eb56defe14cc Fixes: v2.3.0rc0-1841-ga8b68205a4 ("packet: duplicate short_name to fix UAF in wslua") Reviewed-on: https://code.wireshark.org/review/19571 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>
2017-01-07Convert range API to always use wmem memory.Michael Mann54-207/+189
This is mostly to address memory leaks in range preferences (the biggest user of range functionality) on shutdown. Now range preferences must use epan scoped memory when referencing internal preference structures to keep consistency. Change-Id: Idc644f59b5b42fa1d46891542b53ff13ea754157 Reviewed-on: https://code.wireshark.org/review/19387 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06802.11(ad): Enhance dissection of Beacon Interval Control (BIC)Alexis La Goutte1-28/+36
You can now use bitmap on 64bits (or 48bits) and also add a reserved field Ping-Bug: 13244 Change-Id: I2ec9412f6cfebd3a8ca5c082af5e8481e2646eaf Reviewed-on: https://code.wireshark.org/review/19561 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>
2017-01-06Convert some easily identifiable pinos.Michael Mann9-30/+30
grepping for "Decode As" comments reveals exactly was pinos were created for - distinguishing multiple dissection functions in a single dissection table. Change-Id: Iaa9294045e9d0633563e7d763cb585c0e6dc598f Reviewed-on: https://code.wireshark.org/review/19490 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06VLAN: Support IEEE 802.1Q-2005 and -2011 changesJohn A. Thacker1-20/+174
Supports the recommended meanings of the priority field as changed by 802.1Q-2005, and the change from the CFI to DEI in 802.1Q-2011. A preference is added to use the older (non-compatible) spec version. Note that 802.1Q-2011 is consistent with 802.1ad and ah, which got rolled up in 802.1Q, but ends up removing support for bridging Token Ring and FDDI over Ethernet. Bug: 13294 Change-Id: Ieeadb0f6dda2758750f9e6649f1390609d78c50e Reviewed-on: https://code.wireshark.org/review/19548 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06802.11(ad): add reserved fields for Beam FormingAlexis La Goutte1-0/+14
Change-Id: I486c883b27059eb55e9fe11fcc372fc31c1e56ca Ping-Bug: 13244 Reviewed-on: https://code.wireshark.org/review/19560 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06802.11(ad): align length of Beam FormingAlexis La Goutte1-10/+10
use UINT16 Change-Id: I7f7c4e847ed6ccb6ced446d493aa27f76cc8db61 Reviewed-on: https://code.wireshark.org/review/19559 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06802.11(ad): fix typoAlexis La Goutte1-1/+1
Wrong field name for Dynamic Allocation Issue reported by Hany ASSASA Bug: 13244 Change-Id: Idec2cb48c5b3d22d75880325d2aec0083d89ca95 Reviewed-on: https://code.wireshark.org/review/19558 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-05Update the preference help text to indicate the correct default RROCE port.Jeff Morriss1-2/+2
I97b82fb53fd63d9107ee5d4c64b94840e743fc72 changed the default but not the help text. Change-Id: I05375c44c01703e36686d0a16a094cb8d6b3dcd2 Reviewed-on: https://code.wireshark.org/review/19557 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>
2017-01-05NAS EPS: NAS message container in Control Plane Service Request can be cipheredPascal Quantin1-2/+21
Change-Id: I026fc63e09c54807604c5d5a112c36dd41759c00 Reviewed-on: https://code.wireshark.org/review/19556 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>
2017-01-05Add g_log entries to measure startup time, protected by #ifdefAndersBroman1-5/+51
Change-Id: Ic32f89dc824a6da838643445a30335a8c73af1ee Reviewed-on: https://code.wireshark.org/review/19540 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>
2017-01-05More make-version.pl fixups.Gerald Combs1-13/+14
Don't add extra \n's. Change ".*([\r\n]+)$" matches to ".*?([\r\n]+)$" so that we don't greedily match the wrong line ending. Change-Id: I916ee49207eaac17e1e4c4f677558f7be13a099a Reviewed-on: https://code.wireshark.org/review/19541 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>
2017-01-05Do RA_DISSECTORS in the Qt UI.Guy Harris2-3/+6
It looks as if a fair bit of work is done under RA_DISSECTORS before we register any individual items, so add it to the splash screen update with the Qt UI - it's used in the GTK+ UI. Update a comment to explicitly indicate what action transactions are being counted (other than the individual-item ones, where we have to call routines that give us a count of items). Change-Id: I3ec5e5fbfdcf523d693bcf1b0f0ffbe0d05d61ae Reviewed-on: https://code.wireshark.org/review/19553 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-05Fix comment.Guy Harris1-1/+1
Change-Id: I5c18130dc22220ddd85109235383fcf61e543d89 Reviewed-on: https://code.wireshark.org/review/19552 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-05Remove RA_CONFIGURATION.Guy Harris4-11/+3
It's not used at all in the Qt UI, and the point at which it's used in the GTK+ UI doesn't involve reading configuration files - between it and RA_INTERFACES, some mostly quick command-line argument processing is done. Change-Id: Ib4de97c8b6dba658a6e9d8f596b551f7c45739d2 Reviewed-on: https://code.wireshark.org/review/19551 Reviewed-by: Guy Harris <guy@alum.mit.edu>