From: Michael J. Pounders <snowblind@bellsouth.net>
Date: Thu, 4 Dec 2014 02:35:19 +0000 (-0500)
Subject: Code changes requested by fmorgner
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=0f96d841842a2f4adaaf9b271dc3f3e24fa5b009

Code changes requested by fmorgner
---

diff --git a/shm_utils/mon-umurmurd/mon-umurmurd.c b/shm_utils/mon-umurmurd/mon-umurmurd.c
index 931a34d..7cd5697 100644
--- 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;
              case MAT_SHM:                  
                     fstat( shm_fd, &buf);                                       
-                    if( ( shmptr = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, shm_fd, 0) ) == (void *) (-1) )   //MJP BUG? 
+                    if( ( shmptr = mmap(0, buf.st_size, PROT_READ, MAP_SHARED, shm_fd, 0) ) == MAP_FAILED ) 
                     {
                         exit(EXIT_FAILURE);
                     }                    
diff --git a/src/sharedmemory.c b/src/sharedmemory.c
index b4bfee5..9018f5c 100644
--- a/src/sharedmemory.c
+++ b/src/sharedmemory.c
@@ -19,20 +19,20 @@ void Sharedmemory_init( int bindport, int bindport6 )
         if(shm_fd == -1)
         {
             Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno));
-            exit(1);
+            exit(EXIT_FAILURE);
         }  
 
         if( ftruncate( shm_fd, shmtotal_size ) == -1 )
         {
             Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno));  
-            exit(1);
+            exit(EXIT_FAILURE);
         }
 
-        shmptr = mmap(0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);
-        if (shmptr == (void *) -1) 
+        shmptr = mmap( 0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0 );
+        if (shmptr == MAP_FAILED) 
         {
             Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno));
-            exit(1);
+            exit(EXIT_FAILURE);
         } 
 
   memset( shmptr, 0, shmtotal_size );
@@ -64,7 +64,7 @@ void Sharedmemory_update(void)
               channel_t *channel = client_itr->channel;
         
                 strncpy( shmptr->client[cc].username, client_itr->username, 120 );
-                strncpy( shmptr->client[cc].ipaddress, Util_clientAddressToString( client_itr ), 45 );
+                strncpy( shmptr->client[cc].ipaddress, Util_clientAddressToString( client_itr ), INET6_ADDRSTRLEN - 1 );
                 strncpy( shmptr->client[cc].channel, channel->name, 120 );
                 
                 strncpy( shmptr->client[cc].os, client_itr->os, 120 );
diff --git a/src/sharedmemory.h b/src/sharedmemory.h
index 16573ea..b668c32 100644
--- a/src/sharedmemory.h
+++ b/src/sharedmemory.h
@@ -8,6 +8,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
+#include <netinet/in.h>
 #include "util.h"
 #include "conf.h" 
 #include "client.h"
diff --git a/src/sharedmemory_struct.h b/src/sharedmemory_struct.h
index c1f4430..a36382e 100644
--- a/src/sharedmemory_struct.h
+++ b/src/sharedmemory_struct.h
@@ -2,7 +2,7 @@ typedef struct
 {
 
   char username[121];
-  char ipaddress[46];
+  char ipaddress[INET6_ADDRSTRLEN];
   char channel[121];
   char os[121], release[121], os_version[121];
   int tcp_port, udp_port;