diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-02-27 20:53:57 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-02-27 20:53:57 +0000 |
| commit | c2cf121f1d2db9820dbc07b7c2936029064e98ae (patch) | |
| tree | 79b2de76a41864d290666509107d0faf22309985 /usr.sbin/bgpd/rde_update.c | |
| parent | fbea016b8a23b0518ceb0afcad616a711fa34a24 (diff) | |
remove unneded peer pointer in struct prefix and change a in_addr_t to
struct in_addr. OK henning@
Diffstat (limited to 'usr.sbin/bgpd/rde_update.c')
| -rw-r--r-- | usr.sbin/bgpd/rde_update.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c index f5646e71a00..7ce41a66279 100644 --- a/usr.sbin/bgpd/rde_update.c +++ b/usr.sbin/bgpd/rde_update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_update.c,v 1.8 2004/02/25 22:14:31 claudio Exp $ */ +/* $OpenBSD: rde_update.c,v 1.9 2004/02/27 20:53:56 claudio Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -213,7 +213,7 @@ up_generate_updates(struct rde_peer *peer, if (new == NULL || new->aspath->nexthop == NULL || new->aspath->nexthop->state != NEXTHOP_REACH) { - if (peer == old->peer) + if (peer == old->aspath->peer) /* Do not send routes back to sender */ return; @@ -226,7 +226,7 @@ up_generate_updates(struct rde_peer *peer, */ return; - if (peer->conf.ebgp == 0 && old->peer->conf.ebgp == 0 && + if (peer->conf.ebgp == 0 && old->aspath->peer->conf.ebgp == 0 && (old->aspath->nexthop->flags & NEXTHOP_ANNOUNCE) == 0) /* Do not redistribute updates to ibgp peers */ return; @@ -269,7 +269,7 @@ up_generate_updates(struct rde_peer *peer, if (up_add(peer, p, NULL) == -1) log_warnx("queuing update failed."); } else { - if (peer == new->peer) + if (peer == new->aspath->peer) /* Do not send routes back to sender */ return; @@ -282,7 +282,7 @@ up_generate_updates(struct rde_peer *peer, */ return; - if (peer->conf.ebgp == 0 && new->peer->conf.ebgp == 0 && + if (peer->conf.ebgp == 0 && new->aspath->peer->conf.ebgp == 0 && (new->aspath->nexthop->flags & NEXTHOP_ANNOUNCE) == 0) /* Do not redistribute updates to ibgp peers */ return; @@ -373,7 +373,7 @@ up_generate_attr(struct rde_peer *peer, struct update_attr *upa, */ if (nh->flags & NEXTHOP_ANNOUNCE) nexthop = peer->local_addr.v4.s_addr; - else if (a->nexthop == peer->remote_addr.v4.s_addr) + else if (a->nexthop.s_addr == peer->remote_addr.v4.s_addr) /* * per rfc: if remote peer address is equal to * the nexthop set the nexthop to our local address. |