From: roopa <roopa@cumulusnetworks•com>
To: Robert Shearman <rshearma@brocade•com>
Cc: ebiederm@xmission•com, davem@davemloft•net,
netdev@vger•kernel.org, vivek@cumulusnetworks•com
Subject: Re: [PATCH net iproute2 v2 1/2] mpls: always set type as RTN_UNICAST for route add/deletes
Date: Wed, 27 May 2015 13:08:25 -0700 [thread overview]
Message-ID: <55662439.7010503@cumulusnetworks.com> (raw)
In-Reply-To: <5566221A.5020001@brocade.com>
On 5/27/15, 12:59 PM, Robert Shearman wrote:
> On 27/05/15 19:37, Roopa Prabhu wrote:
>> From: Roopa Prabhu <roopa@cumulusnetworks•com>
>>
>> Kernel expects type RTN_UNICAST for mpls route/dels
>>
>> Signed-off-by: Vivek Venkataraman <vivek@cumulusnetworks•com>
>> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks•com>
>> ---
>> ip/iproute.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/ip/iproute.c b/ip/iproute.c
>> index 670a4c6..71c088b 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)
>> @@ -1160,6 +1162,9 @@ static int iproute_modify(int cmd, unsigned
>> flags, int argc, char **argv)
>> }
>> }
>>
>> + if (!type_ok && req.r.rtm_family == AF_MPLS)
>> + req.r.rtm_type = RTN_UNICAST;
>> +
>> if (req.r.rtm_family == AF_UNSPEC)
>> req.r.rtm_family = AF_INET;
>>
>>
>
> There is this block of code near the start of iproute_modify that sets
> req.r.rtm_type in the add/modify cases:
>
> if (cmd != RTM_DELROUTE) {
> req.r.rtm_protocol = RTPROT_BOOT;
> req.r.rtm_scope = RT_SCOPE_UNIVERSE;
> req.r.rtm_type = RTN_UNICAST;
> }
>
> How about doing similar for the mpls delete case? This would avoid the
> need to track if the type has been set and would also make the way
> rtm_type is set in the delete case as close as possible to that in the
> add/modify cases.
sure that works too. There was already *_ok checks for the rest of the
attributes, ..so added it there.
v3 ...coming...
next prev parent reply other threads:[~2015-05-27 20:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 18:37 [PATCH net iproute2 v2 1/2] mpls: always set type as RTN_UNICAST for route add/deletes Roopa Prabhu
2015-05-27 19:59 ` Robert Shearman
2015-05-27 20:08 ` roopa [this message]
2015-05-28 0:06 ` roopa
2015-05-28 9:15 ` Robert Shearman
2015-05-28 9:17 ` Robert Shearman
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=55662439.7010503@cumulusnetworks.com \
--to=roopa@cumulusnetworks$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=ebiederm@xmission$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rshearma@brocade$(echo .)com \
--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