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

Comparing ircd-hybrid-8/src/client.c (file contents):
Revision 1328 by michael, Sat Mar 31 17:43:32 2012 UTC vs.
Revision 1339 by michael, Fri Apr 6 10:22:36 2012 UTC

# Line 632 | Line 632 | get_client_name(const struct Client *cli
632  
633    assert(client != NULL);
634  
635 <  if (!irccmp(client->name, client->host))
635 >  if (!MyConnect(client) || !irccmp(client->name, client->host))
636      return client->name;
637  
638    if (ConfigServerHide.hide_server_ips)
# Line 647 | Line 647 | get_client_name(const struct Client *cli
647    switch (type)
648    {
649      case SHOW_IP:
650 <      if (MyConnect(client))
651 <      {
652 <        snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
653 <                 client->name,
654 <                 client->username, client->sockhost);
655 <        break;
656 <      }
650 >      snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
651 >               client->name,
652 >               client->username, client->sockhost);
653 >      break;
654      case MASK_IP:
655 <      snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
656 <               client->name, client->username);
655 >      if (client->localClient->aftype == AF_INET)
656 >        snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
657 >                 client->name, client->username);
658 >      else
659 >        snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
660 >                 client->name, client->username);
661        break;
662      default:
663        snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines