matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XFRM is now a config optio. 

(Logical change 1.60)
This commit is contained in:
osdl.net!shemminger 2004-07-30 22:27:50 +00:00
parent 9a4a2b4721
commit b9cb1c9a4b
2 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
configure vendored
View File

@ -5,7 +5,17 @@ INCLUDE=${1:-"/usr/include"}
echo "# Generated config based on" $INCLUDE >Config echo "# Generated config based on" $INCLUDE >Config
echo "TC" echo -n "TC xfrm "
XFRM=$INCLUDE/linux/xfrm.h
if [ ! -r $XFRM ];
then
echo no
else
echo "IP_CONFIG_XFRM:=y" >>Config
echo yes
fi
echo "TC schedulers"
PKT_SCHED=$INCLUDE/linux/pkt_sched.h PKT_SCHED=$INCLUDE/linux/pkt_sched.h
if [ ! -r $PKT_SCHED ]; if [ ! -r $PKT_SCHED ];
then then
@ -13,7 +23,7 @@ then
exit 1 exit 1
fi fi
echo -n " netem scheduler... " echo -n " netem "
cat >/tmp/netemtest.c <<EOF cat >/tmp/netemtest.c <<EOF
#include <asm/types.h> #include <asm/types.h>
#include <linux/pkt_sched.h> #include <linux/pkt_sched.h>
@ -26,13 +36,13 @@ gcc -I$INCLUDE -c /tmp/netemtest.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "TC_CONFIG_NETEM:=y" >>Config echo "TC_CONFIG_NETEM:=y" >>Config
echo y echo yes
else else
echo n echo no
fi fi
rm -f /tmp/netemtest.c /tmp/netemtest.o rm -f /tmp/netemtest.c /tmp/netemtest.o
echo -n " ATM... " echo -n " ATM "
cat >/tmp/atmtest.c <<EOF cat >/tmp/atmtest.c <<EOF
#include <atm.h> #include <atm.h>
int main(int argc, char **argv) { int main(int argc, char **argv) {
@ -45,13 +55,13 @@ gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "TC_CONFIG_ATM:=y" >>Config echo "TC_CONFIG_ATM:=y" >>Config
echo y echo yes
else else
echo n echo no
fi fi
rm -f /tmp/atmtest.c /tmp/atmtest rm -f /tmp/atmtest.c /tmp/atmtest
echo -n " HTB... " echo -n " HTB "
DEF_HTB=`grep '^#define HTB_TC_VER' tc/q_htb.c` DEF_HTB=`grep '^#define HTB_TC_VER' tc/q_htb.c`
cat >/tmp/htbtest.c <<EOF cat >/tmp/htbtest.c <<EOF
#include <stdio.h> #include <stdio.h>
@ -66,34 +76,56 @@ int main(int argc, char **argv) {
return 0; return 0;
} }
EOF EOF
gcc -I$INCLUDE -o /tmp/htbtest /tmp/htbtest.c gcc -I$INCLUDE -o /tmp/htbtest /tmp/htbtest.c >/dev/null 2>&1
if [ $? -eq 0 -a /tmp/htbtest ] if [ $? -eq 0 -a /tmp/htbtest ]
then then
echo "TC_CONFIG_HTB:=y" >>Config echo "TC_CONFIG_HTB:=y" >>Config
echo y echo yes
else else
echo n echo no
fi fi
rm -f /tmp/htbtest /tmp/htbtest.c rm -f /tmp/htbtest /tmp/htbtest.c
echo -n " HFSC "
cat >/tmp/hfsctest.c <<EOF
#include <asm/types.h>
#include <linux/pkt_sched.h>
int main(int argc, char **argv) {
static struct tc_hfsc_qopt qopt;
exit(qopt.defcls);
}
EOF
gcc -I$INCLUDE -c /tmp/hfsctest.c >/dev/null 2>&1
if [ $? -eq 0 ]
then
echo "TC_CONFIG_HFSC:=y" >>Config
echo yes
else
echo no
fi
rm -f /tmp/hfsctest.c /tmp/hfsctest.o
# See if we know about TCP Vegas # See if we know about TCP Vegas
echo "SS" echo "SS"
echo -n " TCP Vegas... " echo -n " TCP Vegas "
if grep -q TCPDIAG_VEGASINFO $INCLUDE/linux/tcp_diag.h >/dev/null 2>&1 if grep -q TCPDIAG_VEGASINFO $INCLUDE/linux/tcp_diag.h >/dev/null 2>&1
then then
echo "SS_CONFIG_VEGAS:=y" >>Config echo "SS_CONFIG_VEGAS:=y" >>Config
echo y echo yes
else else
echo n echo no
fi fi
echo -n " TCP DRS... " echo -n " TCP DRS "
if grep -q tcpi_rcv_space $INCLUDE/linux/tcp.h if grep -q tcpi_rcv_space $INCLUDE/linux/tcp.h
then then
echo "SS_CONFIG_DRS:=y" >>Config echo "SS_CONFIG_DRS:=y" >>Config
echo y echo yes
else else
echo n echo no
fi fi

12
ip/Makefile
View File

@ -1,6 +1,14 @@
IPOBJ=ip.o ipaddress.o iproute.o iprule.o \ IPOBJ=ip.o ipaddress.o iproute.o iprule.o \
rtm_map.o iptunnel.o ipneigh.o iplink.o ipmaddr.o \ rtm_map.o iptunnel.o ipneigh.o iplink.o \
ipmonitor.o ipmroute.o ipxfrm.o xfrm_state.o xfrm_policy.o ipmaddr.o ipmonitor.o ipmroute.o
include ../Config
ifeq ($(IP_CONFIG_XFRM),y)
IPOBJ += ipxfrm.o xfrm_state.o xfrm_policy.o
else
IPOBJ += xfrm_stub.o
endif
RTMONOBJ=rtmon.o RTMONOBJ=rtmon.o