X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=src%2Fchannel.c;h=db5cfaa4c0e1e5aff595bd029be368dd0b784e20;hb=3cdeee27cb0c83268f73bfb8a745b0da9dd3f175;hp=942c34847debc64c6589c31aa311ca0e08b2de98;hpb=dd433dd7c2060728c6f51c15c9e822aa26f503d8;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index 942c348..db5cfaa 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -49,8 +49,9 @@ static channel_t *createChannel(int id, const char *name, const char *desc)
 		Log_fatal("out of memory");
 	memset(ch, 0, sizeof(channel_t));
 	ch->id = id;
-	strncpy(ch->name, name, MAX_TEXT);
-	strncpy(ch->desc, desc, MAX_TEXT);
+	ch->name = strdup(name);
+	if (desc)
+		ch->desc = strdup(desc);
 	init_list_entry(&ch->subs);
 	init_list_entry(&ch->node);
 	init_list_entry(&ch->clients);
@@ -139,7 +140,7 @@ void Chan_init()
 	conf_channel_link_t chlink;
 	const char *defaultChannelName;
 
-	defaultChannelName = getStrConf(DEAFULT_CHANNEL);
+	defaultChannelName = getStrConf(DEFAULT_CHANNEL);
 	
 	for (i = 0; ; i++) {
 		if (Conf_getNextChannel(&chdesc, i) < 0) {
@@ -149,6 +150,7 @@ void Chan_init()
 		}
 		if (i == 0) {
 			rootChan = createChannel(0, chdesc.name, chdesc.description);
+			rootChan->noenter = chdesc.noenter;
 			list_add_tail(&rootChan->flatlist_node, &channels);
 			if (strcmp(defaultChannelName, chdesc.name) == 0)
 				defaultChan = rootChan;
@@ -156,6 +158,7 @@ void Chan_init()
 		else {
 			channel_t *ch, *ch_itr = NULL;
 			ch = Chan_createChannel(chdesc.name, chdesc.description);
+			ch->noenter = chdesc.noenter;
 			
 			if (strcmp(defaultChannelName, chdesc.name) == 0) {
 				Log_info("Setting default channel %s", ch->name); 
@@ -176,6 +179,9 @@ void Chan_init()
 	}
 	if (defaultChan == NULL)
 		defaultChan = rootChan;
+	
+	if (defaultChan->noenter)
+		Log_fatal("Error in channel configuration: default channel is marked as noenter");
 
 	/* Channel links */
 	for (i = 0; ; i++) {
@@ -190,7 +196,8 @@ void Chan_init()
 			Chan_iterate(&ch_itr);
 		} while (ch_itr != NULL && strcmp(ch_itr->name, chlink.source) != 0);
 		if (ch_itr == NULL)
-			Log_fatal("Error in channel link configuration: source channel '%s' not found.", chlink.source);
+			Log_fatal("Error in channel link configuration: source channel '%s' not found.",
+					  chlink.source);
 		else
 			ch_src = ch_itr;
 		
@@ -199,7 +206,8 @@ void Chan_init()
 			Chan_iterate(&ch_itr);
 		} while (ch_itr != NULL && strcmp(ch_itr->name, chlink.destination) != 0);
 		if (ch_itr == NULL)
-			Log_fatal("Error in channel link configuration: destination channel '%s' not found", chlink.destination);
+			Log_fatal("Error in channel link configuration: destination channel '%s' not found",
+					  chlink.destination);
 		else
 			ch_dst = ch_itr;
 		
@@ -211,10 +219,15 @@ void Chan_init()
 void Chan_free()
 {
 	struct dlist *itr, *save;
+	channel_t *ch;
 	
 	list_iterate_safe(itr, save, &channels) {
-		Log_debug("Free channel %s", list_get_entry(itr, channel_t, flatlist_node)->name);
-		free(list_get_entry(itr, channel_t, flatlist_node));
+		ch = list_get_entry(itr, channel_t, flatlist_node);
+		Log_debug("Free channel %s", ch->name);
+		free(ch->name);
+		if (ch->desc)
+			free(ch->desc);
+		free(ch);
 	}
 }
 
@@ -241,14 +254,11 @@ void Chan_addChannel(channel_t *parent, channel_t *ch)
 }
 
 
-int Chan_playerJoin(channel_t *ch, client_t *client)
+int Chan_playerLeave(client_t *client)
 {
 	channel_t *leaving = NULL;
 	int leaving_id = -1;
 	
-	/* Only allowed in one channel at a time */
-	Log_debug("Add player %s to channel %s", client->playerName, ch->name); 
-
 	if (client->channel) {
 		list_del(&client->chan_node);
 		leaving = (channel_t *)client->channel;
@@ -257,6 +267,17 @@ int Chan_playerJoin(channel_t *ch, client_t *client)
 			Chan_freeChannel(leaving);
 		}
 	}
+	return leaving_id;
+}
+
+int Chan_playerJoin(channel_t *ch, client_t *client)
+{
+	int leaving_id;
+	
+	Log_debug("Add player %s to channel %s", client->playerName, ch->name); 
+
+	/* Only allowed in one channel at a time */
+	leaving_id = Chan_playerLeave(client);
 	list_add_tail(&client->chan_node, &ch->clients);
 	client->channel = (void *)ch;
 	return leaving_id;
@@ -276,6 +297,22 @@ int Chan_playerJoin_id(int channelid, client_t *client)
 		return Chan_playerJoin(ch_itr, client);	
 }
 
+bool_t Chan_playerJoin_id_test(int channelid)
+{
+	channel_t *ch_itr = NULL;
+	do {
+		Chan_iterate(&ch_itr);
+	} while (ch_itr != NULL && ch_itr->id != channelid);
+	if (ch_itr == NULL) {
+		Log_warn("Channel id %d not found - ignoring.", channelid);
+		return false;
+	}
+	if (ch_itr->noenter)
+		return false;
+	else
+		return true;
+}
+
 #if 0
 void Chan_addChannel_id(int parentId, channel_t *ch)
 {