summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMichele Marchetto <michele@cvs.openbsd.org>2007-04-10 09:37:26 +0000
committerMichele Marchetto <michele@cvs.openbsd.org>2007-04-10 09:37:26 +0000
commitfe730c140d88edf0713def5fc16873dde65ec065 (patch)
tree2fb1c88886a63f453c82c1b63c7a4cbce1fdbba2 /usr.sbin
parentb61d5cffc83057664240f83eca36dd6ded6db5ef (diff)
spacing
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/dvmrpd/rde_srt.c16
-rw-r--r--usr.sbin/dvmrpd/report.c6
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/dvmrpd/rde_srt.c b/usr.sbin/dvmrpd/rde_srt.c
index 9df1bdac2fb..995a485cafd 100644
--- a/usr.sbin/dvmrpd/rde_srt.c
+++ b/usr.sbin/dvmrpd/rde_srt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_srt.c,v 1.6 2007/03/27 09:04:33 michele Exp $ */
+/* $OpenBSD: rde_srt.c,v 1.7 2007/04/10 09:37:25 michele Exp $ */
/*
* Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -55,7 +55,7 @@ void srt_delete_ds(struct src_node *, struct rt_node *, struct ds *,
struct iface *);
struct src_node *srt_find_src(struct in_addr, struct in_addr);
struct src_node *srt_add_src(struct in_addr, struct in_addr);
-void srt_delete_src(struct src_node *);
+void srt_delete_src(struct src_node *);
RB_HEAD(rt_tree, rt_node) rt;
RB_PROTOTYPE(rt_tree, rt_node, entry, rt_compare)
@@ -407,11 +407,11 @@ srt_current_forwarder(struct src_node *src_node, struct rt_node *rn,
nbr_report < src_node->adv_rtr[iface->ifindex].addr.s_addr)) {
if (src_node->adv_rtr[iface->ifindex].addr.s_addr ==
iface->addr.s_addr && !src_node->ds_cnt[iface->ifindex])
- rn->ttls[iface->ifindex] = 0;
+ rn->ttls[iface->ifindex] = 0;
src_node->adv_rtr[iface->ifindex].addr.s_addr = nbr_report;
src_node->adv_rtr[iface->ifindex].metric = metric;
- }
+ }
}
void
@@ -452,7 +452,7 @@ srt_set_forwarder_self(struct src_node *src, struct iface *iface,
void
srt_set_upstream(struct rt_node *rn, u_int32_t ifindex)
{
- if (rn->ifindex != ifindex) {
+ if (rn->ifindex != ifindex) {
rn->ttls[rn->ifindex] = 1;
rn->ifindex = ifindex;
}
@@ -469,7 +469,7 @@ srt_add_ds(struct src_node *src_node, struct rt_node *rn, u_int32_t nbr_report,
ds_nbr->addr.s_addr = nbr_report;
- LIST_INSERT_HEAD(&src_node->ds_list, ds_nbr, entry);
+ LIST_INSERT_HEAD(&src_node->ds_list, ds_nbr, entry);
src_node->ds_cnt[ifindex]++;
rn->ttls[ifindex] = 1;
}
@@ -483,7 +483,7 @@ srt_find_ds(struct src_node *src_node, u_int32_t nbr_report)
if (ds_nbr->addr.s_addr == nbr_report)
return (ds_nbr);
- return (NULL);
+ return (NULL);
}
void
@@ -555,5 +555,5 @@ srt_delete_src(struct src_node *src_node)
}
RB_REMOVE(src_head, &rdeconf->src_list, src_node);
- free(src_node);
+ free(src_node);
}
diff --git a/usr.sbin/dvmrpd/report.c b/usr.sbin/dvmrpd/report.c
index addef80ae76..140dc3f572f 100644
--- a/usr.sbin/dvmrpd/report.c
+++ b/usr.sbin/dvmrpd/report.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: report.c,v 1.6 2006/12/03 20:14:37 michele Exp $ */
+/* $OpenBSD: report.c,v 1.7 2007/04/10 09:37:25 michele Exp $ */
/*
* Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -207,7 +207,7 @@ rr_list_remove(struct route_report *rr)
{
if (--rr->refcount == 0)
free(rr);
-}
+}
void
rr_list_clr(struct rr_head *rr_list)
@@ -216,7 +216,7 @@ rr_list_clr(struct rr_head *rr_list)
while ((le = TAILQ_FIRST(rr_list)) != NULL) {
TAILQ_REMOVE(rr_list, le, entry);
- rr_list_remove(le->re);
+ rr_list_remove(le->re);
free(le);
}
}