summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ospfd/hello.c6
-rw-r--r--usr.sbin/ospfd/interface.c4
-rw-r--r--usr.sbin/ospfd/ospfd.c4
-rw-r--r--usr.sbin/ospfd/ospfd.conf.54
-rw-r--r--usr.sbin/ospfd/ospfd.h4
-rw-r--r--usr.sbin/ospfd/ospfe.c6
-rw-r--r--usr.sbin/ospfd/packet.c4
-rw-r--r--usr.sbin/ospfd/rde_lsdb.c4
8 files changed, 18 insertions, 18 deletions
diff --git a/usr.sbin/ospfd/hello.c b/usr.sbin/ospfd/hello.c
index 53bd885b82e..d7f55b58650 100644
--- a/usr.sbin/ospfd/hello.c
+++ b/usr.sbin/ospfd/hello.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hello.c,v 1.2 2005/01/28 17:53:33 norby Exp $ */
+/* $OpenBSD: hello.c,v 1.3 2005/02/07 05:50:59 david Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -209,7 +209,7 @@ recv_hello(struct iface *iface, struct in_addr src, u_int32_t rtr_id, char *buf,
if (len == 0) {
nbr_fsm(nbr, NBR_EVT_1_WAY_RCVD);
- /* set neighbor parameters */
+ /* set neighbor parameters */
nbr->dr.s_addr = hello.d_rtr;
nbr->bdr.s_addr = hello.bd_rtr;
nbr->priority = hello.rtr_priority;
@@ -244,7 +244,7 @@ recv_hello(struct iface *iface, struct in_addr src, u_int32_t rtr_id, char *buf,
if (twoway) {
/*
- * event 2 way recieved needs to be delayed after the
+ * event 2 way received needs to be delayed after the
* interface neighbor change check else the DR and BDR
* may not be set correctly.
*/
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c
index 8bbf29daaae..3870cc5471e 100644
--- a/usr.sbin/ospfd/interface.c
+++ b/usr.sbin/ospfd/interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interface.c,v 1.3 2005/02/02 19:15:07 henning Exp $ */
+/* $OpenBSD: interface.c,v 1.4 2005/02/07 05:51:00 david Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -462,7 +462,7 @@ start:
bdr = NULL;
}
- /*
+ /*
* if we are involved in the election (e.g. new DR or no
* longer BDR) redo the election
*/
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index 9e5d8feba44..23fa049e80e 100644
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfd.c,v 1.3 2005/02/02 18:52:32 henning Exp $ */
+/* $OpenBSD: ospfd.c,v 1.4 2005/02/07 05:51:00 david Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -145,7 +145,7 @@ main(int argc, char *argv[])
if ((conf = parse_config(conffile, OSPFD_OPT_VERBOSE)) == NULL )
exit(1);
- /* check for root priviledges */
+ /* check for root privileges */
if (geteuid())
errx(1, "need root privileges");
diff --git a/usr.sbin/ospfd/ospfd.conf.5 b/usr.sbin/ospfd/ospfd.conf.5
index de9ad64475b..0e7913c974b 100644
--- a/usr.sbin/ospfd/ospfd.conf.5
+++ b/usr.sbin/ospfd/ospfd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ospfd.conf.5,v 1.3 2005/02/03 10:41:53 jmc Exp $
+.\" $OpenBSD: ospfd.conf.5,v 1.4 2005/02/07 05:51:00 david Exp $
.\"
.\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -39,7 +39,7 @@ configuration file.
.It Sy Global Configuration
Global settings for
.Xr ospfd 8 .
-A number of global settings can be overruled in specfic areas or interfaces.
+A number of global settings can be overruled in specific areas or interfaces.
.It Sy Areas
An OSPF router must be a member of at least one area.
Areas are used to group interfaces, simplifying configuration.
diff --git a/usr.sbin/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h
index ed7a5d4f64d..6d954ad2442 100644
--- a/usr.sbin/ospfd/ospfd.h
+++ b/usr.sbin/ospfd/ospfd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfd.h,v 1.4 2005/02/02 19:15:07 henning Exp $ */
+/* $OpenBSD: ospfd.h,v 1.5 2005/02/07 05:51:00 david Exp $ */
/*
* Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -392,7 +392,7 @@ int imsg_add(struct buf *, void *, u_int16_t);
int imsg_close(struct imsgbuf *, struct buf *);
void imsg_free(struct imsg *);
int imsg_get_fd(struct imsgbuf *);
-void imsg_event_add(struct imsgbuf *); /* needs to be provided externaly */
+void imsg_event_add(struct imsgbuf *); /* needs to be provided externally */
/* in_cksum.c */
int in_cksum(void *, int);
diff --git a/usr.sbin/ospfd/ospfe.c b/usr.sbin/ospfd/ospfe.c
index 0da269abef8..4a98af08bc7 100644
--- a/usr.sbin/ospfd/ospfe.c
+++ b/usr.sbin/ospfd/ospfe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfe.c,v 1.3 2005/02/02 19:15:07 henning Exp $ */
+/* $OpenBSD: ospfe.c,v 1.4 2005/02/07 05:51:00 david Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -335,7 +335,7 @@ ospfe_dispatch_rde(int fd, short event, void *bula)
"neighbor id %s, len %d", inet_ntoa(nbr->id),
imsg.hdr.len - IMSG_HEADER_SIZE);
- /* put these on my ls_req_list for retrival */
+ /* put these on my ls_req_list for retrieval */
lhp = lsa_hdr_new();
memcpy(lhp, imsg.data, sizeof(*lhp));
ls_req_list_add(nbr, lhp);
@@ -402,7 +402,7 @@ ospfe_dispatch_rde(int fd, short event, void *bula)
}
} else {
/*
- * flood on all area interfaces on
+ * flood on all area interfaces on
* area 0.0.0.0 include also virtual links.
*/
area = nbr->iface->area;
diff --git a/usr.sbin/ospfd/packet.c b/usr.sbin/ospfd/packet.c
index e9fe902ad1d..c192bf36740 100644
--- a/usr.sbin/ospfd/packet.c
+++ b/usr.sbin/ospfd/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.3 2005/02/04 07:40:54 claudio Exp $ */
+/* $OpenBSD: packet.c,v 1.4 2005/02/07 05:51:00 david Exp $ */
/*
* Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -240,7 +240,7 @@ ospf_hdr_sanity_check(const struct ip *ip_hdr, struct ospf_hdr *ospf_hdr,
}
if (ospf_hdr->area_id != iface->area->id.s_addr) {
- /* TODO backbone area is allowed for virtual links */
+ /* TODO backbone area is allowed for virtual links */
addr.s_addr = ospf_hdr->area_id;
log_debug("recv_packet: invalid area ID %s, interface %s",
inet_ntoa(addr), iface->name);
diff --git a/usr.sbin/ospfd/rde_lsdb.c b/usr.sbin/ospfd/rde_lsdb.c
index 3b3f662160a..90935138e51 100644
--- a/usr.sbin/ospfd/rde_lsdb.c
+++ b/usr.sbin/ospfd/rde_lsdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_lsdb.c,v 1.4 2005/02/04 07:38:04 claudio Exp $ */
+/* $OpenBSD: rde_lsdb.c,v 1.5 2005/02/07 05:51:00 david Exp $ */
/*
* Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -476,7 +476,7 @@ lsa_refresh(struct vertex *v)
u_int32_t seqnum;
u_int16_t len;
- /* refresh LSA by increasing sequnce number by one */
+ /* refresh LSA by increasing sequence number by one */
v->lsa->hdr.age = ntohs(DEFAULT_AGE);
seqnum = ntohl(v->lsa->hdr.seq_num);
if (seqnum++ == MAX_SEQ_NUM)