[NeoStats-Devel] [Commits] r2542 - in trunk: include src src/protocol
[email protected] Tue, 19 Apr 2005 06:44:49 +1000
Newsgroups
gmane.comp.neostats.devel
Message-ID
<[email protected] >
Author: Mark
Date: Tue Apr 19 04:44:45 2005
New Revision: 2542
Modified:
trunk/include/ircd.h
trunk/src/ircd.c
trunk/src/protocol/bahamut14.c
trunk/src/protocol/bahamut18.c
trunk/src/protocol/client.c
trunk/src/protocol/hybrid7.c
trunk/src/protocol/plexus.c
trunk/src/protocol/ultimate2.c
trunk/src/protocol/ultimate3.c
trunk/src/protocol/unreal31.c
trunk/src/protocol/unreal32.c
trunk/src/users.c
Log:
more protocol updates
Modified: trunk/include/ircd.h
==============================================================================
--- trunk/include/ircd.h (original)
+++ trunk/include/ircd.h Tue Apr 19 04:44:45 2005
@@ -103,6 +103,8 @@
MODULEVAR extern const char TOK_NICK[];
MODULEVAR extern const char MSG_MODE[];
MODULEVAR extern const char TOK_MODE[];
+MODULEVAR extern const char MSG_AWAY[];
+MODULEVAR extern const char TOK_AWAY[];
MODULEVAR extern const char MSG_QUIT[];
MODULEVAR extern const char TOK_QUIT[];
MODULEVAR extern const char MSG_JOIN[];
@@ -123,6 +125,18 @@
MODULEVAR extern const char TOK_SQUIT[];
MODULEVAR extern const char MSG_SVINFO[];
MODULEVAR extern const char TOK_SVINFO[];
+MODULEVAR extern const char MSG_PROTOCTL[];
+MODULEVAR extern const char TOK_PROTOCTL[];
+MODULEVAR extern const char MSG_CAPAB[];
+MODULEVAR extern const char MSG_CAPAB[];
+MODULEVAR extern const char MSG_PASS[];
+MODULEVAR extern const char TOK_PASS[];
+MODULEVAR extern const char MSG_TOPIC[];
+MODULEVAR extern const char TOK_TOPIC[];
+MODULEVAR extern const char MSG_CHATOPS[];
+MODULEVAR extern const char TOK_CHATOPS[];
+MODULEVAR extern const char MSG_ERROR[];
+MODULEVAR extern const char TOK_ERROR[];
MODULEVAR extern const char MSG_KILL[];
MODULEVAR extern const char TOK_KILL[];
MODULEVAR extern const char MSG_SETNAME[];
Modified: trunk/src/ircd.c
==============================================================================
--- trunk/src/ircd.c (original)
+++ trunk/src/ircd.c Tue Apr 19 04:44:45 2005
@@ -186,6 +186,8 @@
static char *TOK_NICK;
static char *MSG_MODE;
static char *TOK_MODE;
+static char *MSG_AWAY;
+static char *TOK_AWAY;
static char *MSG_QUIT;
static char *TOK_QUIT;
static char *MSG_JOIN;
@@ -206,6 +208,18 @@
static char *TOK_SQUIT;
static char *MSG_SVINFO;
static char *TOK_SVINFO;
+static char *MSG_PROTOCTL;
+static char *TOK_PROTOCTL;
+static char *MSG_CAPAB;
+static char *TOK_CAPAB;
+static char *MSG_PASS;
+static char *TOK_PASS;
+static char *MSG_TOPIC;
+static char *TOK_TOPIC;
+static char *MSG_CHATOPS;
+static char *TOK_CHATOPS;
+static char *MSG_ERROR;
+static char *TOK_ERROR;
static char *MSG_KILL;
static char *TOK_KILL;
static char *MSG_SETNAME;
@@ -240,6 +254,7 @@
{( void * )&irc_send_umode, &MSG_MODE, "MSG_MODE", &TOK_MODE, "TOK_MODE", _send_umode, 0 },
{( void * )&irc_send_cmode, &MSG_MODE, "MSG_MODE", &TOK_MODE, "TOK_MODE", _send_cmode, 0 },
{( void * )&irc_send_quit, &MSG_QUIT, "MSG_QUIT", &TOK_QUIT, "TOK_QUIT", _send_quit, 0 },
+ {( void * )NULL, &MSG_AWAY, "MSG_AWAY", &TOK_AWAY, "TOK_AWAY", NULL, 0 },
{( void * )&irc_send_join, &MSG_JOIN, "MSG_JOIN", &TOK_JOIN, "TOK_JOIN", _send_join, 0 },
{( void * )&irc_send_part, &MSG_PART, "MSG_PART", &TOK_PART, "TOK_PART", _send_part, 0 },
{( void * )&irc_send_kick, &MSG_KICK, "MSG_KICK", &TOK_KICK, "TOK_KICK", _send_kick, 0 },
@@ -258,6 +273,13 @@
{( void * )&irc_send_svspart, &MSG_SVSPART, "MSG_SVSPART", &TOK_SVSPART, "TOK_SVSPART", _send_svspart, 0 },
{( void * )&irc_send_svsmode, &MSG_SVSMODE, "MSG_SVSMODE", &TOK_SVSMODE, "TOK_SVSMODE", _send_svsmode, 0 },
{( void * )&irc_send_svskill, &MSG_SVSKILL, "MSG_SVSKILL", &TOK_SVSKILL, "TOK_SVSKILL", _send_svskill, 0 },
+ {( void * )NULL, &MSG_PROTOCTL, "MSG_PROTOCTL", &TOK_PROTOCTL, "TOK_PROTOCTL", NULL, 0},
+ {( void * )NULL, &MSG_CAPAB, "MSG_CAPAB", &TOK_CAPAB, "TOK_CAPAB", NULL, 0},
+ {( void * )NULL, &MSG_PASS, "MSG_PASS", &TOK_PASS, "TOK_PASS", NULL, 0},
+ {( void * )NULL, &MSG_TOPIC, "MSG_TOPIC", &TOK_TOPIC, "TOK_TOPIC", NULL, 0},
+ {( void * )NULL, &MSG_CHATOPS, "MSG_CHATOPS", &TOK_CHATOPS, "TOK_CHATOPS", NULL, 0},
+ {( void * )NULL, &MSG_ERROR, "MSG_ERROR", &TOK_ERROR, "TOK_ERROR", NULL, 0},
+
{NULL, NULL, NULL, NULL, NULL, NULL, 0},
};
@@ -342,6 +364,7 @@
{&MSG_ADMIN, &TOK_ADMIN, _m_admin, 0},
{&MSG_CREDITS, &TOK_CREDITS, _m_credits, 0},
{&MSG_SQUIT, &TOK_SQUIT, _m_squit, 0},
+ {&MSG_AWAY, &TOK_AWAY, _m_away, 0},
{&MSG_QUIT, &TOK_QUIT, _m_quit, 0},
{&MSG_MODE, &TOK_MODE, _m_mode, 0},
{&MSG_SVSJOIN, &TOK_SVSJOIN, _m_svsjoin, 0},
@@ -355,6 +378,15 @@
{&MSG_GLOBOPS, &TOK_GLOBOPS, _m_globops, 0},
{&MSG_WALLOPS, &TOK_WALLOPS, _m_wallops, 0},
{&MSG_SVINFO, &TOK_SVINFO, _m_svinfo, 0},
+ {&MSG_PROTOCTL, &TOK_PROTOCTL, _m_protoctl, 0},
+ {&MSG_CAPAB, &TOK_CAPAB, _m_capab, 0},
+ {&MSG_PASS, &TOK_PASS, _m_pass, 0},
+ {&MSG_TOPIC, &TOK_TOPIC, _m_topic, 0},
+ {&MSG_SETNAME, &TOK_SETNAME, _m_setname, 0},
+ {&MSG_SETHOST, &TOK_SETHOST, _m_sethost, 0},
+ {&MSG_SETIDENT, &TOK_SETIDENT, _m_setident, 0},
+ {&MSG_CHATOPS, &TOK_CHATOPS, _m_chatops, 0},
+ {&MSG_ERROR, &TOK_ERROR, _m_error, 0},
{0, 0, 0, 0},
};
@@ -1184,7 +1216,7 @@
}
intrinsic_cmd_ptr = intrinsic_cmd_list;
while( intrinsic_cmd_ptr->handler ) {
- if( !ircstrcasecmp( *intrinsic_cmd_ptr->name, cmd ) ||
+ if( *intrinsic_cmd_ptr->name && !ircstrcasecmp( *intrinsic_cmd_ptr->name, cmd ) ||
( ( ircd_srv.protocol & PROTOCOL_TOKEN ) && *intrinsic_cmd_ptr->token && !ircstrcasecmp( *intrinsic_cmd_ptr->token, cmd ) ) ) {
dlog( DEBUG3, "process_ircd_cmd: running command %s", *intrinsic_cmd_ptr->name );
intrinsic_cmd_ptr->handler( origin, av, ac, cmdptr );
Modified: trunk/src/protocol/bahamut14.c
==============================================================================
--- trunk/src/protocol/bahamut14.c (original)
+++ trunk/src/protocol/bahamut14.c Tue Apr 19 04:44:45 2005
@@ -174,16 +174,10 @@
/* Command Token Function usage */
{MSG_SERVER, 0, m_server, 0},
{MSG_SVSMODE, 0, m_svsmode, 0},
- {MSG_AWAY, 0, _m_away, 0},
{MSG_NICK, 0, m_nick, 0},
- {MSG_TOPIC, 0, _m_topic, 0},
- {MSG_CAPAB, 0, _m_capab, 0},
{MSG_BURST, 0, m_burst, 0},
{MSG_SJOIN, 0, m_sjoin, 0},
- {MSG_PASS, 0, _m_pass, 0},
{MSG_SVSNICK, 0, m_svsnick, 0},
- {MSG_CHATOPS, 0, _m_chatops, 0},
- {MSG_ERROR, 0, _m_error, 0},
{0, 0, 0, 0},
};
Modified: trunk/src/protocol/bahamut18.c
==============================================================================
--- trunk/src/protocol/bahamut18.c (original)
+++ trunk/src/protocol/bahamut18.c Tue Apr 19 04:44:45 2005
@@ -180,16 +180,10 @@
/* Command Token Function usage */
{MSG_SERVER, 0, m_server, 0},
{MSG_SVSMODE, 0, m_svsmode, 0},
- {MSG_AWAY, 0, _m_away, 0},
{MSG_NICK, 0, m_nick, 0},
- {MSG_TOPIC, 0, _m_topic, 0},
- {MSG_CAPAB, 0, _m_capab, 0},
{MSG_BURST, 0, m_burst, 0},
{MSG_SJOIN, 0, m_sjoin, 0},
- {MSG_PASS, 0, _m_pass, 0},
{MSG_SVSNICK, 0, m_svsnick, 0},
- {MSG_CHATOPS, 0, _m_chatops, 0},
- {MSG_ERROR, 0, _m_error, 0},
{0, 0, 0, 0},
};
Modified: trunk/src/protocol/client.c
==============================================================================
--- trunk/src/protocol/client.c (original)
+++ trunk/src/protocol/client.c Tue Apr 19 04:44:45 2005
@@ -179,7 +179,6 @@
static void m_kick( char *origin, char **argv, int argc, int srv );
static void m_join( char *origin, char **argv, int argc, int srv );
static void m_part( char *origin, char **argv, int argc, int srv );
-static void m_vhost( char *origin, char **argv, int argc, int srv );
static void m_emotd( char *origin, char **argv, int argc, int srv );
/* buffer sizes */
@@ -209,15 +208,11 @@
{MSG_PRIVATE, 0, m_private, 0},
{MSG_NOTICE, 0, _m_notice, 0},
{"376", 0, m_emotd, 0},
- {MSG_SETHOST, 0, m_vhost, 0},
- {MSG_AWAY, 0, _m_away, 0},
{MSG_NICK, 0, m_nick, 0},
{MSG_TOPIC, 0, m_topic, 0},
{MSG_KICK, 0, m_kick, 0},
{MSG_JOIN, 0, m_join, 0},
{MSG_PART, 0, m_part, 0},
- {MSG_CHATOPS, 0, _m_chatops, 0},
- {MSG_ERROR, 0, _m_error, 0},
{0, 0, 0, 0},
};
@@ -316,11 +311,6 @@
send_cmd( ":%s %s - G %s %s %s", source, MSG_TKL, ident, host, source );
}
-static void m_vhost( char *origin, char **argv, int argc, int srv )
-{
- do_vhost( origin, argv[0] );
-}
-
static void m_nick( char *origin, char **argv, int argc, int srv )
{
do_nickchange( origin, argv[0], NULL );
Modified: trunk/src/protocol/hybrid7.c
==============================================================================
--- trunk/src/protocol/hybrid7.c (original)
+++ trunk/src/protocol/hybrid7.c Tue Apr 19 04:44:45 2005
@@ -110,15 +110,10 @@
{
/* Command Token Function usage */
{MSG_SERVER, 0, m_server, 0},
- {MSG_AWAY, 0, _m_away, 0},
{MSG_NICK, 0, m_nick, 0},
{MSG_TOPIC, 0, m_topic, 0},
- {MSG_PASS, 0, _m_pass, 0},
{MSG_EOB, 0, m_burst, 0},
{MSG_SJOIN, 0, m_sjoin, 0},
- {MSG_CAPAB, 0, _m_capab, 0},
- {MSG_CHATOPS, 0, _m_chatops, 0},
- {MSG_ERROR, 0, _m_error, 0},
{0, 0, 0, 0},
};
Modified: trunk/src/protocol/plexus.c
==============================================================================
--- trunk/src/protocol/plexus.c (original)
+++ trunk/src/protocol/plexus.c Tue Apr 19 04:44:45 2005
@@ -224,15 +224,10 @@
{
/* Command Token Function usage */
{MSG_SERVER, 0, m_server, 0},
- {MSG_AWAY, 0, _m_away, 0},
{MSG_NICK, 0, m_nick, 0},
{MSG_TOPIC, 0, m_topic, 0},
- {MSG_PASS, 0, _m_pass, 0},
{MSG_EOB, 0, m_burst, 0},
{MSG_SJOIN, 0, m_sjoin, 0},
- {MSG_CAPAB, 0, _m_capab, 0},
- {MSG_CHATOPS, 0, _m_chatops, 0},
- {MSG_ERROR, 0, _m_error, 0},
{0, 0, 0, 0},
};
Modified: trunk/src/protocol/ultimate2.c
==============================================================================
--- trunk/src/protocol/ultimate2.c (original)
+++ trunk/src/protocol/ultimate2.c Tue Apr 19 04:44:45 2005
@@ -335,7 +335,6 @@
static void m_server( char *origin, char **argv, int argc, int srv );
static void m_svsmode( char *origin, char **argv, int argc, int srv );
static void m_nick( char *origin, char **argv, int argc, int srv );
-static void m_vhost( char *origin, char **argv, int argc, int srv );
static void m_svsnick( char *origin, char **argv, int argc, int srv );
static void m_snetinfo( char *origin, char **argv, int argc, int srv );
static void m_vctrl( char *origin, char **argv, int argc, int srv );
@@ -364,19 +363,12 @@
ircd_cmd cmd_list[] =
{
/* Command Token Function usage */
- {MSG_SETHOST, 0, m_vhost, 0},
{MSG_SERVER, 0, m_server, 0},
{MSG_SVSMODE, 0, m_svsmode, 0},
- {MSG_AWAY, TOK_AWAY, _m_away, 0},
{MSG_NICK, TOK_NICK, m_nick, 0},
- {MSG_TOPIC, TOK_TOPIC, _m_topic, 0},
{MSG_SNETINFO, 0, m_snetinfo, 0},
{MSG_VCTRL, 0, m_vctrl, 0},
- {MSG_PASS, 0, _m_pass, 0},
{MSG_SVSNICK, 0, m_svsnick, 0},
- {MSG_PROTOCTL, 0, _m_protoctl, 0},
- {MSG_CHATOPS, 0, _m_chatops, 0},
- {MSG_ERROR, 0, _m_error, 0},
{0, 0, 0, 0},
};
@@ -505,10 +497,6 @@
do_svsmode_user( argv[0], argv[1], NULL );
}
}
-static void m_vhost( char *origin, char **argv, int argc, int srv )
-{
- do_vhost( origin, argv[0] );
-}
static void m_nick( char *origin, char **argv, int argc, int srv )
{
Modified: trunk/src/protocol/ultimate3.c
==============================================================================
--- trunk/src/protocol/ultimate3.c (original)
+++ trunk/src/protocol/ultimate3.c Tue Apr 19 04:44:45 2005
@@ -182,7 +182,7 @@
static void m_server( char *origin, char **argv, int argc, int srv );
static void m_svsmode( char *origin, char **argv, int argc, int srv );
static void m_nick( char *origin, char **argv, int argc, int srv );
-static void m_vhost( char *origin, char **argv, int argc, int srv );
+static void m_sethost( char *origin, char **argv, int argc, int srv );
static void m_svsnick( char *origin, char **argv, int argc, int srv );
static void m_netinfo( char *origin, char **argv, int argc, int srv );
static void m_burst( char *origin, char **argv, int argc, int srv );
@@ -215,23 +215,17 @@
ircd_cmd cmd_list[] =
{
/* Command Token Function usage */
- {MSG_SETHOST, 0, m_vhost, 0},
+ {MSG_SETHOST, 0, m_sethost, 0},
{MSG_SERVER, 0, m_server, 0},
{MSG_SVSMODE, 0, m_svsmode, 0},
- {MSG_AWAY, 0, _m_away, 0},
{MSG_NICK, 0, m_nick, 0},
- {MSG_TOPIC, 0, _m_topic, 0},
- {MSG_CAPAB, 0, _m_capab, 0},
{MSG_BURST, 0, m_burst, 0},
{MSG_SJOIN, 0, m_sjoin, 0},
{MSG_CLIENT, 0, m_client, 0},
{MSG_SMODE, 0, m_smode, 0},
{MSG_NETINFO, 0, m_netinfo, 0},
{MSG_VCTRL, 0, m_vctrl, 0},
- {MSG_PASS, 0, _m_pass, 0},
{MSG_SVSNICK, 0, m_svsnick, 0},
- {MSG_CHATOPS, 0, _m_chatops, 0},
- {MSG_ERROR, 0, _m_error, 0},
{0, 0, 0, 0},
};
@@ -391,7 +385,7 @@
}
}
-static void m_vhost( char *origin, char **argv, int argc, int srv )
+static void m_sethost( char *origin, char **argv, int argc, int srv )
{
do_vhost( argv[0], argv[1] );
}
Modified: trunk/src/protocol/unreal31.c
==============================================================================
--- trunk/src/protocol/unreal31.c (original)
+++ trunk/src/protocol/unreal31.c Tue Apr 19 04:44:45 2005
@@ -322,7 +322,6 @@
static void m_umode2( char *origin, char **argv, int argc, int srv );
static void m_svsmode( char *origin, char **argv, int argc, int srv );
static void m_nick( char *origin, char **argv, int argc, int srv );
-static void m_vhost( char *origin, char **argv, int argc, int srv );
static void m_netinfo( char *origin, char **argv, int argc, int srv );
static void m_sjoin( char *origin, char **argv, int argc, int srv );
static void m_svsnick( char *origin, char **argv, int argc, int srv );
@@ -357,25 +356,18 @@
ircd_cmd cmd_list[] =
{
/*Message Token Function usage */
- {MSG_SETHOST, TOK_SETHOST, m_vhost, 0},
{MSG_SERVER, TOK_SERVER, m_server, 0},
{MSG_UMODE2, TOK_UMODE2, m_umode2, 0},
{MSG_SVSMODE, TOK_SVSMODE, m_svsmode, 0},
{MSG_SVS2MODE, TOK_SVS2MODE, m_svsmode, 0},
- {MSG_AWAY, TOK_AWAY, _m_away, 0},
{MSG_NICK, TOK_NICK, m_nick, 0},
- {MSG_TOPIC, TOK_TOPIC, _m_topic, 0},
{MSG_NETINFO, TOK_NETINFO, m_netinfo, 0},
{MSG_SJOIN, TOK_SJOIN, m_sjoin, 0},
- {MSG_PASS, TOK_PASS, _m_pass, 0},
{MSG_SVSNICK, TOK_SVSNICK, m_svsnick, 0},
- {MSG_PROTOCTL, TOK_PROTOCTL, _m_protoctl, 0},
{MSG_WHOIS, TOK_WHOIS, m_whois, 0},
{MSG_SWHOIS, TOK_SWHOIS, m_swhois, 0},
{MSG_SMO, TOK_SMO, m_smo, 0},
{MSG_TKL, TOK_TKL, m_tkl, 0},
- {MSG_CHATOPS, TOK_CHATOPS, _m_chatops, 0},
- {MSG_ERROR, TOK_ERROR, _m_error, 0},
{0, 0, 0, 0},
};
@@ -565,11 +557,6 @@
do_mode_user( origin, argv[0] );
}
-static void m_vhost( char *origin, char **argv, int argc, int srv )
-{
- do_vhost( origin, argv[0] );
-}
-
/* m_nick
* argv[0] = nickname
* if from new client
Modified: trunk/src/protocol/unreal32.c
==============================================================================
--- trunk/src/protocol/unreal32.c (original)
+++ trunk/src/protocol/unreal32.c Tue Apr 19 04:44:45 2005
@@ -327,7 +327,6 @@
static void m_umode2( char *origin, char **argv, int argc, int srv );
static void m_svsmode( char *origin, char **argv, int argc, int srv );
static void m_nick( char *origin, char **argv, int argc, int srv );
-static void m_vhost( char *origin, char **argv, int argc, int srv );
static void m_eos( char *origin, char **argv, int argc, int srv );
static void m_netinfo( char *origin, char **argv, int argc, int srv );
static void m_sjoin( char *origin, char **argv, int argc, int srv );
@@ -361,29 +360,19 @@
ircd_cmd cmd_list[] =
{
/*Message Token Function usage */
- {MSG_SETHOST, TOK_SETHOST, m_vhost, 0},
{MSG_SERVER, TOK_SERVER, m_server, 0},
{MSG_UMODE2, TOK_UMODE2, m_umode2, 0},
{MSG_SVSMODE, TOK_SVSMODE, m_svsmode, 0},
{MSG_SVS2MODE, TOK_SVS2MODE, m_svsmode, 0},
- {MSG_AWAY, TOK_AWAY, _m_away, 0},
{MSG_NICK, TOK_NICK, m_nick, 0},
- {MSG_TOPIC, TOK_TOPIC, _m_topic, 0},
{MSG_NETINFO, TOK_NETINFO, m_netinfo, 0},
{MSG_SJOIN, TOK_SJOIN, m_sjoin, 0},
- {MSG_PASS, TOK_PASS, _m_pass, 0},
{MSG_SVSNICK, TOK_SVSNICK, m_svsnick, 0},
- {MSG_PROTOCTL, TOK_PROTOCTL, _m_protoctl, 0},
{MSG_WHOIS, TOK_WHOIS, m_whois, 0},
{MSG_SWHOIS, TOK_SWHOIS, m_swhois, 0},
{MSG_SMO, TOK_SMO, m_smo, 0},
{MSG_EOS, TOK_EOS, m_eos, 0},
{MSG_TKL, TOK_TKL, m_tkl, 0},
- {MSG_SETNAME, TOK_SETNAME, _m_setname, 0},
- {MSG_SETHOST, TOK_SETHOST, _m_sethost, 0},
- {MSG_SETIDENT, TOK_SETIDENT, _m_setident, 0},
- {MSG_CHATOPS, TOK_CHATOPS, _m_chatops, 0},
- {MSG_ERROR, TOK_ERROR, _m_error, 0},
{0, 0, 0, 0},
};
@@ -700,11 +689,6 @@
do_mode_user( origin, argv[0] );
}
-static void m_vhost( char *origin, char **argv, int argc, int srv )
-{
- do_vhost( origin, argv[0] );
-}
-
/* m_nick
* argv[0] = nickname
* if from new client
Modified: trunk/src/users.c
==============================================================================
--- trunk/src/users.c (original)
+++ trunk/src/users.c Tue Apr 19 04:44:45 2005
@@ -150,7 +150,7 @@
}
/* check if the user is excluded */
ns_do_exclude_user(u);
- if ((ircd_srv.protocol & PROTOCOL_B64SERVER) && numeric) {
+ if ((ircd_srv.protocol & PROTOCOL_B64NICK) && numeric) {
set_nick_base64 (u->name, numeric);
}
cmdparams = (CmdParams*) ns_calloc (sizeof(CmdParams));
@@ -403,7 +403,7 @@
int i = 0;
cmdparams = (CmdParams *) v;
- if (ircd_srv.protocol & PROTOCOL_B64SERVER) {
+ if (ircd_srv.protocol & PROTOCOL_B64NICK) {
irc_prefmsg (ns_botptr, cmdparams->source, __("User: %s!%s@%s (%s)", cmdparams->source), u->name, u->user->username, u->user->hostname, u->name64);
} else {
irc_prefmsg (ns_botptr, cmdparams->source, __("User: %s!%s@%s", cmdparams->source), u->name, u->user->username, u->user->hostname);