diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-01-11 19:14:44 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-01-11 19:14:44 +0000 |
| commit | 78cbe2487a366b22ab28b1bbbbd83f3899eb8999 (patch) | |
| tree | 6239f8d1fc95b1dceb500aa0a79aca5f2c55572e /usr.sbin/bgpd/rde_rib.c | |
| parent | 69b82e5ddae9dec0898097d0b2ff04f484701f2a (diff) | |
use struct bgpd_addr for nexthop and gateway in struct kroute_nexthop
(and thus the nexthop messages between parent and RDE)
ok claudio@
Diffstat (limited to 'usr.sbin/bgpd/rde_rib.c')
| -rw-r--r-- | usr.sbin/bgpd/rde_rib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c index 97b61b480ee..4653bebb579 100644 --- a/usr.sbin/bgpd/rde_rib.c +++ b/usr.sbin/bgpd/rde_rib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_rib.c,v 1.17 2004/01/11 02:39:05 henning Exp $ */ +/* $OpenBSD: rde_rib.c,v 1.18 2004/01/11 19:14:43 henning Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> @@ -1087,12 +1087,12 @@ nexthop_update(struct kroute_nexthop *msg) RIB_STAT(nexthop_update); - nh = nexthop_get(msg->nexthop); + nh = nexthop_get(msg->nexthop.v4.s_addr); if (nh == NULL) { logit(LOG_INFO, "nexthop_update: non-existent nexthop"); return; } - ENSURE(nh->exit_nexthop.s_addr == msg->nexthop); + ENSURE(nh->exit_nexthop.s_addr == msg->nexthop.v4.s_addr); if (msg->valid) nh->state = NEXTHOP_REACH; @@ -1102,7 +1102,7 @@ nexthop_update(struct kroute_nexthop *msg) if (msg->connected) nh->true_nexthop.s_addr = nh->exit_nexthop.s_addr; else - nh->true_nexthop.s_addr = msg->gateway; + nh->true_nexthop.s_addr = msg->gateway.v4.s_addr; nh->connected = msg->connected; |