Commit bac735c5 authored by Noriaki TAKAMIYA's avatar Noriaki TAKAMIYA Committed by Stephen Hemminger

enabled to manipulate the flags of IFA_F_HOMEADDRESS or IFA_F_NODAD from ip.

Hi,

  This patch enables ip command to add IFA_F_HOMEADDRESS and
  IFA_F_NODAD flags while adding the IPv6 address.

Signed-off-by: Noriaki TAKAMIYA<takamiya@po.ntts.co.jp>
Signed-off-by: default avatarMasahide NAKAMURA <nakam@linux-ipv6.org>
parent 09bba68c
...@@ -61,6 +61,7 @@ static void usage(void) ...@@ -61,6 +61,7 @@ static void usage(void)
iplink_usage(); iplink_usage();
} }
fprintf(stderr, "Usage: ip addr {add|change|replace} IFADDR dev STRING [ LIFETIME ]\n"); fprintf(stderr, "Usage: ip addr {add|change|replace} IFADDR dev STRING [ LIFETIME ]\n");
fprintf(stderr, " [ CONFFLAG-LIST]\n");
fprintf(stderr, " ip addr del IFADDR dev STRING\n"); fprintf(stderr, " ip addr del IFADDR dev STRING\n");
fprintf(stderr, " ip addr {show|flush} [ dev STRING ] [ scope SCOPE-ID ]\n"); fprintf(stderr, " ip addr {show|flush} [ dev STRING ] [ scope SCOPE-ID ]\n");
fprintf(stderr, " [ to PREFIX ] [ FLAG-LIST ] [ label PATTERN ]\n"); fprintf(stderr, " [ to PREFIX ] [ FLAG-LIST ] [ label PATTERN ]\n");
...@@ -70,7 +71,9 @@ static void usage(void) ...@@ -70,7 +71,9 @@ static void usage(void)
fprintf(stderr, "SCOPE-ID := [ host | link | global | NUMBER ]\n"); fprintf(stderr, "SCOPE-ID := [ host | link | global | NUMBER ]\n");
fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n"); fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
fprintf(stderr, "FLAG := [ permanent | dynamic | secondary | primary |\n"); fprintf(stderr, "FLAG := [ permanent | dynamic | secondary | primary |\n");
fprintf(stderr, " tentative | deprecated ]\n"); fprintf(stderr, " tentative | deprecated | CONFFLAG-LIST ]\n");
fprintf(stderr, "CONFFLAG-LIST := [ CONFFLAG-LIST ] CONFFLAG\n");
fprintf(stderr, "CONFFLAG := [ home | nodad ]\n");
fprintf(stderr, "LIFETIME := [ valid_lft LFT ] [ preferred_lft LFT ]\n"); fprintf(stderr, "LIFETIME := [ valid_lft LFT ] [ preferred_lft LFT ]\n");
fprintf(stderr, "LFT := forever | SECONDS\n"); fprintf(stderr, "LFT := forever | SECONDS\n");
...@@ -427,6 +430,14 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n, ...@@ -427,6 +430,14 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
ifa->ifa_flags &= ~IFA_F_DEPRECATED; ifa->ifa_flags &= ~IFA_F_DEPRECATED;
fprintf(fp, "deprecated "); fprintf(fp, "deprecated ");
} }
if (ifa->ifa_flags&IFA_F_HOMEADDRESS) {
ifa->ifa_flags &= ~IFA_F_HOMEADDRESS;
fprintf(fp, "home ");
}
if (ifa->ifa_flags&IFA_F_NODAD) {
ifa->ifa_flags &= ~IFA_F_NODAD;
fprintf(fp, "nodad ");
}
if (!(ifa->ifa_flags&IFA_F_PERMANENT)) { if (!(ifa->ifa_flags&IFA_F_PERMANENT)) {
fprintf(fp, "dynamic "); fprintf(fp, "dynamic ");
} else } else
...@@ -567,6 +578,12 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush) ...@@ -567,6 +578,12 @@ int ipaddr_list_or_flush(int argc, char **argv, int flush)
} else if (strcmp(*argv, "deprecated") == 0) { } else if (strcmp(*argv, "deprecated") == 0) {
filter.flags |= IFA_F_DEPRECATED; filter.flags |= IFA_F_DEPRECATED;
filter.flagmask |= IFA_F_DEPRECATED; filter.flagmask |= IFA_F_DEPRECATED;
} else if (strcmp(*argv, "home") == 0) {
filter.flags |= IFA_F_HOMEADDRESS;
filter.flagmask |= IFA_F_HOMEADDRESS;
} else if (strcmp(*argv, "nodad") == 0) {
filter.flags |= IFA_F_NODAD;
filter.flagmask |= IFA_F_NODAD;
} else if (strcmp(*argv, "label") == 0) { } else if (strcmp(*argv, "label") == 0) {
NEXT_ARG(); NEXT_ARG();
filter.label = *argv; filter.label = *argv;
...@@ -844,6 +861,10 @@ int ipaddr_modify(int cmd, int flags, int argc, char **argv) ...@@ -844,6 +861,10 @@ int ipaddr_modify(int cmd, int flags, int argc, char **argv)
preferred_lftp = *argv; preferred_lftp = *argv;
if (set_lifetime(&preferred_lft, *argv)) if (set_lifetime(&preferred_lft, *argv))
invarg("preferred_lft value", *argv); invarg("preferred_lft value", *argv);
} else if (strcmp(*argv, "home") == 0) {
req.ifa.ifa_flags |= IFA_F_HOMEADDRESS;
} else if (strcmp(*argv, "nodad") == 0) {
req.ifa.ifa_flags |= IFA_F_NODAD;
} else { } else {
if (strcmp(*argv, "local") == 0) { if (strcmp(*argv, "local") == 0) {
NEXT_ARG(); NEXT_ARG();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment