X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fvserver-info.c;h=9683cbc029309d45bb6d8b083761e17ada146693;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=9a7d6e2056f6559002f310bece353339c13bb775;hpb=2822ba293eb308225c50d346930c47bf98d9927b;p=util-vserver.git

diff --git a/src/vserver-info.c b/src/vserver-info.c
index 9a7d6e2..9683cbc 100644
--- a/src/vserver-info.c
+++ b/src/vserver-info.c
@@ -1,4 +1,4 @@
-// $Id: vserver-info.c,v 1.23 2005/07/04 22:36:46 ensc Exp $    --*- c -*--
+// $Id: vserver-info.c 2589 2007-08-16 03:06:50Z dhozac $    --*- c -*--
 
 // Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -53,6 +53,7 @@ typedef enum { tgNONE,tgCONTEXT, tgID, tgRUNNING,
 	       tgXID, tgUTS, tgSYSINFO,
 	       tgFEATURE, tgCANONIFY,
 	       tgVERIFYCAP, tgXIDTYPE, tgVERIFYPROC,
+	       tgNID, tgTAG,
 }	VserverTag;
 
 static struct {
@@ -82,6 +83,8 @@ static struct {
   { "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" },
+  { "NID",         tgNID,         "outputs the network context-id of the given pid" },
+  { "TAG",         tgTAG,         "outputs the filesystem tag of the given pid" },
 };
 
 int wrapper_exit_code = 1;
@@ -230,13 +233,13 @@ getAPIVer(char *buf)
   return buf;
 }
 
-static char *
-getXid(char *buf, char const *pid_str)
+static inline char *
+getCtxId(char *buf, const char *pid_str, xid_t (*get_id)(pid_t pid), const char *err_str)
 {
   pid_t		pid = atoi(pid_str);
-  xid_t		xid = vc_get_task_xid(pid);
+  xid_t		xid = get_id(pid);
 
-  if (xid==VC_NOCTX) perror("vc_get_task_xid()");
+  if (xid==VC_NOCTX) perror(err_str);
   else {
     utilvserver_fmt_long(buf, xid);
     return buf;
@@ -245,6 +248,24 @@ getXid(char *buf, char const *pid_str)
   return 0;
 }
 
+static char *
+getXid(char *buf, char const *pid_str)
+{
+  return getCtxId(buf, pid_str, vc_get_task_xid, "vc_get_task_xid()");
+}
+
+static char *
+getNid(char *buf, const char *pid_str)
+{
+  return getCtxId(buf, pid_str, vc_get_task_nid, "vc_get_task_nid()");
+}
+
+static char *
+getTag(char *buf, const char *pid_str)
+{
+  return getCtxId(buf, pid_str, vc_get_task_tag, "vc_get_task_tag()");
+}
+
 static char *
 getPXid(char UNUSED *buf, char const UNUSED *vserver)
 {
@@ -320,6 +341,13 @@ getInitPid_emulated(char *buf, xid_t 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 *
@@ -427,7 +455,7 @@ static char *
 getContext(char *buf, char const *vserver, bool allow_only_static)
 {
   xid_t		xid = vc_getVserverCtx(vserver, vcCFG_AUTO,
-				       allow_only_static, 0);
+				       allow_only_static, 0, vcCTX_XID);
   if (xid==VC_NOCTX) return 0;
   
   utilvserver_fmt_long(buf, xid);
@@ -492,10 +520,10 @@ execQuery(char const *vserver, VserverTag tag, int argc, char *argv[])
       signed long		xid;	// type is a small hack, but should be ok...
       struct vc_vx_info		info;
 	
-      if (isNumber(vserver, &xid) && xid>=0)
+      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";
+	res = (vc_getVserverCtx(vserver, vcCFG_AUTO, false, 0, vcCTX_XID)==VC_NOCTX) ? 0 : "1";
       
       break;
     }
@@ -515,6 +543,8 @@ execQuery(char const *vserver, VserverTag tag, int argc, char *argv[])
     case tgFEATURE	:  return testFeature(argc,argv);      break;
     case tgVERIFYCAP	:  return verifyCap() ? 0 : 1;         break;
     case tgVERIFYPROC	:  return verifyProc() ? 0 : 1;        break;
+    case tgNID		:  res = getNid(buf, vserver);         break;
+    case tgTAG		:  res = getTag(buf, vserver);         break;
 
 
     default		: {
@@ -555,7 +585,7 @@ int main(int argc, char *argv[])
       default		:
 	WRITE_MSG(2, "Try '");
 	WRITE_STR(2, argv[0]);
-	WRITE_MSG(2, " --help\" for more information.\n");
+	WRITE_MSG(2, " --help' for more information.\n");
 	exit(1);
 	break;
     }