Code changes requested by fmorgner

diff --git a/shm_utils/mon-umurmurd/mon-umurmurd.c b/shm_utils/mon-umurmurd/mon-umurmurd.c
index 931a34dcf2d54bed9f6300bafbade01e3072d7f8..7cd5697f68abcbab3d98fdb0c4eec86516ed86c5 100644 (file)
--- a/shm_utils/mon-umurmurd/mon-umurmurd.c
+++ b/shm_utils/mon-umurmurd/mon-umurmurd.c
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
                     break;\r
              case MAT_SHM:                  \r
                     fstat( shm_fd, &buf);                                       \r
-                    if( ( shmptr = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, shm_fd, 0) ) == (void *) (-1) )   //MJP BUG? \r
+                    if( ( shmptr = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, shm_fd, 0) ) == MAP_FAILED ) \r
                     {\r
                         exit(EXIT_FAILURE);\r
                     }                    \r

diff --git a/src/sharedmemory.c b/src/sharedmemory.c
index b4bfee58604de774280b083dfcdf32c5259c0470..9018f5cbd7d35bfd93cc39d956ec87c6151add75 100644 (file)
--- a/src/sharedmemory.c
+++ b/src/sharedmemory.c
@@ -19,20 +19,20 @@ void Sharedmemory_init( int bindport, int bindport6 )
         if(shm_fd == -1)\r
         {\r
             Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno));\r
-            exit(1);\r
+            exit(EXIT_FAILURE);\r
         }  \r
 \r
         if( ftruncate( shm_fd, shmtotal_size ) == -1 )\r
         {\r
             Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno));  \r
-            exit(1);\r
+            exit(EXIT_FAILURE);\r
         }\r
 \r
-        shmptr = mmap(0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);\r
-        if (shmptr == (void *) -1) \r
+        shmptr = mmap( 0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0 );\r
+        if (shmptr == MAP_FAILED) \r
         {\r
             Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno));\r
-            exit(1);\r
+            exit(EXIT_FAILURE);\r
         } \r
 \r
   memset( shmptr, 0, shmtotal_size );\r
@@ -64,7 +64,7 @@ void Sharedmemory_update(void)
               channel_t *channel = client_itr->channel;\r
         \r
                 strncpy( shmptr->client[cc].username, client_itr->username, 120 );\r
-                strncpy( shmptr->client[cc].ipaddress, Util_clientAddressToString( client_itr ), 45 );\r
+                strncpy( shmptr->client[cc].ipaddress, Util_clientAddressToString( client_itr ), INET6_ADDRSTRLEN - 1 );\r
                 strncpy( shmptr->client[cc].channel, channel->name, 120 );\r
                 \r
                 strncpy( shmptr->client[cc].os, client_itr->os, 120 );\r

diff --git a/src/sharedmemory.h b/src/sharedmemory.h
index 16573eaf83ba4b330a2d06e05625ad574973c2f9..b668c325a603498a96e218e0821769bc1bc5bc50 100644 (file)
--- a/src/sharedmemory.h
+++ b/src/sharedmemory.h
@@ -8,6 +8,7 @@
 #include <unistd.h>\r
 #include <sys/mman.h>\r
 \r
+#include <netinet/in.h>\r
 #include "util.h"\r
 #include "conf.h" \r
 #include "client.h"\r

diff --git a/src/sharedmemory_struct.h b/src/sharedmemory_struct.h
index c1f443008ba7a709e063b00f01b590894ed38023..a36382e8e425126e720643cc7ce3ab8d3e1591d0 100644 (file)
--- a/src/sharedmemory_struct.h
+++ b/src/sharedmemory_struct.h
@@ -2,7 +2,7 @@ typedef struct
 {\r
 \r
   char username[121];\r
-  char ipaddress[46];\r
+  char ipaddress[INET6_ADDRSTRLEN];\r
   char channel[121];\r
   char os[121], release[121], os_version[121];\r
   int tcp_port, udp_port;\r