Changeset 3596dc15e229f7b814203e71305d82868dac6c05

Timestamp:

04/27/08 01:45:05 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1209260705 +0000

git-parent:

[45cee6d38af0fe7cb5349d7fefc6d964368b6ad4]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1209260705 +0000

Message:

timeout in initial connect needs to cleanup socket based on synch_fd_event, not the subject of the callback

Files:

• src/modules/ssh2.c (modified) (2 diffs)

src/modules/ssh2.c

@@ -173 +173 @@
-static int ssh2_connect_timeout(eventer_t e, int mask, void *closure,
-                                struct timeval *now) {
+  eventer_t fde;
-  ssh2_check_info_t *ci = closure;
-  noit_check_t *check = ci->check;
@@ -178 +179 @@
-  ci->timeout_event = NULL; /* This is us, return 0 will free this */
-  ci->error = strdup("ssh connect timeout");
+  if(ci->synch_fd_event) {
+    fde = ci->synch_fd_event;
+    eventer_remove_fd(fde->fd);
+    fde->opset->close(fde->fd, &mask, fde);
+    eventer_free(fde);
+     ci->synch_fd_event = NULL;
+  }
-  ssh2_log_results(ci->self, ci->check);
-  ssh2_cleanup(ci->self, ci->check);
-  eventer_remove_fd(e->fd);
-  e->opset->close(e->fd, &mask, e);
-  check->flags &= ~NP_RUNNING;
-  return 0;