mirror of
https://github.com/irssi/irssi.git
synced 2026-08-16 07:02:12 +02:00
DCC cleanups - split DCC_REC to CHAT|GET|SEND_DCC_RECs. Plugins should
now be able to add whatever new DCC types. Nick changes affect DCC chats. /WHOIS without parameters works properly in DCC CHAT queries. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1194 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
118f9a11eb
commit
e4f7d55ce9
20 changed files with 1398 additions and 912 deletions
|
|
@ -1,104 +1,18 @@
|
|||
#ifndef __DCC_H
|
||||
#define __DCC_H
|
||||
|
||||
#include "modules.h"
|
||||
#include "network.h"
|
||||
#include "irc-servers.h"
|
||||
|
||||
enum {
|
||||
DCC_TYPE_CHAT = 1,
|
||||
DCC_TYPE_SEND,
|
||||
DCC_TYPE_GET,
|
||||
DCC_TYPE_RESUME,
|
||||
DCC_TYPE_ACCEPT
|
||||
};
|
||||
#define DCC(dcc) ((DCC_REC *) (dcc))
|
||||
|
||||
#define SWAP_SENDGET(a) ((a) == DCC_TYPE_SEND ? DCC_TYPE_GET : \
|
||||
(a) == DCC_TYPE_GET ? DCC_TYPE_SEND : (a))
|
||||
typedef struct CHAT_DCC_REC CHAT_DCC_REC;
|
||||
|
||||
typedef struct DCC_REC {
|
||||
int type;
|
||||
time_t created;
|
||||
|
||||
IRC_SERVER_REC *server;
|
||||
char *chat_id; /* unique identifier for dcc chat. usually same as nick. */
|
||||
char *nick;
|
||||
char *target; /* who the request was sent to - your nick, channel or NULL if you sent the request */
|
||||
|
||||
struct DCC_REC *chat; /* if the request came through DCC chat */
|
||||
|
||||
char *ircnet;
|
||||
char *mynick;
|
||||
|
||||
char *arg;
|
||||
char *file; /* file name we're really moving, arg is just the reference.. */
|
||||
|
||||
IPADDR addr; /* address we're connected in */
|
||||
char addrstr[MAX_IP_LEN]; /* in readable form */
|
||||
int port; /* port we're connected in */
|
||||
|
||||
long size, transfd, skipped; /* file size / bytes transferred / skipped at start */
|
||||
GIOChannel *handle; /* socket handle */
|
||||
NET_SENDBUF_REC *sendbuf;
|
||||
int tagconn, tagread, tagwrite;
|
||||
int fhandle; /* file handle */
|
||||
time_t starttime; /* transfer start time */
|
||||
int trans_bytes;
|
||||
|
||||
int get_type; /* DCC get: what to do if file exists? */
|
||||
|
||||
unsigned int fastsend:1; /* fastsending (just in case that global fastsend toggle changes while transferring..) */
|
||||
unsigned int waitforend:1; /* DCC fast send: file is sent, just wait for the replies from the other side */
|
||||
unsigned int gotalldata:1; /* DCC fast send: got all acks from the other end (needed to make sure the end of transfer works right) */
|
||||
|
||||
unsigned int file_quoted:1; /* file name was received quoted ("file name") */
|
||||
unsigned int mirc_ctcp:1; /* DCC chat: Send CTCPs without the CTCP_MESSAGE prefix */
|
||||
unsigned int connection_lost:1; /* DCC chat: other side closed connection */
|
||||
unsigned int destroyed:1; /* We're about to destroy this DCC recond */
|
||||
|
||||
/* read/write counter buffer */
|
||||
char count_buf[4];
|
||||
int count_pos;
|
||||
|
||||
char *databuf; /* buffer for receiving/transmitting data */
|
||||
int databufsize;
|
||||
|
||||
GHashTable *module_data;
|
||||
typedef struct {
|
||||
#include "dcc-rec.h"
|
||||
} DCC_REC;
|
||||
|
||||
extern GSList *dcc_conns;
|
||||
|
||||
void dcc_init(void);
|
||||
void dcc_deinit(void);
|
||||
|
||||
/* Find waiting DCC requests (non-connected) */
|
||||
DCC_REC *dcc_find_request_latest(int type);
|
||||
DCC_REC *dcc_find_request(int type, const char *nick, const char *arg);
|
||||
|
||||
const char *dcc_type2str(int type);
|
||||
int dcc_str2type(const char *type);
|
||||
void dcc_make_address(IPADDR *ip, char *host);
|
||||
|
||||
DCC_REC *dcc_create(int type, const char *nick, const char *arg,
|
||||
IRC_SERVER_REC *server, DCC_REC *chat);
|
||||
void dcc_destroy(DCC_REC *dcc);
|
||||
|
||||
GIOChannel *dcc_listen(GIOChannel *interface, IPADDR *ip, int *port);
|
||||
|
||||
void dcc_get_address(const char *str, IPADDR *ip);
|
||||
|
||||
/* Send a CTCP message/notify to target. Send the CTCP via DCC chat if
|
||||
`chat' is specified. */
|
||||
void dcc_ctcp_message(IRC_SERVER_REC *server, const char *target,
|
||||
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(WI_ITEM_REC *item);
|
||||
|
||||
/* Reject a DCC request */
|
||||
void dcc_reject(DCC_REC *dcc, IRC_SERVER_REC *server);
|
||||
|
||||
/* fully connected? */
|
||||
#define dcc_is_connected(dcc) \
|
||||
((dcc)->starttime != 0)
|
||||
|
|
@ -111,4 +25,37 @@ void dcc_reject(DCC_REC *dcc, IRC_SERVER_REC *server);
|
|||
#define dcc_is_waiting_user(dcc) \
|
||||
((dcc)->handle == NULL)
|
||||
|
||||
extern GSList *dcc_conns;
|
||||
|
||||
void dcc_register_type(const char *type);
|
||||
void dcc_unregister_type(const char *type);
|
||||
|
||||
int dcc_str2type(const char *str);
|
||||
#define dcc_type2str(type) (module_find_id_str("DCC", type))
|
||||
|
||||
/* Initialize DCC record */
|
||||
void dcc_init_rec(DCC_REC *dcc, IRC_SERVER_REC *server, CHAT_DCC_REC *chat,
|
||||
const char *nick, const char *arg);
|
||||
void dcc_destroy(DCC_REC *dcc);
|
||||
|
||||
/* Find waiting DCC requests (non-connected) */
|
||||
DCC_REC *dcc_find_request_latest(int type);
|
||||
DCC_REC *dcc_find_request(int type, const char *nick, const char *arg);
|
||||
|
||||
/* IP <-> string for DCC CTCP messages.
|
||||
`str' must be at least MAX_IP_LEN bytes */
|
||||
void dcc_ip2str(IPADDR *ip, char *str);
|
||||
void dcc_str2ip(const char *str, IPADDR *ip);
|
||||
|
||||
/* Start listening for incoming connections */
|
||||
GIOChannel *dcc_listen(GIOChannel *interface, IPADDR *ip, int *port);
|
||||
|
||||
/* Close DCC - sends "dcc closed" signal and calls dcc_destroy() */
|
||||
void dcc_close(DCC_REC *dcc);
|
||||
/* Reject a DCC request */
|
||||
void dcc_reject(DCC_REC *dcc, IRC_SERVER_REC *server);
|
||||
|
||||
void dcc_init(void);
|
||||
void dcc_deinit(void);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue