--- embedaddon/miniupnpd/upnpdescgen.h	2012/02/21 23:16:02	1.1.1.1
+++ embedaddon/miniupnpd/upnpdescgen.h	2012/05/29 12:55:57	1.1.1.2
@@ -1,7 +1,7 @@
-/* $Id: upnpdescgen.h,v 1.1.1.1 2012/02/21 23:16:02 misho Exp $ */
+/* $Id: upnpdescgen.h,v 1.1.1.2 2012/05/29 12:55:57 misho Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
- * (c) 2006-2008 Thomas Bernard 
+ * (c) 2006-2011 Thomas Bernard 
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
@@ -31,7 +31,9 @@ struct action {
 };
 
 struct argument {	/* the name of the arg is obtained from the variable */
-	unsigned char dir;		/* 1 = in, 2 = out */
+	unsigned char dir;		/* MSB : don't append "New" Flag, 
+	                         * 5 Medium bits : magic argument name index
+	                         * 2 LSB : 1 = in, 2 = out */
 	unsigned char relatedVar;	/* index of the related variable */
 };
 
@@ -39,13 +41,14 @@ struct stateVar {
 	const char * name;
 	unsigned char itype;	/* MSB: sendEvent flag, 7 LSB: index in upnptypes */
 	unsigned char idefault;	/* default value */
-	unsigned char iallowedlist;	/* index in allowed values list */
+	unsigned char iallowedlist;	/* index in allowed values list 
+	                             * or in allowed range list */
 	unsigned char ieventvalue;	/* fixed value returned or magical values */
 };
 
 /* little endian 
  * The code has now be tested on big endian architecture */
-#define INITHELPER(i, n) ((char *)((n<<16)|i))
+#define INITHELPER(i, n) ((char *)(((n)<<16)|(i)))
 
 /* char * genRootDesc(int *);
  * returns: NULL on error, string allocated on the heap */
@@ -64,6 +67,16 @@ char *
 genL3F(int * len);
 #endif
 
+#ifdef ENABLE_6FC_SERVICE
+char *
+gen6FC(int * len);
+#endif
+
+#ifdef ENABLE_DP_SERVICE
+char *
+genDP(int * len);
+#endif
+
 #ifdef ENABLE_EVENTS
 char *
 getVarsWANIPCn(int * len);
@@ -71,9 +84,19 @@ getVarsWANIPCn(int * len);
 char *
 getVarsWANCfg(int * len);
 
+#ifdef ENABLE_L3F_SERVICE
 char *
 getVarsL3F(int * len);
 #endif
+#ifdef ENABLE_6FC_SERVICE
+char *
+getVars6FC(int * len);
+#endif
+#ifdef ENABLE_DP_SERVICE
+char *
+getVarsDP(int * len);
+#endif
+#endif /* ENABLE_EVENTS */
 
 #endif