diff options
| author | Alexander Barton <alex@barton.de> | 2002-02-26 20:52:40 +0000 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2002-02-26 20:52:40 +0000 |
| commit | 08d43d5f67fb9b5238869a7e58e2804847bc86b2 (patch) | |
| tree | 2f95eff1b9e7000f9bff01cec0fc82924f31aece /src | |
| parent | 1ff2fceb22a8e5f5b02dab3e7b5e31b36381d07d (diff) | |
| download | ngircd-08d43d5f67fb9b5238869a7e58e2804847bc86b2.tar.gz ngircd-08d43d5f67fb9b5238869a7e58e2804847bc86b2.zip | |
- VERSION wurde falsch weitergeleitet und beantwortet (Prefix nicht beachtet)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/irc.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 078376d5..1f1897e6 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -9,11 +9,14 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc.c,v 1.68 2002/02/25 17:46:27 alex Exp $ + * $Id: irc.c,v 1.69 2002/02/26 20:52:40 alex Exp $ * * irc.c: IRC-Befehle * * $Log: irc.c,v $ + * Revision 1.69 2002/02/26 20:52:40 alex + * - VERSION wurde falsch weitergeleitet und beantwortet (Prefix nicht beachtet) + * * Revision 1.68 2002/02/25 17:46:27 alex * - an User wird nun immer ein "komplettes" Prefix verschickt. * @@ -2067,7 +2070,7 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req ) { - CLIENT *target; + CLIENT *target, *prefix; assert( Client != NULL ); assert( Req != NULL ); @@ -2079,15 +2082,23 @@ GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req ) if( Req->argc == 1 ) target = Client_GetFromID( Req->argv[0] ); else target = Client_ThisServer( ); + /* Prefix ermitteln */ + if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_GetFromID( Req->prefix ); + else prefix = Client; + if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix ); + /* An anderen Server weiterleiten? */ if( target != Client_ThisServer( )) { if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] ); - IRC_WriteStrClientPrefix( Client_NextHop( target ), Client, "VERSION %s", Req->argv[0] ); + + /* forwarden */ + IRC_WriteStrClientPrefix( Client_NextHop( target ), prefix, "VERSION %s", Req->argv[0] ); return CONNECTED; } - return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( Client ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( )); + /* mit Versionsinfo antworten */ + return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( )); } /* IRC_VERSION */ |