diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2009-04-09 19:00:41 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2009-04-09 19:00:41 +0000 |
| commit | b669920bfc2ea4253c551a4aac82403a565f820c (patch) | |
| tree | 02f0228245a051ecacace71aca7b9304167f3abb /usr.sbin/ospf6d | |
| parent | 3d72202a65a02b5a0a9d779a18b5f6d298a3ecc6 (diff) | |
Fix a naming inconsistency in struct lsa_intra_prefix (lsid -> ls_id).
"consistency is a good thing" jsing@, ok claudio@
Diffstat (limited to 'usr.sbin/ospf6d')
| -rw-r--r-- | usr.sbin/ospf6d/ospf6.h | 4 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/rde.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ospf6d/ospf6.h b/usr.sbin/ospf6d/ospf6.h index 0e5f252a38b..0a91558c609 100644 --- a/usr.sbin/ospf6d/ospf6.h +++ b/usr.sbin/ospf6d/ospf6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6.h,v 1.14 2009/03/29 18:59:22 stsp Exp $ */ +/* $OpenBSD: ospf6.h,v 1.15 2009/04/09 19:00:40 stsp Exp $ */ /* * Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org> @@ -262,7 +262,7 @@ struct lsa_link { struct lsa_intra_prefix { u_int16_t numprefix; u_int16_t ref_type; - u_int32_t ref_lsid; + u_int32_t ref_ls_id; u_int32_t ref_adv_rtr; /* + numprefix * lsa_prefix */ }; diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c index bb04bb77a1e..3ea41cbe248 100644 --- a/usr.sbin/ospf6d/rde.c +++ b/usr.sbin/ospf6d/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.27 2009/03/29 21:42:30 stsp Exp $ */ +/* $OpenBSD: rde.c,v 1.28 2009/04/09 19:00:40 stsp Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -1238,7 +1238,7 @@ orig_intra_lsa_net(struct iface *iface, struct vertex *old) fatal("orig_intra_lsa_net"); lsa->data.pref_intra.ref_type = htons(LSA_TYPE_NETWORK); - lsa->data.pref_intra.ref_lsid = htonl(iface->ifindex); + lsa->data.pref_intra.ref_ls_id = htonl(iface->ifindex); lsa->data.pref_intra.ref_adv_rtr = rde_router_id(); numprefix = 0; @@ -1398,7 +1398,7 @@ orig_intra_lsa_rtr(struct area *area, struct vertex *old) fatal("orig_intra_lsa_net"); lsa->data.pref_intra.ref_type = htons(LSA_TYPE_ROUTER); - lsa->data.pref_intra.ref_lsid = 0; + lsa->data.pref_intra.ref_ls_id = 0; lsa->data.pref_intra.ref_adv_rtr = rde_router_id(); log_debug("orig_intra_lsa_rtr: area %s", inet_ntoa(area->id)); |