philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move calls to parse_offer_params() into create_dcc_int()

Browse Source 
Every call to create_dcc_int() was preceded by a call to parse_offer_params(), and the DCC_int
is where the address/port/size produced by the latter is stored, so this refactoring makes
sense and reduces the calling function complexity/size considerably.
This commit is contained in:
Kevin Easton
2016-11-03 00:45:38 +11:00
parent 6cac0e6bb1
commit 414b1cc679
1 changed files with 44 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
source/dcc.c
View File

@@ -1131,7 +1131,7 @@ static char *dcc_fullname(const char *filename)
} }
static int parse_offer_params(const struct dcc_offer *offer, static int parse_offer_params(const struct dcc_offer *offer,
unsigned long *p_addr, unsigned *p_port, unsigned long *p_filesize) unsigned long *p_addr, unsigned short *p_port, unsigned long *p_filesize)
{ {
if (offer->size && *offer->size) if (offer->size && *offer->size)
*p_filesize = strtoul(offer->size, NULL, 10); *p_filesize = strtoul(offer->size, NULL, 10);
@@ -1185,25 +1185,31 @@ static int check_collision(char *nick, const char *description, int type)
return 1; return 1;
} }
static DCC_int *create_dcc_int(const char *nick, const char *description, static DCC_int *create_dcc_int(const struct dcc_offer *offer, int server)
const char *userhost, unsigned long address, unsigned short port,
unsigned long filesize, int server)
{ {
UserList *ul = NULL; UserList *ul = NULL;
DCC_int *n = new_malloc(sizeof *n); DCC_int *n;
unsigned long filesize;
unsigned long address;
unsigned short port;
if (!parse_offer_params(offer, &address, &port, &filesize))
return NULL;
n = new_malloc(sizeof *n);
#ifdef WANT_USERLIST #ifdef WANT_USERLIST
ul = lookup_userlevelc(nick, userhost, "*", NULL); ul = lookup_userlevelc(offer->nick, offer->userhost, "*", NULL);
#endif #endif
if (userhost) if (offer->userhost)
n->userhost = m_strdup(userhost); n->userhost = m_strdup(offer->userhost);
n->ul = ul; n->ul = ul;
n->remport = port; n->remport = port;
n->remote.s_addr = htonl(address); n->remote.s_addr = htonl(address);
n->filesize = filesize; n->filesize = filesize;
n->filename = m_strdup(description); n->filename = m_strdup(offer->description);
n->user = m_strdup(nick); n->user = m_strdup(offer->nick);
n->blocksize = get_int_var(DCC_BLOCK_SIZE_VAR); n->blocksize = get_int_var(DCC_BLOCK_SIZE_VAR);
n->server = server; n->server = server;
n->file = -1; /* just in case */ n->file = -1; /* just in case */
@@ -1231,18 +1237,14 @@ static DCC_List *add_dcc_pending(DCC_int *dcc, int flags, void (*func_read)(int)
/* show_dcc_offer() /* show_dcc_offer()
* Wrapper to show the user using the default format a non-file (eg. CHAT) DCC offer. * Wrapper to show the user using the default format a non-file (eg. CHAT) DCC offer.
*/ */
static void show_dcc_offer(const char *nick, const char *dcc_name, static void show_dcc_offer(const DCC_int *n, const char *dcc_name)
const char *description, const char *userhost, unsigned long offer_addr,
unsigned int offer_port)
{ {
if (!dcc_quiet) if (!dcc_quiet)
{ {
struct in_addr in;
in.s_addr = htonl(offer_addr);
put_it("%s", convert_output_format(fget_string_var(FORMAT_DCC_REQUEST_FSET), put_it("%s", convert_output_format(fget_string_var(FORMAT_DCC_REQUEST_FSET),
"%s %s %s %s %s %s %d", "%s %s %s %s %s %s %d",
update_clock(GET_TIME), dcc_name, description, nick, userhost, update_clock(GET_TIME), dcc_name, n->filename, n->user, n->userhost,
inet_ntoa(in), offer_port)); inet_ntoa(n->remote), n->remport));
} }
if (beep_on_level & LOG_DCC) if (beep_on_level & LOG_DCC)
@@ -1252,23 +1254,19 @@ static void show_dcc_offer(const char *nick, const char *dcc_name,
/* show_dcc_fileoffer() /* show_dcc_fileoffer()
* Wrapper to show the user using the default format a file (eg. SEND) DCC offer. * Wrapper to show the user using the default format a file (eg. SEND) DCC offer.
*/ */
static void show_dcc_fileoffer(const char *nick, const char *dcc_name, static void show_dcc_fileoffer(const DCC_int *n, const char *dcc_name)
const char *description, const char *userhost, unsigned long offer_addr,
unsigned int offer_port, unsigned long filesize)
{ {
if (!dcc_quiet) if (!dcc_quiet)
{ {
struct in_addr in;
char buf[40]; char buf[40];
in.s_addr = htonl(offer_addr); sprintf(buf, "%2.4g", _GMKv(n->filesize));
sprintf(buf, "%2.4g",_GMKv(filesize));
put_it("%s", convert_output_format(fget_string_var(FORMAT_DCC_REQUEST_FSET), put_it("%s", convert_output_format(fget_string_var(FORMAT_DCC_REQUEST_FSET),
"%s %s \"%s\" %s %s %s %d %s %s", "%s %s \"%s\" %s %s %s %d %s %s",
update_clock(GET_TIME), dcc_name, description, nick, userhost, update_clock(GET_TIME), dcc_name, n->filename, n->user, n->userhost,
inet_ntoa(in), offer_port, _GMKs(filesize), buf)); inet_ntoa(n->remote), n->remport, _GMKs(n->filesize), buf));
} }
if (!filesize) if (!n->filesize)
put_it("%s", convert_output_format("$G %RDCC%n Warning: Offered file has zero size", NULL, NULL)); put_it("%s", convert_output_format("$G %RDCC%n Warning: Offered file has zero size", NULL, NULL));
if (beep_on_level & LOG_DCC) if (beep_on_level & LOG_DCC)
@@ -1278,23 +1276,18 @@ static void show_dcc_fileoffer(const char *nick, const char *dcc_name,
static void dcc_chat_offer(const struct dcc_offer *offer, int server) static void dcc_chat_offer(const struct dcc_offer *offer, int server)
{ {
int Ctype = DCC_CHAT; int Ctype = DCC_CHAT;
unsigned long filesize;
unsigned long TempLong;
unsigned int TempInt;
DCC_int *n; DCC_int *n;
int autoget = 0; int autoget = 0;
if (!parse_offer_params(offer, &TempLong, &TempInt, &filesize))
return;
if (!check_collision(offer->nick, offer->description, Ctype)) if (!check_collision(offer->nick, offer->description, Ctype))
return; return;
n = create_dcc_int(offer->nick, offer->description, offer->userhost, TempLong, TempInt, filesize, server); if (!(n = create_dcc_int(offer, server)))
return;
if (do_hook(DCC_REQUEST_LIST, "%s %s %s 0", offer->nick, dcc_types[Ctype]->name, offer->description)) if (do_hook(DCC_REQUEST_LIST, "%s %s %s 0", n->user, dcc_types[Ctype]->name, n->filename))
{ {
show_dcc_offer(offer->nick, dcc_types[Ctype]->name, offer->description, offer->userhost, TempLong, TempInt); show_dcc_offer(n, dcc_types[Ctype]->name);
if (get_int_var(BOT_MODE_VAR) && n->ul) if (get_int_var(BOT_MODE_VAR) && n->ul)
{ {
@@ -1319,22 +1312,17 @@ static void dcc_chat_offer(const struct dcc_offer *offer, int server)
static void dcc_bot_offer(const struct dcc_offer *offer, int server) static void dcc_bot_offer(const struct dcc_offer *offer, int server)
{ {
int Ctype = DCC_BOTMODE; int Ctype = DCC_BOTMODE;
unsigned long filesize;
unsigned long TempLong;
unsigned int TempInt;
DCC_int *n; DCC_int *n;
if (!parse_offer_params(offer, &TempLong, &TempInt, &filesize))
return;
if (!check_collision(offer->nick, offer->description, Ctype)) if (!check_collision(offer->nick, offer->description, Ctype))
return; return;
n = create_dcc_int(offer->nick, offer->description, offer->userhost, TempLong, TempInt, filesize, server); if (!(n = create_dcc_int(offer, server)))
return;
if (do_hook(DCC_REQUEST_LIST, "%s %s %s 0", offer->nick, dcc_types[Ctype]->name, offer->description)) if (do_hook(DCC_REQUEST_LIST, "%s %s %s 0", n->user, dcc_types[Ctype]->name, n->filename))
{ {
show_dcc_offer(offer->nick, dcc_types[Ctype]->name, offer->description, offer->userhost, TempLong, TempInt); show_dcc_offer(n, dcc_types[Ctype]->name);
#if 0 #if 0
if (p = get_string_var(BOT_PASSWORD_VAR)) if (p = get_string_var(BOT_PASSWORD_VAR))
{ {
@@ -1390,9 +1378,6 @@ static int do_autoget(const char *nick, unsigned long filesize)
static void dcc_send_offer(const struct dcc_offer *offer, int server) static void dcc_send_offer(const struct dcc_offer *offer, int server)
{ {
int Ctype = DCC_FILEREAD; int Ctype = DCC_FILEREAD;
unsigned long filesize;
unsigned long TempLong;
unsigned int TempInt;
unsigned long tdcc = 0; unsigned long tdcc = 0;
DCC_int *n; DCC_int *n;
DCC_List *new_d; DCC_List *new_d;
@@ -1401,20 +1386,18 @@ static void dcc_send_offer(const struct dcc_offer *offer, int server)
struct stat resume_sb; struct stat resume_sb;
char *fullname = NULL; char *fullname = NULL;
if (!parse_offer_params(offer, &TempLong, &TempInt, &filesize))
return;
if (*offer->type == 'T') if (*offer->type == 'T')
tdcc = DCC_TDCC; tdcc = DCC_TDCC;
if (!check_collision(offer->nick, offer->description, Ctype)) if (!check_collision(offer->nick, offer->description, Ctype))
return; return;
n = create_dcc_int(offer->nick, offer->description, offer->userhost, TempLong, TempInt, filesize, server); if (!(n = create_dcc_int(offer, server)))
return;
if (do_hook(DCC_REQUEST_LIST,"%s %s %s %lu", offer->nick, dcc_types[Ctype]->name, offer->description, filesize)) if (do_hook(DCC_REQUEST_LIST,"%s %s %s %lu", n->user, dcc_types[Ctype]->name, n->filename, n->filesize))
{ {
show_dcc_fileoffer(offer->nick, dcc_types[Ctype]->name, offer->description, offer->userhost, TempLong, TempInt, filesize); show_dcc_fileoffer(n, dcc_types[Ctype]->name);
} }
fullname = dcc_fullname(n->filename); fullname = dcc_fullname(n->filename);
@@ -1489,28 +1472,23 @@ static void dcc_send_offer(const struct dcc_offer *offer, int server)
static void dcc_resend_offer(const struct dcc_offer *offer, int server) static void dcc_resend_offer(const struct dcc_offer *offer, int server)
{ {
int Ctype = DCC_REFILEREAD; int Ctype = DCC_REFILEREAD;
unsigned long filesize;
unsigned long TempLong;
unsigned int TempInt;
unsigned long tdcc = 0; unsigned long tdcc = 0;
DCC_int *n; DCC_int *n;
int autoget = 0; int autoget = 0;
char *fullname = NULL; char *fullname = NULL;
if (!parse_offer_params(offer, &TempLong, &TempInt, &filesize))
return;
if (*offer->type == 'T') if (*offer->type == 'T')
tdcc = DCC_TDCC; tdcc = DCC_TDCC;
if (!check_collision(offer->nick, offer->description, Ctype)) if (!check_collision(offer->nick, offer->description, Ctype))
return; return;
n = create_dcc_int(offer->nick, offer->description, offer->userhost, TempLong, TempInt, filesize, server); if (!(n = create_dcc_int(offer, server)))
return;
if (do_hook(DCC_REQUEST_LIST,"%s %s %s %lu", offer->nick, dcc_types[Ctype]->name, offer->description, filesize)) if (do_hook(DCC_REQUEST_LIST,"%s %s %s %lu", n->user, dcc_types[Ctype]->name, n->filename, n->filesize))
{ {
show_dcc_fileoffer(offer->nick, dcc_types[Ctype]->name, offer->description, offer->userhost, TempLong, TempInt, filesize); show_dcc_fileoffer(n, dcc_types[Ctype]->name);
} }
fullname = dcc_fullname(n->filename); fullname = dcc_fullname(n->filename);
@@ -1552,11 +1530,11 @@ static int check_dcc_init(const struct dcc_offer *offer)
if (dcc_types[i]->name && dcc_types[i]->init_func) if (dcc_types[i]->name && dcc_types[i]->init_func)
{ {
unsigned long filesize; unsigned long filesize;
unsigned long TempLong; unsigned long address;
unsigned int TempInt; unsigned short port;
if (parse_offer_params(offer, &TempLong, &TempInt, &filesize)) if (parse_offer_params(offer, &address, &port, &filesize))
return dcc_types[i]->init_func(offer->type, offer->nick, offer->userhost, offer->description, offer->size, offer->extra, TempLong, TempInt); return dcc_types[i]->init_func(offer->type, offer->nick, offer->userhost, offer->description, offer->size, offer->extra, address, port);
} }
return 0; return 0;
} }