From patchwork Thu Dec 3 20:39:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Haley X-Patchwork-Id: 40243 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5E185B7BEF for ; Fri, 4 Dec 2009 07:41:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755634AbZLCUlS (ORCPT ); Thu, 3 Dec 2009 15:41:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755626AbZLCUlS (ORCPT ); Thu, 3 Dec 2009 15:41:18 -0500 Received: from g1t0026.austin.hp.com ([15.216.28.33]:26027 "EHLO g1t0026.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755618AbZLCUlR (ORCPT ); Thu, 3 Dec 2009 15:41:17 -0500 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0026.austin.hp.com (Postfix) with ESMTP id 03A91C1FB; Thu, 3 Dec 2009 20:41:23 +0000 (UTC) Received: from [16.1.1.100] (squirrel.fc.hp.com [15.11.146.57]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 29591301A9; Thu, 3 Dec 2009 20:39:36 +0000 (UTC) Message-ID: <4B182208.8010707@hp.com> Date: Thu, 03 Dec 2009 15:39:36 -0500 From: Brian Haley Organization: Open Source and Linux Organization User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: Stephen Hemminger CC: "netdev@vger.kernel.org" Subject: [iproute2]: fix support for IFA_F_DADFAILED References: <4AAEAEE7.4090507@hp.com> <4B1813E7.2030004@hp.com> <20091203121015.7a7c069e@nehalam> In-Reply-To: <20091203121015.7a7c069e@nehalam> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stephen Hemminger wrote: > Delta would be easier. Ok, here it is. -Brian Fix support for IFA_F_DADFAILED and update ip.8 man page. Signed-off-by: Brian Haley --- -- 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 diff --git a/ip/ipaddress.c b/ip/ipaddress.c index f0add80..581722a 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -62,7 +62,7 @@ static void usage(void) iplink_usage(); } fprintf(stderr, "Usage: ip addr {add|change|replace} IFADDR dev STRING [ LIFETIME ]\n"); - fprintf(stderr, " [ CONFFLAG-LIST]\n"); + fprintf(stderr, " [ CONFFLAG-LIST ]\n"); fprintf(stderr, " ip addr del IFADDR dev STRING\n"); fprintf(stderr, " ip addr {show|flush} [ dev STRING ] [ scope SCOPE-ID ]\n"); fprintf(stderr, " [ to PREFIX ] [ FLAG-LIST ] [ label PATTERN ]\n"); @@ -72,7 +72,8 @@ 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 | CONFFLAG-LIST ]\n"); + fprintf(stderr, " tentative | deprecated | dadfailed |\n"); + fprintf(stderr, " 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"); @@ -657,6 +658,9 @@ static int ipaddr_list_or_flush(int argc, char **argv, int flush) } else if (strcmp(*argv, "nodad") == 0) { filter.flags |= IFA_F_NODAD; filter.flagmask |= IFA_F_NODAD; + } else if (strcmp(*argv, "dadfailed") == 0) { + filter.flags |= IFA_F_DADFAILED; + filter.flagmask |= IFA_F_DADFAILED; } else if (strcmp(*argv, "label") == 0) { NEXT_ARG(); filter.label = *argv; diff --git a/man/man8/ip.8 b/man/man8/ip.8 index a8fccc4..1145b28 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 " ]" +tentative " | " deprecated " | " dadfailed " ]" .ti -8 .BR "ip addrlabel" " { " add " | " del " } " prefix @@ -1030,7 +1030,7 @@ addresses. .TP .B tentative -(IPv6 only) only list addresses which did not pass duplicate +(IPv6 only) only list addresses which have not yet passed duplicate address detection. .TP @@ -1038,6 +1038,11 @@ address detection. (IPv6 only) only list deprecated addresses. .TP +.B dadfailed +(IPv6 only) only list addresses which have failed duplicate +address detection. + +.TP .BR primary " and " secondary only list primary (or secondary) addresses.