]> jfr.im git - solanum.git/blobdiff - src/client.c
Merge pull request #53 from ShadowNinja/clarify_U+R
[solanum.git] / src / client.c
index 892c88cd5eb96a435112f478f177a4f4f5804908..4edfe35bea83ea300cb3e88d6a551853cbc8c7a4 100644 (file)
@@ -55,6 +55,7 @@
 #include "scache.h"
 #include "irc_dictionary.h"
 #include "sslproc.h"
+#include "s_assert.h"
 
 #define DEBUG_EXITED_CLIENTS
 
@@ -161,7 +162,7 @@ make_client(struct Client *from)
 
                client_p->localClient->F = NULL;
 
-               client_p->preClient = rb_bh_alloc(pclient_heap);;
+               client_p->preClient = rb_bh_alloc(pclient_heap);
 
                /* as good a place as any... */
                rb_dlinkAdd(client_p, &client_p->localClient->tnode, &unknown_list);
@@ -172,7 +173,7 @@ make_client(struct Client *from)
                client_p->preClient = NULL;
                client_p->from = from;  /* 'from' of local client is self! */
        }
-       
+
        SetUnknown(client_p);
        strcpy(client_p->username, "unknown");
 
@@ -192,7 +193,8 @@ free_pre_client(struct Client *client_p)
        blptr = client_p->preClient->dnsbl_listed;
        if (blptr != NULL)
                unref_blacklist(blptr);
-       abort_blacklist_queries(client_p);
+       s_assert(rb_dlink_list_length(&client_p->preClient->dnsbl_queries) == 0);
+
        rb_bh_free(pclient_heap, client_p->preClient);
        client_p->preClient = NULL;
 }
@@ -241,7 +243,7 @@ free_local_client(struct Client *client_p)
 
        if(IsSSL(client_p))
            ssld_decrement_clicount(client_p->localClient->ssl_ctl);
-           
+
        if(IsCapable(client_p, CAP_ZIP))
            ssld_decrement_clicount(client_p->localClient->z_ctl);
 
@@ -266,7 +268,7 @@ free_client(struct Client *client_p)
  *
  * inputs       - NOT USED (from event)
  * output       - next time_t when check_pings() should be called again
- * side effects - 
+ * side effects -
  *
  *
  * A PING can be sent to clients as necessary.
@@ -299,7 +301,7 @@ check_pings(void *notused)
  *
  * inputs      - pointer to list to check
  * output      - NONE
- * side effects        - 
+ * side effects        -
  */
 static void
 check_pings_list(rb_dlink_list * list)
@@ -433,8 +435,8 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
        else
                sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
                           me.name, client_p->name, reason);
-       
-       exit_client(client_p, client_p, &me, 
+
+       exit_client(client_p, client_p, &me,
                        EmptyString(ConfigFileEntry.kline_reason) ? exit_reason :
                         ConfigFileEntry.kline_reason);
 }
@@ -600,12 +602,100 @@ check_xlines(void)
        }
 }
 
+/* resv_nick_fnc
+ *
+ * inputs              - resv, reason, time
+ * outputs             - NONE
+ * side effects        - all local clients matching resv will be FNC'd
+ */
+void
+resv_nick_fnc(const char *mask, const char *reason, int temp_time)
+{
+       struct Client *client_p, *target_p;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
+       char *nick;
+       char note[NICKLEN+10];
+
+       if (!ConfigFileEntry.resv_fnc)
+               return;
+
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+       {
+               client_p = ptr->data;
+
+               if(IsMe(client_p) || !IsPerson(client_p) || IsExemptResv(client_p))
+                       continue;
+
+               /* Skip users that already have UID nicks. */
+               if(IsDigit(client_p->name[0]))
+                       continue;
+
+               if(match_esc(mask, client_p->name))
+               {
+                       nick = client_p->id;
+
+                       /* Tell opers. */
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               "RESV forced nick change for %s!%s@%s to %s; nick matched [%s] (%s)",
+                               client_p->name, client_p->username, client_p->host, nick, mask, reason);
+
+                       sendto_realops_snomask(SNO_NCHANGE, L_ALL,
+                               "Nick change: From %s to %s [%s@%s]",
+                               client_p->name, nick, client_p->username, client_p->host);
+
+                       /* Tell the user. */
+                       if (temp_time > 0)
+                       {
+                               sendto_one_notice(client_p,
+                                       ":*** Nick %s is temporarily unavailable on this server.",
+                                       client_p->name);
+                       }
+                       else
+                       {
+                               sendto_one_notice(client_p,
+                                       ":*** Nick %s is no longer available on this server.",
+                                       client_p->name);
+                       }
+
+                       /* Do all of the nick-changing gymnastics. */
+                       client_p->tsinfo = rb_current_time();
+                       add_history(client_p, 1);
+
+                       monitor_signoff(client_p);
+
+                       invalidate_bancache_user(client_p);
+
+                       sendto_common_channels_local(client_p, NOCAPS, ":%s!%s@%s NICK :%s",
+                               client_p->name, client_p->username, client_p->host, nick);
+                       sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
+                               use_id(client_p), nick, (long) client_p->tsinfo);
+
+                       del_from_client_hash(client_p->name, client_p);
+                       rb_strlcpy(client_p->name, nick, sizeof(client_p->name));
+                       add_to_client_hash(nick, client_p);
+
+                       monitor_signon(client_p);
+
+                       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
+                       {
+                               target_p = ptr->data;
+                               rb_dlinkFindDestroy(client_p, &target_p->localClient->allow_list);
+                               rb_dlinkDestroy(ptr, &client_p->on_allow_list);
+                       }
+
+                       rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+                       rb_note(client_p->localClient->F, note);
+               }
+       }
+}
+
 /*
  * update_client_exit_stats
  *
  * input       - pointer to client
  * output      - NONE
- * side effects        - 
+ * side effects        -
  */
 static void
 update_client_exit_stats(struct Client *client_p)
@@ -636,7 +726,7 @@ update_client_exit_stats(struct Client *client_p)
  *
  * input       - pointer to client to release
  * output      - NONE
- * side effects        - 
+ * side effects        -
  */
 static void
 release_client_state(struct Client *client_p)
@@ -717,8 +807,8 @@ find_named_person(const char *name)
 
 
 /*
- * find_chasing - find the client structure for a nick name (user) 
- *      using history mechanism if necessary. If the client is not found, 
+ * find_chasing - find the client structure for a nick name (user)
+ *      using history mechanism if necessary. If the client is not found,
  *      an error message (NO SUCH NICK) is generated. If the client was found
  *      through the history, chasing will be 1 and otherwise 0.
  */
@@ -782,7 +872,7 @@ get_client_name(struct Client *client, int showip)
                if(!irccmp(client->name, client->host))
                        return client->name;
 
-               if(ConfigFileEntry.hide_spoof_ips && 
+               if(ConfigFileEntry.hide_spoof_ips &&
                   showip == SHOW_IP && IsIPSpoof(client))
                        showip = MASK_IP;
                if(IsAnyServer(client))
@@ -792,8 +882,8 @@ get_client_name(struct Client *client, int showip)
                switch (showip)
                {
                case SHOW_IP:
-                       rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", 
-                                  client->name, client->username, 
+                       rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
+                                  client->name, client->username,
                                   client->sockhost);
                        break;
                case MASK_IP:
@@ -807,12 +897,12 @@ get_client_name(struct Client *client, int showip)
                return nbuf;
        }
 
-       /* As pointed out by Adel Mezibra 
+       /* As pointed out by Adel Mezibra
         * Neph|l|m@EFnet. Was missing a return here.
         */
        return client->name;
 }
-       
+
 /* log_client_name()
  *
  * This version is the same as get_client_name, but doesnt contain the
@@ -838,10 +928,6 @@ log_client_name(struct Client *target_p, int showip)
                                   target_p->username, target_p->sockhost);
                        break;
 
-               case MASK_IP:
-                       rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
-                                  target_p->name, target_p->username);
-
                default:
                        rb_snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", target_p->name,
                                   target_p->username, target_p->host);
@@ -888,7 +974,7 @@ free_exited_clients(void *unused)
                                if(abt->client == target_p)
                                {
                                        s_assert(0);
-                                       sendto_realops_snomask(SNO_GENERAL, L_ALL, 
+                                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                                "On abort_list: %s stat: %u flags: %u/%u handler: %c",
                                                target_p->name, (unsigned int) target_p->status,
                                                target_p->flags, target_p->flags2, target_p->handler);
@@ -935,53 +1021,13 @@ free_exited_clients(void *unused)
                rb_dlinkDestroy(ptr, &dead_remote_list);
        }
 #endif
-       
-}
 
-/*
-** Recursively send QUITs and SQUITs for source_p and all its dependent clients
-** and servers to those servers that need them.  A server needs the client
-** QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
-** isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
-** a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
-** on that one -orabidoo
-*/
-static void
-recurse_send_quits(struct Client *client_p, struct Client *source_p, 
-                  struct Client *to, const char *comment1,
-                  const char *comment)
-{
-       struct Client *target_p;
-       rb_dlink_node *ptr, *ptr_next;
-       /* If this server can handle quit storm (QS) removal
-        * of dependents, just send the SQUIT
-        */
-
-       if(IsCapable(to, CAP_QS))
-       {
-               sendto_one(to, "SQUIT %s :%s",
-                          get_id(source_p, to), comment);
-       }
-       else
-       {
-               RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->users.head)
-               {
-                       target_p = ptr->data;
-                       sendto_one(to, ":%s QUIT :%s", target_p->name, comment1);
-               }
-               RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
-               {
-                       target_p = ptr->data;
-                       recurse_send_quits(client_p, target_p, to, comment1, comment);
-               }
-               sendto_one(to, "SQUIT %s :%s", source_p->name, comment);
-       }
 }
 
-/* 
+/*
 ** Remove all clients that depend on source_p; assumes all (S)QUITs have
-** already been sent.  we make sure to exit a server's dependent clients 
-** and servers before the server itself; exit_one_client takes care of 
+** already been sent.  we make sure to exit a server's dependent clients
+** and servers before the server itself; exit_one_client takes care of
 ** actually removing things off llists.   tweaked from +CSr31  -orabidoo
 */
 /*
@@ -1022,7 +1068,7 @@ recurse_remove_clients(struct Client *source_p, const char *comment)
                        if(!IsDead(target_p) && !IsClosing(target_p))
                                exit_remote_client(NULL, target_p, &me, comment);
                }
-       }       
+       }
 
        RB_DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->servers.head)
        {
@@ -1034,7 +1080,7 @@ recurse_remove_clients(struct Client *source_p, const char *comment)
 
 /*
 ** Remove *everything* that depends on source_p, from all lists, and sending
-** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
+** all necessary SQUITs.  source_p itself is still on the lists,
 ** and its SQUITs have been sent except for the upstream one  -orabidoo
 */
 static void
@@ -1049,11 +1095,10 @@ remove_dependents(struct Client *client_p,
        {
                to = ptr->data;
 
-               if(IsMe(to) || to == source_p->from || 
-                  (to == client_p && IsCapable(to, CAP_QS)))
+               if(IsMe(to) || to == source_p->from || to == client_p)
                        continue;
 
-               recurse_send_quits(client_p, source_p, to, comment1, comment);
+               sendto_one(to, "SQUIT %s :%s", get_id(source_p, to), comment);
        }
 
        recurse_remove_clients(source_p, comment1);
@@ -1073,7 +1118,7 @@ exit_aborted_clients(void *unused)
                        if(rb_dlinkFind(abt->client, &dead_list))
                        {
                                s_assert(0);
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL, 
+                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                        "On dead_list: %s stat: %u flags: %u/%u handler: %c",
                                        abt->client->name, (unsigned int) abt->client->status,
                                        abt->client->flags, abt->client->flags2, abt->client->handler);
@@ -1171,7 +1216,7 @@ exit_generic_client(struct Client *client_p, struct Client *source_p, struct Cli
        remove_client_from_list(source_p);
 }
 
-/* 
+/*
  * Assumes IsPerson(source_p) && !MyConnect(source_p)
  */
 
@@ -1180,7 +1225,7 @@ exit_remote_client(struct Client *client_p, struct Client *source_p, struct Clie
                   const char *comment)
 {
        exit_generic_client(client_p, source_p, from, comment);
-       
+
        if(source_p->servptr && source_p->servptr->serv)
        {
                rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
@@ -1210,6 +1255,7 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
                  const char *comment)
 {
        delete_auth_queries(source_p);
+       abort_blacklist_queries(source_p);
        if (source_p->localClient->dnsquery)
        {
                delete_resolver_queries(source_p->localClient->dnsquery);
@@ -1238,13 +1284,13 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 }
 
 static int
-exit_remote_server(struct Client *client_p, struct Client *source_p, struct Client *from, 
+exit_remote_server(struct Client *client_p, struct Client *source_p, struct Client *from,
                  const char *comment)
 {
        static char comment1[(HOSTLEN*2)+2];
        static char newcomment[BUFSIZE];
        struct Client *target_p;
-       
+
        if(ConfigServerHide.flatten_links)
                strcpy(comment1, "*.net *.split");
        else
@@ -1267,11 +1313,11 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
 
        rb_dlinkFindDestroy(source_p, &global_serv_list);
        target_p = source_p->from;
-       
+
        if(target_p != NULL && IsServer(target_p) && target_p != client_p &&
           !IsMe(target_p) && (source_p->flags & FLAGS_KILLED) == 0)
        {
-               sendto_one(target_p, ":%s SQUIT %s :%s", 
+               sendto_one(target_p, ":%s SQUIT %s :%s",
                           get_id(from, target_p), get_id(source_p, target_p),
                           comment);
        }
@@ -1280,9 +1326,9 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
                del_from_id_hash(source_p->id, source_p);
 
        del_from_client_hash(source_p->name, source_p);
-       remove_client_from_list(source_p);  
+       remove_client_from_list(source_p);
        scache_split(source_p->serv->nameinfo);
-       
+
        SetDead(source_p);
 #ifdef DEBUG_EXITED_CLIENTS
        rb_dlinkAddAlloc(source_p, &dead_remote_list);
@@ -1293,7 +1339,7 @@ exit_remote_server(struct Client *client_p, struct Client *source_p, struct Clie
 }
 
 static int
-qs_server(struct Client *client_p, struct Client *source_p, struct Client *from, 
+qs_server(struct Client *client_p, struct Client *source_p, struct Client *from,
                  const char *comment)
 {
        if(source_p->servptr && source_p->servptr->serv)
@@ -1302,31 +1348,30 @@ qs_server(struct Client *client_p, struct Client *source_p, struct Client *from,
                s_assert(0);
 
        rb_dlinkFindDestroy(source_p, &global_serv_list);
-       
+
        if(has_id(source_p))
                del_from_id_hash(source_p->id, source_p);
 
        del_from_client_hash(source_p->name, source_p);
-       remove_client_from_list(source_p);  
+       remove_client_from_list(source_p);
        scache_split(source_p->serv->nameinfo);
-       
+
        SetDead(source_p);
-       rb_dlinkAddAlloc(source_p, &dead_list); 
+       rb_dlinkAddAlloc(source_p, &dead_list);
        return 0;
 }
 
 static int
-exit_local_server(struct Client *client_p, struct Client *source_p, struct Client *from, 
+exit_local_server(struct Client *client_p, struct Client *source_p, struct Client *from,
                  const char *comment)
 {
        static char comment1[(HOSTLEN*2)+2];
        static char newcomment[BUFSIZE];
        unsigned int sendk, recvk;
-       
+
        rb_dlinkDelete(&source_p->localClient->tnode, &serv_list);
        rb_dlinkFindDestroy(source_p, &global_serv_list);
-       
-       unset_chcap_usage_counts(source_p);
+
        sendk = source_p->localClient->sendK;
        recvk = source_p->localClient->receiveK;
 
@@ -1343,7 +1388,7 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
                sendto_one(source_p, "ERROR :Closing Link: 127.0.0.1 %s (%s)",
                           source_p->name, comment);
        }
-       
+
        if(source_p->servptr && source_p->servptr->serv)
                rb_dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
        else
@@ -1351,7 +1396,7 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 
 
        close_connection(source_p);
-       
+
        if(ConfigServerHide.flatten_links)
                strcpy(comment1, "*.net *.split");
        else
@@ -1370,21 +1415,21 @@ exit_local_server(struct Client *client_p, struct Client *source_p, struct Clien
 
        ilog(L_SERVER, "%s was connected for %ld seconds.  %d/%d sendK/recvK.",
             source_p->name, (long) rb_current_time() - source_p->localClient->firsttime, sendk, recvk);
-        
+
        if(has_id(source_p))
                del_from_id_hash(source_p->id, source_p);
 
        del_from_client_hash(source_p->name, source_p);
        remove_client_from_list(source_p);
        scache_split(source_p->serv->nameinfo);
-       
+
        SetDead(source_p);
        rb_dlinkAddAlloc(source_p, &dead_list);
        return 0;
 }
 
 
-/* 
+/*
  * This assumes IsPerson(source_p) == TRUE && MyConnect(source_p) == TRUE
  */
 
@@ -1500,8 +1545,8 @@ exit_client(struct Client *client_p,      /* The local client originating the
                /* IsUnknown || IsConnecting || IsHandShake */
                else if(!IsReject(source_p))
                        return exit_unknown_client(client_p, source_p, from, comment);
-       } 
-       else 
+       }
+       else
        {
                /* Remotes */
                if(IsPerson(source_p))
@@ -1542,9 +1587,9 @@ count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
 
 /*
  * accept processing, this adds a form of "caller ID" to ircd
- * 
+ *
  * If a client puts themselves into "caller ID only" mode,
- * only clients that match a client pointer they have put on 
+ * only clients that match a client pointer they have put on
  * the accept list will be allowed to message them.
  *
  * [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
@@ -1555,7 +1600,7 @@ count_remote_client_memory(size_t * count, size_t * remote_client_memory_used)
  * each source client then has a back pointer pointing back
  * to the client that has it on its accept list.
  * This allows for exit_one_client to remove these now bogus entries
- * from any client having an accept on them. 
+ * from any client having an accept on them.
  */
 /*
  * del_all_accepts
@@ -1595,12 +1640,12 @@ del_all_accepts(struct Client *client_p)
 }
 
 /*
- * show_ip() - asks if the true IP shoudl be shown when source is
- *             askin for info about target 
+ * show_ip() - asks if the true IP should be shown when source is
+ *             asking for info about target
  *
  * Inputs      - source_p who is asking
  *             - target_p who do we want the info on
- * Output      - returns 1 if clear IP can be showed, otherwise 0
+ * Output      - returns 1 if clear IP can be shown, otherwise 0
  * Side Effects        - none
  */
 
@@ -1641,6 +1686,18 @@ show_ip_conf(struct ConfItem *aconf, struct Client *source_p)
                return 1;
 }
 
+int
+show_ip_whowas(struct Whowas *whowas, struct Client *source_p)
+{
+       if(whowas->flags & WHOWAS_IP_SPOOFING)
+               if(ConfigFileEntry.hide_spoof_ips || !MyOper(source_p))
+                       return 0;
+       if(whowas->flags & WHOWAS_DYNSPOOF)
+               if(!IsOper(source_p))
+                       return 0;
+       return 1;
+}
+
 /*
  * make_user
  *
@@ -1687,7 +1744,7 @@ make_server(struct Client *client_p)
 
 /*
  * free_user
- * 
+ *
  * inputs      - pointer to user struct
  *             - pointer to client struct
  * output      - none
@@ -1717,7 +1774,7 @@ free_user(struct User *user, struct Client *client_p)
                                             client_p->host,
                                             (unsigned long) user,
                                             (unsigned long) user->invited.head,
-                                            (unsigned long) user->channel.head, 
+                                            (unsigned long) user->channel.head,
                                             rb_dlink_list_length(&user->channel),
                                             user->refcnt);
                        s_assert(!user->refcnt);
@@ -1733,7 +1790,7 @@ void
 allocate_away(struct Client *client_p)
 {
        if(client_p->user->away == NULL)
-               client_p->user->away = rb_bh_alloc(away_heap);  
+               client_p->user->away = rb_bh_alloc(away_heap);
 }
 
 
@@ -1809,7 +1866,7 @@ close_connection(struct Client *client_p)
        s_assert(MyConnect(client_p));
        if(!MyConnect(client_p))
                return;
-       
+
        if(IsServer(client_p))
        {
                struct server_conf *server_p;