diff options
Diffstat (limited to 'package/network/utils/iproute2')
33 files changed, 1934 insertions, 0 deletions
diff --git a/package/network/utils/iproute2/.svn/entries b/package/network/utils/iproute2/.svn/entries new file mode 100644 index 0000000..92f09f4 --- /dev/null +++ b/package/network/utils/iproute2/.svn/entries @@ -0,0 +1,68 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/network/utils/iproute2 +svn://svn.openwrt.org/openwrt + + + +2013-01-20T11:25:18.585539Z +35250 +nbd + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +files +dir + +patches +dir + +Makefile +file + + + + +2013-03-17T12:13:17.000000Z +d7020e2c7d8e7b0d9f21e91b1c636d3d +2013-01-20T11:25:18.585539Z +35250 +nbd +has-props + + + + + + + + + + + + + + + + + + + + +2953 + diff --git a/package/network/utils/iproute2/.svn/prop-base/Makefile.svn-base b/package/network/utils/iproute2/.svn/prop-base/Makefile.svn-base new file mode 100644 index 0000000..8e522ae --- /dev/null +++ b/package/network/utils/iproute2/.svn/prop-base/Makefile.svn-base @@ -0,0 +1,9 @@ +K 13 +svn:copyright +V 30 +Copyright (C) 2006 OpenWrt.org +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/network/utils/iproute2/.svn/text-base/Makefile.svn-base b/package/network/utils/iproute2/.svn/text-base/Makefile.svn-base new file mode 100644 index 0000000..578010f --- /dev/null +++ b/package/network/utils/iproute2/.svn/text-base/Makefile.svn-base @@ -0,0 +1,115 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=iproute2 +PKG_VERSION:=3.7.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ +PKG_MD5SUM:=47040899f8fa30c8721fc5aec6509b44 +PKG_BUILD_PARALLEL:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/iproute2/Default + SECTION:=net + CATEGORY:=Network + URL:=http://linux-net.osdl.org/index.php/Iproute2 +endef + +define Package/ip +$(call Package/iproute2/Default) + SUBMENU:=Routing and Redirection + DEPENDS:= +libnl-tiny + TITLE:=Routing control utility +endef + +define Package/ip/conffiles +/etc/iproute2/rt_tables +endef + +define Package/tc +$(call Package/iproute2/Default) + TITLE:=Traffic control utility + DEPENDS:=+kmod-sched-core +endef + +define Package/genl +$(call Package/iproute2/Default) + TITLE:=General netlink utility frontend +endef + +define Package/ss +$(call Package/iproute2/Default) + TITLE:=Socket statistics utility +endef + +define Build/Configure + $(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile + $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \ + $(PKG_BUILD_DIR)/Makefile + $(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \ + $(PKG_BUILD_DIR)/Makefile + echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \ + > $(PKG_BUILD_DIR)/include/SNAPSHOT.h +endef + +ifdef CONFIG_USE_EGLIBC + ifndef CONFIG_EGLIBC_VERSION_2_13 + TARGET_CFLAGS += -DHAVE_SETNS + endif +endif + +MAKE_FLAGS += \ + EXTRA_CCOPTS="$(TARGET_CFLAGS) -I../include -I$(STAGING_DIR)/usr/include/libnl-tiny" \ + KERNEL_INCLUDE="$(LINUX_DIR)/include" \ + FPIC="$(FPIC)" + +define Build/Compile + +$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/include/libnetlink.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/ +endef + +define Package/ip/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/iproute2 + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/iproute2/rt_tables $(1)/etc/iproute2 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/ +endef + +define Package/tc/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/ +endef + +define Package/genl/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/ +endef + +define Package/ss/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,ip)) +$(eval $(call BuildPackage,tc)) +$(eval $(call BuildPackage,genl)) +$(eval $(call BuildPackage,ss)) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile new file mode 100644 index 0000000..578010f --- /dev/null +++ b/package/network/utils/iproute2/Makefile @@ -0,0 +1,115 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=iproute2 +PKG_VERSION:=3.7.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ +PKG_MD5SUM:=47040899f8fa30c8721fc5aec6509b44 +PKG_BUILD_PARALLEL:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/iproute2/Default + SECTION:=net + CATEGORY:=Network + URL:=http://linux-net.osdl.org/index.php/Iproute2 +endef + +define Package/ip +$(call Package/iproute2/Default) + SUBMENU:=Routing and Redirection + DEPENDS:= +libnl-tiny + TITLE:=Routing control utility +endef + +define Package/ip/conffiles +/etc/iproute2/rt_tables +endef + +define Package/tc +$(call Package/iproute2/Default) + TITLE:=Traffic control utility + DEPENDS:=+kmod-sched-core +endef + +define Package/genl +$(call Package/iproute2/Default) + TITLE:=General netlink utility frontend +endef + +define Package/ss +$(call Package/iproute2/Default) + TITLE:=Socket statistics utility +endef + +define Build/Configure + $(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile + $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \ + $(PKG_BUILD_DIR)/Makefile + $(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \ + $(PKG_BUILD_DIR)/Makefile + echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \ + > $(PKG_BUILD_DIR)/include/SNAPSHOT.h +endef + +ifdef CONFIG_USE_EGLIBC + ifndef CONFIG_EGLIBC_VERSION_2_13 + TARGET_CFLAGS += -DHAVE_SETNS + endif +endif + +MAKE_FLAGS += \ + EXTRA_CCOPTS="$(TARGET_CFLAGS) -I../include -I$(STAGING_DIR)/usr/include/libnl-tiny" \ + KERNEL_INCLUDE="$(LINUX_DIR)/include" \ + FPIC="$(FPIC)" + +define Build/Compile + +$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/include/libnetlink.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/ +endef + +define Package/ip/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc/iproute2 + $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/iproute2/rt_tables $(1)/etc/iproute2 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/ +endef + +define Package/tc/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/ +endef + +define Package/genl/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/ +endef + +define Package/ss/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,ip)) +$(eval $(call BuildPackage,tc)) +$(eval $(call BuildPackage,genl)) +$(eval $(call BuildPackage,ss)) diff --git a/package/network/utils/iproute2/files/.svn/entries b/package/network/utils/iproute2/files/.svn/entries new file mode 100644 index 0000000..da89afb --- /dev/null +++ b/package/network/utils/iproute2/files/.svn/entries @@ -0,0 +1,62 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/network/utils/iproute2/files +svn://svn.openwrt.org/openwrt + + + +2012-12-02T13:04:03.330574Z +34442 +juhosg + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +15-teql +file + + + + +2013-03-17T12:13:17.000000Z +7fe397054763bd3778adb4cd9e35d311 +2012-12-02T13:04:03.330574Z +34442 +juhosg + + + + + + + + + + + + + + + + + + + + + +486 + diff --git a/package/network/utils/iproute2/files/.svn/text-base/15-teql.svn-base b/package/network/utils/iproute2/files/.svn/text-base/15-teql.svn-base new file mode 100644 index 0000000..a0c0e50 --- /dev/null +++ b/package/network/utils/iproute2/files/.svn/text-base/15-teql.svn-base @@ -0,0 +1,23 @@ +#!/bin/sh + +. /lib/functions.sh + +if [ "$ACTION" != "ifup" ]; then + exit +fi + +config_load network + +config_get teql $INTERFACE teql + +if [ "$teql" != "" ]; then + logger Adding device $DEVICE to TEQL master $teql + insmod sch_teql + tc qdisc add dev $DEVICE root $teql + + # The kernel doesn't let us bring it up until it has at least one + # slave. So bring it up now, if it isn't already. + if ! cat /sys/class/net/$teql/carrier &>/dev/null; then + ifup $teql & + fi +fi diff --git a/package/network/utils/iproute2/files/15-teql b/package/network/utils/iproute2/files/15-teql new file mode 100644 index 0000000..a0c0e50 --- /dev/null +++ b/package/network/utils/iproute2/files/15-teql @@ -0,0 +1,23 @@ +#!/bin/sh + +. /lib/functions.sh + +if [ "$ACTION" != "ifup" ]; then + exit +fi + +config_load network + +config_get teql $INTERFACE teql + +if [ "$teql" != "" ]; then + logger Adding device $DEVICE to TEQL master $teql + insmod sch_teql + tc qdisc add dev $DEVICE root $teql + + # The kernel doesn't let us bring it up until it has at least one + # slave. So bring it up now, if it isn't already. + if ! cat /sys/class/net/$teql/carrier &>/dev/null; then + ifup $teql & + fi +fi diff --git a/package/network/utils/iproute2/patches/.svn/entries b/package/network/utils/iproute2/patches/.svn/entries new file mode 100644 index 0000000..7f9f990 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/entries @@ -0,0 +1,436 @@ +10 + +dir +36060 +svn://svn.openwrt.org/openwrt/trunk/package/network/utils/iproute2/patches +svn://svn.openwrt.org/openwrt + + + +2013-01-20T11:25:18.585539Z +35250 +nbd + + + + + + + + + + + + + + +3c298f89-4303-0410-b956-a3cf2f4a3e73 + +004-darwin_fixes.patch +file + + + + +2013-03-17T12:13:17.000000Z +6ee7c9736d5c97b7cd3586baa5a6a9c5 +2009-07-11T14:05:54.386537Z +16777 +nbd + + + + + + + + + + + + + + + + + + + + + +1297 + +210-build-unbreak-linkage-of-m_xt.so.patch +file + + + + +2013-03-17T12:13:17.000000Z +db15fa9af449eec7bbf3838361d6d211 +2013-01-20T11:25:18.585539Z +35250 +nbd + + + + + + + + + + + + + + + + + + + + + +1430 + +000-sync_pkt_sched_h.patch +file + + + + +2013-03-17T12:13:17.000000Z +e5618a2ece071525f4e713e754f2770d +2013-01-20T11:25:18.585539Z +35250 +nbd + + + + + + + + + + + + + + + + + + + + + +815 + +120-libnetlink-pic.patch +file + + + + +2013-03-17T12:13:17.000000Z +c278af4b93450325ab17f8f3112f794c +2010-05-20T06:09:49.031848Z +21513 +jow + + + + + + + + + + + + + + + + + + + + + +165 + +007-no_arpd.patch +file + + + + +2013-03-17T12:13:17.000000Z +68c26fe2c0e403dcb9e352460b164c8d +2012-05-16T15:23:12.201327Z +31758 +nbd + + + + + + + + + + + + + + + + + + + + + +221 + +008-no_netem.patch +file + + + + +2013-03-17T12:13:17.000000Z +51b030026ce6e35ca1a262cdc1475826 +2013-01-20T11:25:18.585539Z +35250 +nbd + + + + + + + + + + + + + + + + + + + + + +323 + +110-extra-ccopts.patch +file + + + + +2013-03-17T12:13:17.000000Z +3670666db767bc9a0856e69f5a10f61c +2013-01-20T11:25:18.585539Z +35250 +nbd + + + + + + + + + + + + + + + + + + + + + +284 + +100-allow_pfifo_fast.patch +file + + + + +2013-03-17T12:13:17.000000Z +fbf3572e68781bae8483db40ad21e7a8 +2010-12-02T20:29:22.131755Z +24216 +jow + + + + + + + + + + + + + + + + + + + + + +369 + +006-iproute2-tc_esfq.patch +file + + + + +2013-03-17T12:13:17.000000Z +7c5a57deb540e29d913cd8d9d842422d +2012-05-16T15:23:12.201327Z +31758 +nbd + + + + + + + + + + + + + + + + + + + + + +5494 + +200-act_connmark.patch +file + + + + +2013-03-17T12:13:17.000000Z +93811853e9dc674527fad770e99dbeb0 +2012-05-16T15:23:12.201327Z +31758 +nbd + + + + + + + + + + + + + + + + + + + + + +1955 + +001-iproute2-2.6.11_Config.patch +file + + + + +2013-03-17T12:13:17.000000Z +2958795af18d0ff15a8c8e62e5a4a7ec +2009-07-11T14:05:54.386537Z +16777 +nbd + + + + + + + + + + + + + + + + + + + + + +181 + +002-iproute2-ipxfrm_no_sctp.patch +file + + + + +2013-03-17T12:13:17.000000Z +5cee7636291543d39d9efafa6de5bbc3 +2012-05-16T15:23:12.201327Z +31758 +nbd +has-props + + + + + + + + + + + + + + + + + + + + +505 + diff --git a/package/network/utils/iproute2/patches/.svn/prop-base/002-iproute2-ipxfrm_no_sctp.patch.svn-base b/package/network/utils/iproute2/patches/.svn/prop-base/002-iproute2-ipxfrm_no_sctp.patch.svn-base new file mode 100644 index 0000000..bdbd305 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/prop-base/002-iproute2-ipxfrm_no_sctp.patch.svn-base @@ -0,0 +1,5 @@ +K 13 +svn:eol-style +V 6 +native +END diff --git a/package/network/utils/iproute2/patches/.svn/text-base/000-sync_pkt_sched_h.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/000-sync_pkt_sched_h.patch.svn-base new file mode 100644 index 0000000..b06bc70 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/000-sync_pkt_sched_h.patch.svn-base @@ -0,0 +1,36 @@ +--- a/include/linux/pkt_sched.h ++++ b/include/linux/pkt_sched.h +@@ -214,6 +214,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 { diff --git a/package/network/utils/iproute2/patches/.svn/text-base/001-iproute2-2.6.11_Config.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/001-iproute2-2.6.11_Config.patch.svn-base new file mode 100644 index 0000000..ece8652 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/001-iproute2-2.6.11_Config.patch.svn-base @@ -0,0 +1,7 @@ +--- /dev/null ++++ b/Config +@@ -0,0 +1,4 @@ ++# Fixed config to disable ATM support even if present on host system ++TC_CONFIG_ATM:=n ++TC_CONFIG_ACTION_GACT=y ++TC_CONFIG_ACTION_PROB=y diff --git a/package/network/utils/iproute2/patches/.svn/text-base/002-iproute2-ipxfrm_no_sctp.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/002-iproute2-ipxfrm_no_sctp.patch.svn-base new file mode 100644 index 0000000..3b1f4d6 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/002-iproute2-ipxfrm_no_sctp.patch.svn-base @@ -0,0 +1,22 @@ +--- + ip/ipxfrm.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/ip/ipxfrm.c ++++ b/ip/ipxfrm.c +@@ -468,7 +468,6 @@ void xfrm_selector_print(struct xfrm_sel + switch (sel->proto) { + case IPPROTO_TCP: + case IPPROTO_UDP: +- case IPPROTO_SCTP: + case IPPROTO_DCCP: + default: /* XXX */ + if (sel->sport_mask) +@@ -1263,7 +1262,6 @@ static int xfrm_selector_upspec_parse(st + switch (sel->proto) { + case IPPROTO_TCP: + case IPPROTO_UDP: +- case IPPROTO_SCTP: + case IPPROTO_DCCP: + break; + default: diff --git a/package/network/utils/iproute2/patches/.svn/text-base/004-darwin_fixes.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/004-darwin_fixes.patch.svn-base new file mode 100644 index 0000000..e1a5e97 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/004-darwin_fixes.patch.svn-base @@ -0,0 +1,59 @@ +--- a/netem/maketable.c ++++ b/netem/maketable.c +@@ -10,7 +10,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <math.h> ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> ++#endif + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/netem/normal.c ++++ b/netem/normal.c +@@ -8,8 +8,12 @@ + #include <string.h> + #include <limits.h> + ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <linux/types.h> + #include <linux/pkt_sched.h> ++#else ++#define NETEM_DIST_SCALE 8192 ++#endif + + #define TABLESIZE 16384 + #define TABLEFACTOR NETEM_DIST_SCALE +--- a/netem/pareto.c ++++ b/netem/pareto.c +@@ -7,8 +7,12 @@ + #include <math.h> + #include <limits.h> + ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <linux/types.h> + #include <linux/pkt_sched.h> ++#else ++#define NETEM_DIST_SCALE 8192 ++#endif + + static const double a=3.0; + #define TABLESIZE 16384 +--- a/netem/paretonormal.c ++++ b/netem/paretonormal.c +@@ -15,10 +15,13 @@ + #include <string.h> + #include <math.h> + #include <limits.h> ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> +- + #include <linux/types.h> + #include <linux/pkt_sched.h> ++#else ++#define NETEM_DIST_SCALE 8192 ++#endif + + #define TABLESIZE 16384 + #define TABLEFACTOR NETEM_DIST_SCALE diff --git a/package/network/utils/iproute2/patches/.svn/text-base/006-iproute2-tc_esfq.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/006-iproute2-tc_esfq.patch.svn-base new file mode 100644 index 0000000..8016dbb --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/006-iproute2-tc_esfq.patch.svn-base @@ -0,0 +1,219 @@ +--- + include/linux/pkt_sched.h | 59 +++++++++++++ + tc/Makefile | 1 + tc/q_esfq.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 260 insertions(+) + +--- 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 +--- /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, ++}; diff --git a/package/network/utils/iproute2/patches/.svn/text-base/007-no_arpd.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/007-no_arpd.patch.svn-base new file mode 100644 index 0000000..6a7e24e --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/007-no_arpd.patch.svn-base @@ -0,0 +1,11 @@ +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -1,7 +1,7 @@ + SSOBJ=ss.o ssfilter.o + LNSTATOBJ=lnstat.o lnstat_util.o + +-TARGETS=ss nstat ifstat rtacct arpd lnstat ++TARGETS=ss nstat ifstat rtacct lnstat + + include ../Config + diff --git a/package/network/utils/iproute2/patches/.svn/text-base/008-no_netem.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/008-no_netem.patch.svn-base new file mode 100644 index 0000000..a6a74aa --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/008-no_netem.patch.svn-base @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ WFLAGS = -Wall -Wstrict-prototypes + CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) + YACCFLAGS = -d -t -v + +-SUBDIRS=lib ip tc bridge misc netem genl man ++SUBDIRS=lib ip tc bridge misc genl man + + LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a + LDLIBS += $(LIBNETLINK) diff --git a/package/network/utils/iproute2/patches/.svn/text-base/100-allow_pfifo_fast.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/100-allow_pfifo_fast.patch.svn-base new file mode 100644 index 0000000..b31d4b7 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/100-allow_pfifo_fast.patch.svn-base @@ -0,0 +1,13 @@ +--- + tc/q_fifo.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/tc/q_fifo.c ++++ b/tc/q_fifo.c +@@ -98,5 +98,6 @@ struct qdisc_util pfifo_head_drop_qdisc_ + extern int prio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt); + struct qdisc_util pfifo_fast_qdisc_util = { + .id = "pfifo_fast", ++ .parse_qopt = fifo_parse_opt, + .print_qopt = prio_print_opt, + }; diff --git a/package/network/utils/iproute2/patches/.svn/text-base/110-extra-ccopts.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/110-extra-ccopts.patch.svn-base new file mode 100644 index 0000000..f4ef8d7 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/110-extra-ccopts.patch.svn-base @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o + CC = gcc + HOSTCC = gcc + DEFINES += -D_GNU_SOURCE +-CCOPTS = -O2 ++CCOPTS = -O2 $(EXTRA_CCOPTS) + WFLAGS = -Wall -Wstrict-prototypes + CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) + YACCFLAGS = -d -t -v diff --git a/package/network/utils/iproute2/patches/.svn/text-base/120-libnetlink-pic.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/120-libnetlink-pic.patch.svn-base new file mode 100644 index 0000000..c7b78d0 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/120-libnetlink-pic.patch.svn-base @@ -0,0 +1,8 @@ +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -1,4 +1,4 @@ +-CFLAGS += -fPIC ++CFLAGS+=$(FPIC) + + UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o + diff --git a/package/network/utils/iproute2/patches/.svn/text-base/200-act_connmark.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/200-act_connmark.patch.svn-base new file mode 100644 index 0000000..4a48ac3 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/200-act_connmark.patch.svn-base @@ -0,0 +1,84 @@ +--- a/tc/Makefile ++++ b/tc/Makefile +@@ -38,6 +38,7 @@ TCMODULES += m_mirred.o + TCMODULES += m_nat.o + TCMODULES += m_pedit.o + TCMODULES += m_skbedit.o ++TCMODULES += m_connmark.o + TCMODULES += m_csum.o + TCMODULES += p_ip.o + TCMODULES += p_icmp.o +--- /dev/null ++++ b/tc/m_connmark.c +@@ -0,0 +1,71 @@ ++/* ++ * m_connmark.c Connection tracking marking import ++ * ++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org> ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope 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, write to the Free Software Foundation, Inc., 59 Temple ++ * Place - Suite 330, Boston, MA 02111-1307 USA. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <string.h> ++#include "utils.h" ++#include "tc_util.h" ++ ++static void ++explain(void) ++{ ++ fprintf(stderr, "Usage: ... connmark\n"); ++} ++ ++static void ++usage(void) ++{ ++ explain(); ++ exit(-1); ++} ++ ++static int ++parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, ++ struct nlmsghdr *n) ++{ ++ int argc = *argc_p; ++ char **argv = *argv_p; ++ ++ if (matches(*argv, "connmark") != 0) ++ return -1; ++ ++ NEXT_ARG(); ++ ++ *argc_p = argc; ++ *argv_p = argv; ++ return 0; ++} ++ ++static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg) ++{ ++ if (arg == NULL) ++ return -1; ++ ++ fprintf(f, " connmark"); ++ ++ return 0; ++} ++ ++struct action_util connmark_action_util = { ++ .id = "connmark", ++ .parse_aopt = parse_connmark, ++ .print_aopt = print_connmark, ++}; diff --git a/package/network/utils/iproute2/patches/.svn/text-base/210-build-unbreak-linkage-of-m_xt.so.patch.svn-base b/package/network/utils/iproute2/patches/.svn/text-base/210-build-unbreak-linkage-of-m_xt.so.patch.svn-base new file mode 100644 index 0000000..7fb2c11 --- /dev/null +++ b/package/network/utils/iproute2/patches/.svn/text-base/210-build-unbreak-linkage-of-m_xt.so.patch.svn-base @@ -0,0 +1,58 @@ +From 11e8a1034656eba6571401286b99dabbd9842dac Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <jengelh@inai.de> +Date: Tue, 18 Dec 2012 09:18:45 -0800 +Subject: [PATCH] build: unbreak linakge of m_xt.so + +Commit v3.7.0~10 caused the variable new PKG_CONFIG variable never +to be present at the time of calling make, leading to tc/m_xt.so +not linked with -lxtables (result from pkg-config xtables --libs), +that in turn leading to + +tc: symbol lookup error: /usr/lib64/tc//m_xt.so: undefined symbol: +xtables_init_all + +Fixing that. + +Signed-off-by: Jan Engelhardt <jengelh@inai.de> + +Conflicts: + configure +--- + configure | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +--- a/configure ++++ b/configure +@@ -2,14 +2,20 @@ + # This is not an autconf generated configure + # + INCLUDE=${1:-"$PWD/include"} +-: ${PKG_CONFIG:=pkg-config} +-: ${CC=gcc} +-echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config + + # Make a temp directory in build tree. + TMPDIR=$(mktemp -d config.XXXXXX) + trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM + ++check_toolchain() ++{ ++: ${PKG_CONFIG:=pkg-config} ++: ${AR=ar} ++: ${CC=gcc} ++echo "AR:=${AR}" >>Config ++echo "CC:=${CC}" >>Config ++} ++ + check_atm() + { + cat >$TMPDIR/atmtest.c <<EOF +@@ -224,6 +230,8 @@ rm -f $TMPDIR/ipsettest.c $TMPDIR/ipsett + } + + echo "# Generated config based on" $INCLUDE >Config ++echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config ++check_toolchain + + echo "TC schedulers" + diff --git a/package/network/utils/iproute2/patches/000-sync_pkt_sched_h.patch b/package/network/utils/iproute2/patches/000-sync_pkt_sched_h.patch new file mode 100644 index 0000000..b06bc70 --- /dev/null +++ b/package/network/utils/iproute2/patches/000-sync_pkt_sched_h.patch @@ -0,0 +1,36 @@ +--- a/include/linux/pkt_sched.h ++++ b/include/linux/pkt_sched.h +@@ -214,6 +214,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 { diff --git a/package/network/utils/iproute2/patches/001-iproute2-2.6.11_Config.patch b/package/network/utils/iproute2/patches/001-iproute2-2.6.11_Config.patch new file mode 100644 index 0000000..ece8652 --- /dev/null +++ b/package/network/utils/iproute2/patches/001-iproute2-2.6.11_Config.patch @@ -0,0 +1,7 @@ +--- /dev/null ++++ b/Config +@@ -0,0 +1,4 @@ ++# Fixed config to disable ATM support even if present on host system ++TC_CONFIG_ATM:=n ++TC_CONFIG_ACTION_GACT=y ++TC_CONFIG_ACTION_PROB=y diff --git a/package/network/utils/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch b/package/network/utils/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch new file mode 100644 index 0000000..3b1f4d6 --- /dev/null +++ b/package/network/utils/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch @@ -0,0 +1,22 @@ +--- + ip/ipxfrm.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/ip/ipxfrm.c ++++ b/ip/ipxfrm.c +@@ -468,7 +468,6 @@ void xfrm_selector_print(struct xfrm_sel + switch (sel->proto) { + case IPPROTO_TCP: + case IPPROTO_UDP: +- case IPPROTO_SCTP: + case IPPROTO_DCCP: + default: /* XXX */ + if (sel->sport_mask) +@@ -1263,7 +1262,6 @@ static int xfrm_selector_upspec_parse(st + switch (sel->proto) { + case IPPROTO_TCP: + case IPPROTO_UDP: +- case IPPROTO_SCTP: + case IPPROTO_DCCP: + break; + default: diff --git a/package/network/utils/iproute2/patches/004-darwin_fixes.patch b/package/network/utils/iproute2/patches/004-darwin_fixes.patch new file mode 100644 index 0000000..e1a5e97 --- /dev/null +++ b/package/network/utils/iproute2/patches/004-darwin_fixes.patch @@ -0,0 +1,59 @@ +--- a/netem/maketable.c ++++ b/netem/maketable.c +@@ -10,7 +10,9 @@ + #include <stdio.h> + #include <stdlib.h> + #include <math.h> ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> ++#endif + #include <string.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/netem/normal.c ++++ b/netem/normal.c +@@ -8,8 +8,12 @@ + #include <string.h> + #include <limits.h> + ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <linux/types.h> + #include <linux/pkt_sched.h> ++#else ++#define NETEM_DIST_SCALE 8192 ++#endif + + #define TABLESIZE 16384 + #define TABLEFACTOR NETEM_DIST_SCALE +--- a/netem/pareto.c ++++ b/netem/pareto.c +@@ -7,8 +7,12 @@ + #include <math.h> + #include <limits.h> + ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <linux/types.h> + #include <linux/pkt_sched.h> ++#else ++#define NETEM_DIST_SCALE 8192 ++#endif + + static const double a=3.0; + #define TABLESIZE 16384 +--- a/netem/paretonormal.c ++++ b/netem/paretonormal.c +@@ -15,10 +15,13 @@ + #include <string.h> + #include <math.h> + #include <limits.h> ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include <malloc.h> +- + #include <linux/types.h> + #include <linux/pkt_sched.h> ++#else ++#define NETEM_DIST_SCALE 8192 ++#endif + + #define TABLESIZE 16384 + #define TABLEFACTOR NETEM_DIST_SCALE diff --git a/package/network/utils/iproute2/patches/006-iproute2-tc_esfq.patch b/package/network/utils/iproute2/patches/006-iproute2-tc_esfq.patch new file mode 100644 index 0000000..8016dbb --- /dev/null +++ b/package/network/utils/iproute2/patches/006-iproute2-tc_esfq.patch @@ -0,0 +1,219 @@ +--- + include/linux/pkt_sched.h | 59 +++++++++++++ + tc/Makefile | 1 + tc/q_esfq.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 260 insertions(+) + +--- 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 +--- /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, ++}; diff --git a/package/network/utils/iproute2/patches/007-no_arpd.patch b/package/network/utils/iproute2/patches/007-no_arpd.patch new file mode 100644 index 0000000..6a7e24e --- /dev/null +++ b/package/network/utils/iproute2/patches/007-no_arpd.patch @@ -0,0 +1,11 @@ +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -1,7 +1,7 @@ + SSOBJ=ss.o ssfilter.o + LNSTATOBJ=lnstat.o lnstat_util.o + +-TARGETS=ss nstat ifstat rtacct arpd lnstat ++TARGETS=ss nstat ifstat rtacct lnstat + + include ../Config + diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch new file mode 100644 index 0000000..a6a74aa --- /dev/null +++ b/package/network/utils/iproute2/patches/008-no_netem.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ WFLAGS = -Wall -Wstrict-prototypes + CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) + YACCFLAGS = -d -t -v + +-SUBDIRS=lib ip tc bridge misc netem genl man ++SUBDIRS=lib ip tc bridge misc genl man + + LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a + LDLIBS += $(LIBNETLINK) diff --git a/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch b/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch new file mode 100644 index 0000000..b31d4b7 --- /dev/null +++ b/package/network/utils/iproute2/patches/100-allow_pfifo_fast.patch @@ -0,0 +1,13 @@ +--- + tc/q_fifo.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/tc/q_fifo.c ++++ b/tc/q_fifo.c +@@ -98,5 +98,6 @@ struct qdisc_util pfifo_head_drop_qdisc_ + extern int prio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt); + struct qdisc_util pfifo_fast_qdisc_util = { + .id = "pfifo_fast", ++ .parse_qopt = fifo_parse_opt, + .print_qopt = prio_print_opt, + }; diff --git a/package/network/utils/iproute2/patches/110-extra-ccopts.patch b/package/network/utils/iproute2/patches/110-extra-ccopts.patch new file mode 100644 index 0000000..f4ef8d7 --- /dev/null +++ b/package/network/utils/iproute2/patches/110-extra-ccopts.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o + CC = gcc + HOSTCC = gcc + DEFINES += -D_GNU_SOURCE +-CCOPTS = -O2 ++CCOPTS = -O2 $(EXTRA_CCOPTS) + WFLAGS = -Wall -Wstrict-prototypes + CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) + YACCFLAGS = -d -t -v diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch new file mode 100644 index 0000000..c7b78d0 --- /dev/null +++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch @@ -0,0 +1,8 @@ +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -1,4 +1,4 @@ +-CFLAGS += -fPIC ++CFLAGS+=$(FPIC) + + UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o + diff --git a/package/network/utils/iproute2/patches/200-act_connmark.patch b/package/network/utils/iproute2/patches/200-act_connmark.patch new file mode 100644 index 0000000..4a48ac3 --- /dev/null +++ b/package/network/utils/iproute2/patches/200-act_connmark.patch @@ -0,0 +1,84 @@ +--- a/tc/Makefile ++++ b/tc/Makefile +@@ -38,6 +38,7 @@ TCMODULES += m_mirred.o + TCMODULES += m_nat.o + TCMODULES += m_pedit.o + TCMODULES += m_skbedit.o ++TCMODULES += m_connmark.o + TCMODULES += m_csum.o + TCMODULES += p_ip.o + TCMODULES += p_icmp.o +--- /dev/null ++++ b/tc/m_connmark.c +@@ -0,0 +1,71 @@ ++/* ++ * m_connmark.c Connection tracking marking import ++ * ++ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org> ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms and conditions of the GNU General Public License, ++ * version 2, as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope 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, write to the Free Software Foundation, Inc., 59 Temple ++ * Place - Suite 330, Boston, MA 02111-1307 USA. ++ */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <string.h> ++#include "utils.h" ++#include "tc_util.h" ++ ++static void ++explain(void) ++{ ++ fprintf(stderr, "Usage: ... connmark\n"); ++} ++ ++static void ++usage(void) ++{ ++ explain(); ++ exit(-1); ++} ++ ++static int ++parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, ++ struct nlmsghdr *n) ++{ ++ int argc = *argc_p; ++ char **argv = *argv_p; ++ ++ if (matches(*argv, "connmark") != 0) ++ return -1; ++ ++ NEXT_ARG(); ++ ++ *argc_p = argc; ++ *argv_p = argv; ++ return 0; ++} ++ ++static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg) ++{ ++ if (arg == NULL) ++ return -1; ++ ++ fprintf(f, " connmark"); ++ ++ return 0; ++} ++ ++struct action_util connmark_action_util = { ++ .id = "connmark", ++ .parse_aopt = parse_connmark, ++ .print_aopt = print_connmark, ++}; diff --git a/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch b/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch new file mode 100644 index 0000000..7fb2c11 --- /dev/null +++ b/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch @@ -0,0 +1,58 @@ +From 11e8a1034656eba6571401286b99dabbd9842dac Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <jengelh@inai.de> +Date: Tue, 18 Dec 2012 09:18:45 -0800 +Subject: [PATCH] build: unbreak linakge of m_xt.so + +Commit v3.7.0~10 caused the variable new PKG_CONFIG variable never +to be present at the time of calling make, leading to tc/m_xt.so +not linked with -lxtables (result from pkg-config xtables --libs), +that in turn leading to + +tc: symbol lookup error: /usr/lib64/tc//m_xt.so: undefined symbol: +xtables_init_all + +Fixing that. + +Signed-off-by: Jan Engelhardt <jengelh@inai.de> + +Conflicts: + configure +--- + configure | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +--- a/configure ++++ b/configure +@@ -2,14 +2,20 @@ + # This is not an autconf generated configure + # + INCLUDE=${1:-"$PWD/include"} +-: ${PKG_CONFIG:=pkg-config} +-: ${CC=gcc} +-echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config + + # Make a temp directory in build tree. + TMPDIR=$(mktemp -d config.XXXXXX) + trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM + ++check_toolchain() ++{ ++: ${PKG_CONFIG:=pkg-config} ++: ${AR=ar} ++: ${CC=gcc} ++echo "AR:=${AR}" >>Config ++echo "CC:=${CC}" >>Config ++} ++ + check_atm() + { + cat >$TMPDIR/atmtest.c <<EOF +@@ -224,6 +230,8 @@ rm -f $TMPDIR/ipsettest.c $TMPDIR/ipsett + } + + echo "# Generated config based on" $INCLUDE >Config ++echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config ++check_toolchain + + echo "TC schedulers" + |