X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/21f6caee9936b429da5fcd482b4907315fcb109a..18006b5cc4b0c4b72c638669a6ad5c8fb39ddf87:/src/hash.c

diff --git a/src/hash.c b/src/hash.c
index c5e99fc..e0ce1f9 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -5,7 +5,7 @@
  *
  * x3 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,11 +23,12 @@
 #include "hash.h"
 #include "log.h"
 
-#ifdef HAVE_GEOIP_H
+#if defined(HAVE_LIBGEOIP)&&defined(HAVE_GEOIP_H)&&defined(HAVE_GEOIPCITY_H)
 #include <GeoIP.h>
-#endif
-#ifdef HAVE_GEOIPCITY_H
 #include <GeoIPCity.h>
+
+GeoIP * gi = NULL;
+GeoIP * cgi = NULL;
 #endif
 
 struct server *self;
@@ -196,6 +197,40 @@ NickChange(struct userNode* user, const char *new_nick, int no_announce)
     free(old_nick);
 }
 
+void
+SVSNickChange(struct userNode* user, const char *new_nick)
+{
+    char *old_nick;
+    unsigned int nn;
+
+    /* don't do anything if there's no change */
+    old_nick = user->nick;
+    if (!strncmp(new_nick, old_nick, NICKLEN))
+        return;
+
+    /* remove old entry from clients dictionary */
+    dict_remove(clients, old_nick);
+#if !defined(WITH_PROTOCOL_P10)
+    /* Remove from uplink's clients dict */
+    dict_remove(user->uplink->users, old_nick);
+#endif
+    /* and reinsert */
+    user->nick = strdup(new_nick);
+    dict_insert(clients, user->nick, user);
+#if !defined(WITH_PROTOCOL_P10)
+    dict_insert(user->uplink->users, user->nick, user);
+#endif
+
+    /* Make callbacks for nick changes.  Do this with new nick in
+     * place because that is slightly more useful.
+     */
+    for (nn=0; nn<ncf2_used; nn++)
+        ncf2_list[nn](user, old_nick);
+    user->timestamp = now;
+
+    free(old_nick);
+}
+
 struct userNode *
 GetUserH(const char *nick)
 {
@@ -256,10 +291,10 @@ assign_fakehost(struct userNode *user, const char *host, int announce)
 void
 set_geoip_info(struct userNode *user)
 {
+    if(IsLocal(user))
+        return;
 /* Need the libs and the headers if this is going to compile properly */
 #if defined(HAVE_LIBGEOIP)&&defined(HAVE_GEOIP_H)&&defined(HAVE_GEOIPCITY_H)
-    GeoIP * gi = NULL;
-    GeoIP * cgi = NULL;
     GeoIPRecord * gir;
     const char *geoip_data_file = NULL;
     const char *geoip_city_file = NULL;
@@ -267,14 +302,14 @@ set_geoip_info(struct userNode *user)
     geoip_data_file = conf_get_data("services/opserv/geoip_data_file", RECDB_QSTRING);
     geoip_city_file = conf_get_data("services/opserv/geoip_city_data_file", RECDB_QSTRING);
 
-    if ((!geoip_data_file && !geoip_city_file) || IsLocal(user))
+    if ((!geoip_data_file && !geoip_city_file))
         return; /* Admin doesnt want to use geoip functions */
 
-    if (geoip_data_file)
-        gi  = GeoIP_open(geoip_data_file, GEOIP_STANDARD | GEOIP_CHECK_CACHE);
+    if (geoip_data_file && !gi)
+        gi  = GeoIP_open(geoip_data_file, GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE);
 
-    if (geoip_city_file)
-        cgi = GeoIP_open(geoip_city_file, GEOIP_INDEX_CACHE);
+    if (geoip_city_file && !cgi)
+        cgi = GeoIP_open(geoip_city_file, GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE);
 
     if (cgi) {
         gir = GeoIP_record_by_name(cgi, user->hostname);
@@ -293,12 +328,10 @@ set_geoip_info(struct userNode *user)
             GeoIPRecord_delete(gir);
         }
 
-        GeoIP_delete(cgi);
         return;
     } else if (gi) {
         const char *country = GeoIP_country_name_by_name(gi, user->hostname);
         user->country_name = strdup(country ? country : "");
-        GeoIP_delete(gi);
         return;
     }
 
@@ -714,7 +747,7 @@ ChannelUserKicked(struct userNode* kicker, struct userNode* victim, struct chanN
     unsigned int n;
     struct modeNode *mn;
 
-    if (!victim || !channel || IsService(victim) || !GetUserMode(channel, victim))
+    if (!victim || !channel || !GetUserMode(channel, victim))
         return;
 
     /* Update the kicker's idle time (kicker may be null if it was a server) */