X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/348683aa59f63ac110c129f808c91fc3156ee14f..412b1e16431d0eafbe1bacb0d7e610971144035c:/src/proto-p10.c

diff --git a/src/proto-p10.c b/src/proto-p10.c
index b310d74..aa44db5 100644
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -29,6 +29,7 @@
 /* Full commands. */
 #define CMD_ACCOUNT		"ACCOUNT"
 #define CMD_ADMIN               "ADMIN"
+#define CMD_ALIST               "ALIST"
 #define CMD_ASLL		"ASLL"
 #define CMD_AWAY                "AWAY"
 #define CMD_BURST               "BURST"
@@ -118,6 +119,7 @@
 /* Tokenized commands. */
 #define TOK_ACCOUNT		"AC"
 #define TOK_ADMIN               "AD"
+#define TOK_ALIST               "AL"
 #define TOK_ASLL		"LL"
 #define TOK_AWAY                "A"
 #define TOK_BURST               "B"
@@ -2452,6 +2454,9 @@ init_parse(void)
     dict_insert(irc_func_dict, TOK_EXEMPT, cmd_dummy);
     dict_insert(irc_func_dict, CMD_PRIVS, cmd_privs);
     dict_insert(irc_func_dict, TOK_PRIVS, cmd_privs);
+    /* ignore ALIST for now */
+    dict_insert(irc_func_dict, TOK_ALIST, cmd_dummy);
+    dict_insert(irc_func_dict, CMD_ALIST, cmd_dummy);
     /* Ignore remote luser */
     dict_insert(irc_func_dict, TOK_LUSERS, cmd_dummy);
     /* We have reliable clock!  Always!  Wraaa! */
@@ -2769,6 +2774,8 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char *
 {
     struct userNode *oldUser, *uNode;
     unsigned int n, ignore_user;
+    char *tstr;
+    int type;
 
     if ((strlen(numeric) < 3) || (strlen(numeric) > 5)) {
         log_module(MAIN_LOG, LOG_WARNING, "AddUser(%p, %s, ...): numeric %s wrong length!", uplink, nick, numeric);
@@ -2817,11 +2824,15 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char *
     safestrncpy(uNode->numeric, numeric, sizeof(uNode->numeric));
     irc_p10_pton(&uNode->ip, realip);
 
-    if (irc_in_addr_is_ipv4(uNode->ip)) {
-      make_virtip((char*)irc_ntoa(&uNode->ip), (char*)irc_ntoa(&uNode->ip), uNode->cryptip);
-      make_virthost((char*)irc_ntoa(&uNode->ip), uNode->hostname, uNode->crypthost);
-    } else if (irc_in_addr_is_ipv6(uNode->ip)) {
-      make_ipv6virthost((char*)irc_ntoa(&uNode->ip), uNode->hostname, uNode->crypthost);
+    tstr = conf_get_data("server/type", RECDB_QSTRING);
+    type = atoi(tstr);
+    if (type > 6) {
+      if (irc_in_addr_is_ipv4(uNode->ip)) {
+        make_virtip((char*)irc_ntoa(&uNode->ip), (char*)irc_ntoa(&uNode->ip), uNode->cryptip);
+        make_virthost((char*)irc_ntoa(&uNode->ip), uNode->hostname, uNode->crypthost);
+      } else if (irc_in_addr_is_ipv6(uNode->ip)) {
+        make_ipv6virthost((char*)irc_ntoa(&uNode->ip), uNode->hostname, uNode->crypthost);
+      }
     }
 
     if (!uNode->crypthost && uNode->cryptip)
@@ -2976,6 +2987,30 @@ void mod_usermode(struct userNode *user, const char *mode_change) {
 	// case 'h': do_user_mode(FLAGS_HELPER); break;
 	// I check if there's an 'h' in the first part, and if there, 
 	// then everything after the space becomes their new host.
+	case 'C': do_user_mode(FLAGS_CLOAKHOST);
+	    if (*word) {
+		char cloakhost[MAXLEN];
+		unsigned int ii;
+		for (ii=0; (*word != ' ') && (*word != '\0'); )
+		    cloakhost[ii++] = *word++;
+		cloakhost[ii] = 0;
+		while (*word == ' ')
+		    word++;
+		safestrncpy(user->crypthost, cloakhost, sizeof(user->crypthost));
+	    }
+	    break;
+	case 'c': do_user_mode(FLAGS_CLOAKIP);
+	    if (*word) {
+		char cloakip[MAXLEN];
+		unsigned int ii;
+		for (ii=0; (*word != ' ') && (*word != '\0'); )
+		    cloakip[ii++] = *word++;
+		cloakip[ii] = 0;
+		while (*word == ' ')
+		    word++;
+		safestrncpy(user->cryptip, cloakip, sizeof(user->cryptip));
+	    }
+	    break;
 	case 'h': do_user_mode(FLAGS_SETHOST);
 	    if (*word) {
 		char sethost[MAXLEN];