Add extern to *_main global variable declarations in header files.

[vpp.git] / src / svm / ssvm.c

diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c
index 23e3cf4..c04982d 100644 (file)
--- a/src/svm/ssvm.c
+++ b/src/svm/ssvm.c
@@ -13,10 +13,12 @@
  * limitations under the License.
  */
 #include "ssvm.h"
+#include "svm_common.h"
 
 int
 ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
 {
+  svm_main_region_t *smr = svm_get_root_rp ()->data_base;
   int ssvm_fd;
   u8 *ssvm_filename;
   u8 junk = 0;
@@ -32,6 +34,7 @@ ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
   if (CLIB_DEBUG > 1)
     clib_warning ("[%d] creating segment '%s'", getpid (), ssvm->name);
 
+  ASSERT (vec_c_string_is_terminated (ssvm->name));
   ssvm_filename = format (0, "/dev/shm/%s%c", ssvm->name, 0);
 
   unlink ((char *) ssvm_filename);
@@ -46,6 +49,11 @@ ssvm_master_init (ssvm_private_t * ssvm, u32 master_index)
       return SSVM_API_ERROR_CREATE_FAILURE;
     }
 
+  if (fchmod (ssvm_fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP) < 0)
+    clib_unix_warning ("ssvm segment chmod");
+  if (fchown (ssvm_fd, smr->uid, smr->gid) < 0)
+    clib_unix_warning ("ssvm segment chown");
+
   if (lseek (ssvm_fd, ssvm->ssvm_size, SEEK_SET) < 0)
     {
       clib_unix_warning ("lseek");
@@ -110,6 +118,7 @@ ssvm_slave_init (ssvm_private_t * ssvm, int timeout_in_seconds)
   int ssvm_fd = -1;
   ssvm_shared_header_t *sh;
 
+  ASSERT (vec_c_string_is_terminated (ssvm->name));
   ssvm->i_am_master = 0;
 
   while (timeout_in_seconds-- > 0)