diff for duplicates of <48BCE45E.1080709@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 91e2c83..9471242 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,7 @@ Gerrit Renker wrote: > case DCCPO_CHANGE_L: > - /* fall through */ > case DCCPO_CHANGE_R: -> if (pkt_type = DCCP_PKT_DATA) +> if (pkt_type == DCCP_PKT_DATA) > break; > - if (len < 2) > - goto out_invalid_option; @@ -115,18 +115,18 @@ Gerrit Renker wrote: > + u8 feat, u8 *val, u8 len, const bool server) > +{ > + u8 defval, type = dccp_feat_type(feat); -> + const bool local = (opt = DCCPO_CHANGE_R); +> + const bool local = (opt == DCCPO_CHANGE_R); > + struct dccp_feat_entry *entry; > + dccp_feat_val fval; > + -> + if (len = 0 || type = FEAT_UNKNOWN) /* 6.1 and 6.6.8 */ +> + if (len == 0 || type == FEAT_UNKNOWN) /* 6.1 and 6.6.8 */ > + goto unknown_feature_or_value; > + > + /* > + * Negotiation of NN features: Change R is invalid, so there is no > + * simultaneous negotiation; hence we do not consult the list. > + */ -> + if (type = FEAT_NN) { +> + if (type == FEAT_NN) { > + if (local) > + goto not_valid_or_not_known; > @@ -157,7 +157,7 @@ Is this right? > + * Unidirectional/simultaneous negotiation of SP features (6.3.1) > + */ > + entry = dccp_feat_list_lookup(fn, feat, local); -> + if (entry = NULL) { +> + if (entry == NULL) { > + if (!dccp_feat_sp_list_ok(feat, val, len)) > + goto unknown_feature_or_value; > @@ -188,14 +188,14 @@ validity check is missing? > + } > + > + /* Treat unsupported CCIDs like invalid values */ -> + if (feat = DCCPF_CCID && !ccid_support_check(fval.sp.vec, 1)) { +> + if (feat == DCCPF_CCID && !ccid_support_check(fval.sp.vec, 1)) { > + kfree(fval.sp.vec); > + goto not_valid_or_not_known; > + } > + > + return dccp_feat_push_confirm(fn, feat, local, &fval); > + -> + } else if (entry->state = FEAT_UNSTABLE) { /* 6.6.2 */ +> + } else if (entry->state == FEAT_UNSTABLE) { /* 6.6.2 */ > + return 0; > + } > + @@ -203,7 +203,7 @@ validity check is missing? > + entry->empty_confirm = 0; > + } else if (is_mandatory) { > + return DCCP_RESET_CODE_MANDATORY_ERROR; -> + } else if (entry->state = FEAT_INITIALISING) { +> + } else if (entry->state == FEAT_INITIALISING) { > + /* > + * Failed simultaneous negotiation (server only): try to `save' > + * the connection by checking whether entry contains the default diff --git a/a/content_digest b/N1/content_digest index 57e708a..8c6859b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ + "ref\01219339188-31873-1-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219339188-31873-2-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219339188-31873-3-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219339188-31873-4-git-send-email-gerrit@erg.abdn.ac.uk\0" "ref\020080823105647.GA15928@gerrit.erg.abdn.ac.uk\0" "From\0Wei Yongjun <yjwei@cn.fujitsu.com>\0" - "Subject\0Re: v3 [PATCH 1/1] dccp: Process incoming Change feature-negotiation\0" - "Date\0Tue, 02 Sep 2008 06:59:42 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Subject\0Re: v3 [PATCH 1/1] dccp: Process incoming Change feature-negotiation options\0" + "Date\0Tue, 02 Sep 2008 14:59:42 +0800\0" + "To\0Gerrit Renker <gerrit@erg.abdn.ac.uk>" + dccp@vger.kernel.org + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" "Gerrit Renker wrote:\n" @@ -39,7 +45,7 @@ "> \t\tcase DCCPO_CHANGE_L:\n" "> -\t\t\t/* fall through */\n" "> \t\tcase DCCPO_CHANGE_R:\n" - "> \t\t\tif (pkt_type = DCCP_PKT_DATA)\n" + "> \t\t\tif (pkt_type == DCCP_PKT_DATA)\n" "> \t\t\t\tbreak;\n" "> -\t\t\tif (len < 2)\n" "> -\t\t\t\tgoto out_invalid_option;\n" @@ -122,18 +128,18 @@ "> +\t\t\t\tu8 feat, u8 *val, u8 len, const bool server)\n" "> +{\n" "> +\tu8 defval, type = dccp_feat_type(feat);\n" - "> +\tconst bool local = (opt = DCCPO_CHANGE_R);\n" + "> +\tconst bool local = (opt == DCCPO_CHANGE_R);\n" "> +\tstruct dccp_feat_entry *entry;\n" "> +\tdccp_feat_val fval;\n" "> +\n" - "> +\tif (len = 0 || type = FEAT_UNKNOWN)\t\t/* 6.1 and 6.6.8 */\n" + "> +\tif (len == 0 || type == FEAT_UNKNOWN)\t\t/* 6.1 and 6.6.8 */\n" "> +\t\tgoto unknown_feature_or_value;\n" "> +\n" "> +\t/*\n" "> +\t *\tNegotiation of NN features: Change R is invalid, so there is no\n" "> +\t *\tsimultaneous negotiation; hence we do not consult the list.\n" "> +\t */\n" - "> +\tif (type = FEAT_NN) {\n" + "> +\tif (type == FEAT_NN) {\n" "> +\t\tif (local)\n" "> +\t\t\tgoto not_valid_or_not_known;\n" "> \n" @@ -164,7 +170,7 @@ "> +\t *\tUnidirectional/simultaneous negotiation of SP features (6.3.1)\n" "> +\t */\n" "> +\tentry = dccp_feat_list_lookup(fn, feat, local);\n" - "> +\tif (entry = NULL) {\n" + "> +\tif (entry == NULL) {\n" "> +\t\tif (!dccp_feat_sp_list_ok(feat, val, len))\n" "> +\t\t\tgoto unknown_feature_or_value;\n" "> \n" @@ -195,14 +201,14 @@ "> +\t\t}\n" "> +\n" "> +\t\t/* Treat unsupported CCIDs like invalid values */\n" - "> +\t\tif (feat = DCCPF_CCID && !ccid_support_check(fval.sp.vec, 1)) {\n" + "> +\t\tif (feat == DCCPF_CCID && !ccid_support_check(fval.sp.vec, 1)) {\n" "> +\t\t\tkfree(fval.sp.vec);\n" "> +\t\t\tgoto not_valid_or_not_known;\n" "> +\t\t}\n" "> +\n" "> +\t\treturn dccp_feat_push_confirm(fn, feat, local, &fval);\n" "> +\n" - "> +\t} else if (entry->state = FEAT_UNSTABLE) {\t/* 6.6.2 */\n" + "> +\t} else if (entry->state == FEAT_UNSTABLE) {\t/* 6.6.2 */\n" "> +\t\treturn 0;\n" "> +\t}\n" "> +\n" @@ -210,7 +216,7 @@ "> +\t\tentry->empty_confirm = 0;\n" "> +\t} else if (is_mandatory) {\n" "> +\t\treturn DCCP_RESET_CODE_MANDATORY_ERROR;\n" - "> +\t} else if (entry->state = FEAT_INITIALISING) {\n" + "> +\t} else if (entry->state == FEAT_INITIALISING) {\n" "> +\t\t/*\n" "> +\t\t * Failed simultaneous negotiation (server only): try to `save'\n" "> +\t\t * the connection by checking whether entry contains the default\n" @@ -285,4 +291,4 @@ ">\n" > -65b7226cb569ab1c1b33a8b32f70c22a9106ac4b4920692e3f14364db5db7902 +a929eb8e3d29a23380628f07d688a2e11b620f0b8c2dfd2fd9a4d8df63e8e05e
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.