Added type 8 for Nefarious 1.3.0. We now only use the old cloak code if type 7 is...

diff --git a/ChangeLog b/ChangeLog
index d07304ca68cd8297fa0e36e99e052608b44bc930..92e32ac3a731b9f172ed71f5b758535eb9f14935 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 /***********************************************************************
 X3 ChangeLog
 
+2009-12-18  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
+
+       * x3.conf.example: Added type 8 for Nefarious 1.3.0.
+
+       * src/proto-p10.c: Only use the old cloak.c code if type 7 is given.
+       If type 8 is given then the cloaked hosts are picked up during burst
+       (+cC)
+
 2009-12-17  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
 
        * src/log.c: Revert message type to 5.

diff --git a/src/proto-p10.c b/src/proto-p10.c
index 72ec7d48e01e3b3fbee810fc8a6c4759cbe14ee0..4a4dbb972ff6b8d975889a5c55a3b6cfac8a4568 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -3077,7 +3077,7 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char *
 
     tstr = conf_get_data("server/type", RECDB_QSTRING);
     type = atoi(tstr);
-    if (type > 6) {
+    if (type == 7) {
       if (irc_in_addr_is_ipv4(uNode->ip)) {
         make_virtip((char*)irc_ntoa(&uNode->ip), (char*)irc_ntoa(&uNode->ip), uNode->cryptip);
         make_virthost((char*)irc_ntoa(&uNode->ip), uNode->hostname, uNode->crypthost);

diff --git a/x3.conf.example b/x3.conf.example
index 38b8de59e3e13a0201e7b88a5447eae51503c4e9..c6c0f5fee43ac26c9e8b692f771b97f2e5449607 100644 (file)
--- a/x3.conf.example
+++ b/x3.conf.example
@@ -49,17 +49,18 @@
      * things like bans, where it should not show the user's real hostname. */
     "hidden_host_type" "1"; // change this to 2 if you use Nefarious's style 2 host hiding.
     "key1" "45432"; // Set these key values to the network KEY values you use
-    "key2" "76934"; // for host hiding style 2.
-    "key3" "98336";
+    "key2" "76934"; // for host hiding style 2. If you are using Nefarious 1.3.0 (type 8)
+    "key3" "98336"; // then these are ignored.
     "prefix" "AfterNET"; // If you use style 2 then this is the name that is prefixed to hosts.
     "numeric" "51"; // hint: If you get collisions on link, CHANGE THIS.
-    /* Type handles some changes in nefarious 1.0 (was 0.5.0)
+    /* Type handles some changes in Nefarious from version to version.
      * 4 - nefarious 0.4.x and other ircds
      * 5 - nefarious 1.0.x and higher (Obselete)
-     * 6 - nefarious 1.1.0 and higher (Branch Revision)
-     * 7 - nefarious 1.2.0 and higher (Trunk Revsions)
+     * 6 - nefarious 1.1.0 and higher (Obselete)
+     * 7 - nefarious 1.2.0 and higher (Branch Revsion)
+     * 8 - nefarious 1.3.0 and higher (Trunk Revsions)
      */
-    "type" "6";
+    "type" "8";
     "host_in_topic" "1"; //Set to 1 if your Nefarious server have the HOST_IN_TOPIC F:line set to TRUE.
     "max_users" "256"; // You can save a little memory by setting this to a lower value.
     "force_n2k" "1"; // Use extended (5-digit) numnick for self, even if 3 are possible.