NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <limits.h>
#include "log.h"
#include "list.h"
#include "client.h"
#include "conf.h"
-static int nextchanId;
static channel_t *rootChan;
channel_t *defaultChan;
declare_list(channels); /* A flat list of the channels */
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);
return ch;
}
+static int findFreeId()
+{
+ int id = 0;
+ channel_t *ch_itr = NULL;
+ for (id = 0; id < INT_MAX; id++) {
+ ch_itr = NULL;
+ while ((ch_itr = Chan_iterate(&ch_itr)) != NULL) {
+ if (ch_itr->id == id)
+ break;
+ }
+ if (ch_itr == NULL) /* Found free id */
+ return id;
+ }
+ return -1;
+}
+
#if 0
-/* Might be used when tree travesal becomes neccessary */
+/* Might be used when tree traversal becomes neccessary */
static channel_t *first_subchannel(channel_t *ch)
{
if (list_empty(&ch->subs))
}
#endif
-void Chan_iterate(channel_t **channelpptr)
+channel_t *Chan_iterate(channel_t **channelpptr)
{
channel_t *ch = *channelpptr;
}
*channelpptr = ch;
+ return ch;
+}
+
+channel_t *Chan_iterate_siblings(channel_t *parent, channel_t **channelpptr)
+{
+ channel_t *ch = *channelpptr;
+
+ if (!list_empty(&parent->subs)) {
+ if (ch == NULL)
+ ch = list_get_entry(list_get_first(&parent->subs), channel_t, node);
+ else {
+ if (list_get_next(&ch->node) == &parent->subs)
+ ch = NULL;
+ else
+ ch = list_get_entry(list_get_next(&ch->node), channel_t, node);
+ }
+ }
+
+ *channelpptr = ch;
+ return ch;
}
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) {
}
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;
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);
}
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++) {
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;
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;
list_add_tail(&ch_dst->link_node, &ch_src->channel_links);
- Log_debug("Adding channel link %s -> %s", ch_src->name, ch_dst->name);
+ Log_info("Adding channel link %s -> %s", ch_src->name, ch_dst->name);
}
}
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);
}
}
channel_t *Chan_createChannel(const char *name, const char *desc)
{
- /* Get an ID */
- nextchanId += 1;
- return createChannel(nextchanId, name, desc);
+ int id = findFreeId();
+ if (id < 0)
+ Log_fatal("No free channel ID found");
+ return createChannel(id, name, desc);
}
void Chan_freeChannel(channel_t *ch)
}
-void Chan_playerJoin(channel_t *ch, client_t *client)
+int Chan_playerLeave(client_t *client)
{
- /* Only allowed in one channel at a time */
+ channel_t *leaving = NULL;
+ int leaving_id = -1;
+
+ if (client->channel) {
+ list_del(&client->chan_node);
+ leaving = (channel_t *)client->channel;
+ if (leaving->temporary && list_empty(&leaving->clients)) {
+ leaving_id = leaving->id;
+ 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);
- if (client->channel)
- list_del(&client->chan_node);
+ /* 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;
}
-void Chan_playerJoin_id(int channelid, client_t *client)
+int Chan_playerJoin_id(int channelid, client_t *client)
{
channel_t *ch_itr = NULL;
do {
Chan_iterate(&ch_itr);
} while (ch_itr != NULL && ch_itr->id != channelid);
- if (ch_itr == NULL)
+ if (ch_itr == NULL) {
Log_warn("Channel id %d not found - ignoring.", channelid);
+ return -1;
+ }
else
- Chan_playerJoin(ch_itr, 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)
{
channel_t *ch_itr = NULL;
else
list_add_tail(&ch->node, &ch_itr->subs);
}
+#endif
channel_t *Chan_fromId(int channelid)
{
projects / umurmur.git / blobdiff