vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[svn] Do not try find_server() on a name find_client() has

Browse source 
returned NULL for, as this will always return NULL
since the removal of hostmasking.
This commit is contained in:
jilles 2007-01-31 16:49:07 -08:00
parent b0b7de54b1
commit e26e2b1954
4 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
jilles 2007/02/01 00:34:33 UTC (20070201-3179)
Log:
Remove server_exists() which checked whether the
server name existed taking hostmasking into account
and just check with find_server(); admittedly
this checks if the name is a SID but that's not
a real problem.
Changes: Modified:
+3 -27 trunk/modules/core/m_server.c (File Modified)
jilles 2007/02/01 00:19:14 UTC (20070201-3177) jilles 2007/02/01 00:19:14 UTC (20070201-3177)
Log: Log:
Remove hash_find_masked_server(), which made it possible Remove hash_find_masked_server(), which made it possible

2
include/serno.h
View file

@ -1 +1 @@
#define SERNO "20070201-3177" #define SERNO "20070201-3179"

7
modules/m_pong.c
View file

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: m_pong.c 522 2006-01-15 20:55:27Z jilles $ * $Id: m_pong.c 3181 2007-02-01 00:49:07Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -49,7 +49,7 @@ struct Message pong_msgtab = {
}; };
mapi_clist_av1 pong_clist[] = { &pong_msgtab, NULL }; mapi_clist_av1 pong_clist[] = { &pong_msgtab, NULL };
DECLARE_MODULE_AV1(pong, NULL, NULL, pong_clist, NULL, NULL, "$Revision: 522 $"); DECLARE_MODULE_AV1(pong, NULL, NULL, pong_clist, NULL, NULL, "$Revision: 3181 $");
static int static int
ms_pong(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) ms_pong(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@ -69,8 +69,7 @@ ms_pong(struct Client *client_p, struct Client *source_p, int parc, const char *
if(!EmptyString(destination) && !match(destination, me.name) && if(!EmptyString(destination) && !match(destination, me.name) &&
irccmp(destination, me.id)) irccmp(destination, me.id))
{ {
if((target_p = find_client(destination)) || if((target_p = find_client(destination)))
(target_p = find_server(NULL, destination)))
sendto_one(target_p, ":%s PONG %s %s", sendto_one(target_p, ":%s PONG %s %s",
get_id(source_p, target_p), parv[1], get_id(source_p, target_p), parv[1],
get_id(target_p, target_p)); get_id(target_p, target_p));

6
src/s_serv.c
View file

@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
* *
* $Id: s_serv.c 2723 2006-11-09 23:35:48Z jilles $ * $Id: s_serv.c 3181 2007-02-01 00:49:07Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -280,10 +280,6 @@ hunt_server(struct Client *client_p, struct Client *source_p,
if(target_p->from == source_p->from && !MyConnect(target_p)) if(target_p->from == source_p->from && !MyConnect(target_p))
target_p = NULL; target_p = NULL;
if(target_p == NULL && (target_p = find_server(source_p, new)))
if(target_p->from == source_p->from && !MyConnect(target_p))
target_p = NULL;
collapse(new); collapse(new);
wilds = (strchr(new, '?') || strchr(new, '*')); wilds = (strchr(new, '?') || strchr(new, '*'));