diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2012-03-23 18:24:47 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2012-03-23 18:24:47 +0100 |
| commit | 9972cce777852c59c4ba3226d52cec83565b1dd9 (patch) | |
| tree | ca8e8e67885269a9610fe2eb7d8b508b33a6cfea /src/core/wee-hook.c | |
| parent | 4474f9ca0e7d0eca0edfeae6310594b2436a1b03 (diff) | |
| download | weechat-9972cce777852c59c4ba3226d52cec83565b1dd9.zip | |
core: add a connection timeout for child process in hook_connect (bug #35966)
Diffstat (limited to 'src/core/wee-hook.c')
| -rw-r--r-- | src/core/wee-hook.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c index 9ad507526..caedf6068 100644 --- a/src/core/wee-hook.c +++ b/src/core/wee-hook.c @@ -1763,6 +1763,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy, new_hook_connect->child_read = -1; new_hook_connect->child_write = -1; new_hook_connect->child_pid = 0; + new_hook_connect->hook_child_timer = NULL; new_hook_connect->hook_fd = NULL; new_hook_connect->handshake_hook_fd = NULL; new_hook_connect->handshake_hook_timer = NULL; @@ -3128,6 +3129,8 @@ unhook (struct t_hook *hook) #endif if (HOOK_CONNECT(hook, local_hostname)) free (HOOK_CONNECT(hook, local_hostname)); + if (HOOK_CONNECT(hook, hook_child_timer)) + unhook (HOOK_CONNECT(hook, hook_child_timer)); if (HOOK_CONNECT(hook, hook_fd)) unhook (HOOK_CONNECT(hook, hook_fd)); if (HOOK_CONNECT(hook, handshake_hook_fd)) @@ -3471,6 +3474,8 @@ hook_add_to_infolist_type (struct t_infolist *infolist, int type, return 0; if (!infolist_new_var_integer (ptr_item, "child_pid", HOOK_CONNECT(ptr_hook, child_pid))) return 0; + if (!infolist_new_var_pointer (ptr_item, "hook_child_timer", HOOK_CONNECT(ptr_hook, hook_child_timer))) + return 0; if (!infolist_new_var_pointer (ptr_item, "hook_fd", HOOK_CONNECT(ptr_hook, hook_fd))) return 0; if (!infolist_new_var_pointer (ptr_item, "handshake_hook_fd", HOOK_CONNECT(ptr_hook, handshake_hook_fd))) @@ -3870,6 +3875,7 @@ hook_print_log () log_printf (" child_read. . . . . . : %d", HOOK_CONNECT(ptr_hook, child_read)); log_printf (" child_write . . . . . : %d", HOOK_CONNECT(ptr_hook, child_write)); log_printf (" child_pid . . . . . . : %d", HOOK_CONNECT(ptr_hook, child_pid)); + log_printf (" hook_child_timer. . . : 0x%lx", HOOK_CONNECT(ptr_hook, hook_child_timer)); log_printf (" hook_fd . . . . . . . : 0x%lx", HOOK_CONNECT(ptr_hook, hook_fd)); log_printf (" handshake_hook_fd . . : 0x%lx", HOOK_CONNECT(ptr_hook, handshake_hook_fd)); log_printf (" handshake_hook_timer. : 0x%lx", HOOK_CONNECT(ptr_hook, handshake_hook_timer)); |