tgINITPID, tgINITPID_PID,
tgXID, tgUTS, tgSYSINFO,
tgFEATURE, tgCANONIFY,
- tgVERIFYCAP,
+ tgVERIFYCAP, tgXIDTYPE, tgVERIFYPROC,
} VserverTag;
static struct {
{ "PXID", tgPXID, "returns the xid of the parent context" },
{ "CANONIFY", tgCANONIFY, "canonifies the vserver-name and removes dangerous characters" },
{ "VERIFYCAP", tgVERIFYCAP, "test if the kernel supports linux capabilities" },
+ { "VERIFYPROC", tgVERIFYPROC, "test if /proc can be read by contexts!=0" },
+ { "XIDTYPE", tgXIDTYPE, "returns the type of the given XID" },
};
int wrapper_exit_code = 1;
}
static bool
+verifyProc()
+{
+ char const *errptr;
+
+ if (!switchToWatchXid(&errptr)) {
+ perror(errptr);
+ return false;
+ }
+
+ if (access("/proc/uptime", R_OK)==-1) {
+ if (errno!=ENOENT)
+ perror("access(\"/proc/uptime\")");
+
+ return false;
+ }
+
+ return true;
+}
+
+static bool
verifyCap()
{
struct __user_cap_header_struct header;
}
static char *
-getXid(char *buf, char const *vserver)
+getXid(char *buf, char const *pid_str)
{
- pid_t pid = atoi(vserver);
+ pid_t pid = atoi(pid_str);
xid_t xid = vc_get_task_xid(pid);
if (xid==VC_NOCTX) perror("vc_get_task_xid()");
return 0;
}
+#else // VC_ENABLE_API_COMPAT
+static char *
+getInitPid_emulated(char UNUSED *buf, xid_t UNUSED xid)
+{
+ WRITE_MSG(2, "tools were built without compat API, getInitPid() not available\n");
+ return 0;
+}
#endif // VC_ENABLE_API_COMPAT
static char *
return buf;
}
+static char const *
+getXIDType(xid_t xid, int argc, char *argv[])
+{
+ char const * tp;
+
+ switch (vc_getXIDType(xid)) {
+ case vcTYPE_INVALID : tp = "invalid"; break;
+ case vcTYPE_MAIN : tp = "main"; break;
+ case vcTYPE_WATCH : tp = "watch"; break;
+ case vcTYPE_STATIC : tp = "static"; break;
+ case vcTYPE_DYNAMIC : tp = "dynamic"; break;
+ default : tp = 0; break;
+ }
+
+ if (argc==0 || tp==0)
+ return tp;
+
+ while (argc>0) {
+ --argc;
+ if (strcasecmp(argv[argc], tp)==0) return tp;
+ }
+
+ return 0;
+}
+
static int
testFeature(int argc, char *argv[])
{
static bool
str2bool(char const *str)
{
- return atoi(str)!=0 || strchr("yYtY", str[0])!=0 || strcasecmp("true", str)==0;
+ return atoi(str)!=0 || strchr("yYtT", str[0])!=0 || strcasecmp("true", str)==0;
}
static int
res = vc_getVserverAppDir(vserver, vcCFG_AUTO, argc==0 ? "" : argv[0]);
break;
- case tgRUNNING :
- res = (vc_getVserverCtx(vserver, vcCFG_AUTO, false, 0)==VC_NOCTX) ? 0 : "1";
+ case tgRUNNING : {
+ signed long xid; // type is a small hack, but should be ok...
+ struct vc_vx_info info;
+
+ if (isNumber(vserver, &xid, true) && xid>=0)
+ res = (vc_get_vx_info(xid, &info)==-1) ? 0 : "1";
+ else
+ res = (vc_getVserverCtx(vserver, vcCFG_AUTO, false, 0)==VC_NOCTX) ? 0 : "1";
+
break;
+ }
case tgCANONIFY :
strcpy(buf, vserver);
case tgSYSINFO : return printSysInfo(buf); break;
case tgFEATURE : return testFeature(argc,argv); break;
case tgVERIFYCAP : return verifyCap() ? 0 : 1; break;
+ case tgVERIFYPROC : return verifyProc() ? 0 : 1; break;
default : {
case tgID : res = vc_getVserverByCtx(xid,0,0); break;
case tgINITPID : res = getInitPid(buf, xid); break;
case tgUTS : res = getUTS(buf, xid, argc, argv); break;
+ case tgXIDTYPE : res = getXIDType(xid, argc, argv); break;
default : assert(false); abort(); // TODO
}