Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e559d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "add 'nodad' support to ifc_add_address()" am: 732d410d am: 46d436fd am: 76f3658a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2640734



Change-Id: I3ffec03b7f472e23ba65348874a95151326a99f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3afd166 76f3658a

libnetutils/ifc_utils.c

+7 −2
Original line number Diff line number Diff line
@@ -362,14 +362,19 @@ int ifc_act_on_address(int action, const char* name, const char* address, int pr 
    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);

}



/*