X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fproto.h;h=36de9a8d759bea84fcf259c769509afbe1f6b2a5;hb=0a7f0a288c131806db7b8538554b918a99c1a21d;hp=6f4dccf1274bfefc1f04c0a38d8567882e05cba6;hpb=d6e7d684d688494848fda2ee86adc5d50c3bce10;p=srvx.git diff --git a/src/proto.h b/src/proto.h index 6f4dccf..36de9a8 100644 --- a/src/proto.h +++ b/src/proto.h @@ -27,15 +27,11 @@ * which has much nicer interfaces that hide most of the ugly * differences between protocol dialects. */ -#define COMBO_NUMERIC_LEN 5 /* 1/2, 1/3 or 2/3 digits for server/client parts */ -#define MAXLEN 512 /* Maximum IRC line length */ -#define MAXNUMPARAMS 200 +#define COMBO_NUMERIC_LEN 5 /* 1/2, 1/3 or 2/3 digits for server/client parts */ +#define MAXLEN 512 /* Maximum IRC line length */ +#define MAXNUMPARAMS 200 #define ALLCHANMSG_FUNCS_MAX 4 /* +1 == 5 potential 'allchanmsg' funcs */ -#ifdef HAVE_NETINET_IN_H -#include -#endif - struct gline; struct server; struct userNode; @@ -51,37 +47,37 @@ enum cState CONNECTED }; -#define UPLINK_UNAVAILABLE 0x001 +#define UPLINK_UNAVAILABLE 0x001 struct uplinkNode { - char *name; + char *name; - char *host; - int port; + char *host; + int port; - struct sockaddr *bind_addr; - int bind_addr_len; + struct sockaddr *bind_addr; + int bind_addr_len; - char *password; - char *their_password; + char *password; + char *their_password; - enum cState state; - int tries; - int max_tries; - long flags; + enum cState state; + int tries; + int max_tries; + long flags; - struct uplinkNode *prev; - struct uplinkNode *next; + struct uplinkNode *prev; + struct uplinkNode *next; }; struct cManagerNode { - struct uplinkNode *uplinks; - struct uplinkNode *uplink; + struct uplinkNode *uplinks; + struct uplinkNode *uplink; - int cycles; - int enabled; + int cycles; + int enabled; }; #ifdef WITH_PROTOCOL_P10 @@ -94,7 +90,7 @@ void init_parse(void); int parse_line(char *line, int recursive); /* Callback notifications for protocol support. */ -typedef void (*chanmsg_func_t) (struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot); +typedef void (*chanmsg_func_t) (struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice); void reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler); void reg_allchanmsg_func(struct userNode *service, chanmsg_func_t handler); struct userNode *get_chanmsg_bot(unsigned char prefix); @@ -102,12 +98,15 @@ struct userNode *get_chanmsg_bot(unsigned char prefix); typedef void (*privmsg_func_t) (struct userNode *user, struct userNode *target, const char *text, int server_qualified); void reg_privmsg_func(struct userNode *user, privmsg_func_t handler); void reg_notice_func(struct userNode *user, privmsg_func_t handler); -void unreg_privmsg_func(struct userNode *user, privmsg_func_t handler); -void unreg_notice_func(struct userNode *user, privmsg_func_t handler); +void unreg_privmsg_func(struct userNode *user); +void unreg_notice_func(struct userNode *user); typedef void (*oper_func_t) (struct userNode *user); void reg_oper_func(oper_func_t handler); +typedef void (*xquery_func_t) (struct server *source, const char routing[], const char query[]); +void reg_xquery_func(xquery_func_t handler); + /* replay silliness */ void replay_read_line(void); void replay_event_loop(void); @@ -139,18 +138,27 @@ void irc_fetchtopic(struct userNode *from, const char *to); /* network maintenance */ void irc_gline(struct server *srv, struct gline *gline); -void irc_settime(const char *srv_name_mask, time_t new_time); +void irc_settime(const char *srv_name_mask, unsigned long new_time); void irc_ungline(const char *mask); void irc_error(const char *to, const char *message); void irc_kill(struct userNode *from, struct userNode *target, const char *message); void irc_raw(const char *what); void irc_stats(struct userNode *from, struct server *target, char type); void irc_svsnick(struct userNode *from, struct userNode *target, const char *newnick); +void irc_xresponse(struct server *target, const char *routing, const char *response); /* account maintenance */ -void irc_account(struct userNode *user, const char *stamp); +void irc_account(struct userNode *user, const char *stamp, unsigned long timestamp, unsigned long serial); void irc_regnick(struct userNode *user); -void irc_fakehost(struct userNode *user, const char *host); +void irc_fakehost(struct userNode *user, const char *host, const char *ident, int force); +void irc_keepconn(struct userNode *target, unsigned int timeout); + +/* svs maintenance */ +void irc_svsmode(struct userNode *from, struct userNode *user, const char *modes); +void irc_svsjoin(struct userNode *from, struct userNode *user, struct chanNode *chan); +void irc_svsjoinchan(struct userNode *from, struct userNode *user, const char *chan); +void irc_relay(char *message); +void irc_simul(struct userNode *target, char *command); /* numeric messages */ void irc_numeric(struct userNode *user, unsigned int num, const char *format, ...); @@ -162,6 +170,7 @@ void irc_numeric(struct userNode *user, unsigned int num, const char *format, .. #define RPL_WHOISUSER 311 #define RPL_WHOISSERVER 312 #define RPL_WHOISOPERATOR 313 +#define RPL_WHOISIDLE 317 #define RPL_ENDOFWHOIS 318 #define RPL_WHOISCHANNELS 319 #define RPL_WHOISACCOUNT 330 @@ -172,16 +181,20 @@ void irc_numeric(struct userNode *user, unsigned int num, const char *format, .. int IsChannelName(const char *name); int is_valid_nick(const char *nick); struct userNode *AddLocalUser(const char *nick, const char *ident, const char *hostname, const char *desc, const char *modes); -struct server* AddServer(struct server* uplink, const char *name, int hops, time_t boot, time_t link, const char *numeric, const char *description); +struct server* AddServer(struct server* uplink, const char *name, int hops, unsigned long boot, unsigned long link, const char *numeric, const char *description); void DelServer(struct server* serv, int announce, const char *message); void DelUser(struct userNode* user, struct userNode *killer, int announce, const char *why); /* Most protocols will want to make an AddUser helper function. */ /* User modes */ +extern const char irc_user_mode_chars[]; void mod_usermode(struct userNode *user, const char *modes); +unsigned int irc_user_modes(const struct userNode *user, char modes[], size_t length); /* Channel mode manipulation */ #define KEYLEN 23 +#define NOFLOODLEN 15 +#define CHANNELLEN 200 typedef unsigned long chan_mode_t; /* Rules for struct mod_chanmode: * For a membership mode change, args[n].mode can contain more than @@ -190,11 +203,13 @@ typedef unsigned long chan_mode_t; */ struct mod_chanmode { chan_mode_t modes_set, modes_clear; - unsigned int new_limit, argc; + unsigned int new_limit, new_access, argc; #ifndef NDEBUG unsigned int alloc_argc; #endif char new_key[KEYLEN + 1]; + char new_altchan[CHANNELLEN + 1]; + char new_noflood[NOFLOODLEN + 1]; char new_upass[KEYLEN + 1]; char new_apass[KEYLEN + 1]; struct { @@ -205,14 +220,17 @@ struct mod_chanmode { } u; } args[1]; }; -#define MCP_ALLOW_OVB 0x0001 /* allow op, voice, ban manipulation */ -#define MCP_FROM_SERVER 0x0002 /* parse as from a server */ -#define MCP_KEY_FREE 0x0004 /* -k without a key argument */ -#define MCP_REGISTERED 0x0008 /* chan is already registered; do not allow changes to MODE_REGISTERED */ -#define MCP_UPASS_FREE 0x0010 /* -U without a key argument */ -#define MCP_APASS_FREE 0x0020 /* -A without a key argument */ -#define MC_ANNOUNCE 0x0100 /* send a mod_chanmode() change out */ -#define MC_NOTIFY 0x0200 /* make local callbacks to announce */ +#define MCP_ALLOW_OVB 0x0001 /* allow op, voice, ban manipulation */ +#define MCP_FROM_SERVER 0x0002 /* parse as from a server */ +#define MCP_KEY_FREE 0x0004 /* -k without a key argument */ +#define MCP_REGISTERED 0x0008 /* chan is already registered; do not allow changes to MODE_REGISTERED */ +#define MCP_UPASS_FREE 0x0010 /* -U without a key argument */ +#define MCP_APASS_FREE 0x0020 /* -A without a key argument */ +#define MCP_NO_APASS 0x0040 /* Do not allow +/-A or +/-U */ +#define MCP_IGN_REGISTERED 0x0080 /* chan is already registered; ignore changes to MODE_REGISTERED */ +#define MC_ANNOUNCE 0x0100 /* send a mod_chanmode() change out */ +#define MC_NOTIFY 0x0200 /* make local callbacks to announce */ +#define MCP_OPERMODE 0x0400 #ifdef NDEBUG #define mod_chanmode_init(CHANMODE) do { memset((CHANMODE), 0, sizeof(*CHANMODE)); } while (0) #else @@ -221,7 +239,7 @@ struct mod_chanmode { struct mod_chanmode *mod_chanmode_alloc(unsigned int argc); struct mod_chanmode *mod_chanmode_dup(struct mod_chanmode *orig, unsigned int extra); -struct mod_chanmode *mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, unsigned int flags, short base_oplevel); +struct mod_chanmode *mod_chanmode_parse(struct chanNode *channel, struct userNode *user, char **modes, unsigned int argc, unsigned int flags, short base_oplevel); void mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_chanmode *change); void mod_chanmode_announce(struct userNode *who, struct chanNode *channel, struct mod_chanmode *change); char *mod_chanmode_format(struct mod_chanmode *desc, char *buffer);