summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/bgpd')
-rw-r--r--usr.sbin/bgpd/config.c4
-rw-r--r--usr.sbin/bgpd/kroute.c6
-rw-r--r--usr.sbin/bgpd/mrt.c8
-rw-r--r--usr.sbin/bgpd/mrt.h8
-rw-r--r--usr.sbin/bgpd/rde.c8
-rw-r--r--usr.sbin/bgpd/rde.h6
-rw-r--r--usr.sbin/bgpd/rde_community.c4
-rw-r--r--usr.sbin/bgpd/rde_rib.c6
-rw-r--r--usr.sbin/bgpd/rde_trie.c8
-rw-r--r--usr.sbin/bgpd/rtr_proto.c4
-rw-r--r--usr.sbin/bgpd/session.c8
11 files changed, 35 insertions, 35 deletions
diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c
index 28c0e83a2f3..025be0f0aa5 100644
--- a/usr.sbin/bgpd/config.c
+++ b/usr.sbin/bgpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.105 2022/11/18 10:17:23 claudio Exp $ */
+/* $OpenBSD: config.c,v 1.106 2022/12/28 21:30:15 jmc Exp $ */
/*
* Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -352,7 +352,7 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf)
} else /* exists, just flag */
ola->reconf = RECONF_KEEP;
}
- /* finally clean up the original list and remove all stale entires */
+ /* finally clean up the original list and remove all stale entries */
for (nla = TAILQ_FIRST(xconf->listen_addrs); nla != NULL; nla = next) {
next = TAILQ_NEXT(nla, entry);
if (nla->reconf == RECONF_DELETE) {
diff --git a/usr.sbin/bgpd/kroute.c b/usr.sbin/bgpd/kroute.c
index bf3877f2157..4d3bfc782b8 100644
--- a/usr.sbin/bgpd/kroute.c
+++ b/usr.sbin/bgpd/kroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kroute.c,v 1.302 2022/11/09 14:26:14 claudio Exp $ */
+/* $OpenBSD: kroute.c,v 1.303 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -2099,7 +2099,7 @@ kif_validate(struct kif *kif)
}
/*
- * return 1 when the interface is up and the link state is up or unknwown
+ * return 1 when the interface is up and the link state is up or unknown
* except when this is a carp interface, then return 1 only when link state
* is up
*/
@@ -2435,7 +2435,7 @@ mask2prefixlen6(struct sockaddr_in6 *sa_in6)
u_int l = 0;
/*
- * sin6_len is the size of the sockaddr so substract the offset of
+ * sin6_len is the size of the sockaddr so subtract the offset of
* the possibly truncated sin6_addr struct.
*/
ap = (uint8_t *)&sa_in6->sin6_addr;
diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c
index fe104727d72..d3b417e789a 100644
--- a/usr.sbin/bgpd/mrt.c
+++ b/usr.sbin/bgpd/mrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mrt.c,v 1.110 2022/09/01 13:23:24 claudio Exp $ */
+/* $OpenBSD: mrt.c,v 1.111 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -109,7 +109,7 @@ mrt_update_msg_guess_aid(uint8_t *pkg, uint16_t pkglen)
pkglen -= 2;
if (wlen > 0) {
- /* UPDATE has withdraw routes, therefor IPv4 */
+ /* UPDATE has withdraw routes, therefore IPv4 */
return AID_INET;
}
@@ -119,7 +119,7 @@ mrt_update_msg_guess_aid(uint8_t *pkg, uint16_t pkglen)
pkglen -= 2;
if (alen < pkglen) {
- /* UPDATE has NLRI prefixes, therefor IPv4 */
+ /* UPDATE has NLRI prefixes, therefore IPv4 */
return AID_INET;
}
@@ -972,7 +972,7 @@ mrt_dump_hdr_se(struct ibuf ** bp, struct peer *peer, uint16_t type,
}
DUMP_LONG(*bp, len);
- /* milisecond field use by the _ET format */
+ /* millisecond field use by the _ET format */
DUMP_LONG(*bp, time.tv_nsec / 1000);
if (subtype == BGP4MP_STATE_CHANGE_AS4 ||
diff --git a/usr.sbin/bgpd/mrt.h b/usr.sbin/bgpd/mrt.h
index d6ce17cbd54..db543c06da2 100644
--- a/usr.sbin/bgpd/mrt.h
+++ b/usr.sbin/bgpd/mrt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mrt.h,v 1.37 2022/02/06 09:51:19 claudio Exp $ */
+/* $OpenBSD: mrt.h,v 1.38 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -73,7 +73,7 @@ enum MRT_MSG_TYPES {
/*
* Main zebra dump format is in MSG_PROTOCOL_BGP4MP exceptions are table dumps
- * that are normaly saved as MSG_TABLE_DUMP.
+ * that are normally saved as MSG_TABLE_DUMP.
* In most cases this is the format to choose to dump updates et al.
*/
enum MRT_BGP4MP_SUBTYPES {
@@ -162,7 +162,7 @@ enum MRT_BGP4MP_SUBTYPES {
* ... |
* +--------+--------+--------+
*
- * View is normaly 0 and originated the time of last change.
+ * View is normally 0 and originated the time of last change.
* The status seems to be 1 by default but probably something to indicate
* the status of a prefix would be more useful.
* The format of the nexthop address is defined via the afi value. For IPv6
@@ -298,7 +298,7 @@ enum MRT_DUMP_V2_SUBTYPES {
* +--------+--------+--------+
*
*
- * View is normaly 0 and seqnum just a simple counter for this dump.
+ * View is normally 0 and seqnum just a simple counter for this dump.
* The status field is unused and should be set to 1.
*/
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 0b07ba58c59..61f1ca58573 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.581 2022/12/14 14:16:20 claudio Exp $ */
+/* $OpenBSD: rde.c,v 1.582 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -523,7 +523,7 @@ rde_dispatch_imsg_session(struct imsgbuf *ibuf)
network_add(&netconf_s, &netconf_state);
break;
case 0:
- /* something failed beforehands */
+ /* something failed beforehand */
break;
default:
badnet:
@@ -850,7 +850,7 @@ rde_dispatch_imsg_parent(struct imsgbuf *ibuf)
/* no change to rib apart from filters */
rib->state = RECONF_KEEP;
} else {
- /* reload rib because somehing changed */
+ /* reload rib because something changed */
rib->flags_tmp = rr.flags;
rib->rtableid_tmp = rr.rtableid;
rib->state = RECONF_RELOAD;
@@ -1737,7 +1737,7 @@ rde_update_withdraw(struct rde_peer *peer, uint32_t path_id,
* BGP UPDATE parser functions
*/
-/* attribute parser specific makros */
+/* attribute parser specific macros */
#define UPD_READ(t, p, plen, n) \
do { \
memcpy(t, p, n); \
diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h
index 35017f58190..ac0457bc115 100644
--- a/usr.sbin/bgpd/rde.h
+++ b/usr.sbin/bgpd/rde.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.h,v 1.274 2022/12/14 12:37:15 claudio Exp $ */
+/* $OpenBSD: rde.h,v 1.275 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
@@ -202,8 +202,8 @@ struct rde_community {
#define F_PREFIX_ANNOUNCED 0x00400
#define F_ANN_DYNAMIC 0x00800
#define F_ATTR_OTC 0x01000 /* OTC present */
-#define F_ATTR_OTC_LOOP 0x02000 /* otc loop, not eligable */
-#define F_ATTR_PARSE_ERR 0x10000 /* parse error, not eligable */
+#define F_ATTR_OTC_LOOP 0x02000 /* otc loop, not eligible */
+#define F_ATTR_PARSE_ERR 0x10000 /* parse error, not eligible */
#define F_ATTR_LINKED 0x20000 /* if set path is on various lists */
#define ORIGIN_IGP 0
diff --git a/usr.sbin/bgpd/rde_community.c b/usr.sbin/bgpd/rde_community.c
index 40f25ae38a2..8c470480ded 100644
--- a/usr.sbin/bgpd/rde_community.c
+++ b/usr.sbin/bgpd/rde_community.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_community.c,v 1.9 2022/09/01 13:19:11 claudio Exp $ */
+/* $OpenBSD: rde_community.c,v 1.10 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org>
@@ -857,7 +857,7 @@ communities_copy(struct rde_community *to, struct rde_community *from)
{
memset(to, 0, sizeof(*to));
- /* ingore from->size and allocate the perfect amount */
+ /* ignore from->size and allocate the perfect amount */
to->size = from->size;
to->nentries = from->nentries;
to->flags = from->flags;
diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c
index c4321b94cd9..4325451cd8a 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.250 2022/10/12 11:26:05 jsg Exp $ */
+/* $OpenBSD: rde_rib.c,v 1.251 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -740,7 +740,7 @@ path_copy(struct rde_aspath *dst, const struct rde_aspath *src)
return (dst);
}
-/* initialize or pepare an aspath for use */
+/* initialize or prepare an aspath for use */
struct rde_aspath *
path_prep(struct rde_aspath *asp)
{
@@ -1130,7 +1130,7 @@ prefix_adjout_update(struct prefix *p, struct rde_peer *peer,
if (p == NULL) {
p = prefix_alloc();
- /* initally mark DEAD so code below is skipped */
+ /* initially mark DEAD so code below is skipped */
p->flags |= PREFIX_FLAG_ADJOUT | PREFIX_FLAG_DEAD;
p->pt = pt_get(prefix, prefixlen);
diff --git a/usr.sbin/bgpd/rde_trie.c b/usr.sbin/bgpd/rde_trie.c
index 029a807dd60..cbd55c360e2 100644
--- a/usr.sbin/bgpd/rde_trie.c
+++ b/usr.sbin/bgpd/rde_trie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde_trie.c,v 1.16 2022/08/31 11:25:36 claudio Exp $ */
+/* $OpenBSD: rde_trie.c,v 1.17 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2018 Claudio Jeker <claudio@openbsd.org>
@@ -35,7 +35,7 @@
* nodes. Internal nodes are added when needed because off path nodes are being
* inserted and are just used for branching.
* During lookup every node defines which bit is checked for branching. This
- * offset is strictly increasing. For IPv4 the maximum is therefor 32 levels.
+ * offset is strictly increasing. For IPv4 the maximum is therefore 32 levels.
* Every node checks the bit at position plen to decide which branch to take.
* The real nodes also include a prefixlen mask which represents the prefixlen
* range that was defined. The prefixlen mask for IPv4 only has 32 bits but
@@ -592,7 +592,7 @@ trie_roa_check_v4(struct trie_head *th, struct in_addr *prefix, uint8_t plen,
if (n->node) {
/*
* The prefix is covered by this roa node
- * therefor invalid unless roa_set matches.
+ * therefore invalid unless roa_set matches.
*/
validity = ROA_INVALID;
@@ -640,7 +640,7 @@ trie_roa_check_v6(struct trie_head *th, struct in6_addr *prefix, uint8_t plen,
if (n->node) {
/*
* This prefix is covered by this roa node.
- * Therefor invalid unless proven otherwise.
+ * Therefore invalid unless proven otherwise.
*/
validity = ROA_INVALID;
diff --git a/usr.sbin/bgpd/rtr_proto.c b/usr.sbin/bgpd/rtr_proto.c
index ea59f65a479..97ff01c07b6 100644
--- a/usr.sbin/bgpd/rtr_proto.c
+++ b/usr.sbin/bgpd/rtr_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtr_proto.c,v 1.7 2022/07/11 16:47:27 claudio Exp $ */
+/* $OpenBSD: rtr_proto.c,v 1.8 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@@ -360,7 +360,7 @@ rtr_parse_header(struct rtr_session *rs, void *buf,
return -1;
}
/*
- * session_id check ommitted since ROUTER_KEY and ERROR_REPORT
+ * session_id check omitted since ROUTER_KEY and ERROR_REPORT
* use the field for different things.
*/
return 0;
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 00535257692..88a0f84bb7a 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.437 2022/12/27 17:05:38 claudio Exp $ */
+/* $OpenBSD: session.c,v 1.438 2022/12/28 21:30:16 jmc Exp $ */
/*
* Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -586,7 +586,7 @@ init_peer(struct peer *p)
/*
* on startup, demote if requested.
- * do not handle new peers. they must reach ESTABLISHED beforehands.
+ * do not handle new peers. they must reach ESTABLISHED beforehand.
* peers added at runtime have reconf_action set to RECONF_REINIT.
*/
if (p->reconf_action != RECONF_REINIT && p->conf.demote_group[0])
@@ -1505,7 +1505,7 @@ session_open(struct peer *p)
if (optparamlen == 0) {
/* nothing */
} else if (optparamlen + 2 >= 255) {
- /* RFC9072: 2 byte lenght instead of 1 + 3 byte extra header */
+ /* RFC9072: 2 byte length instead of 1 + 3 byte extra header */
optparamlen += sizeof(op_type) + 2 + 3;
msg.optparamlen = 255;
extlen = 1;
@@ -2775,7 +2775,7 @@ capa_neg_calc(struct peer *p, uint8_t *suberr)
/*
* graceful restart: the peer capabilities are of interest here.
* It is necessary to compare the new values with the previous ones
- * and act acordingly. AFI/SAFI that are not part in the MP capability
+ * and act accordingly. AFI/SAFI that are not part in the MP capability
* are treated as not being present.
* Also make sure that a flush happens if the session stopped
* supporting graceful restart.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:40:27 +0000