summaryrefslogtreecommitdiff
path: root/sysdep
diff options
context:
space:
mode:
Diffstat (limited to 'sysdep')
-rw-r--r--sysdep/cf/README1
-rw-r--r--sysdep/cf/linux-20.h1
-rw-r--r--sysdep/cf/linux-21.h1
-rw-r--r--sysdep/cf/linux-22.h1
-rw-r--r--sysdep/linux/krt-scan.c4
-rw-r--r--sysdep/linux/netlink/netlink.c8
-rw-r--r--sysdep/unix/krt-set.c3
-rw-r--r--sysdep/unix/krt.c16
8 files changed, 11 insertions, 24 deletions
diff --git a/sysdep/cf/README b/sysdep/cf/README
index eb8ac340..1f8d9996 100644
--- a/sysdep/cf/README
+++ b/sysdep/cf/README
@@ -1,7 +1,6 @@
Available configuration variables:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-CONFIG_TOS Routing by TOS supported
CONFIG_AUTO_ROUTES Device routes are added automagically by the kernel
CONFIG_ALL_MULTICAST All devices support multicasting (i.e., ignore IFF_MULTICAST)
CONFIG_SELF_CONSCIOUS We're able to recognize whether route was installed by us
diff --git a/sysdep/cf/linux-20.h b/sysdep/cf/linux-20.h
index c816f942..9d513e2e 100644
--- a/sysdep/cf/linux-20.h
+++ b/sysdep/cf/linux-20.h
@@ -6,7 +6,6 @@
* Can be freely distributed and used under the terms of the GNU GPL.
*/
-#undef CONFIG_TOS
#undef CONFIG_AUTO_ROUTES
#define CONFIG_ALL_MULTICAST
#undef CONFIG_SELF_CONSCIOUS
diff --git a/sysdep/cf/linux-21.h b/sysdep/cf/linux-21.h
index 3a46f875..f9ad830d 100644
--- a/sysdep/cf/linux-21.h
+++ b/sysdep/cf/linux-21.h
@@ -6,7 +6,6 @@
* Can be freely distributed and used under the terms of the GNU GPL.
*/
-#undef CONFIG_TOS
#define CONFIG_AUTO_ROUTES
#define CONFIG_ALL_MULTICAST
#undef CONFIG_SELF_CONSCIOUS
diff --git a/sysdep/cf/linux-22.h b/sysdep/cf/linux-22.h
index a76cb1bb..53ce67cf 100644
--- a/sysdep/cf/linux-22.h
+++ b/sysdep/cf/linux-22.h
@@ -6,7 +6,6 @@
* Can be freely distributed and used under the terms of the GNU GPL.
*/
-#define CONFIG_TOS
#define CONFIG_AUTO_ROUTES
#define CONFIG_ALL_MULTICAST
#define CONFIG_SELF_CONSCIOUS
diff --git a/sysdep/linux/krt-scan.c b/sysdep/linux/krt-scan.c
index 85e092d7..7ee80f27 100644
--- a/sysdep/linux/krt-scan.c
+++ b/sysdep/linux/krt-scan.c
@@ -86,13 +86,13 @@ krt_parse_entry(byte *ent, struct krt_proto *p)
return;
}
- net = net_get(&master_table, 0, dest, masklen);
+ net = net_get(&master_table, dest, masklen);
a.proto = &p->p;
a.source = RTS_INHERIT;
a.scope = SCOPE_UNIVERSE;
a.cast = RTC_UNICAST;
- a.tos = a.flags = a.aflags = 0;
+ a.flags = a.aflags = 0;
a.from = IPA_NONE;
a.iface = NULL;
a.attrs = NULL;
diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c
index 326c1746..31dd608d 100644
--- a/sysdep/linux/netlink/netlink.c
+++ b/sysdep/linux/netlink/netlink.c
@@ -487,9 +487,9 @@ nl_send_route(rte *e, int new)
void
krt_set_notify(struct krt_proto *p, net *n, rte *new, rte *old)
{
- if (old && new && old->attrs->tos == new->attrs->tos)
+ if (old && new)
{
- /* FIXME: Priorities should be identical as well, but we don't use them yet. */
+ /* FIXME: Priorities and TOS should be identical as well, but we don't use them yet. */
nl_send_route(new, 1);
}
else
@@ -594,12 +594,12 @@ nl_parse_route(struct krt_proto *p, struct nlmsghdr *h, int scan)
src = KRT_SRC_ALIEN;
}
- net = net_get(&master_table, 0, dst, i->rtm_dst_len);
+ net = net_get(&master_table, dst, i->rtm_dst_len);
ra.proto = &p->p;
ra.source = RTS_INHERIT;
ra.scope = SCOPE_UNIVERSE; /* FIXME: Use kernel scope? */
ra.cast = RTC_UNICAST;
- ra.tos = ra.flags = ra.aflags = 0;
+ ra.flags = ra.aflags = 0;
ra.from = IPA_NONE;
ra.gw = IPA_NONE;
ra.iface = NULL;
diff --git a/sysdep/unix/krt-set.c b/sysdep/unix/krt-set.c
index 435587be..e1f69db2 100644
--- a/sysdep/unix/krt-set.c
+++ b/sysdep/unix/krt-set.c
@@ -38,8 +38,7 @@ krt_capable(rte *e)
#ifdef RTF_REJECT
|| a->dest == RTD_UNREACHABLE
#endif
- ) &&
- !a->tos;
+ );
}
static void
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 5d694f65..69d535bc 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -128,7 +128,7 @@ krt_learn_announce_update(struct krt_proto *p, rte *e)
net *n = e->net;
rta *aa = rta_clone(e->attrs);
rte *ee = rte_get_temp(aa);
- net *nn = net_get(p->p.table, 0, n->n.prefix, n->n.pxlen); /* FIXME: TOS */
+ net *nn = net_get(p->p.table, n->n.prefix, n->n.pxlen);
ee->net = nn;
ee->pflags = 0;
ee->u.krt = e->u.krt;
@@ -138,7 +138,7 @@ krt_learn_announce_update(struct krt_proto *p, rte *e)
static void
krt_learn_announce_delete(struct krt_proto *p, net *n)
{
- n = net_find(p->p.table, 0, n->n.prefix, n->n.pxlen); /* FIXME: TOS */
+ n = net_find(p->p.table, n->n.prefix, n->n.pxlen);
if (n)
rte_update(n, &p->p, NULL);
}
@@ -147,7 +147,7 @@ static void
krt_learn_scan(struct krt_proto *p, rte *e)
{
net *n0 = e->net;
- net *n = net_get(&p->krt_table, 0, n0->n.prefix, n0->n.pxlen); /* FIXME: TOS */
+ net *n = net_get(&p->krt_table, n0->n.prefix, n0->n.pxlen);
rte *m, **mm;
e->attrs->source = RTS_INHERIT;
@@ -250,7 +250,7 @@ static void
krt_learn_async(struct krt_proto *p, rte *e, int new)
{
net *n0 = e->net;
- net *n = net_get(&p->krt_table, 0, n0->n.prefix, n0->n.pxlen); /* FIXME: TOS */
+ net *n = net_get(&p->krt_table, n0->n.prefix, n0->n.pxlen);
rte *g, **gg, *best, **bestp, *old_best;
e->attrs->source = RTS_INHERIT;
@@ -359,10 +359,6 @@ krt_flush_routes(struct krt_proto *p)
struct rtable *t = &master_table;
DBG("Flushing kernel routes...\n");
- while (t && t->tos)
- t = t->sibling;
- if (!t)
- return;
FIB_WALK(&t->fib, f)
{
net *n = (net *) f;
@@ -474,10 +470,6 @@ krt_prune(struct krt_proto *p)
struct fib_node *f;
DBG("Pruning routes...\n");
- while (t && t->tos)
- t = t->sibling;
- if (!t)
- return;
FIB_WALK(&t->fib, f)
{
net *n = (net *) f;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 14:02:35 +0000