X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fgetxidtype.c;h=8bc2be4ac3bc44427c148e90fd98846c9fbd342c;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=a5c04638c53e05a95725d5e4a5ebbbb4371479fa;hpb=3f3cf95f755f3ef1c31ad8e38153deb4ee214c66;p=util-vserver.git

diff --git a/lib/getxidtype.c b/lib/getxidtype.c
index a5c0463..8bc2be4 100644
--- a/lib/getxidtype.c
+++ b/lib/getxidtype.c
@@ -1,4 +1,4 @@
-// $Id: getxidtype.c,v 1.1 2005/03/09 14:38:51 ensc Exp $    --*- c -*--
+// $Id: getxidtype.c 2493 2007-02-10 15:06:07Z dhozac $    --*- c -*--
 
 // Copyright (C) 2005 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -21,14 +21,21 @@
 #endif
 
 #include "vserver.h"
-#include "virtual.h"
+#include "internal.h"
 
 vcXidType
 vc_getXIDType(xid_t xid)
 {
-  if (xid==0)                                  return vcTYPE_MAIN;
-  if (xid==1)                                  return vcTYPE_WATCH;
-  if (xid>1              && xid<MIN_D_CONTEXT) return vcTYPE_STATIC;
-  if (xid>=MIN_D_CONTEXT && xid<MAX_S_CONTEXT) return vcTYPE_DYNAMIC;
+  static xid_t	MIN_D_CONTEXT = 0;
+  const xid_t	MAX_S_CONTEXT = 65535;
+  if (MIN_D_CONTEXT == 0 && (utilvserver_checkCompatConfig() & VC_VCI_NO_DYNAMIC) == 0)
+    MIN_D_CONTEXT = 49152;
+  else
+    MIN_D_CONTEXT = MAX_S_CONTEXT+1;
+
+  if (xid==0)					return vcTYPE_MAIN;
+  if (xid==1)					return vcTYPE_WATCH;
+  if (xid>1              && xid<MIN_D_CONTEXT)	return vcTYPE_STATIC;
+  if (xid>=MIN_D_CONTEXT && xid<MAX_S_CONTEXT)	return vcTYPE_DYNAMIC;
   return vcTYPE_INVALID;
 }