*
* This file is part of x3.
*
- * srvx is free software; you can redistribute it and/or modify
+ * x3 is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
#define MAXNUMPARAMS 200
#define ALLCHANMSG_FUNCS_MAX 4 /* +1 == 5 potential 'allchanmsg' funcs */
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
struct gline;
+struct shun;
struct server;
struct userNode;
struct chanNode;
char *host;
int port;
- struct sockaddr_in *bind_addr;
+ struct sockaddr *bind_addr;
int bind_addr_len;
char *password;
void init_parse(void);
int parse_line(char *line, int recursive);
+char *client_report_privs(struct userNode *client);
+int check_priv(char *priv);
+
/* Callback notifications for protocol support. */
-typedef void (*chanmsg_func_t) (struct userNode *user, struct chanNode *chan, char *text, struct userNode *bot);
-void reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler);
+typedef void (*chanmsg_func_t) (struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice, void *extra);
+void reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler, void *extra);
void reg_allchanmsg_func(struct userNode *service, chanmsg_func_t handler);
struct userNode *get_chanmsg_bot(unsigned char prefix);
-typedef void (*privmsg_func_t) (struct userNode *user, struct userNode *target, char *text, int server_qualified);
+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);
-
-typedef void (*oper_func_t) (struct userNode *user);
-void reg_oper_func(oper_func_t handler);
+void unreg_privmsg_func(struct userNode *user);
+void unreg_notice_func(struct userNode *user);
-extern struct userList dead_users;
+typedef void (*oper_func_t) (struct userNode *user, void *extra);
+void reg_oper_func(oper_func_t handler, void *extra);
/* replay silliness */
void replay_read_line(void);
void irc_pong(const char *who, const char *data);
void irc_quit(struct userNode *user, const char *message);
void irc_squit(struct server *srv, const char *message, const char *service_message);
+void irc_squit_route(struct server *srv, const char *message, ...);
+void irc_connect(struct userNode *user, char *server, unsigned int port, struct server *target);
/* messages */
void irc_privmsg(struct userNode *from, const char *to, const char *message);
+void irc_privmsg_user(struct userNode *from, struct userNode *to, const char *message);
void irc_notice(struct userNode *from, const char *to, const char *message);
void irc_notice_user(struct userNode *from, struct userNode *to, const char *message);
+void irc_version_user(struct userNode *from, struct userNode *to);
void irc_wallchops(struct userNode *from, const char *to, const char *message);
+void irc_wallops(const char *format, ...);
/* channel maintenance */
void irc_join(struct userNode *who, struct chanNode *what);
void irc_invite(struct userNode *from, struct userNode *who, struct chanNode *to);
void irc_mode(struct userNode *who, struct chanNode *target, const char *modes);
+void irc_umode(struct userNode *target, const char *modes);
void irc_kick(struct userNode *who, struct userNode *target, struct chanNode *from, const char *msg);
void irc_part(struct userNode *who, struct chanNode *what, const char *reason);
-void irc_topic(struct userNode *who, struct chanNode *what, const char *topic);
+void irc_topic(struct userNode *service, struct userNode *who, struct chanNode *what, const char *topic);
void irc_fetchtopic(struct userNode *from, const char *to);
+void irc_svsjoin(struct userNode *from, struct userNode *who, struct chanNode *to);
+void irc_svspart(struct userNode *from, struct userNode *who, struct chanNode *to);
+void irc_svsquit(struct userNode *from, struct userNode *who, char const *reason);
/* network maintenance */
-void irc_gline(struct server *srv, struct gline *gline);
+void irc_silence(struct userNode *who, const char *mask, int add);
+void irc_gline(struct server *srv, struct gline *gline, int silent);
+void irc_shun(struct server *srv, struct shun *shun);
void irc_settime(const char *srv_name_mask, time_t new_time);
void irc_ungline(const char *mask);
+void irc_unshun(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_swhois(struct userNode *from, struct userNode *target, const char *message);
+void irc_tempshun(struct userNode *from, struct userNode *target, int remove, const char *reason);
+void irc_privs(struct userNode *target, char *flag, int add);
+void irc_raw_privs(struct userNode *target, const char *privs);
/* account maintenance */
+void irc_rename(struct userNode *user, const char *new_handle);
+void irc_delete(struct userNode *user);
void irc_account(struct userNode *user, const char *stamp, time_t timestamp);
void irc_regnick(struct userNode *user);
void irc_fakehost(struct userNode *user, const char *host);
+void irc_mark(struct userNode *user, char *mark);
+void irc_sno(unsigned int mask, char const* format, ...);
+void irc_sasl(struct server* dest, const char *identifier, const char *subcmd, const char *data);
/* numeric messages */
void irc_numeric(struct userNode *user, unsigned int num, const char *format, ...);
#define RPL_ENDOFSTATS 219
#define RPL_STATSUPTIME 242
#define RPL_MAXCONNECTIONS 250
+#define RPL_AWAY 301
#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
+#define RPL_WHOISACTUALLY 338
#define ERR_NOSUCHNICK 401
/* stuff originally from other headers that is really protocol-specific */
int IsChannelName(const char *name);
int is_valid_nick(const char *nick);
-struct userNode *AddService(const char *nick, const char *modes, const char *desc, const char *hostname);
-struct userNode *AddClone(const char *nick, const char *ident, const char *hostname, const char *desc);
+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);
void DelServer(struct server* serv, int announce, const char *message);
void DelUser(struct userNode* user, struct userNode *killer, int announce, const char *why);
/* User modes */
void mod_usermode(struct userNode *user, const char *modes);
+extern const char irc_user_mode_chars[];
+unsigned int irc_user_modes(const struct userNode *user, char modes[], size_t length);
/* Channel mode manipulation */
#define KEYLEN 23
unsigned int alloc_argc;
#endif
char new_key[KEYLEN + 1];
+ char new_upass[KEYLEN + 1];
+ char new_apass[KEYLEN + 1];
struct {
unsigned int mode;
union {
#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 */
#ifdef NDEBUG
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);
+struct mod_chanmode *mod_chanmode_parse(struct chanNode *channel, 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);
void mod_chanmode_free(struct mod_chanmode *change);
int mod_chanmode(struct userNode *who, struct chanNode *channel, char **modes, unsigned int argc, unsigned int flags);
-typedef void (*mode_change_func_t) (struct chanNode *channel, struct userNode *user, const struct mod_chanmode *change);
-void reg_mode_change_func(mode_change_func_t handler);
+typedef void (*mode_change_func_t) (struct chanNode *channel, struct userNode *user, const struct mod_chanmode *change, void *extra);
+void reg_mode_change_func(mode_change_func_t handler, void *extra);
int irc_make_chanmode(struct chanNode *chan, char *out);
+int client_modify_priv_by_name(struct userNode *who, char *priv, int what);
/* The "default" for generate_hostmask is to have all of these options off. */
#define GENMASK_STRICT_HOST 1