f_flower: fix build with musl libc

[mirror_iproute2.git] / tc / f_flower.c

diff --git a/tc/f_flower.c b/tc/f_flower.c
index 65fca04303bad63783f66a4279d3a51ed76a60e6..9659e894dd1f93b4f773525f38270ecadf174b67 100644 (file)
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <net/if.h>
+#include <linux/limits.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/ip.h>
@@ -473,24 +474,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)
-               return -1;
+       ret = sscanf(str, "%hu-%hu", &min, &max);
 
-       ret = get_be16(&port, str, 10);
-       if (ret)
-               return -1;
+       if (ret == 1) {
+               int type;
 
-       addattr16(n, MAX_MSG, type, port);
+               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;
+       }
        return 0;
 }
 
@@ -1490,6 +1524,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 +1735,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 +1854,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]);