Re: recieve -> receive (usr.sbin)
On Thu, Jan 20, 2011 at 11:35:40PM +0100, Jasper Lievisse Adriaanse wrote:
> OK?
ok krw@ as in last one.
Ken
>
> --
> Cheers,
> Jasper
>
> "Capable, generous men do not create victims, they nurture them."
>
> Index: npppd/l2tp/l2tp_call.c
> ===
> RCS file: /cvs/src/usr.sbin/npppd/l2tp/l2tp_call.c,v
> retrieving revision 1.6
> diff -p -u -r1.6 l2tp_call.c
> --- npppd/l2tp/l2tp_call.c24 Sep 2010 14:50:30 - 1.6
> +++ npppd/l2tp/l2tp_call.c20 Jan 2011 22:34:37 -
> @@ -155,7 +155,7 @@ l2tp_call_disconnect(l2tp_call *_this, i
> * 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)
> Index: npppd/l2tp/l2tp_ctrl.c
> ===
> RCS file: /cvs/src/usr.sbin/npppd/l2tp/l2tp_ctrl.c,v
> retrieving revision 1.5
> diff -p -u -r1.5 l2tp_ctrl.c
> --- npppd/l2tp/l2tp_ctrl.c24 Sep 2010 14:50:30 - 1.5
> +++ npppd/l2tp/l2tp_ctrl.c20 Jan 2011 22:34:38 -
> @@ -535,7 +535,7 @@ l2tp_ctrl_timeout(int fd, short evtype,
> 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 listen
> /*
>* 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:
> Index: npppd/npppd/eap.c
> ===
> RCS file: /cvs/src/usr.sbin/npppd/npppd/eap.c,v
> retrieving revision 1.5
> diff -p -u -r1.5 eap.c
> --- npppd/npppd/eap.c 22 Sep 2010 11:48:38 - 1.5
> +++ npppd/npppd/eap.c 20 Jan 2011 22:34:38 -
> @@ -236,7 +236,7 @@ eap_input(eap *_this, unsigned char *pkt
> 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 *pkt
> * 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;
> }
>
> Index: npppd/pptp/pptp.h
> ===
> RCS file: /cvs/src/usr.sbin/npppd/pptp/pptp.h,v
> retrieving revision 1.4
> diff -p -u -r1.4 pptp.h
> --- npppd/pptp/pptp.h 2 Jul 2010 21:20:57 - 1.4
> +++ npppd/pptp/pptp.h 20 Jan 2011 22:34:38 -
> @@ -300,7 +300,7 @@ typedef struct _pptp_call {
> pptp_ctrl *ctrl; /* parent */
> unsignedid;
>
> - int ifidx; /* recieve interface index */
> + int ifidx; /* receive interface index */
>
> int state;
>
> @@ -310,8 +310,8 @@ typedef struct _pptp_call {
> uint32_tsnd_una;/* next ack notification */
> uint32_tsnd_nxt;/* next transmit sequence # */
>
> - uint32_trcv_nxt;/* recieved sequence # */
> - uint32_trcv_acked; /* latest acked recieved sequence # */
> + uint32_trcv_nxt;/* received sequence # */
> + uint32_trcv_acked; /* latest acked received sequence # */
>
> int winsz; /* current window size */
> int maxwinsz; /* maximum win
recieve -> receive (usr.sbin)
OK?
--
Cheers,
Jasper
"Capable, generous men do not create victims, they nurture them."
Index: npppd/l2tp/l2tp_call.c
===
RCS file: /cvs/src/usr.sbin/npppd/l2tp/l2tp_call.c,v
retrieving revision 1.6
diff -p -u -r1.6 l2tp_call.c
--- npppd/l2tp/l2tp_call.c 24 Sep 2010 14:50:30 - 1.6
+++ npppd/l2tp/l2tp_call.c 20 Jan 2011 22:34:37 -
@@ -155,7 +155,7 @@ l2tp_call_disconnect(l2tp_call *_this, i
* 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)
Index: npppd/l2tp/l2tp_ctrl.c
===
RCS file: /cvs/src/usr.sbin/npppd/l2tp/l2tp_ctrl.c,v
retrieving revision 1.5
diff -p -u -r1.5 l2tp_ctrl.c
--- npppd/l2tp/l2tp_ctrl.c 24 Sep 2010 14:50:30 - 1.5
+++ npppd/l2tp/l2tp_ctrl.c 20 Jan 2011 22:34:38 -
@@ -535,7 +535,7 @@ l2tp_ctrl_timeout(int fd, short evtype,
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 listen
/*
* 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:
Index: npppd/npppd/eap.c
===
RCS file: /cvs/src/usr.sbin/npppd/npppd/eap.c,v
retrieving revision 1.5
diff -p -u -r1.5 eap.c
--- npppd/npppd/eap.c 22 Sep 2010 11:48:38 - 1.5
+++ npppd/npppd/eap.c 20 Jan 2011 22:34:38 -
@@ -236,7 +236,7 @@ eap_input(eap *_this, unsigned char *pkt
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 *pkt
* 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;
}
Index: npppd/pptp/pptp.h
===
RCS file: /cvs/src/usr.sbin/npppd/pptp/pptp.h,v
retrieving revision 1.4
diff -p -u -r1.4 pptp.h
--- npppd/pptp/pptp.h 2 Jul 2010 21:20:57 - 1.4
+++ npppd/pptp/pptp.h 20 Jan 2011 22:34:38 -
@@ -300,7 +300,7 @@ typedef struct _pptp_call {
pptp_ctrl *ctrl; /* parent */
unsignedid;
- int ifidx; /* recieve interface index */
+ int ifidx; /* receive interface index */
int state;
@@ -310,8 +310,8 @@ typedef struct _pptp_call {
uint32_tsnd_una;/* next ack notification */
uint32_tsnd_nxt;/* next transmit sequence # */
- uint32_trcv_nxt;/* recieved sequence # */
- uint32_trcv_acked; /* latest acked recieved sequence # */
+ uint32_trcv_nxt;/* received sequence # */
+ uint32_trcv_acked; /* latest acked received sequence # */
int winsz; /* current window size */
int maxwinsz; /* maximum window size */
Index: npppd/pptp/pptpd.c
===
RCS file: /cvs/src/usr.sbin/npppd/pptp/pptpd.c,v
retrieving revision 1.7
diff -p -u -r1.7 pptpd.c
--- npppd/pptp/pptpd.c 27 Sep 2010 00:12
