#include "portab.h"
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.30 2005/06/12 18:23:59 alex Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.37 2006/10/06 21:32:58 fw Exp $";
#include "imp.h"
#include <assert.h>
GLOBAL bool
IRC_JOIN( CLIENT *Client, REQUEST *Req )
{
- char *channame, *key, *flags, *topic, modes[8];
+ char *channame, *channame_ptr, *key, *key_ptr, *flags, *topic, modes[8];
bool is_new_chan, is_invited, is_banned;
CLIENT *target;
CHANNEL *chan;
-
+
assert( Client != NULL );
assert( Req != NULL );
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
/* Are channel keys given? */
- if( Req->argc > 1 ) key = Req->argv[1];
- else key = NULL;
+ if (Req->argc > 1) {
+ key = Req->argv[1];
+ key_ptr = strchr(key, ',');
+ if (key_ptr) *key_ptr = '\0';
+ }
+ else
+ key = key_ptr = NULL;
+
+ channame = Req->argv[0];
+ channame_ptr = strchr(channame, ',');
+ if (channame_ptr) *channame_ptr = '\0';
/* Channel-Namen durchgehen */
- chan = NULL;
- channame = strtok( Req->argv[0], "," );
- while( channame )
+ while (channame)
{
chan = NULL; flags = NULL;
if( Client_Type( Client ) == CLIENT_USER )
{
/* Test if the user has reached his maximum channel count */
- if( Client_Type( Client ) == CLIENT_USER )
- {
- if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
- {
- IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
- return CONNECTED;
- }
- }
+ if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
+ return IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG,
+ Client_ID( Client ), channame );
/* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
if( is_new_chan )
IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
}
if( ! Channel_Join( target, channame ))
{
/* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
if( ! chan ) chan = Channel_Search( channame );
/* an Client bestaetigen */
IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
- /* Topic an Client schicken */
- topic = Channel_Topic( chan );
- if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
+ /* Send topic to client, if any */
+ topic = Channel_Topic(chan);
+ if (*topic) {
+ IRC_WriteStrClient(Client, RPL_TOPIC_MSG,
+ Client_ID(Client), channame, topic);
+#ifndef STRICT_RFC
+ IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG,
+ Client_ID(Client), channame,
+ Channel_TopicWho(chan),
+ Channel_TopicTime(chan));
+#endif
+ }
/* Mitglieder an Client Melden */
IRC_Send_NAMES( Client, chan );
IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan ));
}
- /* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
+ /* next channel? */
+ channame = channame_ptr;
+ if (channame) {
+ channame++;
+ channame_ptr = strchr(channame, ',');
+ if (channame_ptr) *channame_ptr = '\0';
+
+ if (key_ptr) {
+ key = ++key_ptr;
+ key_ptr = strchr(key, ',');
+ if (key_ptr) *key_ptr = '\0';
+ }
+ }
}
return CONNECTED;
} /* IRC_JOIN */
CHANNEL *chan;
CLIENT *from;
char *topic;
+ bool r;
assert( Client != NULL );
assert( Req != NULL );
if( Req->argc == 1 )
{
- /* Topic erfragen */
- topic = Channel_Topic( chan );
- if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic );
- else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan ));
+ /* Request actual topic */
+ topic = Channel_Topic(chan);
+ if (*topic) {
+ r = IRC_WriteStrClient(from, RPL_TOPIC_MSG,
+ Client_ID(Client), Channel_Name(chan), topic);
+#ifndef STRICT_RFC
+ r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG,
+ Client_ID(Client), Channel_Name(chan),
+ Channel_TopicWho(chan),
+ Channel_TopicTime(chan));
+#endif
+ return r;
+ }
+ else
+ return IRC_WriteStrClient(from, RPL_NOTOPIC_MSG,
+ Client_ID(from), Channel_Name(chan));
}
if( strchr( Channel_Modes( chan ), 't' ))
if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
}
- /* Topic setzen */
- Channel_SetTopic( chan, Req->argv[1] );
- Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "<none>" );
+ /* Set new topic */
+ Channel_SetTopic(chan, from, Req->argv[1]);
+ Log(LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s",
+ Client_Mask(from), Channel_Name(chan),
+ Req->argv[1][0] ? Req->argv[1] : "<none>");
/* im Channel bekannt machen und an Server weiterleiten */
IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
{
if( *ptr == 'l' )
{
- snprintf( l, sizeof( l ), " %ld", Channel_MaxUsers( chan ));
+ snprintf( l, sizeof( l ), " %lu", Channel_MaxUsers( chan ));
strlcat( modes_add, l, sizeof( modes_add ));
}
if( *ptr == 'k' )
if(( ! *ptr ) && ( Req->argv[arg_topic][0] ))
{
/* OK, there is no topic jet */
- Channel_SetTopic( chan, Req->argv[arg_topic] );
- IRC_WriteStrChannelPrefix( Client, chan, from, false, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan ));
+ Channel_SetTopic(chan, Client, Req->argv[arg_topic]);
+ IRC_WriteStrChannelPrefix(Client, chan, from, false,
+ "TOPIC %s :%s", Req->argv[0], Channel_Topic(chan));
}
}
projects / ngircd-alex.git / blobdiff