X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FChanNode.c;h=977b9b4c985eb8d9270e0f788607882a9db81d3a;hp=9641df31f0d1083192502d36ad31d4952f0bc260;hb=55831bf424312a6908ca07a904f288fba0919a9a;hpb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb diff --git a/src/ChanNode.c b/src/ChanNode.c index 9641df3..977b9b4 100644 --- a/src/ChanNode.c +++ b/src/ChanNode.c @@ -24,8 +24,12 @@ #include "IRCEvents.h" static struct ChanNode **chanList; +#ifdef HAVE_THREADS +pthread_mutex_t cache_sync; +#endif void init_ChanNode() { + THREAD_MUTEX_INIT(cache_sync); /* len pos chars 26 0 a-z @@ -40,6 +44,7 @@ void init_ChanNode() { } void free_ChanNode() { + SYNCHRONIZE(cache_sync); //kamikaze free all channels and chanusers int i; struct ChanNode *chan, *next; @@ -55,6 +60,7 @@ void free_ChanNode() { } } free(chanList); + DESYNCHRONIZE(cache_sync); } int is_valid_chan(const char *name) { @@ -105,8 +111,9 @@ struct ChanNode* getAllChans(struct ChanNode *last) { cindex++; if(cindex >= CHANNEL_LIST_SIZE) return NULL; return chanList[cindex]; - } else + } else { return last->next; + } } struct ChanNode* getChanByName(const char *name) { //case insensitive @@ -143,8 +150,10 @@ struct ChanNode* addChannel(const char *name) { chan->modes = createModeNode(chan); chan->trigger = NULL; + SYNCHRONIZE(cache_sync); chan->next = chanList[chanListIndex]; chanList[chanListIndex] = chan; + DESYNCHRONIZE(cache_sync); return chan; } @@ -186,6 +195,7 @@ int getChanBanCount() { void delChannel(struct ChanNode* chan, int freeChan) { int chanListIndex = get_chanlist_entry(chan->name[1]); if(chanListIndex == -1) return; + SYNCHRONIZE(cache_sync); struct ChanNode *cchan, *last_chan = NULL; for(cchan = chanList[chanListIndex]; cchan; cchan = cchan->next) { if(cchan == chan) { @@ -209,6 +219,7 @@ void delChannel(struct ChanNode* chan, int freeChan) { freeChanNode(chan); else chan->next = NULL; + DESYNCHRONIZE(cache_sync); } void freeChanNode(struct ChanNode* chan) { @@ -238,6 +249,7 @@ int checkChannelVisibility(struct ChanNode* chan) { } } //free the channel... + SYNCHRONIZE(cache_sync); for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next) { next = getChannelUsers(chan, chanuser); //remove the channel from the user's channel-list @@ -250,5 +262,6 @@ int checkChannelVisibility(struct ChanNode* chan) { } chan->user = NULL; delChannel(chan, 1); + DESYNCHRONIZE(cache_sync); return 0; }