From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 19 Jan 2007 18:48:08 +0000 (+0000)
Subject: merged to iproute2-2.6.16-060323
X-Git-Tag: iproute-2.6.16-1~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e49ec8e9515c095deaa4cd39edcee438775c5409;p=iproute2.git

merged to iproute2-2.6.16-060323
---

diff --git a/Config b/Config
deleted file mode 100644
index 290e783..0000000
--- a/Config
+++ /dev/null
@@ -1 +0,0 @@
-# Generated config based on /tmp/iproute2-2.6.11/include
diff --git a/Makefile.kernel b/Makefile.kernel
deleted file mode 100644
index abd5aab..0000000
--- a/Makefile.kernel
+++ /dev/null
@@ -1,67 +0,0 @@
-DESTDIR=
-SBINDIR=/usr/sbin
-CONFDIR=/etc/iproute2
-DOCDIR=/usr/share/doc/iproute2
-MANDIR=/usr/share/man
-
-# Path to db_185.h include
-DBM_INCLUDE:=/usr/include
-
-DEFINES= -DRESOLVE_HOSTNAMES
-
-#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
-LDLIBS=-lresolv
-ADDLIB=
-
-#options for decnet
-ADDLIB+=dnet_ntop.o dnet_pton.o
-
-#options for ipx
-ADDLIB+=ipx_ntop.o ipx_pton.o
-
-CC = gcc
-HOSTCC = gcc
-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
-CFLAGS = $(CCOPTS) -I../include $(DEFINES)
-
-LDLIBS += -L../lib -lnetlink -lutil
-
-SUBDIRS=lib ip tc misc netem
-
-LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
-
-all: Config
-	@for i in $(SUBDIRS); \
-	do $(MAKE) $(MFLAGS) -C $$i; done
-
-Config:
-	./configure $(KERNEL_INCLUDE)
-
-install: all
-	install -m 0755 -d $(DESTDIR)$(SBINDIR)
-	install -m 0755 -d $(DESTDIR)$(CONFDIR)
-	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
-	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
-	install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
-		$(DESTDIR)$(DOCDIR)/examples
-	install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
-		$(DESTDIR)$(DOCDIR)/examples/diffserv
-	@for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
-	install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
-	install -m 0755 -d $(DESTDIR)$(MANDIR)/man8
-	install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8
-	ln -sf $(MANDIR)/man8/tc-pbfifo.8  $(DESTDIR)$(MANDIR)/man8/tc-bfifo.8
-	ln -sf $(MANDIR)/man8/tc-pbfifo.8  $(DESTDIR)$(MANDIR)/man8/tc-pfifo.8
-	install -m 0755 -d $(DESTDIR)$(MANDIR)/man3
-	install -m 0644 $(shell find man/man3 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man3
-
-clean:
-	@for i in $(SUBDIRS) doc; \
-	do $(MAKE) $(MFLAGS) -C $$i clean; done
-
-clobber: clean
-	rm -f Config
-
-distclean: clean clobber
-
-.EXPORT_ALL_VARIABLES:
diff --git a/etc/iproute2/rt_dsfield.rt_config b/etc/iproute2/rt_dsfield.rt_config
deleted file mode 100644
index 110061a..0000000
--- a/etc/iproute2/rt_dsfield.rt_config
+++ /dev/null
@@ -1,13 +0,0 @@
-0x10	lowdelay
-0x08	throughput
-0x04	reliability
-# This value overlap with ECT, do not use it!
-0x02	mincost
-# These values seems do not want to die, Cisco likes them by a strange reason.
-0x20	priority
-0x40	immediate
-0x60	flash
-0x80	flash-override
-0xa0	critical
-0xc0	internet
-0xe0	network
diff --git a/etc/iproute2/rt_protos.rt_config b/etc/iproute2/rt_protos.rt_config
deleted file mode 100644
index 8c985d7..0000000
--- a/etc/iproute2/rt_protos.rt_config
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Reserved protocols.
-#
-0	unspec
-1	redirect
-2	kernel
-3	boot
-4	static
-8	gated
-9	ra
-10	mrt
-11	zebra
-12	bird
-#
-#	Used by me for gated
-#
-254	gated/aggr
-253	gated/bgp
-252	gated/ospf
-251	gated/ospfase
-250	gated/rip
-249	gated/static
-248	gated/conn
-247	gated/inet
-246	gated/default
diff --git a/etc/iproute2/rt_realms.rt_config b/etc/iproute2/rt_realms.rt_config
deleted file mode 100644
index eedd76d..0000000
--- a/etc/iproute2/rt_realms.rt_config
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# reserved values
-#
-0	cosmos
-#
-# local
-#
-#1	inr.ac
-#2	inr.ruhep
-#3	freenet
-#4	radio-msu
-#5	russia
-#6	internet
diff --git a/etc/iproute2/rt_scopes.rt_config b/etc/iproute2/rt_scopes.rt_config
deleted file mode 100644
index 8514bc1..0000000
--- a/etc/iproute2/rt_scopes.rt_config
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# reserved values
-#
-0	global
-255	nowhere
-254	host
-253	link
-#
-# pseudo-reserved
-#
-200	site
diff --git a/etc/iproute2/rt_tables.rt_config b/etc/iproute2/rt_tables.rt_config
deleted file mode 100644
index 541abfd..0000000
--- a/etc/iproute2/rt_tables.rt_config
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# reserved values
-#
-255	local
-254	main
-253	default
-0	unspec
-#
-# local
-#
-#1	inr.ruhep
diff --git a/include/linux/tcp_diag.h b/include/linux/tcp_diag.h
deleted file mode 100644
index ceee962..0000000
--- a/include/linux/tcp_diag.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#ifndef _TCP_DIAG_H_
-#define _TCP_DIAG_H_ 1
-
-/* Just some random number */
-#define TCPDIAG_GETSOCK 18
-
-/* Socket identity */
-struct tcpdiag_sockid
-{
-	__u16	tcpdiag_sport;
-	__u16	tcpdiag_dport;
-	__u32	tcpdiag_src[4];
-	__u32	tcpdiag_dst[4];
-	__u32	tcpdiag_if;
-	__u32	tcpdiag_cookie[2];
-#define TCPDIAG_NOCOOKIE (~0U)
-};
-
-/* Request structure */
-
-struct tcpdiagreq
-{
-	__u8	tcpdiag_family;		/* Family of addresses. */
-	__u8	tcpdiag_src_len;
-	__u8	tcpdiag_dst_len;
-	__u8	tcpdiag_ext;		/* Query extended information */
-
-	struct tcpdiag_sockid id;
-
-	__u32	tcpdiag_states;		/* States to dump */
-	__u32	tcpdiag_dbs;		/* Tables to dump (NI) */
-};
-
-enum
-{
-	TCPDIAG_REQ_NONE,
-	TCPDIAG_REQ_BYTECODE,
-};
-
-#define TCPDIAG_REQ_MAX TCPDIAG_REQ_BYTECODE
-
-/* Bytecode is sequence of 4 byte commands followed by variable arguments.
- * All the commands identified by "code" are conditional jumps forward:
- * to offset cc+"yes" or to offset cc+"no". "yes" is supposed to be
- * length of the command and its arguments.
- */
- 
-struct tcpdiag_bc_op
-{
-	unsigned char	code;
-	unsigned char	yes;
-	unsigned short	no;
-};
-
-enum
-{
-	TCPDIAG_BC_NOP,
-	TCPDIAG_BC_JMP,
-	TCPDIAG_BC_S_GE,
-	TCPDIAG_BC_S_LE,
-	TCPDIAG_BC_D_GE,
-	TCPDIAG_BC_D_LE,
-	TCPDIAG_BC_AUTO,
-	TCPDIAG_BC_S_COND,
-	TCPDIAG_BC_D_COND,
-};
-
-struct tcpdiag_hostcond
-{
-	__u8	family;
-	__u8	prefix_len;
-	int	port;
-	__u32	addr[0];
-};
-
-/* Base info structure. It contains socket identity (addrs/ports/cookie)
- * and, alas, the information shown by netstat. */
-struct tcpdiagmsg
-{
-	__u8	tcpdiag_family;
-	__u8	tcpdiag_state;
-	__u8	tcpdiag_timer;
-	__u8	tcpdiag_retrans;
-
-	struct tcpdiag_sockid id;
-
-	__u32	tcpdiag_expires;
-	__u32	tcpdiag_rqueue;
-	__u32	tcpdiag_wqueue;
-	__u32	tcpdiag_uid;
-	__u32	tcpdiag_inode;
-};
-
-/* Extensions */
-
-enum
-{
-	TCPDIAG_NONE,
-	TCPDIAG_MEMINFO,
-	TCPDIAG_INFO,
-	TCPDIAG_VEGASINFO,
-};
-
-#define TCPDIAG_MAX TCPDIAG_VEGASINFO
-
-
-/* TCPDIAG_MEM */
-
-struct tcpdiag_meminfo
-{
-	__u32	tcpdiag_rmem;
-	__u32	tcpdiag_wmem;
-	__u32	tcpdiag_fmem;
-	__u32	tcpdiag_tmem;
-};
-
-/* TCPDIAG_VEGASINFO */
-
-struct tcpvegas_info {
-	__u32	tcpv_enabled;
-	__u32	tcpv_rttcnt;
-	__u32	tcpv_rtt;
-	__u32	tcpv_minrtt;
-};
-
-
-#endif /* _TCP_DIAG_H_ */
diff --git a/ip/iproute.c.initvar b/ip/iproute.c.initvar
deleted file mode 100644
index b2ddb6e..0000000
--- a/ip/iproute.c.initvar
+++ /dev/null
@@ -1,1413 +0,0 @@
-/*
- * iproute.c		"ip route".
- *
- *		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:
- *
- * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
- * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <string.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
-#include <linux/in_route.h>
-
-#include "rt_names.h"
-#include "utils.h"
-#include "ip_common.h"
-
-#ifndef RTAX_RTTVAR
-#define RTAX_RTTVAR RTAX_HOPS
-#endif
-
-
-static void usage(void) __attribute__((noreturn));
-
-static void usage(void)
-{
-	fprintf(stderr, "Usage: ip route { list | flush } SELECTOR\n");
-	fprintf(stderr, "       ip route get ADDRESS [ from ADDRESS iif STRING ]\n");
-	fprintf(stderr, "                            [ oif STRING ]  [ tos TOS ]\n");
-	fprintf(stderr, "       ip route { add | del | change | append | replace | monitor } ROUTE\n");
-	fprintf(stderr, "SELECTOR := [ root PREFIX ] [ match PREFIX ] [ exact PREFIX ]\n");
-	fprintf(stderr, "            [ table TABLE_ID ] [ proto RTPROTO ]\n");
-	fprintf(stderr, "            [ type TYPE ] [ scope SCOPE ]\n");
-	fprintf(stderr, "ROUTE := NODE_SPEC [ INFO_SPEC ]\n");
-	fprintf(stderr, "NODE_SPEC := [ TYPE ] PREFIX [ tos TOS ]\n");
-	fprintf(stderr, "             [ table TABLE_ID ] [ proto RTPROTO ]\n");
-	fprintf(stderr, "             [ scope SCOPE ] [ metric METRIC ]\n");
-	fprintf(stderr, "INFO_SPEC := NH OPTIONS FLAGS [ nexthop NH ]...\n");
-	fprintf(stderr, "NH := [ via ADDRESS ] [ dev STRING ] [ weight NUMBER ] NHFLAGS\n");
-	fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n");
-	fprintf(stderr, "           [ rtt NUMBER ] [ rttvar NUMBER ]\n");
-	fprintf(stderr, "           [ window NUMBER] [ cwnd NUMBER ] [ ssthresh NUMBER ]\n");
-	fprintf(stderr, "           [ realms REALM ]\n");
-	fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n");
-	fprintf(stderr, "          unreachable | prohibit | blackhole | nat ]\n");
-	fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n");
-	fprintf(stderr, "SCOPE := [ host | link | global | NUMBER ]\n");
-	fprintf(stderr, "FLAGS := [ equalize ]\n");
-	fprintf(stderr, "NHFLAGS := [ onlink | pervasive ]\n");
-	fprintf(stderr, "RTPROTO := [ kernel | boot | static | NUMBER ]\n");
-	exit(-1);
-}
-
-
-static struct
-{
-	int tb;
-	int flushed;
-	char *flushb;
-	int flushp;
-	int flushe;
-	struct rtnl_handle *rth;
-	int protocol, protocolmask;
-	int scope, scopemask;
-	int type, typemask;
-	int tos, tosmask;
-	int iif, iifmask;
-	int oif, oifmask;
-	int realm, realmmask;
-	inet_prefix rprefsrc;
-	inet_prefix rvia;
-	inet_prefix rdst;
-	inet_prefix mdst;
-	inet_prefix rsrc;
-	inet_prefix msrc;
-} filter;
-
-static int flush_update(void)
-{
-	if (rtnl_send(filter.rth, filter.flushb, filter.flushp) < 0) {
-		perror("Failed to send flush request\n");
-		return -1;
-	}
-	filter.flushp = 0;
-	return 0;
-}
-
-int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
-{
-	FILE *fp = (FILE*)arg;
-	struct rtmsg *r = NLMSG_DATA(n);
-	int len = n->nlmsg_len;
-	struct rtattr * tb[RTA_MAX+1];
-	char abuf[256];
-	inet_prefix dst;
-	inet_prefix src;
-	inet_prefix prefsrc;
-	inet_prefix via;
-	int host_len = -1;
-	SPRINT_BUF(b1);
-	
-
-	if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
-		fprintf(stderr, "Not a route: %08x %08x %08x\n",
-			n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);
-		return 0;
-	}
-	if (filter.flushb && n->nlmsg_type != RTM_NEWROUTE)
-		return 0;
-	len -= NLMSG_LENGTH(sizeof(*r));
-	if (len < 0) {
-		fprintf(stderr, "BUG: wrong nlmsg len %d\n", len);
-		return -1;
-	}
-
-	if (r->rtm_family == AF_INET6)
-		host_len = 128;
-	else if (r->rtm_family == AF_INET)
-		host_len = 32;
-	else if (r->rtm_family == AF_DECnet)
-		host_len = 16;
-	else if (r->rtm_family == AF_IPX)
-		host_len = 80;
-
-	if (r->rtm_family == AF_INET6) {
-		if (filter.tb) {
-			if (filter.tb < 0) {
-				if (!(r->rtm_flags&RTM_F_CLONED))
-					return 0;
-			} else {
-				if (r->rtm_flags&RTM_F_CLONED)
-					return 0;
-				if (filter.tb == RT_TABLE_LOCAL) {
-					if (r->rtm_type != RTN_LOCAL)
-						return 0;
-				} else if (filter.tb == RT_TABLE_MAIN) {
-					if (r->rtm_type == RTN_LOCAL)
-						return 0;
-				} else {
-					return 0;
-				}
-			}
-		}
-	} else {
-		if (filter.tb > 0 && filter.tb != r->rtm_table)
-			return 0;
-	}
-	if ((filter.protocol^r->rtm_protocol)&filter.protocolmask)
-		return 0;
-	if ((filter.scope^r->rtm_scope)&filter.scopemask)
-		return 0;
-	if ((filter.type^r->rtm_type)&filter.typemask)
-		return 0;
-	if ((filter.tos^r->rtm_tos)&filter.tosmask)
-		return 0;
-	if (filter.rdst.family &&
-	    (r->rtm_family != filter.rdst.family || filter.rdst.bitlen > r->rtm_dst_len))
-		return 0;
-	if (filter.mdst.family &&
-	    (r->rtm_family != filter.mdst.family ||
-	     (filter.mdst.bitlen >= 0 && filter.mdst.bitlen < r->rtm_dst_len)))
-		return 0;
-	if (filter.rsrc.family &&
-	    (r->rtm_family != filter.rsrc.family || filter.rsrc.bitlen > r->rtm_src_len))
-		return 0;
-	if (filter.msrc.family &&
-	    (r->rtm_family != filter.msrc.family ||
-	     (filter.msrc.bitlen >= 0 && filter.msrc.bitlen < r->rtm_src_len)))
-		return 0;
-	if (filter.rvia.family && r->rtm_family != filter.rvia.family)
-		return 0;
-	if (filter.rprefsrc.family && r->rtm_family != filter.rprefsrc.family)
-		return 0;
-
-	parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
-
-	memset(&dst, 0, sizeof(dst));
-	dst.family = r->rtm_family;
-	if (tb[RTA_DST])
-		memcpy(&dst.data, RTA_DATA(tb[RTA_DST]), (r->rtm_dst_len+7)/8);
-	if (filter.rsrc.family || filter.msrc.family) {
-		memset(&src, 0, sizeof(src));
-		src.family = r->rtm_family;
-		if (tb[RTA_SRC])
-			memcpy(&src.data, RTA_DATA(tb[RTA_SRC]), (r->rtm_src_len+7)/8);
-	}
-	if (filter.rvia.bitlen>0) {
-		memset(&via, 0, sizeof(via));
-		via.family = r->rtm_family;
-		if (tb[RTA_GATEWAY])
-			memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len);
-	}
-	if (filter.rprefsrc.bitlen>0) {
-		memset(&prefsrc, 0, sizeof(prefsrc));
-		prefsrc.family = r->rtm_family;
-		if (tb[RTA_PREFSRC])
-			memcpy(&prefsrc.data, RTA_DATA(tb[RTA_PREFSRC]), host_len);
-	}
-
-	if (filter.rdst.family && inet_addr_match(&dst, &filter.rdst, filter.rdst.bitlen))
-		return 0;
-	if (filter.mdst.family && filter.mdst.bitlen >= 0 &&
-	    inet_addr_match(&dst, &filter.mdst, r->rtm_dst_len))
-		return 0;
-
-	if (filter.rsrc.family && inet_addr_match(&src, &filter.rsrc, filter.rsrc.bitlen))
-		return 0;
-	if (filter.msrc.family && filter.msrc.bitlen >= 0 &&
-	    inet_addr_match(&src, &filter.msrc, r->rtm_src_len))
-		return 0;
-
-	if (filter.rvia.family && inet_addr_match(&via, &filter.rvia, filter.rvia.bitlen))
-		return 0;
-	if (filter.rprefsrc.family && inet_addr_match(&prefsrc, &filter.rprefsrc, filter.rprefsrc.bitlen))
-		return 0;
-	if (filter.realmmask) {
-		__u32 realms = 0;
-		if (tb[RTA_FLOW])
-			realms = *(__u32*)RTA_DATA(tb[RTA_FLOW]);
-		if ((realms^filter.realm)&filter.realmmask)
-			return 0;
-	}
-	if (filter.iifmask) {
-		int iif = 0;
-		if (tb[RTA_IIF])
-			iif = *(int*)RTA_DATA(tb[RTA_IIF]);
-		if ((iif^filter.iif)&filter.iifmask)
-			return 0;
-	}
-	if (filter.oifmask) {
-		int oif = 0;
-		if (tb[RTA_OIF])
-			oif = *(int*)RTA_DATA(tb[RTA_OIF]);
-		if ((oif^filter.oif)&filter.oifmask)
-			return 0;
-	}
-	if (filter.flushb && 
-	    r->rtm_family == AF_INET6 &&
-	    r->rtm_dst_len == 0 &&
-	    r->rtm_type == RTN_UNREACHABLE &&
-	    tb[RTA_PRIORITY] &&
-	    *(int*)RTA_DATA(tb[RTA_PRIORITY]) == -1)
-		return 0;
-
-	if (filter.flushb) {
-		struct nlmsghdr *fn;
-		if (NLMSG_ALIGN(filter.flushp) + n->nlmsg_len > filter.flushe) {
-			if (flush_update())
-				return -1;
-		}
-		fn = (struct nlmsghdr*)(filter.flushb + NLMSG_ALIGN(filter.flushp));
-		memcpy(fn, n, n->nlmsg_len);
-		fn->nlmsg_type = RTM_DELROUTE;
-		fn->nlmsg_flags = NLM_F_REQUEST;
-		fn->nlmsg_seq = ++filter.rth->seq;
-		filter.flushp = (((char*)fn) + n->nlmsg_len) - filter.flushb;
-		filter.flushed++;
-		if (show_stats < 2)
-			return 0;
-	}
-
-	if (n->nlmsg_type == RTM_DELROUTE)
-		fprintf(fp, "Deleted ");
-	if (r->rtm_type != RTN_UNICAST && !filter.type)
-		fprintf(fp, "%s ", rtnl_rtntype_n2a(r->rtm_type, b1, sizeof(b1)));
-
-	if (tb[RTA_DST]) {
-		if (r->rtm_dst_len != host_len) {
-			fprintf(fp, "%s/%u ", rt_addr_n2a(r->rtm_family,
-							 RTA_PAYLOAD(tb[RTA_DST]),
-							 RTA_DATA(tb[RTA_DST]),
-							 abuf, sizeof(abuf)),
-				r->rtm_dst_len
-				);
-		} else {
-			fprintf(fp, "%s ", format_host(r->rtm_family,
-						       RTA_PAYLOAD(tb[RTA_DST]),
-						       RTA_DATA(tb[RTA_DST]),
-						       abuf, sizeof(abuf))
-				);
-		}
-	} else if (r->rtm_dst_len) {
-		fprintf(fp, "0/%d ", r->rtm_dst_len);
-	} else {
-		fprintf(fp, "default ");
-	}
-	if (tb[RTA_SRC]) {
-		if (r->rtm_src_len != host_len) {
-			fprintf(fp, "from %s/%u ", rt_addr_n2a(r->rtm_family,
-							 RTA_PAYLOAD(tb[RTA_SRC]),
-							 RTA_DATA(tb[RTA_SRC]),
-							 abuf, sizeof(abuf)),
-				r->rtm_src_len
-				);
-		} else {
-			fprintf(fp, "from %s ", format_host(r->rtm_family,
-						       RTA_PAYLOAD(tb[RTA_SRC]),
-						       RTA_DATA(tb[RTA_SRC]),
-						       abuf, sizeof(abuf))
-				);
-		}
-	} else if (r->rtm_src_len) {
-		fprintf(fp, "from 0/%u ", r->rtm_src_len);
-	}
-	if (r->rtm_tos && filter.tosmask != -1) {
-		SPRINT_BUF(b1);
-		fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1)));
-	}
-	if (tb[RTA_GATEWAY] && filter.rvia.bitlen != host_len) {
-		fprintf(fp, "via %s ", 
-			format_host(r->rtm_family,
-				    RTA_PAYLOAD(tb[RTA_GATEWAY]),
-				    RTA_DATA(tb[RTA_GATEWAY]),
-				    abuf, sizeof(abuf)));
-	}
-	if (tb[RTA_OIF] && filter.oifmask != -1)
-		fprintf(fp, "dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
-
-	if (!(r->rtm_flags&RTM_F_CLONED)) {
-		if (r->rtm_table != RT_TABLE_MAIN && !filter.tb)
-			fprintf(fp, " table %s ", rtnl_rttable_n2a(r->rtm_table, b1, sizeof(b1)));
-		if (r->rtm_protocol != RTPROT_BOOT && filter.protocolmask != -1)
-			fprintf(fp, " proto %s ", rtnl_rtprot_n2a(r->rtm_protocol, b1, sizeof(b1)));
-		if (r->rtm_scope != RT_SCOPE_UNIVERSE && filter.scopemask != -1)
-			fprintf(fp, " scope %s ", rtnl_rtscope_n2a(r->rtm_scope, b1, sizeof(b1)));
-	}
-	if (tb[RTA_PREFSRC] && filter.rprefsrc.bitlen != host_len) {
-		/* Do not use format_host(). It is our local addr
-		   and symbolic name will not be useful.
-		 */
-		fprintf(fp, " src %s ", 
-			rt_addr_n2a(r->rtm_family,
-				    RTA_PAYLOAD(tb[RTA_PREFSRC]),
-				    RTA_DATA(tb[RTA_PREFSRC]),
-				    abuf, sizeof(abuf)));
-	}
-	if (tb[RTA_PRIORITY])
-		fprintf(fp, " metric %d ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY]));
-	if (r->rtm_flags & RTNH_F_DEAD)
-		fprintf(fp, "dead ");
-	if (r->rtm_flags & RTNH_F_ONLINK)
-		fprintf(fp, "onlink ");
-	if (r->rtm_flags & RTNH_F_PERVASIVE)
-		fprintf(fp, "pervasive ");
-	if (r->rtm_flags & RTM_F_EQUALIZE)
-		fprintf(fp, "equalize ");
-	if (r->rtm_flags & RTM_F_NOTIFY)
-		fprintf(fp, "notify ");
-
-	if (tb[RTA_FLOW] && filter.realmmask != ~0U) {
-		__u32 to = *(__u32*)RTA_DATA(tb[RTA_FLOW]);
-		__u32 from = to>>16;
-		to &= 0xFFFF;
-		fprintf(fp, "realm%s ", from ? "s" : "");
-		if (from) {
-			fprintf(fp, "%s/",
-				rtnl_rtrealm_n2a(from, b1, sizeof(b1)));
-		}
-		fprintf(fp, "%s ",
-			rtnl_rtrealm_n2a(to, b1, sizeof(b1)));
-	}
-	if ((r->rtm_flags&RTM_F_CLONED) && r->rtm_family == AF_INET) {
-		__u32 flags = r->rtm_flags&~0xFFFF;
-		int first = 1;
-
-		fprintf(fp, "%s    cache ", _SL_);
-
-#define PRTFL(fl,flname) if (flags&RTCF_##fl) { \
-  flags &= ~RTCF_##fl; \
-  fprintf(fp, "%s" flname "%s", first ? "<" : "", flags ? "," : "> "); \
-  first = 0; }
-		PRTFL(LOCAL, "local");
-		PRTFL(REJECT, "reject");
-		PRTFL(MULTICAST, "mc");
-		PRTFL(BROADCAST, "brd");
-		PRTFL(DNAT, "dst-nat");
-		PRTFL(SNAT, "src-nat");
-		PRTFL(MASQ, "masq");
-		PRTFL(DIRECTDST, "dst-direct");
-		PRTFL(DIRECTSRC, "src-direct");
-		PRTFL(REDIRECTED, "redirected");
-		PRTFL(DOREDIRECT, "redirect");
-		PRTFL(FAST, "fastroute");
-		PRTFL(NOTIFY, "notify");
-		PRTFL(TPROXY, "proxy");
-#ifdef RTCF_EQUALIZE
-		PRTFL(EQUALIZE, "equalize");
-#endif
-		if (flags)
-			fprintf(fp, "%s%x> ", first ? "<" : "", flags);
-		if (tb[RTA_CACHEINFO]) {
-			struct rta_cacheinfo *ci = RTA_DATA(tb[RTA_CACHEINFO]);
-			static int hz;
-			if (!hz)
-				hz = get_user_hz();
-			if (ci->rta_expires != 0)
-				fprintf(fp, " expires %dsec", ci->rta_expires/hz);
-			if (ci->rta_error != 0)
-				fprintf(fp, " error %d", ci->rta_error);
-			if (show_stats) {
-				if (ci->rta_clntref)
-					fprintf(fp, " users %d", ci->rta_clntref);
-				if (ci->rta_used != 0)
-					fprintf(fp, " used %d", ci->rta_used);
-				if (ci->rta_lastuse != 0)
-					fprintf(fp, " age %dsec", ci->rta_lastuse/hz);
-			}
-#ifdef RTNETLINK_HAVE_PEERINFO
-			if (ci->rta_id)
-				fprintf(fp, " ipid 0x%04x", ci->rta_id);
-			if (ci->rta_ts || ci->rta_tsage)
-				fprintf(fp, " ts 0x%x tsage %dsec", ci->rta_ts, ci->rta_tsage);
-#endif
-		}
-	} else if (r->rtm_family == AF_INET6) {
-		struct rta_cacheinfo *ci = NULL;
-		if (tb[RTA_CACHEINFO])
-			ci = RTA_DATA(tb[RTA_CACHEINFO]);
-		if ((r->rtm_flags & RTM_F_CLONED) || (ci && ci->rta_expires)) {
-			static int hz;
-			if (!hz)
-				hz = get_user_hz();
-			if (r->rtm_flags & RTM_F_CLONED)
-				fprintf(fp, "%s    cache ", _SL_);
-			if (ci->rta_expires)
-				fprintf(fp, " expires %dsec", ci->rta_expires/hz);
-			if (ci->rta_error != 0)
-				fprintf(fp, " error %d", ci->rta_error);
-			if (show_stats) {
-				if (ci->rta_clntref)
-					fprintf(fp, " users %d", ci->rta_clntref);
-				if (ci->rta_used != 0)
-					fprintf(fp, " used %d", ci->rta_used);
-				if (ci->rta_lastuse != 0)
-					fprintf(fp, " age %dsec", ci->rta_lastuse/hz);
-			}
-		} else if (ci) {
-			if (ci->rta_error != 0)
-				fprintf(fp, " error %d", ci->rta_error);
-		}
-	}
-	if (tb[RTA_METRICS]) {
-		int i;
-		unsigned mxlock = 0;
-		struct rtattr *mxrta[RTAX_MAX+1];
-
-		parse_rtattr(mxrta, RTAX_MAX, RTA_DATA(tb[RTA_METRICS]),
-			    RTA_PAYLOAD(tb[RTA_METRICS]));
-		if (mxrta[RTAX_LOCK])
-			mxlock = *(unsigned*)RTA_DATA(mxrta[RTAX_LOCK]);
-
-		for (i=2; i<=RTAX_MAX; i++) {
-			static char *mx_names[] = 
-			{
-				"mtu",
-				"window",
-				"rtt",
-				"rttvar",
-				"ssthresh",
-				"cwnd",
-				"advmss",
-				"reordering",
-			};
-			static int hz;
-			if (mxrta[i] == NULL)
-				continue;
-			if (!hz)
-				hz = get_hz();
-			if (i-2 < sizeof(mx_names)/sizeof(char*))
-				fprintf(fp, " %s", mx_names[i-2]);
-			else
-				fprintf(fp, " metric %d", i);
-			if (mxlock & (1<<i))
-				fprintf(fp, " lock");
-
-			if (i != RTAX_RTT && i != RTAX_RTTVAR)
-				fprintf(fp, " %u", *(unsigned*)RTA_DATA(mxrta[i]));
-			else {
-				unsigned val = *(unsigned*)RTA_DATA(mxrta[i]);
-
-				val *= 1000;
-				if (i == RTAX_RTT)
-					val /= 8;
-				else
-					val /= 4;
-				if (val >= hz)
-					fprintf(fp, " %ums", val/hz);
-				else
-					fprintf(fp, " %.2fms", (float)val/hz);
-			}
-		}
-	}
-	if (tb[RTA_IIF] && filter.iifmask != -1) {
-		fprintf(fp, " iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
-	}
-	if (tb[RTA_MULTIPATH]) {
-		struct rtnexthop *nh = RTA_DATA(tb[RTA_MULTIPATH]);
-		int first = 0;
-
-		len = RTA_PAYLOAD(tb[RTA_MULTIPATH]);
-
-		for (;;) {
-			if (len < sizeof(*nh))
-				break;
-			if (nh->rtnh_len > len)
-				break;
-			if (r->rtm_flags&RTM_F_CLONED && r->rtm_type == RTN_MULTICAST) {
-				if (first)
-					fprintf(fp, " Oifs:");
-				else
-					fprintf(fp, " ");
-			} else
-				fprintf(fp, "%s\tnexthop", _SL_);
-			if (nh->rtnh_len > sizeof(*nh)) {
-				parse_rtattr(tb, RTA_MAX, RTNH_DATA(nh), nh->rtnh_len - sizeof(*nh));
-				if (tb[RTA_GATEWAY]) {
-					fprintf(fp, " via %s ", 
-						format_host(r->rtm_family,
-							    RTA_PAYLOAD(tb[RTA_GATEWAY]),
-							    RTA_DATA(tb[RTA_GATEWAY]),
-							    abuf, sizeof(abuf)));
-				}
-			}
-			if (r->rtm_flags&RTM_F_CLONED && r->rtm_type == RTN_MULTICAST) {
-				fprintf(fp, " %s", ll_index_to_name(nh->rtnh_ifindex));
-				if (nh->rtnh_hops != 1)
-					fprintf(fp, "(ttl>%d)", nh->rtnh_hops);
-			} else {
-				fprintf(fp, " dev %s", ll_index_to_name(nh->rtnh_ifindex));
-				fprintf(fp, " weight %d", nh->rtnh_hops+1);
-			}
-			if (nh->rtnh_flags & RTNH_F_DEAD)
-				fprintf(fp, " dead");
-			if (nh->rtnh_flags & RTNH_F_ONLINK)
-				fprintf(fp, " onlink");
-			if (nh->rtnh_flags & RTNH_F_PERVASIVE)
-				fprintf(fp, " pervasive");
-			len -= NLMSG_ALIGN(nh->rtnh_len);
-			nh = RTNH_NEXT(nh);
-		}
-	}
-	fprintf(fp, "\n");
-	fflush(fp);
-	return 0;
-}
-
-
-int parse_one_nh(struct rtattr *rta, struct rtnexthop *rtnh, int *argcp, char ***argvp)
-{
-	int argc = *argcp;
-	char **argv = *argvp;
-
-	while (++argv, --argc > 0) {
-		if (strcmp(*argv, "via") == 0) {
-			NEXT_ARG();
-			rta_addattr32(rta, 4096, RTA_GATEWAY, get_addr32(*argv));
-			rtnh->rtnh_len += sizeof(struct rtattr) + 4;
-		} else if (strcmp(*argv, "dev") == 0) {
-			NEXT_ARG();
-			if ((rtnh->rtnh_ifindex = ll_name_to_index(*argv)) == 0) {
-				fprintf(stderr, "Cannot find device \"%s\"\n", *argv);
-				exit(1);
-			}
-		} else if (strcmp(*argv, "weight") == 0) {
-			unsigned w;
-			NEXT_ARG();
-			if (get_unsigned(&w, *argv, 0) || w == 0 || w > 256)
-				invarg("\"weight\" is invalid\n", *argv);
-			rtnh->rtnh_hops = w - 1;
-		} else if (strcmp(*argv, "onlink") == 0) {
-			rtnh->rtnh_flags |= RTNH_F_ONLINK;
-		} else
-			break;
-	}
-	*argcp = argc;
-	*argvp = argv;
-	return 0;
-}
-
-int parse_nexthops(struct nlmsghdr *n, struct rtmsg *r, int argc, char **argv)
-{
-	char buf[1024];
-	struct rtattr *rta = (void*)buf;
-	struct rtnexthop *rtnh;
-
-	rta->rta_type = RTA_MULTIPATH;
-	rta->rta_len = RTA_LENGTH(0);
-	rtnh = RTA_DATA(rta);
-
-	while (argc > 0) {
-		if (strcmp(*argv, "nexthop") != 0) {
-			fprintf(stderr, "Error: \"nexthop\" or end of line is expected instead of \"%s\"\n", *argv);
-			exit(-1);
-		}
-		if (argc <= 1) {
-			fprintf(stderr, "Error: unexpected end of line after \"nexthop\"\n");
-			exit(-1);
-		}
-		memset(rtnh, 0, sizeof(*rtnh));
-		rtnh->rtnh_len = sizeof(*rtnh);
-		rta->rta_len += rtnh->rtnh_len;
-		parse_one_nh(rta, rtnh, &argc, &argv);
-		rtnh = RTNH_NEXT(rtnh);
-	}
-
-	if (rta->rta_len > RTA_LENGTH(0))
-		addattr_l(n, 1024, RTA_MULTIPATH, RTA_DATA(rta), RTA_PAYLOAD(rta));
-	return 0;
-}
-
-
-int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
-{
-	struct rtnl_handle rth;
-	struct {
-		struct nlmsghdr 	n;
-		struct rtmsg 		r;
-		char   			buf[1024];
-	} req;
-	char  mxbuf[256];
-	struct rtattr * mxrta = (void*)mxbuf;
-	unsigned mxlock = 0;
-	char  *d = NULL;
-	int gw_ok = 0;
-	int dst_ok = 0;
-	int nhs_ok = 0;
-	int scope_ok = 0;
-	int table_ok = 0;
-	int proto_ok = 0;
-	int type_ok = 0;
-
-	memset(&req, 0, sizeof(req));
-
-	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-	req.n.nlmsg_flags = NLM_F_REQUEST|flags;
-	req.n.nlmsg_type = cmd;
-	req.r.rtm_family = preferred_family;
-	req.r.rtm_table = RT_TABLE_MAIN;
-	req.r.rtm_scope = RT_SCOPE_NOWHERE;
-
-	if (cmd != RTM_DELROUTE) {
-		req.r.rtm_protocol = RTPROT_BOOT;
-		req.r.rtm_scope = RT_SCOPE_UNIVERSE;
-		req.r.rtm_type = RTN_UNICAST;
-	}
-
-	mxrta->rta_type = RTA_METRICS;
-	mxrta->rta_len = RTA_LENGTH(0);
-
-	while (argc > 0) {
-		if (strcmp(*argv, "src") == 0) {
-			inet_prefix addr;
-			NEXT_ARG();
-			get_addr(&addr, *argv, req.r.rtm_family);
-			if (req.r.rtm_family == AF_UNSPEC)
-				req.r.rtm_family = addr.family;
-			addattr_l(&req.n, sizeof(req), RTA_PREFSRC, &addr.data, addr.bytelen);
-		} else if (strcmp(*argv, "via") == 0) {
-			inet_prefix addr;
-			gw_ok = 1;
-			NEXT_ARG();
-			get_addr(&addr, *argv, req.r.rtm_family);
-			if (req.r.rtm_family == AF_UNSPEC)
-				req.r.rtm_family = addr.family;
-			addattr_l(&req.n, sizeof(req), RTA_GATEWAY, &addr.data, addr.bytelen);
-		} else if (strcmp(*argv, "from") == 0) {
-			inet_prefix addr;
-			NEXT_ARG();
-			get_prefix(&addr, *argv, req.r.rtm_family);
-			if (req.r.rtm_family == AF_UNSPEC)
-				req.r.rtm_family = addr.family;
-			if (addr.bytelen)
-				addattr_l(&req.n, sizeof(req), RTA_SRC, &addr.data, addr.bytelen);
-			req.r.rtm_src_len = addr.bitlen;
-		} else if (strcmp(*argv, "tos") == 0 ||
-			   matches(*argv, "dsfield") == 0) {
-			__u32 tos;
-			NEXT_ARG();
-			if (rtnl_dsfield_a2n(&tos, *argv))
-				invarg("\"tos\" value is invalid\n", *argv);
-			req.r.rtm_tos = tos;
-		} else if (matches(*argv, "metric") == 0 ||
-			   matches(*argv, "priority") == 0 ||
-			   matches(*argv, "preference") == 0) {
-			__u32 metric;
-			NEXT_ARG();
-			if (get_u32(&metric, *argv, 0))
-				invarg("\"metric\" value is invalid\n", *argv);
-			addattr32(&req.n, sizeof(req), RTA_PRIORITY, metric);
-		} else if (strcmp(*argv, "scope") == 0) {
-			int scope = 0;
-			NEXT_ARG();
-			if (rtnl_rtscope_a2n(&scope, *argv))
-				invarg("invalid \"scope\" value\n", *argv);
-			req.r.rtm_scope = scope;
-			scope_ok = 1;
-		} else if (strcmp(*argv, "mtu") == 0) {
-			unsigned mtu;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_MTU);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&mtu, *argv, 0))
-				invarg("\"mtu\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
-#ifdef RTAX_ADVMSS
-		} else if (strcmp(*argv, "advmss") == 0) {
-			unsigned mss;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_ADVMSS);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&mss, *argv, 0))
-				invarg("\"mss\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_ADVMSS, mss);
-#endif
-#ifdef RTAX_REORDERING
-		} else if (matches(*argv, "reordering") == 0) {
-			unsigned reord;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_REORDERING);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&reord, *argv, 0))
-				invarg("\"reordering\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord);
-#endif
-		} else if (strcmp(*argv, "rtt") == 0) {
-			unsigned rtt;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_RTT);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&rtt, *argv, 0))
-				invarg("\"rtt\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTT, rtt);
-		} else if (matches(*argv, "window") == 0) {
-			unsigned win;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_WINDOW);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&win, *argv, 0))
-				invarg("\"window\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_WINDOW, win);
-		} else if (matches(*argv, "cwnd") == 0) {
-			unsigned win;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_CWND);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&win, *argv, 0))
-				invarg("\"cwnd\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_CWND, win);
-		} else if (matches(*argv, "rttvar") == 0) {
-			unsigned win;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_RTTVAR);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&win, *argv, 0))
-				invarg("\"rttvar\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_RTTVAR, win);
-		} else if (matches(*argv, "ssthresh") == 0) {
-			unsigned win;
-			NEXT_ARG();
-			if (strcmp(*argv, "lock") == 0) {
-				mxlock |= (1<<RTAX_SSTHRESH);
-				NEXT_ARG();
-			}
-			if (get_unsigned(&win, *argv, 0))
-				invarg("\"ssthresh\" value is invalid\n", *argv);
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_SSTHRESH, win);
-		} else if (matches(*argv, "realms") == 0) {
-			__u32 realm;
-			NEXT_ARG();
-			if (get_rt_realms(&realm, *argv))
-				invarg("\"realm\" value is invalid\n", *argv);
-			addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
-		} else if (strcmp(*argv, "onlink") == 0) {
-			req.r.rtm_flags |= RTNH_F_ONLINK;
-		} else if (matches(*argv, "equalize") == 0 ||
-			   strcmp(*argv, "eql") == 0) {
-			req.r.rtm_flags |= RTM_F_EQUALIZE;
-		} else if (strcmp(*argv, "nexthop") == 0) {
-			nhs_ok = 1;
-			break;
-		} else if (matches(*argv, "protocol") == 0) {
-			int prot;
-			NEXT_ARG();
-			if (rtnl_rtprot_a2n(&prot, *argv))
-				invarg("\"protocol\" value is invalid\n", *argv);
-			req.r.rtm_protocol = prot;
-			proto_ok =1;
-		} else if (matches(*argv, "table") == 0) {
-			int tid;
-			NEXT_ARG();
-			if (rtnl_rttable_a2n(&tid, *argv))
-				invarg("\"table\" value is invalid\n", *argv);
-			req.r.rtm_table = tid;
-			table_ok = 1;
-		} else if (strcmp(*argv, "dev") == 0 ||
-			   strcmp(*argv, "oif") == 0) {
-			NEXT_ARG();
-			d = *argv;
-		} else {
-			int type;
-			inet_prefix dst;
-
-			if (strcmp(*argv, "to") == 0) {
-				NEXT_ARG();
-			}
-			if ((**argv < '0' || **argv > '9') &&
-			    rtnl_rtntype_a2n(&type, *argv) == 0) {
-				NEXT_ARG();
-				req.r.rtm_type = type;
-				type_ok = 1;
-			}
-
-			if (matches(*argv, "help") == 0)
-				usage();
-			if (dst_ok)
-				duparg2("to", *argv);
-			get_prefix(&dst, *argv, req.r.rtm_family);
-			if (req.r.rtm_family == AF_UNSPEC)
-				req.r.rtm_family = dst.family;
-			req.r.rtm_dst_len = dst.bitlen;
-			dst_ok = 1;
-			if (dst.bytelen)
-				addattr_l(&req.n, sizeof(req), RTA_DST, &dst.data, dst.bytelen);
-		}
-		argc--; argv++;
-	}
-
-	if (rtnl_open(&rth, 0) < 0)
-		exit(1);
-
-	if (d || nhs_ok)  {
-		int idx;
-
-		ll_init_map(&rth);
-
-		if (d) {
-			if ((idx = ll_name_to_index(d)) == 0) {
-				fprintf(stderr, "Cannot find device \"%s\"\n", d);
-				return -1;
-			}
-			addattr32(&req.n, sizeof(req), RTA_OIF, idx);
-		}
-	}
-
-	if (mxrta->rta_len > RTA_LENGTH(0)) {
-		if (mxlock)
-			rta_addattr32(mxrta, sizeof(mxbuf), RTAX_LOCK, mxlock);
-		addattr_l(&req.n, sizeof(req), RTA_METRICS, RTA_DATA(mxrta), RTA_PAYLOAD(mxrta));
-	}
-
-	if (nhs_ok)
-		parse_nexthops(&req.n, &req.r, argc, argv);
-
-	if (!table_ok) {
-		if (req.r.rtm_type == RTN_LOCAL ||
-		    req.r.rtm_type == RTN_BROADCAST ||
-		    req.r.rtm_type == RTN_NAT ||
-		    req.r.rtm_type == RTN_ANYCAST)
-			req.r.rtm_table = RT_TABLE_LOCAL;
-	}
-	if (!scope_ok) {
-		if (req.r.rtm_type == RTN_LOCAL ||
-		    req.r.rtm_type == RTN_NAT)
-			req.r.rtm_scope = RT_SCOPE_HOST;
-		else if (req.r.rtm_type == RTN_BROADCAST ||
-			 req.r.rtm_type == RTN_MULTICAST ||
-			 req.r.rtm_type == RTN_ANYCAST)
-			req.r.rtm_scope = RT_SCOPE_LINK;
-		else if (req.r.rtm_type == RTN_UNICAST ||
-			 req.r.rtm_type == RTN_UNSPEC) {
-			if (cmd == RTM_DELROUTE)
-				req.r.rtm_scope = RT_SCOPE_NOWHERE;
-			else if (!gw_ok && !nhs_ok)
-				req.r.rtm_scope = RT_SCOPE_LINK;
-		}
-	}
-
-	if (req.r.rtm_family == AF_UNSPEC)
-		req.r.rtm_family = AF_INET;
-
-	if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
-		exit(2);
-
-	return 0;
-}
-
-static int rtnl_rtcache_request(struct rtnl_handle *rth, int family)
-{
-	struct {
-		struct nlmsghdr nlh;
-		struct rtmsg rtm;
-	} req;
-	struct sockaddr_nl nladdr;
-
-	memset(&nladdr, 0, sizeof(nladdr));
-	memset(&req, 0, sizeof(req));
-	nladdr.nl_family = AF_NETLINK;
-
-	req.nlh.nlmsg_len = sizeof(req);
-	req.nlh.nlmsg_type = RTM_GETROUTE;
-	req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_REQUEST;
-	req.nlh.nlmsg_pid = 0;
-	req.nlh.nlmsg_seq = rth->dump = ++rth->seq;
-	req.rtm.rtm_family = family;
-	req.rtm.rtm_flags |= RTM_F_CLONED;
-
-	return sendto(rth->fd, (void*)&req, sizeof(req), 0, (struct sockaddr*)&nladdr, sizeof(nladdr));
-}
-
-static int iproute_flush_cache(void)
-{
-#define ROUTE_FLUSH_PATH "/proc/sys/net/ipv4/route/flush"
-
-	int len;
-	int flush_fd = open (ROUTE_FLUSH_PATH, O_WRONLY);
-	char *buffer = "-1";
-
-	if (flush_fd < 0) {
-		fprintf (stderr, "Cannot open \"%s\"\n", ROUTE_FLUSH_PATH);
-		return -1;
-	}
-
-	len = strlen (buffer);
-		
-	if ((write (flush_fd, (void *)buffer, len)) < len) {
-		fprintf (stderr, "Cannot flush routing cache\n");
-		return -1;
-	}
-	close(flush_fd);
-	return 0;
-}
-
-
-static int iproute_list_or_flush(int argc, char **argv, int flush)
-{
-	int do_ipv6 = preferred_family;
-	struct rtnl_handle rth;
-	char *id = NULL;
-	char *od = NULL;
-
-	iproute_reset_filter();
-	filter.tb = RT_TABLE_MAIN;
-
-	if (flush && argc <= 0) {
-		fprintf(stderr, "\"ip route flush\" requires arguments.\n");
-		return -1;
-	}
-
-	while (argc > 0) {
-		if (matches(*argv, "table") == 0) {
-			int tid;
-			NEXT_ARG();
-			if (rtnl_rttable_a2n(&tid, *argv)) {
-				if (strcmp(*argv, "all") == 0) {
-					tid = 0;
-				} else if (strcmp(*argv, "cache") == 0) {
-					tid = -1;
-				} else if (strcmp(*argv, "help") == 0) {
-					usage();
-				} else {
-					invarg("table id value is invalid\n", *argv);
-				}
-			}
-			filter.tb = tid;
-		} else if (matches(*argv, "cached") == 0 ||
-			   matches(*argv, "cloned") == 0) {
-			filter.tb = -1;
-		} else if (strcmp(*argv, "tos") == 0 ||
-			   matches(*argv, "dsfield") == 0) {
-			__u32 tos;
-			NEXT_ARG();
-			if (rtnl_dsfield_a2n(&tos, *argv))
-				invarg("TOS value is invalid\n", *argv);
-			filter.tos = tos;
-			filter.tosmask = -1;
-		} else if (matches(*argv, "protocol") == 0) {
-			int prot = 0;
-			NEXT_ARG();
-			filter.protocolmask = -1;
-			if (rtnl_rtprot_a2n(&prot, *argv)) {
-				if (strcmp(*argv, "all") != 0)
-					invarg("invalid \"protocol\"\n", *argv);
-				prot = 0;
-				filter.protocolmask = 0;
-			}
-			filter.protocol = prot;
-		} else if (matches(*argv, "scope") == 0) {
-			int scope = 0;
-			NEXT_ARG();
-			filter.scopemask = -1;
-			if (rtnl_rtscope_a2n(&scope, *argv)) {
-				if (strcmp(*argv, "all") != 0)
-					invarg("invalid \"scope\"\n", *argv);
-				scope = RT_SCOPE_NOWHERE;
-				filter.scopemask = 0;
-			}
-			filter.scope = scope;
-		} else if (matches(*argv, "type") == 0) {
-			int type;
-			NEXT_ARG();
-			filter.typemask = -1;
-			if (rtnl_rtntype_a2n(&type, *argv))
-				invarg("node type value is invalid\n", *argv);
-			filter.type = type;
-		} else if (strcmp(*argv, "dev") == 0 ||
-			   strcmp(*argv, "oif") == 0) {
-			NEXT_ARG();
-			od = *argv;
-		} else if (strcmp(*argv, "iif") == 0) {
-			NEXT_ARG();
-			id = *argv;
-		} else if (strcmp(*argv, "via") == 0) {
-			NEXT_ARG();
-			get_prefix(&filter.rvia, *argv, do_ipv6);
-		} else if (strcmp(*argv, "src") == 0) {
-			NEXT_ARG();
-			get_prefix(&filter.rprefsrc, *argv, do_ipv6);
-		} else if (matches(*argv, "realms") == 0) {
-			__u32 realm;
-			NEXT_ARG();
-			if (get_rt_realms(&realm, *argv))
-				invarg("invalid realms\n", *argv);
-			filter.realm = realm;
-			filter.realmmask = ~0U;
-			if ((filter.realm&0xFFFF) == 0 &&
-			    (*argv)[strlen(*argv) - 1] == '/')
-				filter.realmmask &= ~0xFFFF;
-			if ((filter.realm&0xFFFF0000U) == 0 &&
-			    (strchr(*argv, '/') == NULL ||
-			     (*argv)[0] == '/'))
-				filter.realmmask &= ~0xFFFF0000U;
-		} else if (matches(*argv, "from") == 0) {
-			NEXT_ARG();
-			if (matches(*argv, "root") == 0) {
-				NEXT_ARG();
-				get_prefix(&filter.rsrc, *argv, do_ipv6);
-			} else if (matches(*argv, "match") == 0) {
-				NEXT_ARG();
-				get_prefix(&filter.msrc, *argv, do_ipv6);
-			} else {
-				if (matches(*argv, "exact") == 0) {
-					NEXT_ARG();
-				}
-				get_prefix(&filter.msrc, *argv, do_ipv6);
-				filter.rsrc = filter.msrc;
-			}
-		} else {
-			if (matches(*argv, "to") == 0) {
-				NEXT_ARG();
-			}
-			if (matches(*argv, "root") == 0) {
-				NEXT_ARG();
-				get_prefix(&filter.rdst, *argv, do_ipv6);
-			} else if (matches(*argv, "match") == 0) {
-				NEXT_ARG();
-				get_prefix(&filter.mdst, *argv, do_ipv6);
-			} else {
-				if (matches(*argv, "exact") == 0) {
-					NEXT_ARG();
-				}
-				get_prefix(&filter.mdst, *argv, do_ipv6);
-				filter.rdst = filter.mdst;
-			}
-		}
-		argc--; argv++;
-	}
-
-	if (do_ipv6 == AF_UNSPEC && filter.tb)
-		do_ipv6 = AF_INET;
-
-	if (rtnl_open(&rth, 0) < 0)
-		exit(1);
-
-	ll_init_map(&rth);
-
-	if (id || od)  {
-		int idx;
-
-		if (id) {
-			if ((idx = ll_name_to_index(id)) == 0) {
-				fprintf(stderr, "Cannot find device \"%s\"\n", id);
-				return -1;
-			}
-			filter.iif = idx;
-			filter.iifmask = -1;
-		}
-		if (od) {
-			if ((idx = ll_name_to_index(od)) == 0) {
-				fprintf(stderr, "Cannot find device \"%s\"\n", od);
-				return -1;
-			}
-			filter.oif = idx;
-			filter.oifmask = -1;
-		}
-	}
-
-	if (flush) {
-		int round = 0;
-		char flushb[4096-512];
-		time_t start = time(0);
-
-		if (filter.tb == -1) {
-			if (do_ipv6 != AF_INET6) {
-				iproute_flush_cache();
-				if (show_stats)
-					printf("*** IPv4 routing cache is flushed.\n");
-			}
-			if (do_ipv6 == AF_INET)
-				return 0;
-		}
-
-		filter.flushb = flushb;
-		filter.flushp = 0;
-		filter.flushe = sizeof(flushb);
-		filter.rth = &rth;
-
-		for (;;) {
-			if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) {
-				perror("Cannot send dump request");
-				exit(1);
-			}
-			filter.flushed = 0;
-			if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
-				fprintf(stderr, "Flush terminated\n");
-				exit(1);
-			}
-			if (filter.flushed == 0) {
-				if (round == 0) {
-					if (filter.tb != -1 || do_ipv6 == AF_INET6)
-						fprintf(stderr, "Nothing to flush.\n");
-				} else if (show_stats)
-					printf("*** Flush is complete after %d round%s ***\n", round, round>1?"s":"");
-				fflush(stdout);
-				return 0;
-			}
-			round++;
-			if (flush_update() < 0)
-				exit(1);
-
-			if (time(0) - start > 30) {
-				printf("\n*** Flush not completed after %ld seconds, %d entries remain ***\n",
-				       time(0) - start, filter.flushed);
-				exit(1);
-			}
-
-			if (show_stats) {
-				printf("\n*** Round %d, deleting %d entries ***\n", round, filter.flushed);
-				fflush(stdout);
-			}
-		}
-	}
-
-	if (filter.tb != -1) {
-		if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) {
-			perror("Cannot send dump request");
-			exit(1);
-		}
-	} else {
-		if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
-			perror("Cannot send dump request");
-			exit(1);
-		}
-	}
-
-	if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
-		fprintf(stderr, "Dump terminated\n");
-		exit(1);
-	}
-
-	exit(0);
-}
-
-
-int iproute_get(int argc, char **argv)
-{
-	struct rtnl_handle rth;
-	struct {
-		struct nlmsghdr 	n;
-		struct rtmsg 		r;
-		char   			buf[1024];
-	} req;
-	char  *idev = NULL;
-	char  *odev = NULL;
-	int connected = 0;
-	int from_ok = 0;
-
-	memset(&req, 0, sizeof(req));
-
-	iproute_reset_filter();
-
-	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-	req.n.nlmsg_flags = NLM_F_REQUEST;
-	req.n.nlmsg_type = RTM_GETROUTE;
-	req.r.rtm_family = preferred_family;
-	req.r.rtm_table = 0;
-	req.r.rtm_protocol = 0;
-	req.r.rtm_scope = 0;
-	req.r.rtm_type = 0;
-	req.r.rtm_src_len = 0;
-	req.r.rtm_dst_len = 0;
-	req.r.rtm_tos = 0;
-	
-	while (argc > 0) {
-		if (strcmp(*argv, "tos") == 0 ||
-		    matches(*argv, "dsfield") == 0) {
-			__u32 tos;
-			NEXT_ARG();
-			if (rtnl_dsfield_a2n(&tos, *argv))
-				invarg("TOS value is invalid\n", *argv);
-			req.r.rtm_tos = tos;
-		} else if (matches(*argv, "from") == 0) {
-			inet_prefix addr;
-			NEXT_ARG();
-			if (matches(*argv, "help") == 0)
-				usage();
-			from_ok = 1;
-			get_prefix(&addr, *argv, req.r.rtm_family);
-			if (req.r.rtm_family == AF_UNSPEC)
-				req.r.rtm_family = addr.family;
-			if (addr.bytelen)
-				addattr_l(&req.n, sizeof(req), RTA_SRC, &addr.data, addr.bytelen);
-			req.r.rtm_src_len = addr.bitlen;
-		} else if (matches(*argv, "iif") == 0) {
-			NEXT_ARG();
-			idev = *argv;
-		} else if (matches(*argv, "oif") == 0 ||
-			   strcmp(*argv, "dev") == 0) {
-			NEXT_ARG();
-			odev = *argv;
-		} else if (matches(*argv, "notify") == 0) {
-			req.r.rtm_flags |= RTM_F_NOTIFY;
-		} else if (matches(*argv, "connected") == 0) {
-			connected = 1;
-		} else {
-			inet_prefix addr;
-			if (strcmp(*argv, "to") == 0) {
-				NEXT_ARG();
-			}
-			if (matches(*argv, "help") == 0)
-				usage();
-			get_prefix(&addr, *argv, req.r.rtm_family);
-			if (req.r.rtm_family == AF_UNSPEC)
-				req.r.rtm_family = addr.family;
-			if (addr.bytelen)
-				addattr_l(&req.n, sizeof(req), RTA_DST, &addr.data, addr.bytelen);
-			req.r.rtm_dst_len = addr.bitlen;
-		}
-		argc--; argv++;
-	}
-
-	if (req.r.rtm_dst_len == 0) {
-		fprintf(stderr, "need at least destination address\n");
-		exit(1);
-	}
-
-	if (rtnl_open(&rth, 0) < 0)
-		exit(1);
-
-	ll_init_map(&rth);
-
-	if (idev || odev)  {
-		int idx;
-
-		if (idev) {
-			if ((idx = ll_name_to_index(idev)) == 0) {
-				fprintf(stderr, "Cannot find device \"%s\"\n", idev);
-				return -1;
-			}
-			addattr32(&req.n, sizeof(req), RTA_IIF, idx);
-		}
-		if (odev) {
-			if ((idx = ll_name_to_index(odev)) == 0) {
-				fprintf(stderr, "Cannot find device \"%s\"\n", odev);
-				return -1;
-			}
-			addattr32(&req.n, sizeof(req), RTA_OIF, idx);
-		}
-	}
-
-	if (req.r.rtm_family == AF_UNSPEC)
-		req.r.rtm_family = AF_INET;
-
-	if (rtnl_talk(&rth, &req.n, 0, 0, &req.n, NULL, NULL) < 0)
-		exit(2);
-
-	if (connected && !from_ok) {
-		struct rtmsg *r = NLMSG_DATA(&req.n);
-		int len = req.n.nlmsg_len;
-		struct rtattr * tb[RTA_MAX+1];
-
-		if (print_route(NULL, &req.n, (void*)stdout) < 0) {
-			fprintf(stderr, "An error :-)\n");
-			exit(1);
-		}
-
-		if (req.n.nlmsg_type != RTM_NEWROUTE) {
-			fprintf(stderr, "Not a route?\n");
-			return -1;
-		}
-		len -= NLMSG_LENGTH(sizeof(*r));
-		if (len < 0) {
-			fprintf(stderr, "Wrong len %d\n", len);
-			return -1;
-		}
-
-		parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
-
-		if (tb[RTA_PREFSRC]) {
-			tb[RTA_PREFSRC]->rta_type = RTA_SRC;
-			r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]);
-		} else if (!tb[RTA_SRC]) {
-			fprintf(stderr, "Failed to connect the route\n");
-			return -1;
-		}
-		if (!odev && tb[RTA_OIF])
-			tb[RTA_OIF]->rta_type = 0;
-		if (tb[RTA_GATEWAY])
-			tb[RTA_GATEWAY]->rta_type = 0;
-		if (!idev && tb[RTA_IIF])
-			tb[RTA_IIF]->rta_type = 0;
-		req.n.nlmsg_flags = NLM_F_REQUEST;
-		req.n.nlmsg_type = RTM_GETROUTE;
-
-		if (rtnl_talk(&rth, &req.n, 0, 0, &req.n, NULL, NULL) < 0)
-			exit(2);
-	}
-
-	if (print_route(NULL, &req.n, (void*)stdout) < 0) {
-		fprintf(stderr, "An error :-)\n");
-		exit(1);
-	}
-
-	exit(0);
-}
-
-void iproute_reset_filter()
-{
-	memset(&filter, 0, sizeof(filter));
-	filter.mdst.bitlen = -1;
-	filter.msrc.bitlen = -1;
-}
-
-int do_iproute(int argc, char **argv)
-{
-	if (argc < 1)
-		return iproute_list_or_flush(0, NULL, 0);
-	
-	if (matches(*argv, "add") == 0)
-		return iproute_modify(RTM_NEWROUTE, NLM_F_CREATE|NLM_F_EXCL,
-				      argc-1, argv+1);
-	if (matches(*argv, "change") == 0 || strcmp(*argv, "chg") == 0)
-		return iproute_modify(RTM_NEWROUTE, NLM_F_REPLACE,
-				      argc-1, argv+1);
-	if (matches(*argv, "replace") == 0)
-		return iproute_modify(RTM_NEWROUTE, NLM_F_CREATE|NLM_F_REPLACE,
-				      argc-1, argv+1);
-	if (matches(*argv, "prepend") == 0)
-		return iproute_modify(RTM_NEWROUTE, NLM_F_CREATE,
-				      argc-1, argv+1);
-	if (matches(*argv, "append") == 0)
-		return iproute_modify(RTM_NEWROUTE, NLM_F_CREATE|NLM_F_APPEND,
-				      argc-1, argv+1);
-	if (matches(*argv, "test") == 0)
-		return iproute_modify(RTM_NEWROUTE, NLM_F_EXCL,
-				      argc-1, argv+1);
-	if (matches(*argv, "delete") == 0)
-		return iproute_modify(RTM_DELROUTE, 0,
-				      argc-1, argv+1);
-	if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0
-	    || matches(*argv, "lst") == 0)
-		return iproute_list_or_flush(argc-1, argv+1, 0);
-	if (matches(*argv, "get") == 0)
-		return iproute_get(argc-1, argv+1);
-	if (matches(*argv, "flush") == 0)
-		return iproute_list_or_flush(argc-1, argv+1, 1);
-	if (matches(*argv, "help") == 0)
-		usage();
-	fprintf(stderr, "Command \"%s\" is unknown, try \"ip route help\".\n", *argv);
-	exit(-1);
-}
-
diff --git a/testsuite/tests/std-cbq b/testsuite/tests/std-cbq
deleted file mode 100644
index bff814b..0000000
--- a/testsuite/tests/std-cbq
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-$TC qdisc del dev $DEV root >/dev/null 2>&1
-$TC qdisc add dev $DEV root handle 10:0 cbq bandwidth 100Mbit avpkt 1400 mpu 64
-$TC class add dev $DEV parent 10:0  classid 10:12   cbq bandwidth 100mbit rate 100mbit allot 1514 prio 3 maxburst 1 avpkt  500 bounded
-$TC qdisc list dev $DEV
-$TC qdisc del dev $DEV root
-$TC qdisc list dev $DEV
-$TC qdisc add dev $DEV root handle 10:0 cbq bandwidth 100Mbit avpkt 1400 mpu 64
-$TC class add dev $DEV parent 10:0  classid 10:12   cbq bandwidth 100mbit rate 100mbit allot 1514 prio 3 maxburst 1 avpkt  500 bounded
-$TC qdisc del dev $DEV root