--- embedaddon/miniupnpd/upnpglobalvars.h	2012/02/21 23:16:02	1.1.1.1
+++ embedaddon/miniupnpd/upnpglobalvars.h	2012/05/29 12:55:57	1.1.1.2
@@ -1,7 +1,7 @@
-/* $Id: upnpglobalvars.h,v 1.1.1.1 2012/02/21 23:16:02 misho Exp $ */
+/* $Id: upnpglobalvars.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-2010 Thomas Bernard 
+ * (c) 2006-2011 Thomas Bernard 
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
@@ -49,7 +49,7 @@ extern int runtime_flags;
 #endif
 
 #define SETFLAG(mask)	runtime_flags |= mask
-#define GETFLAG(mask)	runtime_flags & mask
+#define GETFLAG(mask)	(runtime_flags & mask)
 #define CLEARFLAG(mask)	runtime_flags &= ~mask
 
 extern const char * pidfilename;
@@ -71,11 +71,16 @@ extern unsigned int num_upnpperm;
 
 #ifdef ENABLE_NATPMP
 /* NAT-PMP */
+#if 0
 extern unsigned int nextnatpmptoclean_timestamp;
 extern unsigned short nextnatpmptoclean_eport;
 extern unsigned short nextnatpmptoclean_proto;
 #endif
+#endif
 
+/* For automatic removal of expired rules (with LeaseDuration) */
+extern unsigned int nextruletoclean_timestamp;
+
 #ifdef USE_PF
 /* queue and tag for PF rules */
 extern const char * queue;
@@ -92,14 +97,25 @@ extern int nfqueue;
 extern int n_nfqix;
 extern unsigned nfqix[];
 #endif
-/* lan addresses */
-/* MAX_LAN_ADDR : maximum number of interfaces
- * to listen to SSDP traffic */
-#define MAX_LAN_ADDR (4)
-extern int n_lan_addr;
-extern struct lan_addr_s lan_addr[];
 
+/* lan addresses to listen to SSDP traffic */
+extern struct lan_addr_list lan_addrs;
+
+#ifdef ENABLE_IPV6
+/* ipv6 address used for HTTP */
+extern char ipv6_addr_for_http_with_brackets[64];
+#endif
+
 extern const char * minissdpdsocketpath;
+
+/* BOOTID.UPNP.ORG and CONFIGID.UPNP.ORG */
+extern unsigned int upnp_bootid;
+extern unsigned int upnp_configid;
+
+#ifdef ENABLE_6FC_SERVICE
+extern int ipv6fc_firewall_enabled;
+extern int ipv6fc_inbound_pinhole_allowed;
+#endif
 
 #endif