Fixes for LP64 models; announce IPv6 support.

src/alloc-slab.c (SMALL_CUTOFF): Adjust to a multiple of 8.

src/alloc-srvx.c (srvx_malloc): Fix format string for LP64.

src/md5.h (UINT4): Fix typedef for LP64.

src/opserv.c (cmd_warn): Fix whitespace.

src/proto-p10.c (irc_server): Announce IPv6 support.
git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-33

diff --git a/ChangeLog b/ChangeLog
index e1a78d2dc35d28b2ebf1d22f7553fe5f8d17d3de..ddffb7bc7e5f347f5de7e22cfdeb69bb01ae2dd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,28 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3
 #
 
+2005-11-17 20:43:26 GMT        Michael Poole <mdpoole@troilus.org>     patch-33
+
+    Summary:
+      Fixes for LP64 models; announce IPv6 support.
+    Revision:
+      srvx--devo--1.3--patch-33
+
+    src/alloc-slab.c (SMALL_CUTOFF): Adjust to a multiple of 8.
+    
+    src/alloc-srvx.c (srvx_malloc): Fix format string for LP64.
+    
+    src/md5.h (UINT4): Fix typedef for LP64.
+    
+    src/opserv.c (cmd_warn): Fix whitespace.
+    
+    src/proto-p10.c (irc_server): Announce IPv6 support.
+
+    modified files:
+     ChangeLog src/alloc-slab.c src/alloc-srvx.c src/md5.h
+     src/opserv.c src/proto-p10.c
+
+
 2005-11-01 00:37:44 GMT        Michael Poole <mdpoole@troilus.org>     patch-32
 
     Summary:

diff --git a/src/alloc-slab.c b/src/alloc-slab.c
index c468f91ac58a6bc63e4bac7e46ae074cd2e4504d..144a2371a26e47b540994bbf9bf4d68a1860092c 100644 (file)
--- a/src/alloc-slab.c
+++ b/src/alloc-slab.c
@@ -97,7 +97,7 @@ struct slabset {
 #define SLAB_MIN     (2 * sizeof(void*))
 #define SLAB_GRAIN   sizeof(void*)
 #define SLAB_ALIGN   SLAB_GRAIN
-#define SMALL_CUTOFF 580
+#define SMALL_CUTOFF 576
 /* Element size < SMALL_CUTOFF -> use small slabs.
  * Larger elements are allocated directly using mmap().  The largest
  * regularly allocated struct in srvx 1.x is smaller than

diff --git a/src/alloc-srvx.c b/src/alloc-srvx.c
index 45fd15de72cbde97e34a016b41e53240fbb561fd..11de0fd637256199f0e22cd7e5d16246d65f16a2 100644 (file)
--- a/src/alloc-srvx.c
+++ b/src/alloc-srvx.c
@@ -63,8 +63,9 @@ srvx_malloc(const char *file, unsigned int line, size_t size)
     assert(block != NULL);
     if (block->magic == ALLOC_MAGIC && block->file_id < file_ids_used) {
         /* Only report the error, due to possible false positives. */
-        log_module(MAIN_LOG, LOG_WARNING, "Detected possible reallocation: %p (called by %s:%u/%u; allocated by %u:%u/%u).",
-                   block, file, line, size, block->file_id, block->line, block->size);
+        log_module(MAIN_LOG, LOG_WARNING, "Detected possible reallocation: %p (called by %s:%u/%lu; allocated by %u:%u/%u).",
+                   block, file, line, (unsigned long)size,
+                   block->file_id, block->line, block->size);
     }
     memset(block, 0, sizeof(*block) + size);
     memcpy((char*)(block + 1) + size, redzone, sizeof(redzone));

diff --git a/src/md5.h b/src/md5.h
index 4febb69f5ec0f886abe7571234d4e8385a2136da..0ab4990dd5904490c87b2bc9f93ffeeb22c84b17 100644 (file)
--- a/src/md5.h
+++ b/src/md5.h
@@ -16,7 +16,7 @@ typedef unsigned char *POINTER;
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-#if defined(__alpha)
+#if defined(__alpha) || defined(_LP64) || defined(__LP64__)
 typedef unsigned int UINT4;
 #else
 typedef unsigned long int UINT4;

diff --git a/src/opserv.c b/src/opserv.c
index 2f365adc3926c5f00b2ad49d48cd0d59b305ece0..2496b8d3129c618a5a633e66da6b4530d3258721 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -478,7 +478,7 @@ static MODCMD_FUNC(cmd_chaninfo)
     return 1;
 }
 
-static MODCMD_FUNC(cmd_warn) 
+static MODCMD_FUNC(cmd_warn)
 {
     char *reason, *message;
 

diff --git a/src/proto-p10.c b/src/proto-p10.c
index c5ce032d4c001072bdcc4635e1f2513f81064bd8..c7d69b06476c68a124cdf270ebeb215545f1a526 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -368,10 +368,10 @@ irc_server(struct server *srv)
     inttobase64(extranum, srv->num_mask, (srv->numeric[1] || (srv->num_mask >= 64*64)) ? 3 : 2);
     if (srv == self) {
         /* The +s, ignored by Run's ircu, means "service" to Undernet's ircu */
-        putsock(P10_SERVER " %s %d %li %li J10 %s%s +s :%s",
+        putsock(P10_SERVER " %s %d %li %li J10 %s%s +s6 :%s",
                 srv->name, srv->hops+1, srv->boot, srv->link, srv->numeric, extranum, srv->description);
     } else {
-        putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s :%s",
+        putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s6 :%s",
                 self->numeric, srv->name, srv->hops+1, srv->boot, srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description);
     }
 }