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

Comparing ircd-hybrid-8/src/s_serv.c (file contents):
Revision 1169 by michael, Fri Aug 12 18:45:03 2011 UTC vs.
Revision 1196 by michael, Sun Aug 21 10:09:23 2011 UTC

# Line 867 | Line 867 | sendnick_TS(struct Client *client_p, str
867    }
868  
869    /* XXX Both of these need to have a :me.name or :mySID!?!?! */
870 <  if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
871 <    sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
872 <               target_p->servptr->id,
873 <               target_p->name, target_p->hopcount + 1,
874 <               (unsigned long) target_p->tsinfo,
875 <               ubuf, target_p->username, target_p->host,
876 <               (MyClient(target_p) && IsIPSpoof(target_p)) ?
877 <               "0" : target_p->sockhost, target_p->id, target_p->info);
870 >  if (IsCapable(client_p, CAP_SVS))
871 >  {
872 >    if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
873 >      sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
874 >                 target_p->servptr->id,
875 >                 target_p->name, target_p->hopcount + 1,
876 >                 (unsigned long) target_p->tsinfo,
877 >                 ubuf, target_p->username, target_p->host,
878 >                 (MyClient(target_p) && IsIPSpoof(target_p)) ?
879 >                 "0" : target_p->sockhost, target_p->id,
880 >                 (unsigned long)target_p->servicestamp, target_p->info);
881 >    else
882 >      sendto_one(client_p, "NICK %s %d %lu %s %s %s %s %lu :%s",
883 >                 target_p->name, target_p->hopcount + 1,
884 >                 (unsigned long) target_p->tsinfo,
885 >                 ubuf, target_p->username, target_p->host,
886 >                 target_p->servptr->name, (unsigned long)target_p->servicestamp,
887 >                 target_p->info);
888 >  }
889    else
890 <    sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
891 <               target_p->name, target_p->hopcount + 1,
892 <               (unsigned long) target_p->tsinfo,
893 <               ubuf, target_p->username, target_p->host,
894 <               target_p->servptr->name, target_p->info);
890 >  {
891 >    if (HasID(target_p) && IsCapable(client_p, CAP_TS6))
892 >      sendto_one(client_p, ":%s UID %s %d %lu %s %s %s %s %s :%s",
893 >                 target_p->servptr->id,
894 >                 target_p->name, target_p->hopcount + 1,
895 >                 (unsigned long) target_p->tsinfo,
896 >                 ubuf, target_p->username, target_p->host,
897 >                 (MyClient(target_p) && IsIPSpoof(target_p)) ?
898 >                 "0" : target_p->sockhost, target_p->id, target_p->info);
899 >    else
900 >      sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
901 >                 target_p->name, target_p->hopcount + 1,
902 >                 (unsigned long) target_p->tsinfo,
903 >                 ubuf, target_p->username, target_p->host,
904 >                 target_p->servptr->name, target_p->info);
905 >  }
906  
907    if (IsConfAwayBurst((struct AccessItem *)map_to_conf(client_p->serv->sconf)))
908      if (!EmptyString(target_p->away))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines