Fri, Dec 02, 2016 at 10:59:44AM CET, simon.hor...@netronome.com wrote:
>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 <simon.hor...@netronome.com>
>---
> tc/f_flower.c | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
>diff --git a/tc/f_flower.c b/tc/f_flower.c
>index 615e8f27bed2..42253067b43d 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_src,
>+ flower_dst
FLOWER_ENDPOINT_SRC,
FLOWER_ENDPOINT_DST,
>+};
>+
> static void explain(void)
> {
> fprintf(stderr,
>@@ -160,29 +165,30 @@ 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_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_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_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;
>
>@@ -340,14 +346,14 @@ 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_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_src, n);
> if (ret < 0) {
> fprintf(stderr, "Illegal \"src_port\"\n");
> return -1;
>--
>2.7.0.rc3.207.g0ac5344
>
