merge trellis branch to trunk.

[util-vserver-pl.git] / src / planetlab.h

diff --git a/src/planetlab.h b/src/planetlab.h
index 3946640..7127c3a 100644 (file)
--- a/src/planetlab.h
+++ b/src/planetlab.h
@@ -45,15 +45,15 @@ struct sliver_resources {
   struct vc_rlimit vs_rss;
   struct vc_rlimit vs_as;
   struct vc_rlimit vs_nproc;
-  struct vc_rlimit vs_nofile;
-  struct vc_rlimit vs_memlock;
+  struct vc_rlimit vs_openfd;
   unsigned long int personality;
 };
 
 int adjust_lim(const struct vc_rlimit *vcr, struct rlimit *lim);
 
 int
-pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr);
+pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr, 
+            int unshare_netns);
 
 int
 pl_setup_done(xid_t ctx);
@@ -67,6 +67,9 @@ pl_setsched(xid_t ctx, uint32_t cpu_min, uint32_t cpu_share);
 void pl_get_limits(const char *, struct sliver_resources *);
 int pl_set_ulimits(const struct sliver_resources *);
 
+/* For network namespaces */
+int pl_unshare_netns(xid_t xid);
+
 static inline int
 _PERROR(const char *format, char *file, int line, int _errno, ...)
 {