summaryrefslogtreecommitdiff
path: root/usr.sbin/ospf6d
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2009-02-03 14:02:02 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2009-02-03 14:02:02 +0000
commite1169461a59f4f3635d938d7ca5220682b28024e (patch)
tree5bf15273166b69676cbf6a3c796108b18e8fff21 /usr.sbin/ospf6d
parentda56e28ebdc3bdfecf90063da7c3e744fbd3434e (diff)
Formatting fixes.
Diffstat (limited to 'usr.sbin/ospf6d')
-rw-r--r--usr.sbin/ospf6d/ospfe.c6
-rw-r--r--usr.sbin/ospf6d/rde.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/ospf6d/ospfe.c b/usr.sbin/ospf6d/ospfe.c
index 271eb7e9e7a..a3c4c94c155 100644
--- a/usr.sbin/ospf6d/ospfe.c
+++ b/usr.sbin/ospf6d/ospfe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfe.c,v 1.20 2009/01/29 20:15:50 stsp Exp $ */
+/* $OpenBSD: ospfe.c,v 1.21 2009/02/03 14:02:01 stsp Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -1110,8 +1110,8 @@ orig_intra_lsa_rtr(struct iface *iface_arg)
bzero(&lsa_prefix, sizeof(lsa_prefix));
- if (iface->type == IF_TYPE_POINTOMULTIPOINT
- || iface->state == IF_STA_LOOPBACK) {
+ if (iface->type == IF_TYPE_POINTOMULTIPOINT ||
+ iface->state == IF_STA_LOOPBACK) {
lsa_prefix.prefixlen = 128;
lsa_prefix.options = OSPF_PREFIX_LA;
} else {
diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c
index 4189bcebfca..bdc39142ddf 100644
--- a/usr.sbin/ospf6d/rde.c
+++ b/usr.sbin/ospf6d/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.18 2009/01/29 12:16:09 stsp Exp $ */
+/* $OpenBSD: rde.c,v 1.19 2009/02/03 14:02:01 stsp Exp $ */
/*
* Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -1319,9 +1319,9 @@ prefix_tree_add_net(struct prefix_tree *tree, struct lsa_link *lsa)
memcpy(&addr, new->prefix + 1,
LSA_PREFIXSIZE(new->prefix->prefixlen));
- if (!(IN6_IS_ADDR_LINKLOCAL(&addr))
- && (new->prefix->options & OSPF_PREFIX_NU) == 0
- && (new->prefix->options & OSPF_PREFIX_LA) == 0) {
+ if (!(IN6_IS_ADDR_LINKLOCAL(&addr)) &&
+ (new->prefix->options & OSPF_PREFIX_NU) == 0 &&
+ (new->prefix->options & OSPF_PREFIX_LA) == 0) {
old = RB_INSERT(prefix_tree, tree, new);
if (old != NULL) {
old->prefix->options |= new->prefix->options;