From e22b42a2c1f088c09cae071b77b3a57069f196b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Delawarde?= Date: Mon, 26 Nov 2007 18:13:24 +0100 Subject: [PATCH] tc mask patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Hello Stephen, As the current maintainer of iproute2 package, you could be interested in including the attached patch that allow using masks in the fw filter of the tc utility (very useful at least for me). AFAK, it works at least from iproute2 version 2.6.20-?. Feel free to make the appropriate cleaning changes if necessary, or contact me if you see any trouble. Best regards, François Delawarde. Signed-off-by: Stephen Hemminger --- tc/f_fw.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/tc/f_fw.c b/tc/f_fw.c index 046f61468..6d1490b46 100644 --- a/tc/f_fw.c +++ b/tc/f_fw.c @@ -40,19 +40,30 @@ static int fw_parse_opt(struct filter_util *qu, char *handle, int argc, char **a memset(&tp, 0, sizeof(tp)); + tail = NLMSG_TAIL(n); + addattr_l(n, 4096, TCA_OPTIONS, NULL, 0); + if (handle) { + char *slash; + __u32 mask = 0; + if ((slash = strchr(handle, '/')) != NULL) + *slash = '\0'; if (get_u32(&t->tcm_handle, handle, 0)) { fprintf(stderr, "Illegal \"handle\"\n"); return -1; } + if (slash) { + if (get_u32(&mask, slash+1, 0)) { + fprintf(stderr, "Illegal \"handle\" mask\n"); + return -1; + } + addattr32(n, MAX_MSG, TCA_FW_MASK, mask); + } } if (argc == 0) return 0; - tail = NLMSG_TAIL(n); - addattr_l(n, 4096, TCA_OPTIONS, NULL, 0); - while (argc > 0) { if (matches(*argv, "classid") == 0 || matches(*argv, "flowid") == 0) { @@ -111,8 +122,16 @@ static int fw_print_opt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u parse_rtattr_nested(tb, TCA_FW_MAX, opt); - if (handle) - fprintf(f, "handle 0x%x ", handle); + if (handle || tb[TCA_FW_MASK]) { + __u32 mark = 0, mask = 0; + if(handle) + mark = handle; + if(tb[TCA_FW_MASK] && + (mask = *(__u32*)RTA_DATA(tb[TCA_FW_MASK])) != 0xFFFFFFFF) + fprintf(f, "handle 0x%x/0x%x ", mark, mask); + else + fprintf(f, "handle 0x%x ", handle); + } if (tb[TCA_FW_CLASSID]) { SPRINT_BUF(b1); -- 2.47.2