From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Newsgroups: gmane.emacs.bugs Subject: bug#49449: 28: TLS connection never gets to "open" stage Date: Sun, 11 Jul 2021 16:26:47 +0200 Message-ID: References: <87lf6h3nj0.fsf@gnus.org> <22155A42-4A01-4EF1-80BC-B9CDE31ED0B1@acm.org> <87o8bdt180.fsf@gnus.org> <875yxip21h.fsf@gnus.org> <875yxinm2e.fsf@gnus.org> <83sg0matjg.fsf@gnu.org> <6FC06816-48AF-4853-92A9-B0E6BA424533@acm.org> <83pmvqarua.fsf@gnu.org> <580679E8-B94D-4B46-A0CB-CA52B9D535EB@acm.org> <83fswlbb1c.fsf@gnu.org> <23DD5CB6-5035-4C19-91B8-548F0B47E9FC@acm.org> <83eec5b1jb.fsf@gnu.org> Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.21\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_293D64E2-B1D3-4EF2-A3A0-4BB6EF5FC322" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38527"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 49449@debbugs.gnu.org, larsi@gnus.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jul 11 16:27:17 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m2aQO-0009qL-GY for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 11 Jul 2021 16:27:16 +0200 Original-Received: from localhost ([::1]:39282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2aQN-000624-IS for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 11 Jul 2021 10:27:15 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2aQA-00061U-9H for bug-gnu-emacs@gnu.org; Sun, 11 Jul 2021 10:27:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2aQA-0002GA-1w for bug-gnu-emacs@gnu.org; Sun, 11 Jul 2021 10:27:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2aQ9-0002nA-Vp for bug-gnu-emacs@gnu.org; Sun, 11 Jul 2021 10:27:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 11 Jul 2021 14:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49449 X-GNU-PR-Package: emacs Original-Received: via spool by 49449-submit@debbugs.gnu.org id=B49449.162601362110727 (code B ref 49449); Sun, 11 Jul 2021 14:27:01 +0000 Original-Received: (at 49449) by debbugs.gnu.org; 11 Jul 2021 14:27:01 +0000 Original-Received: from localhost ([127.0.0.1]:35569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2aQ9-0002mu-4q for submit@debbugs.gnu.org; Sun, 11 Jul 2021 10:27:01 -0400 Original-Received: from mail1454c50.megamailservers.eu ([91.136.14.54]:34776 helo=mail266c50.megamailservers.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2aQ6-0002md-0n for 49449@debbugs.gnu.org; Sun, 11 Jul 2021 10:27:00 -0400 X-Authenticated-User: mattiase@bredband.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1626013611; bh=VFK3YKhnY1tCrOTUaEIvYxvMchAc/E5IxtyBleRrsvM=; h=From:Subject:Date:In-Reply-To:Cc:To:References:From; b=omN5EP1Q/SZHE/aQEhD6QovQ0SWkPjeys0g6qKLQvBqzQA79ld2q9InZqp0dm8Am6 tySDquOUCJN4ceQ5HbC2q6fRGahF8/vbZBxfjn7Uy7VlJFJhTx/AM6NZgDCSeLkuqF cPIXeoBaYXPodShm3w4pJwXLvVSr+H5Hs2pUIOA4= Feedback-ID: mattiase@acm.or Original-Received: from stanniol.lan (c-b952e353.032-75-73746f71.bbcust.telenor.se [83.227.82.185]) (authenticated bits=0) by mail266c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id 16BEQla6011136; Sun, 11 Jul 2021 14:26:49 +0000 In-Reply-To: <83eec5b1jb.fsf@gnu.org> X-Mailer: Apple Mail (2.3445.104.21) X-CTCH-RefID: str=0001.0A742F1F.60EAFFAA.003B, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=UeYvt5aN c=1 sm=1 tr=0 a=von4qPfY+hyqc0zmWf0tYQ==:117 a=von4qPfY+hyqc0zmWf0tYQ==:17 a=M51BFTxLslgA:10 a=mDV3o1hIAAAA:8 a=X3mAVjWym6pNYM5EMsoA:9 a=CjuIK1q_8ugA:10 a=uBNzgUUHY_ASnSHALLsA:9 a=De_Ol2h6w80A:10 a=4tezseTTOqZLjFF550sA:9 a=_FVE-zBwftR9WsbkzFJk:22 X-Origin-Country: SE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:209798 Archived-At: --Apple-Mail=_293D64E2-B1D3-4EF2-A3A0-4BB6EF5FC322 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii 11 juli 2021 kl. 12.14 skrev Eli Zaretskii : > Did you succeed in understanding what else has to happen before that > flag could be safely reset? Yes. The TCP connection needs to be established, the socket descriptor = removed from write monitoring (because it is now connected) and added to = read monitoring (so that we can get incoming traffic). This suggests a second solution: remove the condition on line 3277 on = the grounds that since the TLS handshake succeeded, we are evidently = connected; then remove the write monitoring and add the read monitoring = before calling the sentinel: --Apple-Mail=_293D64E2-B1D3-4EF2-A3A0-4BB6EF5FC322 Content-Disposition: attachment; filename=alt.diff Content-Type: application/octet-stream; x-unix-mode=0644; name="alt.diff" Content-Transfer-Encoding: 7bit diff --git a/src/process.c b/src/process.c index b8c3e4ecfb..7d2a9e9a62 100644 --- a/src/process.c +++ b/src/process.c @@ -3274,8 +3274,13 @@ finish_after_tls_connection (Lisp_Object proc) pset_status (p, Qfailed); deactivate_process (proc); } - else if ((fd_callback_info[p->outfd].flags & NON_BLOCKING_CONNECT_FD) == 0) + else { + delete_write_fd (p->outfd); + + if (0 <= p->infd && !EQ (p->filter, Qt) && !EQ (p->command, Qt)) + add_process_read_fd (p->infd); + /* If we cleared the connection wait mask before we did the TLS setup, then we have to say that the process is finally "open" here. */ --Apple-Mail=_293D64E2-B1D3-4EF2-A3A0-4BB6EF5FC322 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > And anyway, if those conditions are not yet set, I wonder why are we > calling finish_after_tls_connection at that place? There's no harm in calling `gnutls_handshake`; it will just return = E_AGAIN if the connection hasn't been established. On the other hand = there's little point in doing so until we have a connection. Which suggests a third solution: do the handshake right away after = establishing the connection. That would go into the code somewhere = before line 5900, which right now is a condition that I don't quite = understand. I think Lars wrote it but apparently forgot all about it = (happens to everyone once in a while). I still favour the less intrusive patch posted previously (adding a = condition at line 5235) since it avoids duplication; there is already = far too much of that in the code (everything seems to be done in at = least two places). The code is obviously in the need of restructuring, = but we shouldn't conflate that effort with fixing this specific bug. --Apple-Mail=_293D64E2-B1D3-4EF2-A3A0-4BB6EF5FC322--