ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/server.c

Comparing ircd-hybrid/trunk/src/s_serv.c (file contents):
Revision 1651 by michael, Sat Nov 10 19:27:13 2012 UTC vs.
Revision 1652 by michael, Tue Nov 13 20:28:53 2012 UTC

#	Line 170 | Line 170 | hunt_server(struct Client *client_p, str
170		if (parc <= server || EmptyString(parv[server]))
171		return HUNTED_ISME;
172
173	<	if (!strcmp(parv[server], me.id) || match(parv[server], me.name))
173	>	if (!strcmp(parv[server], me.id) || !match(parv[server], me.name))
174		return HUNTED_ISME;
175
176		/* These are to pickup matches that would cause the following
#	Line 213 | Line 213 | hunt_server(struct Client *client_p, str
213		{
214		target_tmp = ptr->data;
215
216	<	if (match(parv[server], target_tmp->name))
216	>	if (!match(parv[server], target_tmp->name))
217		{
218		if (target_tmp->from == source_p->from && !MyConnect(target_tmp))
219		continue;
#	Line 238 | Line 238 | hunt_server(struct Client *client_p, str
238		if (IsMe(target_p) || MyClient(target_p))
239		return HUNTED_ISME;
240
241	<	if (!match(target_p->name, parv[server]))
241	>	if (match(target_p->name, parv[server]))
242		parv[server] = target_p->name;
243
244		/* This is a little kludgy but should work... */
#	Line 389 | Line 389 | check_server(const char *name, struct Cl
389		{
390		conf = ptr->data;
391
392	<	if (!match(name, conf->name))
392	>	if (match(name, conf->name))
393		continue;
394
395		error = -3;
396
397		/* XXX: Fix me for IPv6                    */
398		/* XXX sockhost is the IPv4 ip as a string */
399	<	if (match(conf->host, client_p->host) ||
400	<	match(conf->host, client_p->sockhost))
399	>	if (!match(conf->host, client_p->host) ||
400	>	!match(conf->host, client_p->sockhost))
401		{
402		error = -2;
403
#	Line 1470 | Line 1470 | find_servconn_in_progress(const char *na
1470		cptr = ptr->data;
1471
1472		if (cptr && cptr->name[0])
1473	<	if (match(name, cptr->name))
1473	>	if (!match(name, cptr->name))
1474		return cptr;
1475		}
1476

Diff Legend

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