New IRC parser and utility str array join function

Author: thommey

src/eggdrop.h

@@ -739,6 +739,12 @@ enum {
 #  define STRINGIFY1(x) #x
 #endif
 
+#define MAX_IRC_TOKENS 64 // TODO: does this make sense?
+typedef struct parsed_irc {
+  size_t argc;
+  char *argv[MAX_IRC_TOKENS];
+} parsed_irc_t;
+
 #ifdef EGG_TDNS
 #include <pthread.h>
 #define DTN_TYPE_HOSTBYIP 0

src/misc.c

@@ -278,6 +278,49 @@ char *newsplit(char **rest)
   return r;
 }
 
+// modifies original text
+// Only usable after from is already split off, does not handle :from keyword text
+struct parsed_irc parse_irc(char *text)
+{
+  struct parsed_irc result = {.argc = 0};
+
+  while (*text) {
+    while (*text && *text == ' ') {
+      *text++ = '\0';
+    }
+    if (!*text) {
+      break;
+    }
+    if (*text == ':') {
+      *text++ = '\0';
+      result.argv[result.argc++] = text;
+      break;
+    } else {
+      result.argv[result.argc++] = text;
+      while (*text && *text != ' ') {
+        text++;
+      }
+    }
+  }
+
+  return result;
+}
+
+char *join_str_array(char **argv, int argc, char *delim)
+{
+  static char buf[512];
+  size_t written = 0;
+
+  if (!argc) {
+    buf[0] = '\0';
+  }
+
+  for (int i = 0; i < argc; i++) {
+    written += snprintf(buf + written, sizeof buf - written, "%s%s", argv[i], i == argc ? "" : delim);
+  }
+  return buf;
+}
+
 /* maskhost(), modified to support custom mask types, as defined
  * by mIRC.
  * Does not require a proper hostmask in 's'. Accepts any strings,

src/mod/irc.mod/chan.c

@@ -2855,20 +2855,32 @@ static void update_chanmodes(mode_info_t *modes, int is_prefix)
 // CHANMODES=eIbq,k,flj,CFLMPQScgimnprstuz
 static int process_chanmodes(char *value)
 {
+  mode_type_t modetype = MODETYPE_LIST;
   mode_info_t modes[256];
 
   memset(&modes, 0, sizeof modes);
 
-  for (mode_type_t modetype = MODETYPE_LIST; modetype <= MODETYPE_FLAG; modetype++) {
+  while (*value) {
     while (*value && isalnum((unsigned char)*value)) {
       modes[(unsigned char)*value].type = modetype;
       modes[(unsigned char)*value].prefix = '\0';
+      debug2("Learned mode type: +%c type %s", *value, MODE_TYPE_STR(modetype));
       value++;
     }
-    if ((modetype < MODETYPE_FLAG && *value != ',') || (modetype == MODETYPE_FLAG && *value)) {
+    if ((modetype != MODETYPE_FLAG && *value != ',') || (modetype == MODETYPE_FLAG && *value)) {
       return -1;
     }
     value++;
+    // next section in order
+    if (modetype == MODETYPE_LIST) {
+      modetype = MODETYPE_KEY;
+    } else if (modetype == MODETYPE_KEY) {
+      modetype = MODETYPE_LIMIT;
+    } else if (modetype == MODETYPE_LIMIT) {
+      modetype = MODETYPE_FLAG;
+    } else {
+      break;
+    }
   }
   update_chanmodes(modes, 0);
   return 0;

src/mod/irc.mod/irc.c

@@ -1122,9 +1122,7 @@ static void tell_account_tracking_status(int idx, int details)
 
 static void tell_modeparsing_type(int idx, mode_type_t type)
 {
-  const char *names[] = {[MODETYPE_FLAG] = "Flag", [MODETYPE_LIST] = "List", [MODETYPE_KEY] = "Key", [MODETYPE_LIMIT] = "Limit", [MODETYPE_PREFIX] = "Prefix"};
-
-  dprintf(idx, "    %s modes: ", names[type]);
+  dprintf(idx, "    %s modes: %s", MODE_TYPE_STR(type), type == MODETYPE_PREFIX ? "" : "+");
   for (int i = 0; i < 256; i++) {
     if (modecharinfo[i].type == type) {
       dprintf(idx, "%c", i);
@@ -1138,9 +1136,11 @@ static void tell_modeparsing_type(int idx, mode_type_t type)
 
 static void tell_modeparsing(int idx)
 {
-  for (mode_type_t i = MODETYPE_LIST; i <= MODETYPE_PREFIX; i++) {
-    tell_modeparsing_type(idx, i);
-  }
+  tell_modeparsing_type(idx, MODETYPE_FLAG);
+  tell_modeparsing_type(idx, MODETYPE_LIMIT);
+  tell_modeparsing_type(idx, MODETYPE_KEY);
+  tell_modeparsing_type(idx, MODETYPE_LIST);
+  tell_modeparsing_type(idx, MODETYPE_PREFIX);
 }
 
 static void irc_report(int idx, int details)

src/mod/irc.mod/irc.h

@@ -33,18 +33,23 @@
 #define REVENGE_KICK 1          /* Kicked victim        */
 #define REVENGE_DEOP 2          /* Took op              */
 
-/* Order and values are relied upon */
+/* Order and values are relied upon, do not change */
 typedef enum mode_type {
-  MODETYPE_INVALID = 0,
-  MODETYPE_LIST = 1,
-  MODETYPE_KEY = 2,
-  MODETYPE_LIMIT = 3,
-  MODETYPE_FLAG = 4,
-  MODETYPE_PREFIX = 5
+  MODETYPE_INVALID = 0, // invalid, must be 0 for init
+  MODETYPE_FLAG = 1,    // no params
+  MODETYPE_LIMIT = 2,   // param on set only
+  MODETYPE_KEY = 3,     // param always
+  MODETYPE_LIST = 4,    // param always
+  MODETYPE_PREFIX = 5   // param always
 } mode_type_t;
 
-#define MODE_HAS_SET_ARG(c) (modecharinfo[(unsigned char)(c)].type & (MODETYPE_LIST|MODETYPE_KEY|MODETYPE_LIMIT|MODETYPE_PREFIX))
-#define MODE_HAS_UNSET_ARG(c) (modecharinfo[(unsigned char)(c)].type & (MODETYPE_LIST|MODETYPE_KEY|MODETYPE_PREFIX))
+#define MODE_TYPE_NAMES ((const char *[]){[MODETYPE_FLAG] = "Flag", [MODETYPE_LIST] = "List", [MODETYPE_KEY] = "Key", [MODETYPE_LIMIT] = "Limit", [MODETYPE_PREFIX] = "Prefix"})
+
+#define MODE_TYPE(c) (modecharinfo[(unsigned char)(c)].type)
+#define MODE_TYPE_STR(t) ((MODE_TYPE_NAMES)[(t)])
+
+#define MODE_HAS_SET_ARG(c) (MODE_TYPE((c)) >= MODETYPE_LIMIT)
+#define MODE_HAS_UNSET_ARG(c) (MODE_TYPE((c)) >= MODETYPE_KEY)
 #define MODE_PREFIX(c) (modecharinfo[(unsigned char)(c)].prefix)
 
 typedef struct mode_info {

src/mod/module.h

@@ -532,7 +532,8 @@ typedef void (*chanout_butfunc)(int, int, const char *, ...) ATTRIBUTE_FORMAT(pr
 #define findsock ((int(*)(int))global[327])
 /* 328 - 331 */
 #define stealth_telnets (*(int *)(global[328]))
-
+#define parse_irc ((parsed_irc_t (*)(char *))global[329])
+#define join_str_array ((char *(*)(char **, int, char *))global[330])
 
 /* hostmasking */
 #define maskhost(a,b) maskaddr((a),(b),3)

src/modules.c

@@ -632,7 +632,9 @@ Function global_table[] = {
   (Function) dcc_telnet_hostresolved2,
   (Function) findsock,
 /* 328 - 331 */
-  (Function) & stealth_telnets    /* int                                 */
+  (Function) & stealth_telnets,   /* int                                 */
+  (Function) parse_irc,
+  (Function) join_str_array,
 };
 
 void init_modules(void)

src/proto.h

@@ -236,6 +236,8 @@ void check_logsize(void);
 void splitc(char *, char *, char);
 void splitcn(char *, char *, char, size_t);
 void remove_crlf(char **);
+parsed_irc_t parse_irc(char *);
+char *join_str_array(char **argv, int argc, char *delim);
 char *newsplit(char **);
 char *splitnick(char **);
 void stridx(char *, char *, int);