X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/7fda2b52a31a4d719437281208fafc12d4aa389e..569e746fd62d279338909d79d0ae9828a665f18b:/src/proto-p10.c?ds=sidebyside

diff --git a/src/proto-p10.c b/src/proto-p10.c
index 6102ec0..7268fbb 100644
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -84,6 +84,7 @@
 #define CMD_SERVSET             "SERVSET"
 #define CMD_SET			"SET"
 #define CMD_SETTIME             "SETTIME"
+#define CMD_SHUN		"SHUN"
 #define CMD_SILENCE             "SILENCE"
 #define CMD_SQUERY              "SQUERY"
 #define CMD_SQUIT               "SQUIT"
@@ -170,6 +171,7 @@
 #define TOK_SERVSET             "SERVSET"
 #define TOK_SET			"SET"
 #define TOK_SETTIME             "SE"
+#define TOK_SHUN		"SU"
 #define TOK_SILENCE             "U"
 #define TOK_SQUERY              "SQUERY"
 #define TOK_SQUIT               "SQ"
@@ -266,6 +268,7 @@
 #define P10_SERVSET             TYPE(SERVSET)
 #define P10_SET			TYPE(SET)
 #define P10_SETTIME             TYPE(SETTIME)
+#define P10_SHUN		TYPE(SHUN)
 #define P10_SILENCE             TYPE(SILENCE)
 #define P10_SQUERY              TYPE(SQUERY)
 #define P10_SQUIT               TYPE(SQUIT)
@@ -446,7 +449,11 @@ irc_delete(struct userNode *user)
 void
 irc_account(struct userNode *user, const char *stamp, time_t timestamp)
 {
-    putsock("%s " P10_ACCOUNT " %s R %s %lu", self->numeric, user->numeric, stamp, timestamp);
+    putsock("%s " P10_ACCOUNT " %s R %s %lu", self->numeric, user->numeric, stamp, timestamp); 
+
+    /*  Uncomment this, and comment above, for use on non-nefarious ircd such as undernet */
+    /* XXX: (sorry for being lame, someone who cares about undernet should make this a x3.conf setting) */
+    /* putsock("%s " P10_ACCOUNT " %s %s %lu", self->numeric, user->numeric, stamp, timestamp); */
 }
 
 void
@@ -570,10 +577,17 @@ irc_introduce(const char *passwd)
 }
 
 void
-irc_gline(struct server *srv, struct gline *gline)
+irc_gline(struct server *srv, struct gline *gline, int silent)
 {
-    putsock("%s " P10_GLINE " %s +%s %ld :<%s> %s",
-            self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires-now, gline->issuer, gline->reason);
+    putsock("%s " P10_GLINE " %s +%s %ld :%s<%s> %s",
+            self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires-now, silent ? "AUTO " : "", gline->issuer, gline->reason);
+}
+
+void
+irc_shun(struct server *srv, struct shun *shun)
+{
+    putsock("%s " P10_SHUN " %s +%s %ld :<%s> %s",
+            self->numeric, (srv ? srv->numeric : "*"), shun->target, shun->expires-now, shun->issuer, shun->reason);
 }
 
 void
@@ -591,6 +605,12 @@ irc_ungline(const char *mask)
     putsock("%s " P10_GLINE " * -%s", self->numeric, mask);
 }
 
+void
+irc_unshun(const char *mask)
+{
+    putsock("%s " P10_SHUN " * -%s", self->numeric, mask);
+}
+
 static void
 irc_burst(struct chanNode *chan)
 {
@@ -1415,7 +1435,15 @@ static CMD_FUNC(cmd_num_gline)
 {
     if (argc < 6)
         return 0;
-    gline_add(origin, argv[3], atoi(argv[4])-now, argv[5], now, 0);
+    gline_add(origin, argv[3], atoi(argv[4])-now, argv[5], now, 0, 0);
+    return 1;
+}
+
+static CMD_FUNC(cmd_num_shun)
+{
+    if (argc < 6)
+        return 0;
+    shun_add(origin, argv[3], atoi(argv[4])-now, argv[5], now, 0);
     return 1;
 }
 
@@ -1548,7 +1576,7 @@ static CMD_FUNC(cmd_gline)
     if (argv[2][0] == '+') {
         if (argc < 5)
             return 0;
-        gline_add(origin, argv[2]+1, strtoul(argv[3], NULL, 0), argv[argc-1], now, 0);
+        gline_add(origin, argv[2]+1, strtoul(argv[3], NULL, 0), argv[argc-1], now, 0, 0);
         return 1;
     } else if (argv[2][0] == '-') {
         gline_remove(argv[2]+1, 0);
@@ -1557,6 +1585,22 @@ static CMD_FUNC(cmd_gline)
         return 0;
 }
 
+static CMD_FUNC(cmd_shun)
+{
+    if (argc < 3)
+        return 0;
+    if (argv[2][0] == '+') {
+        if (argc < 5)
+            return 0;
+        shun_add(origin, argv[2]+1, strtoul(argv[3], NULL, 0), argv[argc-1], now, 0);
+        return 1;
+    } else if (argv[2][0] == '-') {
+        shun_remove(argv[2]+1, 0);
+        return 1;
+    } else
+        return 0;
+}
+
 static CMD_FUNC(cmd_svsnick)
 {
     struct userNode *target, *dest;
@@ -1704,6 +1748,8 @@ init_parse(void)
     dict_insert(irc_func_dict, TOK_WHOIS, cmd_whois);
     dict_insert(irc_func_dict, CMD_GLINE, cmd_gline);
     dict_insert(irc_func_dict, TOK_GLINE, cmd_gline);
+    dict_insert(irc_func_dict, CMD_SHUN, cmd_shun);
+    dict_insert(irc_func_dict, TOK_SHUN, cmd_shun);
     dict_insert(irc_func_dict, CMD_OPMODE, cmd_opmode);
     dict_insert(irc_func_dict, TOK_OPMODE, cmd_opmode);
     dict_insert(irc_func_dict, CMD_CLEARMODE, cmd_clearmode);
@@ -1757,6 +1803,7 @@ init_parse(void)
     /* ban list resetting */
     /* "stats g" responses */
     dict_insert(irc_func_dict, "247", cmd_num_gline);
+    dict_insert(irc_func_dict, "542", cmd_num_shun);
     dict_insert(irc_func_dict, "219", cmd_dummy); /* "End of /STATS report" */
     /* other numeric responses we might get */
     dict_insert(irc_func_dict, "401", cmd_dummy); /* target left network */