1 files changed, 28 insertions, 35 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 1d24881ac0ab..7371a2f3acf4 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -128,21 +128,18 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
                     DCCP_PKT_WITHOUT_ACK_SEQ))
                        dp->dccps_gar = DCCP_SKB_CB(skb)->dccpd_ack_seq;
        } else {
-                LIMIT_NETDEBUG(KERN_WARNING "DCCP: Step 6 failed for %s packet, "
+                DCCP_WARN("DCCP: Step 6 failed for %s packet, "
-                                            "(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and "
+                          "(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and "
-                                            "(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), "
+                          "(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), "
-                                            "sending SYNC...\n",
+                          "sending SYNC...\n",  dccp_packet_name(dh->dccph_type),
-                               dccp_packet_name(dh->dccph_type),
+                          (unsigned long long) lswl,
-                               (unsigned long long) lswl,
+                          (unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq,
-                               (unsigned long long)
+                          (unsigned long long) dp->dccps_swh,
-                               DCCP_SKB_CB(skb)->dccpd_seq,
+                          (DCCP_SKB_CB(skb)->dccpd_ack_seq ==
-                               (unsigned long long) dp->dccps_swh,
-                               (DCCP_SKB_CB(skb)->dccpd_ack_seq ==
                                DCCP_PKT_WITHOUT_ACK_SEQ) ? "doesn't exist" : "exists",
-                               (unsigned long long) lawl,
+                          (unsigned long long) lawl,
-                               (unsigned long long)
+                          (unsigned long long) DCCP_SKB_CB(skb)->dccpd_ack_seq,
-                               DCCP_SKB_CB(skb)->dccpd_ack_seq,
+                          (unsigned long long) dp->dccps_awh);
-                               (unsigned long long) dp->dccps_awh);
                dccp_send_sync(sk, DCCP_SKB_CB(skb)->dccpd_seq, DCCP_PKT_SYNC);
                return -1;
        }
@@ -431,29 +428,25 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
        /*
         *  Step 3: Process LISTEN state
-         *      (Continuing from dccp_v4_do_rcv and dccp_v6_do_rcv)
         *
         *     If S.state == LISTEN,
-         *        If P.type == Request or P contains a valid Init Cookie
+         *       If P.type == Request or P contains a valid Init Cookie option,
-         *              option,
+         *            (* Must scan the packet's options to check for Init
-         *           * Must scan the packet's options to check for an Init
+         *               Cookies.  Only Init Cookies are processed here,
-         *              Cookie.  Only the Init Cookie is processed here,
+         *               however; other options are processed in Step 8.  This
-         *              however; other options are processed in Step 8.  This
+         *               scan need only be performed if the endpoint uses Init
-         *              scan need only be performed if the endpoint uses Init
+         *               Cookies *)
-         *              Cookies *
+         *            (* Generate a new socket and switch to that socket *)
-         *           * Generate a new socket and switch to that socket *
+         *            Set S := new socket for this port pair
-         *           Set S := new socket for this port pair
+         *            S.state = RESPOND
-         *           S.state = RESPOND
+         *            Choose S.ISS (initial seqno) or set from Init Cookies
-         *           Choose S.ISS (initial seqno) or set from Init Cookie
+         *            Initialize S.GAR := S.ISS
-         *           Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie
+         *            Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init
-         *           Continue with S.state == RESPOND
+         *            Cookies Continue with S.state == RESPOND
-         *           * A Response packet will be generated in Step 11 *
+         *            (* A Response packet will be generated in Step 11 *)
-         *        Otherwise,
+         *       Otherwise,
-         *           Generate Reset(No Connection) unless P.type == Reset
+         *            Generate Reset(No Connection) unless P.type == Reset
-         *           Drop packet and return
+         *            Drop packet and return
-         *
-         * NOTE: the check for the packet types is done in
-         *       dccp_rcv_state_process
         */
        if (sk->sk_state == DCCP_LISTEN) {
                if (dh->dccph_type == DCCP_PKT_REQUEST) {

diff --git a/net/dccp/input.c b/net/dccp/input.c index 1d24881ac0ab..7371a2f3acf4 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c
@@ -128,21 +128,18 @@ static int dccp_check_seqno(struct sock sk, struct sk_buff skb)
128	DCCP_PKT_WITHOUT_ACK_SEQ))	128	DCCP_PKT_WITHOUT_ACK_SEQ))
129	dp->dccps_gar = DCCP_SKB_CB(skb)->dccpd_ack_seq;	129	dp->dccps_gar = DCCP_SKB_CB(skb)->dccpd_ack_seq;
130	} else {	130	} else {
131	LIMIT_NETDEBUG(KERN_WARNING "DCCP: Step 6 failed for %s packet, "	131	DCCP_WARN("DCCP: Step 6 failed for %s packet, "
132	"(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and "	132	"(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and "
133	"(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), "	133	"(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), "
134	"sending SYNC...\n",	134	"sending SYNC...\n", dccp_packet_name(dh->dccph_type),
135	dccp_packet_name(dh->dccph_type),	135	(unsigned long long) lswl,
136	(unsigned long long) lswl,	136	(unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq,
137	(unsigned long long)	137	(unsigned long long) dp->dccps_swh,
138	DCCP_SKB_CB(skb)->dccpd_seq,	138	(DCCP_SKB_CB(skb)->dccpd_ack_seq ==
139	(unsigned long long) dp->dccps_swh,
140	(DCCP_SKB_CB(skb)->dccpd_ack_seq ==
141	DCCP_PKT_WITHOUT_ACK_SEQ) ? "doesn't exist" : "exists",	139	DCCP_PKT_WITHOUT_ACK_SEQ) ? "doesn't exist" : "exists",
142	(unsigned long long) lawl,	140	(unsigned long long) lawl,
143	(unsigned long long)	141	(unsigned long long) DCCP_SKB_CB(skb)->dccpd_ack_seq,
144	DCCP_SKB_CB(skb)->dccpd_ack_seq,	142	(unsigned long long) dp->dccps_awh);
145	(unsigned long long) dp->dccps_awh);
146	dccp_send_sync(sk, DCCP_SKB_CB(skb)->dccpd_seq, DCCP_PKT_SYNC);	143	dccp_send_sync(sk, DCCP_SKB_CB(skb)->dccpd_seq, DCCP_PKT_SYNC);
147	return -1;	144	return -1;
148	}	145	}
@@ -431,29 +428,25 @@ int dccp_rcv_state_process(struct sock sk, struct sk_buff skb,
431		428
432	/*	429	/*
433	* Step 3: Process LISTEN state	430	* Step 3: Process LISTEN state
434	* (Continuing from dccp_v4_do_rcv and dccp_v6_do_rcv)
435	*	431	*
436	* If S.state == LISTEN,	432	* If S.state == LISTEN,
437	* If P.type == Request or P contains a valid Init Cookie	433	* If P.type == Request or P contains a valid Init Cookie option,
438	* option,	434	* (* Must scan the packet's options to check for Init
439	* * Must scan the packet's options to check for an Init	435	* Cookies. Only Init Cookies are processed here,
440	* Cookie. Only the Init Cookie is processed here,	436	* however; other options are processed in Step 8. This
441	* however; other options are processed in Step 8. This	437	* scan need only be performed if the endpoint uses Init
442	* scan need only be performed if the endpoint uses Init	438	* Cookies *)
443	* Cookies *	439	* (* Generate a new socket and switch to that socket *)
444	* * Generate a new socket and switch to that socket *	440	* Set S := new socket for this port pair
445	* Set S := new socket for this port pair	441	* S.state = RESPOND
446	* S.state = RESPOND	442	* Choose S.ISS (initial seqno) or set from Init Cookies
447	* Choose S.ISS (initial seqno) or set from Init Cookie	443	* Initialize S.GAR := S.ISS
448	* Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init Cookie	444	* Set S.ISR, S.GSR, S.SWL, S.SWH from packet or Init
449	* Continue with S.state == RESPOND	445	* Cookies Continue with S.state == RESPOND
450	* * A Response packet will be generated in Step 11 *	446	* (* A Response packet will be generated in Step 11 *)
451	* Otherwise,	447	* Otherwise,
452	* Generate Reset(No Connection) unless P.type == Reset	448	* Generate Reset(No Connection) unless P.type == Reset
453	* Drop packet and return	449	* Drop packet and return
454	*
455	* NOTE: the check for the packet types is done in
456	* dccp_rcv_state_process
457	*/	450	*/
458	if (sk->sk_state == DCCP_LISTEN) {	451	if (sk->sk_state == DCCP_LISTEN) {
459	if (dh->dccph_type == DCCP_PKT_REQUEST) {	452	if (dh->dccph_type == DCCP_PKT_REQUEST) {