ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/client.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/client.c (file contents):
Revision 6318 by michael, Wed Aug 5 16:04:43 2015 UTC vs.
Revision 6325 by michael, Sat Aug 8 17:54:22 2015 UTC

# Line 219 | Line 219 | check_pings_list(dlink_list *list)
219      if (IsDead(client_p))
220        continue;  /* Ignore it, its been exited already */
221  
222 <    if (!IsRegistered(client_p))
223 <      ping = CONNECTTIMEOUT;
224 <    else
222 >    if (IsClient(client_p) || IsServer(client_p))
223        ping = get_client_ping(&client_p->connection->confs);
224 +    else
225 +      ping = CONNECTTIMEOUT;
226  
227      if (ping < CurrentTime - client_p->connection->lasttime)
228      {
# Line 725 | Line 725 | exit_client(struct Client *source_p, con
725  
726      delete_auth(&source_p->connection->auth);
727  
728 <    /*
729 <     * This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
730 <     * STAT_HANDSHAKE or STAT_UNKNOWN
731 <     * all of which are lumped together into unknown_list
732 <     *
733 <     * In all above cases IsRegistered() will not be true.
734 <     */
735 <    if (!IsRegistered(source_p))
736 <    {
737 <      assert(dlinkFind(&unknown_list, source_p));
738 <
739 <      dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
740 <    }
741 <    else if (IsClient(source_p))
728 >    if (IsClient(source_p))
729      {
730        time_t on_for = CurrentTime - source_p->connection->firsttime;
731  
# Line 780 | Line 767 | exit_client(struct Client *source_p, con
767        assert(dlinkFind(&local_server_list, source_p));
768        dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
769      }
770 +    else
771 +    {
772 +      assert(dlinkFind(&unknown_list, source_p));
773 +      dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
774 +    }
775  
776      if (!IsDead(source_p))
777      {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines