chm_* declarations gone to chmode.h - this makes some modules clean

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index f68c763acf0669bbd758954833c312161e49582a..f8d5e0ca1ad54d65d4eaf22c888f2d090c92bc65 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "s_user.h"
 #include "channel.h"
 #include "class.h"
@@ -38,17 +37,15 @@
 #include "listener.h"
 #include "msg.h"
 #include "numeric.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "scache.h"
 #include "send.h"
 #include "supported.h"
 #include "whowas.h"
-#include "memory.h"
 #include "packet.h"
 #include "reject.h"
 #include "cache.h"
@@ -97,7 +94,7 @@ int user_modes[256] = {
        0,                      /* W */
        0,                      /* X */
        0,                      /* Y */
-       0,                      /* Z */
+       UMODE_SSLCLIENT,        /* Z */
        /* 0x5B */ 0, 0, 0, 0, 0, 0, /* 0x60 */
        UMODE_ADMIN,            /* a */
        0,                      /* b */
@@ -264,7 +261,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        if(rb_dlink_list_length(&source_p->preClient->dnsbl_queries) > 0)
                return -1;
 
-       client_p->localClient->last = CurrentTime;
+       client_p->localClient->last = rb_current_time();
        /* Straight up the maximum rate of flooding... */
        source_p->localClient->allow_read = MAX_FLOOD_BURST;
 
@@ -293,10 +290,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        /* Apply nick override */
        if(*source_p->preClient->spoofnick)
        {
+               char note[NICKLEN + 10];
+
                del_from_client_hash(source_p->name, source_p);
                strlcpy(source_p->name, source_p->preClient->spoofnick, NICKLEN + 1);
                add_to_client_hash(source_p->name, source_p);
-               rb_note(source_p->localClient->F->fd, "Nick: %s", source_p->name);
+
+               rb_snprintf(note, NICKLEN + 10, "Nick: %s", source_p->name);
+               rb_note(source_p->localClient->F, note);
        }
 
        if(!valid_hostname(source_p->host))
@@ -322,7 +323,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
                if(IsNeedIdentd(aconf))
                {
-                       ServerStats->is_ref++;
+                       ServerStats.is_ref++;
                        sendto_one_notice(source_p, ":*** Notice -- You need to install identd to use this server");
                        exit_client(client_p, source_p, &me, "Install identd");
                        return (CLIENT_EXITED);
@@ -349,7 +350,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
        if(IsNeedSasl(aconf) && !*user->suser)
        {
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                sendto_one_notice(source_p, ":*** Notice -- You need to identify via SASL to use this server");
                exit_client(client_p, source_p, &me, "SASL access only");
                return (CLIENT_EXITED);
@@ -369,7 +370,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
                if(strcmp(encr, aconf->passwd))
                {
-                       ServerStats->is_ref++;
+                       ServerStats.is_ref++;
                        sendto_one(source_p, form_str(ERR_PASSWDMISMATCH), me.name, source_p->name);
                        exit_client(client_p, source_p, &me, "Bad Password");
                        return (CLIENT_EXITED);
@@ -380,7 +381,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                if(source_p->localClient->passwd)
                {
                        memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
-                       MyFree(source_p->localClient->passwd);
+                       rb_free(source_p->localClient->passwd);
                        source_p->localClient->passwd = NULL;
                }
        }
@@ -403,7 +404,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                sendto_realops_snomask(SNO_FULL, L_ALL,
                                     "Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
 
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                exit_client(client_p, source_p, &me, "Sorry, server is full - try later");
                return (CLIENT_EXITED);
        }
@@ -412,7 +413,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
        if(!IsExemptKline(source_p) &&
           (xconf = find_xline(source_p->info, 1)) != NULL)
        {
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                add_reject(source_p, xconf->name, NULL);
                exit_client(client_p, source_p, &me, "Bad user info");
                return CLIENT_EXITED;
@@ -434,7 +435,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                        substitution_append_var(&varlist, "dnsbl-host", source_p->preClient->dnsbl_listed->host);
                        substitution_append_var(&varlist, "network-name", ServerInfo.network_name);
 
-                       ServerStats->is_ref++;
+                       ServerStats.is_ref++;
 
                        sendto_one(source_p, form_str(ERR_YOUREBANNEDCREEP),
                                        me.name, source_p->name,
@@ -458,7 +459,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                sendto_realops_snomask(SNO_REJ, L_ALL,
                                     "Invalid username: %s (%s@%s)",
                                     source_p->name, source_p->username, source_p->host);
-               ServerStats->is_ref++;
+               ServerStats.is_ref++;
                sendto_one_notice(source_p, ":*** Your username is invalid. Please make sure that your username contains "
                                            "only alphanumeric characters.");
                rb_sprintf(tmpstr2, "Invalid username [%s]", source_p->username);
@@ -521,6 +522,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                add_to_id_hash(source_p->id, source_p);
        }
 
+       if (IsSSL(source_p))
+               source_p->umodes |= UMODE_SSLCLIENT;
+
        if (source_p->umodes & UMODE_INVISIBLE)
                Count.invisi++;
 
@@ -676,7 +680,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
                                                source_p->localClient->passwd);
                }
                memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
-               MyFree(source_p->localClient->passwd);
+               rb_free(source_p->localClient->passwd);
                source_p->localClient->passwd = NULL;
        }
 
@@ -990,7 +994,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                                        }
                                        source_p->flags2 &= ~OPER_FLAGS;
 
-                                       MyFree(source_p->localClient->opername);
+                                       rb_free(source_p->localClient->opername);
                                        source_p->localClient->opername = NULL;
 
                                        rb_dlinkFindDestroy(source_p, &local_oper_list);
@@ -1006,6 +1010,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
                /* can only be set on burst */
                case 'S':
+               case 'Z':
                case ' ':
                case '\n':
                case '\r':
@@ -1183,7 +1188,7 @@ send_umode_out(struct Client *client_p, struct Client *source_p, int old)
 
        send_umode(NULL, source_p, old, 0, buf);
 
-       DLINK_FOREACH(ptr, serv_list.head)
+       RB_DLINK_FOREACH(ptr, serv_list.head)
        {
                target_p = ptr->data;
 
@@ -1277,7 +1282,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        SetExemptKline(source_p);
 
        source_p->flags2 |= oper_p->flags;
-       DupString(source_p->localClient->opername, oper_p->name);
+       source_p->localClient->opername = rb_strdup(oper_p->name);
 
        rb_dlinkAddAlloc(source_p, &local_oper_list);
        rb_dlinkAddAlloc(source_p, &oper_list);
@@ -1368,7 +1373,7 @@ construct_umodebuf(void)
 
 void
 change_nick_user_host(struct Client *target_p, const char *nick, const char *user,
-                     const char *host, int newts, char *format, ...)
+                     const char *host, int newts, const char *format, ...)
 {
        rb_dlink_node *ptr;
        struct Channel *chptr;
@@ -1398,7 +1403,7 @@ change_nick_user_host(struct Client *target_p,    const char *nick, const char *use
                                target_p->name, target_p->username, target_p->host,
                                reason);
 
-               DLINK_FOREACH(ptr, target_p->user->channel.head)
+               RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
                {
                        mscptr = ptr->data;
                        chptr = mscptr->chptr;