- tyop, recieve -> receive

ok sthen@

6 files changed, 25 insertions, 25 deletions

diff --git a/usr.sbin/ldpd/notification.c b/usr.sbin/ldpd/notification.c
index 0c9b1b06166..d7f763a1cd2 100644
--- a/usr.sbin/ldpd/notification.c
+++ b/usr.sbin/ldpd/notification.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: notification.c,v 1.8 2010/11/04 09:52:16 claudio Exp $ */
+/*	$OpenBSD: notification.c,v 1.9 2011/01/20 23:12:33 jasper Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -105,11 +105,11 @@ recv_notification(struct nbr *nbr, char *buf, u_int16_t len)
 	/* TODO optional parameters: ext status, returned PDU and msg */
 
 	if (st.status_code & htonl(STATUS_FATAL))
-		log_warnx("recieved notification from neighbor %s: %s",
+		log_warnx("received notification from neighbor %s: %s",
 		    inet_ntoa(nbr->id),
 		    notification_name(ntohl(st.status_code)));
 	else
-		log_debug("recieved non-fatal notification from neighbor "
+		log_debug("received non-fatal notification from neighbor "
 		    "%s: %s", inet_ntoa(nbr->id),
 		    notification_name(ntohl(st.status_code)));
 
diff --git a/usr.sbin/npppd/l2tp/l2tp_call.c b/usr.sbin/npppd/l2tp/l2tp_call.c
index d2e9fd95504..3507ac983ee 100644
--- a/usr.sbin/npppd/l2tp/l2tp_call.c
+++ b/usr.sbin/npppd/l2tp/l2tp_call.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: l2tp_call.c,v 1.6 2010/09/24 14:50:30 yasuoka Exp $	*/
+/* $OpenBSD: l2tp_call.c,v 1.7 2011/01/20 23:12:33 jasper 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: l2tp_call.c,v 1.6 2010/09/24 14:50:30 yasuoka Exp $ */
+/* $Id: l2tp_call.c,v 1.7 2011/01/20 23:12:33 jasper Exp $ */
 /**@file L2TP LNS call */
 #include <sys/types.h>
 #include <sys/param.h>
@@ -155,7 +155,7 @@ l2tp_call_disconnect(l2tp_call *_this, int result_code, int error_code,
  * control packet
  */
 
-/* call it when control packet is recieved */
+/* call it when control packet is received */
 int
 l2tp_call_recv_packet(l2tp_ctrl *ctrl, l2tp_call *_this, int mestype,
     u_char *pkt, int pktlen)
diff --git a/usr.sbin/npppd/l2tp/l2tp_ctrl.c b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
index f7d5b90b7d1..1259eb7a347 100644
--- a/usr.sbin/npppd/l2tp/l2tp_ctrl.c
+++ b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: l2tp_ctrl.c,v 1.5 2010/09/24 14:50:30 yasuoka Exp $	*/
+/* $OpenBSD: l2tp_ctrl.c,v 1.6 2011/01/20 23:12:33 jasper Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /**@file Control connection processing functions for L2TP LNS */
-/* $Id: l2tp_ctrl.c,v 1.5 2010/09/24 14:50:30 yasuoka Exp $ */
+/* $Id: l2tp_ctrl.c,v 1.6 2011/01/20 23:12:33 jasper Exp $ */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -535,7 +535,7 @@ l2tp_ctrl_timeout(int fd, short evtype, void *ctx)
 		    curr_time - _this->last_snd_ctrl >=
 			    L2TP_CTRL_WAIT_CALL_TIMEOUT) {
 			if (_this->ncalls == 0)
-				/* fail to recieve first call */
+				/* fail to receive first call */
 				l2tp_ctrl_log(_this, LOG_WARNING,
 				    "timeout waiting call");
 			l2tp_ctrl_stop(_this,
@@ -706,7 +706,7 @@ l2tp_ctrl_reset_timeout(l2tp_ctrl *_this)
 /*
  * protocols / send and receive
  */
-/* Recieve packet */
+/* Receive packet */
 void
 l2tp_ctrl_input(l2tpd *_this, int listener_index, struct sockaddr *peer,
     struct sockaddr *sock, void *nat_t_ctx, u_char *pkt, int pktlen)
@@ -1037,7 +1037,7 @@ l2tp_ctrl_input(l2tpd *_this, int listener_index, struct sockaddr *peer,
 			/*
 			 * RFC specifies that sent of StopCCN in the state,
 			 * However as this implementation only support Passive
-			 * open, this packet will not recieved.
+			 * open, this packet will not received.
 			 */
 			/* FALLTHROUGH */
 		case L2TP_AVP_MESSAGE_TYPE_SCCCN:
diff --git a/usr.sbin/npppd/npppd/eap.c b/usr.sbin/npppd/npppd/eap.c
index e4d5c1b0bff..1de8875d53f 100644
--- a/usr.sbin/npppd/npppd/eap.c
+++ b/usr.sbin/npppd/npppd/eap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eap.c,v 1.5 2010/09/22 11:48:38 yasuoka Exp $ */
+/* $OpenBSD: eap.c,v 1.6 2011/01/20 23:12:33 jasper Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -34,7 +34,7 @@
  *	    RADIUS (Remote Authentication Dial In User Service) Support For
  *	    Extensible Authentication Protocol (EAP). B. Aboba, P. Calhoun.
  */
-/* $Id: eap.c,v 1.5 2010/09/22 11:48:38 yasuoka Exp $ */
+/* $Id: eap.c,v 1.6 2011/01/20 23:12:33 jasper Exp $ */
 
 /* FIXME: This must be rewritten. */
 
@@ -236,7 +236,7 @@ eap_input(eap *_this, unsigned char *pktp, int len){
 	if (code == EAP_FAILURE) {
 		/* discard */
 		eap_log(_this, LOG_NOTICE,
-		    "Recieved unexpected packet from peer (code = %d)", code);
+		    "Received unexpected packet from peer (code = %d)", code);
 		return;
 	}
 
@@ -292,11 +292,11 @@ eap_input(eap *_this, unsigned char *pktp, int len){
          * discard
          */
 	eap_log(_this, LOG_DEBUG,
-	    "recieve eap length = %d, "
+	    "receive eap length = %d, "
 	    "eap info: code = %d, id = %d, length = %d, type = %d, "
 	    "name length = %d",
 	    len, code, id, length, type, _this->name_len );
-        eap_log(_this, LOG_NOTICE, "Recieved unexpected eap packet from peer");
+        eap_log(_this, LOG_NOTICE, "Received unexpected eap packet from peer");
 	return;
 }
 
diff --git a/usr.sbin/npppd/pptp/pptp.h b/usr.sbin/npppd/pptp/pptp.h
index adcc22893b0..db704aa0f79 100644
--- a/usr.sbin/npppd/pptp/pptp.h
+++ b/usr.sbin/npppd/pptp/pptp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pptp.h,v 1.4 2010/07/02 21:20:57 yasuoka Exp $	*/
+/* $OpenBSD: pptp.h,v 1.5 2011/01/20 23:12:33 jasper Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -300,7 +300,7 @@ typedef struct _pptp_call {
 	pptp_ctrl	*ctrl; /* parent */
 	unsigned	id;
 
-	int		ifidx; /* recieve interface index */
+	int		ifidx; /* receive interface index */
 
 	int		state;
 
@@ -310,8 +310,8 @@ typedef struct _pptp_call {
 	uint32_t	snd_una;	/* next ack notification */
 	uint32_t	snd_nxt;	/* next transmit sequence # */
 
-	uint32_t	rcv_nxt;	/* recieved sequence # */
-	uint32_t	rcv_acked;	/* latest acked recieved sequence # */
+	uint32_t	rcv_nxt;	/* received sequence # */
+	uint32_t	rcv_acked;	/* latest acked received sequence # */
 
 	int		winsz;		/* current window size */
 	int		maxwinsz;	/* maximum window size */
diff --git a/usr.sbin/npppd/pptp/pptpd.c b/usr.sbin/npppd/pptp/pptpd.c
index 4b7fae79426..fbe708a7f2f 100644
--- a/usr.sbin/npppd/pptp/pptpd.c
+++ b/usr.sbin/npppd/pptp/pptpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pptpd.c,v 1.7 2010/09/27 00:12:16 yasuoka Exp $	*/
+/* $OpenBSD: pptpd.c,v 1.8 2011/01/20 23:12:33 jasper 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.7 2010/09/27 00:12:16 yasuoka Exp $ */
+/* $Id: pptpd.c,v 1.8 2011/01/20 23:12:33 jasper 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.7 2010/09/27 00:12:16 yasuoka Exp $
+ * $Id: pptpd.c,v 1.8 2011/01/20 23:12:33 jasper Exp $
  */
 #include <sys/types.h>
 #include <sys/param.h>
@@ -182,7 +182,7 @@ pptpd_add_listener(pptpd *_this, int idx, const char *label,
 		plistener->bind_sin.sin_port = htons(PPTPD_DEFAULT_TCP_PORT);
 
 	/* When a raw socket binds both of an INADDR_ANY and specific IP
-	 * address sockets, packets will be recieved by those sockets
+	 * address sockets, packets will be received by those sockets
 	 * simultaneously. To avoid this duplicate receives, not
 	 * permit such kind of configuration */
 	inaddr_any = 0;
@@ -843,7 +843,7 @@ pptpd_gre_io_event(int fd, short evmask, void *ctx)
 	}
 }
 
-/* recieve GRE then route to pptp_call */
+/* receive GRE then route to pptp_call */
 static void
 pptpd_gre_input(pptpd_listener *listener, struct sockaddr *peer, u_char *pkt,
     int lpkt)