--- embedaddon/miniupnpd/upnpglobalvars.c	2012/02/21 23:16:02	1.1
+++ embedaddon/miniupnpd/upnpglobalvars.c	2013/07/22 00:32:35	1.1.1.3
@@ -1,7 +1,7 @@
-/* $Id: upnpglobalvars.c,v 1.1 2012/02/21 23:16:02 misho Exp $ */
+/* $Id: upnpglobalvars.c,v 1.1.1.3 2013/07/22 00:32:35 misho Exp $ */
 /* MiniUPnP project
  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
- * (c) 2006-2010 Thomas Bernard 
+ * (c) 2006-2012 Thomas Bernard
  * This software is subject to the conditions detailed
  * in the LICENCE file provided within the distribution */
 
@@ -32,18 +32,6 @@ unsigned long upstream_bitrate = 0;
 /* startup time */
 time_t startup_time = 0;
 
-#if 0
-/* use system uptime */
-int sysuptime = 0;
-
-/* log packets flag */
-int logpackets = 0;
-
-#ifdef ENABLE_NATPMP
-int enablenatpmp = 0;
-#endif
-#endif
-
 int runtime_flags = 0;
 
 const char * pidfilename = "/var/run/miniupnpd.pid";
@@ -57,18 +45,27 @@ char modelnumber[MODELNUMBER_MAX_LEN] = "1";
  * http://nnn.nnn.nnn.nnn:ppppp/  => max 30 bytes including terminating 0 */
 char presentationurl[PRESENTATIONURL_MAX_LEN];
 
+/* friendly name for root devices in XML description */
+char friendly_name[FRIENDLY_NAME_MAX_LEN] = OS_NAME " router";
+
 /* UPnP permission rules : */
 struct upnpperm * upnppermlist = 0;
 unsigned int num_upnpperm = 0;
 
 #ifdef ENABLE_NATPMP
 /* NAT-PMP */
+#if 0
 unsigned int nextnatpmptoclean_timestamp = 0;
 unsigned short nextnatpmptoclean_eport = 0;
 unsigned short nextnatpmptoclean_proto = 0;
 #endif
+#endif
 
+/* For automatic removal of expired rules (with LeaseDuration) */
+unsigned int nextruletoclean_timestamp = 0;
+
 #ifdef USE_PF
+const char * anchor_name = "miniupnpd";
 const char * queue = 0;
 const char * tag = 0;
 #endif
@@ -78,15 +75,32 @@ const char * tag = 0;
  * and the filter table */
 const char * miniupnpd_nat_chain = "MINIUPNPD";
 const char * miniupnpd_forward_chain = "MINIUPNPD";
+#ifdef ENABLE_6FC_SERVICE
+const char * miniupnpd_v6_filter_chain = "MINIUPNPD";
 #endif
+
+#endif
 #ifdef ENABLE_NFQUEUE
 int nfqueue = -1;
 int n_nfqix = 0;
 unsigned nfqix[MAX_LAN_ADDR];
 #endif
-int n_lan_addr = 0;
-struct lan_addr_s lan_addr[MAX_LAN_ADDR];
+struct lan_addr_list lan_addrs;
 
+#ifdef ENABLE_IPV6
+/* ipv6 address used for HTTP */
+char ipv6_addr_for_http_with_brackets[64];
+#endif
+
 /* Path of the Unix socket used to communicate with MiniSSDPd */
 const char * minissdpdsocketpath = "/var/run/minissdpd.sock";
+
+/* BOOTID.UPNP.ORG and CONFIGID.UPNP.ORG */
+unsigned int upnp_bootid = 1;
+unsigned int upnp_configid = 1337;
+
+#ifdef ENABLE_6FC_SERVICE
+int ipv6fc_firewall_enabled = 1;
+int ipv6fc_inbound_pinhole_allowed = 1;
+#endif