readded vhost support to core modules (I think)

This commit is contained in:
fishwaldo 2002-08-14 06:01:55 +00:00
parent 72729d1cda
commit 0ef9c1f7fe
6 changed files with 28 additions and 28 deletions

View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_kick.c,v 1.1 2002/08/14 05:47:41 fishwaldo Exp $
* $Id: m_kick.c,v 1.2 2002/08/14 06:01:55 fishwaldo Exp $
*/
#include "stdinc.h"
@ -59,7 +59,7 @@ _moddeinit(void)
mod_del_cmd(&kick_msgtab);
}
const char *_version = "$Revision: 1.1 $";
const char *_version = "$Revision: 1.2 $";
#endif
/*
** m_kick
@ -213,7 +213,7 @@ static void m_kick(struct Client *client_p,
":%s!%s@%s KICK %s %s :%s",
source_p->name,
source_p->username,
source_p->host,
source_p->vhost,
name,
who->name, comment);
}
@ -224,7 +224,7 @@ static void m_kick(struct Client *client_p,
":%s!%s@%s KICK %s %s :%s",
source_p->name,
source_p->username,
source_p->host,
source_p->vhost,
name, who->name, comment);
}

View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_kill.c,v 1.1 2002/08/14 05:47:41 fishwaldo Exp $
* $Id: m_kill.c,v 1.2 2002/08/14 06:01:55 fishwaldo Exp $
*/
#include "stdinc.h"
@ -64,7 +64,7 @@ _moddeinit(void)
mod_del_cmd(&kill_msgtab);
}
const char *_version = "$Revision: 1.1 $";
const char *_version = "$Revision: 1.2 $";
#endif
/*
** mo_kill
@ -129,7 +129,7 @@ static void mo_kill(struct Client *client_p, struct Client *source_p,
if(MyConnect(target_p))
sendto_one(target_p, ":%s!%s@%s KILL %s :%s",
source_p->name, source_p->username, source_p->host,
source_p->name, source_p->username, source_p->vhost,
target_p->name, reason);
/* Do not change the format of this message. There's no point in changing messages
@ -252,7 +252,7 @@ static void ms_kill(struct Client *client_p, struct Client *source_p,
}
else
sendto_one(target_p, ":%s!%s@%s KILL %s :%s",
source_p->name, source_p->username, source_p->host,
source_p->name, source_p->username, source_p->vhost,
target_p->name, reason);
}
@ -354,7 +354,7 @@ static void relay_kill(struct Client *one, struct Client *source_p,
{
sendto_one(client_p, ":%s KILL %s :%s!%s!%s!%s (%s)",
source_p->name, user,
me.name, source_p->host, source_p->username,
me.name, source_p->vhost, source_p->username,
source_p->name, reason);
}
else

View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_message.c,v 1.1 2002/08/14 05:47:41 fishwaldo Exp $
* $Id: m_message.c,v 1.2 2002/08/14 06:01:55 fishwaldo Exp $
*/
#include "stdinc.h"
@ -123,7 +123,7 @@ _moddeinit(void)
mod_del_cmd(&notice_msgtab);
}
const char *_version = "$Revision: 1.1 $";
const char *_version = "$Revision: 1.2 $";
#endif
/*
@ -548,7 +548,7 @@ msg_channel_flags(int p_or_n, char *command, struct Client *client_p,
sendto_channel_local(type, vchan, ":%s!%s@%s %s %c%s :%s",
source_p->name, source_p->username,
source_p->host, command, c, chname, text);
source_p->vhost, command, c, chname, text);
if (chptr->chname[0] == '&')
return;
@ -603,7 +603,7 @@ msg_client(int p_or_n, char *command,
sendto_one(target_p, ":%s!%s@%s %s %s :%s",
source_p->name,
source_p->username,
source_p->host, command, target_p->name, text);
source_p->vhost, command, target_p->name, text);
}
else
{
@ -624,7 +624,7 @@ msg_client(int p_or_n, char *command,
sendto_one(target_p,
":%s NOTICE %s :*** Client %s [%s@%s] is messaging you and you are +g",
me.name, target_p->name,
source_p->name, source_p->username, source_p->host);
source_p->name, source_p->username, source_p->vhost);
target_p->localClient->last_caller_id_time = CurrentTime;
@ -697,7 +697,7 @@ flood_attack_client(int p_or_n, struct Client *source_p,
sendto_realops_flags(FLAGS_BOTS, L_ALL,
"Possible Flooder %s [%s@%s] on %s target: %s",
source_p->name, source_p->username,
source_p->host,
source_p->vhost,
source_p->user->server, target_p->name);
target_p->localClient->flood_noticed = 1;
/* add a bit of penalty */
@ -753,7 +753,7 @@ flood_attack_channel(int p_or_n, struct Client *source_p,
sendto_realops_flags(FLAGS_BOTS, L_ALL,
"Possible Flooder %s [%s@%s] on %s target: %s",
source_p->name, source_p->username,
source_p->host,
source_p->vhost,
source_p->user->server, chptr->chname);
chptr->flood_noticed = 1;
@ -919,7 +919,7 @@ find_userhost(char *user, char *host, int *count)
{
if (!MyClient(c2ptr)) /* implies mine and an user */
continue;
if ((!host || match(host, c2ptr->host)) &&
if ((!host || match(host, c2ptr->host) || match(host, c2ptr->vhost)) &&
irccmp(user, c2ptr->username) == 0)
{
(*count)++;

View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_nick.c,v 1.1 2002/08/14 05:47:41 fishwaldo Exp $
* $Id: m_nick.c,v 1.2 2002/08/14 06:01:55 fishwaldo Exp $
*/
#include "stdinc.h"
@ -97,7 +97,7 @@ _moddeinit(void)
mod_del_cmd(&client_msgtab);
}
const char *_version = "$Revision: 1.1 $";
const char *_version = "$Revision: 1.2 $";
#endif
/*
@ -707,7 +707,7 @@ nick_from_server(struct Client *client_p, struct Client *source_p, int parc,
source_p->tsinfo = newts ? newts : CurrentTime;
sendto_common_channels_local(source_p, ":%s!%s@%s NICK :%s",
source_p->name,source_p->username,source_p->host,
source_p->name,source_p->username,source_p->vhost,
nick);
if (source_p->user)

View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_part.c,v 1.1 2002/08/14 05:47:41 fishwaldo Exp $
* $Id: m_part.c,v 1.2 2002/08/14 06:01:55 fishwaldo Exp $
*/
#include "stdinc.h"
@ -62,7 +62,7 @@ _moddeinit(void)
{
mod_del_cmd(&part_msgtab);
}
const char *_version = "$Revision: 1.1 $";
const char *_version = "$Revision: 1.2 $";
#endif
static void part_one_client(struct Client *client_p,
@ -181,7 +181,7 @@ static void part_one_client(struct Client *client_p,
chptr, ":%s!%s@%s PART %s :%s",
source_p->name,
source_p->username,
source_p->host,
source_p->vhost,
bchan->chname,
reason);
}
@ -195,7 +195,7 @@ static void part_one_client(struct Client *client_p,
chptr, ":%s!%s@%s PART %s",
source_p->name,
source_p->username,
source_p->host,
source_p->vhost,
bchan->chname);
}
remove_user_from_channel(chptr, source_p);

View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* $Id: m_sjoin.c,v 1.1 2002/08/14 05:47:41 fishwaldo Exp $
* $Id: m_sjoin.c,v 1.2 2002/08/14 06:01:55 fishwaldo Exp $
*/
#include "stdinc.h"
@ -63,7 +63,7 @@ _moddeinit(void)
mod_del_cmd(&sjoin_msgtab);
}
const char *_version = "$Revision: 1.1 $";
const char *_version = "$Revision: 1.2 $";
#endif
/*
* ms_sjoin
@ -579,7 +579,7 @@ static void ms_sjoin(struct Client *client_p,
sendto_channel_local(ALL_MEMBERS,chptr, ":%s!%s@%s JOIN :%s",
target_p->name,
target_p->username,
target_p->host,
target_p->vhost,
top_chptr->chname);
}
else
@ -588,7 +588,7 @@ static void ms_sjoin(struct Client *client_p,
sendto_channel_local(ALL_MEMBERS,chptr, ":%s!%s@%s JOIN :%s",
target_p->name,
target_p->username,
target_p->host,
target_p->vhost,
parv[2]);
}
}