Don't parse services file twice, respect user settings
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>
Tue, 6 Oct 2015 08:11:46 +0000 (09:11 +0100)
committerMichael Mann <mmann78@netscape.net>
Sun, 18 Oct 2015 02:33:02 +0000 (02:33 +0000)
commit48d46e67fd7938262df658c0b459e2e926faa9ab
treebbd4a5ef287a4d7d471f0e7453f4519bcbe9c508
parent01b00fd8a10ae034b92719fddecac6fadf8f6c02
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@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
epan/addr_resolv.c