aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Lots of DCC related fixes.

Browse Source 
Added command_bind_first() and command_bind_last() functions.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@285 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-06-04 01:36:07 +00:00 committed by cras
parent 841736a7d3
commit 35fab0c9ef
13 changed files with 1156 additions and 1130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/commands.c
View File

@ -39,7 +39,7 @@ char *current_command;
static GSList *cmdget_funcs; static GSList *cmdget_funcs;
static int signal_default_command; static int signal_default_command;
void command_bind(const char *cmd, const char *category, SIGNAL_FUNC func) void command_bind_to(int pos, const char *cmd, const char *category, SIGNAL_FUNC func)
{ {
COMMAND_REC *rec; COMMAND_REC *rec;
char *str; char *str;
@ -53,7 +53,7 @@ void command_bind(const char *cmd, const char *category, SIGNAL_FUNC func)
if (func != NULL) { if (func != NULL) {
str = g_strconcat("command ", cmd, NULL); str = g_strconcat("command ", cmd, NULL);
signal_add(str, func); signal_add_to(MODULE_NAME, pos, str, func);
g_free(str); g_free(str);
} }

6
src/core/commands.h
View File

@ -25,7 +25,11 @@ enum {
extern GSList *commands; extern GSList *commands;
extern char *current_command; extern char *current_command;
void command_bind(const char *cmd, const char *category, SIGNAL_FUNC func); void command_bind_to(int pos, const char *cmd, const char *category, SIGNAL_FUNC func);
#define command_bind(a, b, c) command_bind_to(1, a, b, c)
#define command_bind_first(a, b, c) command_bind_to(0, a, b, c)
#define command_bind_last(a, b, c) command_bind_to(2, a, b, c)
void command_unbind(const char *cmd, SIGNAL_FUNC func); void command_unbind(const char *cmd, SIGNAL_FUNC func);
void command_runsub(const char *cmd, const char *data, void *p1, void *p2); void command_runsub(const char *cmd, const char *data, void *p1, void *p2);

257
src/fe-common/irc/dcc/fe-dcc.c
View File

@ -27,6 +27,7 @@
#include "levels.h" #include "levels.h"
#include "irc.h" #include "irc.h"
#include "channels.h" #include "channels.h"
#include "query.h"
#include "irc/dcc/dcc.h" #include "irc/dcc/dcc.h"
@ -35,26 +36,25 @@
static void dcc_connected(DCC_REC *dcc) static void dcc_connected(DCC_REC *dcc)
{ {
gchar *str; char *sender;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
switch (dcc->dcc_type) switch (dcc->type) {
{
case DCC_TYPE_CHAT: case DCC_TYPE_CHAT:
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CHAT_CONNECTED, sender = g_strconcat("=", dcc->nick, NULL);
printformat(dcc->server, sender, MSGLEVEL_DCC, IRCTXT_DCC_CHAT_CONNECTED,
dcc->nick, dcc->addrstr, dcc->port); dcc->nick, dcc->addrstr, dcc->port);
if (query_find(NULL, sender) == NULL)
str = g_strconcat("=", dcc->nick, NULL); query_create(dcc->server, sender, TRUE);
/*FIXME: dcc_chat_create(dcc->server, str, FALSE);*/ g_free(sender);
g_free(str);
break; break;
case DCC_TYPE_SEND: case DCC_TYPE_SEND:
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_CONNECTED, printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND_CONNECTED,
dcc->arg, dcc->nick, dcc->addrstr, dcc->port); dcc->arg, dcc->nick, dcc->addrstr, dcc->port);
break; break;
case DCC_TYPE_GET: case DCC_TYPE_GET:
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_CONNECTED, printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_GET_CONNECTED,
dcc->arg, dcc->nick, dcc->addrstr, dcc->port); dcc->arg, dcc->nick, dcc->addrstr, dcc->port);
break; break;
} }
@ -64,72 +64,54 @@ static void dcc_rejected(DCC_REC *dcc)
{ {
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CLOSE, printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_CLOSE,
dcc_type2str(dcc->dcc_type), dcc->nick, dcc->arg); dcc_type2str(dcc->type), dcc->nick, dcc->arg);
} }
static void dcc_closed(DCC_REC *dcc) static void dcc_closed(DCC_REC *dcc)
{ {
char *sender;
double kbs;
time_t secs; time_t secs;
gdouble kbs;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
secs = dcc->starttime == 0 ? -1 : time(NULL)-dcc->starttime; secs = dcc->starttime == 0 ? -1 : time(NULL)-dcc->starttime;
kbs = (gdouble) (dcc->transfd-dcc->skipped) / (secs == 0 ? 1 : secs) / 1024.0; kbs = (double) (dcc->transfd-dcc->skipped) / (secs == 0 ? 1 : secs) / 1024.0;
switch (dcc->dcc_type) switch (dcc->type) {
{
case DCC_TYPE_CHAT: case DCC_TYPE_CHAT:
{ sender = g_strconcat("=", dcc->nick, NULL);
/* nice kludge :) if connection was lost, close the channel. printformat(dcc->server, sender, MSGLEVEL_DCC,
after closed channel (can be done with /unquery too)
prints the disconnected-text.. */
CHANNEL_REC *channel;
gchar *str;
str = g_strdup_printf("=%s", dcc->nick);
printformat(dcc->server, str, MSGLEVEL_DCC,
IRCTXT_DCC_CHAT_DISCONNECTED, dcc->nick); IRCTXT_DCC_CHAT_DISCONNECTED, dcc->nick);
g_free(sender);
channel = channel_find(dcc->server, str);
if (channel != NULL)
channel_destroy(channel);
g_free(str);
}
break; break;
case DCC_TYPE_SEND: case DCC_TYPE_SEND:
if (secs == -1) if (secs == -1) {
{
/* aborted */ /* aborted */
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_ABORTED, printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND_ABORTED,
dcc->arg, dcc->nick); dcc->arg, dcc->nick);
} } else {
else printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND_COMPLETE,
{ dcc->arg, dcc->transfd/1024, dcc->nick, (long) secs, kbs);
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_COMPLETE,
dcc->arg, dcc->transfd/1024, dcc->nick, (glong) secs, kbs);
} }
break; break;
case DCC_TYPE_GET: case DCC_TYPE_GET:
if (secs == -1) if (secs == -1) {
{
/* aborted */ /* aborted */
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_ABORTED, printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_GET_ABORTED,
dcc->arg, dcc->nick); dcc->arg, dcc->nick);
} } else {
else printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_GET_COMPLETE,
{ dcc->arg, dcc->transfd/1024, dcc->nick, (long) secs, kbs);
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_COMPLETE,
dcc->arg, dcc->transfd/1024, dcc->nick, (glong) secs, kbs);
} }
break; break;
} }
} }
static void dcc_chat_in_action(gchar *msg, DCC_REC *dcc) static void dcc_chat_action(const char *msg, DCC_REC *dcc)
{ {
gchar *sender; char *sender;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
g_return_if_fail(msg != NULL); g_return_if_fail(msg != NULL);
@ -140,9 +122,9 @@ static void dcc_chat_in_action(gchar *msg, DCC_REC *dcc)
g_free(sender); g_free(sender);
} }
static void dcc_chat_ctcp(gchar *msg, DCC_REC *dcc) static void dcc_chat_ctcp(const char *msg, DCC_REC *dcc)
{ {
gchar *sender; char *sender;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
g_return_if_fail(msg != NULL); g_return_if_fail(msg != NULL);
@ -152,30 +134,31 @@ static void dcc_chat_ctcp(gchar *msg, DCC_REC *dcc)
g_free(sender); g_free(sender);
} }
static void dcc_chat_msg(DCC_REC *dcc, gchar *msg) static void dcc_chat_msg(DCC_REC *dcc, const char *msg)
{ {
gchar *nick; char *sender;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
g_return_if_fail(msg != NULL); g_return_if_fail(msg != NULL);
nick = g_strconcat("=", dcc->nick, NULL); sender = g_strconcat("=", dcc->nick, NULL);
printformat(NULL, nick, MSGLEVEL_DCC, IRCTXT_DCC_MSG, dcc->nick, msg); printformat(NULL, sender, MSGLEVEL_DCC,
g_free(nick); query_find(NULL, sender) ? IRCTXT_DCC_MSG_QUERY :
IRCTXT_DCC_MSG, dcc->nick, msg);
g_free(sender);
} }
static void dcc_request(DCC_REC *dcc) static void dcc_request(DCC_REC *dcc)
{ {
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
switch (dcc->dcc_type) switch (dcc->type) {
{
case DCC_TYPE_CHAT: case DCC_TYPE_CHAT:
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CHAT, printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_CHAT,
dcc->nick, dcc->addrstr, dcc->port); dcc->nick, dcc->addrstr, dcc->port);
break; break;
case DCC_TYPE_GET: case DCC_TYPE_GET:
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND, printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND,
dcc->nick, dcc->addrstr, dcc->port, dcc->arg, dcc->size); dcc->nick, dcc->addrstr, dcc->port, dcc->arg, dcc->size);
break; break;
} }
@ -185,17 +168,17 @@ static void dcc_error_connect(DCC_REC *dcc)
{ {
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CONNECT_ERROR, dcc->addrstr, dcc->port); printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_CONNECT_ERROR, dcc->addrstr, dcc->port);
} }
static void dcc_error_file_create(DCC_REC *dcc, gchar *fname) static void dcc_error_file_create(DCC_REC *dcc, const char *fname)
{ {
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CANT_CREATE, fname); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CANT_CREATE, fname);
} }
static void dcc_error_file_not_found(gchar *nick, gchar *fname) static void dcc_error_file_not_found(const char *nick, const char *fname)
{ {
g_return_if_fail(nick != NULL); g_return_if_fail(nick != NULL);
g_return_if_fail(fname != NULL); g_return_if_fail(fname != NULL);
@ -203,14 +186,14 @@ static void dcc_error_file_not_found(gchar *nick, gchar *fname)
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_FILE_NOT_FOUND, fname); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_FILE_NOT_FOUND, fname);
} }
static void dcc_error_get_not_found(gchar *nick) static void dcc_error_get_not_found(const char *nick)
{ {
g_return_if_fail(nick != NULL); g_return_if_fail(nick != NULL);
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_NOT_FOUND, nick); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_NOT_FOUND, nick);
} }
static void dcc_error_send_exists(gchar *nick, gchar *fname) static void dcc_error_send_exists(const char *nick, const char *fname)
{ {
g_return_if_fail(nick != NULL); g_return_if_fail(nick != NULL);
g_return_if_fail(fname != NULL); g_return_if_fail(fname != NULL);
@ -218,22 +201,21 @@ static void dcc_error_send_exists(gchar *nick, gchar *fname)
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_EXISTS, fname, nick); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_EXISTS, fname, nick);
} }
static void dcc_error_unknown_type(gchar *type) static void dcc_error_unknown_type(const char *type)
{ {
g_return_if_fail(type != NULL); g_return_if_fail(type != NULL);
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_UNKNOWN_TYPE, type); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_UNKNOWN_TYPE, type);
} }
static void dcc_error_close_not_found(gchar *type, gchar *nick, gchar *fname) static void dcc_error_close_not_found(const char *type, const char *nick, const char *fname)
{ {
g_return_if_fail(type != NULL); g_return_if_fail(type != NULL);
g_return_if_fail(nick != NULL); g_return_if_fail(nick != NULL);
g_return_if_fail(fname != NULL); g_return_if_fail(fname != NULL);
if (fname == '\0') fname = "(ANY)"; if (fname == '\0') fname = "(ANY)";
switch (dcc_str2type(type)) switch (dcc_str2type(type)) {
{
case DCC_TYPE_CHAT: case DCC_TYPE_CHAT:
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CHAT_NOT_FOUND, nick); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CHAT_NOT_FOUND, nick);
break; break;
@ -246,9 +228,9 @@ static void dcc_error_close_not_found(gchar *type, gchar *nick, gchar *fname)
} }
} }
static void dcc_unknown_ctcp(gchar *data, gchar *sender) static void dcc_unknown_ctcp(const char *data, const char *sender)
{ {
gchar *params, *type, *args; char *params, *type, *args;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -257,9 +239,9 @@ static void dcc_unknown_ctcp(gchar *data, gchar *sender)
g_free(params); g_free(params);
} }
static void dcc_unknown_reply(gchar *data, gchar *sender) static void dcc_unknown_reply(const char *data, const char *sender)
{ {
gchar *params, *type, *args; char *params, *type, *args;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -268,46 +250,80 @@ static void dcc_unknown_reply(gchar *data, gchar *sender)
g_free(params); g_free(params);
} }
static void dcc_chat_write(gchar *data) static void sig_dcc_destroyed(DCC_REC *dcc)
{
QUERY_REC *query;
char *nick;
if (dcc->type != DCC_TYPE_CHAT)
return;
nick = g_strconcat("=", dcc->nick, NULL);
query = query_find(NULL, nick);
g_free(nick);
if (query != NULL) {
/* DCC chat closed, close the query with it. */
query_destroy(query);
}
}
static void sig_query_destroyed(QUERY_REC *query)
{ {
DCC_REC *dcc; DCC_REC *dcc;
gchar *params, *text, *target;
if (*query->nick != '=')
return;
dcc = dcc_find_item(DCC_TYPE_CHAT, query->nick+1, NULL);
if (dcc != NULL && !dcc->destroyed) {
/* DCC query window closed, close the dcc chat too. */
signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc);
}
}
static void cmd_msg(const char *data)
{
DCC_REC *dcc;
char *params, *text, *target;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &text); if (*data != '=') {
/* handle only DCC messages */
if (*target == '=')
{
/* dcc msg */
dcc = dcc_find_item(DCC_TYPE_CHAT, target+1, NULL);
if (dcc == NULL)
{
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
return; return;
} }
printformat(NULL, target, MSGLEVEL_DCC, IRCTXT_OWN_DCC, target+1, text); params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &text);
dcc = dcc_find_item(DCC_TYPE_CHAT, target+1, NULL);
if (dcc == NULL) {
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
} else {
printformat(NULL, target, MSGLEVEL_DCC,
query_find(NULL, target) ? IRCTXT_OWN_DCC_QUERY :
IRCTXT_OWN_DCC, dcc->mynick, text);
} }
g_free(params); g_free(params);
} }
static void dcc_chat_out_me(gchar *data, SERVER_REC *server, WI_IRC_REC *item) static void cmd_me(const char *data, SERVER_REC *server, WI_IRC_REC *item)
{ {
DCC_REC *dcc; DCC_REC *dcc;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
dcc = irc_item_dcc_chat(item); dcc = item_get_dcc(item);
if (dcc == NULL) return; if (dcc == NULL) return;
printformat(NULL, item->name, MSGLEVEL_DCC, printformat(NULL, item->name, MSGLEVEL_DCC,
IRCTXT_OWN_DCC_ME, dcc->mynick, data); IRCTXT_OWN_DCC_ME, dcc->mynick, data);
} }
static void dcc_chat_out_action(const char *data, SERVER_REC *server, WI_IRC_REC *item) static void cmd_action(const char *data, SERVER_REC *server, WI_IRC_REC *item)
{ {
char *params, *target, *text; char *params, *target, *text;
DCC_REC *dcc; DCC_REC *dcc;
@ -327,13 +343,13 @@ static void dcc_chat_out_action(const char *data, SERVER_REC *server, WI_IRC_REC
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR, printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
IRCTXT_DCC_CHAT_NOT_FOUND, target+1); IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
} else { } else {
printformat(NULL, item->name, MSGLEVEL_DCC, printformat(NULL, target, MSGLEVEL_DCC,
IRCTXT_OWN_DCC_ME, dcc->mynick, text); IRCTXT_OWN_DCC_ME, dcc->mynick, text);
} }
g_free(params); g_free(params);
} }
static void dcc_chat_out_ctcp(gchar *data, SERVER_REC *server) static void cmd_ctcp(const char *data, SERVER_REC *server)
{ {
char *params, *target, *ctcpcmd, *ctcpdata; char *params, *target, *ctcpcmd, *ctcpdata;
DCC_REC *dcc; DCC_REC *dcc;
@ -363,44 +379,29 @@ static void dcc_chat_out_ctcp(gchar *data, SERVER_REC *server)
g_free(params); g_free(params);
} }
static void cmd_dcc_list(gchar *data) static void cmd_dcc_list(const char *data)
{ {
GSList *tmp; GSList *tmp;
time_t going; time_t going;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
printtext(NULL, NULL, MSGLEVEL_DCC, "%gDCC connections"); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_LIST_HEADER);
for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) {
{
DCC_REC *dcc = tmp->data; DCC_REC *dcc = tmp->data;
going = time(NULL) - dcc->starttime; going = time(NULL) - dcc->starttime;
if (going == 0) going = 1; /* no division by zeros :) */ if (going == 0) going = 1; /* no division by zeros :) */
if (dcc->dcc_type == DCC_TYPE_CHAT) if (dcc->type == DCC_TYPE_CHAT)
printtext(NULL, NULL, MSGLEVEL_DCC, "%g %s %s", dcc->nick, dcc_type2str(dcc->dcc_type)); printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_LIST_LINE_CHAT, dcc->nick, dcc_type2str(dcc->type));
else else
printtext(NULL, NULL, MSGLEVEL_DCC, "%g %s %s: %luk of %luk (%d%%) - %fkB/s - %s", printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_LIST_LINE_FILE,
dcc->nick, dcc_type2str(dcc->dcc_type), dcc->transfd/1024, dcc->size/1024, dcc->nick, dcc_type2str(dcc->type), dcc->transfd/1024, dcc->size/1024,
dcc->size == 0 ? 0 : (100*dcc->transfd/dcc->size), dcc->size == 0 ? 0 : (100*dcc->transfd/dcc->size),
(gdouble) (dcc->transfd-dcc->skipped)/going/1024, dcc->arg); (double) (dcc->transfd-dcc->skipped)/going/1024, dcc->arg);
}
}
static void dcc_chat_closed(WINDOW_REC *window, WI_IRC_REC *item)
{
DCC_REC *dcc;
dcc = irc_item_dcc_chat(item);
if (dcc == NULL) return;
/* check that we haven't got here from dcc_destroy() so we won't try to
close the dcc again.. */
if (!dcc->destroyed) {
/* DCC query window closed, close the dcc chat too. */
dcc_destroy(dcc);
} }
printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_LIST_FOOTER);
} }
void fe_irc_dcc_init(void) void fe_irc_dcc_init(void)
@ -409,7 +410,7 @@ void fe_irc_dcc_init(void)
signal_add("dcc rejected", (SIGNAL_FUNC) dcc_rejected); signal_add("dcc rejected", (SIGNAL_FUNC) dcc_rejected);
signal_add("dcc closed", (SIGNAL_FUNC) dcc_closed); signal_add("dcc closed", (SIGNAL_FUNC) dcc_closed);
signal_add("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg); signal_add("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg);
signal_add("dcc ctcp action", (SIGNAL_FUNC) dcc_chat_in_action); signal_add("dcc ctcp action", (SIGNAL_FUNC) dcc_chat_action);
signal_add("default dcc ctcp", (SIGNAL_FUNC) dcc_chat_ctcp); signal_add("default dcc ctcp", (SIGNAL_FUNC) dcc_chat_ctcp);
signal_add("dcc request", (SIGNAL_FUNC) dcc_request); signal_add("dcc request", (SIGNAL_FUNC) dcc_request);
signal_add("dcc error connect", (SIGNAL_FUNC) dcc_error_connect); signal_add("dcc error connect", (SIGNAL_FUNC) dcc_error_connect);
@ -421,13 +422,14 @@ void fe_irc_dcc_init(void)
signal_add("dcc error close not found", (SIGNAL_FUNC) dcc_error_close_not_found); signal_add("dcc error close not found", (SIGNAL_FUNC) dcc_error_close_not_found);
signal_add("dcc unknown ctcp", (SIGNAL_FUNC) dcc_unknown_ctcp); signal_add("dcc unknown ctcp", (SIGNAL_FUNC) dcc_unknown_ctcp);
signal_add("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply); signal_add("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply);
command_bind("msg", NULL, (SIGNAL_FUNC) dcc_chat_write); signal_add("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
command_bind("me", NULL, (SIGNAL_FUNC) dcc_chat_out_me); signal_add("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
command_bind("action", NULL, (SIGNAL_FUNC) dcc_chat_out_action); command_bind("msg", NULL, (SIGNAL_FUNC) cmd_msg);
command_bind("ctcp", NULL, (SIGNAL_FUNC) dcc_chat_out_ctcp); command_bind("me", NULL, (SIGNAL_FUNC) cmd_me);
command_bind("action", NULL, (SIGNAL_FUNC) cmd_action);
command_bind("ctcp", NULL, (SIGNAL_FUNC) cmd_ctcp);
command_bind("dcc ", NULL, (SIGNAL_FUNC) cmd_dcc_list); command_bind("dcc ", NULL, (SIGNAL_FUNC) cmd_dcc_list);
command_bind("dcc list", NULL, (SIGNAL_FUNC) cmd_dcc_list); command_bind("dcc list", NULL, (SIGNAL_FUNC) cmd_dcc_list);
signal_add("window item remove", (SIGNAL_FUNC) dcc_chat_closed);
theme_register(fecommon_irc_dcc_formats); theme_register(fecommon_irc_dcc_formats);
} }
@ -440,7 +442,7 @@ void fe_irc_dcc_deinit(void)
signal_remove("dcc rejected", (SIGNAL_FUNC) dcc_rejected); signal_remove("dcc rejected", (SIGNAL_FUNC) dcc_rejected);
signal_remove("dcc closed", (SIGNAL_FUNC) dcc_closed); signal_remove("dcc closed", (SIGNAL_FUNC) dcc_closed);
signal_remove("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg); signal_remove("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg);
signal_remove("dcc ctcp action", (SIGNAL_FUNC) dcc_chat_in_action); signal_remove("dcc ctcp action", (SIGNAL_FUNC) dcc_chat_action);
signal_remove("default dcc ctcp", (SIGNAL_FUNC) dcc_chat_ctcp); signal_remove("default dcc ctcp", (SIGNAL_FUNC) dcc_chat_ctcp);
signal_remove("dcc request", (SIGNAL_FUNC) dcc_request); signal_remove("dcc request", (SIGNAL_FUNC) dcc_request);
signal_remove("dcc error connect", (SIGNAL_FUNC) dcc_error_connect); signal_remove("dcc error connect", (SIGNAL_FUNC) dcc_error_connect);
@ -452,11 +454,12 @@ void fe_irc_dcc_deinit(void)
signal_remove("dcc error close not found", (SIGNAL_FUNC) dcc_error_close_not_found); signal_remove("dcc error close not found", (SIGNAL_FUNC) dcc_error_close_not_found);
signal_remove("dcc unknown ctcp", (SIGNAL_FUNC) dcc_unknown_ctcp); signal_remove("dcc unknown ctcp", (SIGNAL_FUNC) dcc_unknown_ctcp);
signal_remove("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply); signal_remove("dcc unknown reply", (SIGNAL_FUNC) dcc_unknown_reply);
command_unbind("msg", (SIGNAL_FUNC) dcc_chat_write); signal_remove("dcc destroyed", (SIGNAL_FUNC) sig_dcc_destroyed);
command_unbind("me", (SIGNAL_FUNC) dcc_chat_out_me); signal_remove("query destroyed", (SIGNAL_FUNC) sig_query_destroyed);
command_unbind("action", (SIGNAL_FUNC) dcc_chat_out_action); command_unbind("msg", (SIGNAL_FUNC) cmd_msg);
command_unbind("ctcp", (SIGNAL_FUNC) dcc_chat_out_ctcp); command_unbind("me", (SIGNAL_FUNC) cmd_me);
command_unbind("action", (SIGNAL_FUNC) cmd_action);
command_unbind("ctcp", (SIGNAL_FUNC) cmd_ctcp);
command_unbind("dcc ", (SIGNAL_FUNC) cmd_dcc_list); command_unbind("dcc ", (SIGNAL_FUNC) cmd_dcc_list);
command_unbind("dcc list", (SIGNAL_FUNC) cmd_dcc_list); command_unbind("dcc list", (SIGNAL_FUNC) cmd_dcc_list);
signal_remove("window item remove", (SIGNAL_FUNC) dcc_chat_closed);
} }

14
src/fe-common/irc/dcc/module-formats.c
View File

@ -27,11 +27,13 @@ FORMAT_REC fecommon_irc_dcc_formats[] = {
/* ---- */ /* ---- */
{ NULL, "DCC", 0 }, { NULL, "DCC", 0 },
{ "own_dcc", "%K[%rdcc%K(%R$0%K)]%n $1", 2, { 0, 0 } }, { "own_dcc", "%K[%rdcc%K(%R$0%K)]%n %|$1", 2, { 0, 0 } },
{ "own_dcc_me", "%W * $0%n $1", 2, { 0, 0 } }, { "own_dcc_me", "%W * $0%n %|$1", 2, { 0, 0 } },
{ "own_dcc_ctcp", "%K[%rctcp%K(%R$0%K)]%n $1 $2", 3, { 0, 0, 0 } }, { "own_dcc_ctcp", "%K[%rctcp%K(%R$0%K)]%n $1 $2", 3, { 0, 0, 0 } },
{ "dcc_msg", "%K[%G$0%K(%gdcc%K)]%n $1", 2, { 0, 0 } }, { "dcc_msg", "%K[%G$0%K(%gdcc%K)]%n %|$1", 2, { 0, 0 } },
{ "action_dcc", "%W (*dcc*) $0%n $1", 2, { 0, 0 } }, { "action_dcc", "%W (*dcc*) $0%n %|$1", 2, { 0, 0 } },
{ "own_dcc_query", "%K<%W$0%K>%n %|$1", 2, { 0, 0 } },
{ "dcc_msg_query", "%K<%G$0%K>%n %|$1", 2, { 0, 0 } },
{ "dcc_ctcp", "%g>>> DCC CTCP received from %_$0%_%K: %g$1", 2, { 0, 0 } }, { "dcc_ctcp", "%g>>> DCC CTCP received from %_$0%_%K: %g$1", 2, { 0, 0 } },
{ "dcc_chat", "%gDCC CHAT from %_$0%_ %K[%g$1 port $2%K]", 3, { 0, 0, 1 } }, { "dcc_chat", "%gDCC CHAT from %_$0%_ %K[%g$1 port $2%K]", 3, { 0, 0, 1 } },
{ "dcc_chat_not_found", "%gNo DCC CHAT connection open to %_$0", 1, { 0 } }, { "dcc_chat_not_found", "%gNo DCC CHAT connection open to %_$0", 1, { 0 } },
@ -55,6 +57,10 @@ FORMAT_REC fecommon_irc_dcc_formats[] = {
{ "dcc_cant_create", "%gDCC can't create file %G$0%g", 1, { 0 } }, { "dcc_cant_create", "%gDCC can't create file %G$0%g", 1, { 0 } },
{ "dcc_rejected", "%gDCC %G$0%g was rejected by %_$1%_ %K[%G$2%K]", 3, { 0, 0, 0 } }, { "dcc_rejected", "%gDCC %G$0%g was rejected by %_$1%_ %K[%G$2%K]", 3, { 0, 0, 0 } },
{ "dcc_close", "%gDCC %G$0%g close for %_$1%_ %K[%G$2%K]", 3, { 0, 0, 0 } }, { "dcc_close", "%gDCC %G$0%g close for %_$1%_ %K[%G$2%K]", 3, { 0, 0, 0 } },
{ "dcc_list_header", "%gDCC connections", 0 },
{ "dcc_list_line_chat", "%g $0 $1", 2, { 0, 0 } },
{ "dcc_list_line_file", "%g $0 $1: $2k of $3k ($4%%) - $5kB/s - $6", 7, { 0, 0, 2, 2, 1, 3, 0 } },
{ "dcc_list_footer", "", 0 },
{ NULL, NULL, 0 } { NULL, NULL, 0 }
}; };

8
src/fe-common/irc/dcc/module-formats.h
View File

@ -10,6 +10,8 @@ enum {
IRCTXT_OWN_DCC_CTCP, IRCTXT_OWN_DCC_CTCP,
IRCTXT_DCC_MSG, IRCTXT_DCC_MSG,
IRCTXT_ACTION_DCC, IRCTXT_ACTION_DCC,
IRCTXT_OWN_DCC_QUERY,
IRCTXT_DCC_MSG_QUERY,
IRCTXT_DCC_CTCP, IRCTXT_DCC_CTCP,
IRCTXT_DCC_CHAT, IRCTXT_DCC_CHAT,
IRCTXT_DCC_CHAT_NOT_FOUND, IRCTXT_DCC_CHAT_NOT_FOUND,
@ -32,7 +34,11 @@ enum {
IRCTXT_DCC_CONNECT_ERROR, IRCTXT_DCC_CONNECT_ERROR,
IRCTXT_DCC_CANT_CREATE, IRCTXT_DCC_CANT_CREATE,
IRCTXT_DCC_REJECTED, IRCTXT_DCC_REJECTED,
IRCTXT_DCC_CLOSE IRCTXT_DCC_CLOSE,
IRCTXT_DCC_LIST_HEADER,
IRCTXT_DCC_LIST_LINE_CHAT,
IRCTXT_DCC_LIST_LINE_FILE,
IRCTXT_DCC_LIST_FOOTER
}; };
extern FORMAT_REC fecommon_irc_dcc_formats[]; extern FORMAT_REC fecommon_irc_dcc_formats[];

82
src/fe-common/irc/fe-irc-commands.c
View File

@ -161,6 +161,36 @@ static void cmd_msg(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
g_free(params); g_free(params);
} }
static void cmd_me(gchar *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
{
g_return_if_fail(data != NULL);
if (!irc_item_check(item))
return;
if (server == NULL || !server->connected) cmd_return_error(CMDERR_NOT_CONNECTED);
printformat(server, item->name, MSGLEVEL_ACTIONS,
IRCTXT_OWN_ME, server->nick, data);
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", item->name, data);
}
static void cmd_action(const char *data, IRC_SERVER_REC *server)
{
char *params, *target, *text;
g_return_if_fail(data != NULL);
if (server == NULL || !server->connected) cmd_return_error(CMDERR_NOT_CONNECTED);
params = cmd_get_params(data, 3 | PARAM_FLAG_GETREST, &target, &text);
if (*target == '\0' || *text == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
printformat(server, target, MSGLEVEL_ACTIONS, IRCTXT_OWN_ME, server->nick, text);
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, text);
g_free(params);
}
static void cmd_notice(gchar *data, IRC_SERVER_REC *server) static void cmd_notice(gchar *data, IRC_SERVER_REC *server)
{ {
char *params, *target, *msg; char *params, *target, *msg;
@ -180,45 +210,6 @@ static void cmd_notice(gchar *data, IRC_SERVER_REC *server)
g_free(params); g_free(params);
} }
static void cmd_me(gchar *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
{
g_return_if_fail(data != NULL);
if (!irc_item_check(item))
return;
if (irc_item_dcc_chat(item)) {
/* DCC action - handled by fe-dcc.c */
return;
}
if (server == NULL || !server->connected) cmd_return_error(CMDERR_NOT_CONNECTED);
printformat(server, item->name, MSGLEVEL_ACTIONS,
IRCTXT_OWN_ME, server->nick, data);
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", item->name, data);
}
static void cmd_action(const char *data, IRC_SERVER_REC *server)
{
char *params, *target, *text;
g_return_if_fail(data != NULL);
if (server == NULL || !server->connected) cmd_return_error(CMDERR_NOT_CONNECTED);
if (*data == '=') {
/* DCC action - handled by fe-dcc.c */
return;
}
params = cmd_get_params(data, 3 | PARAM_FLAG_GETREST, &target, &text);
if (*target == '\0' || *text == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
printformat(server, target, MSGLEVEL_ACTIONS, IRCTXT_OWN_ME, server->nick, text);
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, text);
g_free(params);
}
static void cmd_ctcp(const char *data, IRC_SERVER_REC *server) static void cmd_ctcp(const char *data, IRC_SERVER_REC *server)
{ {
char *params, *target, *ctcpcmd, *ctcpdata; char *params, *target, *ctcpcmd, *ctcpdata;
@ -229,11 +220,6 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server)
params = cmd_get_params(data, 3 | PARAM_FLAG_GETREST, &target, &ctcpcmd, &ctcpdata); params = cmd_get_params(data, 3 | PARAM_FLAG_GETREST, &target, &ctcpcmd, &ctcpdata);
if (*target == '\0' || *ctcpcmd == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*target == '\0' || *ctcpcmd == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
if (*target == '=') {
/* send CTCP via DCC CHAT */
g_free(params);
return;
}
if (*target == '@' && ischannel(target[1])) if (*target == '@' && ischannel(target[1]))
target++; /* Hybrid 6 feature, send ctcp to all ops in channel */ target++; /* Hybrid 6 feature, send ctcp to all ops in channel */
@ -401,10 +387,10 @@ void fe_irc_commands_init(void)
{ {
command_bind("query", NULL, (SIGNAL_FUNC) cmd_query); command_bind("query", NULL, (SIGNAL_FUNC) cmd_query);
command_bind("unquery", NULL, (SIGNAL_FUNC) cmd_unquery); command_bind("unquery", NULL, (SIGNAL_FUNC) cmd_unquery);
command_bind("msg", NULL, (SIGNAL_FUNC) cmd_msg); command_bind_last("msg", NULL, (SIGNAL_FUNC) cmd_msg);
command_bind_last("me", NULL, (SIGNAL_FUNC) cmd_me);
command_bind_last("action", NULL, (SIGNAL_FUNC) cmd_action);
command_bind("notice", NULL, (SIGNAL_FUNC) cmd_notice); command_bind("notice", NULL, (SIGNAL_FUNC) cmd_notice);
command_bind("me", NULL, (SIGNAL_FUNC) cmd_me);
command_bind("action", NULL, (SIGNAL_FUNC) cmd_action);
command_bind("ctcp", NULL, (SIGNAL_FUNC) cmd_ctcp); command_bind("ctcp", NULL, (SIGNAL_FUNC) cmd_ctcp);
command_bind("nctcp", NULL, (SIGNAL_FUNC) cmd_nctcp); command_bind("nctcp", NULL, (SIGNAL_FUNC) cmd_nctcp);
command_bind("ban", NULL, (SIGNAL_FUNC) cmd_ban); command_bind("ban", NULL, (SIGNAL_FUNC) cmd_ban);
@ -420,9 +406,9 @@ void fe_irc_commands_deinit(void)
command_unbind("query", (SIGNAL_FUNC) cmd_query); command_unbind("query", (SIGNAL_FUNC) cmd_query);
command_unbind("unquery", (SIGNAL_FUNC) cmd_unquery); command_unbind("unquery", (SIGNAL_FUNC) cmd_unquery);
command_unbind("msg", (SIGNAL_FUNC) cmd_msg); command_unbind("msg", (SIGNAL_FUNC) cmd_msg);
command_unbind("notice", (SIGNAL_FUNC) cmd_notice);
command_unbind("me", (SIGNAL_FUNC) cmd_me); command_unbind("me", (SIGNAL_FUNC) cmd_me);
command_unbind("action", (SIGNAL_FUNC) cmd_action); command_unbind("action", (SIGNAL_FUNC) cmd_action);
command_unbind("notice", (SIGNAL_FUNC) cmd_notice);
command_unbind("ctcp", (SIGNAL_FUNC) cmd_ctcp); command_unbind("ctcp", (SIGNAL_FUNC) cmd_ctcp);
command_unbind("nctcp", (SIGNAL_FUNC) cmd_nctcp); command_unbind("nctcp", (SIGNAL_FUNC) cmd_nctcp);
command_unbind("ban", (SIGNAL_FUNC) cmd_ban); command_unbind("ban", (SIGNAL_FUNC) cmd_ban);

6
src/irc/core/irc-commands.c
View File

@ -203,12 +203,6 @@ static void cmd_msg(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg); params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
if (*target == '\0' || *msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*target == '\0' || *msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
if (*target == '=') {
/* dcc msg - don't even try to handle here.. */
g_free(params);
return;
}
if (server == NULL || !server->connected || !irc_server_check(server)) if (server == NULL || !server->connected || !irc_server_check(server))
cmd_param_error(CMDERR_NOT_CONNECTED); cmd_param_error(CMDERR_NOT_CONNECTED);

3
src/irc/core/irc.h
View File

@ -19,8 +19,7 @@
/* values returned by module_category() */ /* values returned by module_category() */
enum { enum {
WI_IRC_CHANNEL, WI_IRC_CHANNEL,
WI_IRC_QUERY, WI_IRC_QUERY
WI_IRC_DCC_CHAT
}; };
/* *MUST* have the same contents as WI_ITEM_REC in same order. */ /* *MUST* have the same contents as WI_ITEM_REC in same order. */

5
src/irc/core/query.c
View File

@ -33,18 +33,19 @@ QUERY_REC *query_create(IRC_SERVER_REC *server, const char *nick, int automatic)
{ {
QUERY_REC *rec; QUERY_REC *rec;
g_return_val_if_fail(server != NULL, NULL);
g_return_val_if_fail(nick != NULL, NULL); g_return_val_if_fail(nick != NULL, NULL);
rec = g_new0(QUERY_REC, 1); rec = g_new0(QUERY_REC, 1);
queries = g_slist_append(queries, rec); queries = g_slist_append(queries, rec);
server->queries = g_slist_append(server->queries, rec); if (server != NULL) server->queries = g_slist_append(server->queries, rec);
MODULE_DATA_INIT(rec); MODULE_DATA_INIT(rec);
rec->type = module_get_uniq_id("IRC", WI_IRC_QUERY); rec->type = module_get_uniq_id("IRC", WI_IRC_QUERY);
rec->nick = g_strdup(nick); rec->nick = g_strdup(nick);
if (server != NULL) {
rec->server_tag = g_strdup(server->tag); rec->server_tag = g_strdup(server->tag);
rec->server = server; rec->server = server;
}
signal_emit("query created", 2, rec, GINT_TO_POINTER(automatic)); signal_emit("query created", 2, rec, GINT_TO_POINTER(automatic));
return rec; return rec;

252
src/irc/dcc/dcc-chat.c
View File

@ -29,53 +29,72 @@
#include "masks.h" #include "masks.h"
#include "irc.h" #include "irc.h"
#include "server-setup.h" #include "server-setup.h"
#include "query.h"
#include "dcc.h" #include "dcc.h"
/* Send `data' to dcc chat. */
void dcc_chat_send(DCC_REC *dcc, const char *data)
{
g_return_if_fail(dcc != NULL);
g_return_if_fail(data != NULL);
/* FIXME: we need output queue! */
net_transmit(dcc->handle, data, strlen(data));
net_transmit(dcc->handle, "\n", 1);
}
/* If `item' is a query of a =nick, return DCC chat record of nick */
DCC_REC *item_get_dcc(void *item)
{
QUERY_REC *query;
query = irc_item_query(item);
if (query == NULL || *query->nick != '=') return NULL;
return dcc_find_item(DCC_TYPE_CHAT, query->nick+1, NULL);
}
/* Send text to DCC chat */ /* Send text to DCC chat */
static void dcc_chat_write(gchar *data) static void cmd_msg(const char *data)
{ {
DCC_REC *dcc; DCC_REC *dcc;
gchar *params, *text, *target; char *params, *text, *target;
gint len;
g_return_if_fail(text != NULL); g_return_if_fail(text != NULL);
if (*data != '=') {
/* handle only DCC messages */
return;
}
params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &text); params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &text);
if (*target == '=')
{
/* dcc msg */
dcc = dcc_find_item(DCC_TYPE_CHAT, ++target, NULL); dcc = dcc_find_item(DCC_TYPE_CHAT, ++target, NULL);
if (dcc != NULL) if (dcc != NULL) dcc_chat_send(dcc, text);
{
len = strlen(text);
/* FIXME: we need output queue! */
if (net_transmit(dcc->handle, text, len) != len)
g_warning("dcc_chat_write() : could not send all data!");
net_transmit(dcc->handle, "\n", 1);
}
}
g_free(params); g_free(params);
signal_stop();
} }
static void dcc_chat_me(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item) static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
{ {
DCC_REC *dcc; DCC_REC *dcc;
char *str; char *str;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
dcc = irc_item_dcc_chat(item); dcc = item_get_dcc(item);
if (dcc == NULL) return; if (dcc == NULL) return;
str = g_strdup_printf("ACTION %s", data); str = g_strdup_printf("ACTION %s", data);
dcc_ctcp_message(dcc->nick, NULL, dcc, FALSE, str); dcc_ctcp_message(dcc->nick, NULL, dcc, FALSE, str);
g_free(str); g_free(str);
signal_stop();
} }
static void dcc_chat_action(const char *data, IRC_SERVER_REC *server) static void cmd_action(const char *data, IRC_SERVER_REC *server)
{ {
char *params, *target, *text; char *params, *target, *text;
DCC_REC *dcc; DCC_REC *dcc;
@ -93,14 +112,16 @@ static void dcc_chat_action(const char *data, IRC_SERVER_REC *server)
dcc = dcc_find_item(DCC_TYPE_CHAT, target+1, NULL); dcc = dcc_find_item(DCC_TYPE_CHAT, target+1, NULL);
if (dcc != NULL) { if (dcc != NULL) {
str = g_strdup_printf("ACTION %s", data); str = g_strdup_printf("ACTION %s", text);
dcc_ctcp_message(dcc->nick, NULL, dcc, FALSE, str); dcc_ctcp_message(dcc->nick, NULL, dcc, FALSE, str);
g_free(str); g_free(str);
} }
g_free(params); g_free(params);
signal_stop();
} }
static void dcc_chat_ctcp(const char *data, IRC_SERVER_REC *server) static void cmd_ctcp(const char *data, IRC_SERVER_REC *server)
{ {
char *params, *target, *ctcpcmd, *ctcpdata; char *params, *target, *ctcpcmd, *ctcpdata;
DCC_REC *dcc; DCC_REC *dcc;
@ -128,61 +149,6 @@ static void dcc_chat_ctcp(const char *data, IRC_SERVER_REC *server)
} }
g_free(params); g_free(params);
}
/* DCC CHAT: text received */
static void dcc_chat_msg(DCC_REC *dcc, gchar *msg)
{
gchar *cmd, *ptr;
gboolean reply;
g_return_if_fail(dcc != NULL);
g_return_if_fail(msg != NULL);
reply = FALSE;
if (g_strncasecmp(msg, "CTCP_MESSAGE ", 13) != 0)
{
if (g_strncasecmp(msg, "CTCP_REPLY ", 11) != 0)
{
/* Use the mirc style CTCPing from now on.. */
dcc->mirc_ctcp = TRUE;
}
else
{
/* bitchx (and ircii?) sends this */
msg += 11;
reply = TRUE;
dcc->mirc_ctcp = FALSE;
}
}
else
{
/* bitchx (and ircii?) sends this */
msg += 13;
dcc->mirc_ctcp = FALSE;
}
/* Handle only DCC CTCPs */
if (*msg != 1)
return;
msg = g_strdup(msg+1);
/* remove the later \001 */
ptr = strrchr(msg, 1);
if (ptr != NULL) *ptr = '\0';
/* get ctcp command */
cmd = g_strconcat(reply ? "dcc reply " : "dcc ctcp ", msg, NULL);
ptr = strchr(cmd+9, ' ');
if (ptr != NULL) *ptr++ = '\0'; else ptr = "";
g_strdown(cmd+9);
if (!signal_emit(cmd, 2, ptr, dcc))
signal_emit(reply ? "default dcc reply" : "default dcc ctcp", 2, msg, dcc);
g_free(cmd);
g_free(msg);
signal_stop(); signal_stop();
} }
@ -200,7 +166,6 @@ static void dcc_chat_input(DCC_REC *dcc)
ret = line_split(tmpbuf, recvlen, &str, (LINEBUF_REC **) &dcc->databuf); ret = line_split(tmpbuf, recvlen, &str, (LINEBUF_REC **) &dcc->databuf);
if (ret == -1) { if (ret == -1) {
/* connection lost */ /* connection lost */
dcc->destroyed = TRUE;
signal_emit("dcc closed", 1, dcc); signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
break; break;
@ -217,7 +182,7 @@ static void dcc_chat_input(DCC_REC *dcc)
static void dcc_chat_listen(DCC_REC *dcc) static void dcc_chat_listen(DCC_REC *dcc)
{ {
IPADDR ip; IPADDR ip;
gint handle, port; int handle, port;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
@ -226,8 +191,7 @@ static void dcc_chat_listen(DCC_REC *dcc)
if (handle == -1) if (handle == -1)
return; return;
/* FIXME: add paranoia checking, check if host ip is the same as to who /* TODO: add paranoia check - see dcc-files.c */
we sent the DCC CHAT request.. */
g_source_remove(dcc->tagread); g_source_remove(dcc->tagread);
close(dcc->handle); close(dcc->handle);
@ -244,13 +208,12 @@ static void dcc_chat_listen(DCC_REC *dcc)
} }
/* callback: DCC CHAT - net_connect_nonblock() finished */ /* callback: DCC CHAT - net_connect_nonblock() finished */
static void dcc_chat_connect(DCC_REC *dcc) static void sig_chat_connected(DCC_REC *dcc)
{ {
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
g_source_remove(dcc->tagread); g_source_remove(dcc->tagread);
if (net_geterror(dcc->handle) != 0) if (net_geterror(dcc->handle) != 0) {
{
/* error connecting */ /* error connecting */
signal_emit("dcc error connect", 1, dcc); signal_emit("dcc error connect", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
@ -265,41 +228,42 @@ static void dcc_chat_connect(DCC_REC *dcc)
signal_emit("dcc connected", 1, dcc); signal_emit("dcc connected", 1, dcc);
} }
static void dcc_chat_connect(DCC_REC *dcc)
{
g_return_if_fail(dcc != NULL);
if (dcc->addrstr[0] == '\0' || dcc->starttime != 0) {
/* already sent a chat request / already chatting */
return;
}
dcc->handle = net_connect_ip(&dcc->addr, dcc->port,
source_host_ok ? source_host_ip : NULL);
if (dcc->handle != -1) {
dcc->tagread = g_input_add(dcc->handle, G_INPUT_WRITE|G_INPUT_READ|G_INPUT_EXCEPTION,
(GInputFunction) sig_chat_connected, dcc);
} else {
/* error connecting */
signal_emit("dcc error connect", 1, dcc);
dcc_destroy(dcc);
}
}
/* command: DCC CHAT */ /* command: DCC CHAT */
static void cmd_dcc_chat(gchar *data, IRC_SERVER_REC *server) static void cmd_dcc_chat(const char *data, IRC_SERVER_REC *server)
{ {
DCC_REC *dcc; DCC_REC *dcc;
IPADDR addr; IPADDR own_ip;
gchar *str; char *str, host[MAX_IP_LEN];
gint port, handle; int port, handle;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS); if (*data == '\0') cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
dcc = dcc_find_item(DCC_TYPE_CHAT, data, NULL); dcc = dcc_find_item(DCC_TYPE_CHAT, data, NULL);
if (dcc != NULL) if (dcc != NULL) {
{
if (dcc->addrstr[0] == '\0' || dcc->starttime != 0)
{
/* already sent a chat request / already chatting */
return;
}
/* found from dcc list - so we're the connecting side.. */ /* found from dcc list - so we're the connecting side.. */
dcc->handle = net_connect_ip(&dcc->addr, dcc->port, dcc_chat_connect(dcc);
source_host_ok ? source_host_ip : NULL);
if (dcc->handle != -1)
{
dcc->tagread = g_input_add(dcc->handle, G_INPUT_WRITE|G_INPUT_READ|G_INPUT_EXCEPTION,
(GInputFunction) dcc_chat_connect, dcc);
}
else
{
/* error connecting */
signal_emit("dcc error connect", 1, dcc);
dcc_destroy(dcc);
}
return; return;
} }
@ -307,11 +271,11 @@ static void cmd_dcc_chat(gchar *data, IRC_SERVER_REC *server)
if (server == NULL || !server->connected) if (server == NULL || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED); cmd_return_error(CMDERR_NOT_CONNECTED);
if (net_getsockname(server->handle, &addr, NULL) == -1) if (net_getsockname(server->handle, &own_ip, NULL) == -1)
cmd_return_error(CMDERR_ERRNO); cmd_return_error(CMDERR_ERRNO);
port = settings_get_int("dcc_port"); port = settings_get_int("dcc_port");
handle = net_listen(&addr, &port); handle = net_listen(&own_ip, &port);
if (handle == -1) if (handle == -1)
cmd_return_error(CMDERR_ERRNO); cmd_return_error(CMDERR_ERRNO);
@ -320,8 +284,9 @@ static void cmd_dcc_chat(gchar *data, IRC_SERVER_REC *server)
(GInputFunction) dcc_chat_listen, dcc); (GInputFunction) dcc_chat_listen, dcc);
/* send the request */ /* send the request */
dcc_make_address(&own_ip, host);
str = g_strdup_printf("PRIVMSG %s :\001DCC CHAT CHAT %s %d\001", str = g_strdup_printf("PRIVMSG %s :\001DCC CHAT CHAT %s %d\001",
data, dcc_make_address(&addr), port); data, host, port);
irc_send_cmd(server, str); irc_send_cmd(server, str);
g_free(str); g_free(str);
} }
@ -332,12 +297,55 @@ static void cmd_mircdcc(gchar *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
dcc = irc_item_dcc_chat(item); dcc = item_get_dcc(item);
if (dcc == NULL) return; if (dcc == NULL) return;
dcc->mirc_ctcp = toupper(*data) == 'N' ? FALSE : TRUE; dcc->mirc_ctcp = toupper(*data) == 'N' ? FALSE : TRUE;
} }
/* DCC CHAT: text received */
static void dcc_chat_msg(DCC_REC *dcc, const char *msg)
{
char *cmd, *ptr;
int reply;
g_return_if_fail(dcc != NULL);
g_return_if_fail(msg != NULL);
reply = FALSE;
if (g_strncasecmp(msg, "CTCP_MESSAGE ", 13) == 0) {
/* bitchx (and ircii?) sends this */
msg += 13;
dcc->mirc_ctcp = FALSE;
} else if (g_strncasecmp(msg, "CTCP_REPLY ", 11) == 0) {
/* bitchx (and ircii?) sends this */
msg += 11;
reply = TRUE;
dcc->mirc_ctcp = FALSE;
} else if (*msg == 1) {
/* Use the mirc style CTCPs from now on.. */
dcc->mirc_ctcp = TRUE;
}
/* Handle only DCC CTCPs */
if (*msg != 1)
return;
/* get ctcp command, remove \001 chars */
cmd = g_strconcat(reply ? "dcc reply " : "dcc ctcp ", msg+1, NULL);
if (cmd[strlen(cmd)-1] == 1) cmd[strlen(cmd)-1] = '\0';
ptr = strchr(cmd+9, ' ');
if (ptr != NULL) *ptr++ = '\0'; else ptr = "";
g_strdown(cmd+9);
if (!signal_emit(cmd, 2, ptr, dcc))
signal_emit(reply ? "default dcc reply" : "default dcc ctcp", 2, msg, dcc);
g_free(cmd);
signal_stop();
}
static void dcc_ctcp_redirect(gchar *msg, DCC_REC *dcc) static void dcc_ctcp_redirect(gchar *msg, DCC_REC *dcc)
{ {
g_return_if_fail(msg != NULL); g_return_if_fail(msg != NULL);
@ -348,24 +356,24 @@ static void dcc_ctcp_redirect(gchar *msg, DCC_REC *dcc)
void dcc_chat_init(void) void dcc_chat_init(void)
{ {
command_bind("msg", NULL, (SIGNAL_FUNC) dcc_chat_write); command_bind("msg", NULL, (SIGNAL_FUNC) cmd_msg);
command_bind("me", NULL, (SIGNAL_FUNC) dcc_chat_me); command_bind("me", NULL, (SIGNAL_FUNC) cmd_me);
command_bind("action", NULL, (SIGNAL_FUNC) dcc_chat_action); command_bind("action", NULL, (SIGNAL_FUNC) cmd_action);
command_bind("ctcp", NULL, (SIGNAL_FUNC) dcc_chat_ctcp); command_bind("ctcp", NULL, (SIGNAL_FUNC) cmd_ctcp);
command_bind("dcc chat", NULL, (SIGNAL_FUNC) cmd_dcc_chat); command_bind("dcc chat", NULL, (SIGNAL_FUNC) cmd_dcc_chat);
signal_add_first("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg);
command_bind("mircdcc", NULL, (SIGNAL_FUNC) cmd_mircdcc); command_bind("mircdcc", NULL, (SIGNAL_FUNC) cmd_mircdcc);
signal_add_first("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg);
signal_add("dcc ctcp dcc", (SIGNAL_FUNC) dcc_ctcp_redirect); signal_add("dcc ctcp dcc", (SIGNAL_FUNC) dcc_ctcp_redirect);
} }
void dcc_chat_deinit(void) void dcc_chat_deinit(void)
{ {
command_unbind("msg", (SIGNAL_FUNC) dcc_chat_write); command_unbind("msg", (SIGNAL_FUNC) cmd_msg);
command_unbind("me", (SIGNAL_FUNC) dcc_chat_me); command_unbind("me", (SIGNAL_FUNC) cmd_me);
command_unbind("action", (SIGNAL_FUNC) dcc_chat_action); command_unbind("action", (SIGNAL_FUNC) cmd_action);
command_unbind("ctcp", (SIGNAL_FUNC) dcc_chat_ctcp); command_unbind("ctcp", (SIGNAL_FUNC) cmd_ctcp);
command_unbind("dcc chat", (SIGNAL_FUNC) cmd_dcc_chat); command_unbind("dcc chat", (SIGNAL_FUNC) cmd_dcc_chat);
signal_remove("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg);
command_unbind("mircdcc", (SIGNAL_FUNC) cmd_mircdcc); command_unbind("mircdcc", (SIGNAL_FUNC) cmd_mircdcc);
signal_remove("dcc chat message", (SIGNAL_FUNC) dcc_chat_msg);
signal_remove("dcc ctcp dcc", (SIGNAL_FUNC) dcc_ctcp_redirect); signal_remove("dcc ctcp dcc", (SIGNAL_FUNC) dcc_ctcp_redirect);
} }

452
src/irc/dcc/dcc-files.c
View File

@ -32,131 +32,187 @@
#include "dcc.h" #include "dcc.h"
static gint dcc_file_create_mode; static int dcc_file_create_mode;
static gchar *dcc_prepare_path(gchar *fname) static char *dcc_prepare_path(const char *fname)
{ {
gchar *str, *ptr, *downpath; char *str, *downpath;
/* strip all paths from file. */
ptr = strrchr(fname, '/');
if (ptr == NULL) ptr = fname; else ptr++;
downpath = convert_home(settings_get_str("dcc_download_path")); downpath = convert_home(settings_get_str("dcc_download_path"));
str = g_strdup_printf("%s/%s", downpath, ptr); str = g_strconcat(downpath, G_DIR_SEPARATOR_S, g_basename(fname), NULL);
g_free(downpath); g_free(downpath);
return str; return str;
} }
/* input function: DCC GET received data */ static void sig_dccget_send(DCC_REC *dcc);
static void dcc_receive(DCC_REC *dcc)
void dcc_get_send_received(DCC_REC *dcc)
{ {
guint32 recd; guint32 recd;
gint len, ret;
recd = (guint32) htonl(dcc->transfd);
memcpy(dcc->count_buf, &recd, 4);
dcc->count_pos = net_transmit(dcc->handle, dcc->count_buf+dcc->count_pos, 4-dcc->count_pos);
if (dcc->count_pos == 4) dcc->count_pos = 0;
/* count_pos might be -1 here. if this happens, the
count_buf should be re-sent.. also, if it's 1, 2 or 3, the
last 1-3 bytes should be sent later. these happen probably
never, but I just want to do it right.. :) */
if (dcc->tagwrite != -1) {
dcc->tagwrite = g_input_add(dcc->handle, G_INPUT_WRITE,
(GInputFunction) sig_dccget_send, dcc);
}
}
/* input function: DCC GET is free to send data */
static void sig_dccget_send(DCC_REC *dcc)
{
guint32 recd;
int ret;
if (dcc->count_pos != 0) {
ret = net_transmit(dcc->handle, dcc->count_buf+dcc->count_pos, 4-dcc->count_pos);
if (dcc->count_pos <= 0)
dcc->count_pos = ret;
else if (ret > 0)
dcc->count_pos += ret;
if (dcc->count_pos == 4) dcc->count_pos = 0;
}
if (dcc->count_pos == 0) {
g_source_remove(dcc->tagwrite);
dcc->tagwrite = -1;
}
memcpy(&recd, dcc->count_buf, 4);
if (recd != (guint32) htonl(dcc->transfd))
dcc_get_send_received(dcc);
}
/* input function: DCC GET received data */
static void sig_dccget_receive(DCC_REC *dcc)
{
int ret;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
for (;;) for (;;) {
{ ret = net_receive(dcc->handle, dcc->databuf, dcc->databufsize);
len = net_receive(dcc->handle, dcc->databuf, dcc->databufsize); if (ret == 0) break;
if (len == 0) break;
if (len < 0) if (ret < 0) {
{ /* socket closed - transmit complete,
/* socket closed - transmit complete (or other side died..) */ or other side died.. */
signal_emit("dcc closed", 1, dcc); signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
return; return;
} }
write(dcc->fhandle, dcc->databuf, len); write(dcc->fhandle, dcc->databuf, ret);
dcc->transfd += len; dcc->transfd += ret;
} }
/* send number of total bytes received - if for some reason we couldn't /* send number of total bytes received */
send the 4 characters last time, try to somehow fix it this time by if (dcc->count_pos <= 0)
sending missing amount of 0 characters.. */ dcc_get_send_received(dcc);
if (dcc->trans_bytes != 0)
{
recd = (guint32) htonl(0);
dcc->trans_bytes += net_transmit(dcc->handle, ((gchar *) &recd)+dcc->trans_bytes, 4-dcc->trans_bytes);
if (dcc->trans_bytes == 4) dcc->trans_bytes = 0;
}
if (dcc->trans_bytes == 0)
{
recd = (guint32) htonl(dcc->transfd);
ret = net_transmit(dcc->handle, ((gchar *) &recd), 4);
if (ret > 0 && ret < 4) dcc->trans_bytes = ret;
}
signal_emit("dcc transfer update", 1, dcc); signal_emit("dcc transfer update", 1, dcc);
} }
static char *get_rename_file(const char *fname)
{
GString *newname;
struct stat statbuf;
char *ret;
int num;
newname = g_string_new(NULL);
num = 1;
do {
g_string_sprintf(newname, "%s.%d", fname, num);
num++;
} while (stat(newname->str, &statbuf) == 0);
ret = newname->str;
g_string_free(newname, FALSE);
return ret;
}
/* callback: net_connect() finished for DCC GET */ /* callback: net_connect() finished for DCC GET */
static void dcc_get_connect(DCC_REC *dcc) static void sig_dccget_connected(DCC_REC *dcc)
{ {
struct stat statbuf; struct stat statbuf;
char *fname;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
g_source_remove(dcc->tagread); g_source_remove(dcc->tagread);
if (net_geterror(dcc->handle) != 0) if (net_geterror(dcc->handle) != 0) {
{
/* error connecting */ /* error connecting */
signal_emit("dcc error connect", 1, dcc); signal_emit("dcc error connect", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
return; return;
} }
dcc->file = dcc_prepare_path(dcc->arg); dcc->file = dcc_prepare_path(dcc->arg);
/* if some plugin wants to change the file name/path here.. */ /* if some plugin wants to change the file name/path here.. */
signal_emit("dcc get receive", 1, dcc); signal_emit("dcc get receive", 1, dcc);
if (stat(dcc->file, &statbuf) == 0 && if (stat(dcc->file, &statbuf) == 0 && dcc->get_type == DCC_GET_RENAME) {
(dcc->get_type == DCC_GET_RENAME || dcc->get_type == DCC_GET_DEFAULT))
{
/* file exists, rename.. */ /* file exists, rename.. */
GString *newname; fname = get_rename_file(dcc->file);
gint num;
newname = g_string_new(NULL);
for (num = 1; ; num++)
{
g_string_sprintf(newname, "%s.%d", dcc->file, num);
if (stat(newname->str, &statbuf) != 0) break;
}
g_free(dcc->file); g_free(dcc->file);
dcc->file = newname->str; dcc->file = fname;
g_string_free(newname, FALSE);
} }
if (dcc->get_type != DCC_GET_RESUME) if (dcc->get_type != DCC_GET_RESUME) {
{
dcc->fhandle = open(dcc->file, O_WRONLY | O_TRUNC | O_CREAT, dcc_file_create_mode); dcc->fhandle = open(dcc->file, O_WRONLY | O_TRUNC | O_CREAT, dcc_file_create_mode);
if (dcc->fhandle == -1) if (dcc->fhandle == -1) {
{
signal_emit("dcc error file create", 2, dcc, dcc->file); signal_emit("dcc error file create", 2, dcc, dcc->file);
dcc_destroy(dcc); dcc_destroy(dcc);
return; return;
} }
} }
dcc->databufsize = settings_get_int("dcc_block_size") > 0 ? settings_get_int("dcc_block_size") : 2048; dcc->databufsize = settings_get_int("dcc_block_size");
if (dcc->databufsize <= 0) dcc->databufsize = 2048;
dcc->databuf = g_malloc(dcc->databufsize); dcc->databuf = g_malloc(dcc->databufsize);
dcc->starttime = time(NULL); dcc->starttime = time(NULL);
dcc->tagread = g_input_add(dcc->handle, G_INPUT_READ, dcc->tagread = g_input_add(dcc->handle, G_INPUT_READ,
(GInputFunction) dcc_receive, dcc); (GInputFunction) sig_dccget_receive, dcc);
signal_emit("dcc connected", 1, dcc); signal_emit("dcc connected", 1, dcc);
} }
/* command: DCC GET */ static void dcc_get_connect(DCC_REC *dcc)
static void cmd_dcc_get(gchar *data) {
dcc->handle = net_connect_ip(&dcc->addr, dcc->port,
source_host_ok ? source_host_ip : NULL);
if (dcc->handle != -1) {
dcc->tagread = g_input_add(dcc->handle, G_INPUT_WRITE|G_INPUT_READ|G_INPUT_EXCEPTION,
(GInputFunction) sig_dccget_connected, dcc);
} else {
/* error connecting */
signal_emit("dcc error connect", 1, dcc);
dcc_destroy(dcc);
}
}
#define dcc_is_unget(dcc) \
((dcc)->type == DCC_TYPE_GET && (dcc)->handle == -1)
static void cmd_dcc_get(const char *data)
{ {
DCC_REC *dcc; DCC_REC *dcc;
GSList *tmp, *next; GSList *tmp, *next;
gchar *params, *nick, *fname; char *params, *nick, *fname;
gboolean found; int found;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -164,29 +220,14 @@ static void cmd_dcc_get(gchar *data)
if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
dcc = NULL; found = FALSE; dcc = NULL; found = FALSE;
for (tmp = dcc_conns; tmp != NULL; tmp = next) for (tmp = dcc_conns; tmp != NULL; tmp = next) {
{
dcc = tmp->data; dcc = tmp->data;
next = tmp->next; next = tmp->next;
if (dcc->dcc_type == DCC_TYPE_GET && dcc->handle == -1 && g_strcasecmp(dcc->nick, nick) == 0 && if (dcc_is_unget(dcc) && g_strcasecmp(dcc->nick, nick) == 0 &&
(*fname == '\0' || strcmp(dcc->arg, fname) == 0)) (*fname == '\0' || strcmp(dcc->arg, fname) == 0)) {
{
/* found! */
found = TRUE; found = TRUE;
dcc->handle = net_connect_ip(&dcc->addr, dcc->port, dcc_get_connect(dcc);
source_host_ok ? source_host_ip : NULL);
if (dcc->handle != -1)
{
dcc->tagread = g_input_add(dcc->handle, G_INPUT_WRITE|G_INPUT_READ|G_INPUT_EXCEPTION,
(GInputFunction) dcc_get_connect, dcc);
}
else
{
/* error connecting */
signal_emit("dcc error connect", 1, dcc);
dcc_destroy(dcc);
}
} }
} }
@ -196,91 +237,101 @@ static void cmd_dcc_get(gchar *data)
g_free(params); g_free(params);
} }
/* resume setup: DCC SEND - we either said resume on get, or when we sent, static void dcc_resume_send(DCC_REC *dcc, int port)
someone chose resume */
static void dcc_resume_setup(DCC_REC *dcc, gint port)
{ {
gchar *str; char *str;
g_return_if_fail(dcc != NULL);
g_return_if_fail(dcc->type != DCC_TYPE_SEND);
/* Check for DCC_SEND_RESUME */
if (dcc->dcc_type == DCC_TYPE_SEND)
{
if (lseek(dcc->fhandle, dcc->transfd, SEEK_SET) == -1)
{
signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc);
return;
}
else
{
str = g_strdup_printf("DCC ACCEPT %s %d %lu", str = g_strdup_printf("DCC ACCEPT %s %d %lu",
dcc->arg, port, dcc->transfd); dcc->arg, port, dcc->transfd);
dcc_ctcp_message(dcc->nick, dcc->server, dcc->chat, FALSE, str); dcc_ctcp_message(dcc->nick, dcc->server, dcc->chat, FALSE, str);
g_free(str); g_free(str);
} }
}
/* Check for DCC_GET_RESUME */ static void dcc_resume_get(DCC_REC *dcc)
if (dcc->dcc_type == DCC_TYPE_GET && dcc->get_type == DCC_GET_RESUME)
{ {
g_return_if_fail(dcc != NULL);
g_return_if_fail(dcc->type != DCC_TYPE_GET);
dcc->handle = net_connect_ip(&dcc->addr, dcc->port, dcc->handle = net_connect_ip(&dcc->addr, dcc->port,
source_host_ok ? source_host_ip : NULL); source_host_ok ? source_host_ip : NULL);
if (dcc->handle != -1) if (dcc->handle != -1) {
{
dcc->tagread = g_input_add(dcc->handle, G_INPUT_WRITE|G_INPUT_READ|G_INPUT_EXCEPTION, dcc->tagread = g_input_add(dcc->handle, G_INPUT_WRITE|G_INPUT_READ|G_INPUT_EXCEPTION,
(GInputFunction) dcc_get_connect, dcc); (GInputFunction) dcc_get_connect, dcc);
} } else {
else
{
/* error connecting */ /* error connecting */
signal_emit("dcc error connect", 1, dcc); signal_emit("dcc error connect", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
} }
} }
}
static void dcc_ctcp_msg(gchar *data, IRC_SERVER_REC *server, gchar *sender, gchar *sendaddr, gchar *target, DCC_REC *chat) #define is_resume_type(type) \
(g_strcasecmp(type, "RESUME") == 0 || g_strcasecmp(type, "ACCEPT") == 0)
#define is_resume_ok(type, dcc) \
(g_strcasecmp(type, "RESUME") != 0 || ((dcc)->type == DCC_TYPE_SEND && (dcc)->transfd == 0))
#define is_accept_ok(type, dcc) \
(g_strcasecmp(type, "ACCEPT") != 0 || ((dcc)->type == DCC_TYPE_GET && (dcc)->type == DCC_GET_RESUME))
static void dcc_ctcp_msg(const char *data, IRC_SERVER_REC *server,
const char *sender, const char *sendaddr,
const char *target, DCC_REC *chat)
{ {
gchar *params, *type, *arg, *portstr, *sizestr; char *params, *type, *arg, *portstr, *sizestr;
gulong size; unsigned long size;
gint port; int port;
DCC_REC *dcc; DCC_REC *dcc;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
g_return_if_fail(sender != NULL); g_return_if_fail(sender != NULL);
params = cmd_get_params(data, 4, &type, &arg, &portstr, &sizestr); params = cmd_get_params(data, 4, &type, &arg, &portstr, &sizestr);
if (g_strcasecmp(type, "RESUME") == 0 || g_strcasecmp(type, "ACCEPT") == 0)
{ port = atoi(portstr);
if (sscanf(portstr, "%d", &port) != 1) port = 0; size = atol(sizestr);
if (sscanf(sizestr, "%lu", &size) != 1) size = 0;
dcc = dcc_find_by_port(sender, port); dcc = dcc_find_by_port(sender, port);
if (dcc != NULL && (dcc->dcc_type == DCC_TYPE_GET || dcc->transfd == 0)) if (dcc == NULL || !is_resume_type(type) ||
{ !is_resume_ok(type, dcc) || !is_accept_ok(type, dcc)) {
dcc->transfd = size; g_free(params);
dcc->skipped = size; return;
dcc_resume_setup(dcc, port);
} }
if (lseek(dcc->fhandle, size, SEEK_SET) != dcc->transfd) {
/* error, or trying to seek after end of file */
signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc);
return;
} }
dcc->transfd = dcc->skipped = size;
if (dcc->type == DCC_TYPE_SEND)
dcc_resume_send(dcc, port);
else
dcc_resume_get(dcc);
g_free(params); g_free(params);
} }
static void dcc_resume_rec(DCC_REC *dcc) static void dcc_resume_rec(DCC_REC *dcc)
{ {
gchar *str; char *str;
g_return_if_fail(dcc != NULL);
dcc->get_type = DCC_GET_RESUME;
dcc->file = dcc_prepare_path(dcc->arg); dcc->file = dcc_prepare_path(dcc->arg);
dcc->fhandle = open(dcc->file, O_WRONLY, dcc_file_create_mode); dcc->fhandle = open(dcc->file, O_WRONLY, dcc_file_create_mode);
if (dcc->fhandle == -1) if (dcc->fhandle == -1) {
{
signal_emit("dcc error file not found", 2, dcc, dcc->file); signal_emit("dcc error file not found", 2, dcc, dcc->file);
dcc_destroy(dcc); dcc_destroy(dcc);
return;
} }
else
{
dcc->transfd = lseek(dcc->fhandle, 0, SEEK_END); dcc->transfd = lseek(dcc->fhandle, 0, SEEK_END);
if (dcc->transfd < 0) dcc->transfd = 0; if (dcc->transfd < 0) dcc->transfd = 0;
dcc->skipped = dcc->transfd; dcc->skipped = dcc->transfd;
@ -290,15 +341,13 @@ static void dcc_resume_rec(DCC_REC *dcc)
dcc_ctcp_message(dcc->nick, dcc->server, dcc->chat, FALSE, str); dcc_ctcp_message(dcc->nick, dcc->server, dcc->chat, FALSE, str);
g_free(str); g_free(str);
} }
}
/* command: DCC RESUME */ static void cmd_dcc_resume(const char *data)
static void cmd_dcc_resume(gchar *data)
{ {
DCC_REC *dcc; DCC_REC *dcc;
GSList *tmp; GSList *tmp;
gchar *params, *nick, *fname; char *params, *nick, *fname;
gboolean found; int found;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -306,15 +355,11 @@ static void cmd_dcc_resume(gchar *data)
if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
dcc = NULL; found = FALSE; dcc = NULL; found = FALSE;
for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) {
{
dcc = tmp->data; dcc = tmp->data;
if (dcc->dcc_type == DCC_TYPE_GET && dcc->handle == -1 && g_strcasecmp(dcc->nick, nick) == 0 && if (dcc_is_unget(dcc) && g_strcasecmp(dcc->nick, nick) == 0 &&
(*fname == '\0' || strcmp(dcc->arg, fname) == 0)) (*fname == '\0' || strcmp(dcc->arg, fname) == 0)) {
{
/* found! */
dcc->get_type = DCC_GET_RESUME;
dcc_resume_rec(dcc); dcc_resume_rec(dcc);
found = TRUE; found = TRUE;
} }
@ -326,40 +371,36 @@ static void cmd_dcc_resume(gchar *data)
g_free(params); g_free(params);
} }
/* input function: DCC SEND send more data */ /* input function: DCC SEND - we're ready to send more data */
static void dcc_send_data(DCC_REC *dcc) static void dcc_send_data(DCC_REC *dcc)
{ {
gint n; int ret;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
if (!dcc->fastsend && !dcc->gotalldata) if (!dcc->fastsend && !dcc->gotalldata) {
{
/* haven't received everything we've send there yet.. */ /* haven't received everything we've send there yet.. */
return; return;
} }
n = read(dcc->fhandle, dcc->databuf, dcc->databufsize); ret = read(dcc->fhandle, dcc->databuf, dcc->databufsize);
if (n <= 0) if (ret <= 0) {
{
/* end of file .. or some error .. */ /* end of file .. or some error .. */
if (dcc->fastsend) if (dcc->fastsend) {
{ /* no need to call this function anymore..
/* no need to call this function anymore.. in fact it just eats in fact it just eats all the cpu.. */
all the cpu.. */
dcc->waitforend = TRUE; dcc->waitforend = TRUE;
g_source_remove(dcc->tagwrite); g_source_remove(dcc->tagwrite);
dcc->tagwrite = -1; dcc->tagwrite = -1;
} } else {
else
{
signal_emit("dcc closed", 1, dcc); signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
} }
return; return;
} }
dcc->transfd += net_transmit(dcc->handle, dcc->databuf, n); ret = net_transmit(dcc->handle, dcc->databuf, ret);
if (ret > 0) dcc->transfd += ret;
dcc->gotalldata = FALSE; dcc->gotalldata = FALSE;
lseek(dcc->fhandle, dcc->transfd, SEEK_SET); lseek(dcc->fhandle, dcc->transfd, SEEK_SET);
@ -367,56 +408,52 @@ static void dcc_send_data(DCC_REC *dcc)
signal_emit("dcc transfer update", 1, dcc); signal_emit("dcc transfer update", 1, dcc);
} }
/* input function: DCC SEND received some data */ /* input function: DCC SEND - received some data */
static void dcc_send_read_size(DCC_REC *dcc) static void dcc_send_read_size(DCC_REC *dcc)
{ {
guint32 bytes; guint32 bytes;
gint ret; int ret;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
if (dcc->read_pos == 4) if (dcc->count_pos == 4)
return; return;
/* we need to get 4 bytes.. */ /* we need to get 4 bytes.. */
ret = net_receive(dcc->handle, dcc->read_buf+dcc->read_pos, 4-dcc->read_pos); ret = net_receive(dcc->handle, dcc->count_buf+dcc->count_pos, 4-dcc->count_pos);
if (ret == -1) if (ret == -1) {
{
signal_emit("dcc closed", 1, dcc); signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
return; return;
} }
dcc->read_pos += ret; dcc->count_pos += ret;
if (dcc->read_pos == 4) if (dcc->count_pos != 4)
{ return;
bytes = 0; memcpy(&bytes, dcc->read_buf, 4);
memcpy(&bytes, dcc->count_buf, 4);
bytes = (guint32) ntohl(bytes); bytes = (guint32) ntohl(bytes);
dcc->gotalldata = bytes == dcc->transfd; dcc->gotalldata = bytes == dcc->transfd;
dcc->read_pos = 0; dcc->count_pos = 0;
if (!dcc->fastsend) if (!dcc->fastsend) {
{
/* send more data.. */ /* send more data.. */
dcc_send_data(dcc); dcc_send_data(dcc);
} }
if (dcc->waitforend && dcc->gotalldata) if (dcc->waitforend && dcc->gotalldata) {
{
/* file is sent */ /* file is sent */
signal_emit("dcc closed", 1, dcc); signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
return;
}
} }
} }
/* input function: DCC SEND - someone tried to connect to our socket */ /* input function: DCC SEND - someone tried to connect to our socket */
static void dcc_send_init(DCC_REC *dcc) static void dcc_send_init(DCC_REC *dcc)
{ {
gint handle, port; int handle, port;
IPADDR addr; IPADDR addr;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
@ -426,20 +463,24 @@ static void dcc_send_init(DCC_REC *dcc)
if (handle == -1) if (handle == -1)
return; return;
/* FIXME: add paranoia checking, check if host ip is the same as to who /* TODO: some kind of paranoia check would be nice. it would check
we sent the DCC SEND request.. */ that the host of the nick who we sent the request matches the
address who connected us. */
g_source_remove(dcc->tagread); g_source_remove(dcc->tagread);
close(dcc->handle); close(dcc->handle);
dcc->starttime = time(NULL);
dcc->fastsend = settings_get_bool("dcc_fast_send"); dcc->fastsend = settings_get_bool("dcc_fast_send");
dcc->handle = handle; dcc->handle = handle;
memcpy(&dcc->addr, &addr, sizeof(IPADDR)); memcpy(&dcc->addr, &addr, sizeof(IPADDR));
net_ip2host(&dcc->addr, dcc->addrstr); net_ip2host(&dcc->addr, dcc->addrstr);
dcc->port = port; dcc->port = port;
dcc->databufsize = settings_get_int("dcc_block_size") > 0 ? settings_get_int("dcc_block_size") : 2048;
dcc->databufsize = settings_get_int("dcc_block_size");
if (dcc->databufsize <= 0) dcc->databufsize = 2048;
dcc->databuf = g_malloc(dcc->databufsize); dcc->databuf = g_malloc(dcc->databufsize);
dcc->starttime = time(NULL);
dcc->tagread = g_input_add(handle, G_INPUT_READ, dcc->tagread = g_input_add(handle, G_INPUT_READ,
(GInputFunction) dcc_send_read_size, dcc); (GInputFunction) dcc_send_read_size, dcc);
dcc->tagwrite = !dcc->fastsend ? -1 : dcc->tagwrite = !dcc->fastsend ? -1 :
@ -447,8 +488,7 @@ static void dcc_send_init(DCC_REC *dcc)
signal_emit("dcc connected", 1, dcc); signal_emit("dcc connected", 1, dcc);
if (!dcc->fastsend) if (!dcc->fastsend) {
{
/* send first block */ /* send first block */
dcc->gotalldata = TRUE; dcc->gotalldata = TRUE;
dcc_send_data(dcc); dcc_send_data(dcc);
@ -456,20 +496,22 @@ static void dcc_send_init(DCC_REC *dcc)
} }
/* command: DCC SEND */ /* command: DCC SEND */
static void cmd_dcc_send(gchar *data, IRC_SERVER_REC *server, WI_IRC_REC *item) static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
{ {
gchar *params, *target, *fname, *str, *ptr; char *params, *target, *fname, *str, *ptr;
gint fh, h, port; char host[MAX_IP_LEN];
glong fsize; int hfile, hlisten, port;
long fsize;
DCC_REC *dcc, *chat; DCC_REC *dcc, *chat;
IPADDR addr; IPADDR own_ip;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &fname); params = cmd_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &fname);
if (*target == '\0' || *fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
/* if we're in dcc chat, send the request via it. */ /* if we're in dcc chat, send the request via it. */
chat = irc_item_dcc_chat(item); chat = item_get_dcc(item);
if (chat != NULL && (chat->mirc_ctcp || g_strcasecmp(target, chat->nick) != 0)) if (chat != NULL && (chat->mirc_ctcp || g_strcasecmp(target, chat->nick) != 0))
chat = NULL; chat = NULL;
@ -477,73 +519,63 @@ static void cmd_dcc_send(gchar *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
if ((server == NULL || !server->connected) && chat == NULL) if ((server == NULL || !server->connected) && chat == NULL)
cmd_param_error(CMDERR_NOT_CONNECTED); cmd_param_error(CMDERR_NOT_CONNECTED);
if (*target == '\0' || *fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (dcc_find_item(DCC_TYPE_SEND, target, fname)) {
if (dcc_find_item(DCC_TYPE_SEND, target, fname))
{
signal_emit("dcc error send exists", 2, target, fname); signal_emit("dcc error send exists", 2, target, fname);
g_free(params); g_free(params);
return; return;
} }
str = convert_home(fname); str = convert_home(fname);
if (*str != '/') if (!g_path_is_absolute(str)) {
{ char *path;
gchar *path;
g_free(str); g_free(str);
path = convert_home(settings_get_str("dcc_upload_path")); path = convert_home(settings_get_str("dcc_upload_path"));
str = g_strconcat(path, "/", fname, NULL); str = g_strconcat(path, G_DIR_SEPARATOR_S, fname, NULL);
g_free(path); g_free(path);
} }
fh = open(str, O_RDONLY); hfile = open(str, O_RDONLY);
g_free(str); g_free(str);
if (fh == -1) if (hfile == -1) {
{
signal_emit("dcc error file not found", 2, target, fname); signal_emit("dcc error file not found", 2, target, fname);
g_free(params); g_free(params);
return; return;
} }
fsize = lseek(fh, 0, SEEK_END); fsize = lseek(hfile, 0, SEEK_END);
lseek(fh, 0, SEEK_SET); lseek(hfile, 0, SEEK_SET);
/* get the IP address we use with IRC server */ /* get the IP address we use with IRC server */
if (net_getsockname(chat != NULL ? chat->handle : server->handle, &addr, NULL) == -1) if (net_getsockname(chat != NULL ? chat->handle : server->handle, &own_ip, NULL) == -1) {
{ close(hfile);
close(fh);
cmd_param_error(CMDERR_ERRNO); cmd_param_error(CMDERR_ERRNO);
} }
/* start listening */ /* start listening */
port = settings_get_int("dcc_port"); port = settings_get_int("dcc_port");
h = net_listen(&addr, &port); hlisten = net_listen(&own_ip, &port);
if (h == -1) if (hlisten == -1) {
{ close(hfile);
close(fh);
cmd_param_error(CMDERR_ERRNO); cmd_param_error(CMDERR_ERRNO);
} }
/* skip path */ /* skip path, change all spaces to _ */
ptr = strrchr(fname, '/'); fname = g_strdup(g_basename(fname));
if (ptr != NULL) fname = ptr+1;
/* change all spaces to _ */
fname = g_strdup(fname);
for (ptr = fname; *ptr != '\0'; ptr++) for (ptr = fname; *ptr != '\0'; ptr++)
if (*ptr == ' ') *ptr = '_'; if (*ptr == ' ') *ptr = '_';
dcc = dcc_create(DCC_TYPE_SEND, h, target, fname, server, chat); dcc = dcc_create(DCC_TYPE_SEND, hlisten, target, fname, server, chat);
dcc->port = port; dcc->port = port;
dcc->size = fsize; dcc->size = fsize;
dcc->fhandle = fh; dcc->fhandle = hfile;
dcc->tagread = g_input_add(h, G_INPUT_READ, dcc->tagread = g_input_add(hlisten, G_INPUT_READ,
(GInputFunction) dcc_send_init, dcc); (GInputFunction) dcc_send_init, dcc);
/* send DCC request */ /* send DCC request */
dcc_make_address(&own_ip, host);
str = g_strdup_printf("DCC SEND %s %s %d %lu", str = g_strdup_printf("DCC SEND %s %s %d %lu",
fname, dcc_make_address(&addr), port, fsize); fname, host, port, fsize);
dcc_ctcp_message(target, server, chat, FALSE, str); dcc_ctcp_message(target, server, chat, FALSE, str);
g_free(str); g_free(str);

183
src/irc/dcc/dcc.c
View File

@ -1,7 +1,7 @@
/* /*
dcc.c : irssi dcc.c : irssi
Copyright (C) 1999 Timo Sirainen Copyright (C) 1999-2000 Timo Sirainen
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -38,8 +38,7 @@ void dcc_files_deinit(void);
#define DCC_TYPES 5 #define DCC_TYPES 5
static gchar *dcc_types[] = static char *dcc_types[] = {
{
"CHAT", "CHAT",
"SEND", "SEND",
"GET", "GET",
@ -49,10 +48,11 @@ static gchar *dcc_types[] =
GSList *dcc_conns; GSList *dcc_conns;
static gint dcc_timeouttag; static int dcc_timeouttag;
/* Create new DCC record */ /* Create new DCC record */
DCC_REC *dcc_create(gint type, gint handle, gchar *nick, gchar *arg, IRC_SERVER_REC *server, DCC_REC *chat) DCC_REC *dcc_create(int type, int handle, const char *nick, const char *arg,
IRC_SERVER_REC *server, DCC_REC *chat)
{ {
DCC_REC *dcc; DCC_REC *dcc;
@ -60,11 +60,10 @@ DCC_REC *dcc_create(gint type, gint handle, gchar *nick, gchar *arg, IRC_SERVER_
g_return_val_if_fail(arg != NULL, NULL); g_return_val_if_fail(arg != NULL, NULL);
dcc = g_new0(DCC_REC, 1); dcc = g_new0(DCC_REC, 1);
dcc->type = type == DCC_TYPE_CHAT ? module_get_uniq_id("IRC", WI_IRC_DCC_CHAT) : -1;
dcc->mirc_ctcp = settings_get_bool("dcc_mirc_ctcp"); dcc->mirc_ctcp = settings_get_bool("dcc_mirc_ctcp");
dcc->created = time(NULL); dcc->created = time(NULL);
dcc->chat = chat; dcc->chat = chat;
dcc->dcc_type = type; dcc->type = type;
dcc->arg = g_strdup(arg); dcc->arg = g_strdup(arg);
dcc->nick = g_strdup(nick); dcc->nick = g_strdup(nick);
dcc->handle = handle; dcc->handle = handle;
@ -73,33 +72,40 @@ DCC_REC *dcc_create(gint type, gint handle, gchar *nick, gchar *arg, IRC_SERVER_
dcc->server = server; dcc->server = server;
dcc->mynick = g_strdup(server != NULL ? server->nick : dcc->mynick = g_strdup(server != NULL ? server->nick :
chat != NULL ? chat->nick : "??"); chat != NULL ? chat->nick : "??");
dcc->ircnet = server == NULL ? dcc->ircnet = server == NULL ?
chat == NULL || chat->ircnet == NULL ? NULL : g_strdup(chat->ircnet) : (chat == NULL || chat->ircnet == NULL ? NULL : g_strdup(chat->ircnet)) :
server->connrec->ircnet == NULL ? NULL : g_strdup(server->connrec->ircnet); (server->connrec->ircnet == NULL ? NULL : g_strdup(server->connrec->ircnet));
dcc_conns = g_slist_append(dcc_conns, dcc); dcc_conns = g_slist_append(dcc_conns, dcc);
signal_emit("dcc created", 1, dcc); signal_emit("dcc created", 1, dcc);
return dcc; return dcc;
} }
/* Destroy DCC record */ static void dcc_remove_chat_refs(DCC_REC *dcc)
void dcc_destroy(DCC_REC *dcc)
{ {
GSList *tmp; GSList *tmp;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
dcc_conns = g_slist_remove(dcc_conns, dcc); for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) {
/* remove dcc chat references.. */
for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next)
{
DCC_REC *rec = tmp->data; DCC_REC *rec = tmp->data;
if (rec->chat == dcc) if (rec->chat == dcc)
rec->chat = NULL; rec->chat = NULL;
} }
}
/* Destroy DCC record */
void dcc_destroy(DCC_REC *dcc)
{
g_return_if_fail(dcc != NULL);
if (dcc->destroyed) return;
dcc_conns = g_slist_remove(dcc_conns, dcc);
dcc_remove_chat_refs(dcc);
dcc->destroyed = TRUE;
signal_emit("dcc destroyed", 1, dcc); signal_emit("dcc destroyed", 1, dcc);
if (dcc->fhandle != -1) close(dcc->fhandle); if (dcc->fhandle != -1) close(dcc->fhandle);
@ -107,49 +113,44 @@ void dcc_destroy(DCC_REC *dcc)
if (dcc->tagread != -1) g_source_remove(dcc->tagread); if (dcc->tagread != -1) g_source_remove(dcc->tagread);
if (dcc->tagwrite != -1) g_source_remove(dcc->tagwrite); if (dcc->tagwrite != -1) g_source_remove(dcc->tagwrite);
if (dcc->dcc_type == DCC_TYPE_CHAT) if (dcc->type == DCC_TYPE_CHAT)
line_split_free((LINEBUF_REC *) dcc->databuf); line_split_free((LINEBUF_REC *) dcc->databuf);
else if (dcc->databuf != NULL) g_free(dcc->databuf); else if (dcc->databuf != NULL)
if (dcc->file != NULL) g_free(dcc->file); g_free(dcc->databuf);
if (dcc->ircnet != NULL) g_free(dcc->ircnet);
g_free_not_null(dcc->file);
g_free_not_null(dcc->ircnet);
g_free(dcc->mynick); g_free(dcc->mynick);
g_free(dcc->nick); g_free(dcc->nick);
g_free(dcc->arg); g_free(dcc->arg);
g_free(dcc); g_free(dcc);
} }
gchar *dcc_make_address(IPADDR *ip) void dcc_make_address(IPADDR *ip, char *host)
{ {
static gchar str[MAX_IP_LEN]; unsigned long addr;
gulong addr;
if (is_ipv6_addr(ip)) if (is_ipv6_addr(ip)) {
{
/* IPv6 */ /* IPv6 */
net_ip2host(ip, str); net_ip2host(ip, host);
} } else {
else
{
memcpy(&addr, &ip->addr, 4); memcpy(&addr, &ip->addr, 4);
sprintf(str, "%lu", (unsigned long) htonl(addr)); sprintf(host, "%lu", (unsigned long) htonl(addr));
} }
return str;
} }
/* Find DCC record, arg can be NULL */ /* Find DCC record, arg can be NULL */
DCC_REC *dcc_find_item(gint type, gchar *nick, gchar *arg) DCC_REC *dcc_find_item(int type, const char *nick, const char *arg)
{ {
DCC_REC *dcc; DCC_REC *dcc;
GSList *tmp; GSList *tmp;
g_return_val_if_fail(nick != NULL, NULL); g_return_val_if_fail(nick != NULL, NULL);
for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) {
{
dcc = tmp->data; dcc = tmp->data;
if (dcc->dcc_type == type && g_strcasecmp(dcc->nick, nick) == 0 && if (dcc->type == type && g_strcasecmp(dcc->nick, nick) == 0 &&
(arg == NULL || strcmp(dcc->arg, arg) == 0)) (arg == NULL || strcmp(dcc->arg, arg) == 0))
return dcc; return dcc;
} }
@ -158,55 +159,51 @@ DCC_REC *dcc_find_item(gint type, gchar *nick, gchar *arg)
} }
/* Find DCC record by port # */ /* Find DCC record by port # */
DCC_REC *dcc_find_by_port(gchar *nick, gint port) DCC_REC *dcc_find_by_port(const char *nick, int port)
{ {
DCC_REC *dcc; DCC_REC *dcc;
GSList *tmp; GSList *tmp;
for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) {
{
dcc = tmp->data; dcc = tmp->data;
if (dcc->port == port && ((dcc->dcc_type == DCC_TYPE_GET || dcc->dcc_type == DCC_TYPE_SEND) && g_strcasecmp(dcc->nick, nick) == 0)) if ((dcc->type == DCC_TYPE_GET || dcc->type == DCC_TYPE_SEND) &&
{ dcc->port == port && g_strcasecmp(dcc->nick, nick) == 0)
/* found! */
return dcc; return dcc;
} }
}
return NULL; return NULL;
} }
gchar *dcc_type2str(gint type) const char *dcc_type2str(int type)
{ {
g_return_val_if_fail(type >= 1 && type <= DCC_TYPES, NULL); g_return_val_if_fail(type >= 1 && type <= DCC_TYPES, NULL);
return dcc_types[type-1]; return dcc_types[type-1];
} }
gint dcc_str2type(gchar *type) int dcc_str2type(const char *type)
{ {
gint num; int num;
for (num = 0; num < DCC_TYPES; num++) for (num = 0; num < DCC_TYPES; num++) {
if (g_strcasecmp(dcc_types[num], type) == 0) return num+1; if (g_strcasecmp(dcc_types[num], type) == 0)
return num+1;
}
return 0; return 0;
} }
void dcc_ctcp_message(gchar *target, IRC_SERVER_REC *server, DCC_REC *chat, gboolean notice, gchar *msg) void dcc_ctcp_message(const char *target, IRC_SERVER_REC *server, DCC_REC *chat, int notice, const char *msg)
{ {
gchar *str; char *str;
if (chat != NULL) if (chat != NULL) {
{
/* send it via open DCC chat */ /* send it via open DCC chat */
/* FIXME: we need output queue! */ str = g_strdup_printf("%s\001%s\001", chat->mirc_ctcp ? "" :
str = g_strdup_printf("%s\001%s\001\n", chat->mirc_ctcp ? "" :
notice ? "CTCP_REPLY " : "CTCP_MESSAGE ", msg); notice ? "CTCP_REPLY " : "CTCP_MESSAGE ", msg);
net_transmit(chat->handle, str, strlen(str)); dcc_chat_send(chat, str);
} } else {
else
{
str = g_strdup_printf("%s %s :\001%s\001", str = g_strdup_printf("%s %s :\001%s\001",
notice ? "NOTICE" : "PRIVMSG", target, msg); notice ? "NOTICE" : "PRIVMSG", target, msg);
irc_send_cmd(server, str); irc_send_cmd(server, str);
@ -244,55 +241,48 @@ static void dcc_server_disconnected(IRC_SERVER_REC *server)
g_return_if_fail(server != NULL); g_return_if_fail(server != NULL);
for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) {
{
DCC_REC *dcc = tmp->data; DCC_REC *dcc = tmp->data;
if (dcc->server == server) if (dcc->server != server)
{ continue;
if (dcc->ircnet == NULL) if (dcc->ircnet == NULL)
dcc->server = NULL; dcc->server = NULL;
else else {
{
dcc->server = (IRC_SERVER_REC *) server_find_ircnet(dcc->ircnet); dcc->server = (IRC_SERVER_REC *) server_find_ircnet(dcc->ircnet);
if (dcc->server != NULL) if (dcc->server != NULL) {
{
g_free(dcc->mynick); g_free(dcc->mynick);
dcc->mynick = g_strdup(dcc->server->nick); dcc->mynick = g_strdup(dcc->server->nick);
} }
} }
} }
} }
}
static void dcc_get_address(gchar *str, IPADDR *ip) static void dcc_get_address(const char *str, IPADDR *ip)
{ {
gulong addr; unsigned long addr;
if (strchr(str, ':') == NULL) if (strchr(str, ':') == NULL) {
{ /* normal IPv4 address in 32bit number form */
/* normal IPv4 address */ addr = atol(str);
if (sscanf(str, "%lu", &addr)!=1)
addr = 0;
ip->family = AF_INET; ip->family = AF_INET;
addr = (gulong) ntohl(addr); addr = (unsigned long) ntohl(addr);
memcpy(&ip->addr, &addr, 4); memcpy(&ip->addr, &addr, 4);
} } else {
else /* IPv6 - in standard form */
{
/* IPv6 */
net_host2ip(str, ip); net_host2ip(str, ip);
} }
} }
/* Handle incoming DCC CTCP messages */ /* Handle incoming DCC CTCP messages */
static void dcc_ctcp_msg(gchar *data, IRC_SERVER_REC *server, gchar *sender, gchar *sendaddr, gchar *target, DCC_REC *chat) static void dcc_ctcp_msg(char *data, IRC_SERVER_REC *server, char *sender, char *sendaddr, char *target, DCC_REC *chat)
{ {
gchar *params, *type, *arg, *addrstr, *portstr, *sizestr, *str; char *params, *type, *arg, *addrstr, *portstr, *sizestr, *str;
const char *cstr; const char *cstr;
DCC_REC *dcc; DCC_REC *dcc;
gulong size; gulong size;
gint port; int port;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
g_return_if_fail(sender != NULL); g_return_if_fail(sender != NULL);
@ -308,7 +298,7 @@ static void dcc_ctcp_msg(gchar *data, IRC_SERVER_REC *server, gchar *sender, gch
dcc->port = port; dcc->port = port;
dcc->size = size; dcc->size = size;
switch (dcc->dcc_type) switch (dcc->type)
{ {
case DCC_TYPE_GET: case DCC_TYPE_GET:
cstr = settings_get_str("dcc_autoget_masks"); cstr = settings_get_str("dcc_autoget_masks");
@ -362,10 +352,10 @@ static void dcc_ctcp_msg(gchar *data, IRC_SERVER_REC *server, gchar *sender, gch
} }
/* Handle incoming DCC CTCP replies */ /* Handle incoming DCC CTCP replies */
static void dcc_ctcp_reply(gchar *data, IRC_SERVER_REC *server, gchar *sender, gchar *sendaddr) static void dcc_ctcp_reply(char *data, IRC_SERVER_REC *server, char *sender, char *sendaddr)
{ {
gchar *params, *cmd, *subcmd, *args; char *params, *cmd, *subcmd, *args;
gint type; int type;
DCC_REC *dcc; DCC_REC *dcc;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -379,7 +369,6 @@ static void dcc_ctcp_reply(gchar *data, IRC_SERVER_REC *server, gchar *sender, g
dcc = dcc_find_item(type, sender, type == DCC_TYPE_CHAT ? NULL : args); dcc = dcc_find_item(type, sender, type == DCC_TYPE_CHAT ? NULL : args);
if (dcc != NULL) if (dcc != NULL)
{ {
dcc->destroyed = TRUE;
signal_emit("dcc closed", 1, dcc); signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
} }
@ -395,34 +384,33 @@ static void dcc_ctcp_reply(gchar *data, IRC_SERVER_REC *server, gchar *sender, g
static void dcc_reject(DCC_REC *dcc, IRC_SERVER_REC *server) static void dcc_reject(DCC_REC *dcc, IRC_SERVER_REC *server)
{ {
gchar *str; char *str;
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
if (dcc->server != NULL) server = dcc->server; if (dcc->server != NULL) server = dcc->server;
if (server != NULL && (dcc->dcc_type != DCC_TYPE_CHAT || dcc->starttime == 0)) if (server != NULL && (dcc->type != DCC_TYPE_CHAT || dcc->starttime == 0))
{ {
signal_emit("dcc rejected", 1, dcc); signal_emit("dcc rejected", 1, dcc);
str = g_strdup_printf("NOTICE %s :\001DCC REJECT %s %s\001", str = g_strdup_printf("NOTICE %s :\001DCC REJECT %s %s\001",
dcc->nick, dcc_type2str(SWAP_SENDGET(dcc->dcc_type)), dcc->arg); dcc->nick, dcc_type2str(SWAP_SENDGET(dcc->type)), dcc->arg);
irc_send_cmd(server, str); irc_send_cmd(server, str);
g_free(str); g_free(str);
} }
dcc->destroyed = TRUE;
signal_emit("dcc closed", 1, dcc); signal_emit("dcc closed", 1, dcc);
dcc_destroy(dcc); dcc_destroy(dcc);
} }
/* command: DCC CLOSE */ /* command: DCC CLOSE */
static void cmd_dcc_close(gchar *data, IRC_SERVER_REC *server) static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
{ {
DCC_REC *dcc; DCC_REC *dcc;
GSList *tmp, *next; GSList *tmp, *next;
gchar *params, *type, *nick, *arg; char *params, *type, *nick, *arg;
gboolean found; gboolean found;
gint itype; int itype;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -443,7 +431,7 @@ static void cmd_dcc_close(gchar *data, IRC_SERVER_REC *server)
dcc = tmp->data; dcc = tmp->data;
next = tmp->next; next = tmp->next;
if (dcc->dcc_type == itype && g_strcasecmp(nick, dcc->nick) == 0) if (dcc->type == itype && g_strcasecmp(nick, dcc->nick) == 0)
{ {
dcc_reject(dcc, server); dcc_reject(dcc, server);
found = TRUE; found = TRUE;
@ -481,9 +469,9 @@ static int dcc_timeout_func(void)
return 1; return 1;
} }
static void event_no_such_nick(gchar *data, IRC_SERVER_REC *server) static void event_no_such_nick(char *data, IRC_SERVER_REC *server)
{ {
gchar *params, *nick; char *params, *nick;
GSList *tmp, *next; GSList *tmp, *next;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -499,7 +487,6 @@ static void event_no_such_nick(gchar *data, IRC_SERVER_REC *server)
if (g_strcasecmp(rec->nick, nick) == 0 && rec->starttime == 0) if (g_strcasecmp(rec->nick, nick) == 0 && rec->starttime == 0)
{ {
/* timed out. */ /* timed out. */
rec->destroyed = TRUE;
signal_emit("dcc closed", 1, rec); signal_emit("dcc closed", 1, rec);
dcc_destroy(rec); dcc_destroy(rec);
} }

88
src/irc/dcc/dcc.h
View File

@ -3,8 +3,7 @@
#include "network.h" #include "network.h"
enum enum {
{
DCC_TYPE_CHAT = 1, DCC_TYPE_CHAT = 1,
DCC_TYPE_SEND, DCC_TYPE_SEND,
DCC_TYPE_GET, DCC_TYPE_GET,
@ -12,63 +11,59 @@ enum
DCC_TYPE_ACCEPT DCC_TYPE_ACCEPT
}; };
enum enum {
{ DCC_GET_RENAME = 0, /* this also acts as default */
DCC_GET_DEFAULT = 0,
DCC_GET_OVERWRITE, DCC_GET_OVERWRITE,
DCC_GET_RENAME,
DCC_GET_RESUME DCC_GET_RESUME
}; };
#define SWAP_SENDGET(a) ((a) == DCC_TYPE_SEND ? DCC_TYPE_GET : \ #define SWAP_SENDGET(a) ((a) == DCC_TYPE_SEND ? DCC_TYPE_GET : \
(a) == DCC_TYPE_GET ? DCC_TYPE_SEND : (a)) (a) == DCC_TYPE_GET ? DCC_TYPE_SEND : (a))
typedef struct DCC_REC typedef struct DCC_REC {
{
int type; int type;
GHashTable *module_data; time_t created;
IRC_SERVER_REC *server; IRC_SERVER_REC *server;
gchar *nick; char *nick;
struct DCC_REC *chat; /* if the request came through DCC chat */ struct DCC_REC *chat; /* if the request came through DCC chat */
gchar *ircnet; char *ircnet;
gchar *mynick; char *mynick;
gchar *arg; char *arg;
gchar *file; /* file name we're really moving, arg is just the reference.. */ char *file; /* file name we're really moving, arg is just the reference.. */
time_t created;
gint dcc_type;
IPADDR addr; /* address we're connected in */ IPADDR addr; /* address we're connected in */
gchar addrstr[MAX_IP_LEN]; /* in readable form */ char addrstr[MAX_IP_LEN]; /* in readable form */
gint port; /* port we're connected in */ int port; /* port we're connected in */
glong size, transfd, skipped; /* file size / bytes transferred / skipped at start */ long size, transfd, skipped; /* file size / bytes transferred / skipped at start */
gint handle; /* socket handle */ int handle; /* socket handle */
gint tagread, tagwrite; int tagread, tagwrite;
gint fhandle; /* file handle */ int fhandle; /* file handle */
time_t starttime; /* transfer start time */ time_t starttime; /* transfer start time */
gint trans_bytes; int trans_bytes;
gboolean fastsend; /* fastsending (just in case that global fastsend toggle changes while transferring..) */ int get_type; /* DCC get: what to do if file exists? */
gboolean waitforend; /* DCC fast send: file is sent, just wait for the replies from the other side */
gboolean gotalldata; /* DCC fast send: got all acks from the other end (needed to make sure the end of transfer works right) */
gint get_type; /* DCC get: what to do if file exists? */
gboolean mirc_ctcp; /* DCC chat: Send CTCPs without the CTCP_MESSAGE prefix */ int fastsend:1; /* fastsending (just in case that global fastsend toggle changes while transferring..) */
gboolean destroyed; /* We're about to destroy this DCC recond */ int waitforend:1; /* DCC fast send: file is sent, just wait for the replies from the other side */
int gotalldata:1; /* DCC fast send: got all acks from the other end (needed to make sure the end of transfer works right) */
/* read counter buffer */ int mirc_ctcp:1; /* DCC chat: Send CTCPs without the CTCP_MESSAGE prefix */
gchar read_buf[4]; int destroyed:1; /* We're about to destroy this DCC recond */
gint read_pos;
gchar *databuf; /* buffer for receiving/transmitting data */ /* read/write counter buffer */
gint databufsize; char count_buf[4];
} int count_pos;
DCC_REC;
char *databuf; /* buffer for receiving/transmitting data */
int databufsize;
GHashTable *module_data;
} DCC_REC;
extern GSList *dcc_conns; extern GSList *dcc_conns;
@ -76,16 +71,21 @@ void dcc_init(void);
void dcc_deinit(void); void dcc_deinit(void);
/* Find DCC record, arg can be NULL */ /* Find DCC record, arg can be NULL */
DCC_REC *dcc_find_item(gint type, gchar *nick, gchar *arg); DCC_REC *dcc_find_item(int type, const char *nick, const char *arg);
DCC_REC *dcc_find_by_port(gchar *nick, gint port); DCC_REC *dcc_find_by_port(const char *nick, int port);
gchar *dcc_type2str(gint type); const char *dcc_type2str(int type);
gint dcc_str2type(gchar *type); int dcc_str2type(const char *type);
gchar *dcc_make_address(IPADDR *ip); void dcc_make_address(IPADDR *ip, char *host);
DCC_REC *dcc_create(gint type, gint handle, gchar *nick, gchar *arg, IRC_SERVER_REC *server, DCC_REC *chat); DCC_REC *dcc_create(int type, int handle, const char *nick, const char *arg, IRC_SERVER_REC *server, DCC_REC *chat);
void dcc_destroy(DCC_REC *dcc); void dcc_destroy(DCC_REC *dcc);
void dcc_ctcp_message(gchar *target, IRC_SERVER_REC *server, DCC_REC *chat, gboolean notice, gchar *msg); void dcc_ctcp_message(const char *target, IRC_SERVER_REC *server, DCC_REC *chat, int notice, const char *msg);
/* Send `data' to dcc chat. */
void dcc_chat_send(DCC_REC *dcc, const char *data);
/* If `item' is a query of a =nick, return DCC chat record of nick */
DCC_REC *item_get_dcc(void *item);
#endif #endif