summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/ospf6d/control.c4
-rw-r--r--usr.sbin/ospf6d/kroute.c8
-rw-r--r--usr.sbin/ospf6d/ospfe.c6
-rw-r--r--usr.sbin/ospf6d/parse.y4
-rw-r--r--usr.sbin/ospf6d/rde.c12
-rw-r--r--usr.sbin/ospf6d/rde.h4
-rw-r--r--usr.sbin/ospf6d/rde_lsdb.c9
-rw-r--r--usr.sbin/ospf6d/rde_spf.c8
8 files changed, 27 insertions, 28 deletions
diff --git a/usr.sbin/ospf6d/control.c b/usr.sbin/ospf6d/control.c
index 7403e8150df..61327fc5635 100644
--- a/usr.sbin/ospf6d/control.c
+++ b/usr.sbin/ospf6d/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.15 2010/05/14 11:52:19 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.16 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -273,7 +273,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
memcpy(&verbose, imsg.data, sizeof(verbose));
log_verbose(verbose);
- break;
+ break;
default:
log_debug("control_dispatch_imsg: "
"error handling imsg %d", imsg.hdr.type);
diff --git a/usr.sbin/ospf6d/kroute.c b/usr.sbin/ospf6d/kroute.c
index 5dd53996cdf..3ca80f722cd 100644
--- a/usr.sbin/ospf6d/kroute.c
+++ b/usr.sbin/ospf6d/kroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kroute.c,v 1.23 2010/07/01 18:57:21 bluhm Exp $ */
+/* $OpenBSD: kroute.c,v 1.24 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -856,7 +856,7 @@ if_newaddr(u_short ifindex, struct sockaddr_in6 *ifa, struct sockaddr_in6 *mask,
IN6_IS_ADDR_SITELOCAL(&ifa->sin6_addr) ||
IN6_IS_ADDR_V4MAPPED(&ifa->sin6_addr) ||
IN6_IS_ADDR_V4COMPAT(&ifa->sin6_addr))
- return;
+ return;
/* XXX thanks, KAME, for this ugliness... adopted from route/show.c */
if (IN6_IS_ADDR_LINKLOCAL(&ifa->sin6_addr)) {
@@ -899,7 +899,7 @@ if_newaddr(u_short ifindex, struct sockaddr_in6 *ifa, struct sockaddr_in6 *mask,
default:
fatalx("if_newaddr: unknown interface type");
}
-
+
TAILQ_INSERT_TAIL(&iface->ifa_list, ia, entry);
ifc.addr = ia->addr;
ifc.dstbrd = ia->dstbrd;
@@ -930,7 +930,7 @@ if_deladdr(u_short ifindex, struct sockaddr_in6 *ifa, struct sockaddr_in6 *mask,
IN6_IS_ADDR_SITELOCAL(&ifa->sin6_addr) ||
IN6_IS_ADDR_V4MAPPED(&ifa->sin6_addr) ||
IN6_IS_ADDR_V4COMPAT(&ifa->sin6_addr))
- return;
+ return;
/* XXX thanks, KAME, for this ugliness... adopted from route/show.c */
if (IN6_IS_ADDR_LINKLOCAL(&ifa->sin6_addr)) {
diff --git a/usr.sbin/ospf6d/ospfe.c b/usr.sbin/ospf6d/ospfe.c
index 6f1b1dceb8d..6fb6f7308cc 100644
--- a/usr.sbin/ospf6d/ospfe.c
+++ b/usr.sbin/ospf6d/ospfe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfe.c,v 1.30 2010/07/01 18:57:21 bluhm Exp $ */
+/* $OpenBSD: ospfe.c,v 1.31 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -1010,7 +1010,7 @@ void
orig_link_lsa(struct iface *iface)
{
struct lsa_hdr lsa_hdr;
- struct lsa_link lsa_link;
+ struct lsa_link lsa_link;
struct lsa_prefix lsa_prefix;
struct ibuf *buf;
struct iface_addr *ia;
@@ -1046,7 +1046,7 @@ orig_link_lsa(struct iface *iface)
/* reserve space for LSA header and LSA link header */
if (ibuf_reserve(buf, sizeof(lsa_hdr) + sizeof(lsa_link)) == NULL)
fatal("orig_link_lsa: ibuf_reserve failed");
-
+
/* link-local address, and all prefixes configured on interface */
TAILQ_FOREACH(ia, &iface->ifa_list, entry) {
if (IN6_IS_ADDR_LINKLOCAL(&ia->addr)) {
diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y
index 5d3ac8592db..656727d0e8a 100644
--- a/usr.sbin/ospf6d/parse.y
+++ b/usr.sbin/ospf6d/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.16 2009/03/31 21:03:49 tobias Exp $ */
+/* $OpenBSD: parse.y,v 1.17 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -269,7 +269,7 @@ conf_main : ROUTERID STRING {
| defaults
;
-optlist : /* empty */ { $$ = DEFAULT_REDIST_METRIC; }
+optlist : /* empty */ { $$ = DEFAULT_REDIST_METRIC; }
| SET option {
$$ = $2;
if (($$ & LSA_METRIC_MASK) == 0)
diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c
index dca25f36ba5..a9ca048a825 100644
--- a/usr.sbin/ospf6d/rde.c
+++ b/usr.sbin/ospf6d/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.43 2010/07/01 18:57:21 bluhm Exp $ */
+/* $OpenBSD: rde.c,v 1.44 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -1215,7 +1215,7 @@ append_prefix_lsa(struct lsa **lsa, u_int16_t *len, struct lsa_prefix *prefix)
struct lsa_prefix *copy;
unsigned int lsa_prefix_len;
unsigned int new_len;
- char *new_lsa;
+ char *new_lsa;
lsa_prefix_len = sizeof(struct lsa_prefix)
+ LSA_PREFIXSIZE(prefix->prefixlen);
@@ -1240,7 +1240,7 @@ prefix_compare(struct prefix_node *a, struct prefix_node *b)
{
struct lsa_prefix *p;
struct lsa_prefix *q;
- int i;
+ int i;
int len;
p = a->prefix;
@@ -1275,7 +1275,7 @@ prefix_tree_add(struct prefix_tree *tree, struct lsa_link *lsa)
fatal("prefix_tree_add");
new->prefix = (struct lsa_prefix *)cur_prefix;
- len = sizeof(*new->prefix)
+ len = sizeof(*new->prefix)
+ LSA_PREFIXSIZE(new->prefix->prefixlen);
bzero(&addr, sizeof(addr));
@@ -1320,7 +1320,7 @@ link_lsa_from_full_nbr(struct lsa *lsa, struct iface *iface)
if (nbr->state & NBR_STA_FULL &&
ntohl(lsa->hdr.ls_id) == nbr->iface_id)
return 1;
-
+
return 0;
}
@@ -1454,7 +1454,7 @@ orig_intra_lsa_rtr(struct area *area, struct vertex *old)
TAILQ_FOREACH(ia, &iface->ifa_list, entry) {
if (IN6_IS_ADDR_LINKLOCAL(&ia->addr))
continue;
-
+
bzero(lsa_prefix_buf, sizeof(lsa_prefix_buf));
if (iface->type == IF_TYPE_POINTOMULTIPOINT ||
diff --git a/usr.sbin/ospf6d/rde.h b/usr.sbin/ospf6d/rde.h
index ec0459f8404..746cf9b324b 100644
--- a/usr.sbin/ospf6d/rde.h
+++ b/usr.sbin/ospf6d/rde.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.h,v 1.21 2010/07/01 18:57:21 bluhm Exp $ */
+/* $OpenBSD: rde.h,v 1.22 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -73,7 +73,7 @@ struct rde_nbr {
struct iface *iface;
u_int32_t peerid; /* unique ID in DB */
unsigned int ifindex;
- u_int32_t iface_id; /* id of neighbor's
+ u_int32_t iface_id; /* id of neighbor's
iface */
int state;
int self;
diff --git a/usr.sbin/ospf6d/rde_lsdb.c b/usr.sbin/ospf6d/rde_lsdb.c
index cf65ae42536..d8a89af154c 100644
--- a/usr.sbin/ospf6d/rde_lsdb.c
+++ b/usr.sbin/ospf6d/rde_lsdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_lsdb.c,v 1.33 2010/07/01 18:57:21 bluhm Exp $ */
+/* $OpenBSD: rde_lsdb.c,v 1.34 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -341,8 +341,8 @@ lsa_asext_check(struct lsa *lsa, u_int16_t len)
char *buf = (char *)lsa;
struct lsa_asext *asext;
struct in6_addr fw_addr;
- u_int32_t metric;
- u_int16_t ref_ls_type;
+ u_int32_t metric;
+ u_int16_t ref_ls_type;
int rv;
u_int16_t total_len;
@@ -713,7 +713,7 @@ lsa_snap(struct rde_nbr *nbr, u_int32_t peerid)
if (tree == &nbr->area->lsa_tree) {
tree = &nbr->iface->lsa_tree;
continue;
- } else
+ } else
tree = &asext_tree;
} while (1);
@@ -976,4 +976,3 @@ lsa_get_prefix(void *buf, u_int16_t len, struct rt_prefix *p)
return (consumed);
}
-
diff --git a/usr.sbin/ospf6d/rde_spf.c b/usr.sbin/ospf6d/rde_spf.c
index 517b5d2383a..5d91bebb5d0 100644
--- a/usr.sbin/ospf6d/rde_spf.c
+++ b/usr.sbin/ospf6d/rde_spf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_spf.c,v 1.22 2010/03/01 08:51:40 claudio Exp $ */
+/* $OpenBSD: rde_spf.c,v 1.23 2010/07/01 19:47:04 bluhm Exp $ */
/*
* Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -256,7 +256,7 @@ rt_calc(struct vertex *v, struct area *area, struct ospfd_conf *conf)
v->ls_id, log_rtr_id(iap->ref_adv_rtr),
ntohl(iap->ref_ls_id));
return;
- }
+ }
flags = 0;
break;
default:
@@ -401,7 +401,7 @@ asext_calc(struct vertex *v)
/* lookup forwarding address */
if ((r = rt_lookup(DT_NET, &fw_addr)) == NULL ||
- (r->p_type != PT_INTRA_AREA &&
+ (r->p_type != PT_INTRA_AREA &&
r->p_type != PT_INTER_AREA))
return;
}
@@ -559,7 +559,7 @@ calc_nexthop(struct vertex *dst, struct vertex *parent,
case LSA_TYPE_ROUTER:
if (rtr_link->type != LINK_TYPE_POINTTOPOINT)
fatalx("inconsistent SPF tree");
- nexthop = calc_nexthop_lladdr(dst, rtr_link,
+ nexthop = calc_nexthop_lladdr(dst, rtr_link,
ntohl(rtr_link->iface_id));
break;
case LSA_TYPE_NETWORK:
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.