diff options
| author |   claudio <claudio@openbsd.org> | 2007-10-11 21:25:37 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2007-10-11 21:25:37 +0000 |
| commit | 8974666a478f9a7eb7e5b647a3b018fbb9189c98 (patch) | |
| tree | 01d480e580051a87e70d2378f45580a4485c712e | |
| parent | probe for Winbond W83793G; tested by jon.steel@esentire.com; suggestions/ok deraadt@ (diff) | |
| download | wireguard-openbsd-8974666a478f9a7eb7e5b647a3b018fbb9189c98.tar.xz wireguard-openbsd-8974666a478f9a7eb7e5b647a3b018fbb9189c98.zip | |
No need to store the interface mask. An interface represents a link and is
only addressed via its link local address. All networks on top of it are
handled separately via type 8 Link-LSA.
| -rw-r--r-- | usr.sbin/ospf6d/interface.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/ospf6d.c | 3 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/ospf6d.h | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/ospf6d/interface.c b/usr.sbin/ospf6d/interface.c index 6dc8b0d2e3e..62b664e9d17 100644 --- a/usr.sbin/ospf6d/interface.c +++ b/usr.sbin/ospf6d/interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interface.c,v 1.4 2007/10/11 20:20:44 claudio Exp $ */ +/* $OpenBSD: interface.c,v 1.5 2007/10/11 21:25:37 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -200,7 +200,6 @@ if_new(struct kif *kif, struct kif_addr *ka) /* set address, mask and p2p addr */ iface->addr = ka->addr; - iface->mask = ka->mask; if (kif->flags & IFF_POINTOPOINT) { iface->dst = ka->dstbrd; } @@ -593,7 +592,6 @@ if_to_ctl(struct iface *iface) memcpy(ictl.name, iface->name, sizeof(ictl.name)); memcpy(&ictl.addr, &iface->addr, sizeof(ictl.addr)); - memcpy(&ictl.mask, &iface->mask, sizeof(ictl.mask)); ictl.rtr_id.s_addr = ospfe_router_id(); memcpy(&ictl.area, &iface->area->id, sizeof(ictl.area)); if (iface->dr) { diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c index 86d5cc1fd18..fd128cbe3af 100644 --- a/usr.sbin/ospf6d/ospf6d.c +++ b/usr.sbin/ospf6d/ospf6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.c,v 1.2 2007/10/11 19:02:47 claudio Exp $ */ +/* $OpenBSD: ospf6d.c,v 1.3 2007/10/11 21:25:37 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -781,7 +781,6 @@ merge_interfaces(struct area *a, struct area *xa) ospfd_process, inet_ntoa(a->id), i->name); i->addr = xi->addr; i->dst = xi->dst; - i->mask = xi->mask; i->abr_id = xi->abr_id; i->baudrate = xi->baudrate; i->dead_interval = xi->dead_interval; diff --git a/usr.sbin/ospf6d/ospf6d.h b/usr.sbin/ospf6d/ospf6d.h index 97581fd96ba..cb7fe0ade23 100644 --- a/usr.sbin/ospf6d/ospf6d.h +++ b/usr.sbin/ospf6d/ospf6d.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.h,v 1.6 2007/10/11 20:20:44 claudio Exp $ */ +/* $OpenBSD: ospf6d.h,v 1.7 2007/10/11 21:25:37 claudio Exp $ */ /* * Copyright (c) 2004, 2007 Esben Norby <norby@openbsd.org> @@ -318,7 +318,6 @@ struct iface { char demote_group[IFNAMSIZ]; struct in6_addr addr; struct in6_addr dst; - struct in6_addr mask; struct in_addr abr_id; struct nbr *dr; /* designated router */ struct nbr *bdr; /* backup designated router */ |