Last bit of code clean up, and bug fixes. Release?

[umurmur.git] / src / sharedmemory.c

diff --git a/src/sharedmemory.c b/src/sharedmemory.c
index 46f54f2b095d54311f82028cd7d8f36b648559b2..b4bfee58604de774280b083dfcdf32c5259c0470 100644 (file)
--- a/src/sharedmemory.c
+++ b/src/sharedmemory.c
@@ -1,40 +1,47 @@
 #include "sharedmemory.h"\r
 #include "sharedmemory_global.h"\r
 \r
-void Sharedmemory_init(void) \r
+void Sharedmemory_init( int bindport, int bindport6 ) \r
 {\r
+                 \r
+  int server_max_clients = getIntConf(MAX_CLIENTS);  \r
+  int shmtotal_size =  sizeof( shm_t  ) + (sizeof( shmclient_t ) * server_max_clients);\r
 \r
-  int bindport = getIntConf(BINDPORT);                //MJP BUG commandline option for address and port dont work this way going to have \r
-  int server_max_clients = getIntConf(MAX_CLIENTS);   //to bring them across as prameters to Sharedmemory_init(void)\r
-  int shmptr_size =  sizeof( shm_t  ) + (sizeof( shmclient_t ) * server_max_clients);\r
+  if( !bindport )\r
+  {\r
+    bindport = getIntConf(BINDPORT);  \r
+  }\r
 \r
-  sprintf( shm_file_name, "umurmurd:%i", bindport );\r
+  sprintf( shm_file_name, "/umurmurd:%i", bindport );\r
   Log_info("SHM_API: shm_fd=\"%s\"", shm_file_name  );\r
 \r
-               shm_fd = shm_open( shm_file_name, O_CREAT | O_RDWR, 0660 );\r
-                               if(shm_fd == -1)\r
-                               {\r
-                               Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno));\r
-                               exit(1);\r
-                               }  \r
+    shm_fd = shm_open( shm_file_name, O_CREAT | O_RDWR, 0660 );\r
+        if(shm_fd == -1)\r
+        {\r
+            Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno));\r
+            exit(1);\r
+        }  \r
 \r
-                               if( ftruncate( shm_fd, shmptr_size ) == -1 )\r
-                               {\r
-                               Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno));  \r
-                               exit(1);\r
-                               }\r
+        if( ftruncate( shm_fd, shmtotal_size ) == -1 )\r
+        {\r
+            Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno));  \r
+            exit(1);\r
+        }\r
+\r
+        shmptr = mmap(0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);\r
+        if (shmptr == (void *) -1) \r
+        {\r
+            Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno));\r
+            exit(1);\r
+        } \r
 \r
-                       shmptr = mmap(0, shmptr_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);\r
-                       if (shmptr == (void *) -1) \r
-                       {\r
-                               Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno));\r
-                               exit(1);\r
-                       } \r
+  memset( shmptr, 0, shmtotal_size );\r
 \r
-  memset( shmptr, 0, shmptr_size );\r
-                                       \r
   shmptr->umurmurd_pid = getpid();\r
-  shmptr->server_max_clients = server_max_clients;  \r
+  shmptr->server_max_clients = server_max_clients;   \r
+  shmptr->shmtotal_size = shmtotal_size;\r
+  shmptr->shmclient_size = sizeof( shmclient_t ) * shmptr->server_max_clients;                           \r
+ \r
 }\r
 \r
 void Sharedmemory_update(void) \r
@@ -44,7 +51,7 @@ void Sharedmemory_update(void)
   unsigned int cc = 0;\r
   client_t *client_itr = NULL;\r
 \r
-    memset( &shmptr->client[0], 0, sizeof( shmclient_t ) * shmptr->server_max_clients );\r
+    memset( &shmptr->client[0], 0, shmptr->shmclient_size );\r
     shmptr->clientcount = Client_count();\r
     \r
       if( shmptr->clientcount )\r
@@ -107,4 +114,4 @@ void Sharedmemory_deinit(void)
   close( shm_fd );\r
   shm_unlink( shm_file_name );\r
   shmptr->umurmurd_pid = 0;\r
-}\r
+}
\ No newline at end of file