-/* $OpenBSD: fq_codel.c,v 1.14 2020/12/10 06:53:38 dlg Exp $ */
+/* $OpenBSD: fq_codel.c,v 1.15 2022/01/02 22:36:03 jsg Exp $ */
/*
* Copyright (c) 2017 Mike Belopuhov
/* Grace period after last drop, 16 100ms intervals */
static const int64_t codel_grace = 1600000000;
-/* First 399 "100 / sqrt(x)" intervarls, ns precision */
+/* First 399 "100 / sqrt(x)" intervals, ns precision */
static const uint32_t codel_intervals[] = {
100000000, 70710678, 57735027, 50000000, 44721360, 40824829, 37796447,
35355339, 33333333, 31622777, 30151134, 28867513, 27735010, 26726124,
-/* $OpenBSD: if.c,v 1.645 2021/12/26 01:00:32 sashan Exp $ */
+/* $OpenBSD: if.c,v 1.646 2022/01/02 22:36:03 jsg Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
/*
* most machines boot with 4 or 5 interfaces, so size the initial map
- * to accomodate this
+ * to accommodate this
*/
if_idxmap_init(8);
#if NBPFILTER > 0
/*
- * Only send packets to bpf if they are destinated to local
+ * Only send packets to bpf if they are destined to local
* addresses.
*
* if_input_local() is also called for SIMPLEX interfaces to
-/* $OpenBSD: if_ppp.h,v 1.9 2017/10/24 09:36:13 jsg Exp $ */
+/* $OpenBSD: if_ppp.h,v 1.10 2022/01/02 22:36:03 jsg Exp $ */
/* $NetBSD: if_ppp.h,v 1.11 1996/03/15 02:28:05 paulus Exp $ */
/*
*/
struct npioctl {
- int protocol; /* PPP procotol, e.g. PPP_IP */
+ int protocol; /* PPP protocol, e.g. PPP_IP */
enum NPmode mode;
};
-/* $OpenBSD: if_spppsubr.c,v 1.190 2021/11/17 18:00:24 bket Exp $ */
+/* $OpenBSD: if_spppsubr.c,v 1.191 2022/01/02 22:36:03 jsg Exp $ */
/*
* Synchronous PPP link level subroutines.
*
/*
* Send a PAP or CHAP proto packet.
*
- * Varadic function, each of the elements for the ellipsis is of type
+ * Variadic function, each of the elements for the ellipsis is of type
* ``size_t mlen, const u_char *msg''. Processing will stop iff
* mlen == 0.
*/
-/* $OpenBSD: if_types.h,v 1.23 2021/03/10 10:21:48 jsg Exp $ */
+/* $OpenBSD: if_types.h,v 1.24 2022/01/02 22:36:04 jsg Exp $ */
/* $NetBSD: if_types.h,v 1.17 2000/10/26 06:51:31 onoe Exp $ */
/*
#define IFT_USB 0xa0 /* USB Interface */
#define IFT_IEEE8023ADLAG 0xa1 /* IEEE 802.3ad Link Aggregate*/
#define IFT_BGPPOLICYACCOUNTING 0xa2 /* BGP Policy Accounting */
-#define IFT_FRF16MFRBUNDLE 0xa3 /* FRF.16 Multilik Frame Relay*/
+#define IFT_FRF16MFRBUNDLE 0xa3 /* FRF.16 Multilink Frame Relay*/
#define IFT_H323GATEKEEPER 0xa4 /* H323 Gatekeeper */
#define IFT_H323PROXY 0xa5 /* H323 Voice and Video Proxy */
#define IFT_MPLS 0xa6 /* MPLS */
-/* $OpenBSD: if_wg.c,v 1.19 2021/12/16 00:54:42 deraadt Exp $ */
+/* $OpenBSD: if_wg.c,v 1.20 2022/01/02 22:36:04 jsg Exp $ */
/*
* Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* IP header, we just worry about the sizeof and the version, so we can
* read the source address in wg_aip_lookup.
*
- * We also need to trim the packet, as it was likely paddded before
+ * We also need to trim the packet, as it was likely padded before
* encryption. While we could drop it here, it will be more helpful to
* pass it to bpf_mtap and use the counters that people are expecting
* in ipv4_input and ipv6_input. We can rely on ipv4_input and
-/* $OpenBSD: pf.c,v 1.1122 2021/07/07 18:38:25 sashan Exp $ */
+/* $OpenBSD: pf.c,v 1.1123 2022/01/02 22:36:04 jsg Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
* state->timeout by having the caller do the read (and any
* chacks it needs to do on the same variable) and then pass
* their view of the timeout in here for this function to use.
- * the only consequnce of using a stale timeout value is
+ * the only consequence of using a stale timeout value is
* that the state won't be a candidate for purging until the
* next pass of the purge task.
*/
-/* $OpenBSD: pfvar_priv.h,v 1.7 2021/06/23 06:53:52 dlg Exp $ */
+/* $OpenBSD: pfvar_priv.h,v 1.8 2022/01/02 22:36:04 jsg Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
u_int32_t off; /* protocol header offset */
u_int32_t hdrlen; /* protocol header length */
u_int32_t p_len; /* length of protocol payload */
- u_int32_t extoff; /* extentsion header offset */
+ u_int32_t extoff; /* extension header offset */
u_int32_t fragoff; /* fragment header offset */
u_int32_t jumbolen; /* length from v6 jumbo header */
u_int32_t badopts; /* v4 options or v6 routing headers */
-/* $OpenBSD: pipex.c,v 1.135 2021/07/27 09:29:09 mvs Exp $ */
+/* $OpenBSD: pipex.c,v 1.136 2022/01/02 22:36:04 jsg Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
struct ifnet *over_ifp = NULL;
#endif
- /* Checks requeted parameters. */
+ /* Checks requested parameters. */
switch (req->pr_protocol) {
#ifdef PIPEX_PPPOE
case PIPEX_PROTO_PPPOE:
}
/* ok, The packet is for PIPEX */
- m_adj(m0, hlen);/* cut off the tunnle protocol header */
+ m_adj(m0, hlen);/* cut off the tunnel protocol header */
/* ensure the mbuf length equals the PPP frame length */
if (m0->m_pkthdr.len < plen)
-/* $OpenBSD: pipex.h,v 1.30 2021/01/04 12:21:38 mvs Exp $ */
+/* $OpenBSD: pipex.h,v 1.31 2022/01/02 22:36:04 jsg Exp $ */
/*
* Copyright (c) 2009 Internet Initiative Japan Inc.
int16_t stateless; /* mppe key mode.
1 for stateless */
int16_t keylenbits; /* mppe key length(in bits)*/
- u_char master_key[PIPEX_MPPE_KEYLEN]; /* mppe mastter key */
+ u_char master_key[PIPEX_MPPE_KEYLEN]; /* mppe master key */
};
/* pipex statistics */
-/* $OpenBSD: pipex_local.h,v 1.43 2021/07/27 09:29:09 mvs Exp $ */
+/* $OpenBSD: pipex_local.h,v 1.44 2022/01/02 22:36:04 jsg Exp $ */
/*
* Copyright (c) 2009 Internet Initiative Japan Inc.
reserved:14;
int16_t keylenbits; /* [I] key length */
int16_t keylen; /* [I] */
- uint16_t coher_cnt; /* [m] cohency counter */
+ uint16_t coher_cnt; /* [m] coherency counter */
struct rc4_ctx rc4ctx; /* [m] */
u_char master_key[PIPEX_MPPE_KEYLEN]; /* [m] master key of MPPE */
u_char session_key[PIPEX_MPPE_KEYLEN]; /* [m] session key of MPPE */
struct cpumem;
-/* pppac ip-extension sessoin table */
+/* pppac ip-extension session table */
struct pipex_session {
struct radix_node ps4_rn[2];
/* [N] tree glue, and other values */
-/* $OpenBSD: ppp_tty.c,v 1.53 2019/11/27 17:59:13 beck Exp $ */
+/* $OpenBSD: ppp_tty.c,v 1.54 2022/01/02 22:36:04 jsg Exp $ */
/* $NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $ */
/*
if (sc == NULL)
return 0;
/*
- * Loop waiting for input, checking that nothing disasterous
+ * Loop waiting for input, checking that nothing disastrous
* happens in the meantime.
*/
s = spltty();
-/* $OpenBSD: radix.c,v 1.60 2021/03/10 10:21:48 jsg Exp $ */
+/* $OpenBSD: radix.c,v 1.61 2022/01/02 22:36:04 jsg Exp $ */
/* $NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $ */
/*
* - leaf nodes with possible rn_dupedkey list
* - internal nodes with maybe their own mklist
* If the mask of the route is bigger than the current branch bit then
- * a rn_mklist entrie needs to be made.
+ * a rn_mklist entry needs to be made.
*/
void
rn_fixup_nodes(struct radix_node *tt)
-/* $OpenBSD: route.c,v 1.399 2021/05/25 22:45:09 bluhm Exp $ */
+/* $OpenBSD: route.c,v 1.400 2022/01/02 22:36:04 jsg Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
}
/*
- * Function to pass to rtalble_walk().
+ * Function to pass to rtable_walk().
* Return non-zero error to abort walk.
*/
int
-/* $OpenBSD: rtable.c,v 1.75 2021/05/25 22:45:09 bluhm Exp $ */
+/* $OpenBSD: rtable.c,v 1.76 2022/01/02 22:36:04 jsg Exp $ */
/*
* Copyright (c) 2014-2016 Martin Pieuchot
/*
* Array of rtableid -> rdomain mapping.
*
- * Only used for the first index as describbed above.
+ * Only used for the first index as described above.
*/
struct dommp {
unsigned int limit;
-/* $OpenBSD: ip_ipip.c,v 1.97 2021/10/23 22:19:37 bluhm Exp $ */
+/* $OpenBSD: ip_ipip.c,v 1.98 2022/01/02 22:36:04 jsg Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
tdb->tdb_src.sin.sin_addr.s_addr == INADDR_ANY ||
tdb->tdb_dst.sin.sin_addr.s_addr == INADDR_ANY) {
- DPRINTF("unspecified tunnel endpoind address "
+ DPRINTF("unspecified tunnel endpoint address "
"in SA %s/%08x",
ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
ntohl(tdb->tdb_spi));
tdb->tdb_src.sa.sa_family != AF_INET6 ||
IN6_IS_ADDR_UNSPECIFIED(&tdb->tdb_src.sin6.sin6_addr)) {
- DPRINTF("unspecified tunnel endpoind address "
+ DPRINTF("unspecified tunnel endpoint address "
"in SA %s/%08x",
ipsp_address(&tdb->tdb_dst, buf, sizeof(buf)),
ntohl(tdb->tdb_spi));
-/* $OpenBSD: ipsec_output.c,v 1.96 2021/12/23 12:21:48 bluhm Exp $ */
+/* $OpenBSD: ipsec_output.c,v 1.97 2022/01/02 22:36:04 jsg Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
/*
* If this is just an IP-IP TDB and we're told there's already an
- * encapsulation header or ipip_output() has encapsulted it, move on.
+ * encapsulation header or ipip_output() has encapsulated it, move on.
*/
if (tdb->tdb_xform->xf_type == XF_IP4)
return ipsp_process_done(m, tdb);
-/* $OpenBSD: tcp_input.c,v 1.373 2021/12/01 12:51:09 bluhm Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.374 2022/01/02 22:36:04 jsg Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
*
* -1 We were unable to create the new connection, and are
* aborting it. An ACK,RST is being sent to the peer
- * (unless we got screwey sequence numbners; see below),
+ * (unless we got screwy sequence numbers; see below),
* because the 3-way handshake has been completed. Caller
* should not free the mbuf, since we may be using it. If
* we are not, we will free it.
-/* $OpenBSD: tcp_subr.c,v 1.182 2021/11/11 18:08:18 bluhm Exp $ */
+/* $OpenBSD: tcp_subr.c,v 1.183 2022/01/02 22:36:04 jsg Exp $ */
/* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */
/*
/*
* Depending on the value of "valid" and routing table
* size (mtudisc_{hi,lo}wat), we will:
- * - recalcurate the new MTU and create the
+ * - recalculate the new MTU and create the
* corresponding routing entry, or
* - ignore the MTU change notification.
*/
-/* $OpenBSD: tcp_timer.c,v 1.68 2020/12/20 21:15:47 bluhm Exp $ */
+/* $OpenBSD: tcp_timer.c,v 1.69 2022/01/02 22:36:04 jsg Exp $ */
/* $NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $ */
/*
/*
* This timer is necessary to delay the pool_put() after all timers
* have finished, even if they were sleeping to grab the net lock.
- * Putting the pool_put() in a timer is sufficinet as all timers run
+ * Putting the pool_put() in a timer is sufficient as all timers run
* from the same timeout thread. Note that neither softnet thread nor
* user process may access the tcpcb after arming the reaper timer.
* Freeing may run in parallel as it does not grab the net lock.
-/* $OpenBSD: icmp6.c,v 1.236 2021/07/26 20:44:44 bluhm Exp $ */
+/* $OpenBSD: icmp6.c,v 1.237 2022/01/02 22:36:04 jsg Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
icmp6dst.sin6_scope_id = in6_addr2scopeid(m->m_pkthdr.ph_ifidx,
&icmp6dst.sin6_addr);
if (in6_embedscope(&icmp6dst.sin6_addr, &icmp6dst, NULL)) {
- /* should be impossbile */
+ /* should be impossible */
nd6log((LOG_DEBUG,
"icmp6_notify_error: in6_embedscope failed\n"));
goto freeit;
icmp6src.sin6_scope_id = in6_addr2scopeid(m->m_pkthdr.ph_ifidx,
&icmp6src.sin6_addr);
if (in6_embedscope(&icmp6src.sin6_addr, &icmp6src, NULL)) {
- /* should be impossbile */
+ /* should be impossible */
nd6log((LOG_DEBUG,
"icmp6_notify_error: in6_embedscope failed\n"));
goto freeit;
-/* $OpenBSD: in6.c,v 1.243 2021/03/10 10:21:49 jsg Exp $ */
+/* $OpenBSD: in6.c,v 1.244 2022/01/02 22:36:04 jsg Exp $ */
/* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */
/*
}
/*
- * Initialize an interface's intetnet6 address
+ * Initialize an interface's inet6 address
* and routing table entry.
*/
int
-/* $OpenBSD: in6_var.h,v 1.73 2020/07/03 17:42:50 florian Exp $ */
+/* $OpenBSD: in6_var.h,v 1.74 2022/01/02 22:36:04 jsg Exp $ */
/* $KAME: in6_var.h,v 1.55 2001/02/16 12:49:45 itojun Exp $ */
/*
u_int64_t ifs6_out_forward; /* # of datagrams forwarded */
/* NOTE: increment on outgoing if */
u_int64_t ifs6_out_request; /* # of outgoing datagrams from ULP */
- /* NOTE: does not include forwrads */
+ /* NOTE: does not include forwards */
u_int64_t ifs6_out_discard; /* # of discarded datagrams */
u_int64_t ifs6_out_fragok; /* # of datagrams fragmented */
u_int64_t ifs6_out_fragfail; /* # of datagrams failed on fragment */
-/* $OpenBSD: ip6_forward.c,v 1.104 2021/12/03 17:18:34 bluhm Exp $ */
+/* $OpenBSD: ip6_forward.c,v 1.105 2022/01/02 22:36:04 jsg Exp $ */
/* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */
/*
/*
* Fake scoped addresses. Note that even link-local source or
- * destinaion can appear, if the originating node just sends the
+ * destination can appear, if the originating node just sends the
* packet to us (without address resolution for the destination).
* Since both icmp6_error and icmp6_redirect_output fill the embedded
* link identifiers, we can do this stuff after making a copy for
-/* $OpenBSD: ip6_input.c,v 1.238 2021/12/25 13:35:17 bluhm Exp $ */
+/* $OpenBSD: ip6_input.c,v 1.239 2022/01/02 22:36:04 jsg Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
/*
* If the packet has been received on a loopback interface it
- * can be destinated to any local address, not necessarily to
+ * can be destined to any local address, not necessarily to
* an address configured on `ifp'.
*/
if (ifp->if_flags & IFF_LOOPBACK) {
-/* $OpenBSD: ip6_output.c,v 1.265 2021/12/23 12:21:48 bluhm Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.266 2022/01/02 22:36:04 jsg Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
#endif
/*
- * If the packet is not going on the wire it can be destinated
+ * If the packet is not going on the wire it can be destined
* to any local address. In this case do not clear its scopes
* to let ip6_input() find a matching local route.
*/
-/* $OpenBSD: ip6protosw.h,v 1.14 2021/03/10 10:21:49 jsg Exp $ */
+/* $OpenBSD: ip6protosw.h,v 1.15 2022/01/02 22:36:05 jsg Exp $ */
/* $KAME: ip6protosw.h,v 1.22 2001/02/08 18:02:08 itojun Exp $ */
/*
* argument type for the last arg of pr_ctlinput().
* should be consulted only with AF_INET6 family.
*
- * IPv6 ICMP IPv6 [exthdrs] finalhdr paylaod
+ * IPv6 ICMP IPv6 [exthdrs] finalhdr payload
* ^ ^ ^ ^
* | | ip6c_ip6 ip6c_off
* | ip6c_icmp6
projects / openbsd / commitdiff