commit 732d410d21ad0041eda29335982d050a25353c3b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jul 01 03:15:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jul 01 03:15:34 2023 +0000
tree 7201dffb00fbebc673aade8a16c21256b796f0dd
parent f5d4edaa31198f8c9559c598a6c6774cec2dfb0e
parent 25ec9c4db1345e0b338e333f661bd7ffafa36732

Merge "add 'nodad' support to ifc_add_address()"

libnetutils/ifc_utils.c

diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c
index 5999e39..7cca105 100644
--- a/libnetutils/ifc_utils.c
+++ b/libnetutils/ifc_utils.c
@@ -362,14 +362,19 @@
     return err->error;
 }
 
+// Pass bitwise complement of prefix length to disable DAD, ie. use ~64 instead of 64.
 // Returns zero on success and negative errno on failure.
 int ifc_add_address(const char *name, const char *address, int prefixlen) {
-    return ifc_act_on_address(RTM_NEWADDR, name, address, prefixlen, /*nodad*/ false);
+    bool nodad = (prefixlen < 0);
+    if (nodad) prefixlen = ~prefixlen;
+    return ifc_act_on_address(RTM_NEWADDR, name, address, prefixlen, nodad);
 }
 
 // Returns zero on success and negative errno on failure.
 int ifc_del_address(const char *name, const char * address, int prefixlen) {
-    return ifc_act_on_address(RTM_DELADDR, name, address, prefixlen, /*nodad*/ false);
+    bool nodad = (prefixlen < 0);
+    if (nodad) prefixlen = ~prefixlen;
+    return ifc_act_on_address(RTM_DELADDR, name, address, prefixlen, nodad);
 }
 
 /*