pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 23:36:37 +02:00
Code Activity

Fix some bugs with TLS connections in Jabber pluigin (TLS still not working in Jabber)

Browse Source
This commit is contained in:
Sebastien Helleu
2009-01-30 12:22:10 +01:00
parent 16c9217d52
commit 228ef56860
11 changed files with 118 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-server.c
+2 -2
View File
@@ -1912,7 +1912,7 @@ irc_server_connect_cb (void *arg_server, int status, const char *ip_address)
break;
case WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
weechat_printf (server->buffer,
_("%s%s: GnuTLS init error"),
_("%s%s: TLS init error"),
irc_buffer_get_server_prefix (server, "error"),
IRC_PLUGIN_NAME);
irc_server_close_connection (server);
@@ -1920,7 +1920,7 @@ irc_server_connect_cb (void *arg_server, int status, const char *ip_address)
break;
case WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
weechat_printf (server->buffer,
_("%s%s: GnuTLS handshake failed"),
_("%s%s: TLS handshake failed"),
irc_buffer_get_server_prefix (server, "error"),
IRC_PLUGIN_NAME);
irc_server_close_connection (server);
src/plugins/jabber/jabber-debug.c
+1 -1
View File
@@ -93,12 +93,12 @@ jabber_debug_printf (struct t_jabber_server *server, int send, int modified,
weechat_printf (jabber_debug_buffer,
"%s%s%s%s%s%s\t%s",
(server) ? weechat_color ("chat_server") : "",
(iks_is_secure (server->iks_parser)) ? "[S]" : "",
(server) ? server->name : "",
(server) ? " " : "",
(send) ?
weechat_color ("chat_prefix_quit") :
weechat_color ("chat_prefix_join"),
(iks_is_secure (server->iks_parser)) ? "* " : "",
(send) ?
((modified) ? JABBER_DEBUG_PREFIX_SEND_MOD : JABBER_DEBUG_PREFIX_SEND) :
((modified) ? JABBER_DEBUG_PREFIX_RECV_MOD : JABBER_DEBUG_PREFIX_RECV),
src/plugins/jabber/jabber-server.c
+35 -6
View File
@@ -1004,19 +1004,24 @@ jabber_server_iks_transport_recv (void *socket, char *buffer, size_t buf_len,
{
int sock;
fd_set fds;
struct timeval tv;
struct timeval tv, *ptr_tv;
int len;
/* make C compiler happy */
(void) timeout;
tv.tv_sec = 0;
tv.tv_usec = 0;
sock = (int) socket;
FD_ZERO (&fds);
FD_SET (sock, &fds);
if (select (sock + 1, &fds, NULL, NULL, &tv) > 0)
tv.tv_sec = timeout;
ptr_tv = (timeout != -1) ? &tv : NULL;
/* FIXME: force timeout to 1 second, otherwise WeeChat may freeze when
iksemel calls this function with -1 (for TLS connection) */
tv.tv_sec = 1;
ptr_tv = &tv;
if (select (sock + 1, &fds, NULL, NULL, ptr_tv) > 0)
{
len = recv (sock, buffer, buf_len, 0);
if (len > 0)
@@ -1578,13 +1583,37 @@ int
jabber_server_recv_cb (void *arg_server)
{
struct t_jabber_server *server;
int rc;
server = (struct t_jabber_server *)arg_server;
if (!server)
return WEECHAT_RC_ERROR;
iks_recv (server->iks_parser, 0);
rc = iks_recv (server->iks_parser, 1);
if (rc == IKS_NET_TLSFAIL)
{
weechat_printf (server->buffer,
_("%s%s: TLS handshake failed"),
jabber_buffer_get_server_prefix (server,
"error"),
JABBER_PLUGIN_NAME);
jabber_server_disconnect (server, 0);
return WEECHAT_RC_ERROR;
}
if ((rc != IKS_OK) && (rc != IKS_HOOK))
{
weechat_printf (server->buffer,
_("%s%s: I/O error (%d)"),
jabber_buffer_get_server_prefix (server,
"error"),
JABBER_PLUGIN_NAME,
rc);
jabber_server_disconnect (server, 0);
return WEECHAT_RC_ERROR;
}
return WEECHAT_RC_OK;
}
src/plugins/jabber/jabber-xmpp.c
-1
View File
@@ -274,7 +274,6 @@ jabber_xmpp_iks_stream_hook (void *user_data, int type, iks *node)
jabber_buffer_get_server_prefix (server,
"error"),
JABBER_PLUGIN_NAME);
jabber_server_disconnect (server, 0);
}
else if (strcmp ("success", iks_name (node)) == 0)