Added an error check to help trace users figure out mistakes with mark vs marked

[irc/evilnet/x3.git] / src / proto.h

diff --git a/src/proto.h b/src/proto.h
index 36bbb10235a43c4be07b015f10f46d5b29395831..e55580d94733a99c8c6c565e316047663f3f5d22 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -94,8 +94,8 @@ 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, const char *text, struct userNode *bot, unsigned int is_notice);
-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);
 
@@ -105,8 +105,8 @@ void reg_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 (*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);
@@ -126,6 +126,7 @@ void irc_connect(struct userNode *user, char *server, unsigned int port, struct
 
 /* 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);
@@ -143,7 +144,7 @@ void irc_topic(struct userNode *service, struct userNode *who, struct chanNode *
 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 *reason);
+void irc_svsquit(struct userNode *from, struct userNode *who, char const *reason);
 
 /* network maintenance */
 void irc_silence(struct userNode *who, const char *mask, int add);
@@ -159,6 +160,7 @@ 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_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);
@@ -168,6 +170,7 @@ 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, ...);
@@ -197,6 +200,8 @@ void DelUser(struct userNode* user, struct userNode *killer, int announce, const
 
 /* 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
@@ -245,9 +250,10 @@ void mod_chanmode_announce(struct userNode *who, struct chanNode *channel, struc
 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