Wireshark-commits: [Wireshark-commits] master 26a4fb3: VLAN resolving: check profile first

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 27 May 2019 08:34:39 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=26a4fb332b0febd39cf6f227ab54df36ee31ac7e
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

26a4fb3 by Uli Heilmeier (uh@xxxxxxxxxxxx):

    VLAN resolving: check profile first
    
    If the profile directory contains a vlans file we will use it. Otherwise
    fall back to normal user preferences.
    
    Bug: 15795
    Change-Id: Ie6a63a6f7a29bd83a15799875aa5883be7010039
    Reviewed-on: https://code.wireshark.org/review/33378
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  bc5b71c   RANAP: Handle 7 byte NSAP address in transportLayerAddress
     add  26a4fb3   VLAN resolving: check profile first


Summary of changes:
 epan/addr_resolv.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)