resolve: reduce number of conversions between ifname and ifindex

This also fixes minor memleak introduced in
654457e560c5723b90b419f7651b87040aade07e.

1 files changed, 4 insertions, 24 deletions

diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index 0723458945..bf7b7b1044 100644
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -109,7 +109,6 @@ int resolvconf_parse_argv(int argc, char *argv[]) {
                 TYPE_EXCLUSIVE, /* -x */
         } type = TYPE_REGULAR;
 
-        const char *dot, *iface;
         int c, r;
 
         assert(argc >= 0);
@@ -202,30 +201,11 @@ int resolvconf_parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
-        dot = strchr(argv[optind], '.');
-        if (dot) {
-                iface = strndup(argv[optind], dot - argv[optind]);
-                log_debug("Ignoring protocol specifier '%s'.", dot + 1);
-        } else
-                iface = argv[optind];
-        optind++;
-
-        if (parse_ifindex(iface, &arg_ifindex) < 0) {
-                int ifi;
-
-                ifi = if_nametoindex(iface);
-                if (ifi <= 0) {
-                        if (errno == ENODEV && arg_ifindex_permissive) {
-                                log_debug("Interface '%s' not found, but -f specified, ignoring.", iface);
-                                return 0; /* done */
-                        }
+        r = ifname_mangle(argv[optind], false);
+        if (r <= 0)
+                return r;
 
-                        return log_error_errno(errno, "Unknown interface '%s': %m", iface);
-                }
-
-                arg_ifindex = ifi;
-                arg_ifname = iface;
-        }
+        optind++;
 
         if (arg_mode == MODE_SET_LINK) {
                 unsigned n = 0;