* [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses
@ 2009-09-14 21:01 Brian Haley
2009-12-03 19:41 ` Brian Haley
2010-02-09 19:06 ` Stephen Hemminger
0 siblings, 2 replies; 7+ messages in thread
From: Brian Haley @ 2009-09-14 21:01 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
IPv6 addresses that have IFA_F_SECONDARY set are actually temporary addresses,
hence the IFA_F_TEMPORARY equivalent. Change the output in this case and
allow filtering on the word "temporary".
Signed-off-by: Brian Haley <brian.haley@hp.com>
---
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 32c9008..8492fa8 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -74,7 +74,7 @@ static void usage(void)
fprintf(stderr, "SCOPE-ID := [ host | link | global | NUMBER ]\n");
fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
fprintf(stderr, "FLAG := [ permanent | dynamic | secondary | primary |\n");
- fprintf(stderr, " tentative | deprecated | dadfailed |\n");
+ 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 ]\n");
@@ -486,7 +486,10 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
fprintf(fp, "scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1, sizeof(b1)));
if (ifa->ifa_flags&IFA_F_SECONDARY) {
ifa->ifa_flags &= ~IFA_F_SECONDARY;
- fprintf(fp, "secondary ");
+ if (ifa->ifa_family == AF_INET6)
+ fprintf(fp, "temporary ");
+ else
+ fprintf(fp, "secondary ");
}
if (ifa->ifa_flags&IFA_F_TENTATIVE) {
ifa->ifa_flags &= ~IFA_F_TENTATIVE;
@@ -642,7 +645,8 @@ static int ipaddr_list_or_flush(int argc, char **argv, int flush)
} else if (strcmp(*argv, "permanent") == 0) {
filter.flags |= IFA_F_PERMANENT;
filter.flagmask |= IFA_F_PERMANENT;
- } else if (strcmp(*argv, "secondary") == 0) {
+ } else if (strcmp(*argv, "secondary") == 0 ||
+ strcmp(*argv, "temporary") == 0) {
filter.flags |= IFA_F_SECONDARY;
filter.flagmask |= IFA_F_SECONDARY;
} else if (strcmp(*argv, "primary") == 0) {
diff --git a/man/man8/ip.8 b/man/man8/ip.8
index 1145b28..24a3812 100644
--- a/man/man8/ip.8
+++ b/man/man8/ip.8
@@ -97,7 +97,7 @@ ip \- show / manipulate routing, devices, policy routing and tunnels
.ti -8
.IR FLAG " := "
.RB "[ " permanent " | " dynamic " | " secondary " | " primary " | "\
-tentative " | " deprecated " | " dadfailed " ]"
+tentative " | " deprecated " | " dadfailed " | " temporary " ]"
.ti -8
.BR "ip addrlabel" " { " add " | " del " } " prefix
@@ -1043,6 +1043,10 @@ address detection.
address detection.
.TP
+.B temporary
+(IPv6 only) only list temporary addresses.
+
+.TP
.BR primary " and " secondary
only list primary (or secondary) addresses.
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses
2009-09-14 21:01 [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses Brian Haley
@ 2009-12-03 19:41 ` Brian Haley
2009-12-03 20:20 ` Stephen Hemminger
2010-02-09 19:06 ` Stephen Hemminger
1 sibling, 1 reply; 7+ messages in thread
From: Brian Haley @ 2009-12-03 19:41 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Hi Stephen,
Brian Haley wrote:
> IPv6 addresses that have IFA_F_SECONDARY set are actually temporary addresses,
> hence the IFA_F_TEMPORARY equivalent. Change the output in this case and
> allow filtering on the word "temporary".
I didn't see this in your current git tree, just pinging you about it. This
would apply on top of my dad_failed patch.
Thanks,
-Brian
> Signed-off-by: Brian Haley <brian.haley@hp.com>
> ---
>
> diff --git a/ip/ipaddress.c b/ip/ipaddress.c
> index 32c9008..8492fa8 100644
> --- a/ip/ipaddress.c
> +++ b/ip/ipaddress.c
> @@ -74,7 +74,7 @@ static void usage(void)
> fprintf(stderr, "SCOPE-ID := [ host | link | global | NUMBER ]\n");
> fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
> fprintf(stderr, "FLAG := [ permanent | dynamic | secondary | primary |\n");
> - fprintf(stderr, " tentative | deprecated | dadfailed |\n");
> + 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 ]\n");
> @@ -486,7 +486,10 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
> fprintf(fp, "scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1, sizeof(b1)));
> if (ifa->ifa_flags&IFA_F_SECONDARY) {
> ifa->ifa_flags &= ~IFA_F_SECONDARY;
> - fprintf(fp, "secondary ");
> + if (ifa->ifa_family == AF_INET6)
> + fprintf(fp, "temporary ");
> + else
> + fprintf(fp, "secondary ");
> }
> if (ifa->ifa_flags&IFA_F_TENTATIVE) {
> ifa->ifa_flags &= ~IFA_F_TENTATIVE;
> @@ -642,7 +645,8 @@ static int ipaddr_list_or_flush(int argc, char **argv, int flush)
> } else if (strcmp(*argv, "permanent") == 0) {
> filter.flags |= IFA_F_PERMANENT;
> filter.flagmask |= IFA_F_PERMANENT;
> - } else if (strcmp(*argv, "secondary") == 0) {
> + } else if (strcmp(*argv, "secondary") == 0 ||
> + strcmp(*argv, "temporary") == 0) {
> filter.flags |= IFA_F_SECONDARY;
> filter.flagmask |= IFA_F_SECONDARY;
> } else if (strcmp(*argv, "primary") == 0) {
> diff --git a/man/man8/ip.8 b/man/man8/ip.8
> index 1145b28..24a3812 100644
> --- a/man/man8/ip.8
> +++ b/man/man8/ip.8
> @@ -97,7 +97,7 @@ ip \- show / manipulate routing, devices, policy routing and tunnels
> .ti -8
> .IR FLAG " := "
> .RB "[ " permanent " | " dynamic " | " secondary " | " primary " | "\
> -tentative " | " deprecated " | " dadfailed " ]"
> +tentative " | " deprecated " | " dadfailed " | " temporary " ]"
>
> .ti -8
> .BR "ip addrlabel" " { " add " | " del " } " prefix
> @@ -1043,6 +1043,10 @@ address detection.
> address detection.
>
> .TP
> +.B temporary
> +(IPv6 only) only list temporary addresses.
> +
> +.TP
> .BR primary " and " secondary
> only list primary (or secondary) addresses.
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses
2009-12-03 19:41 ` Brian Haley
@ 2009-12-03 20:20 ` Stephen Hemminger
2009-12-03 20:31 ` Brian Haley
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Hemminger @ 2009-12-03 20:20 UTC (permalink / raw)
To: Brian Haley; +Cc: netdev
On Thu, 03 Dec 2009 14:41:02 -0500
Brian Haley <brian.haley@hp.com> wrote:
> Hi Stephen,
>
> Brian Haley wrote:
> > IPv6 addresses that have IFA_F_SECONDARY set are actually temporary addresses,
> > hence the IFA_F_TEMPORARY equivalent. Change the output in this case and
> > allow filtering on the word "temporary".
>
> I didn't see this in your current git tree, just pinging you about it. This
> would apply on top of my dad_failed patch.
>
I'll put it as well, why did patchwork not see it?
--
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses
2009-12-03 20:20 ` Stephen Hemminger
@ 2009-12-03 20:31 ` Brian Haley
2009-12-26 19:17 ` Stephen Hemminger
0 siblings, 1 reply; 7+ messages in thread
From: Brian Haley @ 2009-12-03 20:31 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Stephen Hemminger wrote:
> On Thu, 03 Dec 2009 14:41:02 -0500
> Brian Haley <brian.haley@hp.com> wrote:
>
>> Hi Stephen,
>>
>> Brian Haley wrote:
>>> IPv6 addresses that have IFA_F_SECONDARY set are actually temporary addresses,
>>> hence the IFA_F_TEMPORARY equivalent. Change the output in this case and
>>> allow filtering on the word "temporary".
>> I didn't see this in your current git tree, just pinging you about it. This
>> would apply on top of my dad_failed patch.
>>
>
> I'll put it as well, why did patchwork not see it?
I can only assume it was my subject line?
Let me know if I need to re-send as it was based on the other one.
-Brian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses
2009-12-03 20:31 ` Brian Haley
@ 2009-12-26 19:17 ` Stephen Hemminger
2010-02-09 14:49 ` Brian Haley
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Hemminger @ 2009-12-26 19:17 UTC (permalink / raw)
To: Brian Haley; +Cc: netdev
On Thu, 03 Dec 2009 15:31:57 -0500
Brian Haley <brian.haley@hp.com> wrote:
> Stephen Hemminger wrote:
> > On Thu, 03 Dec 2009 14:41:02 -0500
> > Brian Haley <brian.haley@hp.com> wrote:
> >
> >> Hi Stephen,
> >>
> >> Brian Haley wrote:
> >>> IPv6 addresses that have IFA_F_SECONDARY set are actually temporary addresses,
> >>> hence the IFA_F_TEMPORARY equivalent. Change the output in this case and
> >>> allow filtering on the word "temporary".
> >> I didn't see this in your current git tree, just pinging you about it. This
> >> would apply on top of my dad_failed patch.
> >>
> >
> > I'll put it as well, why did patchwork not see it?
>
> I can only assume it was my subject line?
>
> Let me know if I need to re-send as it was based on the other one.
>
> -Brian
This in for 2.6.33 (next version)
--
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses
2009-12-26 19:17 ` Stephen Hemminger
@ 2010-02-09 14:49 ` Brian Haley
0 siblings, 0 replies; 7+ messages in thread
From: Brian Haley @ 2010-02-09 14:49 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Stephen Hemminger wrote:
>>>> Brian Haley wrote:
>>>>> IPv6 addresses that have IFA_F_SECONDARY set are actually temporary addresses,
>>>>> hence the IFA_F_TEMPORARY equivalent. Change the output in this case and
>>>>> allow filtering on the word "temporary".
>>>> I didn't see this in your current git tree, just pinging you about it. This
>>>> would apply on top of my dad_failed patch.
>>>>
>>> I'll put it as well, why did patchwork not see it?
>> I can only assume it was my subject line?
>>
>> Let me know if I need to re-send as it was based on the other one.
>>
>> -Brian
>
> This in for 2.6.33 (next version)
Hi Stephen,
Sorry to bug you again, but I still don't see this patch in your
iproute2 git tree, although I see things done after it. Do I have
to wait until you tag a v2.6.33?
Thanks,
-Brian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses
2009-09-14 21:01 [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses Brian Haley
2009-12-03 19:41 ` Brian Haley
@ 2010-02-09 19:06 ` Stephen Hemminger
1 sibling, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2010-02-09 19:06 UTC (permalink / raw)
To: Brian Haley; +Cc: netdev
On Mon, 14 Sep 2009 17:01:43 -0400
Brian Haley <brian.haley@hp.com> wrote:
> IPv6 addresses that have IFA_F_SECONDARY set are actually temporary addresses,
> hence the IFA_F_TEMPORARY equivalent. Change the output in this case and
> allow filtering on the word "temporary".
>
> Signed-off-by: Brian Haley <brian.haley@hp.com>
Applied (for 2.6.33)
--
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-02-09 19:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-14 21:01 [PATCH iproute2] ip: print "temporary" for IPv6 temp addresses Brian Haley
2009-12-03 19:41 ` Brian Haley
2009-12-03 20:20 ` Stephen Hemminger
2009-12-03 20:31 ` Brian Haley
2009-12-26 19:17 ` Stephen Hemminger
2010-02-09 14:49 ` Brian Haley
2010-02-09 19:06 ` Stephen Hemminger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.