X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;h=2a102462d923b5e365d5b31adda10e03029261cc;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=9d76a70ce0e2b150563d55dac6c68525d02f67c0;hpb=00c758e9abd4453bb7bcf2838deaad95bdb62184;p=util-vserver.git

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 9d76a70..2a10246 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -4,17 +4,17 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met: 
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
       
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution.
       
-    * Neither the name of the copyright holder nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
       
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -33,114 +33,159 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <Python.h>
 
-#include "config.h"
-#include "compat.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <string.h>
-#include <sys/ioctl.h>
+#include <stdint.h>
+#include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <unistd.h>
-#include <stdint.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <ifaddrs.h>
+#include <stddef.h>
+#include <fcntl.h>
+#include <sys/mount.h>
+#include <utmp.h>
 
+#include "config.h"
 #include "pathconfig.h"
+#include "virtual.h"
 #include "vserver.h"
+#include "planetlab.h"
 #include "vserver-internal.h"
-#include "sched_cmd.h"
-#include "virtual.h"
 
-#define MEF_DEBUG 1
+static inline PyObject *inc_and_ret_none(void)
+{
+  Py_INCREF(Py_None);
+  return Py_None;
+}
+
+#define NONE  inc_and_ret_none()
+
 /*
  * context create
  */
 static PyObject *
 vserver_chcontext(PyObject *self, PyObject *args)
 {
-	xid_t xid, ctx;
-	struct vc_ctx_caps caps;
-	struct vc_ctx_flags flags;
-	struct vc_vx_info vc;
-	unsigned long long v;
-
-	v = VC_VXF_STATE_SETUP;
-	if (!PyArg_ParseTuple(args, "I|K", &ctx, &v))
-		return NULL;
-
-	caps.ccaps = ~vc_get_insecureccaps();
-	caps.cmask = ~0ull;
-	caps.bcaps = ~vc_get_insecurebcaps();
-	caps.bmask = ~0ull;
-
-	xid = VC_NOCTX;
-	if (vc_get_vx_info(ctx,&vc) != 0) {
-		xid = vc_ctx_create(ctx);
-		if (xid == VC_NOCTX && errno != EEXIST)
-			return PyErr_SetFromErrno(PyExc_OSError);
-	}
-
-	flags.mask = flags.flagword = v;
-	if (vc_set_cflags(ctx, &flags) == -1)
-		return PyErr_SetFromErrno(PyExc_OSError);
-
-	if (xid == VC_NOCTX && vc_ctx_migrate(ctx) == -1)
-		return PyErr_SetFromErrno(PyExc_OSError);
-
-#ifdef MEF_DEBUG
-	printf("vserver_create xid = %d(%d)\n",xid,ctx);
-#endif
-	return Py_None;
+  int  ctx_is_new;
+  xid_t  ctx;
+  uint_least64_t bcaps = 0;
+
+  if (!PyArg_ParseTuple(args, "I|K", &ctx, &bcaps))
+    return NULL;
+  bcaps |= ~vc_get_insecurebcaps();
+
+  if ((ctx_is_new = pl_chcontext(ctx, bcaps, 0)) < 0)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return PyBool_FromLong(ctx_is_new);
 }
 
 static PyObject *
-vserver_set_rlimit(PyObject *self, PyObject *args) {
-	struct vc_rlimit limits;
-	xid_t xid;
-	int resource;
-	PyObject *ret;
-
-	limits.min = VC_LIM_KEEP;
-	limits.soft = VC_LIM_KEEP;
-	limits.hard = VC_LIM_KEEP;
-
-	if (!PyArg_ParseTuple(args, "IiL", &xid, &resource, &limits.hard))
-		return NULL;
-
-	ret = Py_None;
-	if (vc_set_rlimit(xid, resource, &limits)) 
-		ret = PyErr_SetFromErrno(PyExc_OSError);
-	else if (vc_get_rlimit(xid, resource, &limits)==-1)
-		ret = PyErr_SetFromErrno(PyExc_OSError);
-	else
-		ret = Py_BuildValue("L",limits.hard);
-
-	return ret;
+vserver_setup_done(PyObject *self, PyObject *args)
+{
+  xid_t  ctx;
+
+  if (!PyArg_ParseTuple(args, "I", &ctx))
+    return NULL;
+
+  if (pl_setup_done(ctx) < 0)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
+}
+
+static PyObject *
+vserver_isrunning(PyObject *self, PyObject *args)
+{
+  xid_t  ctx;
+  PyObject *ret;
+  struct stat statbuf;
+  char fname[64];
+
+  if (!PyArg_ParseTuple(args, "I", &ctx))
+    return NULL;
+
+  sprintf(fname,"/proc/virtual/%d", ctx);
+
+  if(stat(&fname[0],&statbuf)==0)
+    ret = PyBool_FromLong(1);
+  else
+    ret = PyBool_FromLong(0);
+
+  return ret;
+}
+
+static PyObject *
+__vserver_get_rlimit(xid_t xid, int resource) {
+  struct vc_rlimit limits;
+  PyObject *ret;
+
+  errno = 0;
+  if (vc_get_rlimit(xid, resource, &limits)==-1)
+    ret = PyErr_SetFromErrno(PyExc_OSError);
+  else
+    ret = Py_BuildValue("LLL",limits.hard, limits.soft, limits.min);
+
+  return ret;
 }
 
 static PyObject *
 vserver_get_rlimit(PyObject *self, PyObject *args) {
-	struct vc_rlimit limits;
-	xid_t xid;
-	int resource;
-	PyObject *ret;
+  xid_t xid;
+  int resource;
+  PyObject *ret;
 
-	limits.min = VC_LIM_KEEP;
-	limits.soft = VC_LIM_KEEP;
-	limits.hard = VC_LIM_KEEP;
+  if (!PyArg_ParseTuple(args, "Ii", &xid, &resource))
+    ret = NULL;
+  else
+    ret = __vserver_get_rlimit(xid, resource);
 
-	if (!PyArg_ParseTuple(args, "Ii", &xid, &resource))
-		return NULL;
+  return ret;
+}
+
+static PyObject *
+vserver_set_rlimit(PyObject *self, PyObject *args) {
+  struct vc_rlimit limits;
+  struct rlimit lim;
+  xid_t xid;
+  int resource, lresource;
+  PyObject *ret;
+
+  limits.min = VC_LIM_KEEP;
+  limits.soft = VC_LIM_KEEP;
+  limits.hard = VC_LIM_KEEP;
+
+  if (!PyArg_ParseTuple(args, "IiLLL", &xid, &resource, &limits.hard, &limits.soft, &limits.min))
+    return NULL;
+
+  lresource = resource;
+  switch (resource) {
+  case VC_VLIMIT_NSOCK:
+  case VC_VLIMIT_ANON:
+  case VC_VLIMIT_SHMEM:
+    goto do_vc_set_rlimit;
+  case VC_VLIMIT_OPENFD:
+    lresource = RLIMIT_NOFILE;
+    break;
+  default:
+    break;
+  }
 
-	ret = Py_None;
-	if (vc_get_rlimit(xid, resource, &limits)==-1)
-		ret = PyErr_SetFromErrno(PyExc_OSError);
-	else
-		ret = Py_BuildValue("L",limits.hard);
+  getrlimit(lresource,&lim);
+  if (adjust_lim(&limits,&lim)) {
+    setrlimit(lresource, &lim);
+  }
+
+ do_vc_set_rlimit:
+  errno = 0;
+  if (vc_set_rlimit(xid, resource, &limits)==-1) 
+    ret = PyErr_SetFromErrno(PyExc_OSError);
+  else
+    ret = __vserver_get_rlimit(xid, resource);
 
-	return ret;
+  return ret;
 }
 
 /*
@@ -149,122 +194,517 @@ vserver_get_rlimit(PyObject *self, PyObject *args) {
 static PyObject *
 vserver_setsched(PyObject *self, PyObject *args)
 {
-  xid_t  xid;
-  struct vc_set_sched sched;
-  struct vc_ctx_flags flags;
-  unsigned cpuguaranteed = 0;
-
-  sched.set_mask = (VC_VXSM_FILL_RATE | 
-		    VC_VXSM_INTERVAL | 
-		    VC_VXSM_TOKENS_MIN | 
-		    VC_VXSM_TOKENS_MAX);
-
-  if (!PyArg_ParseTuple(args, "I|I|I|I|I|I|I", &xid, 
-			&sched.fill_rate,
-			&sched.interval,
-			&sched.tokens,
-			&sched.tokens_min,
-			&sched.tokens_max,
-			&cpuguaranteed))
+  xid_t  ctx;
+  uint32_t  cpu_share;
+  uint32_t  cpu_sched_flags = VC_VXF_SCHED_FLAGS;
+
+  if (!PyArg_ParseTuple(args, "II|I", &ctx, &cpu_share, &cpu_sched_flags))
     return NULL;
 
-  flags.flagword = VC_VXF_SCHED_HARD;
-  flags.mask |= VC_VXF_SCHED_HARD;
-#define VC_VXF_SCHED_SHARE       0x00000800ull
-  if (cpuguaranteed==0) {
-	  flags.flagword |= VC_VXF_SCHED_SHARE;
-	  flags.mask |= VC_VXF_SCHED_SHARE;
+  /* ESRCH indicates that there are no processes in the context */
+  if (pl_setsched(ctx, cpu_share, cpu_sched_flags) &&
+      errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
+}
+
+static PyObject *
+vserver_get_dlimit(PyObject *self, PyObject *args)
+{
+  PyObject *res;
+  char* path;
+  unsigned xid;
+  struct vc_ctx_dlimit data;
+  int r;
+
+  if (!PyArg_ParseTuple(args, "si", &path,&xid))
+    return NULL;
+
+  memset(&data, 0, sizeof(data));
+  r = vc_get_dlimit(path, xid, 0, &data);
+  if (r>=0) {
+    res = Py_BuildValue("(i,i,i,i,i)",
+			data.space_used,
+			data.space_total,
+			data.inodes_used,
+			data.inodes_total,
+			data.reserved);
+  } else {
+    res = PyErr_SetFromErrno(PyExc_OSError);
   }
 
-  if (vc_set_cflags(xid, &flags) == -1)
-	  return PyErr_SetFromErrno(PyExc_OSError);
+  return res;
+}
 
-  if (vc_set_sched(xid, &sched) == -1)
-	  return PyErr_SetFromErrno(PyExc_OSError);
 
-  return Py_None;
+static PyObject *
+vserver_set_dlimit(PyObject *self, PyObject *args)
+{
+  char* path;
+  unsigned xid;
+  struct vc_ctx_dlimit data;
+
+  memset(&data,0,sizeof(data));
+  if (!PyArg_ParseTuple(args, "siiiiii", &path,
+			&xid,
+			&data.space_used,
+			&data.space_total,
+			&data.inodes_used,
+			&data.inodes_total,
+			&data.reserved))
+    return NULL;
+
+  if ((vc_add_dlimit(path, xid, 0) && errno != EEXIST) ||
+      vc_set_dlimit(path, xid, 0, &data))
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;	
 }
 
-/*
- * setsched
- */
+static PyObject *
+vserver_unset_dlimit(PyObject *self, PyObject *args)
+{
+  char  *path;
+  unsigned  xid;
+
+  if (!PyArg_ParseTuple(args, "si", &path, &xid))
+    return NULL;
+
+  if (vc_rem_dlimit(path, xid, 0) && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;	
+}
 
 static PyObject *
-vserver_get_dlimit(PyObject *self, PyObject *args)
+vserver_killall(PyObject *self, PyObject *args)
+{
+  xid_t	ctx;
+  int	sig;
+  struct vc_ctx_flags cflags = {
+    .flagword = 0,
+    .mask = VC_VXF_PERSISTENT
+  };
+  struct vc_net_flags nflags = {
+    .flagword = 0,
+    .mask = VC_NXF_PERSISTENT
+  };
+
+  if (!PyArg_ParseTuple(args, "Ii", &ctx, &sig))
+    return NULL;
+
+  if (vc_ctx_kill(ctx, 0, sig) && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  if (vc_set_cflags(ctx, &cflags) && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  if (vc_set_nflags(ctx, &nflags) && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
+}
+
+static PyObject *
+vserver_set_bcaps(PyObject *self, PyObject *args)
 {
-	PyObject *res;
-	char* path;
-	unsigned xid;
-	struct vcmd_ctx_dlimit_v0 data;
-	int r;
-
-	if (!PyArg_ParseTuple(args, "si", &path,&xid))
-		return NULL;
-
-	memset(&data, 0, sizeof(data));
-	data.name = path;
-	data.flags = 0;
-	r = vserver(VCMD_get_dlimit, xid, &data);
-	if (r>=0) {
-		res = Py_BuildValue("(i,i,i,i,i)",
-				    data.space_used,
-				    data.space_total,
-				    data.inodes_used,
-				    data.inodes_total,
-				    data.reserved);
-	} else {
-		res = PyErr_SetFromErrno(PyExc_OSError);
-	}
-
-	return res;
+  xid_t ctx;
+  struct vc_ctx_caps caps;
+
+  if (!PyArg_ParseTuple(args, "IK", &ctx, &caps.bcaps))
+    return NULL;
+
+  caps.bmask = vc_get_insecurebcaps();
+  caps.cmask = caps.ccaps = 0;
+  if (vc_set_ccaps(ctx, &caps) == -1 && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
 }
 
+static PyObject *
+vserver_text2bcaps(PyObject *self, PyObject *args)
+{
+  struct vc_ctx_caps caps = { .bcaps = 0 };
+  const char *list;
+  int len;
+  struct vc_err_listparser err;
+
+  if (!PyArg_ParseTuple(args, "s#", &list, &len))
+    return NULL;
+
+  vc_list2bcap(list, len, &err, &caps);
+
+  return Py_BuildValue("K", caps.bcaps);
+}
 
 static PyObject *
-vserver_set_dlimit(PyObject *self, PyObject *args)
+vserver_get_bcaps(PyObject *self, PyObject *args)
 {
-	char* path;
-	unsigned xid;
-	struct vcmd_ctx_dlimit_base_v0 init;
-	struct vcmd_ctx_dlimit_v0 data;
-
-	memset(&data,0,sizeof(data));
-	if (!PyArg_ParseTuple(args, "siiiiii", &path,
-			      &xid,
-			      &data.space_used,
-			      &data.space_total,
-			      &data.inodes_used,
-			      &data.inodes_total,
-			      &data.reserved))
-		return NULL;
-
-	data.name = path;
-	data.flags = 0;
-
-	memset(&init, 0, sizeof(init));
-	init.name = path;
-	init.flags = 0;
-
-	if ((vserver(VCMD_add_dlimit, xid, &init) && errno != EEXIST) ||
-            vserver(VCMD_set_dlimit, xid, &data))
-          return PyErr_SetFromErrno(PyExc_OSError);
-
-	return Py_None;	
+  xid_t ctx;
+  struct vc_ctx_caps caps;
+
+  if (!PyArg_ParseTuple(args, "I", &ctx))
+    return NULL;
+
+  if (vc_get_ccaps(ctx, &caps) == -1) {
+    if (errno != -ESRCH)
+      return PyErr_SetFromErrno(PyExc_OSError);
+    else
+      caps.bcaps = 0;
+  }
+
+  return Py_BuildValue("K", caps.bcaps & vc_get_insecurebcaps());
+}
+
+static PyObject *
+vserver_bcaps2text(PyObject *self, PyObject *args)
+{
+  struct vc_ctx_caps caps = { .bcaps = 0 };
+  PyObject *list;
+  const char *cap;
+
+  if (!PyArg_ParseTuple(args, "K", &caps.bcaps))
+    return NULL;
+
+  list = PyString_FromString("");
+
+  while ((cap = vc_lobcap2text(&caps.bcaps)) != NULL) {
+    if (list == NULL)
+      break;
+    PyString_ConcatAndDel(&list, PyString_FromFormat(
+			  (PyString_Size(list) > 0 ? ",CAP_%s" : "CAP_%s" ),
+			  cap));
+  }
+
+  return list;
+}
+
+static inline int
+convert_address(const char *str, struct vc_net_addr *addr)
+{
+  void *dst;
+  if (inet_pton(AF_INET6, str, addr->vna_v6_ip.s6_addr) > 0) {
+    addr->vna_type = VC_NXA_TYPE_IPV6;
+    return 0;
+  }
+  else if (inet_pton(AF_INET, str, &addr->vna_v4_ip.s_addr) > 0) {
+    addr->vna_type = VC_NXA_TYPE_IPV4;
+    return 0;
+  }
+  return -1;
+}
+
+static int
+mask_to_prefix(void *data, int limit)
+{
+  uint8_t *mask = data;
+  int prefix;
+  for (prefix = 0; prefix < limit && mask[prefix >> 3] & (1 << (prefix & 0x07)); prefix++)
+    ;
+  return prefix;
+}
+
+static int
+get_mask(struct vc_net_addr *addr)
+{
+  struct ifaddrs *head, *ifa;
+  int ret = 0;
+  int family, offset, len;
+  void *ip;
+
+  switch (addr->vna_type) {
+  case VC_NXA_TYPE_IPV4:
+    family = AF_INET;
+    offset = offsetof(struct sockaddr_in,  sin_addr.s_addr);
+    ip = &addr->vna_v4_ip.s_addr;
+    len = 4;
+    addr->vna_v4_mask.s_addr = htonl(0xffffff00);
+    addr->vna_prefix = 24;
+    break;
+  case VC_NXA_TYPE_IPV6:
+    family = AF_INET6;
+    offset = offsetof(struct sockaddr_in6, sin6_addr.s6_addr);
+    ip = addr->vna_v6_ip.s6_addr;
+    len = 16;
+    addr->vna_v6_mask.s6_addr32[9] = addr->vna_v6_mask.s6_addr32[1] = 0xffffffff;
+    addr->vna_v6_mask.s6_addr32[2] = addr->vna_v6_mask.s6_addr32[3] = 0x00000000;
+    addr->vna_prefix = 64;
+    break;
+  default:
+    errno = -EINVAL;
+    return -1;
+  }
+
+  if (getifaddrs(&head) == -1)
+    return -1;
+  for (ifa = head; ifa; ifa = ifa->ifa_next) {
+    if (ifa->ifa_addr->sa_family == family &&
+        memcmp((char *) ifa->ifa_addr + offset, ip, len) == 0) {
+      switch (addr->vna_type) {
+      case VC_NXA_TYPE_IPV4:
+	memcpy(&addr->vna_v4_mask.s_addr, ifa->ifa_netmask + offset, len);
+	addr->vna_prefix = mask_to_prefix(&addr->vna_v4_mask.s_addr, 32);
+	break;
+      case VC_NXA_TYPE_IPV6:
+	memcpy(addr->vna_v6_mask.s6_addr, ifa->ifa_netmask + offset, len);
+	addr->vna_prefix = mask_to_prefix(addr->vna_v6_mask.s6_addr, 128);
+	break;
+      }
+      ret = 1;
+      break;
+    }
+  }
+  freeifaddrs(head);
+  return ret;
+}
+
+/* XXX These two functions are really similar */
+static PyObject *
+vserver_net_add(PyObject *self, PyObject *args)
+{
+  struct vc_net_addr addr;
+  nid_t nid;
+  const char *ip;
+
+  if (!PyArg_ParseTuple(args, "Is", &nid, &ip))
+    return NULL;
+
+  if (convert_address(ip, &addr) == -1)
+    return PyErr_Format(PyExc_ValueError, "%s is not a valid IP address", ip);
+
+  switch (get_mask(&addr)) {
+  case -1:
+    return PyErr_SetFromErrno(PyExc_OSError);
+  case 0:
+    /* XXX error here? */
+    break;
+  }
+  addr.vna_type |= VC_NXA_TYPE_ADDR;
+
+  if (vc_net_add(nid, &addr) == -1 && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
+}
+
+static PyObject *
+vserver_net_remove(PyObject *self, PyObject *args)
+{
+  struct vc_net_addr addr;
+  nid_t nid;
+  const char *ip;
+
+  if (!PyArg_ParseTuple(args, "Is", &nid, &ip))
+    return NULL;
+
+  if (strcmp(ip, "all") == 0)
+    addr.vna_type = VC_NXA_TYPE_ANY;
+  else if (strcmp(ip, "all4") == 0)
+    addr.vna_type = VC_NXA_TYPE_IPV6 | VC_NXA_TYPE_ANY;
+  else if (strcmp(ip, "all6") == 0)
+    addr.vna_type = VC_NXA_TYPE_IPV6 | VC_NXA_TYPE_ANY;
+  else {
+    if (convert_address(ip, &addr) == -1)
+      return PyErr_Format(PyExc_ValueError, "%s is not a valid IP address", ip);
+    addr.vna_type |= VC_NXA_TYPE_ADDR;
+  }
+
+  switch (get_mask(&addr)) {
+  case -1:
+    return PyErr_SetFromErrno(PyExc_OSError);
+  }
+
+  if (vc_net_remove(nid, &addr) == -1 && errno != ESRCH)
+    return PyErr_SetFromErrno(PyExc_OSError);
+
+  return NONE;
+}
+
+struct secure_dirs {
+  int host_fd;
+  int cwd_fd;
+  int guest_fd;
+  int target_fd;
+};
+
+static inline int
+fchroot(int fd)
+{
+  if (fchdir(fd) == -1 || chroot(".") == -1)
+    return -1;
+  return 0;
+}
+
+static inline int
+restore_dirs(struct secure_dirs *dirs)
+{
+  if (dirs->host_fd != -1) {
+    if (fchroot(dirs->host_fd) == -1)
+      return -1;
+    if (close(dirs->host_fd) == -1)
+      return -1;
+  }
+  if (dirs->guest_fd != -1) {
+    if (close(dirs->guest_fd) == -1)
+      return -1;
+  }
+  if (dirs->target_fd != -1) {
+    if (close(dirs->target_fd) == -1)
+      return -1;
+  }
+  if (dirs->cwd_fd != -1) {
+    if (fchdir(dirs->cwd_fd) == -1)
+      return -1;
+    if (close(dirs->cwd_fd) == -1)
+      return -1;
+  }
+  return 0;
+}
+
+static inline int
+secure_chdir(struct secure_dirs *dirs, const char *guest, const char *target)
+{
+  dirs->host_fd = dirs->cwd_fd = dirs->guest_fd = dirs->target_fd = -1;
+
+  dirs->host_fd = open("/", O_RDONLY|O_DIRECTORY);
+  if (dirs->host_fd == -1)
+    return -1;
+
+  dirs->cwd_fd = open(".", O_RDONLY|O_DIRECTORY);
+  if (dirs->cwd_fd == -1)
+    return -1;
+
+  dirs->guest_fd = open(guest, O_RDONLY|O_DIRECTORY);
+  if (dirs->guest_fd == -1)
+    return -1;
+  if (fchroot(dirs->guest_fd) == -1)
+    return -1;
+
+  dirs->target_fd = open(target, O_RDONLY|O_DIRECTORY);
+  if (dirs->target_fd == -1)
+    return -1;
+
+  if (fchroot(dirs->host_fd) == -1 || close(dirs->host_fd) == -1)
+    return -1;
+  dirs->host_fd = -1;
+  if (close(dirs->guest_fd) == -1)
+    return -1;
+  dirs->guest_fd = -1;
+
+  if (fchdir(dirs->target_fd) == -1 || close(dirs->target_fd) == -1)
+    return -1;
+
+  return 0;
+}
+
+static PyObject *
+vserver_mount(PyObject *self, PyObject *args)
+{
+  const char *guest, *target, *source, *type, *data = NULL;
+  unsigned long flags = 0;
+  struct secure_dirs dirs;
+
+  if (!PyArg_ParseTuple(args, "ssss|ks", &source, &guest, &target, &type,
+			&flags, &data))
+    return NULL;
+
+  if (secure_chdir(&dirs, guest, target) == -1)
+    goto out;
+  if (mount(source, ".", type, flags, data) == -1)
+    goto out;
+  restore_dirs(&dirs);
+
+  return NONE;
+
+out:
+  restore_dirs(&dirs);
+  return PyErr_SetFromErrno(PyExc_OSError);
+}
+
+static PyObject *
+vserver_umount(PyObject *self, PyObject *args)
+{
+  const char *guest, *target;
+  int flags = 0;
+  char *path;
+  PyObject *ret;
+
+  if (!PyArg_ParseTuple(args, "ss|i", &guest, &target, &flags))
+    return NULL;
+
+  path = calloc(strlen(guest) + strlen(target) + 2, sizeof(char));
+  sprintf(path, "%s/%s", guest, target);
+  if (umount2(path, flags) == -1)
+    ret = PyErr_SetFromErrno(PyExc_OSError);
+  else
+    ret = NONE;
+  free(path);
+
+  return ret;
+}
+
+static PyObject *
+vserver_set_runlevel(PyObject *self, PyObject *args)
+{
+  const char *file;
+  int runlevel;
+  struct utmp ut;
+
+  if (!PyArg_ParseTuple(args, "si", &file, &runlevel))
+    return NULL;
+
+  utmpname(file);
+  setutent();
+  memset(&ut, 0, sizeof(ut));
+  ut.ut_type = RUN_LVL;
+  ut.ut_pid = ('#' << 8) + runlevel + '0';
+  pututline(&ut);
+  endutent();
+
+  return NONE;
 }
 
 static PyMethodDef  methods[] = {
   { "chcontext", vserver_chcontext, METH_VARARGS,
     "chcontext to vserver with provided flags" },
+  { "setup_done", vserver_setup_done, METH_VARARGS,
+    "Release vserver setup lock" },
   { "setsched", vserver_setsched, METH_VARARGS,
     "Change vserver scheduling attributes for given vserver context" },
   { "setdlimit", vserver_set_dlimit, METH_VARARGS,
     "Set disk limits for given vserver context" },
+  { "unsetdlimit", vserver_unset_dlimit, METH_VARARGS,
+    "Remove disk limits for given vserver context" },
   { "getdlimit", vserver_get_dlimit, METH_VARARGS,
     "Get disk limits for given vserver context" },
   { "setrlimit", vserver_set_rlimit, METH_VARARGS,
     "Set resource limits for given resource of a vserver context" },
   { "getrlimit", vserver_get_rlimit, METH_VARARGS,
     "Get resource limits for given resource of a vserver context" },
+  { "killall", vserver_killall, METH_VARARGS,
+    "Send signal to all processes in vserver context" },
+  { "isrunning", vserver_isrunning, METH_VARARGS,
+    "Check if vserver is running"},
+  { "setbcaps", vserver_set_bcaps, METH_VARARGS,
+    "Set POSIX capabilities of a vserver context" },
+  { "getbcaps", vserver_get_bcaps, METH_VARARGS,
+    "Get POSIX capabilities of a vserver context" },
+  { "text2bcaps", vserver_text2bcaps, METH_VARARGS,
+    "Translate a string of capabilities to a bitmap" },
+  { "bcaps2text", vserver_bcaps2text, METH_VARARGS,
+    "Translate a capability-bitmap into a string" },
+  { "netadd", vserver_net_add, METH_VARARGS,
+    "Assign an IP address to a context" },
+  { "netremove", vserver_net_remove, METH_VARARGS,
+    "Remove IP address(es) from a context" },
+  { "mount", vserver_mount, METH_VARARGS,
+    "Perform the mount() system call" },
+  { "umount", vserver_umount, METH_VARARGS,
+    "Perform the umount2() system call" },
+  { "setrunlevel", vserver_set_runlevel, METH_VARARGS,
+    "Set the runlevel in utmp" },
   { NULL, NULL, 0, NULL }
 };
 
@@ -281,6 +721,29 @@ initvserverimpl(void)
   /* export the default vserver directory */
   PyModule_AddStringConstant(mod, "VSERVER_BASEDIR", DEFAULT_VSERVERDIR);
 
-  /* export a constant to indicate unchanged disk quota values */
-  PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)CDLIM_KEEP);
+  /* export limit-related constants */
+  PyModule_AddIntConstant(mod, "DLIMIT_KEEP", (int)VC_CDLIM_KEEP);
+  PyModule_AddIntConstant(mod, "DLIMIT_INF", (int)VC_CDLIM_INFINITY);
+  PyModule_AddIntConstant(mod, "VC_LIM_KEEP", (int)VC_LIM_KEEP);
+
+  PyModule_AddIntConstant(mod, "RLIMIT_CPU", (int)RLIMIT_CPU);
+  PyModule_AddIntConstant(mod, "RLIMIT_RSS", (int)RLIMIT_RSS);
+  PyModule_AddIntConstant(mod, "RLIMIT_NPROC", (int)RLIMIT_NPROC);
+  PyModule_AddIntConstant(mod, "RLIMIT_NOFILE", (int)RLIMIT_NOFILE);
+  PyModule_AddIntConstant(mod, "RLIMIT_MEMLOCK", (int)RLIMIT_MEMLOCK);
+  PyModule_AddIntConstant(mod, "RLIMIT_AS", (int)RLIMIT_AS);
+  PyModule_AddIntConstant(mod, "RLIMIT_LOCKS", (int)RLIMIT_LOCKS);
+
+  PyModule_AddIntConstant(mod, "RLIMIT_SIGPENDING", (int)RLIMIT_SIGPENDING);
+  PyModule_AddIntConstant(mod, "RLIMIT_MSGQUEUE", (int)RLIMIT_MSGQUEUE);
+
+  PyModule_AddIntConstant(mod, "VLIMIT_NSOCK", (int)VC_VLIMIT_NSOCK);
+  PyModule_AddIntConstant(mod, "VLIMIT_OPENFD", (int)VC_VLIMIT_OPENFD);
+  PyModule_AddIntConstant(mod, "VLIMIT_ANON", (int)VC_VLIMIT_ANON);
+  PyModule_AddIntConstant(mod, "VLIMIT_SHMEM", (int)VC_VLIMIT_SHMEM);
+
+  /* scheduler flags */
+  PyModule_AddIntConstant(mod,
+			  "VS_SCHED_CPU_GUARANTEED",
+			  VS_SCHED_CPU_GUARANTEED);
 }