URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=48d46e67fd7938262df658c0b459e2e926faa9ab
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
48d46e6 by João Valverde (joao.valverde@xxxxxxxxxxxxxxxxxx):
Don't parse services file twice, respect user settings
Platform file '/etc/services' is the same as Wireshark's
'/usr/share/wireshark/services', only Wireshark's is more recent
(on my system, same goes for other platforms I assume).
Use only Wireshark's IANA services files.
Other benefits would be removing some platform specific #ifdefs and making
service names more consistent.
Also respect user services settings by parsing $PERSCONFIG_DIR/services
after $SYSCONFIG_DIR/services.
Change-Id: I9890473af92763e02dabd2386eaa767aed2f2899
Reviewed-on: https://code.wireshark.org/review/10941
Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Actions performed:
from 01b00fd NBAP: fix indent (use 8 spaces)
adds 48d46e6 Don't parse services file twice, respect user settings
Summary of changes:
epan/addr_resolv.c | 40 ++++++----------------------------------
1 file changed, 6 insertions(+), 34 deletions(-)