[src/trunk]: src/sbin/ifconfig Use existing address when setting parameters.

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b22c1df8b951
branches:  trunk
changeset: 369438:b22c1df8b951
user:      nat <nat%NetBSD.org@localhost>
date:      Wed Aug 17 12:35:10 2022 +0000

description:
Use existing address when setting parameters.

No need to specify address every time when setting broadcast address or
netmask.

Hopefully successfully re addresses PR bin/10911.

diffstat:

 sbin/ifconfig/af_inetany.c |  20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 70e4d91868ef -r b22c1df8b951 sbin/ifconfig/af_inetany.c
--- a/sbin/ifconfig/af_inetany.c        Wed Aug 17 12:25:47 2022 +0000
+++ b/sbin/ifconfig/af_inetany.c        Wed Aug 17 12:35:10 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: af_inetany.c,v 1.21 2022/08/16 22:31:24 nat Exp $      */
+/*     $NetBSD: af_inetany.c,v 1.22 2022/08/17 12:35:10 nat Exp $      */
 
 /*-
  * Copyright (c) 2008 David Young.  All rights reserved.
@@ -27,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: af_inetany.c,v 1.21 2022/08/16 22:31:24 nat Exp $");
+__RCSID("$NetBSD: af_inetany.c,v 1.22 2022/08/17 12:35:10 nat Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -68,6 +68,7 @@
     const struct afparam *param)
 {
        const char *ifname;
+       struct ifreq ifr;
        int af, rc, s;
        bool alias, delete, replace;
        prop_data_t d;
@@ -88,8 +89,19 @@
 
        if ((d = (prop_data_t)prop_dictionary_get(env, "address")) != NULL)
                addr = prop_data_value(d);
-       else if (!prop_dictionary_get_bool(env, "alias", &alias) || alias ||
-           param->gifaddr.cmd == 0)
+       else if (param->gifaddr.cmd == 0)
+               return;
+       else if (!prop_dictionary_get_bool(env, "alias", &alias)) { 
+               static struct paddr_prefix existingaddr;
+
+               memset(&ifr, 0, sizeof(ifr));
+               estrlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+               if (prog_ioctl(s, SIOCGIFADDR, &ifr) == -1)
+                       return;
+
+               existingaddr.pfx_addr = ifr.ifr_addr;
+               addr = &existingaddr;
+       } else if (alias)
                return;
        else if (prog_ioctl(s, param->gifaddr.cmd, param->dgreq.buf) == -1)
                err(EXIT_FAILURE, "%s", param->gifaddr.desc);