From: ebiederm@xmission•com (Eric W. Biederman)
To: Roopa Prabhu <roopa@cumulusnetworks•com>
Cc: stephen@networkplumber•org, davem@davemloft•net,
rshearma@brocade•com, netdev@vger•kernel.org,
vivek@cumulusnetworks•com
Subject: Re: [PATCH net iproute2 v4] mpls: always set type RTN_UNICAST and scope RT_SCOPE_UNIVERSE for route add/deletes
Date: Tue, 02 Jun 2015 20:08:41 -0500 [thread overview]
Message-ID: <87pp5dfvja.fsf@x220.int.ebiederm.org> (raw)
In-Reply-To: <1433292167-13364-1-git-send-email-roopa@cumulusnetworks.com> (Roopa Prabhu's message of "Tue, 2 Jun 2015 17:42:47 -0700")
Roopa Prabhu <roopa@cumulusnetworks•com> writes:
> From: Roopa Prabhu <roopa@cumulusnetworks•com>
>
> This patch fixes incorrect -EINVAL errors due to invalid
> scope and type during mpls route deletes.
>
> $ip -f mpls route add 100 as 200 via inet 10.1.1.2 dev swp1
>
> $ip -f mpls route show
> 100 as to 200 via inet 10.1.1.2 dev swp1
>
> $ip -f mpls route del 100 as 200 via inet 10.1.1.2 dev swp1
> RTNETLINK answers: Invalid argument
>
> $ip -f mpls route del 100
> RTNETLINK answers: Invalid argument
>
> After patch:
>
> $ip -f mpls route show
> 100 as to 200 via inet 10.1.1.2 dev swp1
>
> $ip -f mpls route del 100 as 200 via inet 10.1.1.2 dev swp1
>
> $ip -f mpls route show
>
> Always set type to RTN_UNICAST for mpls route add/deletes.
> Also to keep things consistent with kernel set scope to
> RT_SCOPE_UNIVERSE for both mpls and ipv6 routes. Both mpls and ipv6 route
> deletes ignore scope.
Acked-by: "Eric W. Biederman" <ebiederm@xmission•com>
>
> Suggested-by: Eric W. Biederman <ebiederm@xmission•com>
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks•com>
> Signed-off-by: Vivek Venkataraman <vivek@cumulusnetworks•com>
> --
> v4 move fix to iproute2
> ---
> ip/iproute.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/ip/iproute.c b/ip/iproute.c
> index 670a4c6..d0b9910 100644
> --- a/ip/iproute.c
> +++ b/ip/iproute.c
> @@ -803,6 +803,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
> int scope_ok = 0;
> int table_ok = 0;
> int raw = 0;
> + int type_ok = 0;
>
> memset(&req, 0, sizeof(req));
>
> @@ -1095,6 +1096,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
> rtnl_rtntype_a2n(&type, *argv) == 0) {
> NEXT_ARG();
> req.r.rtm_type = type;
> + type_ok = 1;
> }
>
> if (matches(*argv, "help") == 0)
> @@ -1136,6 +1138,9 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
> if (nhs_ok)
> parse_nexthops(&req.n, &req.r, argc, argv);
>
> + if (req.r.rtm_family == AF_UNSPEC)
> + req.r.rtm_family = AF_INET;
> +
> if (!table_ok) {
> if (req.r.rtm_type == RTN_LOCAL ||
> req.r.rtm_type == RTN_BROADCAST ||
> @@ -1144,8 +1149,11 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
> req.r.rtm_table = RT_TABLE_LOCAL;
> }
> if (!scope_ok) {
> - if (req.r.rtm_type == RTN_LOCAL ||
> - req.r.rtm_type == RTN_NAT)
> + if (req.r.rtm_family == AF_INET6 ||
> + req.r.rtm_family == AF_MPLS)
> + req.r.rtm_scope = RT_SCOPE_UNIVERSE;
> + else if (req.r.rtm_type == RTN_LOCAL ||
> + req.r.rtm_type == RTN_NAT)
> req.r.rtm_scope = RT_SCOPE_HOST;
> else if (req.r.rtm_type == RTN_BROADCAST ||
> req.r.rtm_type == RTN_MULTICAST ||
> @@ -1160,8 +1168,8 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
> }
> }
>
> - if (req.r.rtm_family == AF_UNSPEC)
> - req.r.rtm_family = AF_INET;
> + if (!type_ok && req.r.rtm_family == AF_MPLS)
> + req.r.rtm_type = RTN_UNICAST;
>
> if (rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0)
> return -2;
prev parent reply other threads:[~2015-06-03 1:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 0:42 [PATCH net iproute2 v4] mpls: always set type RTN_UNICAST and scope RT_SCOPE_UNIVERSE for route add/deletes Roopa Prabhu
2015-06-03 1:08 ` Eric W. Biederman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pp5dfvja.fsf@x220.int.ebiederm.org \
--to=ebiederm@xmission$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=roopa@cumulusnetworks$(echo .)com \
--cc=rshearma@brocade$(echo .)com \
--cc=stephen@networkplumber$(echo .)org \
--cc=vivek@cumulusnetworks$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox