From 404b627b261aa76de7718fb481e6bbdacbd6d869 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 17 Mar 2017 13:23:33 +0100 Subject: [PATCH] tc: flower: introduce enum flower_endpoint Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629 Upstream Status: iproute2.git commit 6910d65661a37 commit 6910d65661a3718ef4b944251a0dec170027f3d5 Author: Simon Horman Date: Wed Dec 7 14:54:02 2016 +0100 tc: flower: introduce enum flower_endpoint Introduce enum flower_endpoint and use it instead of a bool as the type for paramatising source and destination. This is intended to improve read-ability and provide some type checking of endpoint parameters. Signed-off-by: Simon Horman --- tc/f_flower.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/tc/f_flower.c b/tc/f_flower.c index 3f0190f..523b82b 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -23,6 +23,11 @@ #include "tc_util.h" #include "rt_names.h" +enum flower_endpoint { + FLOWER_ENDPOINT_SRC, + FLOWER_ENDPOINT_DST +}; + static void explain(void) { fprintf(stderr, @@ -166,29 +171,33 @@ static int flower_parse_ip_addr(char *str, __be16 eth_type, return 0; } -static int flower_port_attr_type(__u8 ip_proto, bool is_src) +static int flower_port_attr_type(__u8 ip_proto, enum flower_endpoint endpoint) { if (ip_proto == IPPROTO_TCP) - return is_src ? TCA_FLOWER_KEY_TCP_SRC : + return endpoint == FLOWER_ENDPOINT_SRC ? + TCA_FLOWER_KEY_TCP_SRC : TCA_FLOWER_KEY_TCP_DST; else if (ip_proto == IPPROTO_UDP) - return is_src ? TCA_FLOWER_KEY_UDP_SRC : + return endpoint == FLOWER_ENDPOINT_SRC ? + TCA_FLOWER_KEY_UDP_SRC : TCA_FLOWER_KEY_UDP_DST; else if (ip_proto == IPPROTO_SCTP) - return is_src ? TCA_FLOWER_KEY_SCTP_SRC : + return endpoint == FLOWER_ENDPOINT_SRC ? + TCA_FLOWER_KEY_SCTP_SRC : TCA_FLOWER_KEY_SCTP_DST; else return -1; } -static int flower_parse_port(char *str, __u8 ip_proto, bool is_src, +static int flower_parse_port(char *str, __u8 ip_proto, + enum flower_endpoint endpoint, struct nlmsghdr *n) { int ret; int type; __be16 port; - type = flower_port_attr_type(ip_proto, is_src); + type = flower_port_attr_type(ip_proto, endpoint); if (type < 0) return -1; @@ -359,14 +368,16 @@ static int flower_parse_opt(struct filter_util *qu, char *handle, } } else if (matches(*argv, "dst_port") == 0) { NEXT_ARG(); - ret = flower_parse_port(*argv, ip_proto, false, n); + ret = flower_parse_port(*argv, ip_proto, + FLOWER_ENDPOINT_DST, n); if (ret < 0) { fprintf(stderr, "Illegal \"dst_port\"\n"); return -1; } } else if (matches(*argv, "src_port") == 0) { NEXT_ARG(); - ret = flower_parse_port(*argv, ip_proto, true, n); + ret = flower_parse_port(*argv, ip_proto, + FLOWER_ENDPOINT_SRC, n); if (ret < 0) { fprintf(stderr, "Illegal \"src_port\"\n"); return -1; -- 1.8.3.1