typos in comments, from jared

4 files changed, 26 insertions, 26 deletions

diff --git a/usr.sbin/bgpd/rde_decide.c b/usr.sbin/bgpd/rde_decide.c
index 8b7584777a5..af779875a44 100644
--- a/usr.sbin/bgpd/rde_decide.c
+++ b/usr.sbin/bgpd/rde_decide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_decide.c,v 1.3 2003/12/23 18:52:46 claudio Exp $ */
+/*	$OpenBSD: rde_decide.c,v 1.4 2003/12/24 11:39:43 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Claudio Jeker <claudio@openbsd.org>
@@ -88,13 +88,13 @@
  * Decision Engine OUR implementation:
  * Our implementation has only one RIB. The filtering is done first. The
  * filtering calculates the preference and stores it in LOCAL_PREF (Phase 1).
- * Ineligible routes are flaged as ineligible via nexthop_add(). The flags
+ * Ineligible routes are flagged as ineligible via nexthop_add(). The flags
  * are inherited from the nexthop descriptor.
  * Phase 3 is done together with Phase 2 -- the output filtering is done in
  * the session engine.
  * In following cases a prefix needs to be reevaluated:
  *  - update of a prefix (path_update)
- *  - withdraw of a preifx (prefix_remove)
+ *  - withdraw of a prefix (prefix_remove)
  *  - state change of the nexthop (nexthop-{in}validate)
  *  - state change of session (session down)
  *
@@ -102,7 +102,7 @@
 
 /*
  * compare two prefixes with equal pt_entry. Returns an integer greater than or
- * less than 0, according to whether the prefix p1 is more or less prefered
+ * less than 0, according to whether the prefix p1 is more or less preferred
  * than the prefix p2. p1 should be used for the new prefix and p2 for a
  * already added prefix.
  */
@@ -148,7 +148,7 @@ prefix_cmp(struct prefix *p1, struct prefix *p2)
 
 	/* 6. EBGP is cooler than IBGP */
 	/*
-	 * It is absolutly important that the ebgp value in peer_config.ebgp
+	 * It is absolutely important that the ebgp value in peer_config.ebgp
 	 * is bigger than all other ones (IBGP, confederations)
 	 */
 	if ((p1->peer->conf.ebgp - p2->peer->conf.ebgp) != 0) {
diff --git a/usr.sbin/bgpd/rde_prefix.c b/usr.sbin/bgpd/rde_prefix.c
index cc219828e6c..a8866e82a89 100644
--- a/usr.sbin/bgpd/rde_prefix.c
+++ b/usr.sbin/bgpd/rde_prefix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_prefix.c,v 1.3 2003/12/21 22:16:53 henning Exp $ */
+/*	$OpenBSD: rde_prefix.c,v 1.4 2003/12/24 11:39:43 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Claudio Jeker <cjeker@diehard.n-r-g.com>
@@ -39,7 +39,7 @@
  * pt_empty:  returns true if there is no bgp prefix linked to the pt_entry.
  * pt_init:   initialize prefix table.
  * pt_alloc:  allocate a pt_entry. Internal function.
- * pt_free:   free a pt_entry. Internal funktion.
+ * pt_free:   free a pt_entry. Internal function.
  */
 
 /* internal prototypes */
@@ -48,7 +48,7 @@ static void		 pt_free(struct pt_entry *);
 
 /*
  * currently we are using a hash list to store the prefixes. This may be
- * replaced with a red-black trie if neccesary.
+ * replaced with a red-black trie if necessary.
  */
 LIST_HEAD(pt_entryhead, pt_entry);
 
@@ -61,7 +61,7 @@ struct pt_table {
 #define MAX_PREFIX 32
 
 /*
- * size of the hashtable per prefixlen. The sizes where choosen from a bgp
+ * size of the hashtable per prefixlen. The sizes were chosen from a bgp
  * dump done on Nov 4. 2003.
  */
 u_long pthashsize[MAX_PREFIX + 1 - MIN_PREFIX] = {
@@ -79,7 +79,7 @@ struct pt_table	pttable[MAX_PREFIX + 1 - MIN_PREFIX];
 
 /*
  * Statistics collector.
- * Collected to tune the preifx table. Currently only a few counters where
+ * Collected to tune the prefix table. Currently only a few counters were
  * added. More to come as soon as we see where we are going.
  * TODO: add a function that dumps the stats after a specified period of time.
  */
@@ -92,7 +92,7 @@ struct pt_stats {
 	u_int64_t		 pt_lookup;
 	u_int64_t		 pt_dump;
 } ptstats;
-/* simple macros to update statisic */
+/* simple macros to update statistics */
 #define PT_STAT(x)	(ptstats.x++)
 #define PT_STAT2(x, p)	(ptstats.x[p]++)
 
@@ -195,7 +195,7 @@ pt_lookup(struct in_addr prefix)
 }
 
 /*
- * XXX We need a redblack tree to get a ordered output.
+ * XXX We need a redblack tree to get an ordered output.
  * XXX A nicer upcall interface wouldn't be luxus too.
  */
 void
diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c
index 08463415c71..88ee3a4c59d 100644
--- a/usr.sbin/bgpd/rde_rib.c
+++ b/usr.sbin/bgpd/rde_rib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_rib.c,v 1.5 2003/12/22 06:42:19 deraadt Exp $ */
+/*	$OpenBSD: rde_rib.c,v 1.6 2003/12/24 11:39:43 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Claudio Jeker <claudio@openbsd.org>
@@ -32,7 +32,7 @@
  *
  * The RIB is build with one aspect in mind. Speed -- actually update speed.
  * Therefor one thing needs to be absolutely avoided, long table walks.
- * This is achieved by heavily linking the different parts toghether.
+ * This is achieved by heavily linking the different parts together.
  */
 
 struct rib_stats {
@@ -69,8 +69,8 @@ struct rib_stats {
 #define RIB_STAT(x)	(ribstats.x++)
 
 /*
- * maximum number of perfixes we allow per prefix. The number should
- * be not to big and ensures only that the prefix count is propperly
+ * Maximum number of prefixes we allow per prefix. The number should
+ * not be too big and ensure only that the prefix count is properly
  * increased and decreased. Only useful if ENSURE is active.
  */
 #define MAX_PREFIX_PER_AS 1500
@@ -210,14 +210,14 @@ attr_dump(void *p, u_int16_t len, struct attr_flags *a)
 /* aspath specific functions */
 
 /* TODO
- * aspath loop detection (partialy done I think),
+ * aspath loop detection (partially done I think),
  * aspath regexp search,
  * aspath to string converter
  */
 static u_int16_t	aspath_extract(void *, int);
 
 /*
- * Extract the asnum out of the as segement at the specified position.
+ * Extract the asnum out of the as segment at the specified position.
  * Direct access is not possible because of non-aligned reads.
  */
 static u_int16_t
@@ -567,7 +567,7 @@ path_unlink(struct rde_aspath *asp)
 	 */
 }
 
-/* alloc and initalize new entry. May not fail. */
+/* alloc and initialize new entry. May not fail. */
 static struct rde_aspath *
 path_alloc(void)
 {
@@ -626,7 +626,7 @@ prefix_get(struct rde_aspath *asp, struct in_addr prefix, int prefixlen)
 
 /*
  * Adds or updates a prefix. Returns 1 if a new routing decision needs
- * to be done -- which is acctually always.
+ * to be done -- which is actually always.
  */
 struct pt_entry *
 prefix_add(struct rde_aspath *asp, struct in_addr prefix, int prefixlen)
@@ -742,7 +742,7 @@ prefix_remove(struct rde_peer *peer, struct in_addr prefix, int prefixlen)
 }
 
 /*
- * seraches in the prefix list of specified pt_entry for a prefix entry
+ * Searches in the prefix list of specified pt_entry for a prefix entry
  * belonging to the peer peer. Returns NULL if no match found.
  */
 struct prefix *
@@ -845,8 +845,8 @@ prefix_unlink(struct prefix *pref)
 	pref->peer = NULL;
 
 	/*
-	 * It's the caller duty to remove empty aspath respectivly pt_entry
-	 * structures. Also freeing the unlinked prefix is callers duty.
+	 * It's the caller's duty to remove empty aspath respectively pt_entry
+	 * structures. Also freeing the unlinked prefix is the caller's duty.
 	 */
 }
 
@@ -884,7 +884,7 @@ prefix_free(struct prefix *pref)
  * the nexthops in a hash is not optimal. An (in)validate needs to do a table
  * walk to find all candidates.
  * Currently I think that there are many more adds and removes so that a
- * hash table has more benefits and the table walk shoulds not happen to often.
+ * hash table has more benefits and the table walk should not happen too often.
  */
 
 static struct nexthop	*nexthop_get(struct in_addr);
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 167b0fdc150..dc3dc5df3fb 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.c,v 1.32 2003/12/23 19:14:49 deraadt Exp $ */
+/*	$OpenBSD: session.c,v 1.33 2003/12/24 11:39:43 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -574,7 +574,7 @@ change_state(struct peer *peer, enum session_state state,
 		/*
 		 * we must start the timer for the next EVNT_START
 		 * if we are coming here due to an error and the
-		 * session was not established successfull before, the
+		 * session was not established successfully before, the
 		 * starttimerinterval needs to be exponentially increased
 		 */
 		peer->events = 0;