Index: source/dcc.c =================================================================== RCS file: /home/cvs/repository/epic4/source/dcc.c,v retrieving revision 1.60 diff -u -3 -p -r1.60 dcc.c --- source/dcc.c 9 May 2003 04:29:52 -0000 1.60 +++ source/dcc.c 9 May 2003 05:44:26 -0000 @@ -514,16 +514,21 @@ static DCC_list *dcc_searchlist ( { DCC_list *client; const char *last = NULL; + char *decoded_description; + + decoded_description = description ? dcc_urldecode(description) : NULL; if (x_debug & DEBUG_DCC_SEARCH) - yell("entering dcc_sl. desc (%s) user (%s) type (%d) " - "other (%s) active (%d)", - description, user, type, othername, active); + yell("entering dcc_sl. desc (%s) decdesc (%s) user (%s) " + "type(%d) other (%s) active (%d)", + description, decoded_description, user, type, + othername, active); /* * Walk all of the DCC connections that we know about. */ lock_dcc(NULL); + for (client = ClientList; client ; client = client->next) { /* Never return deleted entries */ @@ -570,8 +575,10 @@ static DCC_list *dcc_searchlist ( * Otherwise, "othername" must exist and be the same. * In all other cases, reject this entry. */ + if (description && client->description && - my_stricmp(description, client->description)) + my_stricmp(description, client->description) && + my_stricmp(decoded_description, client->description)) { /* * OK. well, 'name' isnt 'description', try looking @@ -584,7 +591,7 @@ static DCC_list *dcc_searchlist ( * If 'name' isnt 'last' then we'll have to look at * 'othername' to see if that matches. */ - if (my_stricmp(description, last + 1)) + if (my_stricmp(description, last + 1) && my_stricmp(decoded_description, last + 1)) { if (!othername || !client->othername) continue; @@ -624,6 +631,7 @@ static DCC_list *dcc_searchlist ( unlock_dcc(NULL); return client; } + new_free(&decoded_description); unlock_dcc(NULL); return NULL; @@ -683,11 +691,13 @@ static int dcc_connected (int fd, int re { char p_addr[256]; char p_port[24]; + char *encoded_description; SA *addr = (SA *)&dcc->peer_sockaddr; if (inet_ntostr(addr, p_addr, 256, p_port, 24, NI_NUMERICHOST)) yell("Couldn't get host/port for this connection."); + encoded_description = dcc_urlencode(dcc->description); /* * It would be nice if SEND also showed the filename @@ -702,7 +712,7 @@ static int dcc_connected (int fd, int re if ((jvs_blah = do_hook(DCC_CONNECT_LIST, "%s %s %s %s %s %s", dcc->user, type, p_addr, p_port, - dcc->description, + encoded_description, ltoa(dcc->filesize)))) /* * Compatability with bitchx @@ -710,7 +720,7 @@ static int dcc_connected (int fd, int re jvs_blah = do_hook(DCC_CONNECT_LIST, "%s GET %s %s %s %s", dcc->user, p_addr, p_port, - dcc->description, + encoded_description, ltoa(dcc->filesize)); } else @@ -725,6 +735,7 @@ static int dcc_connected (int fd, int re say("DCC %s connection with %s[%s:%s] established", type, dcc->user, p_addr, p_port); } + new_free(&encoded_description); } unlock_dcc(dcc); @@ -892,7 +903,7 @@ static void dcc_send_booster_ctcp (DCC_l get_time(&dcc->starttime); get_time(&dcc->lasttime); - if ((dcc->flags & DCC_FILEOFFER) && + if (((dcc->flags & DCC_TYPES) == DCC_FILEOFFER) && (nopath = strrchr(dcc->description, '/'))) nopath++; else @@ -902,7 +913,7 @@ static void dcc_send_booster_ctcp (DCC_l * If this is a DCC SEND... */ lock_dcc(dcc); - if (dcc->flags & DCC_FILEOFFER) + if ((dcc->flags & DCC_TYPES) == DCC_FILEOFFER) { char * url_name = dcc_urlencode(nopath); @@ -1200,6 +1211,7 @@ static void dcc_close (char *args) char *type; char *user; char *file; + char *encoded_description = NULL; int any_type = 0; int any_user = 0; int i; @@ -1246,14 +1258,27 @@ static void dcc_close (char *args) dcc->flags |= DCC_DELETE; lock_dcc(dcc); + + if (dcc->description) { + if (my_type == DCC_FILEOFFER) + encoded_description = dcc_urlencode(dcc->description); + else + /* assume the other end encoded the filename */ + encoded_description = m_strdup(dcc->description); + } + if (do_hook(DCC_LOST_LIST,"%s %s %s USER ABORTED CONNECTION", dcc->user, dcc_types[my_type], - dcc->description ? dcc->description : "")) + encoded_description ? encoded_description : "")) say("DCC %s:%s to %s closed", dcc_types[my_type], file ? file : "", dcc->user); + + if (encoded_description) + new_free(&encoded_description); + unlock_dcc(dcc); } @@ -1324,7 +1349,8 @@ static void dcc_getfile (char *args, int { strlcpy(pathname, get_string_var(DCC_STORE_PATH_VAR), sizeof(pathname)); - } + } else /* SUSv2 doesn't specify realpath() behavior for "" */ + strcpy(pathname, "./"); if (*pathname && normalize_filename(pathname, fullname)) { @@ -1452,6 +1478,7 @@ static void dcc_list (char *args) DCC_list *next; static const char *format = "%-7.7s%-3.3s %-9.9s %-9.9s %-20.20s %-6.6s %-5.5s %-6.6s %s"; + char *encoded_description; if (do_hook(DCC_LIST_LIST, "Start * * * * * * *")) { @@ -1466,6 +1493,13 @@ static const char *format = next = dcc->next; lock_dcc(dcc); + + if ((flags & DCC_TYPES) == DCC_FILEOFFER) + encoded_description = dcc_urlencode(dcc->description); + else + /* assume the other end encoded the filename */ + encoded_description = m_strdup(dcc->description); + if (do_hook(DCC_LIST_LIST, "%s %s %s %s %ld %ld %ld %s", dcc_types[flags & DCC_TYPES], zero, /* No encryption */ @@ -1479,7 +1513,7 @@ static const char *format = (long)dcc->filesize, dcc->bytes_sent ? (unsigned long)dcc->bytes_sent : (unsigned long)dcc->bytes_read, - dcc->description)) + encoded_description)) { char * filename = strrchr(dcc->description, '/'); char completed[9]; @@ -1578,6 +1612,8 @@ static const char *format = "Unknown", time_f, size, completed, speed, filename); } + if (encoded_description) + new_free(&encoded_description); unlock_dcc(dcc); } unlock_dcc(NULL); @@ -2282,7 +2318,8 @@ void dcc_check (fd_set *Readables, fd_se { DCC_list *Client; int previous_server; - + char *encoded_description = NULL; + /* Sanity */ if (!Readables) return; @@ -2335,11 +2372,20 @@ void dcc_check (fd_set *Readables, fd_se time_diff(Client->lasttime, now) > dcc_timeout) { lock_dcc(Client); + + if (Client->description) { + if ((Client->flags & DCC_TYPES) == DCC_FILEOFFER) + encoded_description = dcc_urlencode(Client->description); + else + /* assume the other end encoded the filename */ + encoded_description = m_strdup(Client->description); + } + if (do_hook(DCC_LOST_LIST,"%s %s %s IDLE TIME EXCEEDED", Client->user, dcc_types[Client->flags & DCC_TYPES], - Client->description ? - Client->description : "")) + encoded_description ? + encoded_description : "")) say("Auto-rejecting a dcc after [%ld] seconds", (long)time_diff(Client->lasttime, now)); @@ -2350,6 +2396,10 @@ void dcc_check (fd_set *Readables, fd_se * good reason not to let them. */ Client->flags |= DCC_DELETE; + + if (encoded_description) + new_free(&encoded_description); + unlock_dcc(Client); } @@ -2661,6 +2711,7 @@ static void process_dcc_send_connection SA * addr; char p_addr[256]; char p_port[24]; + char *encoded_description; /* * Open up the network connection @@ -2697,13 +2748,16 @@ static void process_dcc_send_connection * Tell the user */ lock_dcc(dcc); + encoded_description = dcc_urlencode(dcc->description); if (do_hook(DCC_CONNECT_LIST, "%s SEND %s %s %s %s", dcc->user, p_addr, p_port, dcc->description, ltoa(dcc->filesize))) say("DCC SEND connection to %s[%s:%s] established", dcc->user, p_addr, p_port); + new_free(&encoded_description); unlock_dcc(dcc); + /* * Open up the file to be sent */ @@ -2729,6 +2783,7 @@ static void process_dcc_send_connection static void process_dcc_send_handle_ack (DCC_list *dcc) { + char *encoded_description; u_32int_t bytesrecvd; if (x_debug & DEBUG_DCC_XMIT) @@ -2747,10 +2802,12 @@ static void process_dcc_send_handle_ack dcc->flags |= DCC_DELETE; lock_dcc(dcc); + encoded_description = dcc_urlencode(dcc->description); if (do_hook(DCC_LOST_LIST,"%s SEND %s CONNECTION LOST", - dcc->user, dcc->description)) + dcc->user, encoded_description)) say("DCC SEND:%s connection to %s lost", dcc->description, dcc->user); + new_free(&encoded_description); unlock_dcc(dcc); return; } @@ -3061,6 +3118,7 @@ static void DCC_close_filesend (DCC_list char lame_ultrix2[10]; char lame_ultrix3[10]; double xtime, xfer; + char *encoded_description; xtime = time_diff(Client->starttime, get_time(NULL)); xtime -= Client->heldtime; @@ -3082,11 +3140,20 @@ static void DCC_close_filesend (DCC_list lock_dcc(Client); Client->flags |= DCC_DELETE; + + if ((Client->flags & DCC_TYPES) == DCC_FILEOFFER) + encoded_description = dcc_urlencode(Client->description); + else + /* assume the other end encoded the filename */ + encoded_description = m_strdup(Client->description); + if (do_hook(DCC_LOST_LIST,"%s %s %s %s TRANSFER COMPLETE", - Client->user, info, Client->description, lame_ultrix)) + Client->user, info, encoded_description, lame_ultrix)) say("DCC %s:%s [%skb] with %s completed in %s sec (%s kb/sec)", info, Client->description, lame_ultrix2, Client->user, lame_ultrix3, lame_ultrix); + + new_free(&encoded_description); unlock_dcc(Client); } @@ -3237,12 +3304,14 @@ static void dcc_getfile_resume_start (co if (dcc_open(Client)) return; - *pathname = 0; + if (get_string_var(DCC_STORE_PATH_VAR)) { strlcpy(pathname, get_string_var(DCC_STORE_PATH_VAR), sizeof(pathname)); - } + } else /* SUSv2 doesn't specify realpath() behavior for "" */ + strcpy(pathname, "./"); + if (normalize_filename(pathname, fullname)) {