X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fplanetlab.c;h=d3669e38ecab6e404976a70b8175f4292f4e1bc1;hb=f925934b595e983e5f0d980402b72bac7dd8e927;hp=447c858f14249345da2ce242ab982879a82f712b;hpb=3b1cb457f4e28baac062f0fe6a87ff06ed4c02e0;p=util-vserver-pl.git

diff --git a/src/planetlab.c b/src/planetlab.c
index 447c858..d3669e3 100644
--- a/src/planetlab.c
+++ b/src/planetlab.c
@@ -43,6 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <unistd.h>
 #include <ctype.h>
 #include <sys/resource.h>
+#include <sys/types.h>
 #include <fcntl.h>
 #define _GNU_SOURCE 
 #include <sched.h>
@@ -50,6 +51,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "vserver.h"
 #include "planetlab.h"
 
+/* defined in netns.c */
+extern uint32_t get_space_flag(xid_t);
+
 #ifndef VC_NXC_RAW_SOCKET
 #  define VC_NXC_RAW_SOCKET	0x00000200ull
 #endif
@@ -89,8 +93,6 @@ tag:
   if (vc_tag_create(ctx) == VC_NOCTX)
     return -1;
 
-process:
-
   /*
    * Create context info - this sets the STATE_SETUP and STATE_INIT flags.
    */
@@ -99,7 +101,7 @@ process:
 
     if (unshare_flags != 0) {
       unshare(unshare_flags);
-      unshare_flags |= vc_space_mask();
+      unshare_flags |= vc_get_space_mask();
       vc_set_namespace(ctx, unshare_flags);
   }
 
@@ -196,7 +198,7 @@ pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr)
       /* Unshare the net namespace if the slice if requested in the local slice configuration */
       unshare_flags = get_space_flag(ctx);
       if (unshare_flags != 0) {
-          unshare|=vc_space_flags();
+          unshare_flags |=vc_get_space_mask();
           vc_enter_namespace(ctx, unshare_flags);
       }
 
@@ -300,6 +302,10 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
     {"rlimits/openfd.soft", TYPE_LONG, &slr->vs_openfd.soft},
     {"rlimits/openfd.min", TYPE_LONG, &slr->vs_openfd.min},
 
+    {"rlimits/memlock.hard", TYPE_LONG, &slr->vs_memlock.hard},
+    {"rlimits/memlock.soft", TYPE_LONG, &slr->vs_memlock.soft},
+    {"rlimits/memlock.min", TYPE_LONG, &slr->vs_memlock.min},
+
     {"personality", TYPE_PERS, &slr->personality},
 
     {0,0}
@@ -323,6 +329,10 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
   slr->vs_openfd.soft = VC_LIM_KEEP;
   slr->vs_openfd.min = VC_LIM_KEEP;
 
+  slr->vs_memlock.hard = VC_LIM_KEEP;
+  slr->vs_memlock.soft = VC_LIM_KEEP;
+  slr->vs_memlock.min = VC_LIM_KEEP;
+
   slr->personality = 0;
 
   cwd = open(".", O_RDONLY);
@@ -348,8 +358,13 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
 	buf[len-1]='\0';
 	len --;
       }
-      if ( (r->type == TYPE_LONG) && isdigit(*buf)) {
-	*r->limit = atoi(buf);
+      if (r->type == TYPE_LONG) {
+	int val;
+	char *res=0;
+	errno=0;
+	val = strtol(buf,&res,0);
+	if ( !( (val==0 && res) || (errno!=0) ) )
+	  *r->limit = val;
       } else if ( (r->type == TYPE_PERS) && isalpha(*buf)) {
 	unsigned long int res;
 	res = vc_str2personalitytype(buf,len);
@@ -362,7 +377,7 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
     fclose(fb);
   }
 
-  fchdir(cwd);
+  (void)fchdir(cwd);
 out_fd:
   close(cwd);
 out:
@@ -438,5 +453,6 @@ pl_set_ulimits(const struct sliver_resources *slr)
   set_one_ulimit(RLIMIT_AS, &slr->vs_as);
   set_one_ulimit(RLIMIT_NPROC, &slr->vs_nproc);
   set_one_ulimit(RLIMIT_NOFILE, &slr->vs_openfd);
+  set_one_ulimit(RLIMIT_MEMLOCK, &slr->vs_memlock);
   return set_personality(slr->personality);
 }