--- embedaddon/miniupnpd/testupnpdescgen.c	2012/02/21 23:16:02	1.1.1.1
+++ embedaddon/miniupnpd/testupnpdescgen.c	2012/05/29 12:55:57	1.1.1.2
@@ -1,13 +1,17 @@
-/* $Id: testupnpdescgen.c,v 1.1.1.1 2012/02/21 23:16:02 misho Exp $ */
+/* $Id: testupnpdescgen.c,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 */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+/* for mkdir */
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
 
 #include "config.h"
 #include "upnpdescgen.h"
@@ -16,21 +20,32 @@ char uuidvalue[] = "uuid:12345678-0000-0000-0000-00000
 char serialnumber[] = "12345678";
 char modelnumber[] = "1";
 char presentationurl[] = "http://192.168.0.1:8080/";
+/*char presentationurl[] = "";*/
 
 char * use_ext_ip_addr = NULL;
 const char * ext_if_name = "eth0";
 
+#ifdef ENABLE_6FC_SERVICE
+int ipv6fc_firewall_enabled = 1;
+int ipv6fc_inbound_pinhole_allowed = 1;
+#endif
+
 int getifaddr(const char * ifname, char * buf, int len)
 {
 	strncpy(buf, "1.2.3.4", len);
 	return 0;
 }
 
-int upnp_get_portmapping_number_of_entries()
+int upnp_get_portmapping_number_of_entries(void)
 {
 	return 42;
 }
 
+int get_wan_connection_status(const char * ifname)
+{
+	return 2;
+}
+
 /* To be improved */
 int
 xml_pretty_print(const char * s, int len, FILE * f)
@@ -38,6 +53,8 @@ xml_pretty_print(const char * s, int len, FILE * f)
 	int n = 0, i;
 	int elt_close = 0;
 	int c, indent = 0;
+	if(!s)
+		return n;
 	while(len > 0)
 	{
 		c = *(s++);	len--;
@@ -73,6 +90,9 @@ xml_pretty_print(const char * s, int len, FILE * f)
 			else if(elt_close == 0)
 				indent++;
 			break;
+		case '\n':
+			/* remove existing LF */
+			break;
 		default:
 			fputc(c, f); n++;
 		}
@@ -84,7 +104,7 @@ xml_pretty_print(const char * s, int len, FILE * f)
 const char * str1 = "Prefix123String";
 const char * str2 = "123String";
 
-void stupid_test()
+void stupid_test(void)
 {
 	printf("str1:'%s' str2:'%s'\n", str1, str2);
 	printf("str1:%p str2:%p str2-str1:%ld\n", str1, str2, (long)(str2-str1));
@@ -99,24 +119,79 @@ main(int argc, char * * argv)
 	int rootDescLen;
 	char * s;
 	int l;
+	FILE * f;
+
+	if(mkdir("testdescs", 0777) < 0) {
+		if(errno != EEXIST) {
+			perror("mkdir");
+		}
+	}
+	printf("Root Description :\n");
 	rootDesc = genRootDesc(&rootDescLen);
 	xml_pretty_print(rootDesc, rootDescLen, stdout);
+	f = fopen("testdescs/rootdesc.xml", "w");
+	if(f) {
+		xml_pretty_print(rootDesc, rootDescLen, f);
+		fclose(f);
+	}
 	free(rootDesc);
 	printf("\n-------------\n");
+	printf("WANIPConnection Description :\n");
 	s = genWANIPCn(&l);
 	xml_pretty_print(s, l, stdout);
+	f = fopen("testdescs/wanipc_scpd.xml", "w");
+	if(f) {
+		xml_pretty_print(s, l, f);
+		fclose(f);
+	}
 	free(s);
 	printf("\n-------------\n");
+	printf("WANConfig Description :\n");
 	s = genWANCfg(&l);
 	xml_pretty_print(s, l, stdout);
+	f = fopen("testdescs/wanconfig_scpd.xml", "w");
+	if(f) {
+		xml_pretty_print(s, l, f);
+		fclose(f);
+	}
 	free(s);
 	printf("\n-------------\n");
 #ifdef ENABLE_L3F_SERVICE
+	printf("Layer3Forwarding service :\n");
 	s = genL3F(&l);
 	xml_pretty_print(s, l, stdout);
+	f = fopen("testdescs/l3f_scpd.xml", "w");
+	if(f) {
+		xml_pretty_print(s, l, f);
+		fclose(f);
+	}
 	free(s);
 	printf("\n-------------\n");
 #endif
+#ifdef ENABLE_6FC_SERVICE
+	printf("WANIPv6FirewallControl service :\n");
+	s = gen6FC(&l);
+	xml_pretty_print(s, l, stdout);
+	f = fopen("testdescs/wanipv6fc_scpd.xml", "w");
+	if(f) {
+		xml_pretty_print(s, l, f);
+		fclose(f);
+	}
+	free(s);
+	printf("\n-------------\n");
+#endif
+#ifdef ENABLE_DP_SERVICE
+	printf("DeviceProtection service :\n");
+	s = genDP(&l);
+	xml_pretty_print(s, l, stdout);
+	f = fopen("testdescs/dp_scpd.xml", "w");
+	if(f) {
+		xml_pretty_print(s, l, f);
+		fclose(f);
+	}
+	free(s);
+	printf("\n-------------\n");
+#endif
 #ifdef ENABLE_EVENTS
 	s = getVarsWANIPCn(&l);
 	xml_pretty_print(s, l, stdout);
@@ -131,6 +206,18 @@ main(int argc, char * * argv)
 	xml_pretty_print(s, l, stdout);
 	free(s);
 	printf("\n-------------\n");
+#ifdef ENABLE_6FC_SERVICE
+	s = getVars6FC(&l);
+	xml_pretty_print(s, l, stdout);
+	free(s);
+	printf("\n-------------\n");
+#endif
+#ifdef ENABLE_DP_SERVICE
+	s = getVarsDP(&l);
+	xml_pretty_print(s, l, stdout);
+	free(s);
+	printf("\n-------------\n");
+#endif
 #endif
 #endif
 /*