diff for duplicates of <20080828214725.GU9193@ghostprotocols.net> diff --git a/a/1.txt b/N1/1.txt index 52732ec..1e1ed71 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Em Thu, Aug 28, 2008 at 07:44:51PM +0200, Gerrit Renker escreveu: > +{ > + struct ccid *ccid = rx ? dp->dccps_hc_rx_ccid : dp->dccps_hc_tx_ccid; > + -> + if (ccid = NULL || ccid->ccid_ops = NULL) +> + if (ccid == NULL || ccid->ccid_ops == NULL) > + return -1; > + return ccid->ccid_ops->ccid_id; > +} @@ -44,8 +44,8 @@ Em Thu, Aug 28, 2008 at 07:44:51PM +0200, Gerrit Renker escreveu: > - const struct ccid3_hc_tx_sock *hctx; > + struct ccid3_hc_tx_sock *hctx = NULL; > -> - if (dmsk->dccpms_tx_ccid = DCCPC_CCID3) -> + if (ccid_get_current_id(dccp_sk(sk), false) = DCCPC_CCID3) +> - if (dmsk->dccpms_tx_ccid == DCCPC_CCID3) +> + if (ccid_get_current_id(dccp_sk(sk), false) == DCCPC_CCID3) The use of boolean here also hurts the brain, I guess we could have ccid_get_current_rx_id or something along these lines? @@ -54,8 +54,8 @@ ccid_get_current_rx_id or something along these lines? > - else > - hctx = NULL; > -> if (port = 0 || ntohs(inet->dport) = port || -> ntohs(inet->sport) = port) { +> if (port == 0 || ntohs(inet->dport) == port || +> ntohs(inet->sport) == port) { > --- a/net/dccp/proto.c > +++ b/net/dccp/proto.c > @@ -664,6 +664,12 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname, @@ -64,7 +64,7 @@ ccid_get_current_rx_id or something along these lines? > return ccid_getsockopt_builtin_ccids(sk, len, optval, optlen); > + case DCCP_SOCKOPT_TX_CCID: > + case DCCP_SOCKOPT_RX_CCID: -> + val = ccid_get_current_id(dp, optname = DCCP_SOCKOPT_RX_CCID); +> + val = ccid_get_current_id(dp, optname == DCCP_SOCKOPT_RX_CCID); > + if (val < 0) > + return -ENOPROTOOPT; > + break; diff --git a/a/content_digest b/N1/content_digest index 2a2b590..e8e73df 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,19 @@ + "ref\01219945512-7723-8-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-9-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-10-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-11-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-12-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-13-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-14-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-15-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-16-git-send-email-gerrit@erg.abdn.ac.uk\0" "ref\01219945512-7723-17-git-send-email-gerrit@erg.abdn.ac.uk\0" "From\0Arnaldo Carvalho de Melo <acme@redhat.com>\0" "Subject\0Re: [PATCH 16/37] dccp: API to query the current TX/RX CCID\0" - "Date\0Thu, 28 Aug 2008 21:47:25 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Thu, 28 Aug 2008 18:47:25 -0300\0" + "To\0Gerrit Renker <gerrit@erg.abdn.ac.uk>\0" + "Cc\0dccp@vger.kernel.org" + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" "Em Thu, Aug 28, 2008 at 07:44:51PM +0200, Gerrit Renker escreveu:\n" @@ -32,7 +43,7 @@ "> +{\n" "> +\tstruct ccid *ccid = rx ? dp->dccps_hc_rx_ccid : dp->dccps_hc_tx_ccid;\n" "> +\n" - "> +\tif (ccid = NULL || ccid->ccid_ops = NULL)\n" + "> +\tif (ccid == NULL || ccid->ccid_ops == NULL)\n" "> +\t\treturn -1;\n" "> +\treturn ccid->ccid_ops->ccid_id;\n" "> +}\n" @@ -51,8 +62,8 @@ "> -\tconst struct ccid3_hc_tx_sock *hctx;\n" "> +\tstruct ccid3_hc_tx_sock *hctx = NULL;\n" "> \n" - "> -\tif (dmsk->dccpms_tx_ccid = DCCPC_CCID3)\n" - "> +\tif (ccid_get_current_id(dccp_sk(sk), false) = DCCPC_CCID3)\n" + "> -\tif (dmsk->dccpms_tx_ccid == DCCPC_CCID3)\n" + "> +\tif (ccid_get_current_id(dccp_sk(sk), false) == DCCPC_CCID3)\n" "\n" "The use of boolean here also hurts the brain, I guess we could have\n" "ccid_get_current_rx_id or something along these lines?\n" @@ -61,8 +72,8 @@ "> -\telse\n" "> -\t\thctx = NULL;\n" "> \n" - "> \tif (port = 0 || ntohs(inet->dport) = port ||\n" - "> \t ntohs(inet->sport) = port) {\n" + "> \tif (port == 0 || ntohs(inet->dport) == port ||\n" + "> \t ntohs(inet->sport) == port) {\n" "> --- a/net/dccp/proto.c\n" "> +++ b/net/dccp/proto.c\n" "> @@ -664,6 +664,12 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname,\n" @@ -71,7 +82,7 @@ "> \t\treturn ccid_getsockopt_builtin_ccids(sk, len, optval, optlen);\n" "> +\tcase DCCP_SOCKOPT_TX_CCID:\n" "> +\tcase DCCP_SOCKOPT_RX_CCID:\n" - "> +\t\tval = ccid_get_current_id(dp, optname = DCCP_SOCKOPT_RX_CCID);\n" + "> +\t\tval = ccid_get_current_id(dp, optname == DCCP_SOCKOPT_RX_CCID);\n" "> +\t\tif (val < 0)\n" "> +\t\t\treturn -ENOPROTOOPT;\n" "> +\t\tbreak;\n" @@ -86,4 +97,4 @@ "> the body of a message to majordomo@vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -c38bf5eb5150a7c2f6b26d3668d84beab72fc79b23b6334be993889a61c58b9d +e6ab72e00f4a87ab9730035881417fcaf24597f3e466a49c86a3ea08dbf0e7d3
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.