iproute2 update
Subsystems (2)
I am about to push out a new version, so if you have any more patches pending the window is about to close.
Please retest with current git tree
Signature · 1 line
Stephen Hemminger <[email protected]>
Quoted 2 lines · Stephen Hemminger
I am about to push out a new version, so if you have any more patches pending the window is about to close.
I still have this one I would like to get in.
[IPROUTE]: Add support for routing rule fwmark masks
Needs kernel >= 2.6.19.
---
commit ba3145833888823f1e1af4ef093d16eea9baed2c
tree 23ef86c81e53c94d3f8d67d5395bcc3183d39e4b
parent 288384f22ffafd2d7d888ee45d8dfcf26d3f2b1c
author Patrick McHardy <[email protected]> Tue, 05 Dec 2006 19:41:36 +0100 committer Patrick McHardy <[email protected]> Tue, 05 Dec 2006 19:41:36 +0100
include/linux/rtnetlink.h | 1 + ip/iprule.c | 25 +++++++++++++++++++++---- man/man8/ip.8 | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-)
include/linux/rtnetlink.h +1 -0
@@ -264,6 +264,7 @@ enum rtattr_type_tRTA_SESSION ,RTA_MP_ALGO ,RTA_TABLE , +RTA_FWMASK , __RTA_MAX };
ip/iprule.c +21 -4
@@ -37,7 +37,7 @@ static void usage(void) __attribute__((nstatic void usage (void ) {fprintf (stderr,"Usage: ip rule [ list | add | del | flush ] SELECTOR ACTION\n" ); -fprintf (stderr,"SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK ]\n" ); +fprintf (stderr,"SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n" );fprintf (stderr," [ dev STRING ] [ pref NUMBER ]\n" );fprintf (stderr,"ACTION := [ table TABLE_ID ]\n" );fprintf (stderr," [ prohibit | reject | unreachable ]\n" );
@@ -129,8 +129,17 @@ int print_rule(const struct sockaddr_nlSPRINT_BUF (b1);fprintf (fp,"tos %s " ,rtnl_dsfield_n2a (r->rtm_tos, b1,sizeof (b1))); } -if (tb[RTA_PROTOINFO ]) { -fprintf (fp,"fwmark %#x " , *(__u32 *)RTA_DATA (tb[RTA_PROTOINFO ])); +if (tb[RTA_PROTOINFO ] || tb[RTA_FWMASK ]) { +__u32 mark =0 , mask =0 ; + +if (tb[RTA_PROTOINFO ]) + mark = *(__u32 *)RTA_DATA (tb[RTA_PROTOINFO ]); + +if (tb[RTA_FWMASK ] && + (mask = *(__u32 *)RTA_DATA (tb[RTA_FWMASK ])) !=0xFFFFFFFF ) +fprintf (fp,"fwmark 0x%x/0x%x " , mark, mask); +else +fprintf (fp,"fwmark 0x%x " , mark); }if (tb[RTA_IIF ]) {
@@ -252,11 +261,19 @@ static int iprule_modify(int cmd, int arinvarg ("TOS value is invalid\n" , *argv); req.r.rtm_tos = tos; }else if (strcmp (*argv,"fwmark" ) ==0 ) { -__u32 fwmark; +char *slash; +__u32 fwmark, fwmask;NEXT_ARG (); +if ((slash =strchr (*argv,'/' )) !=NULL ) + *slash ='\0' ;if (get_u32 (&fwmark, *argv,0 ))invarg ("fwmark value is invalid\n" , *argv);addattr32 (&req.n,sizeof (req),RTA_PROTOINFO , fwmark); +if (slash) { +if (get_u32 (&fwmask, slash+1 ,0 )) +invarg ("fwmask value is invalid\n" , slash+1 ); +addattr32 (&req.n,sizeof (req),RTA_FWMASK , fwmask); + } }else if (matches (*argv,"realms" ) ==0 ) {__u32 realm;NEXT_ARG ();
man/man8/ip.8 +1 -1
@@ -223,7 +223,7 @@ throw " | " unreachable " | " prohibit " .B tos .IR TOS " ] [ " .B fwmark -.IR FWMARK " ] [ " +.IR FWMARK[/MASK] " ] [ " .B dev .IR STRING " ] [ " .B pref
Quoted 5 lines · Stephen Hemminger
I am about to push out a new version, so if you have any more patches pending the window is about to close.
Please retest with current git tree
Brief tests for MIPv6 xfrm are passed with the tree on kernel 2.6.19.
Signature · 1 line
Masahide NAKAMURA