This should fix the nickserv module complaining about not enough parameters when...

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

diff --git a/src/proto.h b/src/proto.h
index c6ff63452492be35eaeaef3f51712c083dca9309..8b7b15cd46d376051868f6b0c22a2240346c7f9a 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -23,7 +23,7 @@
 
 /* Warning for those looking at how this code does multi-protocol
  * support: It's an awful, nasty hack job.  It is intended for short
- * term use, not long term, since we are already developing srvx2,
+ * term use, not long term, since we are already developing x3,
  * which has much nicer interfaces that hide most of the ugly
  * differences between protocol dialects. */
 
@@ -37,6 +37,7 @@
 #endif
 
 struct gline;
+struct shun;
 struct server;
 struct userNode;
 struct chanNode;
@@ -108,8 +109,6 @@ 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);
 
-extern struct userList dead_users;
-
 /* replay silliness */
 void replay_read_line(void);
 void replay_event_loop(void);
@@ -134,15 +133,18 @@ void irc_wallchops(struct userNode *from, const char *to, const char *message);
 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);
 
 /* network maintenance */
-void irc_gline(struct server *srv, struct gline *gline);
+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);
@@ -150,6 +152,8 @@ void irc_stats(struct userNode *from, struct server *target, char type);
 void irc_svsnick(struct userNode *from, struct userNode *target, const char *newnick);
 
 /* 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);
@@ -234,7 +238,7 @@ int irc_make_chanmode(struct chanNode *chan, char *out);
 #define GENMASK_USENICK  2
 #define GENMASK_OMITNICK 4  /* Hurray for Kevin! */
 #define GENMASK_BYIP     8
-#define GENMASK_SRVXMASK 16
+#define GENMASK_X3MASK 16
 #define GENMASK_NO_HIDING 128
 char *generate_hostmask(struct userNode *user, int options);