X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIRCParser.c;h=eed9380f8e0dddb242bee17782200f36ab36d987;hb=2b9e305af713f0960ac0cd7645af3e0ef85a8515;hp=ab1c69c49099ceabbe58c0095597f95dd05d64f6;hpb=8ee79e874a057be3f45ac81b6e0ade61fc18f255;p=NeonServV5.git

diff --git a/src/IRCParser.c b/src/IRCParser.c
index ab1c69c..eed9380 100644
--- a/src/IRCParser.c
+++ b/src/IRCParser.c
@@ -58,7 +58,7 @@ static void parse_line(struct ClientSocket *client, char *line) {
     int argc = 0;
     char *argv[MAXNUMPARAMS];
     #ifdef HAVE_THREADS
-    printf("[%lu recv %lu] %s\n", syscall(SYS_gettid), (unsigned long) strlen(line), line);
+    printf("[%d recv %lu] %s\n", getCurrentThreadID(), (unsigned long) strlen(line), line);
     #else
     printf("[recv %lu] %s\n", (unsigned long) strlen(line), line);
     #endif
@@ -173,10 +173,17 @@ static int is_onlyBotSeeUser(struct ClientSocket *client, struct UserNode *user)
 
 static IRC_CMD(raw_join) {
     if(from == NULL || argc < 1) return 0;
+    SYNCHRONIZE(cache_sync);
     struct UserNode *user = getUserByMask(from);
     struct ChanNode *chan = getChanByName(argv[0]);
-    if(!chan && (!user || !(user->flags & USERFLAG_ISBOT))) return 0;
-    if(chan && (((!user || !isBot(user)) && chan->chanbot != client->user) || ((user && isBot(user)) && client->user != user))) return 1; //we ignore it - but it's not a parse error
+    if(!chan && (!user || !(user->flags & USERFLAG_ISBOT))) {
+        DESYNCHRONIZE(cache_sync);
+        return 0;
+    }
+    if(chan && (((!user || !isBot(user)) && chan->chanbot != client->user) || ((user && isBot(user)) && client->user != user))) {
+        DESYNCHRONIZE(cache_sync);
+        return 1; //we ignore it - but it's not a parse error
+    }
     //let Bots always add themselves! (maybe they join invisible)
     if(user == NULL) {
         user = addUserMask(from);
@@ -237,6 +244,7 @@ static IRC_CMD(raw_join) {
         chanuser->flags &= ~CHANUSERFLAG_VOICED;
         chanuser->flags |= CHANUSERFLAG_OPPED;
     }
+    DESYNCHRONIZE(cache_sync);
     return 1;
 }
 
@@ -275,11 +283,21 @@ static void check_full_rejoin(struct ChanNode *chan) {
 
 static IRC_CMD(raw_part) {
     if(from == NULL || argc < 1) return 0;
+    SYNCHRONIZE(cache_sync);
     struct UserNode *user = getUserByMask(from);
-    if(user == NULL) return 0;
+    if(user == NULL) {
+        DESYNCHRONIZE(cache_sync);
+        return 0;
+    }
     struct ChanNode *chan = getChanByName(argv[0]);
-    if(chan == NULL) return 0;
-    if((!isBot(user) && chan->chanbot != client->user) || (isBot(user) && client->user != user)) return 1; //we ignore it - but it's not a parse error
+    if(chan == NULL) {
+        DESYNCHRONIZE(cache_sync);
+        return 0;
+    }
+    if((!isBot(user) && chan->chanbot != client->user) || (isBot(user) && client->user != user)) {
+        DESYNCHRONIZE(cache_sync);
+        return 1; //we ignore it - but it's not a parse error
+    }
     int keep_channel = 1;
     if(chan->chanbot == user && (chan->flags & CHANFLAG_REJOINING)) {
         struct ClientSocket **clients = chan->rejoin_array;
@@ -289,6 +307,7 @@ static IRC_CMD(raw_part) {
         }
         free(chan->rejoin_array);
         chan->flags &= ~CHANFLAG_REJOINING;
+        DESYNCHRONIZE(cache_sync);
         return 0;
     } else if(isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
         struct ChanUser *chanuser = getChanUser(user, chan);
@@ -312,16 +331,27 @@ static IRC_CMD(raw_part) {
         putsock(client, "PART %s :magic hop", chan->name);
         putsock(client, "JOIN %s", chan->name);
     }
+    DESYNCHRONIZE(cache_sync);
     return 1;
 }
 
 static IRC_CMD(raw_quit) {
     if(from == NULL || argc < 1) return 0;
+    SYNCHRONIZE(cache_sync);
     struct UserNode *user = getUserByMask(from);
-    if(user == NULL) return 0;
-    if(!is_firstBotSeeUser(client, user)) return 1; //we ignore it - but it's not a parse error
+    if(user == NULL) {
+        DESYNCHRONIZE(cache_sync);
+        return 0;
+    }
+    if(!is_firstBotSeeUser(client, user)) {
+        DESYNCHRONIZE(cache_sync);
+        return 1; //we ignore it - but it's not a parse error
+    }
     int registering = !stricmp(argv[0], "Registered");
-    if((registering && (user->flags & USERFLAG_ISBOT))) return 1; //bot is registering - just ignore it
+    if((registering && (user->flags & USERFLAG_ISBOT))) {
+        DESYNCHRONIZE(cache_sync);
+        return 1; //bot is registering - just ignore it
+    }
     delUser(user, 0); //a little bit crazy, but we want to delete the user on the channel's userlists - but not the users channel list
     event_quit(user, argv[0]);
     if(user->flags & USERFLAG_ISBOT) {
@@ -356,6 +386,7 @@ static IRC_CMD(raw_quit) {
         registering_users = user;
     } else
         delUser(user, 1); //now we fully free the user
+    DESYNCHRONIZE(cache_sync);
     return 1;
 }
 
@@ -391,16 +422,26 @@ void bot_disconnect(struct ClientSocket *client) {
 
 static IRC_CMD(raw_kick) {
     if(from == NULL || argc < 3) return 0;
+    SYNCHRONIZE(cache_sync);
     struct UserNode *user = getUserByMask(from);
     struct UserNode *target = getUserByNick(argv[1]);
     struct ChanNode *chan = getChanByName(argv[0]);
-    if(chan == NULL || target == NULL) return 0;
-    if(((!isBot(target) && chan->chanbot != client->user) || (isBot(target) && client->user != target))) return 1; //we ignore it - but it's not a parse error
+    if(chan == NULL || target == NULL) {
+        DESYNCHRONIZE(cache_sync);
+        return 0;
+    }
+    if(((!isBot(target) && chan->chanbot != client->user) || (isBot(target) && client->user != target))) {
+        DESYNCHRONIZE(cache_sync);
+        return 1; //we ignore it - but it's not a parse error
+    }
     int keep_channel = 1;
     if(isUserOnChan(target, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
         if(user == NULL) {
             user = createTempUserMask(from);
-			if(!user) return 0;
+			if(!user) {
+                DESYNCHRONIZE(cache_sync);
+                return 0;
+            }
             user->flags |= USERFLAG_ISTMPUSER;
         }
         struct ChanUser *chanuser = getChanUser(target, chan);
@@ -419,6 +460,7 @@ static IRC_CMD(raw_kick) {
     if(keep_channel && (chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING)) {
         check_full_rejoin(chan);
     }
+    DESYNCHRONIZE(cache_sync);
     return 1;
 }