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

Comparing ircd-hybrid/branches/8.2.x/src/client.c (file contents):
Revision 6309 by michael, Fri Jul 24 13:50:16 2015 UTC vs.
Revision 6314 by michael, Sat Aug 1 18:06:37 2015 UTC

# Line 226 | Line 226 | check_pings_list(dlink_list *list)
226  
227      if (ping < CurrentTime - client_p->connection->lasttime)
228      {
229 <      if (!IsPingSent(client_p))
229 >      if (!HasFlag(client_p, FLAGS_PINGSENT))
230        {
231          /*
232           * If we haven't PINGed the connection and we haven't
233           * heard from it in a while, PING it to make sure
234           * it is still alive.
235           */
236 <        SetPingSent(client_p);
236 >        AddFlag(client_p, FLAGS_PINGSENT);
237          client_p->connection->lasttime = CurrentTime - ping;
238          sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
239        }
# Line 398 | Line 398 | conf_try_ban(struct Client *client_p, st
398    switch (conf->type)
399    {
400      case CONF_KLINE:
401 <      if (IsExemptKline(client_p))
401 >      if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
402        {
403          sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
404                               "KLINE over-ruled for %s, client is kline_exempt",
# Line 415 | Line 415 | conf_try_ban(struct Client *client_p, st
415        ban_type = 'D';
416        break;
417      case CONF_XLINE:
418 <      if (IsExemptXline(client_p))
418 >      if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
419        {
420          sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
421                               "XLINE over-ruled for %s, client is xline_exempt",
422                               get_client_name(client_p, HIDE_IP));
423          return;
424        }
425 +
426        ban_type = 'X';
427        ++conf->count;
428        break;
# Line 647 | Line 648 | exit_one_client(struct Client *source_p,
648    if (source_p->name[0])
649      hash_del_client(source_p);
650  
651 <  if (IsUserHostIp(source_p))
651 >  if (HasFlag(source_p, FLAGS_USERHOST))
652      delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
653  
654    update_client_exit_stats(source_p);
# Line 969 | Line 970 | exit_aborted_clients(void)
970  
971      dlinkDelete(ptr, &abort_list);
972  
973 <    if (IsSendQExceeded(target_p))
973 >    if (HasFlag(target_p, FLAGS_SENDQEX))
974        notice = "Max SendQ exceeded";
975      else
976        notice = "Write error: connection closed";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines