diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-01-11 21:47:21 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-01-11 21:47:21 +0000 |
| commit | 12e70f4d7ccb40ecfae9219237a94949e22bfb09 (patch) | |
| tree | 85507ff2eccee7919a7c680192057a4bc252598f /usr.sbin/bgpd/rde_prefix.c | |
| parent | 01faae005fd2db7ecc8493455109a48fd8ae5610 (diff) | |
Move all struct in_addr to either struct bgpd_addr or in_addr_t whichever
is more appropriate. The rde uses now in most cases struct bgpd_addr.
OK henning@
Diffstat (limited to 'usr.sbin/bgpd/rde_prefix.c')
| -rw-r--r-- | usr.sbin/bgpd/rde_prefix.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/usr.sbin/bgpd/rde_prefix.c b/usr.sbin/bgpd/rde_prefix.c index 3d6312e911a..b299efc22b4 100644 --- a/usr.sbin/bgpd/rde_prefix.c +++ b/usr.sbin/bgpd/rde_prefix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_prefix.c,v 1.6 2004/01/06 10:51:14 claudio Exp $ */ +/* $OpenBSD: rde_prefix.c,v 1.7 2004/01/11 21:47:20 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> @@ -122,7 +122,7 @@ pt_empty(struct pt_entry *pte) } struct pt_entry * -pt_get(struct in_addr prefix, int prefixlen) +pt_get(struct bgpd_addr *prefix, int prefixlen) { struct pt_entryhead *head; struct pt_entry *p; @@ -131,19 +131,19 @@ pt_get(struct in_addr prefix, int prefixlen) ENSURE(MIN_PREFIX <= prefixlen && prefixlen <= MAX_PREFIX); PT_STAT2(pt_get, prefixlen); - p_hbo = ntohl(prefix.s_addr); + p_hbo = ntohl(prefix->v4.s_addr); head = PT_HASH(p_hbo, prefixlen); ENSURE(head != NULL); LIST_FOREACH(p, head, pt_l) { - if (prefix.s_addr == p->prefix.s_addr) + if (prefix->v4.s_addr == p->prefix.v4.s_addr) return p; } return NULL; } struct pt_entry * -pt_add(struct in_addr prefix, int prefixlen) +pt_add(struct bgpd_addr *prefix, int prefixlen) { struct pt_entryhead *head; struct pt_entry *p; @@ -153,12 +153,12 @@ pt_add(struct in_addr prefix, int prefixlen) ENSURE(pt_get(prefix, prefixlen) == NULL); PT_STAT2(pt_add, prefixlen); - p_hbo = ntohl(prefix.s_addr); + p_hbo = ntohl(prefix->v4.s_addr); head = PT_HASH(p_hbo, prefixlen); ENSURE(head != NULL); p = pt_alloc(); - p->prefix = prefix; + memcpy(&p->prefix, prefix, sizeof(p->prefix)); p->prefixlen = prefixlen; LIST_INIT(&p->prefix_h); @@ -174,12 +174,11 @@ pt_remove(struct pt_entry *pte) PT_STAT2(pt_remove, pte->prefixlen); LIST_REMOVE(pte, pt_l); - /* XXX we could bzero it for debugging reasons */ pt_free(pte); } struct pt_entry * -pt_lookup(struct in_addr prefix) +pt_lookup(struct bgpd_addr *prefix) { struct pt_entry *p; int i; |