diff options
| author | Martin Mares <mj@ucw.cz> | 1999-04-12 20:01:07 +0200 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 1999-04-12 20:01:07 +0200 |
| commit | 08e2d6259a71c5e43ac0083ea6d81357678f99eb (patch) | |
| tree | b8c1cfaf6196d54c506ed025a9d29697bda087b6 /proto | |
| parent | 170c984a9ef1bde00711f405b03d24a2e151501c (diff) | |
| download | bird-08e2d6259a71c5e43ac0083ea6d81357678f99eb.tar bird-08e2d6259a71c5e43ac0083ea6d81357678f99eb.zip | |
Removed TOS support. This simplifies many things a lot.
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/rip/rip.c | 3 | ||||
| -rw-r--r-- | proto/static/static.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/proto/rip/rip.c b/proto/rip/rip.c index e345de6..c2285a7 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -198,7 +198,6 @@ advertise_entry( struct proto *p, struct rip_block *b, ip_addr whotoldme ) A.scope = SCOPE_UNIVERSE; A.cast = RTC_UNICAST; A.dest = RTD_ROUTER; - A.tos = 0; A.flags = 0; A.gw = ipa_nonzero(b->nexthop) ? b->nexthop : whotoldme; A.from = whotoldme; @@ -226,7 +225,7 @@ advertise_entry( struct proto *p, struct rip_block *b, ip_addr whotoldme ) log( L_ERR "%I asked me to route %I/%I, but that is not valid netmask.", A.from, b->network, b->netmask ); return; } - n = net_get( p->table, 0, b->network, ipa_mklen( b->netmask )); + n = net_get( p->table, b->network, ipa_mklen( b->netmask )); r = rte_get_temp(a); r->u.rip.metric = ntohl(b->metric) + rif->metric; if (r->u.rip.metric > P_CF->infinity) r->u.rip.metric = P_CF->infinity; diff --git a/proto/static/static.c b/proto/static/static.c index 3a485bf..871438a 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -32,12 +32,11 @@ static_install(struct proto *p, struct static_route *r, struct iface *ifa) a.scope = SCOPE_UNIVERSE; a.cast = RTC_UNICAST; a.dest = r->dest; - a.tos = 0; a.gw = r->via; a.iface = ifa; aa = rta_lookup(&a); - n = net_get(p->table, a.tos, r->net, r->masklen); + n = net_get(p->table, r->net, r->masklen); e = rte_get_temp(aa); e->net = n; e->pflags = 0; @@ -50,7 +49,7 @@ static_remove(struct proto *p, struct static_route *r) net *n; DBG("Removing static route %I/%d\n", r->net, r->masklen); - n = net_find(p->table, 0, r->net, r->masklen); + n = net_find(p->table, r->net, r->masklen); if (n) rte_update(n, p, NULL); } |