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

Comparing ircd-hybrid/trunk/src/s_serv.c (file contents):
Revision 2691 by michael, Tue Dec 17 18:55:59 2013 UTC vs.
Revision 3107 by michael, Thu Mar 6 12:09:42 2014 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  s_serv.c: Server related functions.
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (C) 2005 by the past and present ircd coders, and others.
4 > *  Copyright (c) 1997-2014 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 18 | Line 17
17   *  along with this program; if not, write to the Free Software
18   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19   *  USA
20 < *
21 < *  $Id$
20 > */
21 >
22 > /*! \file s_serv.c
23 > * \brief Server related functions.
24 > * \version $Id$
25   */
26  
27   #include "stdinc.h"
# Line 31 | Line 33
33   #include "channel.h"
34   #include "channel_mode.h"
35   #include "client.h"
34 – #include "dbuf.h"
36   #include "event.h"
37   #include "fdlist.h"
38   #include "hash.h"
# Line 49 | Line 50
50   #include "s_user.h"
51   #include "send.h"
52   #include "memory.h"
53 < #include "channel.h" /* chcap_usage_counts stuff...*/
53 > #include "channel.h"
54   #include "parse.h"
55  
56   #define MIN_CONN_FREQ 300
# Line 244 | Line 245 | hunt_server(struct Client *client_p, str
245      if (match(target_p->name, parv[server]))
246        parv[server] = target_p->name;
247  
248 <    /* This is a little kludgy but should work... */
248 <    if (IsClient(source_p) &&
249 <        ((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
250 <         (!MyConnect(target_p) && IsCapable(target_p->from, CAP_TS6))))
251 <      parv[0] = ID(source_p);
252 <
253 <    sendto_one(target_p, command, parv[0],
248 >    sendto_one(target_p, command, ID_or_name(source_p, target_p),
249                 parv[1], parv[2], parv[3], parv[4],
250                 parv[5], parv[6], parv[7], parv[8]);
251      return HUNTED_PASS;
# Line 905 | Line 900 | server_estab(struct Client *client_p)
900                   IsHidden(target_p) ? "(H) " : "", target_p->info);
901  
902      if (HasFlag(target_p, FLAGS_EOB))
903 <      sendto_one(client_p, ":%s EOB", ID_or_name(client_p, target_p));
903 >      sendto_one(client_p, ":%s EOB", ID_or_name(target_p, client_p));
904    }
905  
906    server_burst(client_p);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)