mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-08-14 03:16:10 +00:00
tc: flower: Classify packets based port ranges
Added support for filtering based on port ranges. UAPI changes have been accepted into net-next. Example: 1. Match on a port range: ------------------------- $ tc filter add dev enp4s0 protocol ip parent ffff:\ prio 1 flower ip_proto tcp dst_port 20-30 skip_hw\ action drop $ tc -s filter show dev enp4s0 parent ffff: filter protocol ip pref 1 flower chain 0 filter protocol ip pref 1 flower chain 0 handle 0x1 eth_type ipv4 ip_proto tcp dst_port 20-30 skip_hw not_in_hw action order 1: gact action drop random type none pass val 0 index 1 ref 1 bind 1 installed 85 sec used 3 sec Action statistics: Sent 460 bytes 10 pkt (dropped 10, overlimits 0 requeues 0) backlog 0b 0p requeues 0 2. Match on IP address and port range: -------------------------------------- $ tc filter add dev enp4s0 protocol ip parent ffff:\ prio 1 flower dst_ip 192.168.1.1 ip_proto tcp dst_port 100-200\ skip_hw action drop $ tc -s filter show dev enp4s0 parent ffff: filter protocol ip pref 1 flower chain 0 handle 0x2 eth_type ipv4 ip_proto tcp dst_ip 192.168.1.1 dst_port 100-200 skip_hw not_in_hw action order 1: gact action drop random type none pass val 0 index 2 ref 1 bind 1 installed 58 sec used 2 sec Action statistics: Sent 920 bytes 20 pkt (dropped 20, overlimits 0 requeues 0) backlog 0b 0p requeues 0 v6: Modified to change json output format as object for sport/dport. "dst_port":{ "start":2000, "end":6000 }, "src_port":{ "start":50, "end":60 } v5: Simplified some code and used 'sscanf' for parsing. Removed space in output format. v4: Added man updates explaining filtering based on port ranges. Removed 'range' keyword. v3: Modified flower_port_range_attr_type calls. v2: Addressed Jiri's comment to sync output format with input Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com> Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
parent
dd7d522a67
commit
8930840e67
@ -56,8 +56,9 @@ flower \- flow based traffic control filter
|
||||
.IR MASKED_IP_TTL " | { "
|
||||
.BR dst_ip " | " src_ip " } "
|
||||
.IR PREFIX " | { "
|
||||
.BR dst_port " | " src_port " } "
|
||||
.IR port_number " } | "
|
||||
.BR dst_port " | " src_port " } { "
|
||||
.IR port_number " | "
|
||||
.IR min_port_number-max_port_number " } | "
|
||||
.B tcp_flags
|
||||
.IR MASKED_TCP_FLAGS " | "
|
||||
.B type
|
||||
@ -220,10 +221,12 @@ must be a valid IPv4 or IPv6 address, depending on the \fBprotocol\fR
|
||||
option to tc filter, optionally followed by a slash and the prefix length.
|
||||
If the prefix is missing, \fBtc\fR assumes a full-length host match.
|
||||
.TP
|
||||
.BI dst_port " NUMBER"
|
||||
.IR \fBdst_port " { " NUMBER " | " " MIN_VALUE-MAX_VALUE " }
|
||||
.TQ
|
||||
.BI src_port " NUMBER"
|
||||
Match on layer 4 protocol source or destination port number. Only available for
|
||||
.IR \fBsrc_port " { " NUMBER " | " " MIN_VALUE-MAX_VALUE " }
|
||||
Match on layer 4 protocol source or destination port number. Alternatively, the
|
||||
mininum and maximum values can be specified to match on a range of layer 4
|
||||
protocol source or destination port numbers. Only available for
|
||||
.BR ip_proto " values " udp ", " tcp " and " sctp
|
||||
which have to be specified in beforehand.
|
||||
.TP
|
||||
|
@ -473,24 +473,57 @@ static int flower_port_attr_type(__u8 ip_proto, enum flower_endpoint endpoint)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int flower_port_range_attr_type(__u8 ip_proto, enum flower_endpoint type,
|
||||
__be16 *min_port_type,
|
||||
__be16 *max_port_type)
|
||||
{
|
||||
if (ip_proto == IPPROTO_TCP || ip_proto == IPPROTO_UDP ||
|
||||
ip_proto == IPPROTO_SCTP) {
|
||||
if (type == FLOWER_ENDPOINT_SRC) {
|
||||
*min_port_type = TCA_FLOWER_KEY_PORT_SRC_MIN;
|
||||
*max_port_type = TCA_FLOWER_KEY_PORT_SRC_MAX;
|
||||
} else {
|
||||
*min_port_type = TCA_FLOWER_KEY_PORT_DST_MIN;
|
||||
*max_port_type = TCA_FLOWER_KEY_PORT_DST_MAX;
|
||||
}
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int flower_parse_port(char *str, __u8 ip_proto,
|
||||
enum flower_endpoint endpoint,
|
||||
struct nlmsghdr *n)
|
||||
{
|
||||
__u16 min, max;
|
||||
int ret;
|
||||
int type;
|
||||
__be16 port;
|
||||
|
||||
type = flower_port_attr_type(ip_proto, endpoint);
|
||||
if (type < 0)
|
||||
ret = sscanf(str, "%hu-%hu", &min, &max);
|
||||
|
||||
if (ret == 1) {
|
||||
int type;
|
||||
|
||||
type = flower_port_attr_type(ip_proto, endpoint);
|
||||
if (type < 0)
|
||||
return -1;
|
||||
addattr16(n, MAX_MSG, type, htons(min));
|
||||
} else if (ret == 2) {
|
||||
__be16 min_port_type, max_port_type;
|
||||
|
||||
if (max <= min) {
|
||||
fprintf(stderr, "max value should be greater than min value\n");
|
||||
return -1;
|
||||
}
|
||||
if (flower_port_range_attr_type(ip_proto, endpoint,
|
||||
&min_port_type, &max_port_type))
|
||||
return -1;
|
||||
|
||||
addattr16(n, MAX_MSG, min_port_type, htons(min));
|
||||
addattr16(n, MAX_MSG, max_port_type, htons(max));
|
||||
} else {
|
||||
return -1;
|
||||
|
||||
ret = get_be16(&port, str, 10);
|
||||
if (ret)
|
||||
return -1;
|
||||
|
||||
addattr16(n, MAX_MSG, type, port);
|
||||
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1490,6 +1523,29 @@ static void flower_print_port(char *name, struct rtattr *attr)
|
||||
print_hu(PRINT_ANY, name, namefrm, rta_getattr_be16(attr));
|
||||
}
|
||||
|
||||
static void flower_print_port_range(char *name, struct rtattr *min_attr,
|
||||
struct rtattr *max_attr)
|
||||
{
|
||||
if (!min_attr || !max_attr)
|
||||
return;
|
||||
|
||||
if (is_json_context()) {
|
||||
open_json_object(name);
|
||||
print_hu(PRINT_JSON, "start", NULL, rta_getattr_be16(min_attr));
|
||||
print_hu(PRINT_JSON, "end", NULL, rta_getattr_be16(max_attr));
|
||||
close_json_object();
|
||||
} else {
|
||||
SPRINT_BUF(namefrm);
|
||||
SPRINT_BUF(out);
|
||||
size_t done;
|
||||
|
||||
done = sprintf(out, "%u", rta_getattr_be16(min_attr));
|
||||
sprintf(out + done, "-%u", rta_getattr_be16(max_attr));
|
||||
sprintf(namefrm, "\n %s %%s", name);
|
||||
print_string(PRINT_ANY, name, namefrm, out);
|
||||
}
|
||||
}
|
||||
|
||||
static void flower_print_tcp_flags(const char *name, struct rtattr *flags_attr,
|
||||
struct rtattr *mask_attr)
|
||||
{
|
||||
@ -1678,6 +1734,7 @@ static int flower_print_opt(struct filter_util *qu, FILE *f,
|
||||
struct rtattr *opt, __u32 handle)
|
||||
{
|
||||
struct rtattr *tb[TCA_FLOWER_MAX + 1];
|
||||
__be16 min_port_type, max_port_type;
|
||||
int nl_type, nl_mask_type;
|
||||
__be16 eth_type = 0;
|
||||
__u8 ip_proto = 0xff;
|
||||
@ -1796,6 +1853,16 @@ static int flower_print_opt(struct filter_util *qu, FILE *f,
|
||||
if (nl_type >= 0)
|
||||
flower_print_port("src_port", tb[nl_type]);
|
||||
|
||||
if (!flower_port_range_attr_type(ip_proto, FLOWER_ENDPOINT_DST,
|
||||
&min_port_type, &max_port_type))
|
||||
flower_print_port_range("dst_port",
|
||||
tb[min_port_type], tb[max_port_type]);
|
||||
|
||||
if (!flower_port_range_attr_type(ip_proto, FLOWER_ENDPOINT_SRC,
|
||||
&min_port_type, &max_port_type))
|
||||
flower_print_port_range("src_port",
|
||||
tb[min_port_type], tb[max_port_type]);
|
||||
|
||||
flower_print_tcp_flags("tcp_flags", tb[TCA_FLOWER_KEY_TCP_FLAGS],
|
||||
tb[TCA_FLOWER_KEY_TCP_FLAGS_MASK]);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user