zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 10:02:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3c1fcf1ad1 into c890ecafa0

Browse source
This commit is contained in:
Michael Stapelberg 2017-04-16 19:29:08 +00:00 • committed by GitHub
commit da63b5f370
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/server-rec.h
View file

@ -71,5 +71,6 @@ QUERY_REC *(*query_find_func)(SERVER_REC *server, const char *nick);
int (*mask_match_func)(const char *mask, const char *data); int (*mask_match_func)(const char *mask, const char *data);
/* returns true if `msg' was meant for `nick' */ /* returns true if `msg' was meant for `nick' */
int (*nick_match_msg)(const char *nick, const char *msg); int (*nick_match_msg)(const char *nick, const char *msg);
void (*send_data_func)(SERVER_REC *server, const char *data, int len);
#undef STRUCT_SERVER_CONNECT_REC #undef STRUCT_SERVER_CONNECT_REC

5
src/irc/core/irc-servers.c
View file

@ -521,6 +521,11 @@ void irc_server_send_away(IRC_SERVER_REC *server, const char *reason)
void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len) void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len)
{ {
if (server->send_data_func != NULL) {
server->send_data_func(server, data, len);
return;
}
if (net_sendbuffer_send(server->handle, data, len) == -1) { if (net_sendbuffer_send(server->handle, data, len) == -1) {
/* something bad happened */ /* something bad happened */
server->connection_lost = TRUE; server->connection_lost = TRUE;

9
src/irc/core/irc.c
View file

@ -402,10 +402,11 @@ static void irc_init_server(IRC_SERVER_REC *server)
if (!IS_IRC_SERVER(server)) if (!IS_IRC_SERVER(server))
return; return;
server->readtag = if (server->handle)
g_input_add(net_sendbuffer_handle(server->handle), server->readtag =
G_INPUT_READ, g_input_add(net_sendbuffer_handle(server->handle),
(GInputFunction) irc_parse_incoming, server); G_INPUT_READ,
(GInputFunction) irc_parse_incoming, server);
} }
void irc_irc_init(void) void irc_irc_init(void)