]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
add support for IFA_F_NOPREFIXROUTE
authorThomas Haller <thaller@redhat.com>
Tue, 7 Jan 2014 20:46:28 +0000 (21:46 +0100)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 20 Jan 2014 20:30:45 +0000 (12:30 -0800)
Signed-off-by: Thomas Haller <thaller@redhat.com>
ip/ipaddress.c

index b0d54fef25effd5145f4b56927a2990a129e2253..f794fa13d96274938994ed1fede7785166e0b006 100644 (file)
@@ -82,7 +82,7 @@ static void usage(void)
        fprintf(stderr, "           tentative | deprecated | dadfailed | temporary |\n");
        fprintf(stderr, "           CONFFLAG-LIST ]\n");
        fprintf(stderr, "CONFFLAG-LIST := [ CONFFLAG-LIST ] CONFFLAG\n");
-       fprintf(stderr, "CONFFLAG  := [ home | nodad | mngtmpaddr ]\n");
+       fprintf(stderr, "CONFFLAG  := [ home | nodad | mngtmpaddr | noprefixroute ]\n");
        fprintf(stderr, "LIFETIME := [ valid_lft LFT ] [ preferred_lft LFT ]\n");
        fprintf(stderr, "LFT := forever | SECONDS\n");
 
@@ -707,6 +707,10 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
                ifa_flags &= ~IFA_F_MANAGETEMPADDR;
                fprintf(fp, "mngtmpaddr ");
        }
+       if (ifa_flags & IFA_F_NOPREFIXROUTE) {
+               ifa_flags &= ~IFA_F_NOPREFIXROUTE;
+               fprintf(fp, "noprefixroute ");
+       }
        if (!(ifa_flags & IFA_F_PERMANENT)) {
                fprintf(fp, "dynamic ");
        } else
@@ -1133,6 +1137,9 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
                } else if (strcmp(*argv, "mngtmpaddr") == 0) {
                        filter.flags |= IFA_F_MANAGETEMPADDR;
                        filter.flagmask |= IFA_F_MANAGETEMPADDR;
+               } else if (strcmp(*argv, "noprefixroute") == 0) {
+                       filter.flags |= IFA_F_NOPREFIXROUTE;
+                       filter.flagmask |= IFA_F_NOPREFIXROUTE;
                } else if (strcmp(*argv, "dadfailed") == 0) {
                        filter.flags |= IFA_F_DADFAILED;
                        filter.flagmask |= IFA_F_DADFAILED;
@@ -1354,6 +1361,8 @@ static int ipaddr_modify(int cmd, int flags, int argc, char **argv)
                        ifa_flags |= IFA_F_NODAD;
                } else if (strcmp(*argv, "mngtmpaddr") == 0) {
                        ifa_flags |= IFA_F_MANAGETEMPADDR;
+               } else if (strcmp(*argv, "noprefixroute") == 0) {
+                       ifa_flags |= IFA_F_NOPREFIXROUTE;
                } else {
                        if (strcmp(*argv, "local") == 0) {
                                NEXT_ARG();