chiark
/
gitweb
/
~ian
/
inn-innduct.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
66b5a94
)
break out allow_connect_start
author
Ian Jackson
<ian@liberator.(none)>
Mon, 26 Apr 2010 09:33:40 +0000
(10:33 +0100)
committer
Ian Jackson
<ian@liberator.(none)>
Mon, 26 Apr 2010 09:33:40 +0000
(10:33 +0100)
backends/innduct.c
patch
|
blob
|
history
diff --git
a/backends/innduct.c
b/backends/innduct.c
index 018d6bca9adfdba6d6bf37b2501365d8f9218612..0e0b0edeeca2c01b11a820a2b977b3ae56b9b077 100644
(file)
--- a/
backends/innduct.c
+++ b/
backends/innduct.c
@@
-738,6
+738,12
@@
static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
connect_attempt_discard();
}
connect_attempt_discard();
}
+static int allow_connect_start(void) {
+ return conns.count < max_connections
+ && !connecting_child
+ && !until_connect;
+}
+
static void connect_start(void) {
assert(!connecting_sockets[0]);
assert(!connecting_sockets[1]);
static void connect_start(void) {
assert(!connecting_sockets[0]);
assert(!connecting_sockets[1]);
@@
-861,8
+867,7
@@
static void check_master_queue(void) {
spare--;
}
conn_maybe_write(use);
spare--;
}
conn_maybe_write(use);
- } else if (conns.count < max_connections &&
- !connecting_child && !until_connect) {
+ } else if (allow_connect_start()) {
until_connect= reconnect_delay_periods;
connect_start();
break;
until_connect= reconnect_delay_periods;
connect_start();
break;