|
 |
362730 |
From 5dc2d2261224c9533d2b5ec4df6ed822de4cfc3b Mon Sep 17 00:00:00 2001
|
|
|
362730 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
362730 |
Date: Thu, 4 Feb 2021 17:57:06 +0000
|
|
|
362730 |
Subject: [PATCH] generator: Refactor CONNECT.START state.
|
|
|
362730 |
|
|
|
362730 |
Small, neutral refactoring to the CONNECT.START to make the subsequent
|
|
|
362730 |
commit easier.
|
|
|
362730 |
|
|
|
362730 |
(cherry picked from commit cd231fd94bbfaacdd9b89e7d355ba2bbc83c2aeb)
|
|
|
362730 |
---
|
|
|
362730 |
generator/states-connect.c | 21 ++++++++++-----------
|
|
|
362730 |
1 file changed, 10 insertions(+), 11 deletions(-)
|
|
|
362730 |
|
|
|
362730 |
diff --git a/generator/states-connect.c b/generator/states-connect.c
|
|
|
362730 |
index 392879d..03b34c7 100644
|
|
|
362730 |
--- a/generator/states-connect.c
|
|
|
362730 |
+++ b/generator/states-connect.c
|
|
|
362730 |
@@ -47,11 +47,12 @@ disable_nagle (int sock)
|
|
|
362730 |
|
|
|
362730 |
STATE_MACHINE {
|
|
|
362730 |
CONNECT.START:
|
|
|
362730 |
- int fd;
|
|
|
362730 |
+ sa_family_t family;
|
|
|
362730 |
+ int fd, r;
|
|
|
362730 |
|
|
|
362730 |
assert (!h->sock);
|
|
|
362730 |
- fd = socket (h->connaddr.ss_family,
|
|
|
362730 |
- SOCK_STREAM|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
|
|
|
362730 |
+ family = h->connaddr.ss_family;
|
|
|
362730 |
+ fd = socket (family, SOCK_STREAM|SOCK_NONBLOCK|SOCK_CLOEXEC, 0);
|
|
|
362730 |
if (fd == -1) {
|
|
|
362730 |
SET_NEXT_STATE (%.DEAD);
|
|
|
362730 |
set_error (errno, "socket");
|
|
|
362730 |
@@ -65,14 +66,12 @@ STATE_MACHINE {
|
|
|
362730 |
|
|
|
362730 |
disable_nagle (fd);
|
|
|
362730 |
|
|
|
362730 |
- if (connect (fd, (struct sockaddr *) &h->connaddr,
|
|
|
362730 |
- h->connaddrlen) == -1) {
|
|
|
362730 |
- if (errno != EINPROGRESS) {
|
|
|
362730 |
- SET_NEXT_STATE (%.DEAD);
|
|
|
362730 |
- set_error (errno, "connect");
|
|
|
362730 |
- return 0;
|
|
|
362730 |
- }
|
|
|
362730 |
- }
|
|
|
362730 |
+ r = connect (fd, (struct sockaddr *) &h->connaddr, h->connaddrlen);
|
|
|
362730 |
+ if (r == 0 || (r == -1 && errno == EINPROGRESS))
|
|
|
362730 |
+ return 0;
|
|
|
362730 |
+ assert (r == -1);
|
|
|
362730 |
+ SET_NEXT_STATE (%.DEAD);
|
|
|
362730 |
+ set_error (errno, "connect");
|
|
|
362730 |
return 0;
|
|
|
362730 |
|
|
|
362730 |
CONNECT.CONNECTING:
|
|
|
362730 |
--
|
|
|
362730 |
2.18.4
|
|
|
362730 |
|