Cleanups to 005 code, from ratbox (androsyn).

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

diff --git a/src/client.c b/src/client.c
index ab8349e05b2eac9785d332b8afd4c30775edc1be..e9631c400aa1d49328eb81fe541461c240c0dbd8 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -162,7 +162,7 @@ make_client(struct Client *from)
 
                client_p->localClient->lasttime = client_p->localClient->firsttime = CurrentTime;
 
-               client_p->localClient->fd = -1;
+               client_p->localClient->F = NULL;
                client_p->localClient->ctrlfd = -1;
 
                client_p->preClient = (struct PreClient *) BlockHeapAlloc(pclient_heap);
@@ -222,8 +222,8 @@ free_local_client(struct Client *client_p)
                client_p->localClient->listener = 0;
        }
 
-       if(client_p->localClient->fd >= 0)
-               comm_close(client_p->localClient->fd);
+       if(client_p->localClient->F)
+               comm_close(client_p->localClient->F->fd);
 
        if(client_p->localClient->passwd)
        {
@@ -304,45 +304,10 @@ check_pings_list(dlink_list * list)
        {
                client_p = ptr->data;
 
-               /*
-                ** Note: No need to notify opers here. It's
-                ** already done when "FLAGS_DEADSOCKET" is set.
-                */
                if(!MyConnect(client_p) || IsDead(client_p))
                        continue;
 
-               if(IsPerson(client_p))
-               {
-                       if(!IsExemptKline(client_p) &&
-                          GlobalSetOptions.idletime &&
-                          !IsOper(client_p) &&
-                          !IsIdlelined(client_p) &&
-                          ((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
-                       {
-                               struct ConfItem *aconf;
-
-                               aconf = make_conf();
-                               aconf->status = CONF_KILL;
-
-                               DupString(aconf->host, client_p->host);
-                               DupString(aconf->passwd, "idle exceeder");
-                               DupString(aconf->user, client_p->username);
-                               aconf->port = 0;
-                               aconf->hold = CurrentTime + 60;
-                               add_temp_kline(aconf);
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                                    "Idle time limit exceeded for %s - temp k-lining",
-                                                    get_client_name(client_p, HIDE_IP));
-
-                               exit_client(client_p, client_p, &me, aconf->passwd);
-                               continue;
-                       }
-               }
-
-               if(!IsRegistered(client_p))
-                       ping = ConfigFileEntry.connect_timeout;
-               else
-                       ping = get_client_ping(client_p);
+               ping = get_client_ping(client_p);
 
                if(ping < (CurrentTime - client_p->localClient->lasttime))
                {
@@ -353,9 +318,9 @@ check_pings_list(dlink_list * list)
                        if(((CurrentTime - client_p->localClient->lasttime) >= (2 * ping)
                            && (client_p->flags & FLAGS_PINGSENT)))
                        {
-                               if(IsAnyServer(client_p))
+                               if(IsServer(client_p))
                                {
-                                       sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
+                                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                                             "No response from %s, closing link",
                                                             get_server_name(client_p, HIDE_IP));
                                        ilog(L_SERVER,
@@ -399,6 +364,7 @@ check_unknowns_list(dlink_list * list)
 {
        dlink_node *ptr, *next_ptr;
        struct Client *client_p;
+       int timeout;
 
        DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
        {
@@ -412,8 +378,20 @@ check_unknowns_list(dlink_list * list)
                 * for > 30s, close them.
                 */
 
-               if((CurrentTime - client_p->localClient->firsttime) > 30)
+               timeout = IsAnyServer(client_p) ? ConfigFileEntry.connect_timeout : 30;
+               if((CurrentTime - client_p->localClient->firsttime) > timeout)
+               {
+                       if(IsAnyServer(client_p))
+                       {
+                               sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+                                                    "No response from %s, closing link",
+                                                    get_server_name(client_p, HIDE_IP));
+                               ilog(L_SERVER,
+                                    "No response from %s, closing link",
+                                    log_client_name(client_p, HIDE_IP));
+                       }
                        exit_client(client_p, client_p, &me, "Connection timed out");
+               }
        }
 }
 
@@ -1524,6 +1502,7 @@ qs_server(struct Client *client_p, struct Client *source_p, struct Client *from,
 
        del_from_client_hash(source_p->name, source_p);
        remove_client_from_list(source_p);  
+       scache_split(source_p->serv->nameinfo);
        
        SetDead(source_p);
        dlinkAddAlloc(source_p, &dead_list);    
@@ -2091,14 +2070,14 @@ close_connection(struct Client *client_p)
        else
                ServerStats->is_ni++;
 
-       if(-1 < client_p->localClient->fd)
+       if(client_p->localClient->F)
        {
                /* attempt to flush any pending dbufs. Evil, but .. -- adrian */
                if(!IsIOError(client_p))
-                       send_queued_write(client_p->localClient->fd, client_p);
+                       send_queued_write(client_p->localClient->F->fd, client_p);
 
-               comm_close(client_p->localClient->fd);
-               client_p->localClient->fd = -1;
+               comm_close(client_p->localClient->F->fd);
+               client_p->localClient->F = NULL;
        }
 
        if(-1 < client_p->localClient->ctrlfd)
@@ -2134,14 +2113,12 @@ error_exit_client(struct Client *client_p, int error)
         * for reading even though it ends up being an EOF. -avalon
         */
        char errmsg[255];
-       int current_error = comm_get_sockerr(client_p->localClient->fd);
+       int current_error = comm_get_sockerr(client_p->localClient->F->fd);
 
        SetIOError(client_p);
 
        if(IsServer(client_p) || IsHandshake(client_p))
        {
-               int connected = CurrentTime - client_p->localClient->firsttime;
-
                if(error == 0)
                {
                        sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL,
@@ -2159,13 +2136,6 @@ error_exit_client(struct Client *client_p, int error)
                        ilog(L_SERVER, "Lost connection to %s: %s",
                                log_client_name(client_p, SHOW_IP), strerror(current_error));
                }
-
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "%s had been connected for %d day%s, %2d:%02d:%02d",
-                                    client_p->name, connected / 86400,
-                                    (connected / 86400 == 1) ? "" : "s",
-                                    (connected % 86400) / 3600,
-                                    (connected % 3600) / 60, connected % 60);
        }
 
        if(error == 0)