spellings

suggested by jsg

5 files changed, 19 insertions, 19 deletions

diff --git a/usr.sbin/npppd/pptp/pptp.h b/usr.sbin/npppd/pptp/pptp.h
index c759b3e4d04..e8df825f109 100644
--- a/usr.sbin/npppd/pptp/pptp.h
+++ b/usr.sbin/npppd/pptp/pptp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pptp.h,v 1.10 2014/03/22 04:32:39 yasuoka Exp $	*/
+/*	$OpenBSD: pptp.h,v 1.11 2021/03/29 03:54:40 yasuoka Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -171,13 +171,13 @@
 #define	PPTP_CALL_DEFAULT_MAXWINSZ		64
 #endif
 
-/* Connection speed that nofified by OCRP */
+/* Connection speed that notified by OCRP */
 /* XXX: currently we use fixed value */
 #ifndef	PPTP_CALL_CONNECT_SPEED
 #define	PPTP_CALL_CONNECT_SPEED			10000000
 #endif
 
-/* Initial packet processing delay that nofified by OCRP */
+/* Initial packet processing delay that notified by OCRP */
 #ifndef	PPTP_CALL_INITIAL_PPD
 #define PPTP_CALL_INITIAL_PPD			0
 #endif
@@ -285,7 +285,7 @@ typedef struct _pptp_ctrl {
 	slist		call_list;
 
 	time_t	last_snd_ctrl;	/* timestamp of latest ctrl message sent */
-	time_t	last_rcv_ctrl;	/* timestamp of latest ctrl message receieved */
+	time_t	last_rcv_ctrl;	/* timestamp of latest ctrl message received */
 	uint32_t	echo_seq; /* identifier of Echo Request */
 
 	int16_t		/* flags : processing I/O events */
diff --git a/usr.sbin/npppd/pptp/pptp_call.c b/usr.sbin/npppd/pptp/pptp_call.c
index 467948f468e..5c9d6e4c67b 100644
--- a/usr.sbin/npppd/pptp/pptp_call.c
+++ b/usr.sbin/npppd/pptp/pptp_call.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pptp_call.c,v 1.11 2021/03/10 10:29:26 patrick Exp $	*/
+/*	$OpenBSD: pptp_call.c,v 1.12 2021/03/29 03:54:40 yasuoka Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: pptp_call.c,v 1.11 2021/03/10 10:29:26 patrick Exp $ */
+/* $Id: pptp_call.c,v 1.12 2021/03/29 03:54:40 yasuoka Exp $ */
 /**@file PPTP Call */
 /* currently it supports PAC mode only */
 #include <sys/types.h>
@@ -540,7 +540,7 @@ pptp_call_gre_input(pptp_call *_this, uint32_t seq, uint32_t ack,
 		if (SEQ_SUB(seq, _this->rcv_acked) > RUPDIV(_this->winsz, 2)) {
 			/*
 			 * Multi-packet acknowledgement.
-			 * send ack when it reachs to half of window size
+			 * send ack when it reaches to half of window size
 			 */
 			PPTP_CALL_DBG((_this, LOG_DEBUG,
 			    "rcv window size=%u %u %u\n",
diff --git a/usr.sbin/npppd/pptp/pptp_ctrl.c b/usr.sbin/npppd/pptp/pptp_ctrl.c
index a7c4b5dbf7d..7bf1ab79506 100644
--- a/usr.sbin/npppd/pptp/pptp_ctrl.c
+++ b/usr.sbin/npppd/pptp/pptp_ctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pptp_ctrl.c,v 1.12 2021/03/05 08:41:26 yasuoka Exp $	*/
+/*	$OpenBSD: pptp_ctrl.c,v 1.13 2021/03/29 03:54:40 yasuoka Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -29,7 +29,7 @@
  * PPTP(RFC 2637) control connection implementation.
  * currently it only support PAC part
  */
-/* $Id: pptp_ctrl.c,v 1.12 2021/03/05 08:41:26 yasuoka Exp $ */
+/* $Id: pptp_ctrl.c,v 1.13 2021/03/29 03:54:40 yasuoka Exp $ */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -303,7 +303,7 @@ pptp_ctrl_stop(pptp_ctrl *_this, int result)
 
 	switch (_this->state) {
 	case PPTP_CTRL_STATE_WAIT_STOP_REPLY:
-		/* waiting responce. */
+		/* waiting response. */
 		/* this state will timeout by pptp_ctrl_timeout */
 		break;
 	case PPTP_CTRL_STATE_ESTABLISHED:
@@ -751,7 +751,7 @@ pptp_ctrl_send_SCCRP(pptp_ctrl *_this, int result, int error)
 		val = "";
 	strlcpy(scc->host_name, val, sizeof(scc->host_name));
 
-	/* vender name */
+	/* vendor name */
 	if (PPTP_CTRL_CONF(_this)->vendor_name == NULL)
 		val = PPTPD_DEFAULT_VENDOR_NAME;
 	strlcpy(scc->vendor_string, val, sizeof(scc->vendor_string));
diff --git a/usr.sbin/npppd/pptp/pptp_local.h b/usr.sbin/npppd/pptp/pptp_local.h
index a0820e65867..0dcdf63f790 100644
--- a/usr.sbin/npppd/pptp/pptp_local.h
+++ b/usr.sbin/npppd/pptp/pptp_local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pptp_local.h,v 1.4 2012/05/08 13:15:12 yasuoka Exp $	*/
+/*	$OpenBSD: pptp_local.h,v 1.5 2021/03/29 03:54:40 yasuoka Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -60,7 +60,7 @@ struct pptp_gre_header {
 } __attribute__((__packed__));
 
 
-/* Commont part of the PPTP control packet */
+/* Common part of the PPTP control packet */
 struct pptp_ctrl_header {
 	uint16_t	length;
 	uint16_t	pptp_message_type;
diff --git a/usr.sbin/npppd/pptp/pptpd.c b/usr.sbin/npppd/pptp/pptpd.c
index c8767e56f45..0565d204a28 100644
--- a/usr.sbin/npppd/pptp/pptpd.c
+++ b/usr.sbin/npppd/pptp/pptpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pptpd.c,v 1.32 2019/05/10 01:29:31 guenther Exp $	*/
+/*	$OpenBSD: pptpd.c,v 1.33 2021/03/29 03:54:40 yasuoka Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,12 +25,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: pptpd.c,v 1.32 2019/05/10 01:29:31 guenther Exp $ */
+/* $Id: pptpd.c,v 1.33 2021/03/29 03:54:40 yasuoka Exp $ */
 
 /**@file
  * This file provides a implementation of PPTP daemon.  Currently it
  * provides functions for PAC (PPTP Access Concentrator) only.
- * $Id: pptpd.c,v 1.32 2019/05/10 01:29:31 guenther Exp $
+ * $Id: pptpd.c,v 1.33 2021/03/29 03:54:40 yasuoka Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -138,7 +138,7 @@ pptpd_init(pptpd *_this)
 	return 0;
 }
 
-/* add a listner to pptpd daemon context */
+/* add a listener to pptpd daemon context */
 int
 pptpd_add_listener(pptpd *_this, int idx, struct pptp_conf *conf,
     struct sockaddr *addr)
@@ -615,7 +615,7 @@ pptpd_io_event(int fd, short evmask, void *ctx)
 	PPTPD_ASSERT(_this != NULL);
 
 	if ((evmask & EV_READ) != 0) {
-		for (;;) { /* accept till EAGAIN occured */
+		for (;;) { /* accept till EAGAIN occurred */
 			peerlen = sizeof(peer);
 			if ((newsock = accept(listener->sock,
 			    (struct sockaddr *)&peer, &peerlen)) < 0) {
@@ -643,7 +643,7 @@ pptpd_io_event(int fd, short evmask, void *ctx)
 	}
 }
 
-/* I/O event handeler of GRE */
+/* I/O event handler of GRE */
 static void
 pptpd_gre_io_event(int fd, short evmask, void *ctx)
 {