summaryrefslogtreecommitdiffstats
path: root/package/network/utils/iproute2/patches/200-add-tc_esfq.patch
blob: 19d819974bb27fe5f4b2ab4e7a3225a2df6c76be (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -8,6 +8,7 @@ SHARED_LIBS ?= y
 TCMODULES :=
 TCMODULES += q_fifo.o
 TCMODULES += q_sfq.o
+TCMODULES += q_esfq.o
 TCMODULES += q_red.o
 TCMODULES += q_prio.o
 TCMODULES += q_tbf.o
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -226,6 +226,33 @@ struct tc_sfq_xstats {
 	__s32		allot;
 };
 
+/* ESFQ section */
+
+enum
+{
+        /* traditional */
+	TCA_SFQ_HASH_CLASSIC,
+	TCA_SFQ_HASH_DST,
+	TCA_SFQ_HASH_SRC,
+	TCA_SFQ_HASH_FWMARK,
+	/* conntrack */
+	TCA_SFQ_HASH_CTORIGDST,
+	TCA_SFQ_HASH_CTORIGSRC,
+	TCA_SFQ_HASH_CTREPLDST,
+	TCA_SFQ_HASH_CTREPLSRC,
+	TCA_SFQ_HASH_CTNATCHG,
+};
+
+struct tc_esfq_qopt
+{
+	unsigned	quantum;	/* Bytes per round allocated to flow */
+	int		perturb_period;	/* Period of hash perturbation */
+	__u32		limit;		/* Maximal packets in queue */
+	unsigned	divisor;	/* Hash divisor  */
+	unsigned	flows;		/* Maximal number of flows  */
+	unsigned	hash_kind;	/* Hash function to use for flow identification */
+};
+
 /* RED section */
 
 enum {
--- /dev/null
+++ b/tc/q_esfq.c
@@ -0,0 +1,200 @@
+/*
+ * q_esfq.c		ESFQ.
+ *
+ *		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:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ *
+ * Changes:	Alexander Atanasov, <alex@ssi.bg>
+ *		Alexander Clouter, <alex@digriz.org.uk>
+ *		Corey Hickey, <bugfood-c@fatooh.org>
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <fcntl.h>
+#include <math.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <string.h>
+
+#include "utils.h"
+#include "tc_util.h"
+
+static void explain(void)
+{
+	fprintf(stderr, "Usage: ... esfq [ perturb SECS ] [ quantum BYTES ] [ depth FLOWS ]\n\t[ divisor HASHBITS ] [ limit PKTS ] [ hash HASHTYPE]\n");
+	fprintf(stderr,"Where: \n");
+	fprintf(stderr,"HASHTYPE := { classic | src | dst | ctorigdst | ctorigsrc | ctrepldst | ctreplsrc | ctnatchg }\n");
+}
+
+#define usage() return(-1)
+
+static int esfq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
+{
+	int ok=0;
+	struct tc_esfq_qopt opt;
+
+	memset(&opt, 0, sizeof(opt));
+
+	opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
+
+	while (argc > 0) {
+		if (strcmp(*argv, "quantum") == 0) {
+			NEXT_ARG();
+			if (get_size(&opt.quantum, *argv)) {
+				fprintf(stderr, "Illegal \"quantum\"\n");
+				return -1;
+			}
+			ok++;
+		} else if (strcmp(*argv, "perturb") == 0) {
+			NEXT_ARG();
+			if (get_integer(&opt.perturb_period, *argv, 0)) {
+				fprintf(stderr, "Illegal \"perturb\"\n");
+				return -1;
+			}
+			ok++;
+		} else if (strcmp(*argv, "depth") == 0) {
+			NEXT_ARG();
+			if (get_integer((int *) &opt.flows, *argv, 0)) {
+				fprintf(stderr, "Illegal \"depth\"\n");
+				return -1;
+			}
+			ok++;
+		} else if (strcmp(*argv, "divisor") == 0) {
+			NEXT_ARG();
+			if (get_integer((int *) &opt.divisor, *argv, 0)) {
+				fprintf(stderr, "Illegal \"divisor\"\n");
+				return -1;
+			}
+			if(opt.divisor >= 14) {
+				fprintf(stderr, "Illegal \"divisor\": must be < 14\n");
+				return -1;
+			}
+			opt.divisor=pow(2,opt.divisor);
+			ok++;
+		} else if (strcmp(*argv, "limit") == 0) {
+			NEXT_ARG();
+			if (get_integer((int *) &opt.limit, *argv, 0)) {
+				fprintf(stderr, "Illegal \"limit\"\n");
+				return -1;
+			}
+			ok++;
+		} else if (strcmp(*argv, "hash") == 0) {
+			NEXT_ARG();
+			if(strcmp(*argv, "classic") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
+			} else
+			if(strcmp(*argv, "dst") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_DST;
+			} else
+			if(strcmp(*argv, "src") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_SRC;
+			} else
+			if(strcmp(*argv, "ctorigsrc") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_CTORIGSRC;
+			} else
+			if(strcmp(*argv, "ctorigdst") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_CTORIGDST;
+			} else
+			if(strcmp(*argv, "ctreplsrc") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_CTREPLSRC;
+			} else
+			if(strcmp(*argv, "ctrepldst") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_CTREPLDST;
+			} else
+			if(strcmp(*argv, "ctnatchg") == 0) {
+				opt.hash_kind= TCA_SFQ_HASH_CTNATCHG;
+			} else {
+				fprintf(stderr, "Illegal \"hash\"\n");
+				explain();
+				return -1;
+			}
+			ok++;
+		} else if (strcmp(*argv, "help") == 0) {
+			explain();
+			return -1;
+		} else {
+			fprintf(stderr, "What is \"%s\"?\n", *argv);
+			explain();
+			return -1;
+		}
+		argc--; argv++;
+	}
+
+	if (ok)
+		addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
+	return 0;
+}
+
+static int esfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
+{
+	struct tc_esfq_qopt *qopt;
+	SPRINT_BUF(b1);
+
+	if (opt == NULL)
+		return 0;
+
+	if (RTA_PAYLOAD(opt)  < sizeof(*qopt))
+		return -1;
+	qopt = RTA_DATA(opt);
+	fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1));
+	if (show_details) {
+		fprintf(f, "limit %up flows %u/%u ",
+			qopt->limit, qopt->flows, qopt->divisor);
+	}
+	if (qopt->perturb_period)
+		fprintf(f, "perturb %dsec ", qopt->perturb_period);
+
+		fprintf(f,"hash: ");
+	switch(qopt->hash_kind)
+	{
+	case TCA_SFQ_HASH_CLASSIC:
+		fprintf(f,"classic");
+		break;
+	case TCA_SFQ_HASH_DST:
+		fprintf(f,"dst");
+		break;
+	case TCA_SFQ_HASH_SRC:
+		fprintf(f,"src");
+		break;
+	case TCA_SFQ_HASH_CTORIGSRC:
+		fprintf(f,"ctorigsrc");
+		break;
+	case TCA_SFQ_HASH_CTORIGDST:
+		fprintf(f,"ctorigdst");
+		break;
+	case TCA_SFQ_HASH_CTREPLSRC:
+		fprintf(f,"ctreplsrc");
+		break;
+	case TCA_SFQ_HASH_CTREPLDST:
+		fprintf(f,"ctrepldst");
+		break;
+	case TCA_SFQ_HASH_CTNATCHG:
+		fprintf(f,"ctnatchg");
+		break;
+	default:
+		fprintf(f,"Unknown");
+	}
+	return 0;
+}
+
+static int esfq_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
+{
+	return 0;
+}
+
+
+struct qdisc_util esfq_qdisc_util = {
+	.id = "esfq",
+	.parse_qopt = esfq_parse_opt,
+	.print_qopt = esfq_print_opt,
+	.print_xstats = esfq_print_xstats,
+};
/span>$wpa_group_rekey" "$N" [ -n "$wpa_pair_rekey" ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey" "$N" [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey" "$N" ;; *wpa*) # required fields? formats? # hostapd is particular, maybe a default configuration for failures config_get auth_server "$vif" auth_server [ -z "$auth_server" ] && config_get auth_server "$vif" server append "$var" "auth_server_addr=$auth_server" "$N" config_get auth_port "$vif" auth_port [ -z "$auth_port" ] && config_get auth_port "$vif" port auth_port=${auth_port:-1812} append "$var" "auth_server_port=$auth_port" "$N" config_get auth_secret "$vif" auth_secret [ -z "$auth_secret" ] && config_get auth_secret "$vif" key append "$var" "auth_server_shared_secret=$auth_secret" "$N" config_get_bool auth_cache "$vif" auth_cache 0 [ "$auth_cache" -gt 0 ] || append "$var" "disable_pmksa_caching=1" "$N" [ "$auth_cache" -gt 0 ] || append "$var" "okc=0" "$N" config_get acct_server "$vif" acct_server [ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N" config_get acct_port "$vif" acct_port [ -n "$acct_port" ] && acct_port=${acct_port:-1813} [ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N" config_get acct_secret "$vif" acct_secret [ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N" config_get eap_reauth_period "$vif" eap_reauth_period [ -n "$eap_reauth_period" ] && append "$var" "eap_reauth_period=$eap_reauth_period" "$N" config_get dae_client "$vif" dae_client config_get dae_secret "$vif" dae_secret [ -n "$dae_client" -a -n "$dae_secret" ] && { config_get dae_port "$vif" dae_port append "$var" "radius_das_port=${dae_port:-3799}" "$N" append "$var" "radius_das_client=$dae_client $dae_secret" "$N" } config_get nasid "$vif" nasid append "$var" "nas_identifier=$nasid" "$N" append "$var" "eapol_key_index_workaround=1" "$N" append "$var" "ieee8021x=1" "$N" append "$var" "wpa_key_mgmt=WPA-EAP" "$N" [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N" [ -n "$wpa_pair_rekey" ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey" "$N" [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey" "$N" ;; *wep*) config_get key "$vif" key key="${key:-1}" case "$key" in [1234]) for idx in 1 2 3 4; do local zidx zidx=$(($idx - 1)) config_get ckey "$vif" "key${idx}" [ -n "$ckey" ] && \ append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N" done append "$var" "wep_default_key=$((key - 1))" "$N" ;; *) append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N" append "$var" "wep_default_key=0" "$N" [ -n "$wep_rekey" ] && append "$var" "wep_rekey_period=$wep_rekey" "$N" ;; esac case "$enc" in *shared*) auth_algs=2 ;; *mixed*) auth_algs=3 ;; esac wpa=0 crypto= ;; *) wpa=0 crypto= ;; esac append "$var" "auth_algs=${auth_algs:-1}" "$N" append "$var" "wpa=$wpa" "$N" [ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N" [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N" config_get ssid "$vif" ssid config_get bridge "$vif" bridge config_get ieee80211d "$vif" ieee80211d config_get iapp_interface "$vif" iapp_interface config_get_bool wps_pbc "$vif" wps_pushbutton 0 config_get_bool wps_label "$vif" wps_label 0 config_get config_methods "$vif" wps_config [ "$wps_pbc" -gt 0 ] && append config_methods push_button [ -n "$wps_possible" -a -n "$config_methods" ] && { config_get device_type "$vif" wps_device_type "6-0050F204-1" config_get device_name "$vif" wps_device_name "OpenWrt AP" config_get manufacturer "$vif" wps_manufacturer "openwrt.org" config_get wps_pin "$vif" wps_pin "12345670" append "$var" "eap_server=1" "$N" append "$var" "ap_pin=$wps_pin" "$N" append "$var" "wps_state=${wps_not_configured:-2}" "$N" append "$var" "ap_setup_locked=0" "$N" append "$var" "device_type=$device_type" "$N" append "$var" "device_name=$device_name" "$N" append "$var" "manufacturer=$manufacturer" "$N" append "$var" "config_methods=$config_methods" "$N" } append "$var" "ssid=$ssid" "$N" [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N" [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N" [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N" if [ "$wpa" -ge "2" ] then # RSN -> allow preauthentication config_get_bool rsn_preauth "$vif" rsn_preauth "$auth_cache" if [ -n "$bridge" -a "$rsn_preauth" = 1 ] then append "$var" "rsn_preauth=1" "$N" append "$var" "rsn_preauth_interfaces=$bridge" "$N" fi # RSN -> allow management frame protection config_get ieee80211w "$vif" ieee80211w case "$ieee80211w" in [012]) append "$var" "ieee80211w=$ieee80211w" "$N" [ "$ieee80211w" -gt "0" ] && { config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout [ -n "$ieee80211w_max_timeout" ] && \ append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N" [ -n "$ieee80211w_retry_timeout" ] && \ append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N" } ;; esac fi config_get macfile "$vif" macfile config_get maclist "$vif" maclist if [ -z "$macfile" ] then # if no macfile has been specified, fallback to the default name # and truncate file to avoid aggregating entries over time macfile="/var/run/hostapd-$ifname.maclist" echo "" > "$macfile" else if [ -n "$maclist" ] then # to avoid to overwrite the original file, make a copy # before appending the entries specified by the maclist # option cp $macfile $macfile.maclist macfile=$macfile.maclist fi fi if [ -n "$maclist" ] then for mac in $maclist; do echo "$mac" >> $macfile done fi config_get macfilter "$vif" macfilter case "$macfilter" in allow) append "$var" "macaddr_acl=1" "$N" append "$var" "accept_mac_file=$macfile" "$N" ;; deny) append "$var" "macaddr_acl=0" "$N" append "$var" "deny_mac_file=$macfile" "$N" ;; esac } hostapd_set_log_options() { local var="$1" local cfg="$2" local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme config_get log_level "$cfg" log_level 2 config_get_bool log_80211 "$cfg" log_80211 1 config_get_bool log_8021x "$cfg" log_8021x 1 config_get_bool log_radius "$cfg" log_radius 1 config_get_bool log_wpa "$cfg" log_wpa 1 config_get_bool log_driver "$cfg" log_driver 1 config_get_bool log_iapp "$cfg" log_iapp 1 config_get_bool log_mlme "$cfg" log_mlme 1 local log_mask=$(( \ ($log_80211 << 0) | \ ($log_8021x << 1) | \ ($log_radius << 2) | \ ($log_wpa << 3) | \ ($log_driver << 4) | \ ($log_iapp << 5) | \ ($log_mlme << 6) \ )) append "$var" "logger_syslog=$log_mask" "$N" append "$var" "logger_syslog_level=$log_level" "$N" append "$var" "logger_stdout=$log_mask" "$N" append "$var" "logger_stdout_level=$log_level" "$N" } hostapd_setup_vif() { local vif="$1" local driver="$2" local ifname device channel hwmode hostapd_cfg= config_get ifname "$vif" ifname config_get device "$vif" device config_get channel "$device" channel config_get hwmode "$device" hwmode hostapd_set_log_options hostapd_cfg "$device" hostapd_set_bss_options hostapd_cfg "$vif" case "$hwmode" in *bg|*gdt|*gst|*fh) hwmode=g;; *adt|*ast) hwmode=a;; esac [ "$channel" = auto ] && channel= [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device" cat > /var/run/hostapd-$ifname.conf <<EOF driver=$driver interface=$ifname ${hwmode:+hw_mode=${hwmode#11}} ${channel:+channel=$channel} $hostapd_cfg EOF hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf }