diff for duplicates of <4DAE8B79.7060007@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 4899d4f..feaa09c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,19 +27,19 @@ index 30cec77..3a8eb79 100644 ch = (sctp_chunkhdr_t *) skb->data; @@ -697,20 +696,6 @@ static int sctp_rcv_ootb(struct sk_buff *skb) - if (SCTP_CID_INIT = ch->type && (void *)ch != skb->data) + if (SCTP_CID_INIT == ch->type && (void *)ch != skb->data) goto discard; - /* RFC 8.4, 7) If the packet contains a "Stale cookie" ERROR - * or a COOKIE ACK the SCTP Packet should be silently - * discarded. - */ -- if (SCTP_CID_COOKIE_ACK = ch->type) +- if (SCTP_CID_COOKIE_ACK == ch->type) - goto discard; - -- if (SCTP_CID_ERROR = ch->type) { +- if (SCTP_CID_ERROR == ch->type) { - sctp_walk_errors(err, ch) { -- if (SCTP_ERROR_STALE_COOKIE = err->cause) +- if (SCTP_ERROR_STALE_COOKIE == err->cause) - goto discard; - } - } @@ -63,7 +63,7 @@ index 194d5ec..ad3b43b 100644 SCTP_INC_STATS(SCTP_MIB_OUTOFBLUES); @@ -3358,6 +3360,23 @@ sctp_disposition_t sctp_sf_ootb(const struct sctp_endpoint *ep, - if (SCTP_CID_ABORT = ch->type) + if (SCTP_CID_ABORT == ch->type) return sctp_sf_pdiscard(ep, asoc, type, arg, commands); + /* RFC 8.4, 7) If the packet contains a "Stale cookie" ERROR @@ -71,12 +71,12 @@ index 194d5ec..ad3b43b 100644 + * discarded. + */ + -+ if (SCTP_CID_COOKIE_ACK = ch->type) ++ if (SCTP_CID_COOKIE_ACK == ch->type) + ootb_cookie_ack = 1; + -+ if (SCTP_CID_ERROR = ch->type) { ++ if (SCTP_CID_ERROR == ch->type) { + sctp_walk_errors(err, ch) { -+ if (SCTP_ERROR_STALE_COOKIE = err->cause) { ++ if (SCTP_ERROR_STALE_COOKIE == err->cause) { + ootb_cookie_ack = 1; + break; + } diff --git a/a/content_digest b/N1/content_digest index 365505a..10eb2f4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\04DAE8A27.3040007@cn.fujitsu.com\0" "From\0Wei Yongjun <yjwei@cn.fujitsu.com>\0" - "Subject\0[PATCH net-next-2.6 6/9] sctp: handle ootb packet in chunk order\0" - "Date\0Wed, 20 Apr 2011 07:30:01 +0000\0" + "Subject\0[PATCH net-next-2.6 6/9] sctp: handle ootb packet in chunk order as defined\0" + "Date\0Wed, 20 Apr 2011 15:30:01 +0800\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0netdev@vger.kernel.org <netdev@vger.kernel.org>" " lksctp <linux-sctp@vger.kernel.org>\0" @@ -36,19 +36,19 @@ " \tch = (sctp_chunkhdr_t *) skb->data;\n" " \n" "@@ -697,20 +696,6 @@ static int sctp_rcv_ootb(struct sk_buff *skb)\n" - " \t\tif (SCTP_CID_INIT = ch->type && (void *)ch != skb->data)\n" + " \t\tif (SCTP_CID_INIT == ch->type && (void *)ch != skb->data)\n" " \t\t\tgoto discard;\n" " \n" "-\t\t/* RFC 8.4, 7) If the packet contains a \"Stale cookie\" ERROR\n" "-\t\t * or a COOKIE ACK the SCTP Packet should be silently\n" "-\t\t * discarded.\n" "-\t\t */\n" - "-\t\tif (SCTP_CID_COOKIE_ACK = ch->type)\n" + "-\t\tif (SCTP_CID_COOKIE_ACK == ch->type)\n" "-\t\t\tgoto discard;\n" "-\n" - "-\t\tif (SCTP_CID_ERROR = ch->type) {\n" + "-\t\tif (SCTP_CID_ERROR == ch->type) {\n" "-\t\t\tsctp_walk_errors(err, ch) {\n" - "-\t\t\t\tif (SCTP_ERROR_STALE_COOKIE = err->cause)\n" + "-\t\t\t\tif (SCTP_ERROR_STALE_COOKIE == err->cause)\n" "-\t\t\t\t\tgoto discard;\n" "-\t\t\t}\n" "-\t\t}\n" @@ -72,7 +72,7 @@ " \tSCTP_INC_STATS(SCTP_MIB_OUTOFBLUES);\n" " \n" "@@ -3358,6 +3360,23 @@ sctp_disposition_t sctp_sf_ootb(const struct sctp_endpoint *ep,\n" - " \t\tif (SCTP_CID_ABORT = ch->type)\n" + " \t\tif (SCTP_CID_ABORT == ch->type)\n" " \t\t\treturn sctp_sf_pdiscard(ep, asoc, type, arg, commands);\n" " \n" "+\t\t/* RFC 8.4, 7) If the packet contains a \"Stale cookie\" ERROR\n" @@ -80,12 +80,12 @@ "+\t\t * discarded.\n" "+\t\t */\n" "+\n" - "+\t\tif (SCTP_CID_COOKIE_ACK = ch->type)\n" + "+\t\tif (SCTP_CID_COOKIE_ACK == ch->type)\n" "+\t\t\tootb_cookie_ack = 1;\n" "+\n" - "+\t\tif (SCTP_CID_ERROR = ch->type) {\n" + "+\t\tif (SCTP_CID_ERROR == ch->type) {\n" "+\t\t\tsctp_walk_errors(err, ch) {\n" - "+\t\t\t\tif (SCTP_ERROR_STALE_COOKIE = err->cause) {\n" + "+\t\t\t\tif (SCTP_ERROR_STALE_COOKIE == err->cause) {\n" "+\t\t\t\t\tootb_cookie_ack = 1;\n" "+\t\t\t\t\tbreak;\n" "+\t\t\t\t}\n" @@ -107,4 +107,4 @@ "-- \n" 1.6.5.2 -9cfcc5bed6c5585fa54d4ad34bd23416a8f3e4d2f47984aa3bc24e25fd7c659c +8811182a798706e73fdd687edbc94080f5570a8ed937e83adb98679a318a55ee
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.