Fixed wrong buffer size calculation for resolver results.

[ngircd-alex.git] / src / ngircd / irc-server.c

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 99b5cb095bae2a481bc10c56327adfe1342f4ed8..72ca92bbcb28df7a802850dfe090a7d1d0780fa2 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -14,14 +14,16 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-server.c,v 1.30 2002/12/30 16:07:50 alex Exp $";
+static char UNUSED id[] = "$Id: irc-server.c,v 1.37 2004/05/11 00:01:11 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
+#include "defines.h"
 #include "resolve.h"
 #include "conn.h"
 #include "conn-zip.h"
@@ -29,6 +31,7 @@ static char UNUSED id[] = "$Id: irc-server.c,v 1.30 2002/12/30 16:07:50 alex Exp
 #include "client.h"
 #include "channel.h"
 #include "irc-write.h"
+#include "lists.h"
 #include "log.h"
 #include "messages.h"
 #include "parse.h"
@@ -41,7 +44,7 @@ static char UNUSED id[] = "$Id: irc-server.c,v 1.30 2002/12/30 16:07:50 alex Exp
 GLOBAL BOOLEAN
 IRC_SERVER( CLIENT *Client, REQUEST *Req )
 {
-       CHAR str[LINE_LEN], *ptr;
+       CHAR str[LINE_LEN], *ptr, *modes, *topic;
        CLIENT *from, *c, *cl;
        CL2CHAN *cl2chan;
        INT max_hops, i;
@@ -117,7 +120,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                Client_SetType( Client, CLIENT_SERVER );
                Conf_SetServer( i, con );
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
                /* Kompression initialisieren, wenn erforderlich */
                if( strchr( Client_Flags( Client ), 'Z' ))
                {
@@ -179,11 +182,34 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                while( chan )
                {
 #ifdef IRCPLUS
-                       /* Wenn unterstuetzt, CHANINFO senden */
+                       /* Send CHANINFO if the peer supports it */
                        if( strchr( Client_Flags( Client ), 'C' ))
                        {
-                               /* CHANINFO senden */
-                               if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), Channel_Modes( chan ), Channel_Topic( chan ))) return DISCONNECTED;
+#ifdef DEBUG
+                               Log( LOG_DEBUG, "Sending CHANINFO commands ..." );
+#endif
+                               modes = Channel_Modes( chan );
+                               topic = Channel_Topic( chan );
+
+                               if( *modes || *topic )
+                               {
+                                       /* send CHANINFO */
+                                       if(( ! strchr( Channel_Modes( chan ), 'k' )) && ( ! strchr( Channel_Modes( chan ), 'l' )) && ( ! *topic ))
+                                       {
+                                               /* "CHANINFO <chan> +<modes>" */
+                                               if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s", Channel_Name( chan ), modes )) return DISCONNECTED;
+                                       }
+                                       else if(( ! strchr( Channel_Modes( chan ), 'k' )) && ( ! strchr( Channel_Modes( chan ), 'l' )))
+                                       {
+                                               /* "CHANINFO <chan> +<modes> :<topic>" */
+                                               if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), modes, topic )) return DISCONNECTED;
+                                       }
+                                       else
+                                       {
+                                               /* "CHANINFO <chan> +<modes> <key> <limit> :<topic>" */
+                                               if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s %s %ld :%s", Channel_Name( chan ), modes, strchr( Channel_Modes( chan ), 'k' ) ? Channel_Key( chan ) : "*", strchr( Channel_Modes( chan ), 'l' ) ? Channel_MaxUsers( chan ) : 0L, topic )) return DISCONNECTED;
+                                       }
+                               }
                        }
 #endif
 
@@ -218,6 +244,18 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                                if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
                        }
 
+#ifdef IRCPLUS
+                       if( strchr( Client_Flags( Client ), 'L' ))
+                       {
+#ifdef DEBUG
+                               Log( LOG_DEBUG, "Synchronizing INVITE- and BAN-lists ..." );
+#endif
+                               /* Synchronize INVITE- and BAN-lists */
+                               if( ! Lists_SendInvites( Client )) return DISCONNECTED;
+                               if( ! Lists_SendBans( Client )) return DISCONNECTED;
+                       }
+#endif
+
                        /* naechsten Channel suchen */
                        chan = Channel_Next( chan );
                }
@@ -274,7 +312,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 {
-       CHAR str[COMMAND_LEN], *channame, *ptr, modes[8];
+       CHAR nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8];
        BOOLEAN is_op, is_voiced;
        CHANNEL *chan;
        CLIENT *c;
@@ -285,10 +323,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
        /* Falsche Anzahl Parameter? */
        if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       strlcpy( str, Req->argv[1], sizeof( str ));
+       strlcpy( nick_in, Req->argv[1], sizeof( nick_in ));
+       strcpy( nick_out, "" );
 
        channame = Req->argv[0];
-       ptr = strtok( str, "," );
+       ptr = strtok( nick_in, "," );
        while( ptr )
        {
                is_op = is_voiced = FALSE;
@@ -321,6 +360,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
                                /* Modes im Channel bekannt machen */
                                IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c ));
                        }
+
+                       if( nick_out[0] != '\0' ) strlcat( nick_out, ",", sizeof( nick_out ));
+                       if( is_op ) strlcat( nick_out, "@", sizeof( nick_out ));
+                       if( is_voiced ) strlcat( nick_out, "+", sizeof( nick_out ));
+                       strlcat( nick_out, ptr, sizeof( nick_out ));
                }
                else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
                
@@ -329,7 +373,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
        }
 
        /* an andere Server weiterleiten */
-       IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], Req->argv[1] );
+       if( nick_out[0] != '\0' ) IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], nick_out );
 
        return CONNECTED;
 } /* IRC_NJOIN */