From e02f31a775d161a19d5d99061b7822ea291169da Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 25 Feb 2020 20:30:27 +0800 Subject: [PATCH] kernel/iptables: fix IMQ support --- include/netfilter.mk | 4 + package/kernel/linux/modules/netfilter.mk | 1 + package/network/utils/iptables/Makefile | 24 - .../modules/extensions/libipt_bandwidth.c | 657 ------ .../modules/extensions/libipt_timerange.c | 876 ------- .../modules/extensions/libipt_webmon.c | 700 ------ .../modules/extensions/libipt_weburl.c | 290 --- .../iptables/modules/extensions/libxt_IMQ.c | 105 - .../iptables/modules/extensions/libxt_IMQ.man | 15 - .../modules/include/linux/netfilter/xt_IMQ.h | 9 - .../linux/netfilter_ipv4/ipt_bandwidth.h | 106 - .../linux/netfilter_ipv4/ipt_timerange.h | 43 - .../include/linux/netfilter_ipv4/ipt_webmon.h | 63 - .../include/linux/netfilter_ipv4/ipt_weburl.h | 45 - .../patches/601-add-imq-support.patch | 138 ++ target/linux/generic/config-4.14 | 5 + target/linux/generic/config-4.19 | 5 + .../601-add-kernel-imq-support.patch | 2044 +++++++++++++++++ .../601-add-kernel-imq-support.patch | 2044 +++++++++++++++++ 19 files changed, 4241 insertions(+), 2933 deletions(-) delete mode 100644 package/network/utils/iptables/modules/extensions/libipt_bandwidth.c delete mode 100644 package/network/utils/iptables/modules/extensions/libipt_timerange.c delete mode 100644 package/network/utils/iptables/modules/extensions/libipt_webmon.c delete mode 100644 package/network/utils/iptables/modules/extensions/libipt_weburl.c delete mode 100644 package/network/utils/iptables/modules/extensions/libxt_IMQ.c delete mode 100644 package/network/utils/iptables/modules/extensions/libxt_IMQ.man delete mode 100644 package/network/utils/iptables/modules/include/linux/netfilter/xt_IMQ.h delete mode 100644 package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_bandwidth.h delete mode 100644 package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_timerange.h delete mode 100644 package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_webmon.h delete mode 100644 package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_weburl.h create mode 100644 package/network/utils/iptables/patches/601-add-imq-support.patch create mode 100644 target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch create mode 100644 target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch diff --git a/include/netfilter.mk b/include/netfilter.mk index db202b5efc..50ea76cfe5 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -109,6 +109,10 @@ $(eval $(call nf_add,IPT_PHYSDEV,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_ph $(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_STRING, $(P_XT)xt_string)) $(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_BPF, $(P_XT)xt_bpf)) +# imq + +$(eval $(call nf_add,IPT_IMQ,CONFIG_IP_NF_TARGET_IMQ, $(P_V4)ipt_IMQ)) +$(eval $(call nf_add,IPT_IMQ,CONFIG_NETFILTER_XT_TARGET_IMQ, $(P_XT)xt_IMQ)) # ipopt diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 73bc730449..167bcc9bc5 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -489,6 +489,7 @@ define KernelPackage/ipt-imq TITLE:=Intermediate Queueing support KCONFIG:= \ CONFIG_IMQ \ + CONFIG_IMQ_BEHAVIOR_BA=y \ CONFIG_IMQ_NUM_DEVS=2 \ CONFIG_NETFILTER_XT_TARGET_IMQ FILES:= \ diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index fa792a7e05..e8955d2254 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -195,26 +195,6 @@ iptables extension for IMQ support. endef -define Package/iptables-mod-bandwidth -$(call Package/iptables/Module, +kmod-ipt-bandwidth) - TITLE:=bandwidth -endef - -define Package/iptables-mod-timerange -$(call Package/iptables/Module, +kmod-ipt-timerange) - TITLE:=timerange -endef - -define Package/iptables-mod-webmon -$(call Package/iptables/Module, +kmod-ipt-webmon) - TITLE:=webmon -endef - -define Package/iptables-mod-weburl -$(call Package/iptables/Module, +kmod-ipt-weburl) - TITLE:=weburl -endef - define Package/iptables-mod-ipopt $(call Package/iptables/Module, +kmod-ipt-ipopt) TITLE:=IP/Packet option extensions @@ -726,10 +706,6 @@ $(eval $(call BuildPlugin,iptables-mod-physdev,$(IPT_PHYSDEV-m))) $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m))) $(eval $(call BuildPlugin,iptables-mod-cgroup,$(IPT_CGROUP-m))) $(eval $(call BuildPlugin,iptables-mod-imq,$(IPT_IMQ-m))) -$(eval $(call BuildPlugin,iptables-mod-bandwidth,$(IPT_BANDWIDTH-m))) -$(eval $(call BuildPlugin,iptables-mod-timerange,$(IPT_TIMERANGE-m))) -$(eval $(call BuildPlugin,iptables-mod-webmon,$(IPT_WEBMON-m))) -$(eval $(call BuildPlugin,iptables-mod-weburl,$(IPT_WEBURL-m))) $(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m))) $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m))) $(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m))) diff --git a/package/network/utils/iptables/modules/extensions/libipt_bandwidth.c b/package/network/utils/iptables/modules/extensions/libipt_bandwidth.c deleted file mode 100644 index 32d9fa8aa5..0000000000 --- a/package/network/utils/iptables/modules/extensions/libipt_bandwidth.c +++ /dev/null @@ -1,657 +0,0 @@ -/* bandwidth -- An iptables extension for bandwidth monitoring/control - * Can be used to efficiently monitor bandwidth and/or implement bandwidth quotas - * Can be queried using the iptbwctl userspace library - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2009 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * in iptables 1.4.0 and higher, iptables.h includes xtables.h, which - * we can use to check whether we need to deal with the new requirements - * in pre-processor directives below - */ -#include -#include - -#ifdef _XTABLES_H - #define iptables_rule_match xtables_rule_match - #define iptables_match xtables_match - #define iptables_target xtables_target - #define ipt_tryload xt_tryload -#endif - -/* - * XTABLES_VERSION_CODE is only defined in versions 1.4.1 and later, which - * also require the use of xtables_register_match - * - * Version 1.4.0 uses register_match like previous versions - */ -#ifdef XTABLES_VERSION_CODE - #define register_match xtables_register_match -#endif - - - -int get_minutes_west(void); -void set_kernel_timezone(void); -int parse_sub(char* subnet_string, uint32_t* subnet, uint32_t* subnet_mask); -static unsigned long get_pow(unsigned long base, unsigned long pow); -static void param_problem_exit_error(char* msg); - - -/* Function which prints out usage message. */ -static void help(void) -{ - printf("bandwidth options:\n"); - printf(" --id [unique identifier for querying bandwidth]\n"); - printf(" --type [combined|individual_src|individual_dst|individual_local|individual_remote]\n"); - printf(" --subnet [a.b.c.d/mask] (0 < mask < 32)\n"); - printf(" --greater_than [BYTES]\n"); - printf(" --less_than [BYTES]\n"); - printf(" --current_bandwidth [BYTES]\n"); - printf(" --reset_interval [minute|hour|day|week|month]\n"); - printf(" --reset_time [OFFSET IN SECONDS]\n"); - printf(" --intervals_to_save [NUMBER OF PREVIOS INTERVALS TO STORE IN MEMORY]\n"); - printf(" --last_backup_time [UTC SECONDS SINCE 1970]\n"); - printf(" --bcheck Check another bandwidth rule without incrementing it\n"); - printf(" --bcheck_with_src_dst_swap Check another bandwidth rule without incrementing it, swapping src & dst ips for check\n"); -} - -static struct option opts[] = -{ - { .name = "id", .has_arg = 1, .flag = 0, .val = BANDWIDTH_ID }, - { .name = "type", .has_arg = 1, .flag = 0, .val = BANDWIDTH_TYPE }, - { .name = "subnet", .has_arg = 1, .flag = 0, .val = BANDWIDTH_SUBNET }, - { .name = "greater_than", .has_arg = 1, .flag = 0, .val = BANDWIDTH_GT }, - { .name = "less_than", .has_arg = 1, .flag = 0, .val = BANDWIDTH_LT }, - { .name = "current_bandwidth", .has_arg = 1, .flag = 0, .val = BANDWIDTH_CURRENT }, - { .name = "reset_interval", .has_arg = 1, .flag = 0, .val = BANDWIDTH_RESET_INTERVAL }, - { .name = "reset_time", .has_arg = 1, .flag = 0, .val = BANDWIDTH_RESET_TIME }, - { .name = "intervals_to_save", .has_arg = 1, .flag = 0, .val = BANDWIDTH_NUM_INTERVALS }, - { .name = "last_backup_time", .has_arg = 1, .flag = 0, .val = BANDWIDTH_LAST_BACKUP}, - { .name = "bcheck", .has_arg = 0, .flag = 0, .val = BANDWIDTH_CHECK_NOSWAP }, - { .name = "bcheck_with_src_dst_swap", .has_arg = 0, .flag = 0, .val = BANDWIDTH_CHECK_SWAP }, - { .name = 0 } -}; - - -/* Function which parses command options; returns true if it - ate an option */ -static int parse( int c, - char **argv, - int invert, - unsigned int *flags, -#ifdef _XTABLES_H - const void *entry, -#else - const struct ipt_entry *entry, - unsigned int *nfcache, -#endif - struct ipt_entry_match **match - ) -{ - struct ipt_bandwidth_info *info = (struct ipt_bandwidth_info *)(*match)->data; - int valid_arg = 0; - long int num_read; - uint64_t read_64; - time_t read_time; - - /* set defaults first time we get here */ - if(*flags == 0) - { - /* generate random id */ - srand ( time(NULL) ); - unsigned long id_num = rand(); - sprintf(info->id, "%lu", id_num); - - info->type = BANDWIDTH_COMBINED; - info->check_type = BANDWIDTH_CHECK_NOSWAP; - info->local_subnet = 0; - info->local_subnet_mask = 0; - info->cmp = BANDWIDTH_MONITOR; /* don't test greater/less than, just monitor bandwidth */ - info->current_bandwidth = 0; - info->reset_is_constant_interval = 0; - info->reset_interval = BANDWIDTH_NEVER; - info->reset_time=0; - info->last_backup_time = 0; - info->next_reset = 0; - - info->num_intervals_to_save=0; - - info->non_const_self = NULL; - info->ref_count = NULL; - - *flags = *flags + BANDWIDTH_INITIALIZED; - } - - switch (c) - { - case BANDWIDTH_ID: - if(strlen(optarg) < BANDWIDTH_MAX_ID_LENGTH) - { - sprintf(info->id, "%s", optarg); - valid_arg = 1; - } - c=0; - break; - case BANDWIDTH_TYPE: - valid_arg = 1; - if(strcmp(optarg, "combined") == 0) - { - info->type = BANDWIDTH_COMBINED; - } - else if(strcmp(optarg, "individual_src") == 0) - { - info->type = BANDWIDTH_INDIVIDUAL_SRC; - } - else if(strcmp(optarg, "individual_dst") == 0) - { - info->type = BANDWIDTH_INDIVIDUAL_DST; - } - else if(strcmp(optarg, "individual_local") == 0) - { - info->type = BANDWIDTH_INDIVIDUAL_LOCAL; - *flags = *flags + BANDWIDTH_REQUIRES_SUBNET; - } - else if(strcmp(optarg, "individual_remote") == 0) - { - info->type = BANDWIDTH_INDIVIDUAL_REMOTE; - *flags = *flags + BANDWIDTH_REQUIRES_SUBNET; - } - else - { - valid_arg = 0; - } - - c=0; - break; - - case BANDWIDTH_SUBNET: - valid_arg = parse_sub(optarg, &(info->local_subnet), &(info->local_subnet_mask)); - break; - case BANDWIDTH_LT: - num_read = sscanf(argv[optind-1], "%lld", &read_64); - if(num_read > 0 && (*flags & BANDWIDTH_CMP) == 0) - { - info->cmp = BANDWIDTH_LT; - info->bandwidth_cutoff = read_64; - valid_arg = 1; - } - c = BANDWIDTH_CMP; //only need one flag for less_than/greater_than - break; - case BANDWIDTH_GT: - num_read = sscanf(argv[optind-1], "%lld", &read_64); - if(num_read > 0 && (*flags & BANDWIDTH_CMP) == 0) - { - info->cmp = BANDWIDTH_GT; - info->bandwidth_cutoff = read_64; - valid_arg = 1; - } - c = BANDWIDTH_CMP; //only need one flag for less_than/greater_than - break; - case BANDWIDTH_CHECK_NOSWAP: - if( (*flags & BANDWIDTH_CMP) == 0 ) - { - info->cmp = BANDWIDTH_CHECK; - info->check_type = BANDWIDTH_CHECK_NOSWAP; - valid_arg = 1; - } - c = BANDWIDTH_CMP; - break; - case BANDWIDTH_CHECK_SWAP: - if( (*flags & BANDWIDTH_CMP) == 0 ) - { - info->cmp = BANDWIDTH_CHECK; - info->check_type = BANDWIDTH_CHECK_SWAP; - valid_arg = 1; - } - c = BANDWIDTH_CMP; - break; - case BANDWIDTH_CURRENT: - num_read = sscanf(argv[optind-1], "%lld", &read_64); - if(num_read > 0 ) - { - info->current_bandwidth = read_64; - valid_arg = 1; - } - break; - case BANDWIDTH_RESET_INTERVAL: - valid_arg = 1; - if(strcmp(argv[optind-1],"minute") ==0) - { - info->reset_interval = BANDWIDTH_MINUTE; - info->reset_is_constant_interval = 0; - } - else if(strcmp(argv[optind-1],"hour") ==0) - { - info->reset_interval = BANDWIDTH_HOUR; - info->reset_is_constant_interval = 0; - } - else if(strcmp(argv[optind-1],"day") ==0) - { - info->reset_interval = BANDWIDTH_DAY; - info->reset_is_constant_interval = 0; - } - else if(strcmp(argv[optind-1],"week") ==0) - { - info->reset_interval = BANDWIDTH_WEEK; - info->reset_is_constant_interval = 0; - } - else if(strcmp(argv[optind-1],"month") ==0) - { - info->reset_interval = BANDWIDTH_MONTH; - info->reset_is_constant_interval = 0; - } - else if(strcmp(argv[optind-1],"never") ==0) - { - info->reset_interval = BANDWIDTH_NEVER; - } - else if(sscanf(argv[optind-1], "%ld", &read_time) > 0) - { - info->reset_interval = read_time; - info->reset_is_constant_interval = 1; - } - else - { - valid_arg = 0; - } - break; - case BANDWIDTH_NUM_INTERVALS: - if( sscanf(argv[optind-1], "%ld", &num_read) > 0) - { - info->num_intervals_to_save = num_read; - valid_arg=1; - } - c=0; - break; - case BANDWIDTH_RESET_TIME: - num_read = sscanf(argv[optind-1], "%ld", &read_time); - if(num_read > 0 ) - { - info->reset_time = read_time; - valid_arg = 1; - } - break; - case BANDWIDTH_LAST_BACKUP: - num_read = sscanf(argv[optind-1], "%ld", &read_time); - if(num_read > 0 ) - { - info->last_backup_time = read_time; - valid_arg = 1; - } - break; - } - *flags = *flags + (unsigned int)c; - - - //if we have both reset_interval & reset_time, check reset_time is in valid range - if((*flags & BANDWIDTH_RESET_TIME) == BANDWIDTH_RESET_TIME && (*flags & BANDWIDTH_RESET_INTERVAL) == BANDWIDTH_RESET_INTERVAL) - { - if( (info->reset_interval == BANDWIDTH_NEVER) || - (info->reset_interval == BANDWIDTH_MONTH && info->reset_time >= 60*60*24*28) || - (info->reset_interval == BANDWIDTH_WEEK && info->reset_time >= 60*60*24*7) || - (info->reset_interval == BANDWIDTH_DAY && info->reset_time >= 60*60*24) || - (info->reset_interval == BANDWIDTH_HOUR && info->reset_time >= 60*60) || - (info->reset_interval == BANDWIDTH_MINUTE && info->reset_time >= 60) - ) - { - valid_arg = 0; - param_problem_exit_error("Parameter for '--reset_time' is not in valid range"); - } - } - if(info->type != BANDWIDTH_COMBINED && (*flags & BANDWIDTH_CURRENT) == BANDWIDTH_CURRENT) - { - valid_arg = 0; - param_problem_exit_error("You may only specify current bandwidth for combined type\n Use user-space library for setting bandwidth for individual types"); - } - - return valid_arg; -} - - - -static void print_bandwidth_args( struct ipt_bandwidth_info* info ) -{ - if(info->cmp == BANDWIDTH_CHECK) - { - if(info->check_type == BANDWIDTH_CHECK_NOSWAP) - { - printf("--bcheck "); - } - else - { - printf("--bcheck_with_src_dst_swap "); - } - } - printf("--id %s ", info->id); - - - - if(info->cmp != BANDWIDTH_CHECK) - { - /* determine current time in seconds since epoch, with offset for current timezone */ - int minuteswest = get_minutes_west(); - time_t now; - time(&now); - now = now - (minuteswest*60); - - if(info->type == BANDWIDTH_COMBINED) - { - printf("--type combined "); - } - if(info->type == BANDWIDTH_INDIVIDUAL_SRC) - { - printf("--type individual_src "); - } - if(info->type == BANDWIDTH_INDIVIDUAL_DST) - { - printf("--type individual_dst "); - } - if(info->type == BANDWIDTH_INDIVIDUAL_LOCAL) - { - printf("--type individual_local "); - } - if(info->type == BANDWIDTH_INDIVIDUAL_REMOTE) - { - printf("--type individual_remote "); - } - - - if(info->local_subnet != 0) - { - unsigned char* sub = (unsigned char*)(&(info->local_subnet)); - int msk_bits=0; - int pow=0; - for(pow=0; pow<32; pow++) - { - uint32_t test = get_pow(2, pow); - msk_bits = ( (info->local_subnet_mask & test) == test) ? msk_bits+1 : msk_bits; - } - printf("--subnet %u.%u.%u.%u/%u ", (unsigned char)sub[0], (unsigned char)sub[1], (unsigned char)sub[2], (unsigned char)sub[3], msk_bits); - } - if(info->cmp == BANDWIDTH_GT) - { - printf("--greater_than %lld ", info->bandwidth_cutoff); - } - if(info->cmp == BANDWIDTH_LT) - { - printf("--less_than %lld ", info->bandwidth_cutoff); - } - if (info->type == BANDWIDTH_COMBINED) /* too much data to print for multi types, have to use socket to get/set data */ - { - if( info->reset_interval != BANDWIDTH_NEVER && info->next_reset != 0 && info->next_reset < now) - { - /* - * current bandwidth only gets reset when first packet after reset interval arrives, so output - * zero if we're already past interval, but no packets have arrived - */ - printf("--current_bandwidth 0 "); - } - else - { - printf("--current_bandwidth %lld ", info->current_bandwidth); - } - } - if(info->reset_is_constant_interval) - { - printf("--reset_interval %ld ", info->reset_interval); - } - else - { - if(info->reset_interval == BANDWIDTH_MINUTE) - { - printf("--reset_interval minute "); - } - else if(info->reset_interval == BANDWIDTH_HOUR) - { - printf("--reset_interval hour "); - } - else if(info->reset_interval == BANDWIDTH_DAY) - { - printf("--reset_interval day "); - } - else if(info->reset_interval == BANDWIDTH_WEEK) - { - printf("--reset_interval week "); - } - else if(info->reset_interval == BANDWIDTH_MONTH) - { - printf("--reset_interval month "); - } - } - if(info->reset_time > 0) - { - printf("--reset_time %ld ", info->reset_time); - } - if(info->num_intervals_to_save > 0) - { - printf("--intervals_to_save %d ", info->num_intervals_to_save); - } - } -} - -/* - * Final check, we can't have reset_time without reset_interval - */ -static void final_check(unsigned int flags) -{ - if (flags == 0) - { - param_problem_exit_error("You must specify at least one argument. "); - } - if( (flags & BANDWIDTH_RESET_INTERVAL) == 0 && (flags & BANDWIDTH_RESET_TIME) != 0) - { - param_problem_exit_error("You may not specify '--reset_time' without '--reset_interval' "); - } - if( (flags & BANDWIDTH_REQUIRES_SUBNET) == BANDWIDTH_REQUIRES_SUBNET && (flags & BANDWIDTH_SUBNET) == 0 ) - { - param_problem_exit_error("You must specify a local subnet (--subnet a.b.c.d/mask) to match individual local/remote IPs "); - } - - /* update timezone minutes_west in kernel to match userspace*/ - set_kernel_timezone(); -} - -/* Prints out the matchinfo. */ -#ifdef _XTABLES_H -static void print(const void *ip, const struct xt_entry_match *match, int numeric) -#else -static void print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric) -#endif -{ - printf("bandwidth "); - struct ipt_bandwidth_info *info = (struct ipt_bandwidth_info *)match->data; - - print_bandwidth_args(info); -} - -/* Saves the union ipt_matchinfo in parsable form to stdout. */ -#ifdef _XTABLES_H -static void save(const void *ip, const struct xt_entry_match *match) -#else -static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match) -#endif -{ - struct ipt_bandwidth_info *info = (struct ipt_bandwidth_info *)match->data; - time_t now; - - print_bandwidth_args(info); - - time(&now); - printf("--last_backup-time %ld ", now); -} - -static struct iptables_match bandwidth = -{ - .next = NULL, - .name = "bandwidth", - #ifdef XTABLES_VERSION_CODE - .version = XTABLES_VERSION, - #else - .version = IPTABLES_VERSION, - #endif - .size = XT_ALIGN(sizeof(struct ipt_bandwidth_info)), - .userspacesize = XT_ALIGN(sizeof(struct ipt_bandwidth_info)), - .help = &help, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_match(&bandwidth); -} - -static void param_problem_exit_error(char* msg) -{ - #ifdef xtables_error - xtables_error(PARAMETER_PROBLEM, "%s", msg); - #else - exit_error(PARAMETER_PROBLEM, msg); - #endif -} - -/* - * implement a simple function to get positive powers of positive integers so we don't have to mess with math.h - * all we really need are powers of 2 for calculating netmask - * This is only called a couple of times, so speed isn't an issue either - */ -static unsigned long get_pow(unsigned long base, unsigned long pow) -{ - unsigned long ret = pow == 0 ? 1 : base*get_pow(base, pow-1); - return ret; -} - - -int parse_sub(char* subnet_string, uint32_t* subnet, uint32_t* subnet_mask) -{ - - int valid = 0; - unsigned int A,B,C,D,E,F,G,H; - int read_int = sscanf(subnet_string, "%u.%u.%u.%u/%u.%u.%u.%u", &A, &B, &C, &D, &E, &F, &G, &H); - if(read_int >= 5) - { - if( A <= 255 && B <= 255 && C <= 255 && D <= 255) - { - unsigned char* sub = (unsigned char*)(subnet); - unsigned char* msk = (unsigned char*)(subnet_mask); - - *( sub ) = (unsigned char)A; - *( sub + 1 ) = (unsigned char)B; - *( sub + 2 ) = (unsigned char)C; - *( sub + 3 ) = (unsigned char)D; - - if(read_int == 5) - { - unsigned int mask = E; - if(mask <= 32) - { - int msk_index; - for(msk_index=0; msk_index*8 < mask; msk_index++) - { - int bit_index; - msk[msk_index] = 0; - for(bit_index=0; msk_index*8 + bit_index < mask && bit_index < 8; bit_index++) - { - msk[msk_index] = msk[msk_index] + get_pow(2, 7-bit_index); - } - } - } - valid = 1; - } - if(read_int == 8) - { - if( E <= 255 && F <= 255 && G <= 255 && H <= 255) - *( msk ) = (unsigned char)E; - *( msk + 1 ) = (unsigned char)F; - *( msk + 2 ) = (unsigned char)G; - *( msk + 3 ) = (unsigned char)H; - valid = 1; - } - } - } - if(valid) - { - *subnet = (*subnet & *subnet_mask ); - } - return valid; -} - - - -int get_minutes_west(void) -{ - time_t now; - struct tm* utc_info; - struct tm* tz_info; - int utc_day; - int utc_hour; - int utc_minute; - int tz_day; - int tz_hour; - int tz_minute; - int minuteswest; - - time(&now); - utc_info = gmtime(&now); - utc_day = utc_info->tm_mday; - utc_hour = utc_info->tm_hour; - utc_minute = utc_info->tm_min; - tz_info = localtime(&now); - tz_day = tz_info->tm_mday; - tz_hour = tz_info->tm_hour; - tz_minute = tz_info->tm_min; - - utc_day = utc_day < tz_day - 1 ? tz_day + 1 : utc_day; - tz_day = tz_day < utc_day - 1 ? utc_day + 1 : tz_day; - - minuteswest = (24*60*utc_day + 60*utc_hour + utc_minute) - (24*60*tz_day + 60*tz_hour + tz_minute) ; - - return minuteswest; -} - -void set_kernel_timezone(void) -{ - struct timeval tv; - struct timezone old_tz; - struct timezone new_tz; - - new_tz.tz_minuteswest = get_minutes_west();; - new_tz.tz_dsttime = 0; - - /* Get tv to pass to settimeofday(2) to be sure we avoid hour-sized warp */ - /* (see gettimeofday(2) man page, or /usr/src/linux/kernel/time.c) */ - gettimeofday(&tv, &old_tz); - - /* set timezone */ - settimeofday(&tv, &new_tz); -} diff --git a/package/network/utils/iptables/modules/extensions/libipt_timerange.c b/package/network/utils/iptables/modules/extensions/libipt_timerange.c deleted file mode 100644 index ba0c33bb6f..0000000000 --- a/package/network/utils/iptables/modules/extensions/libipt_timerange.c +++ /dev/null @@ -1,876 +0,0 @@ -/* timerange -- An iptables extension to match multiple timeranges within a week - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2009-2010 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include -#include -#include -#include -#include -#include -#include -#include - - -/* - * in iptables 1.4.0 and higher, iptables.h includes xtables.h, which - * we can use to check whether we need to deal with the new requirements - * in pre-processor directives below - */ -#include -#include - -#ifdef _XTABLES_H - #define iptables_rule_match xtables_rule_match - #define iptables_match xtables_match - #define iptables_target xtables_target - #define ipt_tryload xt_tryload -#endif - -/* - * XTABLES_VERSION_CODE is only defined in versions 1.4.1 and later, which - * also require the use of xtables_register_match - * - * Version 1.4.0 uses register_match like previous versions - */ -#ifdef XTABLES_VERSION_CODE - #define register_match xtables_register_match -#endif - -/* utility functions necessary for module to work across multiple iptables versions */ -static int my_check_inverse(const char option[], int* invert, int *my_optind, int argc); -static void param_problem_exit_error(char* msg); - - -long* parse_time_ranges(char* time_ranges, unsigned char is_weekly_range); -void merge_adjacent_time_ranges(long* time_ranges, unsigned char is_weekly_range); -unsigned long parse_time(char* time_str); -long* parse_weekdays(char* wd_str); - -char** split_on_separators(char* line, char* separators, int num_separators, int max_pieces, int include_remainder_at_max); -void to_lowercase(char* str); -char* trim_flanking_whitespace(char* str); - -void set_kernel_timezone(void); - -/* Function which prints out usage message. */ -static void help(void) -{ - printf( "timerange options:\n --hours [HOURLY RANGES] --weekdays [WEEKDAYS ACTIVE] --weekly_ranges [WEEKLY RANGES]\n"); -} - -static struct option opts[] = -{ - { .name = "hours", .has_arg = 1, .flag = 0, .val = HOURS }, - { .name = "weekdays", .has_arg = 1, .flag = 0, .val = WEEKDAYS }, - { .name = "weekly_ranges", .has_arg = 1, .flag = 0, .val = WEEKLY_RANGE }, - { .name = 0 } -}; - - -/* Function which parses command options; returns true if it - ate an option */ -static int parse( int c, - char **argv, - int invert, - unsigned int *flags, -#ifdef _XTABLES_H - const void *entry, -#else - const struct ipt_entry *entry, - unsigned int *nfcache, -#endif - struct ipt_entry_match **match - ) -{ - struct ipt_timerange_info *info = (struct ipt_timerange_info *)(*match)->data; - int valid_arg = 0; - if(*flags == 0) - { - my_check_inverse(optarg, &invert, &optind, 0); - info->invert = invert ? 1 : 0; - } - - long* parsed = NULL; - switch (c) - { - case HOURS: - parsed = parse_time_ranges(argv[optind-1], 0); - if(parsed != NULL && (*flags & HOURS) == 0 && (*flags & WEEKLY_RANGE) == 0) - { - int range_index = 0; - for(range_index = 0; parsed[range_index] != -1; range_index++) - { - if(range_index > 100) - { - return 0; - } - info->ranges[range_index] = parsed[range_index]; - } - info->ranges[range_index] = -1; - free(parsed); - - - valid_arg = 1; - *flags = *flags+ c; - info->type = *flags; - } - break; - - - case WEEKDAYS: - parsed = parse_weekdays(argv[optind-1]); - if(parsed != NULL && (*flags & WEEKDAYS) == 0 && (*flags & WEEKLY_RANGE) == 0) - { - int day_index; - for(day_index=0; day_index < 7; day_index++) - { - info->days[day_index] = parsed[day_index]; - } - free(parsed); - - valid_arg = 1 ; - *flags = *flags + c; - info->type = *flags; - } - break; - case WEEKLY_RANGE: - parsed = parse_time_ranges(argv[optind-1], 1); - if(parsed != NULL && (*flags & HOURS) == 0 && (*flags & WEEKDAYS) == 0 && (*flags & WEEKLY_RANGE) == 0 ) - { - int range_index = 0; - for(range_index = 0; parsed[range_index] != -1; range_index++) - { - if(range_index > 100) - { - return 0; - } - info->ranges[range_index] = parsed[range_index]; - - } - info->ranges[range_index] = -1; - free(parsed); - - valid_arg = 1; - *flags = *flags+c; - info->type = *flags; - } - break; - } - - return valid_arg; -} - - - -static void print_timerange_args( struct ipt_timerange_info* info ) -{ - int i; - - if(info->invert == 1) - { - printf(" ! "); - } - - switch(info->type) - { - case DAYS_HOURS: - case HOURS: - printf(" --hours "); - for(i=0; info->ranges[i] != -1; i++) - { - printf("%ld", info->ranges[i]); - if(info->ranges[i+1] != -1) - { - if(i % 2 == 0){ printf("-"); } - else { printf(","); } - } - } - if(info->type == HOURS) { break; } - case WEEKDAYS: - printf(" --weekdays "); - for(i=0; i<7; i++) - { - printf("%d", info->days[i]); - if(i != 6){ printf(","); } - } - break; - case WEEKLY_RANGE: - printf(" --weekly_ranges "); - for(i=0; info->ranges[i] != -1; i++) - { - printf("%ld", info->ranges[i]); - if(info->ranges[i+1] != -1) - { - if(i % 2 == 0){ printf("-"); } - else { printf(","); } - } - } - break; - } - printf(" "); - -} - -/* Final check; must have specified a test string with either --contains or --contains_regex. */ -static void final_check(unsigned int flags) -{ - if(flags ==0) - { - param_problem_exit_error("Invalid arguments to time_range"); - } - - /* update timezone minutes_west in kernel to match userspace*/ - set_kernel_timezone(); -} - -/* Prints out the matchinfo. */ -#ifdef _XTABLES_H -static void print(const void *ip, const struct xt_entry_match *match, int numeric) -#else -static void print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric) -#endif -{ - printf("timerange "); - struct ipt_timerange_info *info = (struct ipt_timerange_info *)match->data; - - print_timerange_args(info); -} - -/* Saves the union ipt_matchinfo in parsable form to stdout. */ -#ifdef _XTABLES_H -static void save(const void *ip, const struct xt_entry_match *match) -#else -static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match) -#endif -{ - struct ipt_timerange_info *info = (struct ipt_timerange_info *)match->data; - print_timerange_args(info); -} - -static struct iptables_match timerange = -{ - .next = NULL, - .name = "timerange", - #ifdef XTABLES_VERSION_CODE - .version = XTABLES_VERSION, - #else - .version = IPTABLES_VERSION, - #endif - .size = XT_ALIGN(sizeof(struct ipt_timerange_info)), - .userspacesize = XT_ALIGN(sizeof(struct ipt_timerange_info)), - .help = &help, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_match(&timerange); -} - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif -static int my_check_inverse(const char option[], int* invert, int *my_optind, int argc) -{ - if (option && strcmp(option, "!") == 0) - { - if (*invert) - { - param_problem_exit_error("Multiple `!' flags not allowed"); - } - *invert = TRUE; - if (my_optind != NULL) - { - ++*my_optind; - if (argc && *my_optind > argc) - { - param_problem_exit_error("no argument following `!'"); - } - } - return TRUE; - } - return FALSE; -} -static void param_problem_exit_error(char* msg) -{ - #ifdef xtables_error - xtables_error(PARAMETER_PROBLEM, "%s", msg); - #else - exit_error(PARAMETER_PROBLEM, msg); - #endif -} - -/* takes a string of days e.g. "Monday, Tuesday, Friday", and turns into an array of 7 longs - * each 0 or 1, one for each weekday starting with sunday, e.g. [0,1,1,0,0,1,0] for our example - */ -long* parse_weekdays(char* wd_str) -{ - long* weekdays = (long*)malloc(7*sizeof(long)); - weekdays[0] = weekdays[1] = weekdays[2] = weekdays[3] = weekdays[4] = weekdays[5] = weekdays[6] = 0; - - char** days = split_on_separators(wd_str, ",", 1, -1, 0); - int day_index; - int found = 0; - for(day_index=0; days[day_index] != NULL; day_index++) - { - char day[4]; - trim_flanking_whitespace(days[day_index]); - memcpy(day, days[day_index], 3); - free(days[day_index]); - day[3] = '\0'; - to_lowercase(day); - if(strcmp(day, "sun") == 0) - { - weekdays[0] = 1; - found = 1; - } - else if(strcmp(day, "mon") ==0) - { - weekdays[1] = 1; - found = 1; - } - else if(strcmp(day, "tue") ==0) - { - weekdays[2] = 1; - found = 1; - } - else if(strcmp(day, "wed") ==0) - { - weekdays[3] = 1; - found = 1; - } - else if(strcmp(day, "thu") ==0) - { - weekdays[4] = 1; - found = 1; - } - else if(strcmp(day, "fri") ==0) - { - weekdays[5] = 1; - found = 1; - } - else if(strcmp(day, "sat") ==0) - { - weekdays[6] = 1; - found = 1; - } - else if(strcmp(day, "all") ==0) - { - weekdays[0] = weekdays[1] = weekdays[2] = weekdays[3] = weekdays[4] = weekdays[5] = weekdays[6] = 1; - found = 1; - } - } - free(days); - if(found == 0) - { - free(weekdays); - weekdays = NULL; - } - return weekdays; -} - - -/* is_weekly_range indicates whether we're parsing hours within a single day or a range over a whole week */ -long* parse_time_ranges(char* time_ranges, unsigned char is_weekly_range) -{ - char** pieces = split_on_separators(time_ranges, ",", 1, -1, 0); - int num_pieces = 0; - for(num_pieces = 0; pieces[num_pieces] != NULL; num_pieces++) {}; - long *parsed = (long*)malloc( (1+(num_pieces*2)) * sizeof(long)); - - - - int piece_index = 0; - for(piece_index = 0; pieces[piece_index] != NULL; piece_index++) - { - trim_flanking_whitespace(pieces[piece_index]); - char** times=split_on_separators(pieces[piece_index], "-", 1, 2, 0); - int time_count = 0; - for(time_count = 0; times[time_count] != 0 ; time_count++){} - if( time_count == 2 ) - { - unsigned long start = parse_time(trim_flanking_whitespace(times[0])); - unsigned long end = parse_time(trim_flanking_whitespace(times[1])); - parsed[ piece_index*2 ] = (long)start; - parsed[ (piece_index*2)+1 ] = (long)end; - - free( times[1] ); - } - if( time_count > 0) { free(times[0]); } - - free(times); - free(pieces[piece_index]); - } - free(pieces); - parsed[ (num_pieces*2) ] = -1; // terminated with -1 - - - // make sure there is no overlap -- this will invalidate ranges - int range_index = 0; - char overlap_found = 0; - for(range_index = 0; range_index < num_pieces; range_index++) - { - // now test for overlap - long start1 = parsed[ (range_index*2) ]; - long end1 = parsed[ (range_index*2)+1 ]; - end1= end1 < start1 ? end1 + (is_weekly_range ? 7*24*60*60 : 24*60*60) : end1; - - int range_index2 = 0; - for(range_index2 = 0; range_index2 < num_pieces; range_index2++) - { - if(range_index2 != range_index) - { - long start2 = parsed[ (range_index2*2) ]; - long end2 = parsed[ (range_index2*2)+1 ]; - end2= end2 < start2 ? end2 + (is_weekly_range ? 7*24*60*60 : 24*60*60) : end2; - overlap_found = overlap_found || (start1 < end2 && end1 > start2 ); - } - } - } - - if(!overlap_found) - { - // sort ranges - int sorted_index = 0; - while(parsed[sorted_index] != -1) - { - int next_start=-1; - int next_start_index=-1; - int test_index; - long tmp1; - long tmp2; - for(test_index=sorted_index; parsed[test_index] != -1; test_index=test_index+2) - { - next_start_index = next_start < 0 || next_start > parsed[test_index] ? test_index : next_start_index; - next_start = next_start < 0 || next_start > parsed[test_index] ? parsed[test_index] : next_start; - } - tmp1 = parsed[next_start_index]; - tmp2 = parsed[next_start_index+1]; - parsed[next_start_index] = parsed[sorted_index]; - parsed[next_start_index+1] = parsed[sorted_index+1]; - parsed[sorted_index] = tmp1; - parsed[sorted_index+1] = tmp2; - sorted_index = sorted_index + 2; - } - } - else - { - // de-allocate parsed, set to NULL - free(parsed); - parsed = NULL; - } - - // merge time ranges where end of first = start of second - merge_adjacent_time_ranges(parsed, is_weekly_range); - - - // if always active, free & return NULL - int max_multiple = is_weekly_range ? 7 : 1; - if(parsed[0] == 0 && parsed[1] == max_multiple*24*60*60) - { - free(parsed); - parsed = NULL; - } - - - //adjust so any range that crosses end of range is split in two - int num_range_indices=0; - for(num_range_indices=0; parsed[num_range_indices] != -1; num_range_indices++){} - - long* adjusted_range = (long*)malloc((3+num_range_indices)*sizeof(long)); - int ar_index = 0; - int old_index = 0; - if(parsed[num_range_indices-1] < parsed[0]) - { - adjusted_range[0] = 0; - adjusted_range[1] = parsed[num_range_indices-1]; - ar_index = ar_index + 2; - parsed[num_range_indices-1] = -1; - } - for(old_index=0; parsed[old_index] != -1; old_index++) - { - adjusted_range[ar_index] = parsed[old_index]; - ar_index++; - } - - if(ar_index % 2 == 1 ) - { - adjusted_range[ar_index] = is_weekly_range ? 7*24*60*60 : 24*60*60; - ar_index++; - } - adjusted_range[ar_index] = -1; - free(parsed); - - return adjusted_range; -} - - - -void merge_adjacent_time_ranges(long* time_ranges, unsigned char is_weekly_range) -{ - int range_length = 0; - while(time_ranges[range_length] != -1){ range_length++; } - int* merged_indices = (int*)malloc((range_length+1)*sizeof(int)); - - int merged_index=0; - int next_index; - for(next_index=0; time_ranges[next_index] != -1; next_index++) - { - if(next_index == 0) - { - merged_indices[merged_index] = next_index; - merged_index++; - } - else if( time_ranges[next_index+1] == -1 ) - { - merged_indices[merged_index] = next_index; - merged_index++; - } - else if( time_ranges[next_index] != time_ranges[next_index-1] && time_ranges[next_index] != time_ranges[next_index+1] ) - { - merged_indices[merged_index] = next_index; - merged_index++; - } - } - merged_indices[merged_index] = -1; - - for(next_index=0; merged_indices[next_index] != -1; next_index++) - { - time_ranges[next_index] = time_ranges[ merged_indices[next_index] ]; - } - time_ranges[next_index] = -1; - free(merged_indices); - -} - - - - -/* - * assumes 24hr time, not am/pm, in format: - * (Day of week) hours:minutes:seconds - * if day of week is present, returns seconds since midnight on Sunday - * otherwise, seconds since midnight - */ -unsigned long parse_time(char* time_str) -{ - while((*time_str == ' ' || *time_str == '\t') && *time_str != '\0') { time_str++; } - - int weekday = -1; - if(strlen(time_str) > 3) - { - char wday_test[4]; - memcpy(wday_test, time_str, 3); - wday_test[3] = '\0'; - to_lowercase(wday_test); - if(strcmp(wday_test, "sun") == 0) - { - weekday = 0; - } - else if(strcmp(wday_test, "mon") == 0) - { - weekday = 1; - } - else if(strcmp(wday_test, "tue") == 0) - { - weekday = 2; - } - else if(strcmp(wday_test, "wed") == 0) - { - weekday = 3; - } - else if(strcmp(wday_test, "thu") == 0) - { - weekday = 4; - } - else if(strcmp(wday_test, "fri") == 0) - { - weekday = 5; - } - else if(strcmp(wday_test, "sat") == 0) - { - weekday = 6; - } - } - - if(weekday >= 0) - { - time_str = time_str + 3; - while( (*time_str < 48 || *time_str > 57) && *time_str != '\0') { time_str++; } - } - - char** time_parts=split_on_separators(time_str, ":", 1, -1, 0); - unsigned long seconds = weekday < 0 ? 0 : ( ((unsigned long)(weekday))*60*60*24 ); - unsigned long tmp; - unsigned long multiple = 60*60; - - int tp_index = 0; - for(tp_index=0; time_parts[tp_index] != NULL; tp_index++) - { - sscanf(time_parts[tp_index], "%ld", &tmp); - seconds = seconds + (tmp*multiple); - multiple = (unsigned long)(multiple/60); - free(time_parts[tp_index]); - } - free(time_parts); - - return seconds; -} - -void to_lowercase(char* str) -{ - int i; - for(i = 0; str[i] != '\0'; i++) - { - str[i] = tolower(str[i]); - } -} - -/* - * line_str is the line to be parsed -- it is not modified in any way - * max_pieces indicates number of pieces to return, if negative this is determined dynamically - * include_remainder_at_max indicates whether the last piece, when max pieces are reached, - * should be what it would normally be (0) or the entire remainder of the line (1) - * if max_pieces < 0 this parameter is ignored - * - * - * returns all non-separator pieces in a line - * result is dynamically allocated, MUST be freed after call-- even if - * line is empty (you still get a valid char** pointer to to a NULL char*) - */ -char** split_on_separators(char* line_str, char* separators, int num_separators, int max_pieces, int include_remainder_at_max) -{ - char** split; - - if(line_str != NULL) - { - int split_index; - int non_separator_found; - char* dup_line; - char* start; - - if(max_pieces < 0) - { - /* count number of separator characters in line -- this count + 1 is an upperbound on number of pieces */ - int separator_count = 0; - int line_index; - for(line_index = 0; line_str[line_index] != '\0'; line_index++) - { - int sep_index; - int found = 0; - for(sep_index =0; found == 0 && sep_index < num_separators; sep_index++) - { - found = separators[sep_index] == line_str[line_index] ? 1 : 0; - } - separator_count = separator_count+ found; - } - max_pieces = separator_count + 1; - } - split = (char**)malloc((1+max_pieces)*sizeof(char*)); - split_index = 0; - split[split_index] = NULL; - - - dup_line = strdup(line_str); - start = dup_line; - non_separator_found = 0; - while(non_separator_found == 0) - { - int matches = 0; - int sep_index; - for(sep_index =0; sep_index < num_separators; sep_index++) - { - matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; - } - non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; - if(non_separator_found == 0) - { - start++; - } - } - - while(start[0] != '\0' && split_index < max_pieces) - { - /* find first separator index */ - int first_separator_index = 0; - int separator_found = 0; - while( separator_found == 0 ) - { - int sep_index; - for(sep_index =0; separator_found == 0 && sep_index < num_separators; sep_index++) - { - separator_found = separators[sep_index] == start[first_separator_index] || start[first_separator_index] == '\0' ? 1 : 0; - } - if(separator_found == 0) - { - first_separator_index++; - } - } - - /* copy next piece to split array */ - if(first_separator_index > 0) - { - char* next_piece = NULL; - if(split_index +1 < max_pieces || include_remainder_at_max <= 0) - { - next_piece = (char*)malloc((first_separator_index+1)*sizeof(char)); - memcpy(next_piece, start, first_separator_index); - next_piece[first_separator_index] = '\0'; - } - else - { - next_piece = strdup(start); - } - split[split_index] = next_piece; - split[split_index+1] = NULL; - split_index++; - } - - - /* find next non-separator index, indicating start of next piece */ - start = start+ first_separator_index; - non_separator_found = 0; - while(non_separator_found == 0) - { - int matches = 0; - int sep_index; - for(sep_index =0; sep_index < num_separators; sep_index++) - { - matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; - } - non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; - if(non_separator_found == 0) - { - start++; - } - } - } - free(dup_line); - } - else - { - split = (char**)malloc((1)*sizeof(char*)); - split[0] = NULL; - } - return split; -} - - -char* trim_flanking_whitespace(char* str) -{ - int new_start = 0; - int new_length = 0; - - char whitespace[5] = { ' ', '\t', '\n', '\r', '\0' }; - int num_whitespace_chars = 4; - - - int str_index = 0; - int is_whitespace = 1; - int test; - while( (test = str[str_index]) != '\0' && is_whitespace == 1) - { - int whitespace_index; - is_whitespace = 0; - for(whitespace_index = 0; whitespace_index < num_whitespace_chars && is_whitespace == 0; whitespace_index++) - { - is_whitespace = test == whitespace[whitespace_index] ? 1 : 0; - } - str_index = is_whitespace == 1 ? str_index+1 : str_index; - } - new_start = str_index; - - - str_index = strlen(str) - 1; - is_whitespace = 1; - while( str_index >= new_start && is_whitespace == 1) - { - int whitespace_index; - is_whitespace = 0; - for(whitespace_index = 0; whitespace_index < num_whitespace_chars && is_whitespace == 0; whitespace_index++) - { - is_whitespace = str[str_index] == whitespace[whitespace_index] ? 1 : 0; - } - str_index = is_whitespace == 1 ? str_index-1 : str_index; - } - new_length = str[new_start] == '\0' ? 0 : str_index + 1 - new_start; - - - if(new_start > 0) - { - for(str_index = 0; str_index < new_length; str_index++) - { - str[str_index] = str[str_index+new_start]; - } - } - str[new_length] = 0; - return str; -} - -void set_kernel_timezone(void) -{ - time_t now; - struct tm* utc_info; - struct tm* tz_info; - int utc_day; - int utc_hour; - int utc_minute; - int tz_day; - int tz_hour; - int tz_minute; - int minuteswest; - - struct timeval tv; - struct timezone old_tz; - struct timezone new_tz; - - time(&now); - utc_info = gmtime(&now); - utc_day = utc_info->tm_mday; - utc_hour = utc_info->tm_hour; - utc_minute = utc_info->tm_min; - tz_info = localtime(&now); - tz_day = tz_info->tm_mday; - tz_hour = tz_info->tm_hour; - tz_minute = tz_info->tm_min; - - utc_day = utc_day < tz_day - 1 ? tz_day + 1 : utc_day; - tz_day = tz_day < utc_day - 1 ? utc_day + 1 : tz_day; - - minuteswest = (24*60*utc_day + 60*utc_hour + utc_minute) - (24*60*tz_day + 60*tz_hour + tz_minute) ; - new_tz.tz_minuteswest = minuteswest; - new_tz.tz_dsttime = 0; - - /* Get tv to pass to settimeofday(2) to be sure we avoid hour-sized warp */ - /* (see gettimeofday(2) man page, or /usr/src/linux/kernel/time.c) */ - gettimeofday(&tv, &old_tz); - - /* set timezone */ - settimeofday(&tv, &new_tz); - -} diff --git a/package/network/utils/iptables/modules/extensions/libipt_webmon.c b/package/network/utils/iptables/modules/extensions/libipt_webmon.c deleted file mode 100644 index d636246004..0000000000 --- a/package/network/utils/iptables/modules/extensions/libipt_webmon.c +++ /dev/null @@ -1,700 +0,0 @@ -/* webmon -- An iptables extension to match URLs in HTTP requests - * This module can match using string match or regular expressions - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2008-2011 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include -#include -#include -#include -#include - -#include - -/* - * in iptables 1.4.0 and higher, iptables.h includes xtables.h, which - * we can use to check whether we need to deal with the new requirements - * in pre-processor directives below - */ -#include -#include - -#ifdef _XTABLES_H - #define iptables_rule_match xtables_rule_match - #define iptables_match xtables_match - #define iptables_target xtables_target - #define ipt_tryload xt_tryload -#endif - -/* - * XTABLES_VERSION_CODE is only defined in versions 1.4.1 and later, which - * also require the use of xtables_register_match - * - * Version 1.4.0 uses register_match like previous versions - */ -#ifdef XTABLES_VERSION_CODE - #define register_match xtables_register_match -#endif - - -#define STRIP "%d.%d.%d.%d" -#define NIPQUAD(addr) \ - ((unsigned char *)&addr)[0], \ - ((unsigned char *)&addr)[1], \ - ((unsigned char *)&addr)[2], \ - ((unsigned char *)&addr)[3] - - - -/* utility functions necessary for module to work across multiple iptables versions */ -static void param_problem_exit_error(char* msg); - - -void parse_ips_and_ranges(char* addr_str, struct ipt_webmon_info *info); - -char** split_on_separators(char* line, char* separators, int num_separators, int max_pieces, int include_remainder_at_max); -char* trim_flanking_whitespace(char* str); -unsigned char* read_entire_file(FILE* in, unsigned long read_block_size, unsigned long *length); - -#define DEFAULT_MAX 300 - -#define SEARCH_LOAD_FILE 100 -#define DOMAIN_LOAD_FILE 101 -#define CLEAR_SEARCH 102 -#define CLEAR_DOMAIN 103 - -static char* domain_load_file = NULL; -static char* search_load_file = NULL; -static uint32_t global_max_domains = DEFAULT_MAX; -static uint32_t global_max_searches = DEFAULT_MAX; - -/* Function which prints out usage message. */ -static void help(void) -{ - printf( "webmon options:\n"); -} - -static struct option opts[] = -{ - { .name = "exclude_ips", .has_arg = 1, .flag = 0, .val = WEBMON_EXCLUDE }, - { .name = "include_ips", .has_arg = 1, .flag = 0, .val = WEBMON_INCLUDE }, - { .name = "max_domains", .has_arg = 1, .flag = 0, .val = WEBMON_MAXDOMAIN }, - { .name = "max_searches", .has_arg = 1, .flag = 0, .val = WEBMON_MAXSEARCH }, - { .name = "search_load_file", .has_arg = 1, .flag = 0, .val = SEARCH_LOAD_FILE }, - { .name = "domain_load_file", .has_arg = 1, .flag = 0, .val = DOMAIN_LOAD_FILE }, - { .name = "clear_search", .has_arg = 0, .flag = 0, .val = CLEAR_SEARCH }, - { .name = "clear_domain", .has_arg = 0, .flag = 0, .val = CLEAR_DOMAIN }, - - { .name = 0 } -}; - -static void webmon_init( -#ifdef _XTABLES_H - struct xt_entry_match *match -#else - struct ipt_entry_match *match, unsigned int *nfcache -#endif - ) -{ - struct ipt_webmon_info *info = (struct ipt_webmon_info *)match->data; - info->max_domains=DEFAULT_MAX; - info->max_searches=DEFAULT_MAX; - info->num_exclude_ips=0; - info->num_exclude_ranges=0; - info->exclude_type = WEBMON_EXCLUDE; - info->ref_count = NULL; -} - - -/* Function which parses command options; returns true if it ate an option */ -static int parse( int c, - char **argv, - int invert, - unsigned int *flags, -#ifdef _XTABLES_H - const void *entry, -#else - const struct ipt_entry *entry, - unsigned int *nfcache, -#endif - struct ipt_entry_match **match - ) -{ - struct ipt_webmon_info *info = (struct ipt_webmon_info *)(*match)->data; - int valid_arg = 1; - long max; - switch (c) - { - case WEBMON_EXCLUDE: - parse_ips_and_ranges(optarg, info); - info->exclude_type = WEBMON_EXCLUDE; - break; - case WEBMON_INCLUDE: - parse_ips_and_ranges(optarg, info); - info->exclude_type = WEBMON_INCLUDE; - break; - case WEBMON_MAXSEARCH: - if( sscanf(argv[optind-1], "%ld", &max) == 0) - { - info->max_searches = DEFAULT_MAX ; - valid_arg = 0; - } - else - { - info->max_searches = (uint32_t)max; - global_max_searches = info->max_searches; - } - break; - case WEBMON_MAXDOMAIN: - if( sscanf(argv[optind-1], "%ld", &max) == 0) - { - info->max_domains = DEFAULT_MAX ; - valid_arg = 0; - } - else - { - info->max_domains = (uint32_t)max; - global_max_domains = info->max_domains; - } - break; - case SEARCH_LOAD_FILE: - search_load_file = strdup(optarg); - break; - case DOMAIN_LOAD_FILE: - domain_load_file = strdup(optarg); - break; - case CLEAR_SEARCH: - search_load_file = strdup("/dev/null"); - break; - case CLEAR_DOMAIN: - domain_load_file = strdup("/dev/null"); - break; - default: - valid_arg = 0; - } - return valid_arg; - -} - - - -static void print_webmon_args( struct ipt_webmon_info* info ) -{ - printf("--max_domains %ld ", (unsigned long int)info->max_domains); - printf("--max_searches %ld ", (unsigned long int)info->max_searches); - if(info->num_exclude_ips > 0 || info->num_exclude_ranges > 0) - { - int ip_index = 0; - char comma[3] = ""; - printf("--%s ", (info->exclude_type == WEBMON_EXCLUDE ? "exclude_ips" : "include_ips")); - for(ip_index=0; ip_index < info->num_exclude_ips; ip_index++) - { - printf("%s"STRIP, comma, NIPQUAD((info->exclude_ips)[ip_index]) ); - sprintf(comma, ","); - } - for(ip_index=0; ip_index < info->num_exclude_ranges; ip_index++) - { - struct ipt_webmon_ip_range r = (info->exclude_ranges)[ip_index]; - printf("%s"STRIP"-"STRIP, comma, NIPQUAD(r.start), NIPQUAD(r.end) ); - sprintf(comma, ","); - } - printf(" "); - } -} - - -static void do_load(char* file, uint32_t max, unsigned char type) -{ - if(file != NULL) - { - unsigned char* data = NULL; - unsigned long data_length = 0; - char* file_data = NULL; - if(strcmp(file, "/dev/null") != 0) - { - FILE* in = fopen(file, "r"); - if(in != NULL) - { - file_data = (char*)read_entire_file(in, 4096, &data_length); - fclose(in); - } - } - if(file_data == NULL) - { - file_data=strdup(""); - } - - if(file_data != NULL) - { - data_length = strlen(file_data) + sizeof(uint32_t)+2; - data = (unsigned char*)malloc(data_length); - if(data != NULL) - { - int sockfd = -1; - uint32_t* maxp = (uint32_t*)(data+1); - data[0] = type; - *maxp = max; - sprintf( (data+1+sizeof(uint32_t)), "%s", file_data); - - sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); - if(sockfd >= 0) - { - setsockopt(sockfd, IPPROTO_IP, WEBMON_SET, data, data_length); - close(sockfd); - } - free(data); - } - free(file_data); - } - } - -} - - -static void final_check(unsigned int flags) -{ - do_load(domain_load_file, global_max_domains, WEBMON_DOMAIN); - do_load(search_load_file, global_max_searches, WEBMON_SEARCH); -} - -/* Prints out the matchinfo. */ -#ifdef _XTABLES_H -static void print(const void *ip, const struct xt_entry_match *match, int numeric) -#else -static void print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric) -#endif -{ - printf("WEBMON "); - struct ipt_webmon_info *info = (struct ipt_webmon_info *)match->data; - - print_webmon_args(info); -} - -/* Saves the union ipt_matchinfo in parsable form to stdout. */ -#ifdef _XTABLES_H -static void save(const void *ip, const struct xt_entry_match *match) -#else -static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match) -#endif -{ - struct ipt_webmon_info *info = (struct ipt_webmon_info *)match->data; - print_webmon_args(info); -} - -static struct iptables_match webmon = -{ - .next = NULL, - .name = "webmon", - #ifdef XTABLES_VERSION_CODE - .version = XTABLES_VERSION, - #else - .version = IPTABLES_VERSION, - #endif - .size = XT_ALIGN(sizeof(struct ipt_webmon_info)), - .userspacesize = XT_ALIGN(sizeof(struct ipt_webmon_info)), - .help = &help, - .init = &webmon_init, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_match(&webmon); -} - - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - - - - - - - -static void param_problem_exit_error(char* msg) -{ - #ifdef xtables_error - xtables_error(PARAMETER_PROBLEM, "%s", msg); - #else - exit_error(PARAMETER_PROBLEM, msg); - #endif -} - - -void parse_ips_and_ranges(char* addr_str, struct ipt_webmon_info *info) -{ - char** addr_parts = split_on_separators(addr_str, ",", 1, -1, 0); - - info->num_exclude_ips=0; - info->num_exclude_ranges = 0; - - int ip_part_index; - for(ip_part_index=0; addr_parts[ip_part_index] != NULL; ip_part_index++) - { - char* next_str = addr_parts[ip_part_index]; - if(strchr(next_str, '-') != NULL) - { - char** range_parts = split_on_separators(next_str, "-", 1, 2, 1); - char* start = trim_flanking_whitespace(range_parts[0]); - char* end = trim_flanking_whitespace(range_parts[1]); - int start_ip[4]; - int end_ip[4]; - int start_valid = sscanf(start, "%d.%d.%d.%d", start_ip, start_ip+1, start_ip+2, start_ip+3); - int end_valid = sscanf(end, "%d.%d.%d.%d", end_ip, end_ip+1, end_ip+2, end_ip+3); - - if(start_valid == 4 && end_valid == 4) - { - struct ipt_webmon_ip_range r; - struct in_addr sip, eip; - inet_pton(AF_INET, start, &sip); - inet_pton(AF_INET, end, &eip); - r.start = (uint32_t)sip.s_addr; - r.end = (uint32_t)eip.s_addr; - - if(info->num_exclude_ranges < WEBMON_MAX_IP_RANGES && (unsigned long)ntohl(r.start) < (unsigned long)ntohl(r.end) ) - { - (info->exclude_ranges)[ info->num_exclude_ranges ] = r; - info->num_exclude_ranges = info->num_exclude_ranges + 1; - } - } - - free(start); - free(end); - free(range_parts); - } - else if(strchr(next_str, '/') != NULL) - { - char** range_parts = split_on_separators(next_str, "/", 1, 2, 1); - char* start = trim_flanking_whitespace(range_parts[0]); - char* end = trim_flanking_whitespace(range_parts[1]); - int base_ip[4]; - int base_valid = sscanf(start, "%d.%d.%d.%d", base_ip, base_ip+1, base_ip+2, base_ip+3); - if(base_valid == 4) - { - int mask_valid = 0; - uint32_t mask; - if(strchr(end, '.') != NULL) - { - uint32_t mask_ip[4]; - int mask_test = sscanf(end, "%d.%d.%d.%d", mask_ip, mask_ip+1, mask_ip+2, mask_ip+3); - if(mask_test == 4) - { - struct in_addr mask_add; - inet_pton(AF_INET, end, &mask_add); - mask = (uint32_t)mask_add.s_addr; - mask_valid = 1; - } - } - else - { - int mask_bits; - if( sscanf(end, "%d", &mask_bits) > 0) - { - if(mask_bits >=0 && mask_bits <= 32) - { - uint32_t byte = 0; - mask = 0; - for(byte=0; byte < 4; byte++) - { - unsigned char byte_bits = mask_bits > 8 ? 8 : mask_bits; - uint32_t byte_mask = 0; - mask_bits = mask_bits - byte_bits; - - while(byte_bits > 0) - { - byte_mask = byte_mask | (256 >> byte_bits); - byte_bits--; - } - mask = mask | ((uint32_t)byte_mask << (byte*8)); - printf("mask = "STRIP"\n", NIPQUAD(mask)); - } - mask_valid = 1; - } - } - } - if(mask_valid) - { - struct ipt_webmon_ip_range r; - struct in_addr bip; - inet_pton(AF_INET, start, &bip); - r.start = ( ((uint32_t)bip.s_addr) & mask ); - r.end = ( ((uint32_t)bip.s_addr) | (~mask) ); - if(info->num_exclude_ranges < WEBMON_MAX_IP_RANGES && ntohl(r.start) <= ntohl(r.end) ) - { - (info->exclude_ranges)[ info->num_exclude_ranges ] = r; - info->num_exclude_ranges = info->num_exclude_ranges + 1; - } - } - } - free(start); - free(end); - free(range_parts); - } - else - { - int parsed_ip[4]; - int valid = sscanf(next_str, "%d.%d.%d.%d", parsed_ip, parsed_ip+1, parsed_ip+2, parsed_ip+3); - if(valid == 4) - { - struct in_addr ip; - trim_flanking_whitespace(next_str); - inet_pton(AF_INET, next_str, &ip); - - if(info->num_exclude_ranges < WEBMON_MAX_IPS) - { - (info->exclude_ips)[ info->num_exclude_ips ] = (uint32_t)ip.s_addr; - info->num_exclude_ips = info->num_exclude_ips + 1; - } - } - } - free(next_str); - } - free(addr_parts); - -} - - - -/* - * line_str is the line to be parsed -- it is not modified in any way - * max_pieces indicates number of pieces to return, if negative this is determined dynamically - * include_remainder_at_max indicates whether the last piece, when max pieces are reached, - * should be what it would normally be (0) or the entire remainder of the line (1) - * if max_pieces < 0 this parameter is ignored - * - * - * returns all non-separator pieces in a line - * result is dynamically allocated, MUST be freed after call-- even if - * line is empty (you still get a valid char** pointer to to a NULL char*) - */ -char** split_on_separators(char* line_str, char* separators, int num_separators, int max_pieces, int include_remainder_at_max) -{ - char** split; - - if(line_str != NULL) - { - int split_index; - int non_separator_found; - char* dup_line; - char* start; - - if(max_pieces < 0) - { - /* count number of separator characters in line -- this count + 1 is an upperbound on number of pieces */ - int separator_count = 0; - int line_index; - for(line_index = 0; line_str[line_index] != '\0'; line_index++) - { - int sep_index; - int found = 0; - for(sep_index =0; found == 0 && sep_index < num_separators; sep_index++) - { - found = separators[sep_index] == line_str[line_index] ? 1 : 0; - } - separator_count = separator_count+ found; - } - max_pieces = separator_count + 1; - } - split = (char**)malloc((1+max_pieces)*sizeof(char*)); - split_index = 0; - split[split_index] = NULL; - - - dup_line = strdup(line_str); - start = dup_line; - non_separator_found = 0; - while(non_separator_found == 0) - { - int matches = 0; - int sep_index; - for(sep_index =0; sep_index < num_separators; sep_index++) - { - matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; - } - non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; - if(non_separator_found == 0) - { - start++; - } - } - - while(start[0] != '\0' && split_index < max_pieces) - { - /* find first separator index */ - int first_separator_index = 0; - int separator_found = 0; - while( separator_found == 0 ) - { - int sep_index; - for(sep_index =0; separator_found == 0 && sep_index < num_separators; sep_index++) - { - separator_found = separators[sep_index] == start[first_separator_index] || start[first_separator_index] == '\0' ? 1 : 0; - } - if(separator_found == 0) - { - first_separator_index++; - } - } - - /* copy next piece to split array */ - if(first_separator_index > 0) - { - char* next_piece = NULL; - if(split_index +1 < max_pieces || include_remainder_at_max <= 0) - { - next_piece = (char*)malloc((first_separator_index+1)*sizeof(char)); - memcpy(next_piece, start, first_separator_index); - next_piece[first_separator_index] = '\0'; - } - else - { - next_piece = strdup(start); - } - split[split_index] = next_piece; - split[split_index+1] = NULL; - split_index++; - } - - - /* find next non-separator index, indicating start of next piece */ - start = start+ first_separator_index; - non_separator_found = 0; - while(non_separator_found == 0) - { - int matches = 0; - int sep_index; - for(sep_index =0; sep_index < num_separators; sep_index++) - { - matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; - } - non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; - if(non_separator_found == 0) - { - start++; - } - } - } - free(dup_line); - } - else - { - split = (char**)malloc((1)*sizeof(char*)); - split[0] = NULL; - } - return split; -} - - - -char* trim_flanking_whitespace(char* str) -{ - int new_start = 0; - int new_length = 0; - - char whitespace[5] = { ' ', '\t', '\n', '\r', '\0' }; - int num_whitespace_chars = 4; - - - int str_index = 0; - int is_whitespace = 1; - int test; - while( (test = str[str_index]) != '\0' && is_whitespace == 1) - { - int whitespace_index; - is_whitespace = 0; - for(whitespace_index = 0; whitespace_index < num_whitespace_chars && is_whitespace == 0; whitespace_index++) - { - is_whitespace = test == whitespace[whitespace_index] ? 1 : 0; - } - str_index = is_whitespace == 1 ? str_index+1 : str_index; - } - new_start = str_index; - - - str_index = strlen(str) - 1; - is_whitespace = 1; - while( str_index >= new_start && is_whitespace == 1) - { - int whitespace_index; - is_whitespace = 0; - for(whitespace_index = 0; whitespace_index < num_whitespace_chars && is_whitespace == 0; whitespace_index++) - { - is_whitespace = str[str_index] == whitespace[whitespace_index] ? 1 : 0; - } - str_index = is_whitespace == 1 ? str_index-1 : str_index; - } - new_length = str[new_start] == '\0' ? 0 : str_index + 1 - new_start; - - - if(new_start > 0) - { - for(str_index = 0; str_index < new_length; str_index++) - { - str[str_index] = str[str_index+new_start]; - } - } - str[new_length] = 0; - return str; -} - - -unsigned char* read_entire_file(FILE* in, unsigned long read_block_size, unsigned long *length) -{ - int max_read_size = read_block_size; - unsigned char* read_string = (unsigned char*)malloc(max_read_size+1); - unsigned long bytes_read = 0; - int end_found = 0; - while(end_found == 0) - { - int nextch = '?'; - while(nextch != EOF && bytes_read < max_read_size) - { - nextch = fgetc(in); - if(nextch != EOF) - { - read_string[bytes_read] = (unsigned char)nextch; - bytes_read++; - } - } - read_string[bytes_read] = '\0'; - end_found = (nextch == EOF) ? 1 : 0; - if(end_found == 0) - { - unsigned char *new_str; - max_read_size = max_read_size + read_block_size; - new_str = (unsigned char*)malloc(max_read_size+1); - memcpy(new_str, read_string, bytes_read); - free(read_string); - read_string = new_str; - } - } - *length = bytes_read; - return read_string; -} - diff --git a/package/network/utils/iptables/modules/extensions/libipt_weburl.c b/package/network/utils/iptables/modules/extensions/libipt_weburl.c deleted file mode 100644 index be283a7216..0000000000 --- a/package/network/utils/iptables/modules/extensions/libipt_weburl.c +++ /dev/null @@ -1,290 +0,0 @@ -/* weburl -- An iptables extension to match URLs in HTTP requests - * This module can match using string match or regular expressions - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2008-2010 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -#include -#include -#include -#include -#include - - -/* - * in iptables 1.4.0 and higher, iptables.h includes xtables.h, which - * we can use to check whether we need to deal with the new requirements - * in pre-processor directives below - */ -#include -#include - -#ifdef _XTABLES_H - #define iptables_rule_match xtables_rule_match - #define iptables_match xtables_match - #define iptables_target xtables_target - #define ipt_tryload xt_tryload -#endif - -/* - * XTABLES_VERSION_CODE is only defined in versions 1.4.1 and later, which - * also require the use of xtables_register_match - * - * Version 1.4.0 uses register_match like previous versions - */ -#ifdef XTABLES_VERSION_CODE - #define register_match xtables_register_match -#endif - - -/* utility functions necessary for module to work across multiple iptables versions */ -static int my_check_inverse(const char option[], int* invert, int *my_optind, int argc); -static void param_problem_exit_error(char* msg); - - - -/* Function which prints out usage message. */ -static void help(void) -{ - printf( "weburl options:\n --contains [!] [STRING]\n --contains_regex [!] [REGEX]\n --matches_exactly [!] [STRING]\n --domain_only\n --path_only\n"); -} - -static struct option opts[] = -{ - { .name = "contains", .has_arg = 1, .flag = 0, .val = WEBURL_CONTAINS_TYPE }, //string - { .name = "contains_regex", .has_arg = 1, .flag = 0, .val = WEBURL_REGEX_TYPE }, //regex - { .name = "matches_exactly", .has_arg = 1, .flag = 0, .val = WEBURL_EXACT_TYPE }, //exact string match - { .name = "domain_only", .has_arg = 0, .flag = 0, .val = WEBURL_DOMAIN_PART }, //only match domain portion of url - { .name = "path_only", .has_arg = 0, .flag = 0, .val = WEBURL_PATH_PART }, //only match path portion of url - { .name = 0 } -}; - - -/* Function which parses command options; returns true if it - ate an option */ -static int parse( int c, - char **argv, - int invert, - unsigned int *flags, -#ifdef _XTABLES_H - const void *entry, -#else - const struct ipt_entry *entry, - unsigned int *nfcache, -#endif - struct ipt_entry_match **match - ) -{ - struct ipt_weburl_info *info = (struct ipt_weburl_info *)(*match)->data; - int valid_arg = 0; - - if(*flags < 10) - { - info->match_part = WEBURL_ALL_PART; - } - - switch (c) - { - case WEBURL_CONTAINS_TYPE: - case WEBURL_REGEX_TYPE: - case WEBURL_EXACT_TYPE: - info->match_type = c; - - //test whether to invert rule - my_check_inverse(optarg, &invert, &optind, 0); - info->invert = invert ? 1 : 0; - - //test that test string is reasonable length, then to info - int testlen = strlen(argv[optind-1]); - if(testlen > 0 && testlen < MAX_TEST_STR) - { - strcpy(info->test_str, argv[optind-1]); - } - else if(testlen >= MAX_TEST_STR) - { - char err[100]; - sprintf(err, "Parameter definition is too long, must be less than %d characters", MAX_TEST_STR); - param_problem_exit_error(err); - } - else - { - param_problem_exit_error("Parameter definition is incomplete"); - } - - if(*flags % 10 == 1) - { - param_problem_exit_error("You may only specify one string/pattern to match"); - } - *flags = *flags + 1; - - valid_arg = 1; - break; - - case WEBURL_DOMAIN_PART: - case WEBURL_PATH_PART: - info->match_part = c; - if(*flags >= 10) - { - param_problem_exit_error("You may specify at most one part of the url to match:\n\t--domain_only, --path_only or neither (to match full url)\n"); - } - *flags = *flags+10; - - valid_arg = 1; - break; - } - - return valid_arg; -} - - - -static void print_weburl_args( struct ipt_weburl_info* info ) -{ - //invert - if(info->invert > 0) - { - printf("! "); - } - //match type - switch (info->match_type) - { - case WEBURL_CONTAINS_TYPE: - printf("--contains "); - break; - case WEBURL_REGEX_TYPE: - printf("--contains_regex "); - break; - case WEBURL_EXACT_TYPE: - printf("--matches_exactly "); - break; - } - //test string - printf("%s ", info->test_str); - - //match part - switch(info->match_part) - { - case WEBURL_DOMAIN_PART: - printf("--domain_only "); - break; - case WEBURL_PATH_PART: - printf("--path_only "); - break; - case WEBURL_ALL_PART: - //print nothing - break; - } - -} - -/* Final check; must have specified a test string with either --contains or --contains_regex. */ -static void final_check(unsigned int flags) -{ - if (flags %10 == 0) - { - param_problem_exit_error("You must specify '--contains' or '--contains_regex' or '--matches_exactly'"); - } -} - -/* Prints out the matchinfo. */ -#ifdef _XTABLES_H -static void print(const void *ip, const struct xt_entry_match *match, int numeric) -#else -static void print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric) -#endif -{ - printf("WEBURL "); - struct ipt_weburl_info *info = (struct ipt_weburl_info *)match->data; - - print_weburl_args(info); -} - -/* Saves the union ipt_matchinfo in parsable form to stdout. */ -#ifdef _XTABLES_H -static void save(const void *ip, const struct xt_entry_match *match) -#else -static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match) -#endif -{ - struct ipt_weburl_info *info = (struct ipt_weburl_info *)match->data; - print_weburl_args(info); -} - -static struct iptables_match weburl = -{ - .next = NULL, - .name = "weburl", - #ifdef XTABLES_VERSION_CODE - .version = XTABLES_VERSION, - #else - .version = IPTABLES_VERSION, - #endif - .size = XT_ALIGN(sizeof(struct ipt_weburl_info)), - .userspacesize = XT_ALIGN(sizeof(struct ipt_weburl_info)), - .help = &help, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_match(&weburl); -} - - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif -static int my_check_inverse(const char option[], int* invert, int *my_optind, int argc) -{ - if (option && strcmp(option, "!") == 0) - { - if (*invert) - { - param_problem_exit_error("Multiple `!' flags not allowed"); - } - *invert = TRUE; - if (my_optind != NULL) - { - ++*my_optind; - if (argc && *my_optind > argc) - { - param_problem_exit_error("no argument following `!'"); - } - } - return TRUE; - } - return FALSE; -} -static void param_problem_exit_error(char* msg) -{ - #ifdef xtables_error - xtables_error(PARAMETER_PROBLEM, "%s", msg); - #else - exit_error(PARAMETER_PROBLEM, msg); - #endif -} - - diff --git a/package/network/utils/iptables/modules/extensions/libxt_IMQ.c b/package/network/utils/iptables/modules/extensions/libxt_IMQ.c deleted file mode 100644 index 51718d95d7..0000000000 --- a/package/network/utils/iptables/modules/extensions/libxt_IMQ.c +++ /dev/null @@ -1,105 +0,0 @@ -/* Shared library add-on to iptables to add IMQ target support. */ -#include -#include -#include -#include - -#include -#include -#include - -/* Function which prints out usage message. */ -static void IMQ_help(void) -{ - printf( -"IMQ target options:\n" -" --todev enqueue to imq, defaults to 0\n"); - -} - -static struct option IMQ_opts[] = { - { "todev", 1, 0, '1' }, - { 0 } -}; - -/* Initialize the target. */ -static void IMQ_init(struct xt_entry_target *t) -{ - struct xt_imq_info *mr = (struct xt_imq_info*)t->data; - - mr->todev = 0; -} - -/* Function which parses command options; returns true if it - ate an option */ -static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, struct xt_entry_target **target) -{ - struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data; - - switch(c) { - case '1': -/* if (xtables_check_inverse(optarg, &invert, NULL, 0, argv)) - xtables_error(PARAMETER_PROBLEM, - "Unexpected `!' after --todev"); -*/ - mr->todev=atoi(optarg); - break; - - default: - return 0; - } - return 1; -} - -/* Prints out the targinfo. */ -static void IMQ_print(const void *ip, - const struct xt_entry_target *target, - int numeric) -{ - struct xt_imq_info *mr = (struct xt_imq_info*)target->data; - - printf("IMQ: todev %u ", mr->todev); -} - -/* Saves the union ipt_targinfo in parsable form to stdout. */ -static void IMQ_save(const void *ip, const struct xt_entry_target *target) -{ - struct xt_imq_info *mr = (struct xt_imq_info*)target->data; - - printf(" --todev %u", mr->todev); -} - -static struct xtables_target imq_target = { - .name = "IMQ", - .version = XTABLES_VERSION, - .family = NFPROTO_IPV4, - .size = XT_ALIGN(sizeof(struct xt_imq_info)), - .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), - .help = IMQ_help, - .init = IMQ_init, - .parse = IMQ_parse, - .print = IMQ_print, - .save = IMQ_save, - .extra_opts = IMQ_opts, -}; - -static struct xtables_target imq_target6 = { - .name = "IMQ", - .version = XTABLES_VERSION, - .family = NFPROTO_IPV6, - .size = XT_ALIGN(sizeof(struct xt_imq_info)), - .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), - .help = IMQ_help, - .init = IMQ_init, - .parse = IMQ_parse, - .print = IMQ_print, - .save = IMQ_save, - .extra_opts = IMQ_opts, -}; - -// void __attribute((constructor)) nf_ext_init(void){ -void _init(void){ - xtables_register_target(&imq_target); - xtables_register_target(&imq_target6); -} diff --git a/package/network/utils/iptables/modules/extensions/libxt_IMQ.man b/package/network/utils/iptables/modules/extensions/libxt_IMQ.man deleted file mode 100644 index 6e3e89673a..0000000000 --- a/package/network/utils/iptables/modules/extensions/libxt_IMQ.man +++ /dev/null @@ -1,15 +0,0 @@ -This target is used to redirect the traffic to the IMQ driver and you can apply -QoS rules like HTB or CBQ. -For example you can select only traffic comming from a specific interface or -is going out on a specific interface. -Also it permits to capture the traffic BEFORE NAT in the case of outgoing traffic -or AFTER NAT in the case of incomming traffic. -.TP -\fB\-\-to\-dev\fP \fIvalue\fP -Set the IMQ interface where to send this traffic -.TP -Example: -.TP -Redirect incomming traffic from interface eth0 to imq0 and outgoing traffic to imq1: -iptables \-t mangle \-A FORWARD \-i eth0 \-j IMQ \-\-to\-dev 0 -iptables \-t mangle \-A FORWARD \-o eth0 \-j IMQ \-\-to\-dev 1 diff --git a/package/network/utils/iptables/modules/include/linux/netfilter/xt_IMQ.h b/package/network/utils/iptables/modules/include/linux/netfilter/xt_IMQ.h deleted file mode 100644 index 9b072300fd..0000000000 --- a/package/network/utils/iptables/modules/include/linux/netfilter/xt_IMQ.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _XT_IMQ_H -#define _XT_IMQ_H - -struct xt_imq_info { - unsigned int todev; /* target imq device */ -}; - -#endif /* _XT_IMQ_H */ - diff --git a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_bandwidth.h b/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_bandwidth.h deleted file mode 100644 index 9a6227a9e3..0000000000 --- a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_bandwidth.h +++ /dev/null @@ -1,106 +0,0 @@ -/* bandwidth -- An iptables extension for bandwidth monitoring/control - * Can be used to efficiently monitor bandwidth and/or implement bandwidth quotas - * Can be queried using the iptbwctl userspace library - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2009 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef _IPT_BANDWIDTH_H -#define _IPT_BANDWIDTH_H - -/*flags -- first three don't map to parameters the rest do */ -#define BANDWIDTH_INITIALIZED 1 -#define BANDWIDTH_REQUIRES_SUBNET 2 -#define BANDWIDTH_SUBNET 4 -#define BANDWIDTH_CMP 8 -#define BANDWIDTH_CURRENT 16 -#define BANDWIDTH_RESET_INTERVAL 32 -#define BANDWIDTH_RESET_TIME 64 -#define BANDWIDTH_LAST_BACKUP 128 - - -/* parameter defs that don't map to flag bits */ -#define BANDWIDTH_TYPE 70 -#define BANDWIDTH_ID 71 -#define BANDWIDTH_GT 72 -#define BANDWIDTH_LT 73 -#define BANDWIDTH_MONITOR 74 -#define BANDWIDTH_CHECK 75 -#define BANDWIDTH_CHECK_NOSWAP 76 -#define BANDWIDTH_CHECK_SWAP 77 -#define BANDWIDTH_NUM_INTERVALS 78 - -/* possible reset intervals */ -#define BANDWIDTH_MINUTE 80 -#define BANDWIDTH_HOUR 81 -#define BANDWIDTH_DAY 82 -#define BANDWIDTH_WEEK 83 -#define BANDWIDTH_MONTH 84 -#define BANDWIDTH_NEVER 85 - -/* possible monitoring types */ -#define BANDWIDTH_COMBINED 90 -#define BANDWIDTH_INDIVIDUAL_SRC 91 -#define BANDWIDTH_INDIVIDUAL_DST 92 -#define BANDWIDTH_INDIVIDUAL_LOCAL 93 -#define BANDWIDTH_INDIVIDUAL_REMOTE 94 - - - -/* socket id parameters (for userspace i/o) */ -#define BANDWIDTH_SET 2048 -#define BANDWIDTH_GET 2049 - -/* max id length */ -#define BANDWIDTH_MAX_ID_LENGTH 50 - -/* 4 bytes for total number of entries, 100 entries of 12 bytes each, + 1 byte indicating whether all have been dumped */ -#define BANDWIDTH_QUERY_LENGTH 1205 -#define BANDWIDTH_ENTRY_LENGTH 12 - - -struct ipt_bandwidth_info -{ - char id[BANDWIDTH_MAX_ID_LENGTH]; - unsigned char type; - unsigned char check_type; - uint32_t local_subnet; - uint32_t local_subnet_mask; - - unsigned char cmp; - unsigned char reset_is_constant_interval; - time_t reset_interval; //specific fixed type (see above) or interval length in seconds - time_t reset_time; //seconds from start of month/week/day/hour/minute to do reset, or start point of interval if it is a constant interval - uint64_t bandwidth_cutoff; - uint64_t current_bandwidth; - time_t next_reset; - time_t previous_reset; - time_t last_backup_time; - - uint32_t num_intervals_to_save; - - - unsigned long hashed_id; - void* iam; - uint64_t* combined_bw; - struct ipt_bandwidth_info* non_const_self; - unsigned long* ref_count; - - -}; -#endif /*_IPT_BANDWIDTH_H*/ diff --git a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_timerange.h b/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_timerange.h deleted file mode 100644 index 4f1e8b66ec..0000000000 --- a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_timerange.h +++ /dev/null @@ -1,43 +0,0 @@ -/* timerange -- An iptables extension to match multiple timeranges within a week - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2009 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - - - -#ifndef _IPT_TIMERANGE_H -#define _IPT_TIMERANGE_H - - -#define RANGE_LENGTH 51 - -#define HOURS 1 -#define WEEKDAYS 2 -#define DAYS_HOURS (HOURS+WEEKDAYS) -#define WEEKLY_RANGE 4 - - -struct ipt_timerange_info -{ - long ranges[RANGE_LENGTH]; - char days[7]; - char type; - unsigned char invert; -}; -#endif /*_IPT_TIMERANGE_H*/ diff --git a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_webmon.h b/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_webmon.h deleted file mode 100644 index 1a1bd247d4..0000000000 --- a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_webmon.h +++ /dev/null @@ -1,63 +0,0 @@ -/* webmon -- A netfilter module to match URLs in HTTP requests - * This module can match using string match or regular expressions - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2008-2010 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - - - -#ifndef _IPT_WEBMON_H -#define _IPT_WEBMON_H - - -#define WEBMON_MAX_IPS 256 -#define WEBMON_MAX_IP_RANGES 16 - -#define WEBMON_EXCLUDE 1 -#define WEBMON_INCLUDE 2 - -#define WEBMON_MAXDOMAIN 4 -#define WEBMON_MAXSEARCH 8 - -#define WEBMON_DOMAIN 16 -#define WEBMON_SEARCH 32 - - -#define WEBMON_SET 3064 - -struct ipt_webmon_ip_range -{ - uint32_t start; - uint32_t end; -}; - -struct ipt_webmon_info -{ - uint32_t max_domains; - uint32_t max_searches; - uint32_t exclude_ips[WEBMON_MAX_IPS]; - struct ipt_webmon_ip_range exclude_ranges[WEBMON_MAX_IP_RANGES]; - uint32_t num_exclude_ips; - uint32_t num_exclude_ranges; - unsigned char exclude_type; - uint32_t* ref_count; - -}; - -#endif /*_IPT_WEBMON_H*/ diff --git a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_weburl.h b/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_weburl.h deleted file mode 100644 index db4c973c31..0000000000 --- a/package/network/utils/iptables/modules/include/linux/netfilter_ipv4/ipt_weburl.h +++ /dev/null @@ -1,45 +0,0 @@ -/* weburl -- A netfilter module to match URLs in HTTP requests - * This module can match using string match or regular expressions - * Originally designed for use with Gargoyle router firmware (gargoyle-router.com) - * - * - * Copyright © 2008 by Eric Bishop - * - * This file is free software: you may copy, redistribute and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 2 of the License, or (at your - * option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - - - -#ifndef _IPT_WEBURL_H -#define _IPT_WEBURL_H - - -#define MAX_TEST_STR 1024 - -#define WEBURL_CONTAINS_TYPE 1 -#define WEBURL_REGEX_TYPE 2 -#define WEBURL_EXACT_TYPE 3 -#define WEBURL_ALL_PART 4 -#define WEBURL_DOMAIN_PART 5 -#define WEBURL_PATH_PART 6 - -struct ipt_weburl_info -{ - char test_str[MAX_TEST_STR]; - unsigned char match_type; - unsigned char match_part; - unsigned char invert; -}; -#endif /*_IPT_WEBURL_H*/ diff --git a/package/network/utils/iptables/patches/601-add-imq-support.patch b/package/network/utils/iptables/patches/601-add-imq-support.patch new file mode 100644 index 0000000000..5dfbeb12b1 --- /dev/null +++ b/package/network/utils/iptables/patches/601-add-imq-support.patch @@ -0,0 +1,138 @@ +--- a/dev/null ++++ b/extensions/libxt_IMQ.c +@@ -0,0 +1,105 @@ ++/* Shared library add-on to iptables to add IMQ target support. */ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++/* Function which prints out usage message. */ ++static void IMQ_help(void) ++{ ++ printf( ++"IMQ target options:\n" ++" --todev enqueue to imq, defaults to 0\n"); ++ ++} ++ ++static struct option IMQ_opts[] = { ++ { "todev", 1, 0, '1' }, ++ { 0 } ++}; ++ ++/* Initialize the target. */ ++static void IMQ_init(struct xt_entry_target *t) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)t->data; ++ ++ mr->todev = 0; ++} ++ ++/* Function which parses command options; returns true if it ++ ate an option */ ++static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags, ++ const void *entry, struct xt_entry_target **target) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data; ++ ++ switch(c) { ++ case '1': ++/* if (xtables_check_inverse(optarg, &invert, NULL, 0, argv)) ++ xtables_error(PARAMETER_PROBLEM, ++ "Unexpected `!' after --todev"); ++*/ ++ mr->todev=atoi(optarg); ++ break; ++ ++ default: ++ return 0; ++ } ++ return 1; ++} ++ ++/* Prints out the targinfo. */ ++static void IMQ_print(const void *ip, ++ const struct xt_entry_target *target, ++ int numeric) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; ++ ++ printf("IMQ: todev %u ", mr->todev); ++} ++ ++/* Saves the union ipt_targinfo in parsable form to stdout. */ ++static void IMQ_save(const void *ip, const struct xt_entry_target *target) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; ++ ++ printf(" --todev %u", mr->todev); ++} ++ ++static struct xtables_target imq_target = { ++ .name = "IMQ", ++ .version = XTABLES_VERSION, ++ .family = NFPROTO_IPV4, ++ .size = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .help = IMQ_help, ++ .init = IMQ_init, ++ .parse = IMQ_parse, ++ .print = IMQ_print, ++ .save = IMQ_save, ++ .extra_opts = IMQ_opts, ++}; ++ ++static struct xtables_target imq_target6 = { ++ .name = "IMQ", ++ .version = XTABLES_VERSION, ++ .family = NFPROTO_IPV6, ++ .size = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .help = IMQ_help, ++ .init = IMQ_init, ++ .parse = IMQ_parse, ++ .print = IMQ_print, ++ .save = IMQ_save, ++ .extra_opts = IMQ_opts, ++}; ++ ++// void __attribute((constructor)) nf_ext_init(void){ ++void _init(void){ ++ xtables_register_target(&imq_target); ++ xtables_register_target(&imq_target6); ++} +--- a/dev/null ++++ b/extensions/libxt_IMQ.man +@@ -0,0 +1,15 @@ ++This target is used to redirect the traffic to the IMQ driver and you can apply ++QoS rules like HTB or CBQ. ++For example you can select only traffic comming from a specific interface or ++is going out on a specific interface. ++Also it permits to capture the traffic BEFORE NAT in the case of outgoing traffic ++or AFTER NAT in the case of incomming traffic. ++.TP ++\fB\-\-to\-dev\fP \fIvalue\fP ++Set the IMQ interface where to send this traffic ++.TP ++Example: ++.TP ++Redirect incomming traffic from interface eth0 to imq0 and outgoing traffic to imq1: ++iptables \-t mangle \-A FORWARD \-i eth0 \-j IMQ \-\-to\-dev 0 ++iptables \-t mangle \-A FORWARD \-o eth0 \-j IMQ \-\-to\-dev 1 +--- a/dev/null ++++ b/include/linux/netfilter/xt_IMQ.h +@@ -0,0 +1,9 @@ ++#ifndef _XT_IMQ_H ++#define _XT_IMQ_H ++ ++struct xt_imq_info { ++ unsigned int todev; /* target imq device */ ++}; ++ ++#endif /* _XT_IMQ_H */ ++ diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index e42139744a..6842c5be44 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -5807,3 +5807,8 @@ CONFIG_ZONE_DMA=y # CONFIG_ZRAM is not set # CONFIG_ZSMALLOC is not set # CONFIG_ZX_TDM is not set +CONFIG_IMQ_NUM_DEVS=2 +# CONFIG_IMQ_BEHAVIOR_AA is not set +# CONFIG_IMQ_BEHAVIOR_AB is not set +CONFIG_IMQ_BEHAVIOR_BA=y +# CONFIG_IMQ_BEHAVIOR_BB is not set diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index c98991611d..56310a1126 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -6107,3 +6107,8 @@ CONFIG_ZONE_DMA=y # CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_ZSMALLOC is not set # CONFIG_ZX_TDM is not set +CONFIG_IMQ_NUM_DEVS=2 +# CONFIG_IMQ_BEHAVIOR_AA is not set +# CONFIG_IMQ_BEHAVIOR_AB is not set +CONFIG_IMQ_BEHAVIOR_BA=y +# CONFIG_IMQ_BEHAVIOR_BB is not set diff --git a/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch new file mode 100644 index 0000000000..3d5f1de1d2 --- /dev/null +++ b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch @@ -0,0 +1,2044 @@ +--- a/drivers/net/Kconfig 2018-04-22 23:17:57.583718674 -0400 ++++ b/drivers/net/Kconfig 2018-04-22 23:20:39.331768961 -0400 +@@ -277,6 +277,125 @@ + depends on RIONET + default "128" + ++config IMQ ++ tristate "IMQ (intermediate queueing device) support" ++ depends on NETDEVICES && NETFILTER ++ ---help--- ++ The IMQ device(s) is used as placeholder for QoS queueing ++ disciplines. Every packet entering/leaving the IP stack can be ++ directed through the IMQ device where it's enqueued/dequeued to the ++ attached qdisc. This allows you to treat network devices as classes ++ and distribute bandwidth among them. Iptables is used to specify ++ through which IMQ device, if any, packets travel. ++ ++ More information at: https://github.com/imq/linuximq ++ ++ To compile this driver as a module, choose M here: the module ++ will be called imq. If unsure, say N. ++ ++choice ++ prompt "IMQ behavior (PRE/POSTROUTING)" ++ depends on IMQ ++ default IMQ_BEHAVIOR_AB ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ IMQ can work in any of the following ways: ++ ++ PREROUTING | POSTROUTING ++ -----------------|------------------- ++ #1 After NAT | After NAT ++ #2 After NAT | Before NAT ++ #3 Before NAT | After NAT ++ #4 Before NAT | Before NAT ++ ++ The default behavior is to hook before NAT on PREROUTING ++ and after NAT on POSTROUTING (#3). ++ ++ This settings are specially usefull when trying to use IMQ ++ to shape NATed clients. ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AA ++ bool "IMQ AA" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: After NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AB ++ bool "IMQ AB" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BA ++ bool "IMQ BA" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: After NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BB ++ bool "IMQ BB" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++endchoice ++ ++config IMQ_NUM_DEVS ++ int "Number of IMQ devices" ++ range 2 16 ++ depends on IMQ ++ default "16" ++ help ++ This setting defines how many IMQ devices will be created. ++ ++ The default value is 16. ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ + config TUN + tristate "Universal TUN/TAP device driver support" + depends on INET +--- a/drivers/net/Makefile 2018-04-22 23:17:57.583718674 -0400 ++++ b/drivers/net/Makefile 2018-04-22 23:20:39.411768985 -0400 +@@ -13,6 +13,7 @@ + obj-$(CONFIG_EQUALIZER) += eql.o + obj-$(CONFIG_IFB) += ifb.o + obj-$(CONFIG_MACSEC) += macsec.o ++obj-$(CONFIG_IMQ) += imq.o + obj-$(CONFIG_MACVLAN) += macvlan.o + obj-$(CONFIG_MACVTAP) += macvtap.o + obj-$(CONFIG_MII) += mii.o +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/drivers/net/imq.c 2018-05-20 11:10:23.471713282 -0400 +@@ -0,0 +1,1268 @@ ++/* ++ * Pseudo-driver for the intermediate queue device. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ * ++ * Authors: Patrick McHardy, ++ * ++ * The first version was written by Martin Devera, ++ * ++ * See Credits.txt ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num); ++ ++static nf_hookfn imq_nf_hook; ++ ++/*static struct nf_hook_ops imq_ops[] = { ++ { ++ // imq_ingress_ipv4 ++ .hook = imq_nf_hook, ++ .pf = PF_INET, ++ .hooknum = NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority = NF_IP_PRI_MANGLE + 1, ++#else ++ .priority = NF_IP_PRI_NAT_DST + 1, ++#endif ++ }, ++ { ++ // imq_egress_ipv4 ++ .hook = imq_nf_hook, ++ .pf = PF_INET, ++ .hooknum = NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority = NF_IP_PRI_LAST, ++#else ++ .priority = NF_IP_PRI_NAT_SRC - 1, ++#endif ++ }, ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ { ++ // imq_ingress_ipv6 ++ .hook = imq_nf_hook, ++ .pf = PF_INET6, ++ .hooknum = NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority = NF_IP6_PRI_MANGLE + 1, ++#else ++ .priority = NF_IP6_PRI_NAT_DST + 1, ++#endif ++ }, ++ { ++ // imq_egress_ipv6 ++ .hook = imq_nf_hook, ++ .pf = PF_INET6, ++ .hooknum = NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority = NF_IP6_PRI_LAST, ++#else ++ .priority = NF_IP6_PRI_NAT_SRC - 1, ++#endif ++ }, ++#endif ++};*/ ++ ++#if defined(CONFIG_IMQ_NUM_DEVS) ++static int numdevs = CONFIG_IMQ_NUM_DEVS; ++#else ++static int numdevs = IMQ_MAX_DEVS; ++#endif ++ ++static struct net_device *imq_devs_cache[IMQ_MAX_DEVS]; ++ ++#define IMQ_MAX_QUEUES 32 ++static int numqueues = 1; ++static u32 imq_hashrnd; ++static int imq_dev_accurate_stats = 1; ++ ++static inline __be16 pppoe_proto(const struct sk_buff *skb) ++{ ++ return *((__be16 *)(skb_mac_header(skb) + ETH_HLEN + ++ sizeof(struct pppoe_hdr))); ++} ++ ++static u16 imq_hash(struct net_device *dev, struct sk_buff *skb) ++{ ++ unsigned int pull_len; ++ u16 protocol = skb->protocol; ++ u32 addr1, addr2; ++ u32 hash, ihl = 0; ++ union { ++ u16 in16[2]; ++ u32 in32; ++ } ports; ++ u8 ip_proto; ++ ++ pull_len = 0; ++ ++recheck: ++ switch (protocol) { ++ case htons(ETH_P_8021Q): { ++ if (unlikely(skb_pull(skb, VLAN_HLEN) == NULL)) ++ goto other; ++ ++ pull_len += VLAN_HLEN; ++ skb->network_header += VLAN_HLEN; ++ ++ protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto; ++ goto recheck; ++ } ++ ++ case htons(ETH_P_PPP_SES): { ++ if (unlikely(skb_pull(skb, PPPOE_SES_HLEN) == NULL)) ++ goto other; ++ ++ pull_len += PPPOE_SES_HLEN; ++ skb->network_header += PPPOE_SES_HLEN; ++ ++ protocol = pppoe_proto(skb); ++ goto recheck; ++ } ++ ++ case htons(ETH_P_IP): { ++ const struct iphdr *iph = ip_hdr(skb); ++ ++ if (unlikely(!pskb_may_pull(skb, sizeof(struct iphdr)))) ++ goto other; ++ ++ addr1 = iph->daddr; ++ addr2 = iph->saddr; ++ ++ ip_proto = !(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) ? ++ iph->protocol : 0; ++ ihl = ip_hdrlen(skb); ++ ++ break; ++ } ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ case htons(ETH_P_IPV6): { ++ const struct ipv6hdr *iph = ipv6_hdr(skb); ++ __be16 fo = 0; ++ ++ if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr)))) ++ goto other; ++ ++ addr1 = iph->daddr.s6_addr32[3]; ++ addr2 = iph->saddr.s6_addr32[3]; ++ ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto, ++ &fo); ++ if (unlikely(ihl < 0)) ++ goto other; ++ ++ break; ++ } ++#endif ++ default: ++other: ++ if (pull_len != 0) { ++ skb_push(skb, pull_len); ++ skb->network_header -= pull_len; ++ } ++ ++ return (u16)(ntohs(protocol) % dev->real_num_tx_queues); ++ } ++ ++ if (addr1 > addr2) ++ swap(addr1, addr2); ++ ++ switch (ip_proto) { ++ case IPPROTO_TCP: ++ case IPPROTO_UDP: ++ case IPPROTO_DCCP: ++ case IPPROTO_ESP: ++ case IPPROTO_AH: ++ case IPPROTO_SCTP: ++ case IPPROTO_UDPLITE: { ++ if (likely(skb_copy_bits(skb, ihl, &ports.in32, 4) >= 0)) { ++ if (ports.in16[0] > ports.in16[1]) ++ swap(ports.in16[0], ports.in16[1]); ++ break; ++ } ++ /* fall-through */ ++ } ++ default: ++ ports.in32 = 0; ++ break; ++ } ++ ++ if (pull_len != 0) { ++ skb_push(skb, pull_len); ++ skb->network_header -= pull_len; ++ } ++ ++ hash = jhash_3words(addr1, addr2, ports.in32, imq_hashrnd ^ ip_proto); ++ ++ return (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); ++} ++ ++static inline bool sk_tx_queue_recorded(struct sock *sk) ++{ ++ return (sk_tx_queue_get(sk) >= 0); ++} ++ ++static struct netdev_queue *imq_select_queue(struct net_device *dev, ++ struct sk_buff *skb) ++{ ++ u16 queue_index = 0; ++ u32 hash; ++ ++ if (likely(dev->real_num_tx_queues == 1)) ++ goto out; ++ ++ /* IMQ can be receiving ingress or engress packets. */ ++ ++ /* Check first for if rx_queue is set */ ++ if (skb_rx_queue_recorded(skb)) { ++ queue_index = skb_get_rx_queue(skb); ++ goto out; ++ } ++ ++ /* Check if socket has tx_queue set */ ++ if (sk_tx_queue_recorded(skb->sk)) { ++ queue_index = sk_tx_queue_get(skb->sk); ++ goto out; ++ } ++ ++ /* Try use socket hash */ ++ if (skb->sk && skb->sk->sk_hash) { ++ hash = skb->sk->sk_hash; ++ queue_index = ++ (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); ++ goto out; ++ } ++ ++ /* Generate hash from packet data */ ++ queue_index = imq_hash(dev, skb); ++ ++out: ++ if (unlikely(queue_index >= dev->real_num_tx_queues)) ++ queue_index = (u16)((u32)queue_index % dev->real_num_tx_queues); ++ ++ skb_set_queue_mapping(skb, queue_index); ++ return netdev_get_tx_queue(dev, queue_index); ++} ++ ++static struct net_device_stats *imq_get_stats(struct net_device *dev) ++{ ++ return &dev->stats; ++} ++ ++/* called for packets kfree'd in qdiscs at places other than enqueue */ ++static void imq_skb_destructor(struct sk_buff *skb) ++{ ++ struct nf_queue_entry *entry = skb->nf_queue_entry; ++ ++ skb->nf_queue_entry = NULL; ++ ++ if (entry) { ++ nf_queue_entry_release_refs(entry); ++ kfree(entry); ++ } ++ ++ skb_restore_cb(skb); /* kfree backup */ ++} ++ ++static void imq_done_check_queue_mapping(struct sk_buff *skb, ++ struct net_device *dev) ++{ ++ unsigned int queue_index; ++ ++ /* Don't let queue_mapping be left too large after exiting IMQ */ ++ if (likely(skb->dev != dev && skb->dev != NULL)) { ++ queue_index = skb_get_queue_mapping(skb); ++ if (unlikely(queue_index >= skb->dev->real_num_tx_queues)) { ++ queue_index = (u16)((u32)queue_index % ++ skb->dev->real_num_tx_queues); ++ skb_set_queue_mapping(skb, queue_index); ++ } ++ } else { ++ /* skb->dev was IMQ device itself or NULL, be on safe side and ++ * just clear queue mapping. ++ */ ++ skb_set_queue_mapping(skb, 0); ++ } ++} ++ ++static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct nf_queue_entry *entry = skb->nf_queue_entry; ++ ++ rcu_read_lock(); ++ ++ skb->nf_queue_entry = NULL; ++ netif_trans_update(dev); ++ ++ dev->stats.tx_bytes += skb->len; ++ dev->stats.tx_packets++; ++ ++ if (unlikely(entry == NULL)) { ++ /* We don't know what is going on here.. packet is queued for ++ * imq device, but (probably) not by us. ++ * ++ * If this packet was not send here by imq_nf_queue(), then ++ * skb_save_cb() was not used and skb_free() should not show: ++ * WARNING: IMQ: kfree_skb: skb->cb_next:.. ++ * and/or ++ * WARNING: IMQ: kfree_skb: skb->nf_queue_entry... ++ * ++ * However if this message is shown, then IMQ is somehow broken ++ * and you should report this to linuximq.net. ++ */ ++ ++ /* imq_dev_xmit is black hole that eats all packets, report that ++ * we eat this packet happily and increase dropped counters. ++ */ ++ ++ dev->stats.tx_dropped++; ++ dev_kfree_skb(skb); ++ ++ rcu_read_unlock(); ++ return NETDEV_TX_OK; ++ } ++ ++ skb_restore_cb(skb); /* restore skb->cb */ ++ ++ skb->imq_flags = 0; ++ skb->destructor = NULL; ++ ++ imq_done_check_queue_mapping(skb, dev); ++ ++ nf_reinject(entry, NF_ACCEPT); ++ ++ rcu_read_unlock(); ++ return NETDEV_TX_OK; ++} ++ ++static struct net_device *get_imq_device_by_index(int index) ++{ ++ struct net_device *dev = NULL; ++ struct net *net; ++ char buf[8]; ++ ++ /* get device by name and cache result */ ++ snprintf(buf, sizeof(buf), "imq%d", index); ++ ++ /* Search device from all namespaces. */ ++ for_each_net(net) { ++ dev = dev_get_by_name(net, buf); ++ if (dev) ++ break; ++ } ++ ++ if (WARN_ON_ONCE(dev == NULL)) { ++ /* IMQ device not found. Exotic config? */ ++ return ERR_PTR(-ENODEV); ++ } ++ ++ imq_devs_cache[index] = dev; ++ dev_put(dev); ++ ++ return dev; ++} ++ ++static struct nf_queue_entry *nf_queue_entry_dup(struct nf_queue_entry *e) ++{ ++ struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC); ++ if (entry) { ++ nf_queue_entry_get_refs(entry); ++ return entry; ++ } ++ return NULL; ++} ++ ++#ifdef CONFIG_BRIDGE_NETFILTER ++/* When called from bridge netfilter, skb->data must point to MAC header ++ * before calling skb_gso_segment(). Else, original MAC header is lost ++ * and segmented skbs will be sent to wrong destination. ++ */ ++static void nf_bridge_adjust_skb_data(struct sk_buff *skb) ++{ ++ if (skb->nf_bridge) ++ __skb_push(skb, skb->network_header - skb->mac_header); ++} ++ ++static void nf_bridge_adjust_segmented_data(struct sk_buff *skb) ++{ ++ if (skb->nf_bridge) ++ __skb_pull(skb, skb->network_header - skb->mac_header); ++} ++#else ++#define nf_bridge_adjust_skb_data(s) do {} while (0) ++#define nf_bridge_adjust_segmented_data(s) do {} while (0) ++#endif ++ ++static void free_entry(struct nf_queue_entry *entry) ++{ ++ nf_queue_entry_release_refs(entry); ++ kfree(entry); ++} ++ ++static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev); ++ ++static int __imq_nf_queue_gso(struct nf_queue_entry *entry, ++ struct net_device *dev, struct sk_buff *skb) ++{ ++ int ret = -ENOMEM; ++ struct nf_queue_entry *entry_seg; ++ ++ nf_bridge_adjust_segmented_data(skb); ++ ++ if (skb->next == NULL) { /* last packet, no need to copy entry */ ++ struct sk_buff *gso_skb = entry->skb; ++ entry->skb = skb; ++ ret = __imq_nf_queue(entry, dev); ++ if (ret) ++ entry->skb = gso_skb; ++ return ret; ++ } ++ ++ skb->next = NULL; ++ ++ entry_seg = nf_queue_entry_dup(entry); ++ if (entry_seg) { ++ entry_seg->skb = skb; ++ ret = __imq_nf_queue(entry_seg, dev); ++ if (ret) ++ free_entry(entry_seg); ++ } ++ return ret; ++} ++ ++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num) ++{ ++ struct sk_buff *skb, *segs; ++ struct net_device *dev; ++ unsigned int queued; ++ int index, retval, err; ++ ++ index = entry->skb->imq_flags & IMQ_F_IFMASK; ++ if (unlikely(index > numdevs - 1)) { ++ if (net_ratelimit()) ++ pr_warn("IMQ: invalid device specified, highest is %u\n", ++ numdevs - 1); ++ retval = -EINVAL; ++ goto out_no_dev; ++ } ++ ++ /* check for imq device by index from cache */ ++ dev = imq_devs_cache[index]; ++ if (unlikely(!dev)) { ++ dev = get_imq_device_by_index(index); ++ if (IS_ERR(dev)) { ++ retval = PTR_ERR(dev); ++ goto out_no_dev; ++ } ++ } ++ ++ if (unlikely(!(dev->flags & IFF_UP))) { ++ entry->skb->imq_flags = 0; ++ retval = -ECANCELED; ++ goto out_no_dev; ++ } ++ ++ /* Since 3.10.x, GSO handling moved here as result of upstream commit ++ * a5fedd43d5f6c94c71053a66e4c3d2e35f1731a2 (netfilter: move ++ * skb_gso_segment into nfnetlink_queue module). ++ * ++ * Following code replicates the gso handling from ++ * 'net/netfilter/nfnetlink_queue_core.c':nfqnl_enqueue_packet(). ++ */ ++ ++ skb = entry->skb; ++ ++ switch (entry->state.pf) { ++ case NFPROTO_IPV4: ++ skb->protocol = htons(ETH_P_IP); ++ break; ++ case NFPROTO_IPV6: ++ skb->protocol = htons(ETH_P_IPV6); ++ break; ++ } ++ ++ if (!skb_is_gso(entry->skb)) ++ return __imq_nf_queue(entry, dev); ++ ++ nf_bridge_adjust_skb_data(skb); ++ segs = skb_gso_segment(skb, 0); ++ /* Does not use PTR_ERR to limit the number of error codes that can be ++ * returned by nf_queue. For instance, callers rely on -ECANCELED to ++ * mean 'ignore this hook'. ++ */ ++ err = -ENOBUFS; ++ if (IS_ERR(segs)) ++ goto out_err; ++ queued = 0; ++ err = 0; ++ do { ++ struct sk_buff *nskb = segs->next; ++ if (nskb && nskb->next) ++ nskb->cb_next = NULL; ++ if (err == 0) ++ err = __imq_nf_queue_gso(entry, dev, segs); ++ if (err == 0) ++ queued++; ++ else ++ kfree_skb(segs); ++ segs = nskb; ++ } while (segs); ++ ++ if (queued) { ++ if (err) /* some segments are already queued */ ++ free_entry(entry); ++ kfree_skb(skb); ++ return 0; ++ } ++ ++out_err: ++ nf_bridge_adjust_segmented_data(skb); ++ retval = err; ++out_no_dev: ++ return retval; ++} ++ ++static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev) ++{ ++ struct sk_buff *skb_orig, *skb, *skb_shared, *skb_popd; ++ struct Qdisc *q; ++ struct sk_buff *to_free = NULL; ++ struct netdev_queue *txq; ++ spinlock_t *root_lock; ++ int users; ++ int retval = -EINVAL; ++ unsigned int orig_queue_index; ++ ++ dev->last_rx = jiffies; ++ ++ skb = entry->skb; ++ skb_orig = NULL; ++ ++ /* skb has owner? => make clone */ ++ if (unlikely(skb->destructor)) { ++ skb_orig = skb; ++ skb = skb_clone(skb, GFP_ATOMIC); ++ if (unlikely(!skb)) { ++ retval = -ENOMEM; ++ goto out; ++ } ++ skb->cb_next = NULL; ++ entry->skb = skb; ++ } ++ ++ dev->stats.rx_bytes += skb->len; ++ dev->stats.rx_packets++; ++ ++ if (!skb->dev) { ++ /* skb->dev == NULL causes problems, try the find cause. */ ++ if (net_ratelimit()) { ++ dev_warn(&dev->dev, ++ "received packet with skb->dev == NULL\n"); ++ dump_stack(); ++ } ++ ++ skb->dev = dev; ++ } ++ ++ /* Disables softirqs for lock below */ ++ rcu_read_lock_bh(); ++ ++ /* Multi-queue selection */ ++ orig_queue_index = skb_get_queue_mapping(skb); ++ txq = imq_select_queue(dev, skb); ++ ++ q = rcu_dereference(txq->qdisc); ++ if (unlikely(!q->enqueue)) ++ goto packet_not_eaten_by_imq_dev; ++ ++ skb->nf_queue_entry = entry; ++ root_lock = qdisc_lock(q); ++ spin_lock(root_lock); ++ ++ users = refcount_read(&skb->users); ++ ++ skb_shared = skb_get(skb); /* increase reference count by one */ ++ ++ /* backup skb->cb, as qdisc layer will overwrite it */ ++ skb_save_cb(skb_shared); ++ qdisc_enqueue_root(skb_shared, q, &to_free); /* might kfree_skb */ ++ if (likely(refcount_read(&skb_shared->users) == users + 1)) { ++ bool validate; ++ ++ kfree_skb(skb_shared); /* decrease reference count by one */ ++ ++ skb->destructor = &imq_skb_destructor; ++ ++ skb_popd = qdisc_dequeue_skb(q, &validate); ++ ++ /* cloned? */ ++ if (unlikely(skb_orig)) ++ kfree_skb(skb_orig); /* free original */ ++ ++ spin_unlock(root_lock); ++ ++#if 0 ++ /* schedule qdisc dequeue */ ++ __netif_schedule(q); ++#else ++ if (likely(skb_popd)) { ++ /* Note that we validate skb (GSO, checksum, ...) outside of locks */ ++ if (validate) ++ skb_popd = validate_xmit_skb_list(skb_popd, dev); ++ ++ if (skb_popd) { ++ int dummy_ret; ++ int cpu = smp_processor_id(); /* ok because BHs are off */ ++ ++ txq = skb_get_tx_queue(dev, skb_popd); ++ /* ++ IMQ device will not be frozen or stoped, and it always be successful. ++ So we need not check its status and return value to accelerate. ++ */ ++ if (imq_dev_accurate_stats && txq->xmit_lock_owner != cpu) { ++ HARD_TX_LOCK(dev, txq, cpu); ++ if (!netif_xmit_frozen_or_stopped(txq)) { ++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); ++ } ++ HARD_TX_UNLOCK(dev, txq); ++ } else { ++ if (!netif_xmit_frozen_or_stopped(txq)) { ++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); ++ } ++ } ++ } ++ } else { ++ /* No ready skb, then schedule it */ ++ __netif_schedule(q); ++ } ++#endif ++ rcu_read_unlock_bh(); ++ retval = 0; ++ goto out; ++ } else { ++ skb_restore_cb(skb_shared); /* restore skb->cb */ ++ skb->nf_queue_entry = NULL; ++ /* ++ * qdisc dropped packet and decreased skb reference count of ++ * skb, so we don't really want to and try refree as that would ++ * actually destroy the skb. ++ */ ++ spin_unlock(root_lock); ++ goto packet_not_eaten_by_imq_dev; ++ } ++ ++packet_not_eaten_by_imq_dev: ++ skb_set_queue_mapping(skb, orig_queue_index); ++ rcu_read_unlock_bh(); ++ ++ /* cloned? restore original */ ++ if (unlikely(skb_orig)) { ++ kfree_skb(skb); ++ entry->skb = skb_orig; ++ } ++ retval = -1; ++out: ++ if (unlikely(to_free)) { ++ kfree_skb_list(to_free); ++ } ++ return retval; ++} ++static unsigned int imq_nf_hook(void *priv, ++ struct sk_buff *skb, ++ const struct nf_hook_state *state) ++{ ++ return (skb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT; ++} ++ ++static int imq_close(struct net_device *dev) ++{ ++ netif_stop_queue(dev); ++ return 0; ++} ++ ++static int imq_open(struct net_device *dev) ++{ ++ netif_start_queue(dev); ++ return 0; ++} ++ ++static struct device_type imq_device_type = { ++ .name = "imq", ++}; ++ ++static const struct net_device_ops imq_netdev_ops = { ++ .ndo_open = imq_open, ++ .ndo_stop = imq_close, ++ .ndo_start_xmit = imq_dev_xmit, ++ .ndo_get_stats = imq_get_stats, ++}; ++ ++static void imq_setup(struct net_device *dev) ++{ ++ dev->netdev_ops = &imq_netdev_ops; ++ dev->type = ARPHRD_VOID; ++ dev->mtu = 16000; /* too small? */ ++ dev->tx_queue_len = 11000; /* too big? */ ++ dev->flags = IFF_NOARP; ++ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | ++ NETIF_F_GSO | NETIF_F_HW_CSUM | ++ NETIF_F_HIGHDMA; ++ dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | ++ IFF_TX_SKB_SHARING); ++} ++ ++static int imq_validate(struct nlattr *tb[], struct nlattr *data[], ++ struct netlink_ext_ack *extack) ++{ ++ int ret = 0; ++ ++ if (tb[IFLA_ADDRESS]) { ++ if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) { ++ ret = -EINVAL; ++ goto end; ++ } ++ if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) { ++ ret = -EADDRNOTAVAIL; ++ goto end; ++ } ++ } ++ return 0; ++end: ++ pr_warn("IMQ: imq_validate failed (%d)\n", ret); ++ return ret; ++} ++ ++static struct rtnl_link_ops imq_link_ops __read_mostly = { ++ .kind = "imq", ++ .priv_size = 0, ++ .setup = imq_setup, ++ .validate = imq_validate, ++}; ++ ++static const struct nf_queue_handler imq_nfqh = { ++ .outfn = imq_nf_queue, ++}; ++ ++static inline char *kernel_strdup(const char *str) ++{ ++ char *tmp; ++ long int s; ++ s=strlen(str) + 1; ++ tmp = kmalloc(s, GFP_ATOMIC); ++ if (tmp != NULL) ++ { ++ memcpy(tmp, str, s); ++ } ++ return tmp; ++} ++ ++/* ++ * line is the line to be parsed -- it is not modified in any way ++ * max_pieces indicates number of pieces to return, if negative this is determined dynamically ++ * include_remainder_at_max indicates whether the last piece, when max pieces are reached, ++ * should be what it would normally be (0) or the entire remainder of the line (1) ++ * if max_pieces < 0 this parameter is ignored ++ * ++ * ++ * returns all non-separator pieces in a line ++ * result is dynamically allocated, MUST be freed after call-- even if ++ * line is empty (you still get a valid char** pointer to to a NULL char*) ++ */ ++char** split_on_separators(char* line, char* separators, int num_separators, int max_pieces, int include_remainder_at_max, unsigned long *num_pieces) ++{ ++ char** split; ++ ++ *num_pieces = 0; ++ if(line != NULL) ++ { ++ int split_index; ++ int non_separator_found; ++ char* dup_line; ++ char* start; ++ ++ if(max_pieces < 0) ++ { ++ /* count number of separator characters in line -- this count + 1 is an upperbound on number of pieces */ ++ int separator_count = 0; ++ int line_index; ++ for(line_index = 0; line[line_index] != '\0'; line_index++) ++ { ++ int sep_index; ++ int found = 0; ++ for(sep_index =0; found == 0 && sep_index < num_separators; sep_index++) ++ { ++ found = separators[sep_index] == line[line_index] ? 1 : 0; ++ } ++ separator_count = separator_count+ found; ++ } ++ max_pieces = separator_count + 1; ++ } ++ split = (char**)kmalloc((1+max_pieces)*sizeof(char*), GFP_ATOMIC); ++ split_index = 0; ++ split[split_index] = NULL; ++ ++ ++ dup_line = kernel_strdup(line); ++ start = dup_line; ++ non_separator_found = 0; ++ while(non_separator_found == 0) ++ { ++ int matches = 0; ++ int sep_index; ++ for(sep_index =0; sep_index < num_separators; sep_index++) ++ { ++ matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; ++ } ++ non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; ++ if(non_separator_found == 0) ++ { ++ start++; ++ } ++ } ++ ++ while(start[0] != '\0' && split_index < max_pieces) ++ { ++ /* find first separator index */ ++ int first_separator_index = 0; ++ int separator_found = 0; ++ while( separator_found == 0 ) ++ { ++ int sep_index; ++ for(sep_index =0; separator_found == 0 && sep_index < num_separators; sep_index++) ++ { ++ separator_found = separators[sep_index] == start[first_separator_index] || start[first_separator_index] == '\0' ? 1 : 0; ++ } ++ if(separator_found == 0) ++ { ++ first_separator_index++; ++ } ++ } ++ ++ /* copy next piece to split array */ ++ if(first_separator_index > 0) ++ { ++ char* next_piece = NULL; ++ if(split_index +1 < max_pieces || include_remainder_at_max <= 0) ++ { ++ next_piece = (char*)kmalloc((first_separator_index+1)*sizeof(char), GFP_ATOMIC); ++ memcpy(next_piece, start, first_separator_index); ++ next_piece[first_separator_index] = '\0'; ++ } ++ else ++ { ++ next_piece = kernel_strdup(start); ++ } ++ split[split_index] = next_piece; ++ split[split_index+1] = NULL; ++ split_index++; ++ } ++ ++ ++ /* find next non-separator index, indicating start of next piece */ ++ start = start+ first_separator_index; ++ non_separator_found = 0; ++ while(non_separator_found == 0) ++ { ++ int matches = 0; ++ int sep_index; ++ for(sep_index =0; sep_index < num_separators; sep_index++) ++ { ++ matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; ++ } ++ non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; ++ if(non_separator_found == 0) ++ { ++ start++; ++ } ++ } ++ } ++ kfree(dup_line); ++ *num_pieces = split_index; ++ } ++ else ++ { ++ split = (char**)kmalloc((1)*sizeof(char*), GFP_ATOMIC); ++ split[0] = NULL; ++ } ++ return split; ++} ++ ++ ++/* returns number freed */ ++int free_null_terminated_string_array(char** strs) ++{ ++ unsigned long str_index = 0; ++ if(strs != NULL) ++ { ++ for(str_index=0; strs[str_index] != NULL; str_index++) ++ { ++ kfree(strs[str_index]); ++ } ++ kfree(strs); ++ } ++ return str_index; ++} ++ ++ ++ ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ #define DEFAULT_PRE_TABLE "mangle" ++#else ++ #define DEFAULT_PRE_TABLE "nat" ++#endif ++ ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ #define DEFAULT_POST_TABLE "nat" ++#else ++ #define DEFAULT_POST_TABLE "mangle" ++#endif ++ ++static char* hook_chains = "PREROUTING,POSTROUTING"; ++static char* hook_tables = DEFAULT_PRE_TABLE","DEFAULT_POST_TABLE; ++ ++static struct nf_hook_ops* hook_list = NULL; ++static int hook_list_length = 0; ++ ++static int __net_init imq_nf_register(struct net *net) ++{ ++ int ret; ++ char separators[4] = {',', ' ', '\t', '\0' }; ++ unsigned long num_chains; ++ unsigned long num_tables; ++ char** chain_list = split_on_separators(hook_chains, separators, 3, -1, 0, &num_chains); ++ char** table_list = split_on_separators(hook_tables, separators, 3, -1, 0, &num_tables); ++ int hook_index = 0; ++ ++ hook_list_length = 0; ++ if(num_chains != num_tables) ++ { ++ printk("ERROR: must have same number of chains and tables\n"); ++ return -1; ++ } ++ ++ /* we multiply by 2 here since we need hooks for both IPv4 and IPv6 */ ++ hook_list = (struct nf_hook_ops*)kmalloc(sizeof(struct nf_hook_ops)*((num_chains*2)+1), GFP_ATOMIC); ++ ++ ++ for(hook_index=0; hook_index < num_chains; hook_index++) ++ { ++ char* chain = chain_list[hook_index]; ++ char* table = table_list[hook_index]; ++ int valid = 0; ++ if(strcmp(chain, "PREROUTING") == 0 || strcmp(chain, "POSTROUTING") == 0 || strcmp(chain, "INPUT") == 0 || strcmp(chain, "FORWARD") == 0 || strcmp(chain, "OUTPUT") == 0) ++ { ++ if( strcmp(table, "mangle") == 0 || ++ (strcmp(table, "nat") == 0 && strcmp(chain, "FORWARD") != 0 && strcmp(chain, "INPUT") != 0 ) || ++ (strcmp(table, "filter") == 0 && strcmp(chain, "PREROUTING") != 0 && strcmp(chain, "POSTROUTING") != 0 ) ++ ) ++ { ++ unsigned int chain_id = NF_INET_PRE_ROUTING; ++ int table_id = NF_IP_PRI_MANGLE; ++ int err = 0; ++ ++ valid = 1; ++ ++ if(strcmp(chain, "PREROUTING") == 0) ++ { ++ chain_id = NF_INET_PRE_ROUTING; ++ } ++ else if (strcmp(chain, "POSTROUTING") == 0) ++ { ++ chain_id = NF_INET_POST_ROUTING; ++ } ++ else if (strcmp(chain, "INPUT") == 0) ++ { ++ chain_id = NF_INET_LOCAL_IN; ++ ++ } ++ else if (strcmp(chain, "FORWARD") == 0) ++ { ++ chain_id = NF_INET_FORWARD; ++ ++ } ++ else if (strcmp(chain, "OUTPUT") == 0) ++ { ++ chain_id = NF_INET_LOCAL_OUT; ++ } ++ ++ if(strcmp(table, "mangle") == 0) ++ { ++ table_id = NF_IP_PRI_MANGLE+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") == 0) ++ { ++ table_id = NF_IP_PRI_NAT_SRC+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") != 0) ++ { ++ table_id = NF_IP_PRI_NAT_DST+1; ++ } ++ else if (strcmp(table, "filter") == 0) ++ { ++ table_id = NF_IP_PRI_FILTER+1; ++ } ++ (hook_list[hook_list_length]).hook = imq_nf_hook; ++ (hook_list[hook_list_length]).pf = PF_INET; ++ (hook_list[hook_list_length]).hooknum = chain_id; ++ (hook_list[hook_list_length]).priority = table_id; ++ printk(KERN_INFO "\tIMQv4: Hooking IMQ after %s on %s, pf=%d, hooknum=%d, priority=%d\n", table, chain, (hook_list[hook_list_length]).pf, (hook_list[hook_list_length]).hooknum, (hook_list[hook_list_length]).priority); ++ hook_list_length++; ++ ++ #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ if(strcmp(table, "mangle") == 0) ++ { ++ table_id = NF_IP6_PRI_MANGLE+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") == 0) ++ { ++ table_id = NF_IP6_PRI_NAT_SRC+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") != 0) ++ { ++ table_id = NF_IP6_PRI_NAT_DST+1; ++ } ++ else if (strcmp(table, "filter") == 0) ++ { ++ table_id = NF_IP6_PRI_FILTER+1; ++ } ++ ++ (hook_list[hook_list_length]).hook = imq_nf_hook; ++ (hook_list[hook_list_length]).pf = PF_INET6; ++ (hook_list[hook_list_length]).hooknum = chain_id; ++ (hook_list[hook_list_length]).priority = table_id; ++ printk(KERN_INFO "\tIMQv6: Hooking IMQ after %s on %s, pf=%d, hooknum=%d, priority=%d\n", table, chain, (hook_list[hook_list_length]).pf, (hook_list[hook_list_length]).hooknum, (hook_list[hook_list_length]).priority); ++ hook_list_length++; ++ #endif ++ } ++ } ++ if(valid == 0) ++ { ++ printk("ERROR: invalid chain/table at index %d (%s/%s)\n", hook_index, chain, table); ++ } ++ } ++ free_null_terminated_string_array(chain_list); ++ free_null_terminated_string_array(table_list); ++ ++ return nf_register_net_hooks(net, hook_list, ++ hook_list_length); ++}; ++ ++ ++static void __net_exit imq_nf_unregister(struct net *net) ++{ ++ nf_unregister_net_hooks(net, hook_list, ++ hook_list_length); ++}; ++ ++static struct pernet_operations imq_net_ops = { ++ .init = imq_nf_register, ++ .exit = imq_nf_unregister, ++}; ++ ++static int __net_init imq_init_hooks(void) ++{ ++ int ret ; ++ nf_register_queue_imq_handler(&imq_nfqh); ++ ++ ret = register_pernet_subsys(&imq_net_ops); ++ if (ret < 0) ++ nf_unregister_queue_imq_handler(); ++ ++ return ret; ++} ++ ++#ifdef CONFIG_LOCKDEP ++ static struct lock_class_key imq_netdev_addr_lock_key; ++ ++ static void __init imq_dev_set_lockdep_one(struct net_device *dev, ++ struct netdev_queue *txq, void *arg) ++ { ++ /* ++ * the IMQ transmit locks can be taken recursively, ++ * for example with one IMQ rule for input- and one for ++ * output network devices in iptables! ++ * until we find a better solution ignore them. ++ */ ++ lockdep_set_novalidate_class(&txq->_xmit_lock); ++ } ++ ++ static void imq_dev_set_lockdep_class(struct net_device *dev) ++ { ++ lockdep_set_class_and_name(&dev->addr_list_lock, ++ &imq_netdev_addr_lock_key, "_xmit_addr_IMQ"); ++ netdev_for_each_tx_queue(dev, imq_dev_set_lockdep_one, NULL); ++} ++#else ++ static inline void imq_dev_set_lockdep_class(struct net_device *dev) ++ { ++ } ++#endif ++ ++static int __init imq_init_one(int index) ++{ ++ struct net_device *dev; ++ int ret; ++ ++ dev = alloc_netdev_mq(0, "imq%d", NET_NAME_UNKNOWN, imq_setup, numqueues); ++ if (!dev) ++ return -ENOMEM; ++ ++ ret = dev_alloc_name(dev, dev->name); ++ if (ret < 0) ++ goto fail; ++ ++ dev->rtnl_link_ops = &imq_link_ops; ++ SET_NETDEV_DEVTYPE(dev, &imq_device_type); ++ ret = register_netdevice(dev); ++ if (ret < 0) ++ goto fail; ++ ++ imq_dev_set_lockdep_class(dev); ++ ++ return 0; ++fail: ++ free_netdev(dev); ++ return ret; ++} ++ ++static int __init imq_init_devs(void) ++{ ++ int err, i; ++ ++ if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) { ++ pr_err("IMQ: numdevs has to be betweed 1 and %u\n", ++ IMQ_MAX_DEVS); ++ return -EINVAL; ++ } ++ ++ if (numqueues < 1 || numqueues > IMQ_MAX_QUEUES) { ++ pr_err("IMQ: numqueues has to be betweed 1 and %u\n", ++ IMQ_MAX_QUEUES); ++ return -EINVAL; ++ } ++ ++ get_random_bytes(&imq_hashrnd, sizeof(imq_hashrnd)); ++ ++ rtnl_lock(); ++ err = __rtnl_link_register(&imq_link_ops); ++ ++ for (i = 0; i < numdevs && !err; i++) ++ err = imq_init_one(i); ++ ++ if (err) { ++ __rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++ } ++ rtnl_unlock(); ++ ++ return err; ++} ++ ++static int __init imq_init_module(void) ++{ ++ int err; ++ ++#if defined(CONFIG_IMQ_NUM_DEVS) ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16); ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2); ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK); ++#endif ++ ++ err = imq_init_devs(); ++ if (err) { ++ pr_err("IMQ: Error trying imq_init_devs(net)\n"); ++ return err; ++ } ++ ++ err = imq_init_hooks(); ++ if (err) { ++ pr_err(KERN_ERR "IMQ: Error trying imq_init_hooks()\n"); ++ rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++ return err; ++ } ++ ++ pr_info("IMQ driver loaded successfully. (numdevs = %d, numqueues = %d, imq_dev_accurate_stats = %d)\n", ++ numdevs, numqueues, imq_dev_accurate_stats); ++/* ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ pr_info("\tHooking IMQ before NAT on PREROUTING.\n"); ++#else ++ pr_info("\tHooking IMQ after NAT on PREROUTING.\n"); ++#endif ++#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ pr_info("\tHooking IMQ before NAT on POSTROUTING.\n"); ++#else ++ pr_info("\tHooking IMQ after NAT on POSTROUTING.\n"); ++#endif ++*/ ++ return 0; ++} ++ ++static void __exit imq_unhook(void) ++{ ++ unregister_pernet_subsys(&imq_net_ops); ++ nf_unregister_queue_imq_handler(); ++ ++ kfree(hook_list); ++ hook_list_length = 0; ++} ++ ++static void __exit imq_cleanup_devs(void) ++{ ++ rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++} ++ ++static void __exit imq_exit_module(void) ++{ ++ imq_unhook(); ++ imq_cleanup_devs(); ++ pr_info("IMQ driver unloaded successfully.\n"); ++} ++ ++module_init(imq_init_module); ++module_exit(imq_exit_module); ++ ++module_param(numdevs, int, 0); ++module_param(numqueues, int, 0); ++module_param(imq_dev_accurate_stats, int, 0); ++module_param(hook_chains, charp, 0); ++module_param(hook_tables, charp, 0); ++MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)"); ++MODULE_PARM_DESC(numqueues, "number of queues per IMQ device"); ++MODULE_PARM_DESC(imq_dev_accurate_stats, "Notify if need the accurate imq device stats"); ++MODULE_PARM_DESC(hook_chains, "netfilter chains in which to insert hooks to IMQ"); ++MODULE_PARM_DESC(hook_tables, "netfilter tables after which to insert hooks to IMQ"); ++ ++MODULE_AUTHOR("https://github.com/imq/linuximq"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information."); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS_RTNL_LINK("imq"); +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/imq.h 2018-04-22 23:20:39.411768985 -0400 +@@ -0,0 +1,13 @@ ++#ifndef _IMQ_H ++#define _IMQ_H ++ ++/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */ ++#define IMQ_F_BITS 5 ++ ++#define IMQ_F_IFMASK 0x0f ++#define IMQ_F_ENQUEUE 0x10 ++ ++#define IMQ_MAX_DEVS (IMQ_F_IFMASK + 1) ++ ++#endif /* _IMQ_H */ ++ +--- a/include/linux/netdevice.h 2018-04-22 23:18:14.351723881 -0400 ++++ b/include/linux/netdevice.h 2018-04-22 23:20:39.411768985 -0400 +@@ -1785,6 +1785,11 @@ + /* + * Cache lines mostly used on receive path (including eth_type_trans()) + */ ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ unsigned long last_rx; ++#endif ++ + /* Interface address info used in eth_type_trans() */ + unsigned char *dev_addr; + +@@ -3646,6 +3651,19 @@ + } \ + } + ++#define HARD_TX_LOCK_BH(dev, txq) { \ ++ if ((dev->features & NETIF_F_LLTX) == 0) { \ ++ __netif_tx_lock_bh(txq); \ ++ } \ ++} ++ ++#define HARD_TX_UNLOCK_BH(dev, txq) { \ ++ if ((dev->features & NETIF_F_LLTX) == 0) { \ ++ __netif_tx_unlock_bh(txq); \ ++ } \ ++} ++ ++ + static inline void netif_tx_disable(struct net_device *dev) + { + unsigned int i; +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/netfilter/xt_IMQ.h 2018-04-22 23:20:39.415768987 -0400 +@@ -0,0 +1,9 @@ ++#ifndef _XT_IMQ_H ++#define _XT_IMQ_H ++ ++struct xt_imq_info { ++ unsigned int todev; /* target imq device */ ++}; ++ ++#endif /* _XT_IMQ_H */ ++ +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/netfilter_ipv4/ipt_IMQ.h 2018-04-22 23:20:39.415768987 -0400 +@@ -0,0 +1,10 @@ ++#ifndef _IPT_IMQ_H ++#define _IPT_IMQ_H ++ ++/* Backwards compatibility for old userspace */ ++#include ++ ++#define ipt_imq_info xt_imq_info ++ ++#endif /* _IPT_IMQ_H */ ++ +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h 2018-04-22 23:20:39.415768987 -0400 +@@ -0,0 +1,10 @@ ++#ifndef _IP6T_IMQ_H ++#define _IP6T_IMQ_H ++ ++/* Backwards compatibility for old userspace */ ++#include ++ ++#define ip6t_imq_info xt_imq_info ++ ++#endif /* _IP6T_IMQ_H */ ++ +--- a/include/linux/skbuff.h 2018-04-22 23:18:15.079724108 -0400 ++++ b/include/linux/skbuff.h 2018-04-22 23:20:39.415768987 -0400 +@@ -40,6 +40,10 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif ++ + + /* The interface for checksum offload between the stack and networking drivers + * is as follows... +@@ -582,7 +586,7 @@ + typedef unsigned char *sk_buff_data_t; + #endif + +-/** ++/** + * struct sk_buff - socket buffer + * @next: Next buffer in list + * @prev: Previous buffer in list +@@ -685,6 +689,9 @@ + * first. This is owned by whoever has the skb queued ATM. + */ + char cb[48] __aligned(8); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ void *cb_next; ++#endif + + unsigned long _skb_refdst; + void (*destructor)(struct sk_buff *skb); +@@ -694,6 +701,9 @@ + #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) + unsigned long _nfct; + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ struct nf_queue_entry *nf_queue_entry; ++#endif + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) + struct nf_bridge_info *nf_bridge; + #endif +@@ -771,6 +781,9 @@ + #ifdef CONFIG_NET_SWITCHDEV + __u8 offload_fwd_mark:1; + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ __u8 imq_flags:IMQ_F_BITS; ++#endif + #ifdef CONFIG_NET_CLS_ACT + __u8 tc_skip_classify:1; + __u8 tc_at_ingress:1; +@@ -870,7 +883,7 @@ + */ + static inline struct dst_entry *skb_dst(const struct sk_buff *skb) + { +- /* If refdst was not refcounted, check we still are in a ++ /* If refdst was not refcounted, check we still are in a + * rcu_read_lock section + */ + WARN_ON((skb->_skb_refdst & SKB_DST_NOREF) && +@@ -960,6 +973,12 @@ + void consume_skb(struct sk_buff *skb); + void __consume_stateless_skb(struct sk_buff *skb); + void __kfree_skb(struct sk_buff *skb); ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++int skb_save_cb(struct sk_buff *skb); ++int skb_restore_cb(struct sk_buff *skb); ++#endif ++ + extern struct kmem_cache *skbuff_head_cache; + + void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); +@@ -3779,8 +3798,12 @@ + dst->_nfct = src->_nfct; + nf_conntrack_get(skb_nfct(src)); + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ dst->imq_flags = src->imq_flags; ++ dst->nf_queue_entry = src->nf_queue_entry; ++#endif + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) +- dst->nf_bridge = src->nf_bridge; ++ dst->nf_bridge = src->nf_bridge; + nf_bridge_get(src->nf_bridge); + #endif + #if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES) +--- a/include/net/netfilter/nf_queue.h 2018-04-22 23:18:15.199724146 -0400 ++++ b/include/net/netfilter/nf_queue.h 2018-04-22 23:20:39.419768987 -0400 +@@ -31,6 +31,12 @@ + void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh); + void nf_unregister_queue_handler(struct net *net); + void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict); ++void nf_queue_entry_release_refs(struct nf_queue_entry *entry); ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh); ++void nf_unregister_queue_imq_handler(void); ++#endif + + void nf_queue_entry_get_refs(struct nf_queue_entry *entry); + void nf_queue_entry_release_refs(struct nf_queue_entry *entry); +--- a/include/net/pkt_sched.h 2018-04-22 23:18:15.219724151 -0400 ++++ b/include/net/pkt_sched.h 2018-04-22 23:20:39.419768987 -0400 +@@ -109,6 +109,8 @@ + + void __qdisc_run(struct Qdisc *q); + ++struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate); ++ + static inline void qdisc_run(struct Qdisc *q) + { + if (qdisc_run_begin(q)) +--- a/include/net/sch_generic.h 2018-04-22 23:18:15.227724154 -0400 ++++ b/include/net/sch_generic.h 2018-04-22 23:20:39.419768987 -0400 +@@ -567,6 +567,13 @@ + return sch->enqueue(skb, sch, to_free); + } + ++static inline int qdisc_enqueue_root(struct sk_buff *skb, struct Qdisc *sch, ++ struct sk_buff **to_free) ++{ ++ qdisc_skb_cb(skb)->pkt_len = skb->len; ++ return qdisc_enqueue(skb, sch, to_free) & NET_XMIT_MASK; ++} ++ + static inline bool qdisc_is_percpu_stats(const struct Qdisc *q) + { + return q->flags & TCQ_F_CPUSTATS; +--- a/include/uapi/linux/netfilter.h 2018-04-22 23:18:16.159724442 -0400 ++++ b/include/uapi/linux/netfilter.h 2018-04-22 23:20:39.419768987 -0400 +@@ -14,7 +14,8 @@ + #define NF_QUEUE 3 + #define NF_REPEAT 4 + #define NF_STOP 5 /* Deprecated, for userspace nf_queue compatibility. */ +-#define NF_MAX_VERDICT NF_STOP ++#define NF_IMQ_QUEUE 6 ++#define NF_MAX_VERDICT NF_IMQ_QUEUE + + /* we overload the higher bits for encoding auxiliary data such as the queue + * number or errno values. Not nice, but better than additional function +--- a/net/core/dev.c 2018-04-22 23:18:24.391727000 -0400 ++++ b/net/core/dev.c 2018-04-22 23:20:39.419768987 -0400 +@@ -143,6 +143,9 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif + #include + #include + +@@ -2979,7 +2982,12 @@ + unsigned int len; + int rc; + ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ if ((!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) && ++ !(skb->imq_flags & IMQ_F_ENQUEUE)) ++#else + if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) ++#endif + dev_queue_xmit_nit(skb, dev); + + #ifdef CONFIG_ETHERNET_PACKET_MANGLE +@@ -3028,6 +3036,8 @@ + return skb; + } + ++EXPORT_SYMBOL_GPL(dev_hard_start_xmit); ++ + static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, + netdev_features_t features) + { +--- a/net/core/skbuff.c 2018-04-22 23:18:24.395727003 -0400 ++++ b/net/core/skbuff.c 2018-04-22 23:20:39.419768987 -0400 +@@ -82,6 +82,87 @@ + static struct kmem_cache *skbuff_fclone_cache __read_mostly; + int sysctl_max_skb_frags __read_mostly = MAX_SKB_FRAGS; + EXPORT_SYMBOL(sysctl_max_skb_frags); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++static struct kmem_cache *skbuff_cb_store_cache __read_mostly; ++#endif ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++/* Control buffer save/restore for IMQ devices */ ++struct skb_cb_table { ++ char cb[48] __aligned(8); ++ void *cb_next; ++ atomic_t refcnt; ++}; ++ ++static DEFINE_SPINLOCK(skb_cb_store_lock); ++ ++int skb_save_cb(struct sk_buff *skb) ++{ ++ struct skb_cb_table *next; ++ ++ next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC); ++ if (!next) ++ return -ENOMEM; ++ ++ BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb)); ++ ++ memcpy(next->cb, skb->cb, sizeof(skb->cb)); ++ next->cb_next = skb->cb_next; ++ ++ atomic_set(&next->refcnt, 1); ++ ++ skb->cb_next = next; ++ return 0; ++} ++EXPORT_SYMBOL(skb_save_cb); ++ ++int skb_restore_cb(struct sk_buff *skb) ++{ ++ struct skb_cb_table *next; ++ ++ if (!skb->cb_next) ++ return 0; ++ ++ next = skb->cb_next; ++ ++ BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb)); ++ ++ memcpy(skb->cb, next->cb, sizeof(skb->cb)); ++ skb->cb_next = next->cb_next; ++ ++ spin_lock(&skb_cb_store_lock); ++ ++ if (atomic_dec_and_test(&next->refcnt)) ++ kmem_cache_free(skbuff_cb_store_cache, next); ++ ++ spin_unlock(&skb_cb_store_lock); ++ ++ return 0; ++} ++EXPORT_SYMBOL(skb_restore_cb); ++ ++static void skb_copy_stored_cb(struct sk_buff * , const struct sk_buff * ) __attribute__ ((unused)); ++static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old) ++{ ++ struct skb_cb_table *next; ++ struct sk_buff *old; ++ ++ if (!__old->cb_next) { ++ new->cb_next = NULL; ++ return; ++ } ++ ++ spin_lock(&skb_cb_store_lock); ++ ++ old = (struct sk_buff *)__old; ++ ++ next = old->cb_next; ++ atomic_inc(&next->refcnt); ++ new->cb_next = next; ++ ++ spin_unlock(&skb_cb_store_lock); ++} ++#endif + + /** + * skb_panic - private function for out-of-line support +@@ -628,6 +709,28 @@ + WARN_ON(in_irq()); + skb->destructor(skb); + } ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ /* ++ * This should not happen. When it does, avoid memleak by restoring ++ * the chain of cb-backups. ++ */ ++ while (skb->cb_next != NULL) { ++ if (net_ratelimit()) ++ pr_warn("IMQ: kfree_skb: skb->cb_next: %08x\n", ++ (unsigned int)(uintptr_t)skb->cb_next); ++ ++ skb_restore_cb(skb); ++ } ++ /* ++ * This should not happen either, nf_queue_entry is nullified in ++ * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are ++ * leaking entry pointers, maybe memory. We don't know if this is ++ * pointer to already freed memory, or should this be freed. ++ * If this happens we need to add refcounting, etc for nf_queue_entry. ++ */ ++ if (skb->nf_queue_entry && net_ratelimit()) ++ pr_warn("%s\n", "IMQ: kfree_skb: skb->nf_queue_entry != NULL"); ++#endif + #if IS_ENABLED(CONFIG_NF_CONNTRACK) + nf_conntrack_put(skb_nfct(skb)); + #endif +@@ -817,6 +920,10 @@ + new->sp = secpath_get(old->sp); + #endif + __nf_copy(new, old, false); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ new->cb_next = NULL; ++ /*skb_copy_stored_cb(new, old);*/ ++#endif + + /* Note : this field could be in headers_start/headers_end section + * It is not yet because we do not want to have a 16 bit hole +@@ -3915,6 +4022,13 @@ + 0, + SLAB_HWCACHE_ALIGN|SLAB_PANIC, + NULL); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache", ++ sizeof(struct skb_cb_table), ++ 0, ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, ++ NULL); ++#endif + } + + static int +--- a/net/netfilter/core.c 2018-04-22 23:18:26.019727507 -0400 ++++ b/net/netfilter/core.c 2018-04-22 23:20:39.419768987 -0400 +@@ -457,6 +457,11 @@ + if (ret == 0) + ret = -EPERM; + return ret; ++ case NF_IMQ_QUEUE: ++ ret = nf_queue(skb, state, e, s, verdict); ++ if (ret == -ECANCELED) ++ continue; ++ return ret; + case NF_QUEUE: + ret = nf_queue(skb, state, e, s, verdict); + if (ret == 1) +--- a/net/netfilter/Kconfig 2018-04-22 23:18:25.751727424 -0400 ++++ b/net/netfilter/Kconfig 2018-04-22 23:20:39.419768987 -0400 +@@ -902,6 +902,18 @@ + + To compile it as a module, choose M here. If unsure, say N. + ++config NETFILTER_XT_TARGET_IMQ ++ tristate '"IMQ" target support' ++ depends on NETFILTER_XTABLES ++ depends on IP_NF_MANGLE || IP6_NF_MANGLE ++ select IMQ ++ default m if NETFILTER_ADVANCED=n ++ help ++ This option adds a `IMQ' target which is used to specify if and ++ to which imq device packets should get enqueued/dequeued. ++ ++ To compile it as a module, choose M here. If unsure, say N. ++ + config NETFILTER_XT_TARGET_MARK + tristate '"MARK" target support' + depends on NETFILTER_ADVANCED +--- a/net/netfilter/Makefile 2018-04-22 23:18:25.711727410 -0400 ++++ b/net/netfilter/Makefile 2018-04-22 23:20:39.423768990 -0400 +@@ -136,6 +136,7 @@ + obj-$(CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD) += xt_FLOWOFFLOAD.o + obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o + obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o ++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o + obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o + obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o + obj-$(CONFIG_NETFILTER_XT_TARGET_NETMAP) += xt_NETMAP.o +--- a/net/netfilter/nf_queue.c 2018-04-22 23:18:25.699727407 -0400 ++++ b/net/netfilter/nf_queue.c 2018-04-22 23:22:59.395812579 -0400 +@@ -1,4 +1,4 @@ +-/* ++ /* + * Rusty Russell (C)2000 -- This code is GPL. + * Patrick McHardy (c) 2006-2012 + */ +@@ -29,6 +29,23 @@ + * receives, no matter what. + */ + ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++static const struct nf_queue_handler __rcu *queue_imq_handler __read_mostly; ++ ++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh) ++{ ++ rcu_assign_pointer(queue_imq_handler, qh); ++} ++EXPORT_SYMBOL_GPL(nf_register_queue_imq_handler); ++ ++void nf_unregister_queue_imq_handler(void) ++{ ++ RCU_INIT_POINTER(queue_imq_handler, NULL); ++ synchronize_rcu(); ++} ++EXPORT_SYMBOL_GPL(nf_unregister_queue_imq_handler); ++#endif ++ + /* return EBUSY when somebody else is registered, return EEXIST if the + * same handler is registered, return 0 in case of success. */ + void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh) +@@ -144,16 +161,29 @@ + + static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state, + const struct nf_hook_entries *entries, +- unsigned int index, unsigned int queuenum) ++ unsigned int index, unsigned int verdict) + { + int status = -ENOENT; + struct nf_queue_entry *entry = NULL; + const struct nf_queue_handler *qh; + struct net *net = state->net; + unsigned int route_key_size; ++ unsigned int queuetype = verdict & NF_VERDICT_MASK; ++ unsigned int queuenum = verdict >> NF_VERDICT_QBITS; + + /* QUEUE == DROP if no one is waiting, to be safe. */ +- qh = rcu_dereference(net->nf.queue_handler); ++ ++ if (queuetype == NF_IMQ_QUEUE) { ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ qh = rcu_dereference(queue_imq_handler); ++#else ++ BUG(); ++ goto err_unlock; ++#endif ++ } else { ++ qh = rcu_dereference(net->nf.queue_handler); ++ } ++ + if (!qh) { + status = -ESRCH; + goto err; +@@ -217,8 +248,16 @@ + { + int ret; + +- ret = __nf_queue(skb, state, entries, index, verdict >> NF_VERDICT_QBITS); ++ ret = __nf_queue(skb, state, entries, index, verdict); + if (ret < 0) { ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ /* IMQ Bypass */ ++ if (ret == -ECANCELED && skb->imq_flags == 0) { ++ return 1; ++ } ++#endif ++ + if (ret == -ESRCH && + (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS)) + return 1; +@@ -302,6 +341,7 @@ + local_bh_enable(); + break; + case NF_QUEUE: ++ case NF_IMQ_QUEUE: + err = nf_queue(skb, &entry->state, hooks, i, verdict); + if (err == 1) + goto next_hook; +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/net/netfilter/xt_IMQ.c 2018-04-22 23:20:39.423768990 -0400 +@@ -0,0 +1,72 @@ ++/* ++ * This target marks packets to be enqueued to an imq device ++ */ ++#include ++#include ++#include ++#include ++#include ++ ++static unsigned int imq_target(struct sk_buff *pskb, ++ const struct xt_action_param *par) ++{ ++ const struct xt_imq_info *mr = par->targinfo; ++ ++ pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE; ++ ++ return XT_CONTINUE; ++} ++ ++static int imq_checkentry(const struct xt_tgchk_param *par) ++{ ++ struct xt_imq_info *mr = par->targinfo; ++ ++ if (mr->todev > IMQ_MAX_DEVS - 1) { ++ pr_warn("IMQ: invalid device specified, highest is %u\n", ++ IMQ_MAX_DEVS - 1); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static struct xt_target xt_imq_reg[] __read_mostly = { ++ { ++ .name = "IMQ", ++ .family = AF_INET, ++ .checkentry = imq_checkentry, ++ .target = imq_target, ++ .targetsize = sizeof(struct xt_imq_info), ++ .table = "mangle", ++ .me = THIS_MODULE ++ }, ++ { ++ .name = "IMQ", ++ .family = AF_INET6, ++ .checkentry = imq_checkentry, ++ .target = imq_target, ++ .targetsize = sizeof(struct xt_imq_info), ++ .table = "mangle", ++ .me = THIS_MODULE ++ }, ++}; ++ ++static int __init imq_init(void) ++{ ++ return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); ++} ++ ++static void __exit imq_fini(void) ++{ ++ xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); ++} ++ ++module_init(imq_init); ++module_exit(imq_fini); ++ ++MODULE_AUTHOR("https://github.com/imq/linuximq"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information."); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS("ipt_IMQ"); ++MODULE_ALIAS("ip6t_IMQ"); ++ +--- a/net/sched/sch_generic.c 2018-04-22 23:18:26.623727693 -0400 ++++ b/net/sched/sch_generic.c 2018-04-22 23:20:39.423768990 -0400 +@@ -158,6 +158,14 @@ + return skb; + } + ++struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate) ++{ ++ int packets; ++ ++ return dequeue_skb(q, validate, &packets); ++} ++EXPORT_SYMBOL(qdisc_dequeue_skb); ++ + /* + * Transmit possibly several skbs, and handle the return status as + * required. Owning running seqcount bit guarantees that \ No newline at end of file diff --git a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch new file mode 100644 index 0000000000..3d5f1de1d2 --- /dev/null +++ b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch @@ -0,0 +1,2044 @@ +--- a/drivers/net/Kconfig 2018-04-22 23:17:57.583718674 -0400 ++++ b/drivers/net/Kconfig 2018-04-22 23:20:39.331768961 -0400 +@@ -277,6 +277,125 @@ + depends on RIONET + default "128" + ++config IMQ ++ tristate "IMQ (intermediate queueing device) support" ++ depends on NETDEVICES && NETFILTER ++ ---help--- ++ The IMQ device(s) is used as placeholder for QoS queueing ++ disciplines. Every packet entering/leaving the IP stack can be ++ directed through the IMQ device where it's enqueued/dequeued to the ++ attached qdisc. This allows you to treat network devices as classes ++ and distribute bandwidth among them. Iptables is used to specify ++ through which IMQ device, if any, packets travel. ++ ++ More information at: https://github.com/imq/linuximq ++ ++ To compile this driver as a module, choose M here: the module ++ will be called imq. If unsure, say N. ++ ++choice ++ prompt "IMQ behavior (PRE/POSTROUTING)" ++ depends on IMQ ++ default IMQ_BEHAVIOR_AB ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ IMQ can work in any of the following ways: ++ ++ PREROUTING | POSTROUTING ++ -----------------|------------------- ++ #1 After NAT | After NAT ++ #2 After NAT | Before NAT ++ #3 Before NAT | After NAT ++ #4 Before NAT | Before NAT ++ ++ The default behavior is to hook before NAT on PREROUTING ++ and after NAT on POSTROUTING (#3). ++ ++ This settings are specially usefull when trying to use IMQ ++ to shape NATed clients. ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AA ++ bool "IMQ AA" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: After NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_AB ++ bool "IMQ AB" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: After NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BA ++ bool "IMQ BA" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: After NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++config IMQ_BEHAVIOR_BB ++ bool "IMQ BB" ++ help ++ This setting defines how IMQ behaves in respect to its ++ hooking in PREROUTING and POSTROUTING. ++ ++ Choosing this option will make IMQ hook like this: ++ ++ PREROUTING: Before NAT ++ POSTROUTING: Before NAT ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ ++endchoice ++ ++config IMQ_NUM_DEVS ++ int "Number of IMQ devices" ++ range 2 16 ++ depends on IMQ ++ default "16" ++ help ++ This setting defines how many IMQ devices will be created. ++ ++ The default value is 16. ++ ++ More information can be found at: https://github.com/imq/linuximq ++ ++ If not sure leave the default settings alone. ++ + config TUN + tristate "Universal TUN/TAP device driver support" + depends on INET +--- a/drivers/net/Makefile 2018-04-22 23:17:57.583718674 -0400 ++++ b/drivers/net/Makefile 2018-04-22 23:20:39.411768985 -0400 +@@ -13,6 +13,7 @@ + obj-$(CONFIG_EQUALIZER) += eql.o + obj-$(CONFIG_IFB) += ifb.o + obj-$(CONFIG_MACSEC) += macsec.o ++obj-$(CONFIG_IMQ) += imq.o + obj-$(CONFIG_MACVLAN) += macvlan.o + obj-$(CONFIG_MACVTAP) += macvtap.o + obj-$(CONFIG_MII) += mii.o +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/drivers/net/imq.c 2018-05-20 11:10:23.471713282 -0400 +@@ -0,0 +1,1268 @@ ++/* ++ * Pseudo-driver for the intermediate queue device. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ * ++ * Authors: Patrick McHardy, ++ * ++ * The first version was written by Martin Devera, ++ * ++ * See Credits.txt ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++#include ++#endif ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num); ++ ++static nf_hookfn imq_nf_hook; ++ ++/*static struct nf_hook_ops imq_ops[] = { ++ { ++ // imq_ingress_ipv4 ++ .hook = imq_nf_hook, ++ .pf = PF_INET, ++ .hooknum = NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority = NF_IP_PRI_MANGLE + 1, ++#else ++ .priority = NF_IP_PRI_NAT_DST + 1, ++#endif ++ }, ++ { ++ // imq_egress_ipv4 ++ .hook = imq_nf_hook, ++ .pf = PF_INET, ++ .hooknum = NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority = NF_IP_PRI_LAST, ++#else ++ .priority = NF_IP_PRI_NAT_SRC - 1, ++#endif ++ }, ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ { ++ // imq_ingress_ipv6 ++ .hook = imq_nf_hook, ++ .pf = PF_INET6, ++ .hooknum = NF_INET_PRE_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ .priority = NF_IP6_PRI_MANGLE + 1, ++#else ++ .priority = NF_IP6_PRI_NAT_DST + 1, ++#endif ++ }, ++ { ++ // imq_egress_ipv6 ++ .hook = imq_nf_hook, ++ .pf = PF_INET6, ++ .hooknum = NF_INET_POST_ROUTING, ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ .priority = NF_IP6_PRI_LAST, ++#else ++ .priority = NF_IP6_PRI_NAT_SRC - 1, ++#endif ++ }, ++#endif ++};*/ ++ ++#if defined(CONFIG_IMQ_NUM_DEVS) ++static int numdevs = CONFIG_IMQ_NUM_DEVS; ++#else ++static int numdevs = IMQ_MAX_DEVS; ++#endif ++ ++static struct net_device *imq_devs_cache[IMQ_MAX_DEVS]; ++ ++#define IMQ_MAX_QUEUES 32 ++static int numqueues = 1; ++static u32 imq_hashrnd; ++static int imq_dev_accurate_stats = 1; ++ ++static inline __be16 pppoe_proto(const struct sk_buff *skb) ++{ ++ return *((__be16 *)(skb_mac_header(skb) + ETH_HLEN + ++ sizeof(struct pppoe_hdr))); ++} ++ ++static u16 imq_hash(struct net_device *dev, struct sk_buff *skb) ++{ ++ unsigned int pull_len; ++ u16 protocol = skb->protocol; ++ u32 addr1, addr2; ++ u32 hash, ihl = 0; ++ union { ++ u16 in16[2]; ++ u32 in32; ++ } ports; ++ u8 ip_proto; ++ ++ pull_len = 0; ++ ++recheck: ++ switch (protocol) { ++ case htons(ETH_P_8021Q): { ++ if (unlikely(skb_pull(skb, VLAN_HLEN) == NULL)) ++ goto other; ++ ++ pull_len += VLAN_HLEN; ++ skb->network_header += VLAN_HLEN; ++ ++ protocol = vlan_eth_hdr(skb)->h_vlan_encapsulated_proto; ++ goto recheck; ++ } ++ ++ case htons(ETH_P_PPP_SES): { ++ if (unlikely(skb_pull(skb, PPPOE_SES_HLEN) == NULL)) ++ goto other; ++ ++ pull_len += PPPOE_SES_HLEN; ++ skb->network_header += PPPOE_SES_HLEN; ++ ++ protocol = pppoe_proto(skb); ++ goto recheck; ++ } ++ ++ case htons(ETH_P_IP): { ++ const struct iphdr *iph = ip_hdr(skb); ++ ++ if (unlikely(!pskb_may_pull(skb, sizeof(struct iphdr)))) ++ goto other; ++ ++ addr1 = iph->daddr; ++ addr2 = iph->saddr; ++ ++ ip_proto = !(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) ? ++ iph->protocol : 0; ++ ihl = ip_hdrlen(skb); ++ ++ break; ++ } ++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ case htons(ETH_P_IPV6): { ++ const struct ipv6hdr *iph = ipv6_hdr(skb); ++ __be16 fo = 0; ++ ++ if (unlikely(!pskb_may_pull(skb, sizeof(struct ipv6hdr)))) ++ goto other; ++ ++ addr1 = iph->daddr.s6_addr32[3]; ++ addr2 = iph->saddr.s6_addr32[3]; ++ ihl = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &ip_proto, ++ &fo); ++ if (unlikely(ihl < 0)) ++ goto other; ++ ++ break; ++ } ++#endif ++ default: ++other: ++ if (pull_len != 0) { ++ skb_push(skb, pull_len); ++ skb->network_header -= pull_len; ++ } ++ ++ return (u16)(ntohs(protocol) % dev->real_num_tx_queues); ++ } ++ ++ if (addr1 > addr2) ++ swap(addr1, addr2); ++ ++ switch (ip_proto) { ++ case IPPROTO_TCP: ++ case IPPROTO_UDP: ++ case IPPROTO_DCCP: ++ case IPPROTO_ESP: ++ case IPPROTO_AH: ++ case IPPROTO_SCTP: ++ case IPPROTO_UDPLITE: { ++ if (likely(skb_copy_bits(skb, ihl, &ports.in32, 4) >= 0)) { ++ if (ports.in16[0] > ports.in16[1]) ++ swap(ports.in16[0], ports.in16[1]); ++ break; ++ } ++ /* fall-through */ ++ } ++ default: ++ ports.in32 = 0; ++ break; ++ } ++ ++ if (pull_len != 0) { ++ skb_push(skb, pull_len); ++ skb->network_header -= pull_len; ++ } ++ ++ hash = jhash_3words(addr1, addr2, ports.in32, imq_hashrnd ^ ip_proto); ++ ++ return (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); ++} ++ ++static inline bool sk_tx_queue_recorded(struct sock *sk) ++{ ++ return (sk_tx_queue_get(sk) >= 0); ++} ++ ++static struct netdev_queue *imq_select_queue(struct net_device *dev, ++ struct sk_buff *skb) ++{ ++ u16 queue_index = 0; ++ u32 hash; ++ ++ if (likely(dev->real_num_tx_queues == 1)) ++ goto out; ++ ++ /* IMQ can be receiving ingress or engress packets. */ ++ ++ /* Check first for if rx_queue is set */ ++ if (skb_rx_queue_recorded(skb)) { ++ queue_index = skb_get_rx_queue(skb); ++ goto out; ++ } ++ ++ /* Check if socket has tx_queue set */ ++ if (sk_tx_queue_recorded(skb->sk)) { ++ queue_index = sk_tx_queue_get(skb->sk); ++ goto out; ++ } ++ ++ /* Try use socket hash */ ++ if (skb->sk && skb->sk->sk_hash) { ++ hash = skb->sk->sk_hash; ++ queue_index = ++ (u16)(((u64)hash * dev->real_num_tx_queues) >> 32); ++ goto out; ++ } ++ ++ /* Generate hash from packet data */ ++ queue_index = imq_hash(dev, skb); ++ ++out: ++ if (unlikely(queue_index >= dev->real_num_tx_queues)) ++ queue_index = (u16)((u32)queue_index % dev->real_num_tx_queues); ++ ++ skb_set_queue_mapping(skb, queue_index); ++ return netdev_get_tx_queue(dev, queue_index); ++} ++ ++static struct net_device_stats *imq_get_stats(struct net_device *dev) ++{ ++ return &dev->stats; ++} ++ ++/* called for packets kfree'd in qdiscs at places other than enqueue */ ++static void imq_skb_destructor(struct sk_buff *skb) ++{ ++ struct nf_queue_entry *entry = skb->nf_queue_entry; ++ ++ skb->nf_queue_entry = NULL; ++ ++ if (entry) { ++ nf_queue_entry_release_refs(entry); ++ kfree(entry); ++ } ++ ++ skb_restore_cb(skb); /* kfree backup */ ++} ++ ++static void imq_done_check_queue_mapping(struct sk_buff *skb, ++ struct net_device *dev) ++{ ++ unsigned int queue_index; ++ ++ /* Don't let queue_mapping be left too large after exiting IMQ */ ++ if (likely(skb->dev != dev && skb->dev != NULL)) { ++ queue_index = skb_get_queue_mapping(skb); ++ if (unlikely(queue_index >= skb->dev->real_num_tx_queues)) { ++ queue_index = (u16)((u32)queue_index % ++ skb->dev->real_num_tx_queues); ++ skb_set_queue_mapping(skb, queue_index); ++ } ++ } else { ++ /* skb->dev was IMQ device itself or NULL, be on safe side and ++ * just clear queue mapping. ++ */ ++ skb_set_queue_mapping(skb, 0); ++ } ++} ++ ++static netdev_tx_t imq_dev_xmit(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct nf_queue_entry *entry = skb->nf_queue_entry; ++ ++ rcu_read_lock(); ++ ++ skb->nf_queue_entry = NULL; ++ netif_trans_update(dev); ++ ++ dev->stats.tx_bytes += skb->len; ++ dev->stats.tx_packets++; ++ ++ if (unlikely(entry == NULL)) { ++ /* We don't know what is going on here.. packet is queued for ++ * imq device, but (probably) not by us. ++ * ++ * If this packet was not send here by imq_nf_queue(), then ++ * skb_save_cb() was not used and skb_free() should not show: ++ * WARNING: IMQ: kfree_skb: skb->cb_next:.. ++ * and/or ++ * WARNING: IMQ: kfree_skb: skb->nf_queue_entry... ++ * ++ * However if this message is shown, then IMQ is somehow broken ++ * and you should report this to linuximq.net. ++ */ ++ ++ /* imq_dev_xmit is black hole that eats all packets, report that ++ * we eat this packet happily and increase dropped counters. ++ */ ++ ++ dev->stats.tx_dropped++; ++ dev_kfree_skb(skb); ++ ++ rcu_read_unlock(); ++ return NETDEV_TX_OK; ++ } ++ ++ skb_restore_cb(skb); /* restore skb->cb */ ++ ++ skb->imq_flags = 0; ++ skb->destructor = NULL; ++ ++ imq_done_check_queue_mapping(skb, dev); ++ ++ nf_reinject(entry, NF_ACCEPT); ++ ++ rcu_read_unlock(); ++ return NETDEV_TX_OK; ++} ++ ++static struct net_device *get_imq_device_by_index(int index) ++{ ++ struct net_device *dev = NULL; ++ struct net *net; ++ char buf[8]; ++ ++ /* get device by name and cache result */ ++ snprintf(buf, sizeof(buf), "imq%d", index); ++ ++ /* Search device from all namespaces. */ ++ for_each_net(net) { ++ dev = dev_get_by_name(net, buf); ++ if (dev) ++ break; ++ } ++ ++ if (WARN_ON_ONCE(dev == NULL)) { ++ /* IMQ device not found. Exotic config? */ ++ return ERR_PTR(-ENODEV); ++ } ++ ++ imq_devs_cache[index] = dev; ++ dev_put(dev); ++ ++ return dev; ++} ++ ++static struct nf_queue_entry *nf_queue_entry_dup(struct nf_queue_entry *e) ++{ ++ struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC); ++ if (entry) { ++ nf_queue_entry_get_refs(entry); ++ return entry; ++ } ++ return NULL; ++} ++ ++#ifdef CONFIG_BRIDGE_NETFILTER ++/* When called from bridge netfilter, skb->data must point to MAC header ++ * before calling skb_gso_segment(). Else, original MAC header is lost ++ * and segmented skbs will be sent to wrong destination. ++ */ ++static void nf_bridge_adjust_skb_data(struct sk_buff *skb) ++{ ++ if (skb->nf_bridge) ++ __skb_push(skb, skb->network_header - skb->mac_header); ++} ++ ++static void nf_bridge_adjust_segmented_data(struct sk_buff *skb) ++{ ++ if (skb->nf_bridge) ++ __skb_pull(skb, skb->network_header - skb->mac_header); ++} ++#else ++#define nf_bridge_adjust_skb_data(s) do {} while (0) ++#define nf_bridge_adjust_segmented_data(s) do {} while (0) ++#endif ++ ++static void free_entry(struct nf_queue_entry *entry) ++{ ++ nf_queue_entry_release_refs(entry); ++ kfree(entry); ++} ++ ++static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev); ++ ++static int __imq_nf_queue_gso(struct nf_queue_entry *entry, ++ struct net_device *dev, struct sk_buff *skb) ++{ ++ int ret = -ENOMEM; ++ struct nf_queue_entry *entry_seg; ++ ++ nf_bridge_adjust_segmented_data(skb); ++ ++ if (skb->next == NULL) { /* last packet, no need to copy entry */ ++ struct sk_buff *gso_skb = entry->skb; ++ entry->skb = skb; ++ ret = __imq_nf_queue(entry, dev); ++ if (ret) ++ entry->skb = gso_skb; ++ return ret; ++ } ++ ++ skb->next = NULL; ++ ++ entry_seg = nf_queue_entry_dup(entry); ++ if (entry_seg) { ++ entry_seg->skb = skb; ++ ret = __imq_nf_queue(entry_seg, dev); ++ if (ret) ++ free_entry(entry_seg); ++ } ++ return ret; ++} ++ ++static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num) ++{ ++ struct sk_buff *skb, *segs; ++ struct net_device *dev; ++ unsigned int queued; ++ int index, retval, err; ++ ++ index = entry->skb->imq_flags & IMQ_F_IFMASK; ++ if (unlikely(index > numdevs - 1)) { ++ if (net_ratelimit()) ++ pr_warn("IMQ: invalid device specified, highest is %u\n", ++ numdevs - 1); ++ retval = -EINVAL; ++ goto out_no_dev; ++ } ++ ++ /* check for imq device by index from cache */ ++ dev = imq_devs_cache[index]; ++ if (unlikely(!dev)) { ++ dev = get_imq_device_by_index(index); ++ if (IS_ERR(dev)) { ++ retval = PTR_ERR(dev); ++ goto out_no_dev; ++ } ++ } ++ ++ if (unlikely(!(dev->flags & IFF_UP))) { ++ entry->skb->imq_flags = 0; ++ retval = -ECANCELED; ++ goto out_no_dev; ++ } ++ ++ /* Since 3.10.x, GSO handling moved here as result of upstream commit ++ * a5fedd43d5f6c94c71053a66e4c3d2e35f1731a2 (netfilter: move ++ * skb_gso_segment into nfnetlink_queue module). ++ * ++ * Following code replicates the gso handling from ++ * 'net/netfilter/nfnetlink_queue_core.c':nfqnl_enqueue_packet(). ++ */ ++ ++ skb = entry->skb; ++ ++ switch (entry->state.pf) { ++ case NFPROTO_IPV4: ++ skb->protocol = htons(ETH_P_IP); ++ break; ++ case NFPROTO_IPV6: ++ skb->protocol = htons(ETH_P_IPV6); ++ break; ++ } ++ ++ if (!skb_is_gso(entry->skb)) ++ return __imq_nf_queue(entry, dev); ++ ++ nf_bridge_adjust_skb_data(skb); ++ segs = skb_gso_segment(skb, 0); ++ /* Does not use PTR_ERR to limit the number of error codes that can be ++ * returned by nf_queue. For instance, callers rely on -ECANCELED to ++ * mean 'ignore this hook'. ++ */ ++ err = -ENOBUFS; ++ if (IS_ERR(segs)) ++ goto out_err; ++ queued = 0; ++ err = 0; ++ do { ++ struct sk_buff *nskb = segs->next; ++ if (nskb && nskb->next) ++ nskb->cb_next = NULL; ++ if (err == 0) ++ err = __imq_nf_queue_gso(entry, dev, segs); ++ if (err == 0) ++ queued++; ++ else ++ kfree_skb(segs); ++ segs = nskb; ++ } while (segs); ++ ++ if (queued) { ++ if (err) /* some segments are already queued */ ++ free_entry(entry); ++ kfree_skb(skb); ++ return 0; ++ } ++ ++out_err: ++ nf_bridge_adjust_segmented_data(skb); ++ retval = err; ++out_no_dev: ++ return retval; ++} ++ ++static int __imq_nf_queue(struct nf_queue_entry *entry, struct net_device *dev) ++{ ++ struct sk_buff *skb_orig, *skb, *skb_shared, *skb_popd; ++ struct Qdisc *q; ++ struct sk_buff *to_free = NULL; ++ struct netdev_queue *txq; ++ spinlock_t *root_lock; ++ int users; ++ int retval = -EINVAL; ++ unsigned int orig_queue_index; ++ ++ dev->last_rx = jiffies; ++ ++ skb = entry->skb; ++ skb_orig = NULL; ++ ++ /* skb has owner? => make clone */ ++ if (unlikely(skb->destructor)) { ++ skb_orig = skb; ++ skb = skb_clone(skb, GFP_ATOMIC); ++ if (unlikely(!skb)) { ++ retval = -ENOMEM; ++ goto out; ++ } ++ skb->cb_next = NULL; ++ entry->skb = skb; ++ } ++ ++ dev->stats.rx_bytes += skb->len; ++ dev->stats.rx_packets++; ++ ++ if (!skb->dev) { ++ /* skb->dev == NULL causes problems, try the find cause. */ ++ if (net_ratelimit()) { ++ dev_warn(&dev->dev, ++ "received packet with skb->dev == NULL\n"); ++ dump_stack(); ++ } ++ ++ skb->dev = dev; ++ } ++ ++ /* Disables softirqs for lock below */ ++ rcu_read_lock_bh(); ++ ++ /* Multi-queue selection */ ++ orig_queue_index = skb_get_queue_mapping(skb); ++ txq = imq_select_queue(dev, skb); ++ ++ q = rcu_dereference(txq->qdisc); ++ if (unlikely(!q->enqueue)) ++ goto packet_not_eaten_by_imq_dev; ++ ++ skb->nf_queue_entry = entry; ++ root_lock = qdisc_lock(q); ++ spin_lock(root_lock); ++ ++ users = refcount_read(&skb->users); ++ ++ skb_shared = skb_get(skb); /* increase reference count by one */ ++ ++ /* backup skb->cb, as qdisc layer will overwrite it */ ++ skb_save_cb(skb_shared); ++ qdisc_enqueue_root(skb_shared, q, &to_free); /* might kfree_skb */ ++ if (likely(refcount_read(&skb_shared->users) == users + 1)) { ++ bool validate; ++ ++ kfree_skb(skb_shared); /* decrease reference count by one */ ++ ++ skb->destructor = &imq_skb_destructor; ++ ++ skb_popd = qdisc_dequeue_skb(q, &validate); ++ ++ /* cloned? */ ++ if (unlikely(skb_orig)) ++ kfree_skb(skb_orig); /* free original */ ++ ++ spin_unlock(root_lock); ++ ++#if 0 ++ /* schedule qdisc dequeue */ ++ __netif_schedule(q); ++#else ++ if (likely(skb_popd)) { ++ /* Note that we validate skb (GSO, checksum, ...) outside of locks */ ++ if (validate) ++ skb_popd = validate_xmit_skb_list(skb_popd, dev); ++ ++ if (skb_popd) { ++ int dummy_ret; ++ int cpu = smp_processor_id(); /* ok because BHs are off */ ++ ++ txq = skb_get_tx_queue(dev, skb_popd); ++ /* ++ IMQ device will not be frozen or stoped, and it always be successful. ++ So we need not check its status and return value to accelerate. ++ */ ++ if (imq_dev_accurate_stats && txq->xmit_lock_owner != cpu) { ++ HARD_TX_LOCK(dev, txq, cpu); ++ if (!netif_xmit_frozen_or_stopped(txq)) { ++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); ++ } ++ HARD_TX_UNLOCK(dev, txq); ++ } else { ++ if (!netif_xmit_frozen_or_stopped(txq)) { ++ dev_hard_start_xmit(skb_popd, dev, txq, &dummy_ret); ++ } ++ } ++ } ++ } else { ++ /* No ready skb, then schedule it */ ++ __netif_schedule(q); ++ } ++#endif ++ rcu_read_unlock_bh(); ++ retval = 0; ++ goto out; ++ } else { ++ skb_restore_cb(skb_shared); /* restore skb->cb */ ++ skb->nf_queue_entry = NULL; ++ /* ++ * qdisc dropped packet and decreased skb reference count of ++ * skb, so we don't really want to and try refree as that would ++ * actually destroy the skb. ++ */ ++ spin_unlock(root_lock); ++ goto packet_not_eaten_by_imq_dev; ++ } ++ ++packet_not_eaten_by_imq_dev: ++ skb_set_queue_mapping(skb, orig_queue_index); ++ rcu_read_unlock_bh(); ++ ++ /* cloned? restore original */ ++ if (unlikely(skb_orig)) { ++ kfree_skb(skb); ++ entry->skb = skb_orig; ++ } ++ retval = -1; ++out: ++ if (unlikely(to_free)) { ++ kfree_skb_list(to_free); ++ } ++ return retval; ++} ++static unsigned int imq_nf_hook(void *priv, ++ struct sk_buff *skb, ++ const struct nf_hook_state *state) ++{ ++ return (skb->imq_flags & IMQ_F_ENQUEUE) ? NF_IMQ_QUEUE : NF_ACCEPT; ++} ++ ++static int imq_close(struct net_device *dev) ++{ ++ netif_stop_queue(dev); ++ return 0; ++} ++ ++static int imq_open(struct net_device *dev) ++{ ++ netif_start_queue(dev); ++ return 0; ++} ++ ++static struct device_type imq_device_type = { ++ .name = "imq", ++}; ++ ++static const struct net_device_ops imq_netdev_ops = { ++ .ndo_open = imq_open, ++ .ndo_stop = imq_close, ++ .ndo_start_xmit = imq_dev_xmit, ++ .ndo_get_stats = imq_get_stats, ++}; ++ ++static void imq_setup(struct net_device *dev) ++{ ++ dev->netdev_ops = &imq_netdev_ops; ++ dev->type = ARPHRD_VOID; ++ dev->mtu = 16000; /* too small? */ ++ dev->tx_queue_len = 11000; /* too big? */ ++ dev->flags = IFF_NOARP; ++ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | ++ NETIF_F_GSO | NETIF_F_HW_CSUM | ++ NETIF_F_HIGHDMA; ++ dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | ++ IFF_TX_SKB_SHARING); ++} ++ ++static int imq_validate(struct nlattr *tb[], struct nlattr *data[], ++ struct netlink_ext_ack *extack) ++{ ++ int ret = 0; ++ ++ if (tb[IFLA_ADDRESS]) { ++ if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) { ++ ret = -EINVAL; ++ goto end; ++ } ++ if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) { ++ ret = -EADDRNOTAVAIL; ++ goto end; ++ } ++ } ++ return 0; ++end: ++ pr_warn("IMQ: imq_validate failed (%d)\n", ret); ++ return ret; ++} ++ ++static struct rtnl_link_ops imq_link_ops __read_mostly = { ++ .kind = "imq", ++ .priv_size = 0, ++ .setup = imq_setup, ++ .validate = imq_validate, ++}; ++ ++static const struct nf_queue_handler imq_nfqh = { ++ .outfn = imq_nf_queue, ++}; ++ ++static inline char *kernel_strdup(const char *str) ++{ ++ char *tmp; ++ long int s; ++ s=strlen(str) + 1; ++ tmp = kmalloc(s, GFP_ATOMIC); ++ if (tmp != NULL) ++ { ++ memcpy(tmp, str, s); ++ } ++ return tmp; ++} ++ ++/* ++ * line is the line to be parsed -- it is not modified in any way ++ * max_pieces indicates number of pieces to return, if negative this is determined dynamically ++ * include_remainder_at_max indicates whether the last piece, when max pieces are reached, ++ * should be what it would normally be (0) or the entire remainder of the line (1) ++ * if max_pieces < 0 this parameter is ignored ++ * ++ * ++ * returns all non-separator pieces in a line ++ * result is dynamically allocated, MUST be freed after call-- even if ++ * line is empty (you still get a valid char** pointer to to a NULL char*) ++ */ ++char** split_on_separators(char* line, char* separators, int num_separators, int max_pieces, int include_remainder_at_max, unsigned long *num_pieces) ++{ ++ char** split; ++ ++ *num_pieces = 0; ++ if(line != NULL) ++ { ++ int split_index; ++ int non_separator_found; ++ char* dup_line; ++ char* start; ++ ++ if(max_pieces < 0) ++ { ++ /* count number of separator characters in line -- this count + 1 is an upperbound on number of pieces */ ++ int separator_count = 0; ++ int line_index; ++ for(line_index = 0; line[line_index] != '\0'; line_index++) ++ { ++ int sep_index; ++ int found = 0; ++ for(sep_index =0; found == 0 && sep_index < num_separators; sep_index++) ++ { ++ found = separators[sep_index] == line[line_index] ? 1 : 0; ++ } ++ separator_count = separator_count+ found; ++ } ++ max_pieces = separator_count + 1; ++ } ++ split = (char**)kmalloc((1+max_pieces)*sizeof(char*), GFP_ATOMIC); ++ split_index = 0; ++ split[split_index] = NULL; ++ ++ ++ dup_line = kernel_strdup(line); ++ start = dup_line; ++ non_separator_found = 0; ++ while(non_separator_found == 0) ++ { ++ int matches = 0; ++ int sep_index; ++ for(sep_index =0; sep_index < num_separators; sep_index++) ++ { ++ matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; ++ } ++ non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; ++ if(non_separator_found == 0) ++ { ++ start++; ++ } ++ } ++ ++ while(start[0] != '\0' && split_index < max_pieces) ++ { ++ /* find first separator index */ ++ int first_separator_index = 0; ++ int separator_found = 0; ++ while( separator_found == 0 ) ++ { ++ int sep_index; ++ for(sep_index =0; separator_found == 0 && sep_index < num_separators; sep_index++) ++ { ++ separator_found = separators[sep_index] == start[first_separator_index] || start[first_separator_index] == '\0' ? 1 : 0; ++ } ++ if(separator_found == 0) ++ { ++ first_separator_index++; ++ } ++ } ++ ++ /* copy next piece to split array */ ++ if(first_separator_index > 0) ++ { ++ char* next_piece = NULL; ++ if(split_index +1 < max_pieces || include_remainder_at_max <= 0) ++ { ++ next_piece = (char*)kmalloc((first_separator_index+1)*sizeof(char), GFP_ATOMIC); ++ memcpy(next_piece, start, first_separator_index); ++ next_piece[first_separator_index] = '\0'; ++ } ++ else ++ { ++ next_piece = kernel_strdup(start); ++ } ++ split[split_index] = next_piece; ++ split[split_index+1] = NULL; ++ split_index++; ++ } ++ ++ ++ /* find next non-separator index, indicating start of next piece */ ++ start = start+ first_separator_index; ++ non_separator_found = 0; ++ while(non_separator_found == 0) ++ { ++ int matches = 0; ++ int sep_index; ++ for(sep_index =0; sep_index < num_separators; sep_index++) ++ { ++ matches = matches == 1 || separators[sep_index] == start[0] ? 1 : 0; ++ } ++ non_separator_found = matches==0 || start[0] == '\0' ? 1 : 0; ++ if(non_separator_found == 0) ++ { ++ start++; ++ } ++ } ++ } ++ kfree(dup_line); ++ *num_pieces = split_index; ++ } ++ else ++ { ++ split = (char**)kmalloc((1)*sizeof(char*), GFP_ATOMIC); ++ split[0] = NULL; ++ } ++ return split; ++} ++ ++ ++/* returns number freed */ ++int free_null_terminated_string_array(char** strs) ++{ ++ unsigned long str_index = 0; ++ if(strs != NULL) ++ { ++ for(str_index=0; strs[str_index] != NULL; str_index++) ++ { ++ kfree(strs[str_index]); ++ } ++ kfree(strs); ++ } ++ return str_index; ++} ++ ++ ++ ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ #define DEFAULT_PRE_TABLE "mangle" ++#else ++ #define DEFAULT_PRE_TABLE "nat" ++#endif ++ ++#if defined(CONFIG_IMQ_BEHAVIOR_AA) || defined(CONFIG_IMQ_BEHAVIOR_BA) ++ #define DEFAULT_POST_TABLE "nat" ++#else ++ #define DEFAULT_POST_TABLE "mangle" ++#endif ++ ++static char* hook_chains = "PREROUTING,POSTROUTING"; ++static char* hook_tables = DEFAULT_PRE_TABLE","DEFAULT_POST_TABLE; ++ ++static struct nf_hook_ops* hook_list = NULL; ++static int hook_list_length = 0; ++ ++static int __net_init imq_nf_register(struct net *net) ++{ ++ int ret; ++ char separators[4] = {',', ' ', '\t', '\0' }; ++ unsigned long num_chains; ++ unsigned long num_tables; ++ char** chain_list = split_on_separators(hook_chains, separators, 3, -1, 0, &num_chains); ++ char** table_list = split_on_separators(hook_tables, separators, 3, -1, 0, &num_tables); ++ int hook_index = 0; ++ ++ hook_list_length = 0; ++ if(num_chains != num_tables) ++ { ++ printk("ERROR: must have same number of chains and tables\n"); ++ return -1; ++ } ++ ++ /* we multiply by 2 here since we need hooks for both IPv4 and IPv6 */ ++ hook_list = (struct nf_hook_ops*)kmalloc(sizeof(struct nf_hook_ops)*((num_chains*2)+1), GFP_ATOMIC); ++ ++ ++ for(hook_index=0; hook_index < num_chains; hook_index++) ++ { ++ char* chain = chain_list[hook_index]; ++ char* table = table_list[hook_index]; ++ int valid = 0; ++ if(strcmp(chain, "PREROUTING") == 0 || strcmp(chain, "POSTROUTING") == 0 || strcmp(chain, "INPUT") == 0 || strcmp(chain, "FORWARD") == 0 || strcmp(chain, "OUTPUT") == 0) ++ { ++ if( strcmp(table, "mangle") == 0 || ++ (strcmp(table, "nat") == 0 && strcmp(chain, "FORWARD") != 0 && strcmp(chain, "INPUT") != 0 ) || ++ (strcmp(table, "filter") == 0 && strcmp(chain, "PREROUTING") != 0 && strcmp(chain, "POSTROUTING") != 0 ) ++ ) ++ { ++ unsigned int chain_id = NF_INET_PRE_ROUTING; ++ int table_id = NF_IP_PRI_MANGLE; ++ int err = 0; ++ ++ valid = 1; ++ ++ if(strcmp(chain, "PREROUTING") == 0) ++ { ++ chain_id = NF_INET_PRE_ROUTING; ++ } ++ else if (strcmp(chain, "POSTROUTING") == 0) ++ { ++ chain_id = NF_INET_POST_ROUTING; ++ } ++ else if (strcmp(chain, "INPUT") == 0) ++ { ++ chain_id = NF_INET_LOCAL_IN; ++ ++ } ++ else if (strcmp(chain, "FORWARD") == 0) ++ { ++ chain_id = NF_INET_FORWARD; ++ ++ } ++ else if (strcmp(chain, "OUTPUT") == 0) ++ { ++ chain_id = NF_INET_LOCAL_OUT; ++ } ++ ++ if(strcmp(table, "mangle") == 0) ++ { ++ table_id = NF_IP_PRI_MANGLE+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") == 0) ++ { ++ table_id = NF_IP_PRI_NAT_SRC+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") != 0) ++ { ++ table_id = NF_IP_PRI_NAT_DST+1; ++ } ++ else if (strcmp(table, "filter") == 0) ++ { ++ table_id = NF_IP_PRI_FILTER+1; ++ } ++ (hook_list[hook_list_length]).hook = imq_nf_hook; ++ (hook_list[hook_list_length]).pf = PF_INET; ++ (hook_list[hook_list_length]).hooknum = chain_id; ++ (hook_list[hook_list_length]).priority = table_id; ++ printk(KERN_INFO "\tIMQv4: Hooking IMQ after %s on %s, pf=%d, hooknum=%d, priority=%d\n", table, chain, (hook_list[hook_list_length]).pf, (hook_list[hook_list_length]).hooknum, (hook_list[hook_list_length]).priority); ++ hook_list_length++; ++ ++ #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) ++ if(strcmp(table, "mangle") == 0) ++ { ++ table_id = NF_IP6_PRI_MANGLE+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") == 0) ++ { ++ table_id = NF_IP6_PRI_NAT_SRC+1; ++ } ++ else if (strcmp(table, "nat") == 0 && strcmp(chain, "POSTROUTING") != 0) ++ { ++ table_id = NF_IP6_PRI_NAT_DST+1; ++ } ++ else if (strcmp(table, "filter") == 0) ++ { ++ table_id = NF_IP6_PRI_FILTER+1; ++ } ++ ++ (hook_list[hook_list_length]).hook = imq_nf_hook; ++ (hook_list[hook_list_length]).pf = PF_INET6; ++ (hook_list[hook_list_length]).hooknum = chain_id; ++ (hook_list[hook_list_length]).priority = table_id; ++ printk(KERN_INFO "\tIMQv6: Hooking IMQ after %s on %s, pf=%d, hooknum=%d, priority=%d\n", table, chain, (hook_list[hook_list_length]).pf, (hook_list[hook_list_length]).hooknum, (hook_list[hook_list_length]).priority); ++ hook_list_length++; ++ #endif ++ } ++ } ++ if(valid == 0) ++ { ++ printk("ERROR: invalid chain/table at index %d (%s/%s)\n", hook_index, chain, table); ++ } ++ } ++ free_null_terminated_string_array(chain_list); ++ free_null_terminated_string_array(table_list); ++ ++ return nf_register_net_hooks(net, hook_list, ++ hook_list_length); ++}; ++ ++ ++static void __net_exit imq_nf_unregister(struct net *net) ++{ ++ nf_unregister_net_hooks(net, hook_list, ++ hook_list_length); ++}; ++ ++static struct pernet_operations imq_net_ops = { ++ .init = imq_nf_register, ++ .exit = imq_nf_unregister, ++}; ++ ++static int __net_init imq_init_hooks(void) ++{ ++ int ret ; ++ nf_register_queue_imq_handler(&imq_nfqh); ++ ++ ret = register_pernet_subsys(&imq_net_ops); ++ if (ret < 0) ++ nf_unregister_queue_imq_handler(); ++ ++ return ret; ++} ++ ++#ifdef CONFIG_LOCKDEP ++ static struct lock_class_key imq_netdev_addr_lock_key; ++ ++ static void __init imq_dev_set_lockdep_one(struct net_device *dev, ++ struct netdev_queue *txq, void *arg) ++ { ++ /* ++ * the IMQ transmit locks can be taken recursively, ++ * for example with one IMQ rule for input- and one for ++ * output network devices in iptables! ++ * until we find a better solution ignore them. ++ */ ++ lockdep_set_novalidate_class(&txq->_xmit_lock); ++ } ++ ++ static void imq_dev_set_lockdep_class(struct net_device *dev) ++ { ++ lockdep_set_class_and_name(&dev->addr_list_lock, ++ &imq_netdev_addr_lock_key, "_xmit_addr_IMQ"); ++ netdev_for_each_tx_queue(dev, imq_dev_set_lockdep_one, NULL); ++} ++#else ++ static inline void imq_dev_set_lockdep_class(struct net_device *dev) ++ { ++ } ++#endif ++ ++static int __init imq_init_one(int index) ++{ ++ struct net_device *dev; ++ int ret; ++ ++ dev = alloc_netdev_mq(0, "imq%d", NET_NAME_UNKNOWN, imq_setup, numqueues); ++ if (!dev) ++ return -ENOMEM; ++ ++ ret = dev_alloc_name(dev, dev->name); ++ if (ret < 0) ++ goto fail; ++ ++ dev->rtnl_link_ops = &imq_link_ops; ++ SET_NETDEV_DEVTYPE(dev, &imq_device_type); ++ ret = register_netdevice(dev); ++ if (ret < 0) ++ goto fail; ++ ++ imq_dev_set_lockdep_class(dev); ++ ++ return 0; ++fail: ++ free_netdev(dev); ++ return ret; ++} ++ ++static int __init imq_init_devs(void) ++{ ++ int err, i; ++ ++ if (numdevs < 1 || numdevs > IMQ_MAX_DEVS) { ++ pr_err("IMQ: numdevs has to be betweed 1 and %u\n", ++ IMQ_MAX_DEVS); ++ return -EINVAL; ++ } ++ ++ if (numqueues < 1 || numqueues > IMQ_MAX_QUEUES) { ++ pr_err("IMQ: numqueues has to be betweed 1 and %u\n", ++ IMQ_MAX_QUEUES); ++ return -EINVAL; ++ } ++ ++ get_random_bytes(&imq_hashrnd, sizeof(imq_hashrnd)); ++ ++ rtnl_lock(); ++ err = __rtnl_link_register(&imq_link_ops); ++ ++ for (i = 0; i < numdevs && !err; i++) ++ err = imq_init_one(i); ++ ++ if (err) { ++ __rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++ } ++ rtnl_unlock(); ++ ++ return err; ++} ++ ++static int __init imq_init_module(void) ++{ ++ int err; ++ ++#if defined(CONFIG_IMQ_NUM_DEVS) ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS > 16); ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS < 2); ++ BUILD_BUG_ON(CONFIG_IMQ_NUM_DEVS - 1 > IMQ_F_IFMASK); ++#endif ++ ++ err = imq_init_devs(); ++ if (err) { ++ pr_err("IMQ: Error trying imq_init_devs(net)\n"); ++ return err; ++ } ++ ++ err = imq_init_hooks(); ++ if (err) { ++ pr_err(KERN_ERR "IMQ: Error trying imq_init_hooks()\n"); ++ rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++ return err; ++ } ++ ++ pr_info("IMQ driver loaded successfully. (numdevs = %d, numqueues = %d, imq_dev_accurate_stats = %d)\n", ++ numdevs, numqueues, imq_dev_accurate_stats); ++/* ++#if defined(CONFIG_IMQ_BEHAVIOR_BA) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ pr_info("\tHooking IMQ before NAT on PREROUTING.\n"); ++#else ++ pr_info("\tHooking IMQ after NAT on PREROUTING.\n"); ++#endif ++#if defined(CONFIG_IMQ_BEHAVIOR_AB) || defined(CONFIG_IMQ_BEHAVIOR_BB) ++ pr_info("\tHooking IMQ before NAT on POSTROUTING.\n"); ++#else ++ pr_info("\tHooking IMQ after NAT on POSTROUTING.\n"); ++#endif ++*/ ++ return 0; ++} ++ ++static void __exit imq_unhook(void) ++{ ++ unregister_pernet_subsys(&imq_net_ops); ++ nf_unregister_queue_imq_handler(); ++ ++ kfree(hook_list); ++ hook_list_length = 0; ++} ++ ++static void __exit imq_cleanup_devs(void) ++{ ++ rtnl_link_unregister(&imq_link_ops); ++ memset(imq_devs_cache, 0, sizeof(imq_devs_cache)); ++} ++ ++static void __exit imq_exit_module(void) ++{ ++ imq_unhook(); ++ imq_cleanup_devs(); ++ pr_info("IMQ driver unloaded successfully.\n"); ++} ++ ++module_init(imq_init_module); ++module_exit(imq_exit_module); ++ ++module_param(numdevs, int, 0); ++module_param(numqueues, int, 0); ++module_param(imq_dev_accurate_stats, int, 0); ++module_param(hook_chains, charp, 0); ++module_param(hook_tables, charp, 0); ++MODULE_PARM_DESC(numdevs, "number of IMQ devices (how many imq* devices will be created)"); ++MODULE_PARM_DESC(numqueues, "number of queues per IMQ device"); ++MODULE_PARM_DESC(imq_dev_accurate_stats, "Notify if need the accurate imq device stats"); ++MODULE_PARM_DESC(hook_chains, "netfilter chains in which to insert hooks to IMQ"); ++MODULE_PARM_DESC(hook_tables, "netfilter tables after which to insert hooks to IMQ"); ++ ++MODULE_AUTHOR("https://github.com/imq/linuximq"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information."); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS_RTNL_LINK("imq"); +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/imq.h 2018-04-22 23:20:39.411768985 -0400 +@@ -0,0 +1,13 @@ ++#ifndef _IMQ_H ++#define _IMQ_H ++ ++/* IFMASK (16 device indexes, 0 to 15) and flag(s) fit in 5 bits */ ++#define IMQ_F_BITS 5 ++ ++#define IMQ_F_IFMASK 0x0f ++#define IMQ_F_ENQUEUE 0x10 ++ ++#define IMQ_MAX_DEVS (IMQ_F_IFMASK + 1) ++ ++#endif /* _IMQ_H */ ++ +--- a/include/linux/netdevice.h 2018-04-22 23:18:14.351723881 -0400 ++++ b/include/linux/netdevice.h 2018-04-22 23:20:39.411768985 -0400 +@@ -1785,6 +1785,11 @@ + /* + * Cache lines mostly used on receive path (including eth_type_trans()) + */ ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ unsigned long last_rx; ++#endif ++ + /* Interface address info used in eth_type_trans() */ + unsigned char *dev_addr; + +@@ -3646,6 +3651,19 @@ + } \ + } + ++#define HARD_TX_LOCK_BH(dev, txq) { \ ++ if ((dev->features & NETIF_F_LLTX) == 0) { \ ++ __netif_tx_lock_bh(txq); \ ++ } \ ++} ++ ++#define HARD_TX_UNLOCK_BH(dev, txq) { \ ++ if ((dev->features & NETIF_F_LLTX) == 0) { \ ++ __netif_tx_unlock_bh(txq); \ ++ } \ ++} ++ ++ + static inline void netif_tx_disable(struct net_device *dev) + { + unsigned int i; +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/netfilter/xt_IMQ.h 2018-04-22 23:20:39.415768987 -0400 +@@ -0,0 +1,9 @@ ++#ifndef _XT_IMQ_H ++#define _XT_IMQ_H ++ ++struct xt_imq_info { ++ unsigned int todev; /* target imq device */ ++}; ++ ++#endif /* _XT_IMQ_H */ ++ +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/netfilter_ipv4/ipt_IMQ.h 2018-04-22 23:20:39.415768987 -0400 +@@ -0,0 +1,10 @@ ++#ifndef _IPT_IMQ_H ++#define _IPT_IMQ_H ++ ++/* Backwards compatibility for old userspace */ ++#include ++ ++#define ipt_imq_info xt_imq_info ++ ++#endif /* _IPT_IMQ_H */ ++ +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h 2018-04-22 23:20:39.415768987 -0400 +@@ -0,0 +1,10 @@ ++#ifndef _IP6T_IMQ_H ++#define _IP6T_IMQ_H ++ ++/* Backwards compatibility for old userspace */ ++#include ++ ++#define ip6t_imq_info xt_imq_info ++ ++#endif /* _IP6T_IMQ_H */ ++ +--- a/include/linux/skbuff.h 2018-04-22 23:18:15.079724108 -0400 ++++ b/include/linux/skbuff.h 2018-04-22 23:20:39.415768987 -0400 +@@ -40,6 +40,10 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif ++ + + /* The interface for checksum offload between the stack and networking drivers + * is as follows... +@@ -582,7 +586,7 @@ + typedef unsigned char *sk_buff_data_t; + #endif + +-/** ++/** + * struct sk_buff - socket buffer + * @next: Next buffer in list + * @prev: Previous buffer in list +@@ -685,6 +689,9 @@ + * first. This is owned by whoever has the skb queued ATM. + */ + char cb[48] __aligned(8); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ void *cb_next; ++#endif + + unsigned long _skb_refdst; + void (*destructor)(struct sk_buff *skb); +@@ -694,6 +701,9 @@ + #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) + unsigned long _nfct; + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ struct nf_queue_entry *nf_queue_entry; ++#endif + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) + struct nf_bridge_info *nf_bridge; + #endif +@@ -771,6 +781,9 @@ + #ifdef CONFIG_NET_SWITCHDEV + __u8 offload_fwd_mark:1; + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ __u8 imq_flags:IMQ_F_BITS; ++#endif + #ifdef CONFIG_NET_CLS_ACT + __u8 tc_skip_classify:1; + __u8 tc_at_ingress:1; +@@ -870,7 +883,7 @@ + */ + static inline struct dst_entry *skb_dst(const struct sk_buff *skb) + { +- /* If refdst was not refcounted, check we still are in a ++ /* If refdst was not refcounted, check we still are in a + * rcu_read_lock section + */ + WARN_ON((skb->_skb_refdst & SKB_DST_NOREF) && +@@ -960,6 +973,12 @@ + void consume_skb(struct sk_buff *skb); + void __consume_stateless_skb(struct sk_buff *skb); + void __kfree_skb(struct sk_buff *skb); ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++int skb_save_cb(struct sk_buff *skb); ++int skb_restore_cb(struct sk_buff *skb); ++#endif ++ + extern struct kmem_cache *skbuff_head_cache; + + void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); +@@ -3779,8 +3798,12 @@ + dst->_nfct = src->_nfct; + nf_conntrack_get(skb_nfct(src)); + #endif ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ dst->imq_flags = src->imq_flags; ++ dst->nf_queue_entry = src->nf_queue_entry; ++#endif + #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) +- dst->nf_bridge = src->nf_bridge; ++ dst->nf_bridge = src->nf_bridge; + nf_bridge_get(src->nf_bridge); + #endif + #if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES) +--- a/include/net/netfilter/nf_queue.h 2018-04-22 23:18:15.199724146 -0400 ++++ b/include/net/netfilter/nf_queue.h 2018-04-22 23:20:39.419768987 -0400 +@@ -31,6 +31,12 @@ + void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh); + void nf_unregister_queue_handler(struct net *net); + void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict); ++void nf_queue_entry_release_refs(struct nf_queue_entry *entry); ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh); ++void nf_unregister_queue_imq_handler(void); ++#endif + + void nf_queue_entry_get_refs(struct nf_queue_entry *entry); + void nf_queue_entry_release_refs(struct nf_queue_entry *entry); +--- a/include/net/pkt_sched.h 2018-04-22 23:18:15.219724151 -0400 ++++ b/include/net/pkt_sched.h 2018-04-22 23:20:39.419768987 -0400 +@@ -109,6 +109,8 @@ + + void __qdisc_run(struct Qdisc *q); + ++struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate); ++ + static inline void qdisc_run(struct Qdisc *q) + { + if (qdisc_run_begin(q)) +--- a/include/net/sch_generic.h 2018-04-22 23:18:15.227724154 -0400 ++++ b/include/net/sch_generic.h 2018-04-22 23:20:39.419768987 -0400 +@@ -567,6 +567,13 @@ + return sch->enqueue(skb, sch, to_free); + } + ++static inline int qdisc_enqueue_root(struct sk_buff *skb, struct Qdisc *sch, ++ struct sk_buff **to_free) ++{ ++ qdisc_skb_cb(skb)->pkt_len = skb->len; ++ return qdisc_enqueue(skb, sch, to_free) & NET_XMIT_MASK; ++} ++ + static inline bool qdisc_is_percpu_stats(const struct Qdisc *q) + { + return q->flags & TCQ_F_CPUSTATS; +--- a/include/uapi/linux/netfilter.h 2018-04-22 23:18:16.159724442 -0400 ++++ b/include/uapi/linux/netfilter.h 2018-04-22 23:20:39.419768987 -0400 +@@ -14,7 +14,8 @@ + #define NF_QUEUE 3 + #define NF_REPEAT 4 + #define NF_STOP 5 /* Deprecated, for userspace nf_queue compatibility. */ +-#define NF_MAX_VERDICT NF_STOP ++#define NF_IMQ_QUEUE 6 ++#define NF_MAX_VERDICT NF_IMQ_QUEUE + + /* we overload the higher bits for encoding auxiliary data such as the queue + * number or errno values. Not nice, but better than additional function +--- a/net/core/dev.c 2018-04-22 23:18:24.391727000 -0400 ++++ b/net/core/dev.c 2018-04-22 23:20:39.419768987 -0400 +@@ -143,6 +143,9 @@ + #include + #include + #include ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++#include ++#endif + #include + #include + +@@ -2979,7 +2982,12 @@ + unsigned int len; + int rc; + ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ if ((!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) && ++ !(skb->imq_flags & IMQ_F_ENQUEUE)) ++#else + if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) ++#endif + dev_queue_xmit_nit(skb, dev); + + #ifdef CONFIG_ETHERNET_PACKET_MANGLE +@@ -3028,6 +3036,8 @@ + return skb; + } + ++EXPORT_SYMBOL_GPL(dev_hard_start_xmit); ++ + static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, + netdev_features_t features) + { +--- a/net/core/skbuff.c 2018-04-22 23:18:24.395727003 -0400 ++++ b/net/core/skbuff.c 2018-04-22 23:20:39.419768987 -0400 +@@ -82,6 +82,87 @@ + static struct kmem_cache *skbuff_fclone_cache __read_mostly; + int sysctl_max_skb_frags __read_mostly = MAX_SKB_FRAGS; + EXPORT_SYMBOL(sysctl_max_skb_frags); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++static struct kmem_cache *skbuff_cb_store_cache __read_mostly; ++#endif ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++/* Control buffer save/restore for IMQ devices */ ++struct skb_cb_table { ++ char cb[48] __aligned(8); ++ void *cb_next; ++ atomic_t refcnt; ++}; ++ ++static DEFINE_SPINLOCK(skb_cb_store_lock); ++ ++int skb_save_cb(struct sk_buff *skb) ++{ ++ struct skb_cb_table *next; ++ ++ next = kmem_cache_alloc(skbuff_cb_store_cache, GFP_ATOMIC); ++ if (!next) ++ return -ENOMEM; ++ ++ BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb)); ++ ++ memcpy(next->cb, skb->cb, sizeof(skb->cb)); ++ next->cb_next = skb->cb_next; ++ ++ atomic_set(&next->refcnt, 1); ++ ++ skb->cb_next = next; ++ return 0; ++} ++EXPORT_SYMBOL(skb_save_cb); ++ ++int skb_restore_cb(struct sk_buff *skb) ++{ ++ struct skb_cb_table *next; ++ ++ if (!skb->cb_next) ++ return 0; ++ ++ next = skb->cb_next; ++ ++ BUILD_BUG_ON(sizeof(skb->cb) != sizeof(next->cb)); ++ ++ memcpy(skb->cb, next->cb, sizeof(skb->cb)); ++ skb->cb_next = next->cb_next; ++ ++ spin_lock(&skb_cb_store_lock); ++ ++ if (atomic_dec_and_test(&next->refcnt)) ++ kmem_cache_free(skbuff_cb_store_cache, next); ++ ++ spin_unlock(&skb_cb_store_lock); ++ ++ return 0; ++} ++EXPORT_SYMBOL(skb_restore_cb); ++ ++static void skb_copy_stored_cb(struct sk_buff * , const struct sk_buff * ) __attribute__ ((unused)); ++static void skb_copy_stored_cb(struct sk_buff *new, const struct sk_buff *__old) ++{ ++ struct skb_cb_table *next; ++ struct sk_buff *old; ++ ++ if (!__old->cb_next) { ++ new->cb_next = NULL; ++ return; ++ } ++ ++ spin_lock(&skb_cb_store_lock); ++ ++ old = (struct sk_buff *)__old; ++ ++ next = old->cb_next; ++ atomic_inc(&next->refcnt); ++ new->cb_next = next; ++ ++ spin_unlock(&skb_cb_store_lock); ++} ++#endif + + /** + * skb_panic - private function for out-of-line support +@@ -628,6 +709,28 @@ + WARN_ON(in_irq()); + skb->destructor(skb); + } ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ /* ++ * This should not happen. When it does, avoid memleak by restoring ++ * the chain of cb-backups. ++ */ ++ while (skb->cb_next != NULL) { ++ if (net_ratelimit()) ++ pr_warn("IMQ: kfree_skb: skb->cb_next: %08x\n", ++ (unsigned int)(uintptr_t)skb->cb_next); ++ ++ skb_restore_cb(skb); ++ } ++ /* ++ * This should not happen either, nf_queue_entry is nullified in ++ * imq_dev_xmit(). If we have non-NULL nf_queue_entry then we are ++ * leaking entry pointers, maybe memory. We don't know if this is ++ * pointer to already freed memory, or should this be freed. ++ * If this happens we need to add refcounting, etc for nf_queue_entry. ++ */ ++ if (skb->nf_queue_entry && net_ratelimit()) ++ pr_warn("%s\n", "IMQ: kfree_skb: skb->nf_queue_entry != NULL"); ++#endif + #if IS_ENABLED(CONFIG_NF_CONNTRACK) + nf_conntrack_put(skb_nfct(skb)); + #endif +@@ -817,6 +920,10 @@ + new->sp = secpath_get(old->sp); + #endif + __nf_copy(new, old, false); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ new->cb_next = NULL; ++ /*skb_copy_stored_cb(new, old);*/ ++#endif + + /* Note : this field could be in headers_start/headers_end section + * It is not yet because we do not want to have a 16 bit hole +@@ -3915,6 +4022,13 @@ + 0, + SLAB_HWCACHE_ALIGN|SLAB_PANIC, + NULL); ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ skbuff_cb_store_cache = kmem_cache_create("skbuff_cb_store_cache", ++ sizeof(struct skb_cb_table), ++ 0, ++ SLAB_HWCACHE_ALIGN|SLAB_PANIC, ++ NULL); ++#endif + } + + static int +--- a/net/netfilter/core.c 2018-04-22 23:18:26.019727507 -0400 ++++ b/net/netfilter/core.c 2018-04-22 23:20:39.419768987 -0400 +@@ -457,6 +457,11 @@ + if (ret == 0) + ret = -EPERM; + return ret; ++ case NF_IMQ_QUEUE: ++ ret = nf_queue(skb, state, e, s, verdict); ++ if (ret == -ECANCELED) ++ continue; ++ return ret; + case NF_QUEUE: + ret = nf_queue(skb, state, e, s, verdict); + if (ret == 1) +--- a/net/netfilter/Kconfig 2018-04-22 23:18:25.751727424 -0400 ++++ b/net/netfilter/Kconfig 2018-04-22 23:20:39.419768987 -0400 +@@ -902,6 +902,18 @@ + + To compile it as a module, choose M here. If unsure, say N. + ++config NETFILTER_XT_TARGET_IMQ ++ tristate '"IMQ" target support' ++ depends on NETFILTER_XTABLES ++ depends on IP_NF_MANGLE || IP6_NF_MANGLE ++ select IMQ ++ default m if NETFILTER_ADVANCED=n ++ help ++ This option adds a `IMQ' target which is used to specify if and ++ to which imq device packets should get enqueued/dequeued. ++ ++ To compile it as a module, choose M here. If unsure, say N. ++ + config NETFILTER_XT_TARGET_MARK + tristate '"MARK" target support' + depends on NETFILTER_ADVANCED +--- a/net/netfilter/Makefile 2018-04-22 23:18:25.711727410 -0400 ++++ b/net/netfilter/Makefile 2018-04-22 23:20:39.423768990 -0400 +@@ -136,6 +136,7 @@ + obj-$(CONFIG_NETFILTER_XT_TARGET_FLOWOFFLOAD) += xt_FLOWOFFLOAD.o + obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o + obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o ++obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o + obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o + obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o + obj-$(CONFIG_NETFILTER_XT_TARGET_NETMAP) += xt_NETMAP.o +--- a/net/netfilter/nf_queue.c 2018-04-22 23:18:25.699727407 -0400 ++++ b/net/netfilter/nf_queue.c 2018-04-22 23:22:59.395812579 -0400 +@@ -1,4 +1,4 @@ +-/* ++ /* + * Rusty Russell (C)2000 -- This code is GPL. + * Patrick McHardy (c) 2006-2012 + */ +@@ -29,6 +29,23 @@ + * receives, no matter what. + */ + ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++static const struct nf_queue_handler __rcu *queue_imq_handler __read_mostly; ++ ++void nf_register_queue_imq_handler(const struct nf_queue_handler *qh) ++{ ++ rcu_assign_pointer(queue_imq_handler, qh); ++} ++EXPORT_SYMBOL_GPL(nf_register_queue_imq_handler); ++ ++void nf_unregister_queue_imq_handler(void) ++{ ++ RCU_INIT_POINTER(queue_imq_handler, NULL); ++ synchronize_rcu(); ++} ++EXPORT_SYMBOL_GPL(nf_unregister_queue_imq_handler); ++#endif ++ + /* return EBUSY when somebody else is registered, return EEXIST if the + * same handler is registered, return 0 in case of success. */ + void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh) +@@ -144,16 +161,29 @@ + + static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state, + const struct nf_hook_entries *entries, +- unsigned int index, unsigned int queuenum) ++ unsigned int index, unsigned int verdict) + { + int status = -ENOENT; + struct nf_queue_entry *entry = NULL; + const struct nf_queue_handler *qh; + struct net *net = state->net; + unsigned int route_key_size; ++ unsigned int queuetype = verdict & NF_VERDICT_MASK; ++ unsigned int queuenum = verdict >> NF_VERDICT_QBITS; + + /* QUEUE == DROP if no one is waiting, to be safe. */ +- qh = rcu_dereference(net->nf.queue_handler); ++ ++ if (queuetype == NF_IMQ_QUEUE) { ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ qh = rcu_dereference(queue_imq_handler); ++#else ++ BUG(); ++ goto err_unlock; ++#endif ++ } else { ++ qh = rcu_dereference(net->nf.queue_handler); ++ } ++ + if (!qh) { + status = -ESRCH; + goto err; +@@ -217,8 +248,16 @@ + { + int ret; + +- ret = __nf_queue(skb, state, entries, index, verdict >> NF_VERDICT_QBITS); ++ ret = __nf_queue(skb, state, entries, index, verdict); + if (ret < 0) { ++ ++#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) ++ /* IMQ Bypass */ ++ if (ret == -ECANCELED && skb->imq_flags == 0) { ++ return 1; ++ } ++#endif ++ + if (ret == -ESRCH && + (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS)) + return 1; +@@ -302,6 +341,7 @@ + local_bh_enable(); + break; + case NF_QUEUE: ++ case NF_IMQ_QUEUE: + err = nf_queue(skb, &entry->state, hooks, i, verdict); + if (err == 1) + goto next_hook; +--- /dev/null 2018-03-30 15:39:24.291451107 -0400 ++++ b/net/netfilter/xt_IMQ.c 2018-04-22 23:20:39.423768990 -0400 +@@ -0,0 +1,72 @@ ++/* ++ * This target marks packets to be enqueued to an imq device ++ */ ++#include ++#include ++#include ++#include ++#include ++ ++static unsigned int imq_target(struct sk_buff *pskb, ++ const struct xt_action_param *par) ++{ ++ const struct xt_imq_info *mr = par->targinfo; ++ ++ pskb->imq_flags = (mr->todev & IMQ_F_IFMASK) | IMQ_F_ENQUEUE; ++ ++ return XT_CONTINUE; ++} ++ ++static int imq_checkentry(const struct xt_tgchk_param *par) ++{ ++ struct xt_imq_info *mr = par->targinfo; ++ ++ if (mr->todev > IMQ_MAX_DEVS - 1) { ++ pr_warn("IMQ: invalid device specified, highest is %u\n", ++ IMQ_MAX_DEVS - 1); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static struct xt_target xt_imq_reg[] __read_mostly = { ++ { ++ .name = "IMQ", ++ .family = AF_INET, ++ .checkentry = imq_checkentry, ++ .target = imq_target, ++ .targetsize = sizeof(struct xt_imq_info), ++ .table = "mangle", ++ .me = THIS_MODULE ++ }, ++ { ++ .name = "IMQ", ++ .family = AF_INET6, ++ .checkentry = imq_checkentry, ++ .target = imq_target, ++ .targetsize = sizeof(struct xt_imq_info), ++ .table = "mangle", ++ .me = THIS_MODULE ++ }, ++}; ++ ++static int __init imq_init(void) ++{ ++ return xt_register_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); ++} ++ ++static void __exit imq_fini(void) ++{ ++ xt_unregister_targets(xt_imq_reg, ARRAY_SIZE(xt_imq_reg)); ++} ++ ++module_init(imq_init); ++module_exit(imq_fini); ++ ++MODULE_AUTHOR("https://github.com/imq/linuximq"); ++MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See https://github.com/imq/linuximq/wiki for more information."); ++MODULE_LICENSE("GPL"); ++MODULE_ALIAS("ipt_IMQ"); ++MODULE_ALIAS("ip6t_IMQ"); ++ +--- a/net/sched/sch_generic.c 2018-04-22 23:18:26.623727693 -0400 ++++ b/net/sched/sch_generic.c 2018-04-22 23:20:39.423768990 -0400 +@@ -158,6 +158,14 @@ + return skb; + } + ++struct sk_buff *qdisc_dequeue_skb(struct Qdisc *q, bool *validate) ++{ ++ int packets; ++ ++ return dequeue_skb(q, validate, &packets); ++} ++EXPORT_SYMBOL(qdisc_dequeue_skb); ++ + /* + * Transmit possibly several skbs, and handle the return status as + * required. Owning running seqcount bit guarantees that \ No newline at end of file