fixed event_neonserv_kick and user-free-after-kick problem

[NeonServV5.git] / src / event_neonserv_kick.c

diff --git a/src/event_neonserv_kick.c b/src/event_neonserv_kick.c
index c9037d97c23352bed6b265e5311412dd5ac84edd..8e32d02a4dab680b87302f0a5f2d4310ede83131 100644 (file)
--- a/src/event_neonserv_kick.c
+++ b/src/event_neonserv_kick.c
@@ -18,13 +18,14 @@
 struct neonserv_event_kick_cache {
     struct ClientSocket *client;
     struct UserNode *user;
-    struct ChanUser *target;
+    struct UserNode *target;
+    struct ChanNode *chan;
     int userauth_pending;
 };
 
 static USERAUTH_CALLBACK(neonserv_event_kick_nick_lookup);
 static void neonserv_event_kick_async1(struct neonserv_event_kick_cache *cache);
-static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct ChanUser *target);
+static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, struct ChanNode *chan);
 
 static void neonserv_event_kick(struct UserNode *user, struct ChanUser *target, char *reason) {
     struct ChanNode *chan = target->chan;
@@ -62,8 +63,9 @@ static void neonserv_event_kick(struct UserNode *user, struct ChanUser *target,
     }
     cache->client = client;
     cache->user = user;
-    cache->target = target;
-    cache->userauth_pending++;
+    cache->target = target->user;
+    cache->chan = target->chan;
+    cache->userauth_pending = 0;
     if(!(user->flags & USERFLAG_ISAUTHED)) {
         get_userauth(user, neonserv_event_kick_nick_lookup, cache);
         cache->userauth_pending++;
@@ -83,15 +85,15 @@ static USERAUTH_CALLBACK(neonserv_event_kick_nick_lookup) {
 
 static void neonserv_event_kick_async1(struct neonserv_event_kick_cache *cache) {
     if(cache->userauth_pending == 0) {
-        neonserv_event_kick_async2(cache->client, cache->user, cache->target);
+        neonserv_event_kick_async2(cache->client, cache->user, cache->target, cache->chan);
         free(cache);
     }
 }
 
-static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct ChanUser *target) {
-    if(isUserProtected(target->chan, target->user, user)) {
+static void neonserv_event_kick_async2(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, struct ChanNode *chan) {
+    if(isUserProtected(chan, target, user)) {
         char buf[MAXLEN];
-        putsock(client, "KICK %s %s :%s", target->chan->name, user->nick, build_language_string(user, buf, "NS_USER_PROTECTED", target->user->nick));
-        putsock(client, "INVITE %s %s", target->user->nick, target->chan->name);
+        putsock(client, "KICK %s %s :%s", chan->name, user->nick, build_language_string(user, buf, "NS_USER_PROTECTED", target->nick));
+        putsock(client, "INVITE %s %s", target->nick, chan->name);
     }
 }