fixed defines

[umurmur.git] / src / sharedmemory.c

diff --git a/src/sharedmemory.c b/src/sharedmemory.c
index b4bfee58604de774280b083dfcdf32c5259c0470..c2b703ab5ba0697d13a7f7ffe5d0cefc661f0014 100644 (file)
--- a/src/sharedmemory.c
+++ b/src/sharedmemory.c
@@ -1,5 +1,8 @@
 #include "sharedmemory.h"\r
-#include "sharedmemory_global.h"\r
+\r
+int shm_fd;\r
+shm_t *shmptr = NULL;\r
+char shm_file_name[128];\r
 \r
 void Sharedmemory_init( int bindport, int bindport6 ) \r
 {\r
@@ -19,20 +22,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 +67,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
@@ -114,4 +117,4 @@ void Sharedmemory_deinit(void)
   close( shm_fd );\r
   shm_unlink( shm_file_name );\r
   shmptr->umurmurd_pid = 0;\r
-}
\ No newline at end of file
+}\r