ip: Add support for nexthop objects
Subsystems (4)
David Ahern
maintainerPATCH v2 1/10 libnetlink: Set NLA_F_NESTED in rta_nest
In reply to David AhernFrom: David Ahern <[email protected]>
Kernel now requires NLA_F_NESTED to be set on new nested attributes. Set NLA_F_NESTED in rta_nest.
--- lib/libnetlink.c | 1 + 1 file changed, 1 insertion(+)
lib/libnetlink.c +1 -0
@@ -1336,6 +1336,7 @@ struct rtattr *rta_nest(struct rtattr *rta, int maxlen, int type)struct rtattr *nest =RTA_TAIL (rta);rta_addattr_l (rta, maxlen, type,NULL ,0 ); + nest->rta_type |=NLA_F_NESTED ;return nest; }
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 4/10 uapi: Import nexthop object API
In reply to David AhernFrom: David Ahern <[email protected]>
Add nexthop.h from kernel with the uapi for nexthop objects.
--- include/uapi/linux/nexthop.h | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 include/uapi/linux/nexthop.h
include/uapi/linux/nexthop.h new file +56 -0
@@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _LINUX_NEXTHOP_H +#define _LINUX_NEXTHOP_H + +#include <linux/types.h> + +struct nhmsg { +unsigned char nh_family; +unsigned char nh_scope;/* return only */ +unsigned char nh_protocol;/* Routing protocol that installed nh */ +unsigned char resvd; +unsigned int nh_flags;/* RTNH_F flags */ +}; + +/* entry in a nexthop group */ +struct nexthop_grp { +__u32 id;/* nexthop id - must exist */ +__u8 weight;/* weight of this nexthop */ +__u8 resvd1; +__u16 resvd2; +}; + +enum { +NEXTHOP_GRP_TYPE_MPATH ,/* default type if not specified */ + __NEXTHOP_GRP_TYPE_MAX, +}; + +#define NEXTHOP_GRP_TYPE_MAX (__NEXTHOP_GRP_TYPE_MAX - 1) + +enum { +NHA_UNSPEC , +NHA_ID ,/* u32; id for nexthop. id == 0 means auto-assign */ + +NHA_GROUP ,/* array of nexthop_grp */ +NHA_GROUP_TYPE ,/* u16 one of NEXTHOP_GRP_TYPE */ +/* if NHA_GROUP attribute is added, no other attributes can be set */ + +NHA_BLACKHOLE ,/* flag; nexthop used to blackhole packets */ +/* if NHA_BLACKHOLE is added, OIF, GATEWAY, ENCAP can not be set */ + +NHA_OIF ,/* u32; nexthop device */ +NHA_GATEWAY ,/* be32 (IPv4) or in6_addr (IPv6) gw address */ +NHA_ENCAP_TYPE ,/* u16; lwt encap type */ +NHA_ENCAP ,/* lwt encap data */ + +/* NHA_OIF can be appended to dump request to return only +* nexthops using given device +*/ +NHA_GROUPS ,/* flag; only return nexthop groups in dump */ +NHA_MASTER ,/* u32; only return nexthops with given master dev */ + + __NHA_MAX, +}; + +#define NHA_MAX (__NHA_MAX - 1) +#endif
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 7/10 Add support for nexthop objects
In reply to David AhernFrom: David Ahern <[email protected]>
Add nexthop subcommand to ip. Implement basic commands for creating, deleting and dumping nexthop objects. Syntax follows 'nexthop' syntax from existing 'ip route' command.
Examples:
1. Single path
$ ip nexthop add id 1 via 10.99.1.2 dev veth1
$ ip nexthop ls
id 1 via 10.99.1.2 src 10.99.1.1 dev veth1 scope link2. ECMP
$ ip nexthop add id 2 via 10.99.3.2 dev veth3
$ ip nexthop add id 1001 group 1/2
--> creates a nexthop group with 2 component nexthops:
id 1 and id 2 both the same weight $ ip nexthop ls
id 1 via 10.99.1.2 src 10.99.1.1 dev veth1 scope link
id 2 via 10.99.3.2 src 10.99.3.1 dev veth3 scope link
id 1001 group 1/23. Weighted multipath
$ ip nexthop add id 1002 group 1,10/2,20
--> creates a nexthop group with 2 component nexthops:
id 1 with a weight of 10 and id 2 with a weight of 20 $ ip nexthop ls
id 1 via 10.99.1.2 src 10.99.1.1 dev veth1 scope link
id 2 via 10.99.3.2 src 10.99.3.1 dev veth3 scope link
id 1001 group 1/2
id 1002 group 1,10/2,20--- ip/Makefile | 3 +- ip/ip.c | 3 +- ip/ip_common.h | 2 + ip/ipnexthop.c | 558 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 564 insertions(+), 2 deletions(-) create mode 100644 ip/ipnexthop.c
ip/Makefile +2 -1
@@ -10,7 +10,8 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ link_iptnl.o link_gre6.o iplink_bond.o iplink_bond_slave.o iplink_hsr.o \ iplink_bridge.o iplink_bridge_slave.o ipfou.o iplink_ipvlan.o \ iplink_geneve.o iplink_vrf.o iproute_lwtunnel.o ipmacsec.o ipila.o \ - ipvrf.o iplink_xstats.o ipseg6.o iplink_netdevsim.o iplink_rmnet.o + ipvrf.o iplink_xstats.o ipseg6.o iplink_netdevsim.o iplink_rmnet.o \ + ipnexthop.o RTMONOBJ=rtmon.o
ip/ip.c +2 -1
@@ -50,7 +50,7 @@ static void usage(void)"where OBJECT := { link | address | addrlabel | route | rule | neigh | ntable |\n" " tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n" " netns | l2tp | fou | macsec | tcp_metrics | token | netconf | ila |\n" -" vrf | sr }\n" +" vrf | sr | nexthop }\n" " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n" " -h[uman-readable] | -iec | -j[son] | -p[retty] |\n" " -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
@@ -100,6 +100,7 @@ static const struct cmd { { "netconf", do_ipnetconf }, { "vrf", do_ipvrf}, { "sr", do_seg6 }, + { "nexthop", do_ipnh }, { "help", do_help }, { 0 } };
ip/ip_common.h +2 -0
@@ -47,6 +47,7 @@ int print_prefix(struct nlmsghdr *n, void *arg);int print_rule (struct nlmsghdr *n,void *arg);int print_netconf (struct rtnl_ctrl_data *ctrl,struct nlmsghdr *n,void *arg); +int print_nexthop (struct nlmsghdr *n,void *arg);void netns_map_init (void );void netns_nsid_socket_init (void );int print_nsid (struct nlmsghdr *n,void *arg);
@@ -80,6 +81,7 @@ int do_ipvrf(int argc, char **argv);void vrf_reset (void );int netns_identify_pid (const char *pidstr,char *name,int len);int do_seg6 (int argc,char **argv); +int do_ipnh (int argc,char **argv);int iplink_get (char *name,__u32 filt_mask);int iplink_ifla_xstats (int argc,char **argv);
ip/ipnexthop.c new file +558 -0
558 lines not on this page · raw message
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 9/10 ip route: Add option to use nexthop objects
In reply to David AhernFrom: David Ahern <[email protected]>
Add nhid option for routes to use nexthop objects by id.
Example:
$ ip nexthop add id 1 via 10.99.1.2 dev veth1 $ ip route add 10.100.1.0/24 nhid 1 $ ip route ls ... 10.100.1.0/24 nhid 1 via 10.99.1.2 dev veth1
--- ip/iproute.c | 14 ++++++++++++-- man/man8/ip-route.8.in | 13 ++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-)
ip/iproute.c +12 -2
@@ -80,7 +80,7 @@ static void usage(void)" [ table TABLE_ID ] [ proto RTPROTO ]\n" " [ scope SCOPE ] [ metric METRIC ]\n" " [ ttl-propagate { enabled | disabled } ]\n" -"INFO_SPEC := NH OPTIONS FLAGS [ nexthop NH ]...\n" +"INFO_SPEC := { NH | nhid ID } OPTIONS FLAGS [ nexthop NH ]...\n" "NH := [ encap ENCAPTYPE ENCAPHDR ] [ via [ FAMILY ] ADDRESS ]\n" " [ dev STRING ] [ weight NUMBER ] NHFLAGS\n" "FAMILY := [ inet | inet6 | mpls | bridge | link ]\n"
@@ -809,6 +809,10 @@ int print_route(struct nlmsghdr *n, void *arg)print_string (PRINT_ANY ,"src" ,"from %s " , b1); } +if (tb[RTA_NH_ID ]) +print_uint (PRINT_ANY ,"nhid" ,"nhid %u " , +rta_getattr_u32 (tb[RTA_NH_ID ])); +if (tb[RTA_NEWDST ])print_rta_newdst (fp, r, tb[RTA_NEWDST ]);
@@ -1080,6 +1084,7 @@ static int iproute_modify(int cmd, unsigned int flags, int argc, char **argv)int table_ok =0 ;int raw =0 ;int type_ok =0 ; +__u32 nhid =0 ;if (cmd !=RTM_DELROUTE ) { req.r.rtm_protocol =RTPROT_BOOT ;
@@ -1358,6 +1363,11 @@ static int iproute_modify(int cmd, unsigned int flags, int argc, char **argv) }else if (strcmp (*argv,"nexthop" ) ==0 ) { nhs_ok =1 ;break ; + }else if (!strcmp (*argv,"nhid" )) { +NEXT_ARG (); +if (get_u32 (&nhid, *argv,0 )) +invarg ("\"id\" value is invalid\n" , *argv); +addattr32 (&req.n,sizeof (req),RTA_NH_ID , nhid); }else if (matches (*argv,"protocol" ) ==0 ) {__u32 prot;
@@ -1520,7 +1530,7 @@ static int iproute_modify(int cmd, unsigned int flags, int argc, char **argv) req.r.rtm_type == RTN_UNSPEC) {if (cmd ==RTM_DELROUTE ) req.r.rtm_scope =RT_SCOPE_NOWHERE ; -else if (!gw_ok && !nhs_ok) +else if (!gw_ok && !nhs_ok && !nhid) req.r.rtm_scope =RT_SCOPE_LINK ; } }
man/man8/ip-route.8.in +12 -1
@@ -89,7 +89,9 @@ replace " } " .RB "{ " enabled " | " disabled " } ]" .ti -8 -.IR INFO_SPEC " := " "NH OPTIONS FLAGS" " [" +.IR INFO_SPEC " := { " NH " | " +.B nhid +.IR ID " } " "OPTIONS FLAGS" " [" .B nexthop .IR NH " ] ..."
@@ -687,6 +689,10 @@ is a string specifying the route preference as defined in RFC4191 for Router .sp .TP +.BI nhid " ID" +use nexthop object with given id as nexthop specification. +.sp +.TP .BI encap " ENCAPTYPE ENCAPHDR" attach tunnel encapsulation attributes to this route. .sp
@@ -1154,6 +1160,11 @@ ip -6 route add 2001:db8:1::/64 encap seg6 mode encap segs 2001:db8:42::1,2001:d .RS 4 Adds an IPv6 route with SRv6 encapsulation and two segments attached. .RE +.PP +ip route add 10.1.1.0/30 nhid 10 +.RS 4 +Adds an ipv4 route using nexthop object with id 10. +.RE .SH SEE ALSO .br .BR ip (8)
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 6/10 ip route: Export print_rt_flags, print_rta_if and print_rta_gateway
In reply to David AhernFrom: David Ahern <[email protected]>
Export print_rt_flags and print_rta_if for use by the nexthop command.
Change print_rta_gateway to take the family versus rtmsg struct and export for use by the nexthop command.
--- ip/ip_common.h | 5 ++++- ip/iproute.c | 17 ++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-)
ip/ip_common.h +4 -1
@@ -156,5 +156,8 @@ int name_is_vrf(const char *name);#endif void print_num (FILE *fp,unsigned int width,uint64_t count); - +void print_rt_flags (FILE *fp,unsigned int flags); +void print_rta_if (FILE *fp,const struct rtattr *rta,const char *prefix); +void print_rta_gateway (FILE *fp,unsigned char family, +const struct rtattr *rta);#endif /* _IP_COMMON_H_ */
ip/iproute.c +8 -9
@@ -349,7 +349,7 @@ static void print_rtax_features(FILE *fp, unsigned int features) "features", "%#llx ", of); } -static void print_rt_flags (FILE *fp,unsigned int flags) +void print_rt_flags (FILE *fp,unsigned int flags) {open_json_array (PRINT_JSON ,is_json_context () ?"flags" :"" );
@@ -394,8 +394,7 @@ static void print_rt_pref(FILE *fp, unsigned int pref) } } -static void print_rta_if (FILE *fp,const struct rtattr *rta, -const char *prefix) +void print_rta_if (FILE *fp,const struct rtattr *rta,const char *prefix) {const char *ifname =ll_index_to_name (rta_getattr_u32 (rta));
@@ -532,17 +531,16 @@ static void print_rta_newdst(FILE *fp, const struct rtmsg *r, } } -static void print_rta_gateway (FILE *fp,const struct rtmsg *r, -const struct rtattr *rta) +void print_rta_gateway (FILE *fp,unsigned char family,const struct rtattr *rta) { -const char *gateway =format_host_rta (r->rtm_family, rta); +const char *gateway =format_host_rta (family, rta);if (is_json_context ())print_string (PRINT_JSON ,"gateway" ,NULL , gateway);else {fprintf (fp,"via " );print_color_string (PRINT_FP , -ifa_family_color (r->rtm_family), +ifa_family_color (family),NULL ,"%s " , gateway); } }
@@ -679,7 +677,8 @@ static void print_rta_multipath(FILE *fp, const struct rtmsg *r,if (tb[RTA_NEWDST ])print_rta_newdst (fp, r, tb[RTA_NEWDST ]);if (tb[RTA_GATEWAY ]) -print_rta_gateway (fp, r, tb[RTA_GATEWAY ]); +print_rta_gateway (fp, r->rtm_family, + tb[RTA_GATEWAY ]);if (tb[RTA_VIA ])print_rta_via (fp, tb[RTA_VIA ]);if (tb[RTA_FLOW ])
@@ -822,7 +821,7 @@ int print_route(struct nlmsghdr *n, void *arg) }if (tb[RTA_GATEWAY ] && filter.rvia.bitlen != host_len) -print_rta_gateway (fp, r, tb[RTA_GATEWAY ]); +print_rta_gateway (fp, r->rtm_family, tb[RTA_GATEWAY ]);if (tb[RTA_VIA ])print_rta_via (fp, tb[RTA_VIA ]);
Signature · 1 line
2.11.0
David Ahern
maintainerv2 cover ip: Add support for nexthop objects
From: David Ahern <[email protected]>
This set adds support for nexthop objects to the ip command. The syntax for nexthop objects is identical to the current 'ip route .. nexthop ...' syntax making it easy to convert existing use cases.
v2
- Fixed header use in rtnl_nexthopdump_req as noted by roopa
- made rth_del static per Stephen's request and fixed coding style
- removed print_nh_gateway and exported print_rta_gateway to reuse the iproute.c code (keeps consistency in output)
- added examples to commit message
- fixed monitor use when specific groups requested
- fixed usage in 'ip nexthop'
- added manpage
David Ahern (10):
libnetlink: Set NLA_F_NESTED in rta_nest
lwtunnel: Pass encap and encap_type attributes to lwt_parse_encap
libnetlink: Add helper to add a group via setsockopt
uapi: Import nexthop object API
libnetlink: Add helper to create nexthop dump request
ip route: Export print_rt_flags, print_rta_if and print_rta_gateway Add support for nexthop objects
ip: Add man page for nexthop command
ip route: Add option to use nexthop objects
ipmonitor: Add nexthop option to monitor
include/libnetlink.h | 7 +- include/uapi/linux/nexthop.h | 56 +++++ ip/Makefile | 3 +- ip/ip.c | 3 +- ip/ip_common.h | 10 +- ip/ipmonitor.c | 28 +++ ip/ipnexthop.c | 558 +++++++++++++++++++++++++++++++++++++++++++ ip/iproute.c | 37 ++- ip/iproute_lwtunnel.c | 7 +- lib/libnetlink.c | 34 +++ man/man8/ip-nexthop.8 | 196 +++++++++++++++ man/man8/ip-route.8.in | 13 +- 12 files changed, 930 insertions(+), 22 deletions(-) create mode 100644 include/uapi/linux/nexthop.h create mode 100644 ip/ipnexthop.c create mode 100644 man/man8/ip-nexthop.8
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 3/10 libnetlink: Add helper to add a group via setsockopt
From: David Ahern <[email protected]>
groups > 31 have to be joined using the setsockopt. Since the nexthop group is 32, add a helper to allow 'ip monitor' to listen for nexthop messages.
--- include/libnetlink.h | 3 ++- lib/libnetlink.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
include/libnetlink.h +2 -1
@@ -45,7 +45,8 @@ int rtnl_open(struct rtnl_handle *rth, unsigned int subscriptions)int rtnl_open_byproto (struct rtnl_handle *rth,unsigned int subscriptions,int protocol) __attribute__((warn_unused_result)); - +int rtnl_add_nl_group (struct rtnl_handle *rth,unsigned int group) + __attribute__((warn_unused_result));void rtnl_close (struct rtnl_handle *rth);void rtnl_set_strict_dump (struct rtnl_handle *rth);
lib/libnetlink.c +6 -0
@@ -173,6 +173,12 @@ void rtnl_set_strict_dump(struct rtnl_handle *rth) rth->flags |=RTNL_HANDLE_F_STRICT_CHK ; } +int rtnl_add_nl_group (struct rtnl_handle *rth,unsigned int group) +{ +return setsockopt (rth->fd,SOL_NETLINK ,NETLINK_ADD_MEMBERSHIP , + &group,sizeof (group)); +} +void rtnl_close (struct rtnl_handle *rth) {if (rth->fd >=0 ) {
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 8/10 ip: Add man page for nexthop command
In reply to David AhernFrom: David Ahern <[email protected]>
Document 'ip nexthop' options in a man page with a few examples.
--- man/man8/ip-nexthop.8 | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 man/man8/ip-nexthop.8
man/man8/ip-nexthop.8 new file +196 -0
@@ -0,0 +1,196 @@ +.TH IP\-NEXTHOP 8 "30 May 2019" "iproute2" "Linux" +.SH "NAME" +ip-nexthop \- nexthop object management +.SH "SYNOPSIS" +.sp +.ad l +.in +8 +.ti -8 +.B ip +.RI "[ " ip-OPTIONS " ]" +.B nexthop +.RI " { " COMMAND " | " +.BR help " }" +.sp +.ti -8 + +.ti -8 +.BR "ip nexthop" " { " +.BR show " | " flush " } " +.I SELECTOR + +.ti -8 +.BR "ip nexthop" " { " add " | " replace " } id " +.I ID +.IR NH + +.ti -8 +.BR "ip nexthop" " { " get " | " del " } id " +.I ID + +.ti -8 +.IR SELECTOR " := " +.RB "[ " id +.IR ID " ] [ " +.B dev +.IR DEV " ] [ " +.B vrf +.IR NAME " ] [ " +.B master +.IR DEV " ] [ " +.BR groups " ] " + +.ti -8 +.IR NH " := { " +.BR blackhole " | [ " +.B via +.IR ADDRESS " ] [ " +.B dev +.IR DEV " ] [ " +.BR onlink " ] [ " +.B encap +.IR ENCAP " ] | " +.B group +.IR GROUP " } " + +.ti -8 +.IR ENCAP " := [ " +.IR ENCAP_MPLS " ] " + +.ti -8 +.IR ENCAP_MPLS " := " +.BR mpls " [ " +.IR LABEL " ] [" +.B ttl +.IR TTL " ]" + +.ti -8 +.IR GROUP " := " +.BR id "[," weight "[/...]" + +.SH DESCRIPTION +.B ip nexthop +is used to manipulate entries in the kernel's nexthop tables. +.TP +ip nexthop add id ID +add new nexthop entry +.TP +ip nexthop replace id ID +change the configuration of a nexthop or add new one +.RS +.TP +.BI via " [ FAMILY ] ADDRESS" +the address of the nexthop router, in the address family FAMILY. +Address family must match address family of nexthop instance. +.TP +.BI dev " NAME" +is the output device. +.TP +.B onlink +pretend that the nexthop is directly attached to this link, +even if it does not match any interface prefix. +.TP +.BI encap " ENCAPTYPE ENCAPHDR" +attach tunnel encapsulation attributes to this route. +.sp +.I ENCAPTYPE +is a string specifying the supported encapsulation type. Namely: + +.in +8 +.BI mpls +- encapsulation type MPLS +.sp +.in -8 +.I ENCAPHDR +is a set of encapsulation attributes specific to the +.I ENCAPTYPE. + +.in +8 +.B mpls +.in +2 +.I MPLSLABEL +- mpls label stack with labels separated by +.I "/" +.sp + +.B ttl +.I TTL +- TTL to use for MPLS header or 0 to inherit from IP header +.in -2 + +.TP +.BI group " GROUP" +create a nexthop group. Group specification is id with an optional +weight (id,weight) and a '/' as a separator between entries. +.TP +.B blackhole +create a blackhole nexthop +.RE + +.TP +ip nexthop delete id ID +delete nexthop with given id. +.RE + +.TP +ip nexthop show +show the contents of the nexthop table or the nexthops +selected by some criteria. +.RS +.TP +.BI dev " DEV " +show the nexthops using the given device. +.TP +.BI vrf " NAME " +show the nexthops using devices associated with the vrf name +.TP +.BI master " DEV " +show the nexthops using devices enslaved to given master device +.TP +.BI groups +show only nexthop groups +.RE +.TP +ip nexthop flush +flushes nexthops selected by some criteria. Criteria options are the same +as show. +.RE + +.TP +ip nexthop get id ID +get a single nexthop by id + +.SH EXAMPLES +.PP +ip nexthop ls +.RS 4 +Show all nexthop entries in the kernel. +.RE +.PP +ip nexthop add id 1 via 192.168.1.1 dev eth0 +.RS 4 +Adds an IPv4 nexthop with id 1 using the gateway 192.168.1.1 out device eth0. +.RE +.PP +ip nexthop add id 2 encap mpls 200/300 via 10.1.1.1 dev eth0 +.RS 4 +Adds an IPv4 nexthop with mpls encapsulation attributes attached to it. +.RE +.PP +ip nexthop add id 3 group 1/2 +.RS 4 +Adds a nexthop with id 3. The nexthop is a group using nexthops with ids +1 and 2 at equal weight. +.RE +.PP +ip nexthop add id 4 group 1,5/2,11 +.RS 4 +Adds a nexthop with id 4. The nexthop is a group using nexthops with ids +1 and 2 with nexthop 1 at weight 5 and nexthop 2 at weight 11. +.RE +.SH SEE ALSO +.br +.BR ip (8) + +.SH AUTHOR +Original Manpage by David Ahern <[email protected]>
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 10/10 ipmonitor: Add nexthop option to monitor
In reply to David AhernFrom: David Ahern <[email protected]>
Add capability to ip-monitor to listen and dump nexthop messages. Since the nexthop group = 32 which exceeds the max groups bit field, 2 separate flags are needed - one that defaults on to indicate nexthop group is joined by default and a second that indicates a specific selection by the user (e.g, ip mon nexthop route).
--- ip/ipmonitor.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
ip/ipmonitor.c +28 -0
@@ -84,6 +84,12 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl, } } +case RTM_NEWNEXTHOP : +case RTM_DELNEXTHOP : +print_headers (fp,"[NEXTHOP]" , ctrl); +print_nexthop (n, arg); +return 0 ; +case RTM_NEWLINK :case RTM_DELLINK :ll_remember_index (n,NULL );
@@ -161,6 +167,7 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl,int do_ipmonitor (int argc,char **argv) { +int lnexthop =0 , nh_set =1 ;char *file =NULL ;unsigned int groups =0 ;int llink =0 ;
@@ -202,30 +209,42 @@ int do_ipmonitor(int argc, char **argv) }else if (matches (*argv,"link" ) ==0 ) { llink =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"address" ) ==0 ) { laddr =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"route" ) ==0 ) { lroute =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"mroute" ) ==0 ) { lmroute =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"prefix" ) ==0 ) { lprefix =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"neigh" ) ==0 ) { lneigh =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"netconf" ) ==0 ) { lnetconf =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"rule" ) ==0 ) { lrule =1 ; groups =0 ; + nh_set =0 ; }else if (matches (*argv,"nsid" ) ==0 ) { lnsid =1 ; groups =0 ; + nh_set =0 ; + }else if (matches (*argv,"nexthop" ) ==0 ) { + lnexthop =1 ; + groups =0 ; }else if (strcmp (*argv,"all" ) ==0 ) { prefix_banner =1 ; }else if (matches (*argv,"all-nsid" ) ==0 ) {
@@ -297,6 +316,9 @@ int do_ipmonitor(int argc, char **argv)if (lnsid) { groups |=nl_mgrp (RTNLGRP_NSID ); } +if (nh_set) + lnexthop =1 ; +if (file) {FILE *fp;int err;
@@ -313,6 +335,12 @@ int do_ipmonitor(int argc, char **argv)if (rtnl_open (&rth, groups) <0 )exit (1 ); + +if (lnexthop &&rtnl_add_nl_group (&rth,RTNLGRP_NEXTHOP ) <0 ) { +fprintf (stderr,"Failed to add nexthop group to list\n" ); +exit (1 ); + } +if (listen_all_nsid &&rtnl_listen_all_nsid (&rth) <0 )exit (1 );
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 5/10 libnetlink: Add helper to create nexthop dump request
In reply to David AhernFrom: David Ahern <[email protected]>
Add rtnl_nexthopdump_req to initiate a dump request of nexthop objects.
--- include/libnetlink.h | 4 ++++ lib/libnetlink.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)
include/libnetlink.h +4 -0
@@ -93,6 +93,10 @@ int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req,int rtnl_dump_request_n (struct rtnl_handle *rth,struct nlmsghdr *n) __attribute__((warn_unused_result)); +int rtnl_nexthopdump_req (struct rtnl_handle *rth,int family, +req_filter_fn_t filter_fn) + __attribute__((warn_unused_result)); +struct rtnl_ctrl_data {int nsid; };
lib/libnetlink.c +27 -0
@@ -25,6 +25,7 @@#include <linux/fib_rules.h> #include <linux/if_addrlabel.h> #include <linux/if_bridge.h> +#include <linux/nexthop.h> #include "libnetlink.h"
@@ -252,6 +253,32 @@ int rtnl_open(struct rtnl_handle *rth, unsigned int subscriptions)return rtnl_open_byproto (rth, subscriptions,NETLINK_ROUTE ); } +int rtnl_nexthopdump_req (struct rtnl_handle *rth,int family, +req_filter_fn_t filter_fn) +{ +struct { +struct nlmsghdr nlh; +struct nhmsg nhm; +char buf[128 ]; + } req = { + .nlh.nlmsg_len =NLMSG_LENGTH (sizeof (struct nhmsg )), + .nlh.nlmsg_type =RTM_GETNEXTHOP , + .nlh.nlmsg_flags =NLM_F_DUMP |NLM_F_REQUEST , + .nlh.nlmsg_seq = rth->dump = ++rth->seq, + .nhm.nh_family = family, + }; + +if (filter_fn) { +int err; + + err =filter_fn (&req.nlh,sizeof (req)); +if (err) +return err; + } + +return send (rth->fd, &req,sizeof (req),0 ); +} +int rtnl_addrdump_req (struct rtnl_handle *rth,int family,req_filter_fn_t filter_fn) {
Signature · 1 line
2.11.0
David Ahern
maintainerPATCH v2 2/10 lwtunnel: Pass encap and encap_type attributes to lwt_parse_encap
In reply to David AhernFrom: David Ahern <[email protected]>
lwt_parse_encap currently assumes the encap attribute is RTA_ENCAP and the type is RTA_ENCAP_TYPE. Change lwt_parse_encap to take these as input arguments for reuse by nexthop code which has the attributes as NHA_ENCAP and NHA_ENCAP_TYPE.
--- ip/ip_common.h | 3 ++- ip/iproute.c | 6 ++++-- ip/iproute_lwtunnel.c | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-)
ip/ip_common.h +2 -1
@@ -134,7 +134,8 @@ int bond_parse_xstats(struct link_util *lu, int argc, char **argv);int bond_print_xstats (struct nlmsghdr *n,void *arg);/* iproute_lwtunnel.c */ -int lwt_parse_encap (struct rtattr *rta,size_t len,int *argcp,char ***argvp); +int lwt_parse_encap (struct rtattr *rta,size_t len,int *argcp,char ***argvp, +int encap_attr,int encap_type_attr);void lwt_print_encap (FILE *fp,struct rtattr *encap_type,struct rtattr *encap);/* iplink_xdp.c */
ip/iproute.c +4 -2
@@ -997,7 +997,8 @@ static int parse_one_nh(struct nlmsghdr *n, struct rtmsg *r, }else if (strcmp (*argv,"encap" ) ==0 ) {int old_len = rta->rta_len; -if (lwt_parse_encap (rta, len, &argc, &argv)) +if (lwt_parse_encap (rta, len, &argc, &argv, +RTA_ENCAP ,RTA_ENCAP_TYPE ))return -1 ; rtnh->rtnh_len += rta->rta_len - old_len; }else if (strcmp (*argv,"as" ) ==0 ) {
@@ -1416,7 +1417,8 @@ static int iproute_modify(int cmd, unsigned int flags, int argc, char **argv) rta->rta_type =RTA_ENCAP ; rta->rta_len =RTA_LENGTH (0 ); -lwt_parse_encap (rta,sizeof (buf), &argc, &argv); +lwt_parse_encap (rta,sizeof (buf), &argc, &argv, +RTA_ENCAP ,RTA_ENCAP_TYPE );if (rta->rta_len >RTA_LENGTH (0 )) addraw_l(&req.n, 1024
ip/iproute_lwtunnel.c +4 -3
@@ -1111,7 +1111,8 @@ static int parse_encap_bpf(struct rtattr *rta, size_t len, int *argcp,return 0 ; } -int lwt_parse_encap (struct rtattr *rta,size_t len,int *argcp,char ***argvp) +int lwt_parse_encap (struct rtattr *rta,size_t len,int *argcp,char ***argvp, +int encap_attr,int encap_type_attr) {struct rtattr *nest;int argc = *argcp;
@@ -1131,7 +1132,7 @@ int lwt_parse_encap(struct rtattr *rta, size_t len, int *argcp, char ***argvp)exit (-1 ); } - nest =rta_nest (rta, len,RTA_ENCAP ); + nest =rta_nest (rta, len, encap_attr);switch (type) {case LWTUNNEL_ENCAP_MPLS : ret =parse_encap_mpls (rta, len, &argc, &argv);
@@ -1164,7 +1165,7 @@ int lwt_parse_encap(struct rtattr *rta, size_t len, int *argcp, char ***argvp)rta_nest_end (rta, nest); - ret =rta_addattr16 (rta, len,RTA_ENCAP_TYPE , type); + ret =rta_addattr16 (rta, len, encap_type_attr, type); *argcp = argc; *argvp = argv;
Signature · 1 line
2.11.0
Re: [PATCH v2 iproute-next 10/10] ipmonitor: Add nexthop option to monitor
In reply to David AhernQuoted 9 lines · On Fri, 7 Jun 2019 15:38:16 -0700 David Ahern <[email protected]> wrote:
From: David Ahern <[email protected]>
Add capability to ip-monitor to listen and dump nexthop messages. Since the nexthop group = 32 which exceeds the max groups bit field, 2 separate flags are needed - one that defaults on to indicate nexthop group is joined by default and a second that indicates a specific selection by the user (e.g, ip mon nexthop route).
Signed-off-by David Ahern <[email protected]>