remove or translate old comments

1 files changed, 24 insertions, 43 deletions

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index f1b817c0..11ff54f8 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -70,40 +70,37 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		LogDebug("Connection %d: got SERVER command (new server link) ...",
 			Client_Conn(Client));
 
-		/* Falsche Anzahl Parameter? */
 		if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-		/* Ist dieser Server bei uns konfiguriert? */
+		/* Ist this server configured on out side? */
 		for( i = 0; i < MAX_SERVERS; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
 		if( i >= MAX_SERVERS )
 		{
-			/* Server ist nicht konfiguriert! */
 			Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] );
 			Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true);
 			return DISCONNECTED;
 		}
 		if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 )
 		{
-			/* Falsches Passwort */
+			/* wrong password */
 			Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
 			Conn_Close( Client_Conn( Client ), NULL, "Bad password", true);
 			return DISCONNECTED;
 		}
 		
-		/* Ist ein Server mit dieser ID bereits registriert? */
+		/* Is there a registered server with this ID? */
 		if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
 
-		/* Server-Strukturen fuellen ;-) */
 		Client_SetID( Client, Req->argv[0] );
 		Client_SetHops( Client, 1 );
 		Client_SetInfo( Client, Req->argv[Req->argc - 1] );
 
-		/* Meldet sich der Server bei uns an (d.h., bauen nicht wir
-		 * selber die Verbindung zu einem anderen Server auf)? */
+		/* Is this server registering on our side, or are we connecting to
+		 * a remote server? */
 		con = Client_Conn( Client );
 		if( Client_Token( Client ) != TOKEN_OUTBOUND )
 		{
-			/* Eingehende Verbindung: Unseren SERVER- und PASS-Befehl senden */
+			/* Incoming connection, send user/pass */
 			ok = true;
 			if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd_out, NGIRCd_ProtoID )) ok = false;
 			else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
@@ -117,8 +114,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		}
 		else
 		{
-			/* Ausgehende verbindung, SERVER und PASS wurden von uns bereits
-			 * an die Gegenseite uerbermittelt */
+			/* outgoing connect, we already sent SERVER and PASS to the peer */
 			Client_SetToken( Client, atoi( Req->argv[1] ));
 		}
 
@@ -139,15 +135,9 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		Client_SetType(Client, CLIENT_UNKNOWNSERVER);
 
 #ifdef ZLIB
-		/* Kompression initialisieren, wenn erforderlich */
-		if( strchr( Client_Flags( Client ), 'Z' ))
-		{
-			if( ! Zip_InitConn( con ))
-			{
-				/* Fehler! */
-				Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, false );
-				return DISCONNECTED;
-			}
+		if (strchr(Client_Flags(Client), 'Z') && !Zip_InitConn(con)) {
+			Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, false );
+			return DISCONNECTED;
 		}
 #endif
 
@@ -171,43 +161,38 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 	}
 	else if( Client_Type( Client ) == CLIENT_SERVER )
 	{
-		/* Neuer Server wird im Netz angekuendigt */
+		/* New server is being introduced to the network */
 
-		/* Falsche Anzahl Parameter? */
 		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-		/* Ist ein Server mit dieser ID bereits registriert? */
+		/* check for existing server with same ID */
 		if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
 
-		/* Ueberfluessige Hostnamen aus Info-Text entfernen */
+		/* remove superfluous hostnames from Info-Text */
 		ptr = strchr( Req->argv[3] + 2, '[' );
 		if( ! ptr ) ptr = Req->argv[3];
 
 		from = Client_Search( Req->prefix );
 		if( ! from )
 		{
-			/* Hm, Server, der diesen einfuehrt, ist nicht bekannt!? */
+			/* Uh, Server, that introduced the new server is unknown?! */
 			Log( LOG_ALERT, "Unknown ID in prefix of SERVER: \"%s\"! (on connection %d)", Req->prefix, Client_Conn( Client ));
 			Conn_Close( Client_Conn( Client ), NULL, "Unknown ID in prefix of SERVER", true);
 			return DISCONNECTED;
 		}
 
-		/* Neue Client-Struktur anlegen */
 		c = Client_NewRemoteServer( Client, Req->argv[0], from, atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr, true);
-		if( ! c )
-		{
-			/* Neue Client-Struktur konnte nicht angelegt werden */
+		if (!c) {
 			Log( LOG_ALERT, "Can't create client structure for server! (on connection %d)", Client_Conn( Client ));
 			Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", true);
 			return DISCONNECTED;
 		}
 
-		/* Log-Meldung zusammenbauen und ausgeben */
 		if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) snprintf( str, sizeof( str ), "connected to %s, ", Client_ID( from ));
 		else strcpy( str, "" );
 		Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
 
-		/* Andere Server informieren */
+		/* notify other servers */
 		IRC_WriteStrServersPrefix( Client, from, "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ));
 
 		return CONNECTED;
@@ -228,7 +213,6 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 	strlcpy( nick_in, Req->argv[1], sizeof( nick_in ));
@@ -240,7 +224,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 	{
 		is_op = is_voiced = false;
 		
-		/* Prefixe abschneiden */
+		/* cut off prefixes */
 		while(( *ptr == '@' ) || ( *ptr == '+' ))
 		{
 			if( *ptr == '@' ) is_op = true;
@@ -258,14 +242,14 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 			if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
 			if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
 
-			/* im Channel bekannt machen */
+			/* announce to channel... */
 			IRC_WriteStrChannelPrefix( Client, chan, c, false, "JOIN :%s", channame );
 
-			/* Channel-User-Modes setzen */
+			/* set Channel-User-Modes */
 			strlcpy( modes, Channel_UserModes( chan, c ), sizeof( modes ));
 			if( modes[0] )
 			{
-				/* Modes im Channel bekannt machen */
+				/* send modes to channel */
 				IRC_WriteStrChannelPrefix( Client, chan, Client, false, "MODE %s +%s %s", channame, modes, Client_ID( c ));
 			}
 
@@ -276,11 +260,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 		}
 		else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
 		
-		/* naechsten Nick suchen */
+		/* search for next Nick */
 		ptr = strtok( NULL, "," );
 	}
 
-	/* an andere Server weiterleiten */
+	/* forward to other servers */
 	if( nick_out[0] != '\0' ) IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], nick_out );
 
 	return CONNECTED;
@@ -296,7 +280,6 @@ IRC_SQUIT( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 	Log( LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID( Client ), Req->argv[0], Req->argv[1] );
@@ -304,7 +287,6 @@ IRC_SQUIT( CLIENT *Client, REQUEST *Req )
 	target = Client_Search( Req->argv[0] );
 	if( ! target )
 	{
-		/* Den Server kennen wir nicht (mehr), also nichts zu tun. */
 		Log( LOG_WARNING, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
 		return CONNECTED;
 	}
@@ -318,18 +300,17 @@ IRC_SQUIT( CLIENT *Client, REQUEST *Req )
 
 	if( Client_Conn( target ) > NONE )
 	{
-		/* dieser Server hat die Connection */
+		/* This server has the connection */
 		if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), msg, Req->argv[1], true);
 		else Conn_Close( Client_Conn( target ), msg, NULL, true);
 		return DISCONNECTED;
 	}
 	else
 	{
-		/* Verbindung hielt anderer Server */
+		/* connection was on another server */
 		Client_Destroy( target, msg, Req->argv[1], false );
 		return CONNECTED;
 	}
 } /* IRC_SQUIT */
 
-
 /* -eof- */