Should've been part of the previous commit.
[util-vserver.git] / src / vsh.c
index 1cb0522..ee6ba76 100644 (file)
--- a/src/vsh.c
+++ b/src/vsh.c
@@ -27,8 +27,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <limits.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <syscall.h>
 #include <sys/mount.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/resource.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdarg.h>
 
 //--------------------------------------------------------------------
 #include "vserver.h"
+#include "planetlab.h"
 
 #undef CONFIG_VSERVER_LEGACY
 
-/* Null byte made explicit */
-#define NULLBYTE_SIZE                    1
-
 /* Base for all vserver roots for chroot */
 #define VSERVER_ROOT_BASE       "/vservers"
 
-static int
-_PERROR(const char *format, char *file, int line, int _errno, ...)
-{
-       va_list ap;
-
-       va_start(ap, _errno);
-       fprintf(stderr, "%s:%d: ", file, line);
-       vfprintf(stderr, format, ap);
-       if (_errno)
-               fprintf(stderr, ": %s (%d)", strerror(_errno), _errno);
-       fputs("\n", stderr);
-       fflush(stderr);
-
-       return _errno;
-}
-
-#define PERROR(format, args...) _PERROR(format, __FILE__, __LINE__, errno, ## args)
-
 /* Change to root:root (before entering new context) */
 static int setuidgid_root()
 {
@@ -198,75 +179,7 @@ static int sandbox_chroot(uid_t uid)
        return 0;
 }
 
-#define WHITESPACE(buffer,index,len)     \
-  while(isspace((int)buffer[index])) \
-       if (index < len) index++; else goto out;
-
-struct resources {
-       char *name;
-       int *limit;
-};
-
-#define VSERVERCONF "/etc/vservers/"
-static void get_limits(char *context, int *cpu, int *mem, int *task) {
-       FILE *fb;
-       size_t len = strlen(VSERVERCONF) + strlen(context) + strlen(".conf") + NULLBYTE_SIZE;
-       char *conf = (char *)malloc(len);       
-       struct resources list[] = 
-               {{"MEMLIMIT", mem},
-                {"CPULIMIT", cpu},
-                {"TASKLIMIT", task},
-                {0,0}};
-       struct resources *r;
-
-       sprintf(conf, "%s%s.conf", VSERVERCONF, context);
-
-       /* open the conf file for reading */
-       fb = fopen(conf,"r");
-       if (fb != NULL) {
-               size_t index;
-               char *buffer = malloc(1000);
-               char *p;
-
-               /* the conf file exist */ 
-               while((p=fgets(buffer,1000-1,fb))!=NULL) {
-                       index = 0;
-                       len = strnlen(buffer,1000);
-                       WHITESPACE(buffer,index,len);
-                       if (buffer[index] == '#') 
-                               continue;
-
-                       for (r=list; r->name; r++)
-                               if ((p=strstr(&buffer[index],r->name))!=NULL) {
-                                       /* adjust index into buffer */
-                                       index+= (p-&buffer[index])+strlen(r->name);
-
-                                       /* skip over whitespace */
-                                       WHITESPACE(buffer,index,len);
-
-                                       /* expecting to see = sign */
-                                       if (buffer[index++]!='=') goto out;
-
-                                       /* skip over whitespace */
-                                       WHITESPACE(buffer,index,len);
-
-                                       /* expecting to see a digit for number */
-                                       if (!isdigit((int)buffer[index])) goto out;
-
-                                       *r->limit = atoi(&buffer[index]);
-                                       break;
-                               }
-               }
-       out:
-               free(buffer);
-       } else {
-               fprintf(stderr,"cannot open %s\n",conf);
-       }
-       free(conf);
-}
-
-
-static int sandbox_processes(xid_t xid, char *context)
+static int sandbox_processes(xid_t ctx, char *context)
 {
 #ifdef CONFIG_VSERVER_LEGACY
        int     flags;
@@ -275,7 +188,7 @@ static int sandbox_processes(xid_t xid, char *context)
        flags |= 1; /* VX_INFO_LOCK -- cannot request a new vx_id */
        /* flags |= 4; VX_INFO_NPROC -- limit number of procs in a context */
 
-       (void) vc_new_s_context(xid, 0, flags);
+       (void) vc_new_s_context(ctx, 0, flags);
 
        /* use legacy dirty hack for capremove */
        if (vc_new_s_context(VC_SAMECTX, vc_get_insecurebcaps(), flags) == VC_NOCTX) {
@@ -284,62 +197,43 @@ static int sandbox_processes(xid_t xid, char *context)
                exit(1);
        }
 #else
-       struct vc_ctx_caps caps;
-       struct vc_ctx_flags flags;
-       int cpu = VC_LIM_KEEP;
-       int mem = VC_LIM_KEEP;
-       int task = VC_LIM_KEEP;
-       get_limits(context,&cpu, &mem, &task);
-       (void) (sandbox_chroot(xid));
-
-       caps.ccaps = ~vc_get_insecureccaps();
-       caps.cmask = ~0ull;
-       caps.bcaps = ~vc_get_insecurebcaps();
-       caps.bmask = ~0ull;
-
-       flags.flagword = VC_VXF_INFO_LOCK;
-       flags.mask = VC_VXF_STATE_SETUP | VC_VXF_INFO_LOCK;
-
-       errno = 0;
-       if ((vc_ctx_create(xid) == VC_NOCTX) && (errno != EEXIST)) {
-               PERROR("vc_ctx_create(%d)", xid);
-               exit(1);
-       }
-
-       if (errno != EEXIST) {
-               struct vc_rlimit limits;
-               /* The context did not exist before, which requires that we set the various limit */
-
-               /* CPU    */
-               /* not yet */
-
-               /* MEM    */
-               limits.min  = VC_LIM_KEEP;
-               limits.soft = VC_LIM_KEEP;
-               limits.hard = mem;
-               if (vc_set_rlimit(xid, 5, &limits)) {
-               }
-       
-               /* TASK   */
-               limits.min  = VC_LIM_KEEP;
-               limits.soft = VC_LIM_KEEP;
-               limits.hard = task;
-               if (vc_set_rlimit(xid, 6, &limits)) {
-                       /* setting limit failed */
-               }
-       }
-       
-       if (vc_set_ccaps(xid, &caps) == -1) {
-               PERROR("vc_set_ccaps(%d, 0x%16ullx/0x%16ullx, 0x%16ullx/0x%16ullx)\n",
-                      xid, caps.ccaps, caps.cmask, caps.bcaps, caps.bmask);
-               exit(1);
-       }
-
-       if (vc_set_cflags(xid, &flags) == -1) {
-               PERROR("vc_set_cflags(%d, 0x%16llx/0x%16llx)\n",
-                      xid, flags.flagword, flags.mask);
-               exit(1);
-       }
+       int  ctx_is_new;
+       struct sliver_resources slr;
+       char hostname[HOST_NAME_MAX+1];
+       pl_get_limits(context,&slr);
+
+       if (gethostname(hostname, sizeof hostname) == -1)
+         {
+           PERROR("gethostname(...)");
+           exit(1);
+         }
+
+       /* check whether the slice has been taken off of the whitelist */
+       if (slr.vs_whitelisted==0)
+         {
+           fprintf(stderr, "*** %s: %s has not been allocated resources on this node ***\n", hostname, context);
+           exit(0);
+         }
+
+       /* check whether the slice has been suspended */
+       if (slr.vs_cpu==0)
+         {
+           fprintf(stderr, "*** %s: %s has zero cpu resources and presumably it has been disabled/suspended ***\n", hostname, context);
+           exit(0);
+         }
+
+       (void) (sandbox_chroot(ctx));
+
+        if ((ctx_is_new = pl_chcontext(ctx, ~vc_get_insecurebcaps(),&slr)) < 0)
+          {
+            PERROR("pl_chcontext(%u)", ctx);
+            exit(1);
+          }
+       if (ctx_is_new)
+         {
+           pl_set_limits(ctx,&slr);
+           pl_setup_done(ctx);
+         }
 #endif
        return 0;
 }