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

Extend net_sendbuffer by adding a LINEBUF_REC member and a net_sendbuffer_receive_line

Browse source 
function to read linewise from the associated io channel.
Rewrite irc/dcc/proxy read logic on top of it.


git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4841 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-05-22 22:38:29 +00:00 • committed by exg
commit f053542dcf
12 changed files with 33 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -334,7 +334,7 @@ static void sig_server_quit(IRC_SERVER_REC *server, const char *msg)
char *str;
if (!IS_IRC_SERVER(server) || server->handle == NULL ||
server->buffer == NULL)
server->handle->readbuffer == NULL)
return;
str = g_strdup_printf("QUIT :%s", msg);

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

@ -22,7 +22,6 @@
#include "modules.h"
#include "network.h"
#include "net-sendbuffer.h"
#include "line-split.h"
#include "rawlog.h"
#include "misc.h"
@ -326,28 +325,6 @@ static void irc_server_event(IRC_SERVER_REC *server, const char *line,
g_free(recoded_nick);
}
/* Read line from server */
static int irc_receive_line(SERVER_REC *server, char **str, int read_socket)
{
char tmpbuf[512];
int recvlen, ret;
g_return_val_if_fail(server != NULL, -1);
g_return_val_if_fail(str != NULL, -1);
recvlen = !read_socket ? 0 :
net_receive(net_sendbuffer_handle(server->handle),
tmpbuf, sizeof(tmpbuf));
ret = line_split(tmpbuf, recvlen, str, &server->buffer);
if (ret == -1) {
/* connection lost */
server->connection_lost = TRUE;
server_disconnect(server);
}
return ret;
}
static char *irc_parse_prefix(char *line, char **nick, char **address)
{
char *p;
@ -403,6 +380,7 @@ static void irc_parse_incoming(SERVER_REC *server)
{
char *str;
int count;
int ret;
g_return_if_fail(server != NULL);
@ -412,7 +390,7 @@ static void irc_parse_incoming(SERVER_REC *server)
count = 0;
server_ref(server);
while (!server->disconnected &&
irc_receive_line(server, &str, count < MAX_SOCKET_READS) > 0) {
(ret = net_sendbuffer_receive_line(server->handle, &str, count < MAX_SOCKET_READS)) > 0) {
rawlog_input(server->rawlog, str);
signal_emit_id(signal_server_incoming, 2, server, str);
@ -421,6 +399,11 @@ static void irc_parse_incoming(SERVER_REC *server)
count++;
}
if (ret == -1) {
/* connection lost */
server->connection_lost = TRUE;
server_disconnect(server);
}
server_unref(server);
}