summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/protocol/charybdis.c18
-rw-r--r--src/protocol/charybdis.h32
2 files changed, 21 insertions, 29 deletions
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 6ebe3ff85..074ff3b4d 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -216,23 +216,23 @@ unsigned long umodes[128] = {
0, 0, 0, /* G H I */
0, 0, 0, /* J K L */
0, 0, 0, /* M N O */
- 0, 0, 0, /* P Q R */
- 0, 0, 0, /* S T U */
+ 0, UMODE_Q, UMODE_R, /* P Q R */
+ UMODE_S, 0, 0, /* S T U */
0, 0, 0, /* V W X */
0, /* Y */
0, /* Z */
0, 0, 0, /* [ \ ] */
0, 0, 0, /* ^ _ ` */
- UMODE_a, UMODE_b, 0, /* a b c */
- UMODE_d, 0, 0, /* d e f */
- 0, 0, UMODE_i, /* g h i */
+ UMODE_a, 0, 0, /* a b c */
+ 0, 0, 0, /* d e f */
+ UMODE_g, 0, UMODE_i, /* g h i */
0, 0, UMODE_l, /* j k l */
- UMODE_g, UMODE_n, UMODE_o, /* m n o */
+ 0, 0, UMODE_o, /* m n o */
0, 0, 0, /* p q r */
- 0, 0, UMODE_u, /* s t u */
- 0, UMODE_w, UMODE_x, /* v w x */
+ UMODE_s, 0, 0, /* s t u */
+ 0, UMODE_w, 0, /* v w x */
0, /* y */
- 0, /* z */
+ UMODE_z, /* z */
0, 0, 0, /* { | } */
0, 0 /* ~ ‚ */
};
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index f452eae69..64107012a 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -11,26 +11,18 @@
*
*/
-#define UMODE_a 0x00000001
-#define UMODE_C 0x00000002
-#define UMODE_i 0x00000004
-#define UMODE_o 0x00000008
-#define UMODE_z 0x00000010
-#define UMODE_w 0x00000020
-#define UMODE_s 0x00000040
-#define UMODE_c 0x00000080
-#define UMODE_r 0x00000100
-#define UMODE_k 0x00000200
-#define UMODE_f 0x00000400
-#define UMODE_y 0x00000800
-#define UMODE_d 0x00001000
-#define UMODE_n 0x00002000
-#define UMODE_x 0x00004000
-#define UMODE_u 0x00008000
-#define UMODE_b 0x00010000
-#define UMODE_l 0x00020000
-#define UMODE_g 0x00040000
-#define UMODE_Z 0x00080000
+#define UMODE_a 0x00000001 /* umode a - admin */
+#define UMODE_g 0x00000002 /* umode g - caller ID */
+#define UMODE_i 0x00000004 /* umode i - invisible */
+#define UMODE_o 0x00000008 /* umode o - operator */
+#define UMODE_z 0x00000010 /* umode u - operwall */
+#define UMODE_w 0x00000020 /* umode w - wallops */
+#define UMODE_s 0x00000040 /* umode s - server notices */
+#define UMODE_Q 0x00000080 /* umode Q - block forwarding */
+#define UMODE_R 0x00000200 /* umode R - reject messages from unauthenticated users */
+#define UMODE_S 0x00000400 /* umode S - network service */
+#define UMODE_l 0x00020000 /* umode l - locops */
+
#define CMODE_i 0x00000001
#define CMODE_m 0x00000002