rearranged NeonServ code to be modular

[NeonServV5.git] / src / UserNode.h

diff --git a/src/UserNode.h b/src/UserNode.h
index 699c53990041aa255a6b94b4b350e1d25eb10e51..fb1afc1567c7ce8fd7613de1c6dcdf81fe394c46 100644 (file)
--- a/src/UserNode.h
+++ b/src/UserNode.h
@@ -37,6 +37,7 @@
 
 struct ChanUser;
 struct language;
+struct IPNode;
 
 struct UserNode {
     char nick[NICKLEN+1];
@@ -44,6 +45,7 @@ struct UserNode {
     char host[HOSTLEN+1];
     char realname[REALLEN+1];
     char auth[AUTHLEN+1];
+    struct IPNode *ip;
     unsigned int flags;
     time_t created, last_who;
     struct ChanUser *channel;
@@ -57,22 +59,24 @@ struct UserNode {
 #define isNetworkService(USER) (USER->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP | USERFLAG_ISSERVER))
 #define isBot(USER) (USER->flags & (USERFLAG_ISBOT))
 
+#ifndef DND_FUNCTIONS
 void init_UserNode();
 void free_UserNode();
-int is_valid_nick(const char *nick);
-struct UserNode* getUserByNick(const char *nick);
-struct UserNode* getUserByMask(const char *mask);
-int countUsersWithHost(char *host);
-char *getAuthFakehost(char *auth);
-struct UserNode* searchUserByNick(const char *nick);
-struct UserNode* getAllUsers(struct UserNode *last);
-struct UserNode* getUsersWithAuth(const char *auth, struct UserNode *last);
-int getUserCount();
+/* MODULAR ACCESSIBLE */ int is_valid_nick(const char *nick);
+/* MODULAR ACCESSIBLE */ struct UserNode* getUserByNick(const char *nick);
+/* MODULAR ACCESSIBLE */ struct UserNode* getUserByMask(const char *mask);
+/* MODULAR ACCESSIBLE */ int countUsersWithHost(char *host);
+/* MODULAR ACCESSIBLE */ char *getAuthFakehost(char *auth);
+/* MODULAR ACCESSIBLE */ struct UserNode* searchUserByNick(const char *nick);
+/* MODULAR ACCESSIBLE */ struct UserNode* getAllUsers(struct UserNode *last);
+/* MODULAR ACCESSIBLE */ struct UserNode* getUsersWithAuth(const char *auth, struct UserNode *last);
+/* MODULAR ACCESSIBLE */ int getUserCount();
 struct UserNode* addUser(const char *nick);
 struct UserNode* addUserMask(const char *mask);
-struct UserNode* createTempUser(const char *mask);
+struct UserNode* createTempUser(const char *nick);
+struct UserNode* createTempUserMask(const char *mask);
 int renameUser(struct UserNode* user, const char *new_nick);
 void delUser(struct UserNode* user, int freeUser);
 void clearTempUsers();
-
+#endif
 #endif