*** VERSION 5.4.0 ***

[NeonServV5.git] / src / UserNode.c

diff --git a/src/UserNode.c b/src/UserNode.c
index f90e72f2c1876fc95dcf315bb0b376d34bd6d276..0f10b532e27f24d0cbc4f83741d0666995e1529d 100644 (file)
--- a/src/UserNode.c
+++ b/src/UserNode.c
@@ -1,4 +1,4 @@
-/* UserNode.c - NeonServ v5.3
+/* UserNode.c - NeonServ v5.4
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -69,15 +69,20 @@ struct UserNode* getUserByNick(const char *nick) { //case sensitive
     int userListIndex = get_nicklist_entry(*nick);
     if(userListIndex == -1 || userList[userListIndex] == NULL)
         return NULL;
+    SYNCHRONIZE(cache_sync);
     struct UserNode *user;
     for(user = userList[userListIndex]; user; user = user->next) {
-        if(!stricmp(nick, user->nick))
+        if(!stricmp(nick, user->nick)) {
+            DESYNCHRONIZE(cache_sync);
             return user;
+        }
     }
+    DESYNCHRONIZE(cache_sync);
     return NULL;
 }
 
 struct UserNode* getUserByMask(const char *mask) { //case sensitive
+    SYNCHRONIZE(cache_sync);
     char cmask[strlen(mask)+1];
     strcpy(cmask, mask);
     int i;
@@ -86,12 +91,15 @@ struct UserNode* getUserByMask(const char *mask) { //case sensitive
         if(cmask[i] == '!') {
             cmask[i] = 0;
             user = getUserByNick(&cmask[0]);
+            DESYNCHRONIZE(cache_sync);
             return user;
         } else if(cmask[i] == '.') {
             //it's a server
+            DESYNCHRONIZE(cache_sync);
             return NULL;
         }
     }
+    DESYNCHRONIZE(cache_sync);
     return NULL;
 }
 
@@ -99,6 +107,7 @@ struct UserNode* searchUserByNick(const char *nick) { //case insensitive
     if(!isalpha(*nick)) 
         return getUserByNick(nick);
 
+    SYNCHRONIZE(cache_sync);
     int userListIndex;
     struct UserNode *user;
 
@@ -106,22 +115,28 @@ struct UserNode* searchUserByNick(const char *nick) { //case insensitive
     userListIndex = get_nicklist_entry(tolower(*nick));
     if(userListIndex != -1 && userList[userListIndex] != NULL) {
         for(user = userList[userListIndex]; user; user = user->next) {
-            if(!stricmp(nick, user->nick))
+            if(!stricmp(nick, user->nick)) {
+                DESYNCHRONIZE(cache_sync);
                 return user;
+            }
         }
     }
     //search in the upper case "section"
     userListIndex = get_nicklist_entry(toupper(*nick));
     if(userListIndex != -1 && userList[userListIndex] != NULL) {
         for(user = userList[userListIndex]; user; user = user->next) {
-            if(!stricmp(nick, user->nick))
+            if(!stricmp(nick, user->nick)) {
+                DESYNCHRONIZE(cache_sync);
                 return user;
+            }
         }
     }
+    DESYNCHRONIZE(cache_sync);
     return NULL;
 }
 
 int countUsersWithHost(char *host) {
+    SYNCHRONIZE(cache_sync);
     int i, count = 0;
     struct UserNode *user;
     for(i = 0; i < VALID_NICK_CHARS_FIRST_LEN; i++) {
@@ -131,23 +146,28 @@ int countUsersWithHost(char *host) {
             }
         }
     }
+    DESYNCHRONIZE(cache_sync);
     return count;
 }
 
 char *getAuthFakehost(char *auth) {
+    SYNCHRONIZE(cache_sync);
     int i;
     struct UserNode *user;
     for(i = 0; i < VALID_NICK_CHARS_FIRST_LEN; i++) {
         for(user = userList[i]; user; user = user->next) {
             if((user->flags & USERFLAG_ISAUTHED) && !strcmp(user->auth, auth) && isFakeHost(user->host)) {
+                DESYNCHRONIZE(cache_sync);
                 return user->host;
             }
         }
     }
+    DESYNCHRONIZE(cache_sync);
     return NULL;
 }
 
 struct UserNode* getAllUsers(struct UserNode *last) {
+    SYNCHRONIZE(cache_sync);
     if(last == NULL || last->next == NULL) {
         int cindex;
         if(last == NULL)
@@ -156,27 +176,35 @@ struct UserNode* getAllUsers(struct UserNode *last) {
             cindex = get_nicklist_entry(last->nick[0]) + 1;
         while(userList[cindex] == NULL && cindex < VALID_NICK_CHARS_FIRST_LEN)
             cindex++;
-        if(cindex > VALID_NICK_CHARS_FIRST_LEN) return NULL;
+        DESYNCHRONIZE(cache_sync);
+        if(cindex >= VALID_NICK_CHARS_FIRST_LEN) return NULL;
         return userList[cindex];
-    } else
+    } else {
+        DESYNCHRONIZE(cache_sync);
         return last->next;
+    }
 }
 
 struct UserNode* getUsersWithAuth(const char *auth, struct UserNode *last) {
+    SYNCHRONIZE(cache_sync);
     int cindex = (last ? get_nicklist_entry(last->nick[0]) : 0);
     struct UserNode *cuser = last;
     while(cindex <= VALID_NICK_CHARS_FIRST_LEN) {
         for(cuser = (cuser ? cuser->next : userList[cindex]); cuser; cuser = cuser->next) {
-            if((cuser->flags & USERFLAG_ISAUTHED) && !strcmp(cuser->auth, auth))
+            if((cuser->flags & USERFLAG_ISAUTHED) && !strcmp(cuser->auth, auth)) {
+                DESYNCHRONIZE(cache_sync);
                 return cuser;
+            }
         }
         cindex++;
         cuser = NULL;
     }
+    DESYNCHRONIZE(cache_sync);
     return NULL;
 }
 
 int getUserCount() {
+    SYNCHRONIZE(cache_sync);
     int i, count = 0;
     struct UserNode *user;
     for(i = 0; i < VALID_NICK_CHARS_FIRST_LEN; i++) {
@@ -184,6 +212,7 @@ int getUserCount() {
             count++;
         }
     }
+    DESYNCHRONIZE(cache_sync);
     return count;
 }
 
@@ -328,6 +357,8 @@ struct UserNode* createTempUserMask(const char *mask) {
                 return NULL;
             }
             strcpy(user->host, cmask);
+            strncpy(user->nick, cmask, NICKLEN);
+            user->nick[NICKLEN] = 0;
             user->created = time(0);
             user->ident[0] = 0;
             user->host[0] = 0;
@@ -336,7 +367,7 @@ struct UserNode* createTempUserMask(const char *mask) {
             user->flags = USERFLAG_ISSERVER;
             user->channel = NULL;
             user->last_who = 0;
-            return user;
+            break;
         } else if(cmask[i] == '@') {
             if(user == NULL) return NULL;
             cmask[i] = 0;