X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/d914d1cbfd541d1c1302ac989a8c5b7d57d25f55..35305a49c0973c0e29e4a607c2b507a2d8face43:/src/proto.h

diff --git a/src/proto.h b/src/proto.h
index b65b736..63f1b1d 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -3,7 +3,7 @@
  *
  * 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
  * (at your option) any later version.
@@ -61,7 +61,7 @@ struct uplinkNode
     char		*host;
     int			port;
 
-    struct sockaddr_in 	*bind_addr;
+    struct sockaddr 	*bind_addr;
     int 		bind_addr_len;
 
     char		*password;
@@ -122,12 +122,15 @@ void irc_ping(const char *something);
 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_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_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);
@@ -140,7 +143,8 @@ void irc_topic(struct userNode *service, struct userNode *who, struct chanNode *
 void irc_fetchtopic(struct userNode *from, const char *to);
 
 /* 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);
@@ -150,6 +154,7 @@ void irc_kill(struct userNode *from, struct userNode *target, const char *messag
 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);
 
 /* account maintenance */
 void irc_rename(struct userNode *user, const char *new_handle);
@@ -198,6 +203,8 @@ struct mod_chanmode {
     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 {
@@ -210,6 +217,8 @@ struct mod_chanmode {
 #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
@@ -220,7 +229,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);
+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);