White spaces.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@581 119443c7-1b9e-41f8-b6fc-b9c35fce742c

ChangeLog

@@ -1,3 +1,580 @@
+*******************************************************************************
+Version 1.6.7
+*******************************************************************************
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* The last part of Ronan Menard's patch.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* upnp/src/ssdp/ssdp_device.c: Fix for IPV6 ULA/GUA issues.
+	* upnp/src/ssdp/ssdp_ctrlpt.c: Fix for IPV6 ULA/GUA issues.
+	* upnp/src/ssdp/ssdp_server.c: Fix for IPV6 ULA/GUA issues.
+	
+	Patch submitted by Ronan Menard.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* upnp/src/genlib/miniserver/miniserver.c: Fix for IPV6 ULA/GUA issues.
+	
+	Patch submitted by Ronan Menard.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* gena_subscribe(): Fix for IPV6 ULA/GUA issues.
+	
+	Patch submitted by Ronan Menard.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SOCKET ssdpSock6UlaGua: created variable for later use.
+	
+	Patch submitted by Ronan Menard.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SSDP_IPV6_SITELOCAL: new macro.
+	
+	Patch submitted by Ronan Menard.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* The scope of the macro NUM_HANDLE is now restricted to upnpapi.c.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* InitHandleList() has never been implemented, I guess no one has ever
+	called it, so remove it.
+	* GetFreeHandle() and FreeHandle() are now static as they should.
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* New internal buffer added to store global/ula IPV6 address.
+	* Macros to test whether an IPV6 address is global or ula.
+	* UpnpGetServerUlaGuaIp6Address(): added interface.
+	* IN6_IS_ADDR_GLOBAL, IN6_IS_ADDR_ULA: new macros.
+	* gIF_IPV6_ULA_GUA: new buffer.
+	* UpnpRegisterRootDevice3(): Change to the test of already registered
+	devices for IPV6.
+	* UpnpGetIfInfo(): gua/ula issues.
+	
+	Patch submitted by Ronan Menard.
+
+2010-08-19 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* libUPnP does support IPV6 now.
+	
+	Patch submitted by Ronan Menard.
+
+2010-08-19 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* HTTP version equal to 1.0 should fail as required by the UPnP
+	certification tool. Patch submitted by Ronan Menard.
+
+2010-06-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	SF Bug Tracker [ 3022490 ] String declaration fix for patch applied in 3007407
+	Hello,
+
+	When my patch for tracker ID 3007407 was accepted, the definition of the
+	serviceList string was changed from
+
+	#define SERVICELIST_STR "serviceList"
+
+	to
+
+	static const char *SERVICELIST_STR = "serviceList";
+
+	During internal code review of the final patch, it was pointed out that 
+	sizeof(SERVICELIST_STR) == 4 since SERVICELIST_STR is now declared as
+	a pointer instead of an array.
+
+	If you wish to use a variable instead of a define, I suggest the
+	following instead:
+
+	static const char SERVICELIST_STR[] = "serviceList";
+
+	Thanks,
+	Chuck Thomason
+
+2010-06-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	SF Bug Tracker [ 3007407 ] Service traversal issue in AdvertiseAndReply()
+	Submitted: Chuck Thomason ( cyt4 ) - 2010-05-26 15:07:39 UTC
+
+	When the UPnP server is started, one alive message is broadcast for each
+	service in each device. It appears that libupnp's implementation of the
+	alive message generation does not correctly navigate the XML description
+	document when locating the services. This can result in the wrong UDN
+	being used in the alive message sent for a service.
+
+	In my specific case (see attached XML), the root EchoSTB device contains
+	no services, but its embedded MediaServer device contains 2 services.
+	When the existing libupnp code traverses the EchoSTB device in the XML,
+	it searches the global list of serviceLists within the document instead
+	of searching for a serviceList that is its direct child node. The
+	ContentDirectory and ConnectionManager services are then announced with
+	the UDN of EchoSTB1 (the root device) instead of with the UDN of
+	MediaServer, which is actually their parent device.
+
+	I discovered this behavior using libupnp-1.6.6. I have generated a patch
+	against branch-1.6.x that corrects the XML navigation such that all
+	services are traversed from their parent device, which results in the
+	correct UDN being sent in the alive message for each service. I built
+	from branch-1.6.x without this patch, tested, and confirmed that the
+	issue still exists as I observed it in libupnp-1.6.6. I then built
+	from branch-1.6.x with this patch, tested, and confirmed that the
+	issue was resolved.
+
+	Thanks,
+	Chuck Thomason
+
+2010-05-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	SF Bug Tracker [ 2995758 ] libupnp 1.6.6, wrong bind when reuseaddr is
+	1.
+	Submitted: viallard anthony ( homer242 )
+	When trying to use reuseaddr option in miniserver/miniserver.c, there
+	isn't a affectation of the port chosen (serverAddr.sin_port isn't
+	receive listen_port variable value).
+
+2010-04-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	Define PROTOTYPES to be one by default in global.h. This affects the
+	RSA MD5 code.
+
+2010-03-27 Nick Leverton <nick@leverton.org>
+	Subscription auto-renewals copy the renewal time from old subscription.
+
+2010-03-27 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added API to ithread, created the following functions:
+	- int ithread_initialize_library(void);
+	- int ithread_cleanup_library(void);
+	- int ithread_initialize_thread(void);
+	- int ithread_cleanup_thread(void);
+	* SF Bug Tracker [ 2876374 ] Access Violation when compiling with Visual Studio 2008
+	Submitted: Stulle ( stulleamgym ) - 2009-10-10 19:05
+
+	Hi,
+
+	I am one of the devs of the MorphXT project and I use this lib in some
+	other of my projects, too. When I tried to upgrade the lib earlier for one
+	of my projects I had to realise that something did not work at first and
+	while most of the things were reasonably ease to be fixed. Now, the last
+	thing I encountered was not so easy to fix and I am uncertain if my fix is
+	any good so I'll just post it here and wait for some comments.
+
+	The problem was that I got an Access Violation when calling "UpnpInit". It
+	would call "ithread_rwlock_init(&GlobalHndRWLock, NULL)" which eventually
+	led to calling "pthread_cond_init" and I got the error notice at
+	"EnterCriticalSection (&ptw32_cond_list_lock);". It appeared that
+	"ptw32_cond_list_lock" was NULL. Now, I found two ways to fix this. Firstly
+	moving the whole block after at least one of the "ThreadPoolInit" calls
+	will fix the issue. Secondly, you could add:
+	#ifdef WIN32
+	#ifdef PTW32_STATIC_LIB
+	// to get the following working we need this... is it a good patch or
+	not... I do not know!
+	pthread_win32_process_attach_np();
+	#endif
+	#endif
+	right before "ithread_rwlock_init(&GlobalHndRWLock, NULL)".
+
+	Just so you know, I am using libupnp 1.6.6 and libpthreads 2.8.0 and both
+	are linked static into the binaries. I am currently using Visual Studio
+	2008 for development with Windows being the target OS. Any comment at your
+	end?
+
+	Regards, Stulle
+
+2010-03-27 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
+	Submitted By: zephyrus ( zephyrus00jp )
+	This second part covers the issue on linking with -lsocket -lnsl -lrt.
+
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 2392166 ] ithread_detach not called for finished worker thread
+	Submitted: Ulrik ( ulsv_enea ) - 2008-12-05 08:24
+
+	Valgrind reports a memory leak due to that the function ithread_detach is
+	not called for finished worker threads in ThreadPool.c.
+
+	==21137== 2,176 bytes in 8 blocks are possibly lost in loss record 5 of 5
+	==21137== at 0x4C20F3F: calloc (vg_replace_malloc.c:279)
+	==21137== by 0x4010F58: _dl_allocate_tls (in /lib/ld-2.6.1.so)
+	==21137== by 0x544BA92: pthread_create@@GLIBC_2.2.5 (in
+	/lib/libpthread-2.6.1.so)
+	==21137== by 0x5F94592: CreateWorker (ThreadPool.c:639)
+	==21137== by 0x5F95079: ThreadPoolInit (ThreadPool.c:784)
+
+	I'm using libupnp 1.6.6
+
+	For more info on pthread_detach, see:
+	http://gelorakan.wordpress.com/2007/11/26/pthead_create-valgrind-memory-lea
+	k-solved/
+
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 2392304 ] Memory leak in SSDP AdvertiseAndReply
+	Submitted: Ulrik ( ulsv_enea ) - 2008-12-05 08:24
+
+	Valgrind reports a memory leak function in AdvertiseAndReply
+	(ssdp/ssdp_server.c) in libupnp 1.6.6
+
+	There are continue statements in many places in AdvertiseAndReply. In some
+	of those error handling cases the variable nodelist is not free'ed before
+	continuing to the next iteration. The next iteration will take care of
+	free'ing the nodelist from the previous iteration in most cases, but not
+	when breaking out of the for loop after the last element.
+
+	I belive this memory leak can be solved by makeing sure that the rows
+
+	ixmlNodeList_free( nodeList );
+	nodeList = NULL;
+
+	are always executed, also in the beginning of the last iteration when we
+	found out that there are not more elements.
+
+	==29110== at 0x4C21C16: malloc (vg_replace_malloc.c:149)
+	==29110== by 0x5D8DE0E: ixmlNodeList_addToNodeList (nodeList.c:106)
+	==29110== by 0x5D8B7E2: ixmlNode_getElementsByTagNameRecursive
+	(node.c:1438)
+	==29110== by 0x5D8E587: ixmlElement_getElementsByTagName
+	(element.c:491)
+	==29110== by 0x5B6C0F1: AdvertiseAndReply (ssdp_server.c:201)
+	==29110== by 0x5B7AB74: UpnpSendAdvertisement (upnpapi.c:1495)
+
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* libupnp and multi-flows scenario patch
+	Submited by Carlo Parata from STMicroelectronics.
+
+	Hi Roberto and Nektarios,
+	after an analysis of the problem of libupnp with a multi-flows scenario, I
+	noticed that the only cause of the freezed system is the ThreadPool
+	management. There are not mutex problems. In practise, if all threads in the
+	thread pool are busy executing jobs, a new worker thread should be created if
+	a job is scheduled (I inspired to tombupnp library). So I solved the problem
+	with a little patch in threadutil library that you can find attached in this
+	e-mail. I hope to have helped you.
+
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2964973 ] install: will not overwrite just-created
+	...blah... with...
+	Submitted: Nick Leverton ( leveret ) - 2010-03-07 05:18
+
+	Full error:
+	/usr/bin/install: will not overwrite just-created
+	`/tmp/buildd/libupnp-1.6.6/debian/tmp/usr/share/doc/libupnp3-dev/examples/s
+	ample_util.c' with `common/sample_util.c'
+
+	This seems to be from Automake 1.11 which doesn't like having duplicate
+	files in a Makefile.am. Patch attached, kindly provided by Stefan Potyra
+	for Debian (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543068)
+
+	This fix will be needed for both 1.6.x and 1.8.x branches.
+
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Backport of svn revision 504:
+	SF Patch Tracker [ 2969188 ] 1.8.0: patch for FreeBSD compilation
+	Submitted By: Nick Leverton (leveret)
+	Fix the order of header inclusion for FreeBSD.
+
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
+	Submitted By: zephyrus ( zephyrus00jp )
+	Obs by Marcelo: The issue with linking with -lsocket -lnsl -lrt is not
+	covered in this changeset beacuse I don't have solaris to test. I will
+	need some help from zephyrus in this regard. The issue will be addressed
+	in a future changeset.
+
+	Compilation for solaris
+
+	I have used gcc3.x and gcc4.x under solaris 10 for x86 / 64 bits.
+
+	A couple of Source file fixes were necessary for successful compilation
+	and runtime behavior.
+
+	threadutil/src/ThreadPool.c
+
+	POSIX
+	sched_setschduler() returns non-negative value for success.
+
+	Without the fix, UpnpInit() fails immediately.
+
+	upnpp/src/api/upnpai.c
+
+	There is a typo of a macro name "__sun" in one of the
+	CPP conditional.
+	Without the fix, the compilation aborts due to unknown constant
+	in socket ioctl call.
+
+	A few structs and an array is not properly initialized.
+	Well, I think it may be safe as is, but when I checked it
+	using purify evaluation version, it was reported that
+	uninitizlied iszBuffer may cause read of uninitialized memory.
+	So play it safe.
+
+	Configure issue.
+	This has to be more of a configure magic.
+	To link a program successfully using network, we need
+	-lsocket and -lnsl library specifications on the link line.
+	We also need -lrt for programs that use thread scheduling features.
+
+	The sample program under upnp/sample requires
+	-lsocket -lnsl -lrt
+	for successful linking.
+	I added -lsocket -lnsl -lrt to Makefile.in.
+	configure probably needs to take care of these.
+
+	I don't know much about configure, automake, etc., so
+	I am just raising a flag here.
+
+	TIA
+	
+2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2836704 ] Search for nested serviceList (not
+	stopping at the first lis
+	Submitted By: zephyrus ( zephyrus00jp )
+	
+	Internet Gateway Device description contains nested serviceList (rootdevice
+	-> servicelist, subdevice
+	and subdevice has the lower-level serviceList, etc..)
+
+	Unfrotunately, the sample code sample_util.c used by tv_device sample,
+	etc.
+	has a code that looks for only the first top-level serviceList.
+	This results in the failure to read all the services of an IGD xml
+	description.
+
+	Attached patch modifies this behavior and looks for the service by
+	visiting all the serviceList in xml document in turn.
+
+	With the modified patch (ad additional modification), I could
+	simulate an IGD device and created a modified control program for that.
+
+	Patch against 1.6.6
+
+	TIA.
+	
+2010-03-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2203721 ] timeb.h check obsolete
+
+2010-03-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2970872 ] Update ErrorMessages for latest return
+	code list
+	Submitted By: Nick Leverton ( leveret )
+	
+	ErrorMessage[] in upnptools.c has got a bit out of sync, the attached
+	patch (generated from grep 'define UPNP_E_') should bring it up to date.
+
+2010-03-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2857611 ] Declare a few functions to have proper
+	(void) argument list.
+	Submitted By: zephyrus ( zephyrus00jp )
+	
+	In a publicly installed headers, a few functions are declared without any
+	arguments at all, a la "()".
+	When I used gcc's -Wimplict and -Wstrict-prototypes to check for the
+	mismatch of
+	function prototype declarations and their usage in my own program,
+	some headers from libupnp-1.6.6 produced warnings.
+
+	They are not strictly bugs, but pretty much annoying. This is 2009, and
+	almost all the important compilers
+	understand ISO-C.
+
+	So the offending functions are declared as "(void") to show that they have
+	no arguments at all.
+
+2010-03-14 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2546532 ] Missing carriage return between
+	SOAPACTION and User-Agent headers.
+
+	There is something going wrong in soap_ctrlpt.c at line 931 (based on
+	version 1.6.6 release).
+	
+	The http_Makemessage call looks as follows:
+	
+	if (http_MakeMessage(
+	&request, 1, 1,
+	"Q" "sbc" "N" "s" "s" "Ucc" "sss",
+	SOAPMETHOD_POST, path.buf, path.length,
+	"HOST: ", host.buf, host.length,
+	content_length,
+	ContentTypeHeader,
+	"SOAPACTION:
+	\"urn:schemas-upnp-org:control-1-0#QueryStateVariable\"",
+	xml_start, var_name, xml_end ) != 0 ) {
+	return UPNP_E_OUTOF_MEMORY;
+	}
+	
+	This will result in the SOAPACTION header to be immediately followed by the
+	User-Agent header, while a cr-lf should separate the two. I propose to fix
+	this by changing the second "s" to "sc" to force the addition of a cr-lf
+	after the SOAPACTION. This looks consistent to the other Makemessage calls.
+
+2009-03-06 Oxygenic <oxygenic(at)users.sourceforge.net>
+	* parameter problem fixed in soap_request_and_response(), 2nd call to
+	http_RequestAndResponse() was wrong (thanks to Kim Kyungsan)
+
+2008-07-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added upnp/m4/libupnp.m4 to the distribution tarball.
+
+2008-07-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fixed a missing HandleUnlock() in upnp/src/gena/gena_device.c.
+
+2008-07-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 2026431 ] pupnp does not build on GNU/KfreeBSD.
+	Submitted By: Nick Leverton - leveret
+	Gnu/KFreeBSD is one of the Debian architectures, it includes a FreeBSD
+	kernel with GNU userspace (glibc etc). The Gnu/KfreeBSD developers
+	provided the attached patch to test the appropriate #define and allow pupnp
+	to build in their environment, and asked me to forward it to you.
+
+	Since the test is a simple check for defined(__GLIBC__), this would
+	presumably also help with other ports of GNU libc to non-Linux kernels.
+
+2008-07-16 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Andre Sodermans (wienerschnitzel) patch for building libupnp under
+	windows systems with VC9. This one fixes a missing include.
+
+2008-06-30 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added an m4 macro to deal with finding libupnp in the users'
+	configure script.
+
+2008-06-11 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fixed a buffer overflow due to a bug in the calculation of the
+	CONTENT-TYPE header line size, the length was beeing calculated with
+	the wrong string, there was a missing colon.
+
+2008-06-02 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 1942285 ]
+	UpnpCreatePropertySet can leak memory.
+	Submitted By: Bob Ciora - bobciora
+
+	In file upnp/src/api/upnptools.c, function UpnpCreatePropertySet can leak
+	memory if no additional arguments are passed. This is because of the
+	'return' statement at (or near) line 554.
+
+	The prior call to ixmlParseBufferEx may succeed. This causes a basic ixml
+	tree to be created. The return statement at line 554 leaves this tree in
+	memory without cleaning it up.
+
+	There are two options: either add code prior to the return at 554 to clean
+	up the tree, or simply allow a NumArg parameter of 0 to be passed.
+
+	I prefer the second method -- there doesn't seem to be any need to pass
+	*any* arguments to this function.
+
+	In my local copy of upnptools.c, I have simply replaced the "return NULL"
+	in line 554 to "return PropSet".
+
+	I've attached the source file.
+
+2008-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 1903069 ]
+	Subs (not services) not marked 'active'
+	Submitted By: Bob Ciora - bobciora
+
+	If the UpnpAcceptSubscription is not called, the subscription is not marked
+	as "active", so no state variables will ever be sent.
+
+	I have a "lazy" architecture where a service may not be ready to publish
+	any state data at the time of a subscription. Subscriptions are still
+	accepted, there's just nothing to send, so UpnpAcceptSubscription is never
+	called. As a result, the subscription is never marked as "active" via the
+	genaInitNotify functions.
+
+	A best course of action would be to modify UpnpAcceptSubscription<...>
+	functions so that they can accept *no* initial state information, but can
+	still result in the subscription being marked as active. Technically,
+	then, the "active" flag should be set here, not in the genaInitNotify<...>
+	functions.
+
+	But the UpnpAccept functions don't muck with the subscription table, and
+	it's more work than it's worth to move that code from the gena fucntions to
+	the upnpapi functions.
+
+	So--- what I've done to correct this problem is to modify both
+	UpnpAcceptSubscription<...> functions (in upnppapi.c) to accept an empty
+	state list and still call the gena layer functions. The gena layer
+	genaInitNotify<...> functions (gena_device.c) then mark the subscription as
+	"active" *before* checking for an empty state set.
+
+	In genaInitNotify, a check for "var_count <= 0" is added immediately after
+	the "subs->active = 1;" line. If this occurs, then all cleanup is
+	performed and the function returns GENA_SUCCESS (since now, an empty state
+	list is not an error). The same check is made for "PropSet == 0" in
+	genaInitNotifyExt (just after the "subs->active = 1;" line).
+
+	I've modifified my proxy layer to call UpnpAcceptSubscriptionExt even when
+	there is no state data to send. With the suggested changes to
+	gena_device.c, later state changes are sent correctly.
+
+	This has solved my problem.
+
+2008-04-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fix in function SetSeed() in threadutil/src/ThreadPool.c for CYGWIN
+	compilation. Thanks to Gary Chan.
+
+*******************************************************************************
+Version 1.6.6
+*******************************************************************************
+
+2008-04-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added thread id's to the UpnpPrintf debug messages. Thanks to
+	Charles Nepveu for the idea.
+
+2008-04-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	*  SF Bug Tracker [ 1948586 ]
+	Uppercase U in in "xmlns:U" in Invoke Action causes seg. f.
+	Submitted By: Thomas Norheim - kjakan_no
+	Device no longer segfaults with the following malformed xml action:
+	<u:SetColor xmlns:U="urn:schemas-upnp-org:service:tvpicture:1">
+		<Color>2</Color>
+	</u:SetColor>
+
+2008-04-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Use -O0 in debug builds so that variables do not get optimized out.
+
+2008-04-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Apostolos Syropoulos changes for OpenSolaris x86.
+
+2008-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Andre Sodermans (wienerschnitzel) patch for building libupnp under
+	windows systems with VC9.
+
+2008-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Andre Sodermans (wienerschnitzel) patch for building libupnp under
+	windows systems with VC8.
+
+2008-03-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fixed a printf format problem on the upnp_tv_device.c from both
+	upnp/sample/tvdevie and upnp/sample/tvcombo directories. The variable
+	port was a short int instead of an unsigned short and it was beeing
+	print as a negative value.
+
+2008-03-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Bug Tracker [ 1902668 ] Cannot compile on MSVC
+	Submitted By Luke Kim - nereusuj
+	Version 1.6.5 cannot be compiled because of some changes in 1.6.3.
+	MSVC does not support stdint.h, gettimeofday(), sys/param.h, const int
+	variables in array size and Windows does not define _WINDOWS_ but define
+	_WINDOWS.
+	* MSVC does not understand "const int"'s as declarators of array
+	dimensions, we must use #define'd constants.
+	* Use WIN32 instead of _WINDOWS_ or _WINDOWS.
+
+2008-02-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* No longer ignore "upnp:rootdevice" advertisement. Thanks to Bob Ciora.
+
+2008-02-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Changed "sys_errlist[errno]", which is deprecated, by
+	"strerror_r()", which is thread safe.
+
+2008-02-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Slightly improved error report by showing the sys_errlist string
+	corresponding to errno.
+
+2008-02-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Got rid of two useless constants: UPNP_SOCKETERROR and
+	UPNP_INVALID_SOCKET. They both mean the same, that a network API
+	function has failed. -1 is the value to check, not an invented constant.
+
+*******************************************************************************
+Version 1.6.5
+*******************************************************************************
+
+2008-02-02 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Peter Hartley's fix for wrong sized variable beeing passed to
+	http_MakeMessage() on 64 bit architectures.
+
+
 *******************************************************************************
 Version 1.6.4
 *******************************************************************************
@@ -146,7 +723,7 @@ Version 1.6.1
 	handle accordingly.
 
 2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Merge of Mac OS X patch from St<EFBFBD>phane Corth<EFBFBD>sy (davelopper),
+	* Merge of Mac OS X patch from Stéphane Corthésy (davelopper),
 	SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
 	Some of the proposed changes were already done by Rene Hexel's patch.
 
@@ -570,14 +1147,14 @@ Version 1.4.0
 FORK FROM DEAD libupnp
 *******************************************************************************
 
-2006-04-29  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-29  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* THANKS: new file with list of contributors
 
 	* upnp/src/gena/gena_device.c (respond_ok): add 'Content-Length: 0'
 	  in subscription response. Patch by Chaos (Bug # 1455367).
 
-2006-04-08  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-08  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/doc/UPnP_Programming_Guide.pdf: replace this document with 
 	  the one in libupnp-doc-1.2.1 because current CVS version 
@@ -588,20 +1165,20 @@ FORK FROM DEAD libupnp
 	* changes applied to several files to work under Sparc Solaris, temporarily
 	  requiring a define SPARC_SOLARIS
 
-2006-04-03  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-03  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/Makefile.am: install upnp samples in $(docdir)/examples
 
-2006-03-28  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-28  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add --with-docdir option to choose where documentation
 	  is installed (or -without-docdir to not install the documentation)
 
-2006-03-27  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-27  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/test: add simple test suite for xml parser
 
-2006-03-26  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-26  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/ixmlparser.c (Parser_processCDSect): fix bug which prevents
 	  CDATA sections which contain a 0 (zero) to be parsed (instead the
@@ -612,18 +1189,18 @@ FORK FROM DEAD libupnp
 	  option, and move samples compilation from check_PROGRAMS to
 	  noinst_PROGRAMS
 
-2006-03-25  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-25  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/genlib/miniserver/miniserver.c (get_miniserver_sockets): 
 	  fix bug if new socket created has fd 0 (can only occur when stdin
 	  has been closed). Patch by Oskar Liljeblad 2004-07-02 :
 	  http://sourceforge.net/mailarchive/message.php?msg_id=8870528
 	
-2006-03-21  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-21  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/test/test_init.c: add some version checks and exit if failure
 
-2006-03-05  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-05  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* libupnp version 1.3.1
 
@@ -638,11 +1215,11 @@ FORK FROM DEAD libupnp
 	  dependencies between upnp and ixml / threadutil, so that programs 
 	  linking against upnp only still work.
 
-2006-03-04  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-04  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* libupnp version 1.3.0
 
-2006-03-03  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-03  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/genlib/net/http/httpreadwrite.c (get_sdk_info): use
 	  package version string from configure to set sdk info
@@ -650,7 +1227,7 @@ FORK FROM DEAD libupnp
 	* upnp/Makefile.am: add sample/tvdevice/web/ files in EXTRA_DIST
 	  + do not distribute generated upnpconfig.h file.
 
-2006-02-28  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-28  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/inc/config.h, configure.ac: use only new defines
 	  UPNP_HAVE_xx instead of INCLUDE_yyy_APIS and INTERNAL_WEB_SERVER
@@ -659,7 +1236,7 @@ FORK FROM DEAD libupnp
 	  the librarie LDFLAGS in order to export only the symbols defined 
 	  in the API
 
-2006-02-27  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-27  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add libtool versions for the 3 libraries
 
@@ -667,7 +1244,7 @@ FORK FROM DEAD libupnp
 
 	* threadutil/src/ThreadPool.c (SetSeed): add missing 'static' 
 
-2006-02-26  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-26  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/inc/iasnprintf.h: add gcc __printf__ format attribute
 	  to "iasnprintf"
@@ -688,11 +1265,11 @@ FORK FROM DEAD libupnp
 	  the configuration of the installed libraries (generates installed
 	  file <upnp/upnpconfig.h>)
 
-2006-02-22  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-22  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/ : add missing include of config.h in some .c files
 
-2006-02-21  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-21  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/upnp.h: move some definitions which should not be
 	  exported into "upnp/src/inc/util.h"
@@ -700,12 +1277,12 @@ FORK FROM DEAD libupnp
 	* import all modifications below from libupnp in djmount 0.51
 	  into official libupnp
 	
-2006-01-17  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-17  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/Makefile.am (libthreadutil_la_SOURCES): remove extraneous
 	  file
 
-2006-01-15  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-15  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add checks for large-file support
 
@@ -725,53 +1302,53 @@ FORK FROM DEAD libupnp
 	* ixml/src/node.c (ixmlNode_getNodeType): fix compilation warning
 	  on const return type
 
-2006-01-12  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-12  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/inc/readwrite.h : suppress unused C++ header file
 
-2006-01-11  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-11  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/config.h, upnp/src/inc/upnpapi.h, 
 	  upnp/src/inc/httpreadwrite.h: remove internal configuration variable 
 	  MINIMUM_DELAY (no clear purpose)
 
-2005-12-05  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-12-05  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/upnp.h: re-declare obsolete method UpnpSetContentLength,
 	  for binary compatibility with previous libupnp version.
 
 	* upnp/src/api/upnpapi.c: correct type of g_maxContentLength to size_t
 
-2005-11-01  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-11-01  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* autoconfiscate library : replace all makefiles by Makefile.am
 	  for automake support, + preliminary autoconf support
 	  (generated config.h not yet used in source files)
 
-2005-10-18  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-18  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/makefile: fix location of DEBUG STATIC libupnp library
 	
 	* upnp/sample/tvctrlpt/linux/Makefile, 
 	  upnp/sample/tvdevice/linux/Makefile: fix STATIC library support
 
-2005-10-16  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-16  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/src/Makefile (clean): remove built library
 
-2005-08-28  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-28  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/ixml.h, ixml/src/ixml.c (ixmlRelaxParser) : new function
 
 	* ixml/src/ixmlparser.h, ixml/src/ixmlparser.c (Parser_setErrorChar) :
 	  new function
 
-2005-08-02  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-02  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/Makefile: correct bug for static library being incorrectly 
 	  stripped when building non-debug
 
-2005-06-09  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-06-09  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/element.c (ixmlElement_removeAttributeNode): 
 	  remove some compilation warning
@@ -782,7 +1359,7 @@ FORK FROM DEAD libupnp
 	* upnp/inc/upnptools.h, upnp/src/api/upnptools.c : 
 	  add missing const's in public API
 
-2005-05-28  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-28  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/config.h: suppress HTTP_READ_BYTES (unused)
 	  and replace by DEFAULT_SOAP_CONTENT_LENGTH (previously in upnpapi.h)
@@ -803,7 +1380,7 @@ FORK FROM DEAD libupnp
 	* upnp/src/genlib/net/http/httpreadwrite.c : corrected an incorrect
 	  sprintf format
 	
-2005-05-27  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-27  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/makefile, upnp/src/makefile, 
 	  ixml/Makefile, ixml/src/Makefile, 
@@ -811,7 +1388,7 @@ FORK FROM DEAD libupnp
 	  implement STATIC library support (from patch at 
 	  http://sourceforge.net/tracker/?group_id=7189&atid=307189 )
 
-2005-05-26  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-26  Rémi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/api/upnpapi.c, upnp/src/soap/soap_device.c,
 	  upnp/src/soap/makefile : 

Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = libUPnP
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.4.7
+PROJECT_NUMBER         = 1.6.7
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -91,7 +91,7 @@ ABBREVIATE_BRIEF       =
 # Doxygen will generate a detailed section even if there is only a brief 
 # description.
 
-ALWAYS_DETAILED_SEC    = NO
+ALWAYS_DETAILED_SEC    = YES
 
 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
 # inherited members of a class in the documentation of that class as if those 
@@ -290,7 +290,7 @@ HIDE_IN_BODY_DOCS      = NO
 # to NO (the default) then the documentation will be excluded. 
 # Set it to YES to include the internal documentation.
 
-INTERNAL_DOCS          = NO
+INTERNAL_DOCS          = YES
 
 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
 # file names in lower-case letters. If set to YES upper-case letters are also 
@@ -462,7 +462,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ./upnp ./ixml ./threadutil
+INPUT                  = upnp ixml threadutil
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -995,7 +995,7 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled 
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
@@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
 
-PREDEFINED             = 
+PREDEFINED             = DEBUG UPNP_HAVE_TOOLS INCLUDE_DEVICE_APIS INCLUDE_CLIENT_APIS EXCLUDE_GENA=0 EXCLUDE_DOM=0
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

Makefile.am

@@ -1,7 +1,7 @@
 #
 # Top-level "Makefile.am" for libupnp
 #
-# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 ACLOCAL_AMFLAGS = -I m4
@@ -16,6 +16,7 @@ SUBDIRS = \
 
 
 EXTRA_DIST = \
+	Doxyfile \
 	libupnp.pc.in \
 	LICENSE \
 	THANKS \
@@ -27,7 +28,22 @@ EXTRA_DIST = \
 	build/inc/autoconfig.h \
 	build/inc/config.h \
 	build/inc/upnpconfig.h \
-	build/msvc/inttypes.h
+	build/msvc/inttypes.h \
+	build/msvc/stdint.h \
+	build/vc8/ixml.vcproj \
+	build/vc8/libupnp.sln \
+	build/vc8/libupnp.vcproj \
+	build/vc8/threadutil.vcproj \
+	build/vc8/tvcombo.vcproj \
+	build/vc8/tvctrlpt.vcproj \
+	build/vc8/tvdevice.vcproj \
+	build/vc9/ixml.vcproj \
+	build/vc9/libupnp.sln \
+	build/vc9/libupnp.vcproj \
+	build/vc9/threadutil.vcproj \
+	build/vc9/tvcombo.vcproj \
+	build/vc9/tvctrlpt.vcproj \
+	build/vc9/tvdevice.vcproj 
 
 
 # This variable must have 'exec' in its name, in order to be installed 

THANKS

@@ -7,10 +7,16 @@ Here is a list of these people. Help us keep it complete and
 exempt of errors.
 
 - Alex (afaucher)
+- Andre Sodermans (wienerschnitzel)
+- Anthony Viallard (homer242)
+- Apostolos Syropoulos
 - Arno Willig
 - Bob Ciora
+- Carlo Parata
 - Chaos
+- Charles Nepveu (cnepveu)
 - Chris Pickel
+- Chuck Thomason (cyt4)
 - Craig Nelson
 - David Maass
 - Emil Ljungdahl
@@ -30,16 +36,19 @@ exempt of errors.
 - Keith Brindley
 - Leuk_He
 - Loigu
-- Luke Kim
+- Luke Kim (nereusuj)
 - Marcelo Roberto Jimenez (mroberto)
 - Markus Strobl
 - Nektarios K. Papadopoulos (npapadop)
+- Nicholas Kraft
+- Nick Leverton (leveret)
 - Oskar Liljeblad
 - Michael (oxygenic)
 - Paul Vixie
 - Peter Hartley
 - Rene Hexel
 - Robert Gingher (robsbox)
+- Ronan Menard
 - Siva Chandran
 - Stéphane Corthésy
 - Steve Bresson

build/msvc/stdint.h

@@ -0,0 +1,222 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   extern "C++" {
+#endif 
+#     include <wchar.h>
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   }
+#endif
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+typedef __int8            int8_t;
+typedef __int16           int16_t;
+typedef __int32           int32_t;
+typedef __int64           int64_t;
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+typedef unsigned __int64  uint64_t;
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef __int64           intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef int               intptr_t;
+   typedef unsigned int      uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]

build/vc8/ixml.vcproj

@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ixml"
+	ProjectGUID="{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
+	RootNamespace="ixml"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc"
+				PreprocessorDefinitions="WIN32;IXML_INLINE="
+				RuntimeLibrary="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\ixml\src\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\document.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\element.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmldebug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlmembuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\namedNodeMap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\node.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\nodeList.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\ixml\inc\ixml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\inc\ixmldebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc8/libupnp.sln

@@ -0,0 +1,65 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcproj", "{24884928-0501-4CF2-BC8A-180AFC23B2AF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcproj", "{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcproj", "{F592B023-E1F3-4A1E-841E-662DEE497435}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{24884928-0501-4CF2-BC8A-180AFC23B2AF} = {24884928-0501-4CF2-BC8A-180AFC23B2AF}
+		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427} = {AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcproj", "{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427} = {AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}
+		{24884928-0501-4CF2-BC8A-180AFC23B2AF} = {24884928-0501-4CF2-BC8A-180AFC23B2AF}
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcproj", "{B5D74697-F615-4DCB-AA8B-935F6372F01C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{24884928-0501-4CF2-BC8A-180AFC23B2AF} = {24884928-0501-4CF2-BC8A-180AFC23B2AF}
+		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427} = {AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
+		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Debug|Win32.Build.0 = Debug|Win32
+		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Release|Win32.ActiveCfg = Release|Win32
+		{24884928-0501-4CF2-BC8A-180AFC23B2AF}.Release|Win32.Build.0 = Release|Win32
+		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Debug|Win32.Build.0 = Debug|Win32
+		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Release|Win32.ActiveCfg = Release|Win32
+		{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}.Release|Win32.Build.0 = Release|Win32
+		{F592B023-E1F3-4A1E-841E-662DEE497435}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F592B023-E1F3-4A1E-841E-662DEE497435}.Debug|Win32.Build.0 = Debug|Win32
+		{F592B023-E1F3-4A1E-841E-662DEE497435}.Release|Win32.ActiveCfg = Release|Win32
+		{F592B023-E1F3-4A1E-841E-662DEE497435}.Release|Win32.Build.0 = Release|Win32
+		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Debug|Win32.Build.0 = Debug|Win32
+		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Release|Win32.ActiveCfg = Release|Win32
+		{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}.Release|Win32.Build.0 = Release|Win32
+		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Debug|Win32.Build.0 = Debug|Win32
+		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Release|Win32.ActiveCfg = Release|Win32
+		{B5D74697-F615-4DCB-AA8B-935F6372F01C}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

build/vc8/libupnp.vcproj

@@ -0,0 +1,654 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libupnp"
+	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
+	RootNamespace="libupnp"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/libupnp.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/libupnp.pch"
+				AssemblerListingLocation="$(OutDir)\"
+				ObjectFile="$(OutDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib  iphlpapi.lib"
+				OutputFile="$(OutDir)\libupnp.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/libupnp.pdb"
+				ImportLibrary=".\Release/libupnp.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/libupnp.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/libupnp.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
+				PreprocessorDefinitions="DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile="$(OutDir)\libupnp.pch"
+				AssemblerListingLocation="$(OutDir)\"
+				ObjectFile="$(OutDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib"
+				OutputFile="$(OutDir)\libupnp.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(OutDir)\..\ixml"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
+				ImportLibrary="$(OutDir)\libupnp.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="$(OutDir)\libupnp.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="sources"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionRequest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Discovery.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\document.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\element.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Event.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\EventSubscribe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\FileInfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\FreeList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\gena\gena_callback2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\gena\gena_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\gena\gena_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\httpparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\httpreadwrite.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inet_pton.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlmembuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\LinkedList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\uuid\md5.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\membuffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\miniserver\miniserver.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\namedNodeMap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\node.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\nodeList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\parsetools.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\service_table\service_table.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\soap\soap_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\soap\soap_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\soap\soap_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\sock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_server.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\statcodes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarRequest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\strintmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\SubscriptionRequest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\uuid\sysdep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\ThreadPool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\TimerThread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\upnp_timeout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\upnpapi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\upnpdebug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\UpnpString.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\upnptools.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\uri\uri.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\urlconfig\urlconfig.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\uuid\uuid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\webserver.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\win_dll.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="headers"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\upnp\inc\ActionComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\actionrequest.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\client_table.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\discovery.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\Event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\EventSubscribe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\FileInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gena.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gena_ctrlpt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gena_device.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\global.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gmtdate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\http_client.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\httpparser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\httpreadwrite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\inet_pton.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\md5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\membuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\miniserver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\netall.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\parsetools.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\server.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\service_table.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\soaplib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\sock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\ssdplib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\statcodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\StateVarComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\statevarrequest.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\statuscodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\strintmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\sysdep.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\unixutil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnpapi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnpclosesocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnpdebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\UpnpString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnptools.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\uri.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\urlconfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\utilall.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\uuid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\webserver.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\..\libupnp_win32.patch"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc8/threadutil.vcproj

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="threadutil"
+	ProjectGUID="{24884928-0501-4CF2-BC8A-180AFC23B2AF}"
+	RootNamespace="threadutil"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="pthreadVC2.lib"
+				AdditionalLibraryDirectories="..\..\pthreads\lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\threadutil\src\FreeList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\LinkedList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\ThreadPool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\TimerThread.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\threadutil\inc\FreeList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\ithread.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\LinkedList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\ThreadPool.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\TimerThread.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc8/tvcombo.vcproj

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="tvcombo"
+	ProjectGUID="{B5D74697-F615-4DCB-AA8B-935F6372F01C}"
+	RootNamespace="tvcombo"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvcombo;..\..\upnp\sample\tvcombo\linux"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\linux\upnp_tv_combo_main.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc8/tvctrlpt.vcproj

@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="tvctrlpt"
+	ProjectGUID="{BC1557D9-9E84-4BA5-861E-CB04D767FBDC}"
+	RootNamespace="tvctrlpt"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt;..\..\upnp\sample\tvctrlpt\linux"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvctrlpt\linux\upnp_tv_ctrlpt_main.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc8/tvdevice.vcproj

@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="tvdevice"
+	ProjectGUID="{F592B023-E1F3-4A1E-841E-662DEE497435}"
+	RootNamespace="tvdevice"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;out.vc8.$(ConfigurationName)\ixml&quot;;&quot;out.vc8.$(ConfigurationName)\threadutil&quot;;&quot;out.vc8.$(ConfigurationName)\libupnp&quot;"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvdevice\linux\upnp_tv_device_main.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/ixml.vcproj

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ixml"
+	ProjectGUID="{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
+	RootNamespace="ixml"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\ixml\src\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\document.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\element.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmldebug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlmembuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\namedNodeMap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\node.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\nodeList.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\ixml\inc\ixml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\inc\ixmldebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/libupnp.sln

@@ -0,0 +1,63 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcproj", "{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
+		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.Build.0 = Debug|Win32
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.ActiveCfg = Release|Win32
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.Build.0 = Release|Win32
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.Build.0 = Debug|Win32
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.ActiveCfg = Release|Win32
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.Build.0 = Release|Win32
+		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.Build.0 = Debug|Win32
+		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.ActiveCfg = Release|Win32
+		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.Build.0 = Release|Win32
+		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.Build.0 = Debug|Win32
+		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.ActiveCfg = Release|Win32
+		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.Build.0 = Release|Win32
+		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.Build.0 = Debug|Win32
+		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.ActiveCfg = Release|Win32
+		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

build/vc9/libupnp.vcproj

@@ -0,0 +1,650 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="libupnp"
+	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
+	RootNamespace="libupnp"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/libupnp.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\pthreads\include,..\ixml\src\inc,..\ixml\inc,..\threadutil\inc,..\upnp\inc,..\upnp\src\inc,.\inc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/libupnp.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib"
+				OutputFile=".\Release/libupnp.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/libupnp.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary=".\Release/libupnp.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/libupnp.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/libupnp.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile="$(OutDir)\libupnp.pch"
+				AssemblerListingLocation="$(OutDir)\"
+				ObjectFile="$(OutDir)\"
+				ProgramDataBaseFileName="$(OutDir)\"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1031"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib $(TargetDir)..\ixml\ixml.lib"
+				OutputFile="$(OutDir)\libupnp.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)\libupnp.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile="$(OutDir)\libupnp.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="sources"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\ActionRequest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Discovery.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\document.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\element.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\Event.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\EventSubscribe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\FileInfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\FreeList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\gena\gena_callback2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\gena\gena_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\gena\gena_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\httpparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\httpreadwrite.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inet_pton.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlmembuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\LinkedList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\uuid\md5.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\membuffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\miniserver\miniserver.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\namedNodeMap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\node.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\nodeList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\parsetools.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\service_table\service_table.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\soap\soap_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\soap\soap_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\soap\soap_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\sock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_server.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\statcodes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarComplete.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\StateVarRequest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\strintmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\SubscriptionRequest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\uuid\sysdep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\ThreadPool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\TimerThread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\upnp_timeout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\upnpapi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\upnpdebug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\UpnpString.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\api\upnptools.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\uri\uri.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\urlconfig\urlconfig.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\util\util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\uuid\uuid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\genlib\net\http\webserver.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\win_dll.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="headers"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\upnp\inc\ActionComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\ActionRequest.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\client_table.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\Discovery.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\Event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\EventSubscribe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\FileInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gena.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gena_ctrlpt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gena_device.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\global.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\gmtdate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\http_client.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\httpparser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\httpreadwrite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\inet_pton.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\md5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\membuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\miniserver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\netall.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\parsetools.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\server.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\service_table.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\soaplib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\sock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\ssdplib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\statcodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\StateVarComplete.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\StateVarRequest.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\statuscodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\strintmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\sysdep.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\unixutil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnpapi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnpclosesocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnpdebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\UpnpString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\inc\upnptools.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\uri.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\urlconfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\utilall.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\uuid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\webserver.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\..\..\..\libupnp_win32.patch"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/threadutil.vcproj

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="threadutil"
+	ProjectGUID="{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
+	RootNamespace="threadutil"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="pthreadVC2.lib"
+				AdditionalLibraryDirectories="..\..\pthreads\lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\threadutil\src\FreeList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\LinkedList.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\ThreadPool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\src\TimerThread.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\threadutil\inc\FreeList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\ithread.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\LinkedList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\threadpool.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\threadutil\inc\TimerThread.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/tvcombo.vcproj

@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="tvcombo"
+	ProjectGUID="{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
+	RootNamespace="tvcombo"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
+				PreprocessorDefinitions="DEBUG;WIN32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib $(TargetDir)..\libupnp\libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(TargetDir)..\ixml&quot;;&quot;$(TargetDir)..\threadutil&quot;;&quot;$(TargetDir)..\libupnp&quot;"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\linux\upnp_tv_combo_main.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/tvctrlpt.vcproj

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="tvctrlpt"
+	ProjectGUID="{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
+	RootNamespace="sample"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvctrlpt\linux\upnp_tv_ctrlpt_main.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/vc9/tvdevice.vcproj

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="tvdevice"
+	ProjectGUID="{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
+	RootNamespace="tvdevice"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvdevice\linux\upnp_tv_device_main.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\upnp\sample\common\sample_util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

configure.ac

@@ -4,12 +4,12 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# (C) Copyright 2005-2007 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 AC_PREREQ(2.60)
 
-AC_INIT([libupnp], [1.6.4], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.7], [mroberto@users.sourceforge.net])
 dnl ############################################################################
 dnl # *Independently* of the above libupnp package version, the libtool version
 dnl # of the 3 libraries need to be updated whenever there is a change released:
@@ -120,9 +120,49 @@ dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
 dnl #AC_SUBST([LT_VERSION_UPNP],       [3:3:0])
 dnl #
 dnl ############################################################################
+dnl # Release 1.6.5:
+dnl # "current:revision:age"
+dnl #
+dnl # - Code has changed in upnp
+dnl #	revision: 3 -> 4
+dnl #
+dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
+dnl #AC_SUBST([LT_VERSION_UPNP],       [3:4:0])
+dnl #
+dnl ############################################################################
+dnl # Release 1.6.6:
+dnl # "current:revision:age"
+dnl #
+dnl # - Code has changed in threadutil
+dnl #	revision: 2 -> 3
+dnl # - Code has changed in upnp
+dnl #	revision: 4 -> 5
+dnl #
+dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:3:2])
+dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
+dnl #
+dnl ############################################################################
+dnl # Release 1.6.7:
+dnl # "current:revision:age"
+dnl #
+dnl # - Code has changed in upnp
+dnl #	revision: 5 -> 6
+dnl # - Code has changed in threadutil
+dnl #	revision: 3 -> 4
+dnl # - Interfaces have been changed, added and removed in upnp
+dnl #	current: 4 -> 5
+dnl #   revision: 4 -> 0
+dnl #
+dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:0:2])
+dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
+dnl #
+dnl ############################################################################
 AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
-AC_SUBST([LT_VERSION_UPNP],       [3:3:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [5:0:2])
+AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
 dnl ############################################################################
 dnl # Repeating the algorithm to place it closer to the modificatin place:
 dnl # 	- library code modified:		revision++
@@ -277,7 +317,9 @@ freebsd*)
 	echo "Using non-specific system compiler settings"
 	if test x"$enable_debug" = xyes; then
 		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
-		:
+		#:
+		# Use -O0 in debug so that variables do not get optimized out
+		AX_CFLAGS_GCC_OPTION([-O0])
 	else
 		# add optimise for size
 		AX_CFLAGS_GCC_OPTION([-Os])
@@ -299,9 +341,26 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
 
 
 #
-# Checks for header files
+# Are we targetting Win32?
+#
+AC_MSG_CHECKING([for Win32])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#ifdef WIN32
+	#error Yup
+#endif
+],[])], [ac_cv_win32="no"], [ac_cv_win32="yes"])
+if test "$ac_cv_win32" = "yes"; then
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+fi
+
+
+#
+# Checks for header files (which aren't needed on Win32)
 #
 AC_HEADER_STDC
+if test "$ac_cv_win32" = "no"; then
 # libupnp code doesn't use autoconf variables yet,
 # so just abort if a header file is not found.
 AC_CHECK_HEADERS(
@@ -317,19 +376,43 @@ AC_CHECK_HEADERS(
 	sys/ioctl.h \
 	sys/socket.h \
 	sys/time.h \
-	sys/timeb.h \
 	syslog.h \
 	unistd.h \
 	],
 	[],
 	[AC_MSG_ERROR([required header file missing])])
+fi
 
 
 #
 # Checks for typedefs, structures, and compiler characteristics
 #	
 AC_C_CONST
-TYPE_SOCKLEN_T
+
+# The test for socklen_t was getting it wrong when it exists but is in ws2tcpip.h,
+# so we use a new test.
+#TYPE_SOCKLEN_T
+
+AC_CHECK_HEADERS([sys/types.h sys/socket.h ws2tcpip.h])
+AC_MSG_CHECKING(for socklen_t)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#ifdef HAVE_SYS_TYPES_H
+	#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+	#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+	#include <ws2tcpip.h>
+#endif
+],[ socklen_t t = 0; return t; ])
+],[ac_cv_socklen_t="yes"],[ac_cv_socklen_t="no"])
+if test "$ac_cv_socklen_t" = "yes"; then
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no, using int])
+	AC_DEFINE(socklen_t, int, [Type for storing the length of struct sockaddr])
+fi
 
 
 #
@@ -338,6 +421,11 @@ TYPE_SOCKLEN_T
 AC_FUNC_VPRINTF
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])
+#
+# Solaris needs -lsocket -lnsl -lrt
+AC_SEARCH_LIBS([bind],           [socket])
+AC_SEARCH_LIBS([gethostbyname],  [nsl])
+AC_SEARCH_LIBS([sched_getparam], [rt])
 
 
 #

ixml/Makefile.am

@@ -2,7 +2,7 @@
 #
 # "Makefile.am" for "libupnp/ixml"
 #
-# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 SUBDIRS 		= doc
@@ -24,15 +24,23 @@ libixml_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
 			  -export-symbols-regex '^ixml.*'
 
 libixml_la_SOURCES	= \
-			src/ixml.c src/node.c src/ixmlparser.c \
-			src/ixmlmembuf.c src/nodeList.c \
-			src/element.c src/attr.c src/document.c \
+			src/attr.c \
+			src/document.c \
+			src/element.c \
+			src/inc/ixmlmembuf.h \
+			src/inc/ixmlparser.h \
+			src/ixml.c \
+			src/ixmldebug.c \
+			src/ixmlparser.c \
+			src/ixmlmembuf.c \
 			src/namedNodeMap.c \
-			src/inc/ixmlmembuf.h src/inc/ixmlparser.h
+			src/node.c \
+			src/nodeList.c
 
 upnpincludedir		= $(includedir)/upnp
-upnpinclude_HEADERS	= inc/ixml.h 
-
+upnpinclude_HEADERS	= \
+			inc/ixml.h \
+			inc/ixmldebug.h
 
 check_PROGRAMS          = test_document
 TESTS                   = test/test_document.sh
@@ -47,4 +55,3 @@ dist-hook:
 clean-local:
 	@if [ -d bin ] ; then  rm -rf bin ; fi
 
-

ixml/inc/ixmldebug.h

@@ -0,0 +1,41 @@
+
+
+#ifndef IXMLDEBUG_H
+#define IXMLDEBUG_H
+
+
+#include "UpnpGlobal.h"
+
+
+/*!
+ * \file
+ *
+ * \brief Auxiliar routines to aid debugging.
+ */
+
+
+/*!
+ * \brief Prints the debug statement either on the standard output or log file
+ * along with the information from where this debug statement is coming.
+ */ 
+#ifdef DEBUG
+void IxmlPrintf(
+	/*! [in] Printf like format specification. */
+	const char* FmtStr,
+	/*! [in] Printf like Variable number of arguments that will go in the debug
+	 * statement. */
+	...)
+#if (__GNUC__ >= 3)
+	/* This enables printf like format checking by the compiler */
+	__attribute__((format (__printf__, 1, 2)))
+#endif
+;
+#else /* DEBUG */
+static UPNP_INLINE void IxmlPrintf(
+	const char* FmtStr,
+	...) {}
+#endif /* DEBUG */
+
+
+#endif /* IXMLDEBUG_H */
+

ixml/src/attr.c

@@ -1,60 +1,53 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
 #include "ixmlparser.h"
 
-/*================================================================
-*   Function: Attr_init
-*       Initializes an attribute node
-*       External function.
-*
-*=================================================================*/
-void
-ixmlAttr_init( IN IXML_Attr * attr )
+
+#include <string.h>
+
+
+void ixmlAttr_init(IN IXML_Attr *attr)
 {
-    if( attr != NULL ) {
-        memset( attr, 0, sizeof( IXML_Attr ) );
+	if (attr != NULL) {
+		memset(attr, 0, sizeof (IXML_Attr));
 	}
 }
 
-/*================================================================
-*   Function: Attr_free
-*       Frees an attribute node.
-*       external function.
-*
-*=================================================================*/
-void
-ixmlAttr_free( IN IXML_Attr * attr )
+
+void ixmlAttr_free(IN IXML_Attr *attr)
 {
-    if( attr != NULL ) {
-        ixmlNode_free( ( IXML_Node * ) attr );
+	if (attr != NULL) {
+		ixmlNode_free((IXML_Node *)attr);
 	}
 }
+

ixml/src/inc/ixmlmembuf.h

@@ -1,73 +1,173 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
+
+#ifndef IXML_MEMBUF_H
+#define IXML_MEMBUF_H
+
+
+/*!
+ * \file
+ */
 
-#ifndef _IXML_MEMBUF_H
-#define _IXML_MEMBUF_H
 
-#include <stdlib.h>
 #include "ixml.h"
 
-#define MINVAL( a, b ) ( (a) < (b) ? (a) : (b) )
-#define MAXVAL( a, b ) ( (a) > (b) ? (a) : (b) )
+
+#include <stdlib.h> /* for size_t */
+
+
+#define MINVAL(a, b) ( (a) < (b) ? (a) : (b) )
+#define MAXVAL(a, b) ( (a) > (b) ? (a) : (b) )
+
 
 #define MEMBUF_DEF_SIZE_INC 20
 
 
-typedef struct // ixml_membuf 
+/*!
+ * \brief The ixml_membuf type.
+ */
+typedef struct
 {
 	char *buf;	
-				
 	size_t length;
 	size_t capacity;
 	size_t size_inc;
-
 } ixml_membuf;
 
-//--------------------------------------------------
-//////////////// functions /////////////////////////
-//--------------------------------------------------
-/*
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-*/
 
-void ixml_membuf_init(INOUT ixml_membuf *m);
-void ixml_membuf_destroy(INOUT ixml_membuf *m);
-int ixml_membuf_assign(INOUT ixml_membuf *m, IN const void *buf, 
-					 IN size_t buf_len );
-int ixml_membuf_assign_str(INOUT ixml_membuf *m, IN const char *c_str );
-int ixml_membuf_append(INOUT ixml_membuf *m, IN const void *buf);
-int ixml_membuf_append_str(INOUT ixml_membuf *m, IN const char *c_str);
-int ixml_membuf_insert(INOUT ixml_membuf *m, IN const void* buf, 
-					 IN size_t buf_len, int index );
+/*!
+ * \brief ixml_membuf initialization routine.
+ */
+void ixml_membuf_init(
+	/*! [in,out] The memory buffer to initializa. */
+	ixml_membuf *m);
+
+
+/*!
+ * \brief ixml_membuf clearing routine.
+ *
+ * The internal buffer is deleted and ixml_membuf_init() is called in the end
+ * to reinitialize the buffer.
+ */
+void ixml_membuf_destroy(
+	/*! [in,out] The memory buffer to clear. */
+	ixml_membuf *m);
+
+
+/*!
+ * \brief Copies the contents o a buffer to the designated ixml_membuf.
+ *
+ * The previous contents of the ixml_membuf are destroyed.
+ *
+ * \return IXML_SUCCESS if successfull, or the error code returned
+ * by ixml_membuf_set_size().
+ *
+ * \sa ixml_membuf_assign_str().
+ */
+int ixml_membuf_assign(
+	/*! [in,out] The memory buffer on which to operate. */
+	ixml_membuf *m,
+	/*! [in] The input buffer to copy from. */
+	const void *buf, 
+	/*! [in] The number of bytes to copy from the input buffer. */
+	size_t buf_len);
+
+/*!
+ * \brief Copies a \b NULL terminated string to the ixml_buffer.
+ *
+ * This is a convenience function that internally uses ixml_membuf_assign().
+ *
+ * \return The return value of ixml_membuf_assign().
+ *
+ * \sa ixml_membuf_assign().
+ */
+int ixml_membuf_assign_str(
+	/*! [in,out] The memory buffer on which to operate. */
+	ixml_membuf *m,
+	/*! [in] The input string to copy from. */
+	const char *c_str);
+
+/*!
+ * \brief Appends one byte to the designated ixml_membuffer.
+ *
+ * This is a convenience function that internally uses ixml_membuf_insert().
+ *
+ * \return The return value of ixml_membuf_insert().
+ *
+ * \sa ixml_membuf_insert()
+ */
+int ixml_membuf_append(
+	/*! [in,out] The memory buffer on which to operate. */
+	ixml_membuf *m,
+	/*! [in] The pointer to the byte to append. */
+	const void *buf);
+
+/*!
+ * \brief Appends the contents of a \b NULL terminated string to the designated
+ * ixml_membuf.
+ *
+ * This is a convenience function that internally uses ixml_membuf_insert().
+ *
+ * \return The return value of ixml_membuf_insert().
+ *
+ * \sa ixml_membuf_insert().
+ */
+int ixml_membuf_append_str(
+	/*! [in,out] The memory buffer on which to operate. */
+	ixml_membuf *m,
+	/*! [in] The input string to copy from. */
+	const char *c_str);
+
+/*!
+ * \brief 
+ *
+ * \return
+ * 	\li 0 if successfull.
+ * 	\li IXML_INDEX_SIZE_ERR if the index parameter is out of range.
+ * 	\li Or the return code of ixml_membuf_set_size()
+ *
+ * \sa ixml_membuf_set_size()
+ */
+int ixml_membuf_insert(
+	/*! [in,out] The memory buffer on which to operate. */
+	ixml_membuf *m,
+	/*! [in] The pointer to the input buffer. */
+	const void *buf, 
+	/*! [in] The buffer length. */
+	size_t buf_len,
+	/*! [in] The point of insertion relative to the beggining of the
+	 * ixml_membuf internal buffer. */
+	int index);
+
+
+#endif /* IXML_MEMBUF_H */
 
-#endif // _IXML_MEMBUF_H

ixml/src/inc/ixmlparser.h

@@ -1,41 +1,49 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
+
+#ifndef IXMLPARSER_H
+#define IXMLPARSER_H
+
+
+/*!
+ * \file
+ */
 
-#ifndef _IXMLPARSER_H
-#define _IXMLPARSER_H
 
 #include "ixml.h"
 #include "ixmlmembuf.h"
 
-// Parser definitions
+
+/* Parser definitions */
 #define QUOT        """
 #define LT          "<"
 #define GT          ">"
@@ -44,6 +52,7 @@
 #define ESC_HEX     "&#x"
 #define ESC_DEC     "&#"
 
+
 typedef struct _IXML_NamespaceURI 
 {
 	char *nsURI;
@@ -69,52 +78,192 @@ typedef enum
 	eCONTENT,
 } PARSER_STATE;
 
+
 typedef struct _Parser
 {
-    char            *dataBuffer;	//data buffer
-    char            *curPtr;		//ptr to the token parsed 
-    char            *savePtr;		//Saves for backup
+	/*! Data buffer. */
+	char *dataBuffer;
+	/*! Pointer to the token parsed. */
+	char *curPtr;
+	/*! Saves for backup. */
+	char *savePtr;
 	ixml_membuf lastElem;
 	ixml_membuf tokenBuf;    
-
 	IXML_Node *pNeedPrefixNode;
 	IXML_ElementStack *pCurElement;
 	IXML_Node *currentNodePtr;
 	PARSER_STATE state;
-
 	BOOL bHasTopLevel;
-
 } Parser;
 
 
+/*!
+ * \brief Check to see whether name is a valid xml name.
+ */
+BOOL Parser_isValidXmlName(
+	/*! [in] The string to be checked. */
+	const DOMString name);
+
+
+/*!
+ * \brief Sets the error character.
+ *
+ * If 'c' is 0 (default), the parser is strict about XML encoding:
+ * invalid UTF-8 sequences or "&" entities are rejected, and the parsing 
+ * aborts.
+ *
+ * If 'c' is not 0, the parser is relaxed: invalid UTF-8 characters
+ * are replaced by this character, and invalid "&" entities are left
+ * untranslated. The parsing is then allowed to continue.
+ */
+void Parser_setErrorChar(
+	/*! [in] The character to become the error character. */
+	char c);
+
+
+/*!
+ * \brief Fees a node contents.
+ */
+void Parser_freeNodeContent(
+	/*! [in] The Node to process. */
+	IXML_Node *IXML_Nodeptr);
+
+int Parser_LoadDocument(IXML_Document **retDoc, const char * xmlFile, BOOL file);
 
-int     Parser_LoadDocument( IXML_Document **retDoc, const char * xmlFile, BOOL file);
-BOOL    Parser_isValidXmlName( const DOMString name);
 int Parser_setNodePrefixAndLocalName(IXML_Node *newIXML_NodeIXML_Attr);
-void    Parser_freeNodeContent( IXML_Node *IXML_Nodeptr);
 
-void    Parser_setErrorChar( char c );
 
-void    ixmlAttr_free(IXML_Attr *attrNode);
 void ixmlAttr_init(IXML_Attr *attrNode);
 
-int     ixmlElement_setTagName(IXML_Element *element, const char *tagName);
+/*!
+ * \brief Set the given element's tagName.
+ *
+ * \return One of the following:
+ * 	\li \b IXML_SUCCESS, if successfull.
+ * 	\li \b IXML_FAILED, if element of tagname is \b NULL.
+ * 	\li \b IXML_INSUFFICIENT_MEMORY, if there is no memory to allocate the
+ * 		buffer for the element's tagname.
+ */
+int ixmlElement_setTagName(
+	/*! [in] The element to change the tagname. */
+	IXML_Element *element,
+	/*! [in] The new tagName for the element. */
+	const char *tagName);
 
-void    ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap);
-int     ixmlNamedNodeMap_addToNamedNodeMap(IXML_NamedNodeMap **nnMap, IXML_Node *add);
 
-void    ixmlNode_init(IXML_Node *IXML_Nodeptr);
-BOOL    ixmlNode_compare(IXML_Node *srcIXML_Node, IXML_Node *destIXML_Node);
+/*!
+ * \brief Initializes a NamedNodeMap object.
+ */
+void ixmlNamedNodeMap_init(
+	/*! [in] The named node map to process. */
+	IXML_NamedNodeMap *nnMap);
 
-void    ixmlNode_getElementsByTagName( IXML_Node *n, const char *tagname, IXML_NodeList **list);
-void    ixmlNode_getElementsByTagNameNS( IXML_Node *IXML_Node, const char *namespaceURI,
-                const char *localName, IXML_NodeList **list);
 
-int     ixmlNode_setNodeProperties(IXML_Node* node, IXML_Node *src);
-int     ixmlNode_setNodeName( IXML_Node* node, const DOMString qualifiedName);
+/*!
+ * \brief Add a node to a NamedNodeMap.
+ *
+ * \return IXML_SUCCESS or failure.
+ */
+int ixmlNamedNodeMap_addToNamedNodeMap(
+	/* [in] The named node map. */
+	IXML_NamedNodeMap **nnMap,
+	/* [in] The node to add. */
+	IXML_Node *add);
 
-void    ixmlNodeList_init(IXML_NodeList *nList);
-int     ixmlNodeList_addToNodeList(IXML_NodeList **nList, IXML_Node *add);
+/*!
+ * \brief Add a node to nodelist.
+ */
+int ixmlNodeList_addToNodeList(
+	/*! [in] The pointer to the nodelist. */
+	IXML_NodeList **nList,
+	/*! [in] The node to add. */
+	IXML_Node *add);
 
-#endif  // _IXMLPARSER_H
+
+/*!
+ * \brief Intializes a node.
+ */
+void ixmlNode_init(
+	/*! [in] The \b Node to iniatialize. */
+	IN IXML_Node *nodeptr);
+
+
+/*!
+ * \brief Compare two nodes to see whether they are the same node.
+ * Parent, sibling and children node are ignored.
+ *
+ * \return
+ * 	\li TRUE, the two nodes are the same.
+ * 	\li FALSE, the two nodes are not the same.
+ */
+BOOL ixmlNode_compare(
+	/*! [in] The first \b Node. */
+	IXML_Node *srcNode,
+	/*! [in] The second \b Node. */
+ 	IXML_Node *destNode);
+
+
+/*!
+ * \brief Returns a nodeList of all descendant Elements with a given tagName,
+ * in the order in which they are encountered in a traversal of this element
+ * tree.
+ */
+void ixmlNode_getElementsByTagName(
+	/*! [in] The \b Node tree. */
+	IXML_Node *n,
+	/*! [in] The tag name to match. */
+	const char *tagname,
+	/*! [out] The output \b NodeList. */
+	IXML_NodeList **list);
+
+
+/*!
+ * \brief Returns a nodeList of all the descendant Elements with a given local
+ * name and namespace URI in the order in which they are encountered in a
+ * preorder traversal of this Elememt tree.		
+ */
+void ixmlNode_getElementsByTagNameNS(
+	/*! [in] The \b Element tree. */
+	IXML_Node *n,
+	/*! [in] The name space to match. */
+	const char *namespaceURI,
+	/*! [in] The local name to match. */
+	const char *localName,
+	/*! [out] The output \b NodeList. */
+	IXML_NodeList **list);
+
+
+/*!
+ * \brief 
+ *
+ * \return 
+ */
+int ixmlNode_setNodeName(
+	/*! [in] The \b Node. */
+	IXML_Node *node,
+	/*! [in] . */
+	const DOMString qualifiedName);
+
+
+/*!
+ * \brief 
+ *
+ * \return 
+ */
+int ixmlNode_setNodeProperties(
+	/*! [in] . */
+	IXML_Node *destNode,
+	/*! [in] . */
+	IXML_Node *src);
+
+
+/*!
+ * \brief Initializes a nodelist 
+ */
+void ixmlNodeList_init(
+	/*! [in,out] The \b NodeList to initialize. */
+	IXML_NodeList *nList);
+
+
+#endif  /* IXMLPARSER_H */
 

ixml/src/ixml.c

@@ -1,531 +1,469 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
 
+
+/*!
+ * \file
+ */
+
+
+#include "ixmldebug.h"
 #include "ixmlmembuf.h"
 #include "ixmlparser.h"
 
-/*================================================================
-*   copy_with_escape
-*
-*
-*=================================================================*/
-static void
-copy_with_escape( INOUT ixml_membuf * buf,
-                  IN const char *p )
+
+#include <stdlib.h> /* for free() */
+#include <string.h>
+
+
+/*!
+ * \brief Appends a string to a buffer, substituting some characters by escape
+ * sequences.
+ */
+static void copy_with_escape(
+	/*! [in,out] The input/output buffer. */
+	ixml_membuf *buf,
+	/*! [in] The string to copy from. */
+	const char *p)
 {
 	int i;
 	int plen;
 
-    if( p == NULL )
+	if (p == NULL) {
 		return;
+	}
 
 	plen = strlen( p );
 
-    for( i = 0; i < plen; i++ ) {
-        switch ( p[i] ) {
+	for (i = 0; i < plen; i++) {
+		switch (p[i]) {
 		case '<':
-                ixml_membuf_append_str( buf, "&lt;" );
+			ixml_membuf_append_str(buf, "&lt;");
 			break;
 
 		case '>':
-                ixml_membuf_append_str( buf, "&gt;" );
+			ixml_membuf_append_str(buf, "&gt;");
 			break;
 
 		case '&':
-                ixml_membuf_append_str( buf, "&amp;" );
+			ixml_membuf_append_str(buf, "&amp;");
 			break;
 
 		case '\'':
-                ixml_membuf_append_str( buf, "&apos;" );
+			ixml_membuf_append_str(buf, "&apos;");
 			break;
 
 		case '\"':
-                ixml_membuf_append_str( buf, "&quot;" );
+			ixml_membuf_append_str(buf, "&quot;");
 			break;
 
 		default:
-                ixml_membuf_append( buf, &p[i] );
+			ixml_membuf_append(buf, &p[i]);
+			break;
 		}
 	}
 }
 
-/*================================================================
-*	ixmlPrintDomTreeRecursive
-*       It is a recursive function to print all the node in a tree.
-*       Internal to parser only.
-*
-*=================================================================*/
-void
-ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
-                           IN ixml_membuf * buf )
+
+/*!
+ * \brief Recursive function to print all the node in a tree.
+ * Internal to parser only.
+ */
+static void ixmlPrintDomTreeRecursive(
+	/*! [in] \todo documentation. */
+	IXML_Node *nodeptr,
+	/*! [in] \todo documentation. */
+	ixml_membuf *buf)
 {
 	const char *nodeName = NULL;
 	const char *nodeValue = NULL;
 	IXML_Node *child = NULL,
 	*sibling = NULL;
 
-    if( nodeptr != NULL ) {
-        nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
-        nodeValue = ixmlNode_getNodeValue( nodeptr );
-
-        switch ( ixmlNode_getNodeType( nodeptr ) ) {
+	if (nodeptr != NULL) {
+		nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
+		nodeValue = ixmlNode_getNodeValue(nodeptr);
 		
+		switch (ixmlNode_getNodeType(nodeptr)) {
 		case eTEXT_NODE:
-                copy_with_escape( buf, nodeValue );
+			copy_with_escape(buf, nodeValue);
 			break;
 
 		case eCDATA_SECTION_NODE:
-                ixml_membuf_append_str( buf, "<![CDATA[" );
-                ixml_membuf_append_str( buf, nodeValue );
-                ixml_membuf_append_str( buf, "]]>" );
+			ixml_membuf_append_str(buf, "<![CDATA[");
+			ixml_membuf_append_str(buf, nodeValue);
+			ixml_membuf_append_str(buf, "]]>");
 			break;
 
 		case ePROCESSING_INSTRUCTION_NODE:
-                ixml_membuf_append_str( buf, "<?" );
-                ixml_membuf_append_str( buf, nodeName );
-                ixml_membuf_append_str( buf, " " );
-                copy_with_escape( buf, nodeValue );
-                ixml_membuf_append_str( buf, "?>\n" );
+			ixml_membuf_append_str(buf, "<?");
+			ixml_membuf_append_str(buf, nodeName);
+			ixml_membuf_append_str(buf, " ");
+			copy_with_escape(buf, nodeValue);
+			ixml_membuf_append_str(buf, "?>\n");
 			break;
 
 		case eDOCUMENT_NODE:
-                ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild
-                                           ( nodeptr ), buf );
+			ixmlPrintDomTreeRecursive(
+				ixmlNode_getFirstChild(nodeptr), buf);
 			break;
 
 		case eATTRIBUTE_NODE:
-                ixml_membuf_append_str( buf, nodeName );
-                ixml_membuf_append_str( buf, "=\"" );
-                copy_with_escape( buf, nodeValue );
-                ixml_membuf_append_str( buf, "\"" );
-
-                if( nodeptr->nextSibling != NULL ) {
-                    ixml_membuf_append_str( buf, " " );
-                    ixmlPrintDomTreeRecursive( nodeptr->nextSibling, buf );
+			ixml_membuf_append_str(buf, nodeName);
+			ixml_membuf_append_str(buf, "=\"");
+			copy_with_escape(buf, nodeValue);
+			ixml_membuf_append_str(buf, "\"");
+			if (nodeptr->nextSibling != NULL) {
+				ixml_membuf_append_str(buf, " ");
+				ixmlPrintDomTreeRecursive(nodeptr->nextSibling, buf);
 			}
 			break;
 
 		case eELEMENT_NODE:
-                ixml_membuf_append_str( buf, "<" );
-                ixml_membuf_append_str( buf, nodeName );
-
-                if( nodeptr->firstAttr != NULL ) {
-                    ixml_membuf_append_str( buf, " " );
-                    ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+			ixml_membuf_append_str(buf, "<");
+			ixml_membuf_append_str(buf, nodeName);
+			if (nodeptr->firstAttr != NULL) {
+				ixml_membuf_append_str(buf, " ");
+				ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
 			}
-
-                child = ixmlNode_getFirstChild( nodeptr );
-                if( ( child != NULL )
-                    && ( ixmlNode_getNodeType( child ) ==
-                         eELEMENT_NODE ) ) {
-                    ixml_membuf_append_str( buf, ">\r\n" );
+			child = ixmlNode_getFirstChild(nodeptr);
+			if (child != NULL &&
+			    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
+				ixml_membuf_append_str(buf, ">\r\n");
 			} else {
-                    ixml_membuf_append_str( buf, ">" );
+				ixml_membuf_append_str(buf, ">");
 			}
-
 			//  output the children
-                ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild
-                                           ( nodeptr ), buf );
+			ixmlPrintDomTreeRecursive(
+				ixmlNode_getFirstChild(nodeptr), buf);
 
 			// Done with children.  Output the end tag.
-                ixml_membuf_append_str( buf, "</" );
-                ixml_membuf_append_str( buf, nodeName );
+			ixml_membuf_append_str(buf, "</");
+			ixml_membuf_append_str(buf, nodeName);
 
-                sibling = ixmlNode_getNextSibling( nodeptr );
-                if( sibling != NULL
-                    && ixmlNode_getNodeType( sibling ) == eTEXT_NODE ) {
+			sibling = ixmlNode_getNextSibling(nodeptr);
+			if (sibling != NULL &&
+			    ixmlNode_getNodeType(sibling) == eTEXT_NODE) {
 				ixml_membuf_append_str( buf, ">" );
 			} else {
 				ixml_membuf_append_str( buf, ">\r\n" );
 			}
-                ixmlPrintDomTreeRecursive( ixmlNode_getNextSibling
-                                           ( nodeptr ), buf );
+			ixmlPrintDomTreeRecursive(
+				ixmlNode_getNextSibling(nodeptr), buf);
 			break;
 
 		default:
+			IxmlPrintf("(%s::ixmlPrintDomTreeRecursive) line %d: "
+				"Warning, unknown node type %d\n",
+				__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
 			break;
 		}
 	}
 }
 
-/*================================================================
-*   ixmlPrintDomTree
-*       Print a DOM tree.
-*       Element, and Attribute nodes are handled differently.
-*       We don't want to print the Element and Attribute nodes' sibling.
-*       External function.
-*
-*=================================================================*/
-void
-ixmlPrintDomTree( IN IXML_Node * nodeptr,
-                  IN ixml_membuf * buf )
+
+/*!
+ * \brief Print a DOM tree.
+ *
+ * Element, and Attribute nodes are handled differently. We don't want to print
+ * the Element and Attribute nodes' sibling.
+ */
+static void ixmlPrintDomTree(
+	/*! [in] \todo documentation. */
+	IXML_Node *nodeptr,
+	/*! [in] \todo documentation. */
+	ixml_membuf *buf)
 {
 	const char *nodeName = NULL;
 	const char *nodeValue = NULL;
 	IXML_Node *child = NULL;
 
-    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+	if (nodeptr == NULL || buf == NULL) {
 		return;
 	}
 
-    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
-    nodeValue = ixmlNode_getNodeValue( nodeptr );
-
-    switch ( ixmlNode_getNodeType( nodeptr ) ) {
-
+	nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
+	nodeValue = ixmlNode_getNodeValue(nodeptr);
+	switch (ixmlNode_getNodeType(nodeptr)) {
 	case eTEXT_NODE:
 	case eCDATA_SECTION_NODE:
 	case ePROCESSING_INSTRUCTION_NODE:
 	case eDOCUMENT_NODE:
-            ixmlPrintDomTreeRecursive( nodeptr, buf );
+		ixmlPrintDomTreeRecursive(nodeptr, buf);
 		break;
 
 	case eATTRIBUTE_NODE:
-            ixml_membuf_append_str( buf, nodeName );
-            ixml_membuf_append_str( buf, "=\"" );
-            copy_with_escape( buf, nodeValue );
-            ixml_membuf_append_str( buf, "\"" );
+		ixml_membuf_append_str(buf, nodeName);
+		ixml_membuf_append_str(buf, "=\"");
+		copy_with_escape(buf, nodeValue);
+		ixml_membuf_append_str(buf, "\"");
 		break;
 
 	case eELEMENT_NODE:
-            ixml_membuf_append_str( buf, "<" );
-            ixml_membuf_append_str( buf, nodeName );
-
-            if( nodeptr->firstAttr != NULL ) {
-                ixml_membuf_append_str( buf, " " );
-                ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+		ixml_membuf_append_str(buf, "<");
+		ixml_membuf_append_str(buf, nodeName);
+		if (nodeptr->firstAttr != NULL) {
+			ixml_membuf_append_str(buf, " ");
+			ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
 		}
-
-            child = ixmlNode_getFirstChild( nodeptr );
-            if( ( child != NULL )
-                && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
-                ixml_membuf_append_str( buf, ">\r\n" );
+		child = ixmlNode_getFirstChild(nodeptr);
+		if (child != NULL &&
+		    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
+			ixml_membuf_append_str(buf, ">\r\n");
 		} else {
-                ixml_membuf_append_str( buf, ">" );
+			ixml_membuf_append_str(buf, ">");
 		}
 
 		// output the children
-            ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild( nodeptr ),
-                                       buf );
+		ixmlPrintDomTreeRecursive(
+			ixmlNode_getFirstChild(nodeptr), buf);
 
 		// Done with children. Output the end tag.
-            ixml_membuf_append_str( buf, "</" );
-            ixml_membuf_append_str( buf, nodeName );
-            ixml_membuf_append_str( buf, ">\r\n" );
+		ixml_membuf_append_str(buf, "</");
+		ixml_membuf_append_str(buf, nodeName);
+		ixml_membuf_append_str(buf, ">\r\n");
 		break;
 
 	default:
+		IxmlPrintf("(%s::ixmlPrintDomTree) line %d: "
+			"Warning, unknown node type %d\n",
+			__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
 		break;
 	}
 }
 
-/*================================================================
-*   ixmlDomTreetoString
-*       Converts a DOM tree into a text string
-*       Element, and Attribute nodes are handled differently.
-*       We don't want to print the Element and Attribute nodes' sibling.
-*       External function.
-*
-*=================================================================*/
-void
-ixmlDomTreetoString( IN IXML_Node * nodeptr,
-                     IN ixml_membuf * buf )
+
+/*!
+ * \brief Converts a DOM tree into a text string.
+ *
+ * Element, and Attribute nodes are handled differently. We don't want to print
+ * the Element and Attribute nodes' sibling.
+ */
+static void ixmlDomTreetoString(
+	/*! [in] \todo documentation. */
+	IXML_Node *nodeptr,
+	/*! [in] \todo documentation. */
+	ixml_membuf *buf)
 {
 	const char *nodeName = NULL;
 	const char *nodeValue = NULL;
 	IXML_Node *child = NULL;
 
-    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+	if (nodeptr == NULL || buf == NULL) {
 		return;
 	}
 
-    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
-    nodeValue = ixmlNode_getNodeValue( nodeptr );
-
-    switch ( ixmlNode_getNodeType( nodeptr ) ) {
+	nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
+	nodeValue = ixmlNode_getNodeValue(nodeptr);
 
+	switch (ixmlNode_getNodeType(nodeptr)) {
 	case eTEXT_NODE:
 	case eCDATA_SECTION_NODE:
 	case ePROCESSING_INSTRUCTION_NODE:
 	case eDOCUMENT_NODE:
-            ixmlPrintDomTreeRecursive( nodeptr, buf );
+		ixmlPrintDomTreeRecursive(nodeptr, buf);
 		break;
 
 	case eATTRIBUTE_NODE:
-            ixml_membuf_append_str( buf, nodeName );
-            ixml_membuf_append_str( buf, "=\"" );
-            copy_with_escape( buf, nodeValue );
-            ixml_membuf_append_str( buf, "\"" );
+		ixml_membuf_append_str(buf, nodeName);
+		ixml_membuf_append_str(buf, "=\"");
+		copy_with_escape(buf, nodeValue );
+		ixml_membuf_append_str(buf, "\"");
 		break;
 
 	case eELEMENT_NODE:
-            ixml_membuf_append_str( buf, "<" );
-            ixml_membuf_append_str( buf, nodeName );
-
-            if( nodeptr->firstAttr != NULL ) {
-                ixml_membuf_append_str( buf, " " );
-                ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+		ixml_membuf_append_str(buf, "<");
+		ixml_membuf_append_str(buf, nodeName);
+		if (nodeptr->firstAttr != NULL) {
+			ixml_membuf_append_str(buf, " ");
+			ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
 		}
-
-            child = ixmlNode_getFirstChild( nodeptr );
-            if( ( child != NULL )
-                && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
-                ixml_membuf_append_str( buf, ">" );
+		child = ixmlNode_getFirstChild(nodeptr);
+		if (child != NULL &&
+		    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
+			ixml_membuf_append_str(buf, ">");
 		} else {
-                ixml_membuf_append_str( buf, ">" );
+			ixml_membuf_append_str(buf, ">");
 		}
 
 		//  output the children
-            ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild( nodeptr ),
-                                       buf );
+		ixmlPrintDomTreeRecursive(ixmlNode_getFirstChild(nodeptr), buf);
 
 		// Done with children.  Output the end tag.
-            ixml_membuf_append_str( buf, "</" );
-            ixml_membuf_append_str( buf, nodeName );
-            ixml_membuf_append_str( buf, ">" );
+		ixml_membuf_append_str(buf, "</");
+		ixml_membuf_append_str(buf, nodeName);
+		ixml_membuf_append_str(buf, ">");
 		break;
 
 	default:
+		IxmlPrintf("(%s::ixmlDomTreetoString) line %d: "
+			"Warning, unknown node type %d\n",
+			__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
 		break;
 	}
 }
 
-/*================================================================
-*   ixmlLoadDocumentEx
-*       Parses the given file, and returns the DOM tree from it.
-*       External function.
-*
-*=================================================================*/
-int
-ixmlLoadDocumentEx( IN const char *xmlFile,
-                    IXML_Document ** doc )
-{
 
-    if( ( xmlFile == NULL ) || ( doc == NULL ) ) {
+int ixmlLoadDocumentEx(const char *xmlFile, IXML_Document **doc)
+{
+	if (xmlFile == NULL || doc == NULL) {
 		return IXML_INVALID_PARAMETER;
 	}
 
-    return Parser_LoadDocument( doc, xmlFile, TRUE );
-}
-
-/*================================================================
-*   ixmlLoadDocument
-*       Parses the given file, and returns the DOM tree from it.
-*       External function.
-*
-*=================================================================*/
-IXML_Document *
-ixmlLoadDocument( IN const char *xmlFile )
-{
-
-    IXML_Document *doc = NULL;
-
-    ixmlLoadDocumentEx( xmlFile, &doc );
-    return doc;
-}
-
-/*================================================================
-*   ixmlPrintDocument
-*       Prints entire document, prepending XML prolog first.
-*       Puts lots of white spaces.
-*       External function.
-*
-*=================================================================*/
-
-DOMString
-ixmlPrintDocument(IXML_Document *doc)
-{
-    IXML_Node* rootNode = ( IXML_Node * )doc;
-    ixml_membuf memBuf;
-    ixml_membuf *buf = &memBuf;
-
-    if( rootNode == NULL ) {
-        return NULL;
-    }
-
-    ixml_membuf_init( buf );
-    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
-    ixmlPrintDomTree( rootNode, buf );
-    return buf->buf;
-
-}
-
-/*================================================================
-*   ixmlPrintNode
-*       Print DOM tree under node. Puts lots of white spaces
-*       External function.
-*
-*=================================================================*/
-DOMString
-ixmlPrintNode( IN IXML_Node * node )
-{
-
-    ixml_membuf memBuf;
-    ixml_membuf *buf = &memBuf;
-
-    if( node == NULL ) {
-        return NULL;
-    }
-
-    ixml_membuf_init( buf );
-    ixmlPrintDomTree( node, buf );
-    return buf->buf;
-
-}
-
-/*================================================================
-*   ixmlDocumenttoString
-*       converts DOM tree under node to text string,
-*       prepending XML prolog first.
-*       External function.
-*
-*=================================================================*/
-
-DOMString
-ixmlDocumenttoString(IXML_Document *doc)
-{
-    IXML_Node* rootNode = ( IXML_Node * )doc;
-    ixml_membuf memBuf;
-    ixml_membuf *buf = &memBuf;
-
-    if( rootNode == NULL ) {
-        return NULL;
-    }
-
-    ixml_membuf_init( buf );
-    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
-    ixmlDomTreetoString( rootNode, buf );
-    return buf->buf;
-
-}
-
-/*================================================================
-*   ixmlNodetoString
-*       converts DOM tree under node to text string
-*       External function.
-*
-*=================================================================*/
-DOMString
-ixmlNodetoString( IN IXML_Node * node )
-{
-
-    ixml_membuf memBuf;
-    ixml_membuf *buf = &memBuf;
-
-    if( node == NULL ) {
-        return NULL;
-    }
-
-    ixml_membuf_init( buf );
-    ixmlDomTreetoString( node, buf );
-    return buf->buf;
-
-}
-
-/*================================================================
-*   ixmlRelaxParser
-*       Makes the XML parser more tolerant to malformed text.
-*       External function.
-*
-*=================================================================*/
-void
-ixmlRelaxParser(char errorChar)
-{
-    Parser_setErrorChar( errorChar );
+	return Parser_LoadDocument(doc, xmlFile, TRUE);
 }
 
 
-/*================================================================
-*   ixmlParseBufferEx
-*       Parse xml file stored in buffer.
-*       External function.
-*
-*=================================================================*/
-int
-ixmlParseBufferEx( IN const char *buffer,
-                   IXML_Document ** retDoc )
-{
-
-    if( ( buffer == NULL ) || ( retDoc == NULL ) ) {
-        return IXML_INVALID_PARAMETER;
-    }
-
-    if( buffer[0] == '\0' ) {
-        return IXML_INVALID_PARAMETER;
-    }
-
-    return Parser_LoadDocument( retDoc, buffer, FALSE );
-}
-
-/*================================================================
-*   ixmlParseBuffer
-*       Parse xml file stored in buffer.
-*       External function.
-*
-*=================================================================*/
-IXML_Document *
-ixmlParseBuffer( IN const char *buffer )
+IXML_Document *ixmlLoadDocument(const char *xmlFile)
 {
 	IXML_Document *doc = NULL;
 
-    ixmlParseBufferEx( buffer, &doc );
+	ixmlLoadDocumentEx(xmlFile, &doc);
+
 	return doc;
 }
 
-/*================================================================
-*   ixmlCloneDOMString
-*       Clones a DOM String.
-*       External function.
-*
-*=================================================================*/
-DOMString
-ixmlCloneDOMString( IN const DOMString src )
+
+DOMString ixmlPrintDocument(IXML_Document *doc)
 {
-    if( src == NULL ) {
+	IXML_Node* rootNode = (IXML_Node *)doc;
+	ixml_membuf memBuf;
+	ixml_membuf *buf = &memBuf;
+
+	if(rootNode == NULL) {
 		return NULL;
 	}
 
-    return ( strdup( src ) );
+	ixml_membuf_init(buf);
+	ixml_membuf_append_str(buf, "<?xml version=\"1.0\"?>\r\n");
+	ixmlPrintDomTree(rootNode, buf);
+
+	return buf->buf;
 }
 
-/*================================================================
-*   ixmlFreeDOMString
-*       Frees a DOM String.
-*       External function.
-*
-*=================================================================*/
-void
-ixmlFreeDOMString( IN DOMString buf )
+
+DOMString ixmlPrintNode(IXML_Node *node)
 {
-    if( buf != NULL ) {
-        free( buf );
+	ixml_membuf memBuf;
+	ixml_membuf *buf = &memBuf;
+
+	if (node == NULL) {
+		return NULL;
+	}
+
+	ixml_membuf_init(buf);
+	ixmlPrintDomTree(node, buf);
+
+	return buf->buf;
+}
+
+
+DOMString ixmlDocumenttoString(IXML_Document *doc)
+{
+	IXML_Node* rootNode = (IXML_Node *)doc;
+	ixml_membuf memBuf;
+	ixml_membuf *buf = &memBuf;
+
+	if(rootNode == NULL) {
+		return NULL;
+	}
+
+	ixml_membuf_init(buf);
+	ixml_membuf_append_str(buf, "<?xml version=\"1.0\"?>\r\n");
+	ixmlDomTreetoString(rootNode, buf);
+
+	return buf->buf;
+}
+
+
+DOMString ixmlNodetoString(IXML_Node *node)
+{
+	ixml_membuf memBuf;
+	ixml_membuf *buf = &memBuf;
+
+	if (node == NULL) {
+		return NULL;
+	}
+
+	ixml_membuf_init(buf);
+	ixmlDomTreetoString(node, buf);
+
+	return buf->buf;
+}
+
+
+void ixmlRelaxParser(char errorChar)
+{
+	Parser_setErrorChar(errorChar);
+}
+
+
+int ixmlParseBufferEx(const char *buffer, IXML_Document **retDoc)
+{
+	if (buffer == NULL || retDoc == NULL) {
+		return IXML_INVALID_PARAMETER;
+	}
+
+	if (buffer[0] == '\0') {
+		return IXML_INVALID_PARAMETER;
+	}
+
+	return Parser_LoadDocument(retDoc, buffer, FALSE);
+}
+
+
+IXML_Document *ixmlParseBuffer(const char *buffer)
+{
+	IXML_Document *doc = NULL;
+
+	ixmlParseBufferEx(buffer, &doc);
+
+	return doc;
+}
+
+
+DOMString ixmlCloneDOMString(const DOMString src)
+{
+	if (src == NULL) {
+		return NULL;
+	}
+
+	return strdup(src);
+}
+
+
+void ixmlFreeDOMString(DOMString buf)
+{
+	if (buf != NULL) {
+		free(buf);
 	}
 }
+

ixml/src/ixmldebug.c

@@ -0,0 +1,31 @@
+
+
+/*!
+ * \file
+ */
+
+
+#include "autoconfig.h"
+
+
+#include "ixmldebug.h"
+
+
+#include <stdarg.h>
+#include <stdio.h>
+
+
+#ifdef DEBUG
+void IxmlPrintf(
+	const char *FmtStr,
+	...)
+{
+	va_list ArgList;
+	
+	va_start(ArgList, FmtStr);
+	vfprintf(stdout, FmtStr, ArgList);
+	fflush(stdout);
+	va_end(ArgList);
+}
+#endif
+

ixml/src/ixmlmembuf.c

@@ -1,109 +1,112 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
+
+/*!
+ * \file
+ */
+
+
+#include "ixmlmembuf.h"
+#include "ixml.h"
+
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "ixmlmembuf.h"
-#include "ixml.h"
 
-/*================================================================
-*   ixml_membuf_set_size
-*
-*   Increases or decreases buffer cap so that at least
-*   'new_length' bytes can be stored
-*
-*   On error, m's fields do not change.
-*
-*   returns:
-*       UPNP_E_SUCCESS
-*       UPNP_E_OUTOF_MEMORY
-*
-*=================================================================*/
-static int
-ixml_membuf_set_size( INOUT ixml_membuf * m,
-                      IN size_t new_length )
+
+/*!
+ * \brief Increases or decreases buffer capacity so that at least 'new_length'
+ * bytes can be stored.
+ *
+ * On error, m's fields do not change.
+ *
+ * \return
+ * 	\li UPNP_E_SUCCESS
+ * 	\li UPNP_E_OUTOF_MEMORY
+ */
+static int ixml_membuf_set_size(
+	/*! [in,out] The memory buffer. */
+	INOUT ixml_membuf *m,
+	/*! [in] The new lenght. */
+	IN size_t new_length)
 {
 	size_t diff;
 	size_t alloc_len;
 	char *temp_buf;
 
-    if( new_length >= m->length )   // increase length
-    {
-        // need more mem?
-        if( new_length <= m->capacity ) {
-            return 0;           // have enough mem; done
+	if (new_length >= m->length) {
+		/* increase length */
+		/* need more mem? */
+		if (new_length <= m->capacity) {
+			/* have enough mem; done */
+			return 0;
 		}
 
 		diff = new_length - m->length;
-        alloc_len = MAXVAL( m->size_inc, diff ) + m->capacity;
-    } else                      // decrease length
-    {
-        assert( new_length <= m->length );
+		alloc_len = MAXVAL(m->size_inc, diff) + m->capacity;
+	} else {
+		// decrease length
+		assert(new_length <= m->length);
 
 		// if diff is 0..m->size_inc, don't free
-        if( ( m->capacity - new_length ) <= m->size_inc ) {
+		if ((m->capacity - new_length) <= m->size_inc) {
 			return 0;
 		}
-
 		alloc_len = new_length + m->size_inc;
 	}
 
-    assert( alloc_len >= new_length );
+	assert(alloc_len >= new_length);
 
-    temp_buf = realloc( m->buf, alloc_len + 1 );
-    if( temp_buf == NULL ) {
-        // try smaller size
+	temp_buf = realloc(m->buf, alloc_len + 1);
+	if (temp_buf == NULL) {
+		/* try smaller size */
 		alloc_len = new_length;
-        temp_buf = realloc( m->buf, alloc_len + 1 );
-
-        if( temp_buf == NULL ) {
+		temp_buf = realloc(m->buf, alloc_len + 1);
+		if (temp_buf == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;
 		}
 	}
-    // save
+	/* save */
 	m->buf = temp_buf;
 	m->capacity = alloc_len;
+
 	return 0;
 }
 
-/*================================================================
-*   membuffer_init
-*
-*
-*=================================================================*/
-void
-ixml_membuf_init( INOUT ixml_membuf * m )
+
+void ixml_membuf_init(ixml_membuf *m)
 {
-    assert( m != NULL );
+	assert(m != NULL);
 
 	m->size_inc = MEMBUF_DEF_SIZE_INC;
 	m->buf = NULL;
@@ -111,126 +114,105 @@ ixml_membuf_init( INOUT ixml_membuf * m )
 	m->capacity = 0;
 }
 
-/*================================================================
-*   membuffer_destroy
-*
-*
-*=================================================================*/
-void
-ixml_membuf_destroy( INOUT ixml_membuf * m )
+
+void ixml_membuf_destroy(ixml_membuf *m)
 {
-    if( m == NULL ) {
+	if (m == NULL) {
 		return;
 	}
 
-    free( m->buf );
-    ixml_membuf_init( m );
+	free(m->buf);
+	ixml_membuf_init(m);
 }
 
-/*================================================================
-*   ixml_membuf_assign
-*
-*
-*=================================================================*/
-int
-ixml_membuf_assign( INOUT ixml_membuf * m,
-                    IN const void *buf,
-                    IN size_t buf_len )
+
+int ixml_membuf_assign(
+	ixml_membuf *m,
+	const void *buf,
+	size_t buf_len)
 {
 	int return_code;
 
-    assert( m != NULL );
+	assert(m != NULL);
 
 	// set value to null
-    if( buf == NULL ) {
-        ixml_membuf_destroy( m );
+	if (buf == NULL) {
+		ixml_membuf_destroy(m);
 		return IXML_SUCCESS;
 	}
 	// alloc mem
-    return_code = ixml_membuf_set_size( m, buf_len );
-    if( return_code != 0 ) {
+	return_code = ixml_membuf_set_size(m, buf_len);
+	if (return_code != 0) {
 		return return_code;
 	}
-    // copy
-    memcpy( m->buf, buf, buf_len );
-    m->buf[buf_len] = 0;        // null-terminate
 
+	// copy
+	memcpy(m->buf, buf, buf_len);
+
+	// null-terminate
+	m->buf[buf_len] = 0;
 	m->length = buf_len;
 
 	return IXML_SUCCESS;
-
 }
 
-/*================================================================
-*   ixml_membuf_assign_str
-*
-*
-*=================================================================*/
-int
-ixml_membuf_assign_str( INOUT ixml_membuf * m,
-                        IN const char *c_str )
+
+int ixml_membuf_assign_str(
+	ixml_membuf *m,
+	const char *c_str)
 {
-    return ixml_membuf_assign( m, c_str, strlen( c_str ) );
+	return ixml_membuf_assign(m, c_str, strlen(c_str));
 }
 
-/*================================================================
-*   ixml_membuf_append
-*
-*
-*=================================================================*/
-int
-ixml_membuf_append( INOUT ixml_membuf * m,
-                    IN const void *buf )
+
+int ixml_membuf_append(
+	INOUT ixml_membuf *m,
+	IN const void *buf)
 {
-    assert( m != NULL );
+	assert(m != NULL);
 
-    return ixml_membuf_insert( m, buf, 1, m->length );
+	return ixml_membuf_insert(m, buf, 1, m->length);
 }
 
-/*================================================================
-*   ixml_membuf_append_str
-*
-*
-*=================================================================*/
-int
-ixml_membuf_append_str( INOUT ixml_membuf * m,
-                        IN const char *c_str )
+
+int ixml_membuf_append_str(
+	INOUT ixml_membuf *m,
+	IN const char *c_str)
 {
-    return ixml_membuf_insert( m, c_str, strlen( c_str ), m->length );
+	return ixml_membuf_insert(m, c_str, strlen(c_str), m->length);
 }
 
-/*================================================================
-*   ixml_membuf_insert
-*
-*
-*=================================================================*/
-int
-ixml_membuf_insert( INOUT ixml_membuf * m,
+
+int ixml_membuf_insert(
+	INOUT ixml_membuf *m,
 	IN const void *buf,
 	IN size_t buf_len,
-                    int index )
+	int index)
 {
-    int return_code;
+	int return_code = 0;
 
-    assert( m != NULL );
+	assert(m != NULL);
 
-    if( index < 0 || index > ( int )m->length )
+	if (index < 0 || index > (int)m->length) {
 		return IXML_INDEX_SIZE_ERR;
+	}
 
-    if( buf == NULL || buf_len == 0 ) {
+	if (buf == NULL || buf_len == 0) {
 		return 0;
 	}
-    // alloc mem
-    return_code = ixml_membuf_set_size( m, m->length + buf_len );
-    if( return_code != 0 ) {
+	/* alloc mem */
+	return_code = ixml_membuf_set_size(m, m->length + buf_len);
+	if (return_code != 0) {
 		return return_code;
 	}
-    // insert data
-    // move data to right of insertion point
-    memmove( m->buf + index + buf_len, m->buf + index, m->length - index );
-    memcpy( m->buf + index, buf, buf_len );
+	/* insert data */
+	/* move data to right of insertion point */
+	memmove(m->buf + index + buf_len, m->buf + index, m->length - index);
+	memcpy(m->buf + index, buf, buf_len);
 	m->length += buf_len;
-    m->buf[m->length] = 0;      // null-terminate
+	/* Null terminate */
+	m->buf[m->length] = 0;
 
 	return 0;
 }
+

ixml/src/namedNodeMap.c

@@ -1,62 +1,70 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
+
+/*!
+ * \file
+ */
+
 
 #include "ixmlparser.h"
 
-/*================================================================
-*   NamedNodeMap_getItemNumber
-*       return the item number of a item in NamedNodeMap.
-*       Internal to parser only.
-*   Parameters:
-*       name: the name of the item to find
-*   
-*=================================================================*/
-unsigned long
-ixmlNamedNodeMap_getItemNumber( IN IXML_NamedNodeMap * nnMap,
-                                IN const char *name )
+
+#include <assert.h>
+#include <stdlib.h> /* for free(), malloc() */
+#include <string.h>
+
+
+/*!
+ * \brief Return the item number of a item in NamedNodeMap.
+ */
+static unsigned long ixmlNamedNodeMap_getItemNumber(
+	/*! [in] The named node map to process. */
+	IN IXML_NamedNodeMap *nnMap,
+	/*! [in] The name of the item to find. */
+	IN const char *name)
 {
 	IXML_Node *tempNode;
 	unsigned long returnItemNo = 0;
 
-    assert( nnMap != NULL && name != NULL );
-    if( ( nnMap == NULL ) || ( name == NULL ) ) {
+	assert(nnMap != NULL && name != NULL);
+	if (nnMap == NULL || name == NULL) {
 		return IXML_INVALID_ITEM_NUMBER;
 	}
 
 	tempNode = nnMap->nodeItem;
-    while( tempNode != NULL ) {
-        if( strcmp( name, tempNode->nodeName ) == 0 ) {
+	while (tempNode != NULL) {
+		if (strcmp(name, tempNode->nodeName) == 0) {
 			return returnItemNo;
 		}
-
 		tempNode = tempNode->nextSibling;
 		returnItemNo++;
 	}
@@ -64,173 +72,117 @@ ixmlNamedNodeMap_getItemNumber( IN IXML_NamedNodeMap * nnMap,
 	return IXML_INVALID_ITEM_NUMBER;
 }
 
-/*================================================================
-*   NamedNodeMap_init
-*       Initializes a NamedNodeMap object.
-*       External function.
-*
-*=================================================================*/
-void
-ixmlNamedNodeMap_init( IN IXML_NamedNodeMap * nnMap )
+
+void ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap)
 {
-    assert( nnMap != NULL );
-    memset( nnMap, 0, sizeof( IXML_NamedNodeMap ) );
+	assert(nnMap != NULL);
+
+	memset(nnMap, 0, sizeof (IXML_NamedNodeMap));
 }
 
-/*================================================================
-*   NamedNodeMap_getNamedItem
-*       Retrieves a node specified by name.
-*       External function.
-*
-*   Parameter:
-*       name: type nodeName of a node to retrieve.
-*
-*   Return Value:
-*       A Node with the specified nodeName, or null if it
-*       does not identify any node in this map.
-*
-*=================================================================*/
-IXML_Node *
-ixmlNamedNodeMap_getNamedItem( IN IXML_NamedNodeMap * nnMap,
-                               IN const char *name )
+
+IXML_Node *ixmlNamedNodeMap_getNamedItem(
+	IXML_NamedNodeMap *nnMap,
+	const DOMString name)
 {
 	long index;
 
-    if( ( nnMap == NULL ) || ( name == NULL ) ) {
+	if (nnMap == NULL || name == NULL) {
 		return NULL;
 	}
 
-    index = ixmlNamedNodeMap_getItemNumber( nnMap, name );
-    if( index == IXML_INVALID_ITEM_NUMBER ) {
+	index = ixmlNamedNodeMap_getItemNumber(nnMap, name);
+	if (index == IXML_INVALID_ITEM_NUMBER) {
 		return NULL;
 	} else {
-        return ( ixmlNamedNodeMap_item( nnMap, ( unsigned long )index ) );
+		return ixmlNamedNodeMap_item(nnMap, (unsigned long)index);
 	}
 }
 
-/*================================================================
-*   NamedNodeMap_item
-*       Returns the indexth item in the map. If index is greater than or
-*       equal to the number of nodes in this map, this returns null.
-*       External function.
-*
-*   Parameter:
-*       index: index into this map.
-*
-*   Return Value:
-*       The node at the indexth position in the map, or null if that is
-*       not a valid index.
-*
-*=================================================================*/
-IXML_Node *
-ixmlNamedNodeMap_item( IN IXML_NamedNodeMap * nnMap,
+
+IXML_Node *ixmlNamedNodeMap_item(
+	IN IXML_NamedNodeMap *nnMap,
 	IN unsigned long index )
 {
 	IXML_Node *tempNode;
 	unsigned int i;
 
-    if( nnMap == NULL ) {
+	if (nnMap == NULL) {
 		return NULL;
 	}
 
-    if( index > ixmlNamedNodeMap_getLength( nnMap ) - 1 ) {
+	if (index > ixmlNamedNodeMap_getLength(nnMap) - 1) {
 		return NULL;
 	}
 
 	tempNode = nnMap->nodeItem;
-    for( i = 0; i < index && tempNode != NULL; ++i ) {
+	for (i = 0; i < index && tempNode != NULL; ++i) {
 		tempNode = tempNode->nextSibling;
 	}
 
 	return tempNode;
 }
 
-/*================================================================
-*   NamedNodeMap_getLength	
-*       Return the number of Nodes in this map.       
-*       External function.
-*   
-*   Parameters:
-*
-*=================================================================*/
-unsigned long
-ixmlNamedNodeMap_getLength( IN IXML_NamedNodeMap * nnMap )
+
+unsigned long ixmlNamedNodeMap_getLength(IXML_NamedNodeMap *nnMap)
 {
 	IXML_Node *tempNode;
 	unsigned long length = 0;
 
-    if( nnMap != NULL ) {
+	if (nnMap != NULL) {
 		tempNode = nnMap->nodeItem;
-        for( length = 0; tempNode != NULL; ++length ) {
+		for (length = 0; tempNode != NULL; ++length) {
 			tempNode = tempNode->nextSibling;
 		}
 	}
+
 	return length;
 }
 
-/*================================================================
-*   ixmlNamedNodeMap_free
-*       frees a NamedNodeMap.
-*       External function.
-*
-*=================================================================*/
-void
-ixmlNamedNodeMap_free( IXML_NamedNodeMap * nnMap )
+
+void ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap)
 {
 	IXML_NamedNodeMap *pNext;
 
-    while( nnMap != NULL ) {
+	while (nnMap != NULL) {
 		pNext = nnMap->next;
-        free( nnMap );
+		free(nnMap);
 		nnMap = pNext;
 	}
 }
 
-/*================================================================
-*   NamedNodeMap_addToNamedNodeMap
-*       add a node to a NamedNodeMap.
-*       Internal to parser only.
-*   Parameters:
-*       add: the node to add into NamedNodeMap.
-*   Return:
-*       IXML_SUCCESS or failure.
-*
-*=================================================================*/
-int
-ixmlNamedNodeMap_addToNamedNodeMap( IN IXML_NamedNodeMap ** nnMap,
-                                    IN IXML_Node * add )
+
+int ixmlNamedNodeMap_addToNamedNodeMap(
+	IXML_NamedNodeMap **nnMap,
+	IXML_Node *add)
 {
-    IXML_NamedNodeMap *traverse = NULL,
-     *p = NULL;
+	IXML_NamedNodeMap *traverse = NULL;
+	IXML_NamedNodeMap *p = NULL;
 	IXML_NamedNodeMap *newItem = NULL;
 
-    if( add == NULL ) {
+	if(add == NULL) {
 		return IXML_SUCCESS;
 	}
 
-    if( *nnMap == NULL )        // nodelist is empty
-    {
-        *nnMap =
-            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
-        if( *nnMap == NULL ) {
+	if (*nnMap == NULL) {
+		// nodelist is empty
+		*nnMap = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
+		if (*nnMap == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;
 		}
-        ixmlNamedNodeMap_init( *nnMap );
+		ixmlNamedNodeMap_init(*nnMap);
 	}
-
-    if( ( *nnMap )->nodeItem == NULL ) {
-        ( *nnMap )->nodeItem = add;
+	if ((*nnMap)->nodeItem == NULL) {
+		(*nnMap)->nodeItem = add;
 	} else {
 		traverse = *nnMap;
 		p = traverse;
-        while( traverse != NULL ) {
+		while (traverse != NULL) {
 			p = traverse;
 			traverse = traverse->next;
 		}
-
-        newItem =
-            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
-        if( newItem == NULL ) {
+		newItem = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
+		if (newItem == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;
 		}
 		p->next = newItem;
@@ -240,3 +192,4 @@ ixmlNamedNodeMap_addToNamedNodeMap( IN IXML_NamedNodeMap ** nnMap,
 
 	return IXML_SUCCESS;
 }
+

ixml/src/nodeList.c

@@ -1,128 +1,118 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+
+/*!
+ * \file
+ */
+
 
 #include "ixmlparser.h"
 
-/*================================================================
-*   ixmlNodeList_init
-*       initializes a nodelist 
-*       External function.
-*
-*=================================================================*/
-void
-ixmlNodeList_init( IXML_NodeList * nList )
+
+#include <assert.h>
+#include <string.h>
+
+
+void ixmlNodeList_init(IXML_NodeList *nList)
 {
-    assert( nList != NULL );
-
-    memset( nList, 0, sizeof( IXML_NodeList ) );
+	assert(nList != NULL);
 
+	memset(nList, 0, sizeof (IXML_NodeList));
 }
 
-/*================================================================
-*   ixmlNodeList_item
-*       Returns the indexth item in the collection. If index is greater
-*       than or equal to the number of nodes in the list, this returns 
-*       null.
-*       External function.
-*
-*=================================================================*/
-IXML_Node *
-ixmlNodeList_item( IXML_NodeList * nList,
-                   unsigned long index )
+
+IXML_Node *ixmlNodeList_item(
+	IXML_NodeList *nList,
+	unsigned long index)
 {
 	IXML_NodeList *next;
 	unsigned int i;
 
 	// if the list ptr is NULL
-    if( nList == NULL ) {
+	if (nList == NULL) {
 		return NULL;
 	}
 	// if index is more than list length
-    if( index > ixmlNodeList_length( nList ) - 1 ) {
+	if (index > ixmlNodeList_length(nList) - 1) {
 		return NULL;
 	}
 
 	next = nList;
-    for( i = 0; i < index && next != NULL; ++i ) {
+	for (i = 0; i < index && next != NULL; ++i) {
 		next = next->next;
 	}
 
-    if( next == NULL ) return NULL;
+	if (next == NULL) {
+		return NULL;
+	}
 
 	return next->nodeItem;
-
 }
 
-/*================================================================
-*   ixmlNodeList_addToNodeList
-*       Add a node to nodelist
-*       Internal to parser only.
-*
-*=================================================================*/
-int
-ixmlNodeList_addToNodeList( IN IXML_NodeList ** nList,
-                            IN IXML_Node * add )
+int ixmlNodeList_addToNodeList(
+	IXML_NodeList **nList,
+	IXML_Node *add)
 {
-    IXML_NodeList *traverse,
-     *p = NULL;
+	IXML_NodeList *traverse = NULL;
+	IXML_NodeList *p = NULL;
 	IXML_NodeList *newListItem;
 
-    assert( add != NULL );
+	assert(add != NULL);
 
-    if( add == NULL ) {
+	if (add == NULL) {
 		return IXML_FAILED;
 	}
 
-    if( *nList == NULL )        // nodelist is empty
-    {
-        *nList = ( IXML_NodeList * ) malloc( sizeof( IXML_NodeList ) );
-        if( *nList == NULL ) {
+	if (*nList == NULL) {
+		// nodelist is empty
+		*nList = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
+		if (*nList == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;
 		}
 
-        ixmlNodeList_init( *nList );
+		ixmlNodeList_init(*nList);
 	}
 
-    if( ( *nList )->nodeItem == NULL ) {
-        ( *nList )->nodeItem = add;
+	if ((*nList)->nodeItem == NULL) {
+		(*nList)->nodeItem = add;
 	} else {
 		traverse = *nList;
-        while( traverse != NULL ) {
+		while (traverse != NULL) {
 			p = traverse;
 			traverse = traverse->next;
 		}
 
-        newListItem =
-            ( IXML_NodeList * ) malloc( sizeof( IXML_NodeList ) );
-        if( newListItem == NULL ) {
+		newListItem = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
+		if (newListItem == NULL) {
 			return IXML_INSUFFICIENT_MEMORY;
 		}
 		p->next = newListItem;
@@ -133,21 +123,14 @@ ixmlNodeList_addToNodeList( IN IXML_NodeList ** nList,
 	return IXML_SUCCESS;
 }
 
-/*================================================================
-*   ixmlNodeList_length
-*       Returns the number of nodes in the list.  The range of valid
-*       child node indices is 0 to length-1 inclusive.
-*       External function.       
-*
-*=================================================================*/
-unsigned long
-ixmlNodeList_length( IN IXML_NodeList * nList )
+
+unsigned long ixmlNodeList_length(IXML_NodeList *nList)
 {
 	IXML_NodeList *list;
 	unsigned long length = 0;
 
 	list = nList;
-    while( list != NULL ) {
+	while (list != NULL) {
 		++length;
 		list = list->next;
 	}
@@ -155,22 +138,15 @@ ixmlNodeList_length( IN IXML_NodeList * nList )
 	return length;
 }
 
-/*================================================================
-*   ixmlNodeList_free
-*       frees a nodeList
-*       External function
-*       
-*=================================================================*/
-void
-ixmlNodeList_free( IN IXML_NodeList * nList )
+
+void ixmlNodeList_free(IXML_NodeList *nList)
 {
 	IXML_NodeList *next;
 
-    while( nList != NULL ) {
+	while (nList != NULL) {
 		next = nList->next;
-
-        free( nList );
+		free(nList);
 		nList = next;
 	}
-
 }
+

libupnp.pc.in

@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libupnp
 Description: Linux SDK for UPnP Devices
 Version: @VERSION@
-Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
+Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
 Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
 

libupnp.spec

@@ -1,4 +1,4 @@
-Version: 1.6.4
+Version: 1.6.7
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 1%{?dist}

m4/rt_bool_arg_enable.m4

@@ -12,7 +12,7 @@ dnl $2 = default value, shall be m4 constant, either [yes] or [no]
 dnl $3 = help string (default value is appended) e.g. [compile debugging code]
 dnl
 dnl @version $Id: rt_bool_arg_enable.m4,v 1.2 2006/02/18 14:35:09 r3mi Exp $
-dnl @author R<>mi Turboult <r3mi@users.sourceforge.net>
+dnl @author R<>mi Turboult <r3mi@users.sourceforge.net>
 dnl @license GPLWithACException
 dnl
 dnl This file is free software, distributed under the terms of the GNU

threadutil/Makefile.am

@@ -2,7 +2,7 @@
 #
 # "Makefile.am" for "libupnp/threadutil"
 #
-# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc

threadutil/inc/ThreadPool.h

@@ -29,67 +29,134 @@
  *
  ******************************************************************************/
 
+
 #ifndef THREADPOOL_H
 #define THREADPOOL_H
 
-#ifdef UPNP_USE_MSVCPP
-	#define UPNP_INLINE
-#else
-	#define UPNP_INLINE inline
+
+/*!
+ * \file
+ */
+
+
+#include "FreeList.h"
+#include "ithread.h"
+#include "LinkedList.h"
+#include "UpnpInet.h"
+#include "UpnpGlobal.h" /* for UPNP_INLINE, EXPORT_SPEC */
+
+
+#include <errno.h>
+
+
+#ifdef WIN32
+	#include <time.h>
+	struct timezone
+	{
+		int  tz_minuteswest; /* minutes W of Greenwich */
+		int  tz_dsttime;     /* type of dst correction */
+	};
+	int gettimeofday(struct timeval *tv, struct timezone *tz);
+#else /* WIN32 */
+	#include <sys/param.h>
+	#include <sys/time.h> /* for gettimeofday() */
+	#if defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__)
+		#include <sys/resource.h>	/* for setpriority() */
+	#endif
+
 #endif
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Size of job free list */
+
+/*! Size of job free list */
 #define JOBFREELISTSIZE 100
 
+
 #define INFINITE_THREADS -1
 
+
 #define EMAXTHREADS (-8 & 1<<29)
 
-/* Invalid Policy */
+
+/*! Invalid Policy */
 #define INVALID_POLICY (-9 & 1<<29)
 
-/* Invalid JOB Id */
+
+/*! Invalid JOB Id */
 #define INVALID_JOB_ID (-2 & 1<<29)
 
-typedef enum duration {SHORT_TERM,PERSISTENT} Duration;
 
-typedef enum priority {LOW_PRIORITY,
+typedef enum duration {
+	SHORT_TERM,
+	PERSISTENT
+} Duration;
+
+
+typedef enum priority {
+	LOW_PRIORITY,
 	MED_PRIORITY,
-		       HIGH_PRIORITY} ThreadPriority;
+	HIGH_PRIORITY
+} ThreadPriority;
 
-#define DEFAULT_PRIORITY MED_PRIORITY /* default priority used by TPJobInit */
-#define DEFAULT_MIN_THREADS 1	      /* default minimum used by TPAttrInit */
-#define DEFAULT_MAX_THREADS 10	      /* default max used by TPAttrInit	*/
-#define DEFAULT_JOBS_PER_THREAD 10    /* default jobs per thread used by TPAttrInit */
-#define DEFAULT_STARVATION_TIME	500   /* default starvation time used by TPAttrInit */
-#define DEFAULT_IDLE_TIME 10 * 1000   /* default idle time used by TPAttrInit */
-#define DEFAULT_FREE_ROUTINE NULL     /* default free routine used TPJobInit */
-#define DEFAULT_MAX_JOBS_TOTAL 100    /* default max jobs used TPAttrInit */
 
-/* Statistics */
-/* always include stats because code change is minimal */
+/*! default priority used by TPJobInit */
+#define DEFAULT_PRIORITY MED_PRIORITY
+
+
+/*! default minimum used by TPAttrInit */
+#define DEFAULT_MIN_THREADS 1
+
+
+/*! default max used by TPAttrInit */
+#define DEFAULT_MAX_THREADS 10
+
+
+/*! default jobs per thread used by TPAttrInit */
+#define DEFAULT_JOBS_PER_THREAD 10
+
+
+/*! default starvation time used by TPAttrInit */
+#define DEFAULT_STARVATION_TIME	500
+
+
+/*! default idle time used by TPAttrInit */
+#define DEFAULT_IDLE_TIME 10 * 1000
+
+
+/*! default free routine used TPJobInit */
+#define DEFAULT_FREE_ROUTINE NULL
+
+
+/*! default max jobs used TPAttrInit */
+#define DEFAULT_MAX_JOBS_TOTAL 100
+
+
+/*!
+ * \brief Statistics.
+ *
+ * Always include stats because code change is minimal.
+ */
 #define STATS 1
 
+
 #ifdef _DEBUG
 	#define DEBUG 1
 #endif
 
-#include "LinkedList.h"
-#include <sys/time.h> /* for gettimeofday() */
-#include "FreeList.h"
-
-#include "ithread.h"
-#include <errno.h>
-
-#define EXPORT
 
 typedef int PolicyType;
+
+
 #define DEFAULT_POLICY SCHED_OTHER
-#define DEFAULT_SCHED_PARAM 0 /* default priority */
+
+
+/*! Default priority */
+#define DEFAULT_SCHED_PARAM 0
+
 
 /****************************************************************************
  * Name: free_routine
@@ -99,6 +166,7 @@ typedef int PolicyType;
  *****************************************************************************/
 typedef void (*free_routine)(void *arg);
 
+
 /****************************************************************************
  * Name: ThreadPoolAttr
  *
@@ -132,6 +200,7 @@ typedef struct THREADPOOLATTR
 	PolicyType schedPolicy;
 } ThreadPoolAttr;
 
+
 /****************************************************************************
  * Name: ThreadPool
  *
@@ -148,13 +217,13 @@ typedef struct THREADPOOLJOB
 	int jobId;
 } ThreadPoolJob;
 
+
 /****************************************************************************
  * Name: ThreadPoolStats
  *
  *  Description:
  *     Structure to hold statistics
  *****************************************************************************/
-
 typedef struct TPOOLSTATS
 {
 	double totalTimeHQ;
@@ -179,15 +248,12 @@ typedef struct TPOOLSTATS
 } ThreadPoolStats;
 
 
-/****************************************************************************
- * Name: ThreadPool
+/*!
+ * \brief A thread pool similar to the thread pool in the UPnP SDK.
  *
- *  Description:
- *     A thread pool similar to the thread pool in the UPnP SDK.
  * Allows jobs to be scheduled for running by threads in a 
  * thread pool. The thread pool is initialized with a 
- *     minimum and maximum thread number as well as a 
- *	   max idle time
+ * minimum and maximum thread number as well as a max idle time
  * and a jobs per thread ratio. If a worker thread waits the whole
  * max idle time without receiving a job and the thread pool
  * currently has more threads running than the minimum
@@ -196,25 +262,22 @@ typedef struct TPOOLSTATS
  * becomes greater than the set ratio and the thread pool currently has
  * less than the maximum threads then a new thread will
  * be created.
- *
- *****************************************************************************/
-
+ */
 typedef struct THREADPOOL
 {
 	ithread_mutex_t mutex;		/* mutex to protect job qs */
 	ithread_cond_t condition;	/* condition variable to signal Q */
-	ithread_cond_t start_and_shutdown; /* condition variable for start 
-					and stop */
+	ithread_cond_t start_and_shutdown; /* condition variable for start and stop */
 	int lastJobId;			/* ids for jobs */
 	int shutdown;			/* whether or not we are shutting down */
 	int totalThreads;		/* total number of threads */
+	int busyThreads;		/* number of threads that are currently executing jobs */
 	int persistentThreads;		/* number of persistent threads */
 	FreeList jobFreeList;		/* free list of jobs */
 	LinkedList lowJobQ;		/* low priority job Q */
 	LinkedList medJobQ;		/* med priority job Q */
 	LinkedList highJobQ;		/* high priority job Q */
 	ThreadPoolJob *persistentJob;	/* persistent job */
-
 	ThreadPoolAttr attr;		/* thread pool attributes */
 
 	/* statistics */
@@ -222,7 +285,6 @@ typedef struct THREADPOOL
 } ThreadPool;
 
 
-
 /****************************************************************************
  * Function: ThreadPoolInit
  *
@@ -261,6 +323,7 @@ typedef struct THREADPOOL
  *****************************************************************************/
 int ThreadPoolInit(ThreadPool *tp, ThreadPoolAttr *attr);
 
+
 /****************************************************************************
  * Function: ThreadPoolAddPersistent
  *
@@ -283,6 +346,7 @@ int ThreadPoolInit(ThreadPool *tp, ThreadPoolAttr *attr);
  *****************************************************************************/
 int ThreadPoolAddPersistent(ThreadPool*tp, ThreadPoolJob *job, int *jobId);
 
+
 /****************************************************************************
  * Function: ThreadPoolGetAttr
  *
@@ -297,6 +361,8 @@ int ThreadPoolAddPersistent(ThreadPool*tp, ThreadPoolJob *job, int *jobId);
  *      Always returns 0.
  *****************************************************************************/
 int ThreadPoolGetAttr(ThreadPool *tp, ThreadPoolAttr *out);
+
+
 /****************************************************************************
  * Function: ThreadPoolSetAttr
  *
@@ -312,6 +378,7 @@ int ThreadPoolGetAttr(ThreadPool *tp, ThreadPoolAttr *out);
  *****************************************************************************/
 int ThreadPoolSetAttr(ThreadPool *tp, ThreadPoolAttr *attr);
 
+
 /****************************************************************************
  * Function: ThreadPoolAdd
  *
@@ -331,6 +398,7 @@ int ThreadPoolSetAttr(ThreadPool *tp, ThreadPoolAttr *attr);
  *****************************************************************************/
 int ThreadPoolAdd (ThreadPool*tp, ThreadPoolJob *job, int *jobId);
 
+
 /****************************************************************************
  * Function: ThreadPoolRemove
  *
@@ -383,6 +451,7 @@ int ThreadPoolShutdown(ThreadPool *tp);
  *****************************************************************************/
 int TPJobInit(ThreadPoolJob *job, start_routine func, void *arg);
 
+
 /****************************************************************************
  * Function: TPJobSetPriority
  *
@@ -396,6 +465,7 @@ int TPJobInit(ThreadPoolJob *job, start_routine func, void *arg);
  *****************************************************************************/
 int TPJobSetPriority(ThreadPoolJob *job, ThreadPriority priority);
 
+
 /****************************************************************************
  * Function: TPJobSetFreeFunction
  *
@@ -409,6 +479,7 @@ int TPJobSetPriority(ThreadPoolJob *job, ThreadPriority priority);
  *****************************************************************************/
 int TPJobSetFreeFunction(ThreadPoolJob *job, free_routine func);
 
+
 /****************************************************************************
  * Function: TPAttrInit
  *
@@ -422,6 +493,7 @@ int TPJobSetFreeFunction(ThreadPoolJob *job, free_routine func);
  *****************************************************************************/
 int TPAttrInit(ThreadPoolAttr *attr);
 
+
 /****************************************************************************
  * Function: TPAttrSetMaxThreads
  *
@@ -435,6 +507,7 @@ int TPAttrInit(ThreadPoolAttr *attr);
  *****************************************************************************/
 int TPAttrSetMaxThreads(ThreadPoolAttr *attr, int maxThreads);
 
+
 /****************************************************************************
  * Function: TPAttrSetMinThreads
  *
@@ -448,6 +521,7 @@ int TPAttrSetMaxThreads(ThreadPoolAttr *attr, int maxThreads);
  *****************************************************************************/
 int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads);
 
+
 /****************************************************************************
  * Function: TPAttrSetIdleTime
  *
@@ -460,6 +534,7 @@ int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads);
  *****************************************************************************/
 int TPAttrSetIdleTime(ThreadPoolAttr *attr, int idleTime);
 
+
 /****************************************************************************
  * Function: TPAttrSetJobsPerThread
  *
@@ -473,6 +548,7 @@ int TPAttrSetIdleTime(ThreadPoolAttr *attr, int idleTime);
  *****************************************************************************/
 int TPAttrSetJobsPerThread(ThreadPoolAttr *attr, int jobsPerThread);
 
+
 /****************************************************************************
  * Function: TPAttrSetStarvationTime
  *
@@ -486,6 +562,7 @@ int TPAttrSetJobsPerThread(ThreadPoolAttr *attr, int jobsPerThread);
  *****************************************************************************/
 int TPAttrSetStarvationTime(ThreadPoolAttr *attr, int starvationTime);
 
+
 /****************************************************************************
  * Function: TPAttrSetSchedPolicy
  *
@@ -513,6 +590,7 @@ int TPAttrSetSchedPolicy(ThreadPoolAttr *attr, PolicyType schedPolicy);
  *****************************************************************************/
 int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
 
+
 /****************************************************************************
  * Function: ThreadPoolGetStats
  *
@@ -527,18 +605,20 @@ int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
  *      Always returns 0.
  *****************************************************************************/
 #ifdef STATS
-	EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
+	EXPORT_SPEC int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
 
-	EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats);
+	EXPORT_SPEC void ThreadPoolPrintStats(ThreadPoolStats *stats);
 #else
 	static UPNP_INLINE int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats) {}
 
 	static UPNP_INLINE void ThreadPoolPrintStats(ThreadPoolStats *stats) {}
 #endif
 
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ThreadPool */
+
+#endif /* THREADPOOL_H */
 

threadutil/inc/ithread.h

@@ -29,22 +29,42 @@
  *
  ******************************************************************************/
 
-#ifndef ITHREADH
-#define ITHREADH
+
+#ifndef ITHREAD_H
+#define ITHREAD_H
+
+
+/*!
+ * \file
+ */
+
+
+#if !defined(WIN32)
+	#include <sys/param.h>
+#endif
+
+
+#include "UpnpGlobal.h" /* For UPNP_INLINE, EXPORT_SPEC */
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
 #include <pthread.h>
-#ifndef WIN32
+#ifdef WIN32
+	/* Do not #include <unistd.h> */
+#else
 	#include <unistd.h>
 #endif
 
-#ifdef __FreeBSD__
+
+#if defined(BSD)
 	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif
 
+
 #ifdef PTHREAD_MUTEX_RECURSIVE
 	/* This system has SuS2-compliant mutex attributes.
 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
@@ -76,6 +96,7 @@ extern "C" {
  ***************************************************************************/
 typedef pthread_t ithread_t;
 
+  
 /****************************************************************************
  * Name: ithread_attr_t
  *
@@ -94,7 +115,7 @@ typedef pthread_attr_t ithread_attr_t;
  *      Thread start routine 
  *      Internal Use Only.
  ***************************************************************************/
-typedef void * (*start_routine) (void *arg);
+typedef void *(*start_routine)(void *arg);
 
   
 /****************************************************************************
@@ -163,6 +184,95 @@ typedef pthread_rwlockattr_t ithread_rwlockattr_t;
  ***************************************************************************/
 typedef pthread_rwlock_t ithread_rwlock_t;
 
+
+/****************************************************************************
+ * Function: ithread_initialize_library
+ *
+ *  Description:
+ *      Initializes the library. Does nothing in all implementations, except
+ *      when statically linked for WIN32.
+ *  Parameters:
+ *      none.
+ *  Returns:
+ *      0 on success, Nonzero on failure.
+ ***************************************************************************/
+static UPNP_INLINE int ithread_initialize_library(void) {
+	int ret = 0;
+
+#if defined(WIN32) && defined(PTW32_STATIC_LIB)
+	ret = !pthread_win32_process_attach_np();
+#endif
+
+	return ret;
+}
+
+
+/****************************************************************************
+ * Function: ithread_cleanup_library
+ *
+ *  Description:
+ *      Clean up library resources. Does nothing in all implementations, except
+ *      when statically linked for WIN32.
+ *  Parameters:
+ *      none.
+ *  Returns:
+ *      0 on success, Nonzero on failure.
+ ***************************************************************************/
+static UPNP_INLINE int ithread_cleanup_library(void) {
+	int ret = 0;
+
+#if defined(WIN32) && defined(PTW32_STATIC_LIB)
+	ret = !pthread_win32_process_detach_np();
+#endif
+
+	return ret;
+}
+
+
+/****************************************************************************
+ * Function: ithread_initialize_thread
+ *
+ *  Description:
+ *      Initializes the thread. Does nothing in all implementations, except
+ *      when statically linked for WIN32.
+ *  Parameters:
+ *      none.
+ *  Returns:
+ *      0 on success, Nonzero on failure.
+ ***************************************************************************/
+static UPNP_INLINE int ithread_initialize_thread(void) {
+	int ret = 0;
+
+#if defined(WIN32) && defined(PTW32_STATIC_LIB)
+	ret = !pthread_win32_thread_attach_np();
+#endif
+
+	return ret;
+}
+
+
+/****************************************************************************
+ * Function: ithread_cleanup_thread
+ *
+ *  Description:
+ *      Clean up thread resources. Does nothing in all implementations, except
+ *      when statically linked for WIN32.
+ *  Parameters:
+ *      none.
+ *  Returns:
+ *      0 on success, Nonzero on failure.
+ ***************************************************************************/
+static UPNP_INLINE int ithread_cleanup_thread(void) {
+	int ret = 0;
+
+#if defined(WIN32) && defined(PTW32_STATIC_LIB)
+	ret = !pthread_win32_thread_detach_np();
+#endif
+
+	return ret;
+}
+
+
 /****************************************************************************
  * Function: ithread_mutexattr_init
  *
@@ -402,8 +512,8 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Must be called before use.
  *      
  *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      const ithread_rwlockattr_t * rwlock_attr 
+ *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      const ithread_rwlockattr_t *rwlock_attr 
  *  Returns:
  *      0 on success, Nonzero on failure.
  *      Always returns 0.
@@ -418,7 +528,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *  Description:
  *      Locks rwlock for reading.
  *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *      
  *  Returns:
@@ -435,7 +545,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *  Description:
  *      Locks rwlock for writting.
  *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *      
  *  Returns:
@@ -453,7 +563,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Unlocks rwlock.
  *
  *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *      
  *  Returns:
@@ -473,7 +583,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *		rwlock is only destroyed when there are no longer any threads waiting on it. 
  *		rwlock cannot be destroyed if it is locked.
  *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
  *      rwlock must be initialized.
  *  Returns:
  *      0 on success. Nonzero on failure.
@@ -490,8 +600,8 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Initializes condition variable.
  *      Must be called before use.
  *  Parameters:
- *      ithread_cond_t * cond (must be valid non NULL pointer to pthread_cond_t)
- *      const ithread_condattr_t * cond_attr (ignored)
+ *      ithread_cond_t *cond (must be valid non NULL pointer to pthread_cond_t)
+ *      const ithread_condattr_t *cond_attr (ignored)
  *  Returns:
  *      0 on success, Nonzero on failure.
  *      See man page for pthread_cond_init
@@ -499,7 +609,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
 #define ithread_cond_init pthread_cond_init
 
 
-
 /****************************************************************************
  * Function: ithread_cond_signal
  *
@@ -507,7 +616,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Wakes up exactly one thread waiting on condition.
  *      Associated mutex MUST be locked by thread before entering this call.
  *  Parameters:
- *      ithread_cond_t * cond (must be valid non NULL pointer to 
+ *      ithread_cond_t *cond (must be valid non NULL pointer to 
  *      ithread_cond_t)
  *      cond must be initialized
  *  Returns:
@@ -524,7 +633,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Wakes up all threads waiting on condition.
  *      Associated mutex MUST be locked by thread before entering this call.
  *  Parameters:
- *      ithread_cond_t * cond (must be valid non NULL pointer to 
+ *      ithread_cond_t *cond (must be valid non NULL pointer to 
  *      ithread_cond_t)
  *      cond must be initialized
  *  Returns:
@@ -542,7 +651,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Associated mutex MUST be locked by thread before entering this call.
  *      Mutex is reacquired when call returns.
  *  Parameters:
- *      ithread_cond_t * cond (must be valid non NULL pointer to 
+ *      ithread_cond_t *cond (must be valid non NULL pointer to 
  *      ithread_cond_t)
  *      cond must be initialized
  *      ithread_mutex_t *mutex (must be valid non NULL pointer to 
@@ -559,22 +668,18 @@ typedef pthread_rwlock_t ithread_rwlock_t;
    * Function: pthread_cond_timedwait
    *
    *	Description:      
-   *      Atomically releases the associated mutex and waits on the condition. 
-   *		If the condition is not signaled in the specified time 
-   *              than the 
+   *		Atomically releases the associated mutex and waits on the
+   *	condition.
+   *		If the condition is not signaled in the specified time than the
    *	call times out and returns.
-   *		Associated mutex MUST be locked by thread before entering 
-   *              this call.
+   *		Associated mutex MUST be locked by thread before entering this call.
    *		Mutex is reacquired when call returns.
    *  Parameters:
-   *      ithread_cond_t * cond (must be valid non NULL pointer to 
-   *      ithread_cond_t)
+   *      ithread_cond_t *cond (must be valid non NULL pointer to ithread_cond_t)
    *      	cond must be initialized
-   *      ithread_mutex_t *mutex (must be valid non NULL pointer to 
-   *      ithread_mutex_t)
+   *      ithread_mutex_t *mutex (must be valid non NULL pointer to ithread_mutex_t)
    *      	Mutex must be locked.
-   *      const struct timespec *abstime (absolute time, measured 
-   *      from Jan 1, 1970)
+   *      const struct timespec *abstime (absolute time, measured from Jan 1, 1970)
    *  Returns:
    *      0 on success. ETIMEDOUT on timeout. Nonzero on failure.
    *      See man page for pthread_cond_timedwait
@@ -590,7 +695,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
    *      Releases any resources held by the condition variable. 
    *		Condition variable can no longer be used after this call.	
    *  Parameters:
-   *      ithread_cond_t * cond (must be valid non NULL pointer to 
+   *      ithread_cond_t *cond (must be valid non NULL pointer to 
    *      ithread_cond_t)
    *      cond must be initialized.
    *  Returns:
@@ -646,6 +751,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
    ***************************************************************************/
 #define ithread_exit pthread_exit
 
+
 /****************************************************************************
    * Function: ithread_get_current_thread_id
    *
@@ -669,6 +775,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
    ***************************************************************************/
 #define ithread_self pthread_self
 
+
   /****************************************************************************
    * Function: ithread_detach
    *
@@ -682,6 +789,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
    ***************************************************************************/
 #define ithread_detach pthread_detach  
 
+
   /****************************************************************************
    * Function: ithread_join
    *
@@ -701,7 +809,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
 #define ithread_join pthread_join
   
 
-
 /****************************************************************************
  * Function: isleep
  *
@@ -715,7 +822,12 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
-#define isleep sleep
+#ifdef WIN32
+	#define isleep(x) Sleep((x)*1000)
+#else
+	#define isleep sleep
+#endif
+
 
 /****************************************************************************
  * Function: isleep
@@ -730,21 +842,10 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
-#define imillisleep(x) usleep(1000*x)
-
 #ifdef WIN32
-	#ifndef UPNP_STATIC_LIB
-		#ifdef LIBUPNP_EXPORTS
-			/* set up declspec for dll export to make functions visible to library users */
-			#define EXPORT_SPEC __declspec(dllexport)
-		#else
-			#define EXPORT_SPEC __declspec(dllimport)
-		#endif
-	#else
-		#define EXPORT_SPEC
-	#endif
+	#define imillisleep Sleep
 #else
-	#define EXPORT_SPEC
+	#define imillisleep(x) usleep(1000*x)
 #endif
 
 
@@ -753,9 +854,11 @@ typedef pthread_rwlock_t ithread_rwlock_t;
 EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
 #endif
 
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ITHREADH */
+
+#endif /* ITHREAD_H */
 

threadutil/src/LinkedList.c

@@ -30,11 +30,13 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include "LinkedList.h"
-#include <sys/param.h>
+#ifndef WIN32
+	#include <sys/param.h>
+#endif
 #if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
-#include <stdlib.h>
+	#include <stdlib.h>
 #else
-#include <malloc.h>
+	#include <malloc.h>
 #endif
 #include <assert.h>
 
@@ -532,3 +534,4 @@ ListSize( LinkedList * list )
 
     return list->size;
 }
+

upnp/Makefile.am

@@ -1,7 +1,7 @@
 #
 # "Makefile.am" for "libupnp/upnp"
 #
-# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 SUBDIRS = doc . sample
@@ -19,8 +19,11 @@ LDADD = \
 
 upnpincludedir = $(includedir)/upnp
 upnpinclude_HEADERS = \
+	inc/UpnpString.h \
 	inc/upnp.h \
-	inc/upnpdebug.h
+	inc/upnpdebug.h \
+	inc/UpnpGlobal.h \
+	inc/UpnpInet.h
 
 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
@@ -46,7 +49,6 @@ libupnp_la_SOURCES = \
 	src/inc/gena_device.h \
 	src/inc/global.h \
 	src/inc/gmtdate.h \
-	src/inc/http_client.h \
 	src/inc/httpparser.h \
 	src/inc/httpreadwrite.h \
 	src/inc/md5.h \
@@ -72,6 +74,7 @@ libupnp_la_SOURCES = \
 	src/inc/util.h \
 	src/inc/utilall.h \
 	src/inc/uuid.h \
+	src/inc/VirtualDir.h \
 	src/inc/webserver.h
 
 # ssdp
@@ -110,10 +113,14 @@ libupnp_la_SOURCES += \
 	src/gena/gena_callback2.c
 
 # api
-libupnp_la_SOURCES += src/api/upnpapi.c
+libupnp_la_SOURCES += \
+	src/api/UpnpString.c \
+	src/api/upnpapi.c
+
 if ENABLE_TOOLS
 libupnp_la_SOURCES += src/api/upnptools.c
 endif
+
 if ENABLE_DEBUG
 libupnp_la_SOURCES += src/api/upnpdebug.c 
 endif
@@ -130,6 +137,12 @@ libupnp_la_SOURCES += \
 libupnp_la_SOURCES += src/urlconfig/urlconfig.c
 
 
+# inet_pton (needed on Win32, compiles to nothing elsewhere)
+libupnp_la_SOURCES += \
+	src/inet_pton.c \
+	src/inc/inet_pton.h
+
+
 # check / distcheck tests
 check_PROGRAMS = test_init
 TESTS = test_init
@@ -138,8 +151,7 @@ test_init_SOURCES = test/test_init.c
 
 EXTRA_DIST = \
 	LICENSE \
-	src/inc/inet_pton.h \
-	src/inet_pton.c \
+	m4/libupnp.m4 \
 	src/win_dll.c
 
 

upnp/inc/UpnpGlobal.h

@@ -0,0 +1,120 @@
+
+
+#ifndef UPNPGLOBAL_H
+#define UPNPGLOBAL_H
+
+
+/*!
+ * \file
+ *
+ * \brief Defines constants that for some reason are not defined on some systems.
+ */
+
+
+#if defined MYLIB_LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 != 64
+	#if defined __GNUC__
+		#warning libupnp requires largefile mode - use AC_SYS_LARGEFILE
+	#else
+		#error  libupnp requires largefile mode - use AC_SYS_LARGEFILE
+	#endif
+#endif 
+
+
+#ifdef WIN32
+	/*
+	 * EXPORT_SPEC
+	 */
+	#ifdef UPNP_STATIC_LIB
+		#define EXPORT_SPEC
+	#else /* UPNP_STATIC_LIB */
+		#ifdef LIBUPNP_EXPORTS
+			/*! set up declspec for dll export to make functions
+			 * visible to library users */
+			#define EXPORT_SPEC __declspec(dllexport)
+		#else /* LIBUPNP_EXPORTS */
+			#define EXPORT_SPEC __declspec(dllimport)
+		#endif /* LIBUPNP_EXPORTS */
+	#endif /* UPNP_STATIC_LIB */
+
+
+	/*
+	 * UPNP_INLINE
+	 * PRId64
+	 * PRIzu
+	 */
+	#ifdef UPNP_USE_MSVCPP
+		/* define some things the M$ VC++ doesn't know */
+		#define UPNP_INLINE
+		typedef __int64 int64_t;
+		#define PRId64 "I64d"
+		#define PRIzu "lu"
+	#endif /* UPNP_USE_MSVCPP */
+
+
+	#ifdef UPNP_USE_BCBPP
+		/* define some things Borland Builder doesn't know */
+		#define UPNP_INLINE inline
+		typedef __int64 int64_t;
+		#warning The Borland C compiler is probably broken on PRId64,
+		#warning please someone provide a proper fix here
+		#define PRId64 "I64d"
+		#define PRIzu "zu"
+	#endif /* UPNP_USE_BCBPP */
+
+
+	#ifdef __GNUC__
+		#define UPNP_INLINE inline
+
+		/* Note with PRIzu that in the case of Mingw32, it's the MS C
+		 * runtime printf which ends up getting called, not the glibc
+		 * printf, so it genuinely doesn't have "zu"
+		 */
+		#define PRIzu "lu"
+	#endif /* __GNUC__ */
+#else
+	/*! 
+	 * \brief Export functions on WIN32 DLLs.
+	 *
+	 * Every funtion that belongs to the library API must use this
+	 * definition upon declaration or it will not be exported on WIN32
+	 * DLLs.
+	 */
+	#define EXPORT_SPEC
+
+	/*!
+	 * \brief Declares an inline function.
+	 *
+	 * Surprisingly, there are some compilers that do not understand the
+	 * inline keyword. This definition makes the use of this keyword
+	 * portable to these systems.
+	 */
+	#define UPNP_INLINE inline
+	
+	/*!
+	 * \brief Supply the PRId64 printf() macro.
+	 *
+	 * MSVC still does not know about this.
+	 */
+	/* #define PRId64 PRId64 */
+
+	/*!
+	 * \brief Supply the PRIzu printf() macro.
+	 *
+	 * This macro was invented so that we can live a little longer with
+	 * MSVC lack of C99. "z" is the correct printf() size specifier for
+	 * the size_t type.
+	 */
+	#define PRIzu "zu"
+#endif
+
+
+/*
+ * Defining this macro here gives some interesting information about unused
+ * functions in the code. Of course, this should never go uncommented on a
+ * release.
+ */
+/*#define inline*/
+
+
+#endif /* UPNPGLOBAL_H */
+

upnp/inc/UpnpInet.h

@@ -0,0 +1,30 @@
+
+
+#ifndef UPNPINET_H
+#define UPNPINET_H
+
+
+/*!
+ * \file
+ *
+ * \brief Provides a platform independent way to include TCP/IP types and functions.
+ */
+
+
+#ifdef WIN32
+	#include <winsock2.h>
+	#include <Ws2tcpip.h>
+#else
+	#include <sys/param.h>
+	#if (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
+		#include <ifaddrs.h>
+		/* Do not move or remove the include below for "sys/socket"!
+		 * Will break FreeBSD builds. */
+		#include <sys/socket.h>
+	#endif
+	#include <netinet/in.h>
+#endif
+
+
+#endif /* UPNPINET_H */
+

upnp/inc/UpnpString.h

@@ -0,0 +1,133 @@
+
+
+#ifndef STRING_H
+#define STRING_H
+
+
+/*!
+ * \defgroup UpnpString The UpnpString Class
+ *
+ * \brief Implements string operations in the UPnP library.
+ *
+ * \author Marcelo Roberto Jimenez
+ *
+ * \version 1.0
+ *
+ * @{
+ *
+ * \file
+ *
+ * \brief UpnpString object declarartion.
+ */
+
+
+#include "UpnpGlobal.h" /* for EXPORT_SPEC */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/*!
+ * \brief Type of the string objects inside libupnp.
+ */
+typedef struct s_UpnpString UpnpString;
+
+
+/*!
+ * \brief Constructor.
+ *
+ * \return A pointer to a new allocated object.
+ */
+EXPORT_SPEC UpnpString *UpnpString_new();
+
+
+/*!
+ * \brief Destructor.
+ */
+EXPORT_SPEC void UpnpString_delete(
+	/*! [in] The \em \b this pointer. */
+	UpnpString *p);
+
+
+/*!
+ * \brief Copy Constructor.
+ *
+ * \return A pointer to a new allocated copy of the original object.
+ */
+EXPORT_SPEC UpnpString *UpnpString_dup(
+	/*! [in] The \em \b this pointer. */
+	const UpnpString *p);
+
+
+/*!
+ * \brief Assignment operator.
+ */
+EXPORT_SPEC void UpnpString_assign(
+	/*! [in] The \em \b this pointer. */
+	UpnpString *p,
+	/*! [in] The \em \b that pointer. */
+	const UpnpString *q);
+
+
+/*!
+ * \brief Returns the length of the string.
+ *
+ * \return The length of the string.
+ * */
+EXPORT_SPEC int UpnpString_get_Length(
+	/*! [in] The \em \b this pointer. */
+	const UpnpString *p);
+
+
+/*!
+ * \brief Returns the pointer to char.
+ *
+ * \return The pointer to char.
+ */
+EXPORT_SPEC const char *UpnpString_get_String(
+	/*! [in] The \em \b this pointer. */
+	const UpnpString *p);
+
+
+/*!
+ * \brief Sets the string from a pointer to char.
+ */
+EXPORT_SPEC void UpnpString_set_String(
+	/*! [in] The \em \b this pointer. */
+	UpnpString *p,
+	/*! [in] (char *) to copy from. */
+	const char *s);
+
+
+/*!
+ * \brief Sets the string from a pointer to char using a maximum of N chars.
+ */
+EXPORT_SPEC void UpnpString_set_StringN(
+	/*! [in] The \em \b this pointer. */
+	UpnpString *p,
+	/*! [in] (char *) to copy from. */
+	const char *s,
+	/*! Maximum number of chars to copy.*/
+	int n);
+
+
+/*!
+ * \brief Clears the string, sets its size to zero.
+ */
+EXPORT_SPEC void UpnpString_clear(
+	/*! [in] The \em \b this pointer. */
+	UpnpString *p);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+/* @} UpnpString The UpnpString API */
+
+
+#endif /* STRING_H */
+

upnp/inc/upnpdebug.h

@@ -1,18 +1,18 @@
 /*******************************************************************************
  *
  * Copyright (c) 2000-2003 Intel Corporation 
- * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
  * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions are met: 
  *
- * * Redistributions of source code must retain the above copyright notice, 
+ * - Redistributions of source code must retain the above copyright notice, 
  * this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
  * this list of conditions and the following disclaimer in the documentation 
  * and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+ * - Neither name of Intel Corporation nor the names of its contributors 
  * may be used to endorse or promote products derived from this software 
  * without specific prior written permission.
  * 
@@ -33,25 +33,34 @@
 #ifndef UPNP_DEBUG_H
 #define UPNP_DEBUG_H 
 
-#include "upnp.h"
+
+/*!
+ * \file
+ */
+
+
+#include "ThreadPool.h"
 #include "upnpconfig.h"
+#include "UpnpGlobal.h" /* for UPNP_INLINE */
+
 
 #include <stdio.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
-/** @name Other debugging features
-          The UPnP SDK contains other features to aid in debugging.
+/** \name Other debugging features
+ *
+ * The UPnP SDK contains other features to aid in debugging.
  */
+/*@{*/
 
-/*! @{ */
-
-/** @name Upnp_LogLevel
+/** \name Upnp_LogLevel
  *  The user has the option to select 4 different types of debugging levels,
- *  see {\tt UpnpSetLogLevel}. 
+ *  see \c UpnpSetLogLevel. 
  *  The critical level will show only those messages 
  *  which can halt the normal processing of the library, like memory 
  *  allocation errors. The remaining three levels are just for debugging 
@@ -60,14 +69,11 @@ extern "C" {
  *  Info Level displays the other important operational information 
  *  regarding the working of the library. If the user selects All, 
  *  then the library displays all the debugging information that it has.
- *  \begin{itemize}
- *    \item {\tt UPNP_CRITICAL [0]}
- *    \item {\tt UPNP_PACKET [1]}
- *    \item {\tt UPNP_INFO [2]}
- *    \item {\tt UPNP_ALL [3]}
- *  \end{itemize}
+ *    \li \c UPNP_CRITICAL [0]
+ *    \li \c UPNP_PACKET [1]
+ *    \li \c UPNP_INFO [2]
+ *    \li \c UPNP_ALL [3]
  */
-
 typedef enum Upnp_Module {
 	SSDP,
 	SOAP,
@@ -79,91 +85,69 @@ typedef enum Upnp_Module {
 	HTTP
 } Dbg_Module;
 
-/*! @{ */
+
+/*@{*/
 typedef enum Upnp_LogLevel_e {
 	UPNP_CRITICAL,
 	UPNP_PACKET,
 	UPNP_INFO,
 	UPNP_ALL
 } Upnp_LogLevel;
-/*! @} */
+/*@}*/
 
 
 /**
- * Default log level : see {\tt Upnp_LogLevel}
+ * Default log level : see \c Upnp_LogLevel
  */
 #define UPNP_DEFAULT_LOG_LEVEL	UPNP_ALL
 
 
 
-/***************************************************************************
- * Function : UpnpInitLog
+/*!
+ * \brief Initialize the log files.
  *
- * Parameters:	void
- *
- * Description:
- *	This functions initializes the log files
- *
- * Returns: int
- *	-1 : If fails
- *	UPNP_E_SUCCESS : if success
- ***************************************************************************/
+ * \return -1 if fails or UPNP_E_SUCCESS if succeeds.
+ */
 #ifdef DEBUG
-int UpnpInitLog();
+int UpnpInitLog(void);
 #else
-static UPNP_INLINE int UpnpInitLog() { return UPNP_E_SUCCESS; }
+static UPNP_INLINE int UpnpInitLog(void)
+{
+	return UPNP_E_SUCCESS;
+}
 #endif
 
 
-/***************************************************************************
- * Function : UpnpSetLogLevel
- *				
- * Parameters: Upnp_LogLevel log_level
- *
- * Description:							
- *	This functions set the log level (see {\tt Upnp_LogLevel}
- * Returns: void
- ***************************************************************************/
+/*!
+ * \brief Set the log level (see \c Upnp_LogLevel).
+ */
 #ifdef DEBUG
-void UpnpSetLogLevel(Upnp_LogLevel log_level);
+void UpnpSetLogLevel(
+	/*! [in] Log level. */
+	Upnp_LogLevel log_level);
 #else
 static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
 #endif
 
 
-/***************************************************************************
- * Function : UpnpCloseLog						
- *								
- * Parameters:	void					
- *								
- * Description:							
- *	This functions closes the log files
- * Returns: void
- ***************************************************************************/
+/*!
+ * \brief Closes the log files.
+ */
 #ifdef DEBUG
-void UpnpCloseLog();
+void UpnpCloseLog(void);
 #else
-static UPNP_INLINE void UpnpCloseLog() {}
+static UPNP_INLINE void UpnpCloseLog(void) {}
 #endif
 
 
-/***************************************************************************
- * Function : UpnpSetLogFileNames		
- *							
- * Parameters:						
- *	IN const char* ErrFileName: name of the error file
- *	IN const char *InfoFileName: name of the information file
- *	IN int size: Size of the buffer
- *	IN int starLength: This parameter provides the width of the banner
- *								
- * Description:							
- *	This functions takes the buffer and writes the buffer in the file as 
- *	per the requested banner	
- * Returns: void
- ***************************************************************************/
+/*!
+ * \brief Set the name for error and information files, respectively.
+ */
 #ifdef DEBUG
 void UpnpSetLogFileNames(
+	/*! [in] Name of the error file. */
 	const char *ErrFileName,
+	/*! [in] Name of the information file. */
 	const char *InfoFileName);
 #else
 static UPNP_INLINE void UpnpSetLogFileNames(
@@ -172,24 +156,20 @@ static UPNP_INLINE void UpnpSetLogFileNames(
 #endif
 
 
-/***************************************************************************
- * Function : UpnpGetDebugFile		
+/*!
+ * \brief Check if the module is turned on for debug and returns the file
+ * descriptor corresponding to the debug level
  *
- * Parameters:					
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *								
- * Description:
- *	This function checks if the module is turned on for debug 
- *	and returns the file descriptor corresponding to the debug level
- * Returns: FILE *
- *	NULL : if the module is turn off for debug 
- *	else returns the right file descriptor
- ***************************************************************************/
+ * \return NULL if the module is turn off for debug otheriwse returns the
+ *	right file descriptor.
+ */
 #ifdef DEBUG
-FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module);
+FILE *UpnpGetDebugFile(
+	/*! [in] The level of the debug logging. It will decide whether debug
+	 * statement will go to standard output, or any of the log files. */
+	Upnp_LogLevel level,
+	/*! [in] debug will go in the name of this module. */
+	Dbg_Module module);
 #else
 static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module)
 {
@@ -198,60 +178,47 @@ static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module
 #endif
 
 
-/***************************************************************************
- * Function : DebugAtThisLevel					
+/*!
+ * \brief Returns true if debug output should be done in this module.
  *
- * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *					
- * Description:					
- *	This functions returns true if debug output should be done in this
- *	module.
- *
- * Returns: int
- ***************************************************************************/
+ * \return Nonzero value if true, zero if false.
+ */
 #ifdef DEBUG
 int DebugAtThisLevel(
-	IN Upnp_LogLevel DLevel,
-	IN Dbg_Module Module);
+	/*! [in] The level of the debug logging. It will decide whether debug
+	 * statement will go to standard output, or any of the log files. */
+	Upnp_LogLevel DLevel,
+	/*! [in] Debug will go in the name of this module. */
+	Dbg_Module Module);
 #else
 static UPNP_INLINE int DebugAtThisLevel(
-	IN Upnp_LogLevel DLevel,
-	IN Dbg_Module Module) { return 0; }
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module)
+{
+	return 0;
+}
 #endif
 
 
-/***************************************************************************
- * Function : UpnpPrintf				
- *									
- * Parameters:								
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *	IN char *DbgFileName: Name of the file from where debug statement is
- *							coming
- *	IN int DbgLineNo : Line number of the file from where debug statement 
- *				is coming
- *	IN char * FmtStr, ...: Variable number of arguments that will go 
- *				in the debug statement
- *					
- * Description:							
- *	This functions prints the debug statement either on the startdard 
- *	output or log file along with the information from where this 
- *	debug statement is coming
- * Returns: void
- ***************************************************************************/ 
+/*!
+ * \brief Prints the debug statement either on the standard output or log file
+ * along with the information from where this debug statement is coming.
+ */ 
 #ifdef DEBUG
 void UpnpPrintf(
+	/*! [in] The level of the debug logging. It will decide whether debug
+	 * statement will go to standard output, or any of the log files. */
 	Upnp_LogLevel DLevel,
+	/*! [in] debug will go in the name of this module. */
 	Dbg_Module Module,
+	/*! [in] Name of the file from where debug statement is coming. */
 	const char* DbgFileName,
+	/*! [in] Line number of the file from where debug statement is coming. */
 	int DbgLineNo,
+	/*! [in] Printf like format specification. */
 	const char* FmtStr,
+	/*! [in] Printf like Variable number of arguments that will go in the debug
+	 * statement. */
 	...)
 #if (__GNUC__ >= 3)
 	/* This enables printf like format checking by the compiler */
@@ -265,29 +232,44 @@ static UPNP_INLINE void UpnpPrintf(
 	const char* DbgFileName,
 	int DbgLineNo,
 	const char* FmtStr,
-	...) {}
+	...)
+{
+}
 #endif /* DEBUG */
 
 
-/***************************************************************************
- * Function : UpnpDisplayBanner				
- *							
- * Parameters:							
- *	IN FILE *fd: file descriptor where the banner will be written
- *	IN char **lines: The buffer that will be written
- *	IN int size: Size of the buffer
- *	IN int starLength: This parameter provides the width of the banner
- *									
- * Description:							
- *	This functions takes the buffer and writes the buffer in the file as 
- *	per the requested banner			
- * Returns: void
- ***************************************************************************/
+/*!
+ * \brief Writes the file name and file number from where debug statement is
+ * coming to the log file.
+ */
+#ifdef DEBUG
+void UpnpDisplayFileAndLine(
+	/*! [in] File descriptor where line number and file name will be written. */
+	FILE *fd,
+	/*! [in] Name of the file. */
+	const char *DbgFileName,
+	/*! [in] Line number of the file. */
+	int DbgLineNo);
+#else
+static UPNP_INLINE void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo) {}
+#endif
+
+
+/*!
+ * \brief Writes the buffer in the file as per the requested banner
+ */
 #ifdef DEBUG
 void UpnpDisplayBanner(
+	/*! [in] file descriptor where the banner will be written. */
 	FILE *fd,
+	/*! [in] The buffer that will be written. */
 	const char **lines,
+	/*! [in] Size of the buffer. */
 	size_t size,
+	/*! [in] This parameter provides the width of the banner. */
 	int starlength);
 #else
 static UPNP_INLINE void UpnpDisplayBanner(
@@ -298,33 +280,49 @@ static UPNP_INLINE void UpnpDisplayBanner(
 #endif
 
 
-/***************************************************************************
- * Function : UpnpDisplayFileAndLine				
- *								
- * Parameters:							
- *	IN FILE *fd: File descriptor where line number and file name will be 
- *			written 
- *	IN char *DbgFileName: Name of the file  
- *	IN int DbgLineNo : Line number of the file
- *								
- * Description:
- *	This function writes the file name and file number from where
- *		debug statement is coming to the log file
- * Returns: void
- ***************************************************************************/
+/*!
+ * \brief Prints thread pool statistics.
+ */
 #ifdef DEBUG
-void UpnpDisplayFileAndLine(
-	FILE *fd,
+void PrintThreadPoolStats(
+	/*! [in] The thread pool. */
+	ThreadPool *tp, 
+	/*! [in] The file name that called this function, use the macro __FILE__. */
 	const char *DbgFileName,
-	int DbgLineNo);
+	/*! [in] The line number that the function was called, use the macro __LINE__. */
+	int DbgLineNo,
+	/*! [in] The message. */
+	const char *msg);
 #else
-static UPNP_INLINE void UpnpDisplayFileAndLine(
-	FILE *fd,
+static UPNP_INLINE void PrintThreadPoolStats(
+	ThreadPool *tp, 
 	const char *DbgFileName,
-	int DbgLineNo) {}
+	int DbgLineNo,
+	const char *msg)
+{
+}
 #endif
 
-/*! @} */
+
+/*!
+ * \brief Print the node names and values of a XML tree.
+ */
+#ifdef DEBUG
+void printNodes(
+	/*! [in] The root of the tree to print. */
+	IXML_Node *tmpRoot,
+	/*! [in] The depth to print. */
+	int depth);
+#else
+static UPNP_INLINE void printNodes(
+	IXML_Node *tmpRoot,
+	int depth)
+{
+}
+#endif
+
+
+/*@}*/
 
 #ifdef __cplusplus
 }

upnp/m4/libupnp.m4

@@ -0,0 +1,97 @@
+#							-*- Autoconf -*-
+# This file is part of the aMule project.
+# This file is part of the libupnp library project.
+#
+# Copyright (c) 2003-2008 aMule Team ( admin@amule.org / http://www.amule.org )
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+#
+
+dnl --------------------------------------------------------------------------
+dnl LIBUPNP_CHECK([VERSION = 1.6.6], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl
+dnl Check for the libupnp library
+dnl --------------------------------------------------------------------------
+dnl
+dnl This macro sets these variables:
+dnl - LIBUPNP_VERSION
+dnl 	Something like "1.6.7"
+dnl - LIBUPNP_CPPFLAGS
+dnl 	Flags to be added to CPPFLAGS
+dnl - LIBUPNP_CFLAGS
+dnl 	Flags to be added to CFLAGS
+dnl - LIBUPNP_LDFLAGS
+dnl 	Flags to be added to LDFLAGS
+dnl - LIBUPNP_LIBS
+dnl 	Library to be added to LIBS
+dnl
+dnl The LIBUPNP_CPPFLAGS, LIBUPNP_CFLAGS, LIBUPNP_LDFLAGS and LIBUPNP_LIBS variables are also substituted.
+dnl
+AC_DEFUN([LIBUPNP_CHECK],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+m4_define([MIN_LIBUPNP_VERSION], [m4_ifval([$1], [$1], [1.6.6])])dnl
+
+dnl	Test for --with-libupnp-prefix
+	AC_ARG_WITH(
+		[libupnp-prefix],
+		[AS_HELP_STRING(
+			[--with-libupnp-prefix=PREFIX],
+			[UPnP library location])],
+		[export PKG_CONFIG_PATH=$withval/lib/pkgconfig])
+
+dnl	Check for libupnp >= MIN_LIBUPNP_VERSION
+	AS_IF([test $cross_compiling = no], [
+		AC_MSG_CHECKING([for libupnp version >= MIN_LIBUPNP_VERSION])
+		AS_IF([test -n "$PKG_CONFIG"], [
+			AS_IF([$PKG_CONFIG libupnp --exists], [
+				LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion`
+				AS_IF([$PKG_CONFIG libupnp --atleast-version=MIN_LIBUPNP_VERSION], [
+					result=yes
+					resultstr=" (version $LIBUPNP_VERSION)"
+					LIBUPNP_CPPFLAGS=`$PKG_CONFIG libupnp --cflags-only-I`
+					LIBUPNP_CFLAGS=`$PKG_CONFIG libupnp --cflags-only-other`
+					LIBUPNP_LDFLAGS=`$PKG_CONFIG libupnp --libs-only-L`
+					LIBUPNP_LIBS=`$PKG_CONFIG libupnp --libs-only-other`
+					LIBUPNP_LIBS="$LIBUPNP_LIBS `$PKG_CONFIG libupnp --libs-only-l`"
+				], [
+					result=no
+					resultstr=" (version $LIBUPNP_VERSION is not new enough)"
+				])
+			], [
+				result=no
+				resultstr=" (try to use --with-libupnp-prefix=PREFIX)"
+			])
+		], [
+			result=no
+			resultstr=" (pkg-config not found)"
+		])
+		AC_MSG_RESULT([$result$resultstr])
+		libupnp_error="libupnp >= MIN_LIBUPNP_VERSION not found$resultstr"
+	], [
+dnl Currently cross-compilation with libupnp is not supported.
+		result=no
+		libupnp_error="cross compiling"
+	])
+
+dnl	Execute the right action.
+	AS_IF([test ${result:-no} = yes], [$2], [$3])
+
+dnl Exported symbols
+AC_SUBST([LIBUPNP_CPPFLAGS])dnl
+AC_SUBST([LIBUPNP_CFLAGS])dnl
+AC_SUBST([LIBUPNP_LDFLAGS])dnl
+AC_SUBST([LIBUPNP_LIBS])dnl
+m4_undefine([MIN_LIBUPNP_VERSION])dnl
+])

upnp/sample/Makefile.am

@@ -69,8 +69,9 @@ upnp_tv_combo_SOURCES = \
 if WITH_DOCUMENTATION
 examplesdir = $(docdir)/examples
 examples_DATA = \
+		$(sort \
 			$(upnp_tv_ctrlpt_SOURCES) \
-		$(upnp_tv_device_SOURCES)
+			$(upnp_tv_device_SOURCES))
 endif
 
 

upnp/sample/common/sample_util.h

@@ -34,24 +34,26 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
+
 
 #include <stdlib.h>
-
 #include <string.h>
 
-#include "upnptools.h"
 #include "ithread.h"
 #include "ixml.h"
+#include "upnptools.h"
+
+
+// mutex to control displaying of events
+extern ithread_mutex_t display_mutex;
 
-//mutex to control displaying of events
-extern ithread_mutex_t display_mutex ;
 
 typedef enum {
 	STATE_UPDATE = 0,
-	DEVICE_ADDED =1,
-	DEVICE_REMOVED=2,
-	GET_VAR_COMPLETE=3
+	DEVICE_ADDED = 1,
+	DEVICE_REMOVED = 2,
+	GET_VAR_COMPLETE = 3
 } eventType;
 
 
@@ -68,7 +70,7 @@ typedef enum {
  *   node -- The DOM node from which to extract the value
  *
  ********************************************************************************/
-char * SampleUtil_GetElementValue(IN IXML_Element *element);
+char *SampleUtil_GetElementValue(IN IXML_Element *element);
 
 /********************************************************************************
  * SampleUtil_GetFirstServiceList
@@ -85,7 +87,7 @@ char * SampleUtil_GetElementValue(IN IXML_Element *element);
  *
  ********************************************************************************/
 
-IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document * doc); 
+IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document *doc); 
 
 
 /********************************************************************************
@@ -100,7 +102,7 @@ IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document * doc);
  *   item -- The item to search for
  *
  ********************************************************************************/
-char * SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *item); 
+char *SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *item); 
 
 
 
@@ -116,7 +118,7 @@ char * SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *ite
  *   item -- The item to search for
  *
  ********************************************************************************/
-char * SampleUtil_GetFirstElementItem(IN IXML_Element *element, IN const char *item); 
+char *SampleUtil_GetFirstElementItem(IN IXML_Element *element, IN const char *item); 
 
 /********************************************************************************
  * SampleUtil_PrintEventType
@@ -162,9 +164,13 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType,
  *   controlURL -- OUT -- The control URL for the service
  *
  ********************************************************************************/
-int SampleUtil_FindAndParseService (IN IXML_Document *DescDoc, IN char* location, 
-				    IN char *serviceType, OUT char **serviceId, 
-				    OUT char **eventURL, OUT char **controlURL);
+int SampleUtil_FindAndParseService (
+	IN IXML_Document *DescDoc,
+	IN const char *location,
+	IN char *serviceType,
+	OUT char **serviceId, 
+	OUT char **eventURL,
+	OUT char **controlURL);
 
 
 /********************************************************************************
@@ -196,7 +202,10 @@ extern print_string gPrintFun;
  *   const char * UDN
  *   int          newDevice
  ********************************************************************************/
-typedef void (*state_update)( const char *varName, const char *varValue, const char *UDN,
+typedef void (*state_update)(
+	const char *varName,
+	const char *varValue,
+	const char *UDN,
 	eventType type);
 
 //global state update function used by smaple util
@@ -224,7 +233,7 @@ int SampleUtil_Initialize(print_string print_function);
  * Parameters:
  *
  ********************************************************************************/
-int SampleUtil_Finish(void);
+int SampleUtil_Finish();
 
 /********************************************************************************
  * SampleUtil_Print
@@ -238,7 +247,7 @@ int SampleUtil_Finish(void);
  *   . . .  - variable number of args. (see printf)
  *
  ********************************************************************************/
-int SampleUtil_Print( char *fmt, ... );
+int SampleUtil_Print(char *fmt, ...);
 
 /********************************************************************************
  * SampleUtil_RegisterUpdateFunction
@@ -248,7 +257,7 @@ int SampleUtil_Print( char *fmt, ... );
  * Parameters:
  *
  ********************************************************************************/
-int SampleUtil_RegisterUpdateFunction( state_update update_function );
+int SampleUtil_RegisterUpdateFunction(state_update update_function);
 
 /********************************************************************************
  * SampleUtil_StateUpdate
@@ -258,11 +267,22 @@ int SampleUtil_RegisterUpdateFunction( state_update update_function );
  * Parameters:
  *
  ********************************************************************************/
-void SampleUtil_StateUpdate( const char *varName, const char *varValue, const char *UDN,
+void SampleUtil_StateUpdate(
+	const char *varName,
+	const char *varValue,
+	const char *UDN,
 	eventType type);
 
 #ifdef __cplusplus
 };
+#endif /* __cplusplus */
+
+
+#ifdef WIN32
+	#define snprintf	_snprintf
+	#define strcasecmp	stricmp
 #endif
 
-#endif /* UPNPSDK_UTIL_H */
+
+#endif /* SAMPLE_UTIL_H */
+

upnp/sample/tvcombo/linux/upnp_tv_combo_main.c

@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
 
 #include "sample_util.h"
@@ -130,7 +130,8 @@ TvCtrlPointPrintLongHelp( void )
     SampleUtil_Print( "" );
     SampleUtil_Print( "This sample control point application automatically searches" );
     SampleUtil_Print( "for and subscribes to the services of television device emulator" );
-    SampleUtil_Print( "devices. While registers a tv device itself." );
+    SampleUtil_Print( "devices, described in the tvdevicedesc.xml description document." );
+    SampleUtil_Print( "It also registers itself as a tv device." );
     SampleUtil_Print( "" );
     SampleUtil_Print( "Commands:" );
     SampleUtil_Print( "  Help" );
@@ -449,17 +450,18 @@ device_main( int argc, char **argv )
 
     port = ( unsigned short )portTemp;
 
-    return TvDeviceStart(
-        ip_address, port, desc_doc_name, web_dir_path, linux_print );
+    return TvDeviceStart( ip_address, port, desc_doc_name, web_dir_path, linux_print );
 }
 
-int
-main( int argc, char **argv )
+int main( int argc, char **argv )
 {
     int rc;
     ithread_t cmdloop_thread;
+#ifdef WIN32
+#else
     int sig;
     sigset_t sigs_to_catch;
+#endif
     int code;
 
     device_main(argc, argv);
@@ -468,11 +470,12 @@ main( int argc, char **argv )
         SampleUtil_Print( "Error starting UPnP TV Control Point" );
         return rc;
     }
-    // start a command loop thread
-    code =
-        ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop,
-                        NULL );
+    /* start a command loop thread */
+    code = ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL );
 
+#ifdef WIN32
+    ithread_join(cmdloop_thread, NULL);
+#else
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -480,10 +483,9 @@ main( int argc, char **argv )
     sigaddset( &sigs_to_catch, SIGINT );
     sigwait( &sigs_to_catch, &sig );
 
-    SampleUtil_Print( "Shutting down on signal %d...", sig );
+    SampleUtil_Print( "Shutting down on signal %d...\n", sig );
+#endif
     TvDeviceStop();
     rc = TvCtrlPointStop();
-    
     return rc;
 }
-

upnp/sample/tvcombo/upnp_tv_ctrlpt.c

@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
 #include "upnp_tv_ctrlpt.h"
 
@@ -138,11 +138,10 @@ TvCtrlPointDeleteNode( struct TvDeviceNode *node )
  *   UDN -- The Unique Device Name for the device to remove
  *
  ********************************************************************************/
-int
-TvCtrlPointRemoveDevice( char *UDN )
+int TvCtrlPointRemoveDevice(const char *UDN)
 {
-    struct TvDeviceNode *curdevnode,
-     *prevdevnode;
+    struct TvDeviceNode *curdevnode;
+    struct TvDeviceNode *prevdevnode;
 
     ithread_mutex_lock( &DeviceListMutex );
 
@@ -224,7 +223,7 @@ TvCtrlPointRefresh( void )
 {
     int rc;
 
-    TvCtrlPointRemoveAll(  );
+    TvCtrlPointRemoveAll();
 
     /*
        Search for all devices of type tvdevice version 1, 
@@ -539,7 +538,7 @@ TvCtrlPointGetDevice( int devnum,
  *
  ********************************************************************************/
 int
-TvCtrlPointPrintList(  )
+TvCtrlPointPrintList()
 {
     struct TvDeviceNode *tmpdevnode;
     int i = 0;
@@ -668,8 +667,8 @@ TvCtrlPointPrintDevice( int devnum )
  *
  ********************************************************************************/
 void
-TvCtrlPointAddDevice( IXML_Document * DescDoc,
-                      char *location,
+TvCtrlPointAddDevice( IXML_Document *DescDoc,
+                      const char *location,
                       int expires )
 {
     char *deviceType = NULL;
@@ -682,20 +681,19 @@ TvCtrlPointAddDevice( IXML_Document * DescDoc,
     char *eventURL[TV_SERVICE_SERVCOUNT] = { NULL, NULL };
     char *controlURL[TV_SERVICE_SERVCOUNT] = { NULL, NULL };
     Upnp_SID eventSID[TV_SERVICE_SERVCOUNT];
-    int TimeOut[TV_SERVICE_SERVCOUNT] =
-        { default_timeout, default_timeout };
+    int TimeOut[TV_SERVICE_SERVCOUNT] = {
+        default_timeout,
+        default_timeout };
     struct TvDeviceNode *deviceNode;
     struct TvDeviceNode *tmpdevnode;
     int ret = 1;
     int found = 0;
-    int service,
-      var;
+    int service;
+    int var;
 
     ithread_mutex_lock( &DeviceListMutex );
 
-    /*
-       Read key elements from description document 
-     */
+    /* Read key elements from description document */
     UDN = SampleUtil_GetFirstDocumentItem( DescDoc, "UDN" );
     deviceType = SampleUtil_GetFirstDocumentItem( DescDoc, "deviceType" );
     friendlyName =
@@ -703,9 +701,8 @@ TvCtrlPointAddDevice( IXML_Document * DescDoc,
     baseURL = SampleUtil_GetFirstDocumentItem( DescDoc, "URLBase" );
     relURL = SampleUtil_GetFirstDocumentItem( DescDoc, "presentationURL" );
 
-    ret =
-        UpnpResolveURL( ( baseURL ? baseURL : location ), relURL,
-                        presURL );
+    ret = UpnpResolveURL(
+        ( baseURL ? baseURL : location ), relURL, presURL);
 
     if( UPNP_E_SUCCESS != ret )
         SampleUtil_Print( "Error generating presURL from %s + %s", baseURL,
@@ -939,34 +936,36 @@ TvStateUpdate( char *UDN,
  *   changes -- The DOM document representing the changes
  *
  ********************************************************************************/
-void
-TvCtrlPointHandleEvent( Upnp_SID sid,
+void TvCtrlPointHandleEvent(
+	const Upnp_SID sid,
 	int evntkey,
-                        IXML_Document * changes )
+	IXML_Document *changes)
 {
 	struct TvDeviceNode *tmpdevnode;
 	int service;
 
-    ithread_mutex_lock( &DeviceListMutex );
+	ithread_mutex_lock(&DeviceListMutex);
 
 	tmpdevnode = GlobalDeviceList;
-    while( tmpdevnode ) {
-        for( service = 0; service < TV_SERVICE_SERVCOUNT; service++ ) {
-            if( strcmp( tmpdevnode->device.TvService[service].SID, sid ) ==
-                0 ) {
-                SampleUtil_Print( "Received Tv %s Event: %d for SID %s",
-                                  TvServiceName[service], evntkey, sid );
-
-                TvStateUpdate( tmpdevnode->device.UDN, service, changes,
-                               ( char ** )&tmpdevnode->device.
-                               TvService[service].VariableStrVal );
+	while (tmpdevnode) {
+		for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) {
+			if(strcmp(tmpdevnode->device.TvService[service].SID, sid) == 0) {
+				SampleUtil_Print("Received Tv %s Event: %d for SID %s",
+					TvServiceName[service],
+					evntkey,
+					sid );
+				TvStateUpdate(
+					tmpdevnode->device.UDN,
+					service,
+					changes,
+					(char **)&tmpdevnode->device.TvService[service].VariableStrVal);
 				break;
 			}
 		}
 		tmpdevnode = tmpdevnode->next;
 	}
 
-    ithread_mutex_unlock( &DeviceListMutex );
+	ithread_mutex_unlock(&DeviceListMutex);
 }
 
 /********************************************************************************
@@ -983,10 +982,10 @@ TvCtrlPointHandleEvent( Upnp_SID sid,
  *   timeout  -- The new timeout for the subscription
  *
  ********************************************************************************/
-void
-TvCtrlPointHandleSubscribeUpdate( char *eventURL,
-                                  Upnp_SID sid,
-                                  int timeout )
+void TvCtrlPointHandleSubscribeUpdate(
+	const char *eventURL,
+	const Upnp_SID sid,
+	int timeout)
 {
     struct TvDeviceNode *tmpdevnode;
     int service;
@@ -1014,10 +1013,10 @@ TvCtrlPointHandleSubscribeUpdate( char *eventURL,
     ithread_mutex_unlock( &DeviceListMutex );
 }
 
-void
-TvCtrlPointHandleGetVar( char *controlURL,
-                         char *varName,
-                         DOMString varValue )
+void TvCtrlPointHandleGetVar(
+	const char *controlURL,
+	const char *varName,
+	const DOMString varValue)
 {
 
     struct TvDeviceNode *tmpdevnode;
@@ -1026,14 +1025,11 @@ TvCtrlPointHandleGetVar( char *controlURL,
     ithread_mutex_lock( &DeviceListMutex );
 
     tmpdevnode = GlobalDeviceList;
-    while( tmpdevnode ) {
-        for( service = 0; service < TV_SERVICE_SERVCOUNT; service++ ) {
-            if( strcmp
-                ( tmpdevnode->device.TvService[service].ControlURL,
-                  controlURL ) == 0 ) {
-                SampleUtil_StateUpdate( varName, varValue,
-                                        tmpdevnode->device.UDN,
-                                        GET_VAR_COMPLETE );
+    while (tmpdevnode) {
+        for (service = 0; service < TV_SERVICE_SERVCOUNT; service++) {
+            if (strcmp(tmpdevnode->device.TvService[service].ControlURL, controlURL) == 0) {
+                SampleUtil_StateUpdate(
+			varName, varValue, tmpdevnode->device.UDN, GET_VAR_COMPLETE);
                 break;
             }
         }
@@ -1057,179 +1053,130 @@ TvCtrlPointHandleGetVar( char *controlURL,
  *   Cookie -- Optional data specified during callback registration
  *
  ********************************************************************************/
-int
-TvCtrlPointCallbackEventHandler( Upnp_EventType EventType,
-                                 void *Event,
-                                 void *Cookie )
+int TvCtrlPointCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-    SampleUtil_PrintEvent( EventType, Event );
+	/*int errCode = 0;*/
 
+	SampleUtil_PrintEvent(EventType, Event);
 	switch ( EventType ) {
-            /*
-               SSDP Stuff 
-             */
+	/* SSDP Stuff */
 	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
-        case UPNP_DISCOVERY_SEARCH_RESULT:
-            {
-                struct Upnp_Discovery *d_event =
-                    ( struct Upnp_Discovery * )Event;
+	case UPNP_DISCOVERY_SEARCH_RESULT: {
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 		IXML_Document *DescDoc = NULL;
 		int ret;
 
-                if( d_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print( "Error in Discovery Callback -- %d",
-                                      d_event->ErrCode );
+		if (d_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Discovery Callback -- %d", d_event->ErrCode);
 		}
-
-                if( ( ret =
-                      UpnpDownloadXmlDoc( d_event->Location,
-                                          &DescDoc ) ) !=
-                    UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error obtaining device description from %s -- error = %d",
-                          d_event->Location, ret );
+		ret = UpnpDownloadXmlDoc(d_event->Location, &DescDoc);
+		if (ret != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error obtaining device description from %s -- error = %d",
+				d_event->Location, ret);
 		} else {
-                    TvCtrlPointAddDevice( DescDoc, d_event->Location,
-                                          d_event->Expires );
+			TvCtrlPointAddDevice(
+				DescDoc, d_event->Location, d_event->Expires);
 		}
-
-                if( DescDoc )
-                    ixmlDocument_free( DescDoc );
-
-                TvCtrlPointPrintList(  );
+		if (DescDoc) {
+			ixmlDocument_free(DescDoc);
+		}
+		TvCtrlPointPrintList();
 		break;
 	}
-
 	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
-            /*
-               Nothing to do here... 
-             */
+		/* Nothing to do here... */
 		break;
+	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 
-        case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
-            {
-                struct Upnp_Discovery *d_event =
-                    ( struct Upnp_Discovery * )Event;
-
-                if( d_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in Discovery ByeBye Callback -- %d",
-                          d_event->ErrCode );
+		if (d_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Discovery ByeBye Callback -- %d", d_event->ErrCode);
 		}
-
-                SampleUtil_Print( "Received ByeBye for Device: %s",
-                                  d_event->DeviceId );
-                TvCtrlPointRemoveDevice( d_event->DeviceId );
-
-                SampleUtil_Print( "After byebye:" );
-                TvCtrlPointPrintList(  );
-
+		SampleUtil_Print("Received ByeBye for Device: %s", d_event->DeviceId);
+		TvCtrlPointRemoveDevice(d_event->DeviceId);
+		SampleUtil_Print("After byebye:");
+		TvCtrlPointPrintList();
 		break;
 	}
+	/* SOAP Stuff */
+	case UPNP_CONTROL_ACTION_COMPLETE: {
+		struct Upnp_Action_Complete *a_event = (struct Upnp_Action_Complete *)Event;
 
-            /*
-               SOAP Stuff 
-             */
-        case UPNP_CONTROL_ACTION_COMPLETE:
-            {
-                struct Upnp_Action_Complete *a_event =
-                    ( struct Upnp_Action_Complete * )Event;
-
-                if( a_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in  Action Complete Callback -- %d",
-                          a_event->ErrCode );
+		if (a_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in  Action Complete Callback -- %d", a_event->ErrCode);
 		}
-
-                /*
-                   No need for any processing here, just print out results.  Service state
-                   table updates are handled by events. 
-                 */
-
+		/* No need for any processing here, just print out results.
+		 * Service state table updates are handled by events. */
 		break;
 	}
+	case UPNP_CONTROL_GET_VAR_COMPLETE: {
+		struct Upnp_State_Var_Complete *sv_event = (struct Upnp_State_Var_Complete *)Event;
 
-        case UPNP_CONTROL_GET_VAR_COMPLETE:
-            {
-                struct Upnp_State_Var_Complete *sv_event =
-                    ( struct Upnp_State_Var_Complete * )Event;
-
-                if( sv_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in Get Var Complete Callback -- %d",
-                          sv_event->ErrCode );
+		if (sv_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Get Var Complete Callback -- %d", sv_event->ErrCode);
 		} else {
-                    TvCtrlPointHandleGetVar( sv_event->CtrlUrl,
+			TvCtrlPointHandleGetVar(
+				sv_event->CtrlUrl,
 				sv_event->StateVarName,
-                                             sv_event->CurrentVal );
+				sv_event->CurrentVal);
 		}
-
 		break;
 	}
+	/* GENA Stuff */
+	case UPNP_EVENT_RECEIVED: {
+		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
 
-            /*
-               GENA Stuff 
-             */
-        case UPNP_EVENT_RECEIVED:
-            {
-                struct Upnp_Event *e_event = ( struct Upnp_Event * )Event;
-
-                TvCtrlPointHandleEvent( e_event->Sid, e_event->EventKey,
-                                        e_event->ChangedVariables );
+		TvCtrlPointHandleEvent(
+			e_event->Sid,
+			e_event->EventKey,
+			e_event->ChangedVariables);
 		break;
 	}
-
 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
 	case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
-        case UPNP_EVENT_RENEWAL_COMPLETE:
-            {
-                struct Upnp_Event_Subscribe *es_event =
-                    ( struct Upnp_Event_Subscribe * )Event;
+	case UPNP_EVENT_RENEWAL_COMPLETE: {
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 
-                if( es_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in Event Subscribe Callback -- %d",
-                          es_event->ErrCode );
+		if (es_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Event Subscribe Callback -- %d", es_event->ErrCode);
 		} else {
-                    TvCtrlPointHandleSubscribeUpdate( es_event->
-                                                      PublisherUrl,
+			TvCtrlPointHandleSubscribeUpdate(
+				es_event->PublisherUrl,
 				es_event->Sid,
-                                                      es_event->TimeOut );
+				es_event->TimeOut);
 		}
-
 		break;
 	}
-
 	case UPNP_EVENT_AUTORENEWAL_FAILED:
-        case UPNP_EVENT_SUBSCRIPTION_EXPIRED:
-            {
+	case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 		int TimeOut = default_timeout;
 		Upnp_SID newSID;
 		int ret;
 
-                struct Upnp_Event_Subscribe *es_event =
-                    ( struct Upnp_Event_Subscribe * )Event;
-
-                ret =
-                    UpnpSubscribe( ctrlpt_handle, es_event->PublisherUrl,
-                                   &TimeOut, newSID );
-
-                if( ret == UPNP_E_SUCCESS ) {
-                    SampleUtil_Print( "Subscribed to EventURL with SID=%s",
-                                      newSID );
-                    TvCtrlPointHandleSubscribeUpdate( es_event->
-                                                      PublisherUrl, newSID,
-                                                      TimeOut );
+		ret = UpnpSubscribe(
+			ctrlpt_handle,
+			es_event->PublisherUrl,
+			&TimeOut,
+			newSID);
+		if (ret == UPNP_E_SUCCESS) {
+			SampleUtil_Print("Subscribed to EventURL with SID=%s", newSID);
+			TvCtrlPointHandleSubscribeUpdate(
+				es_event->PublisherUrl,
+				newSID,
+				TimeOut);
 		} else {
-                    SampleUtil_Print
-                        ( "Error Subscribing to EventURL -- %d", ret );
+			SampleUtil_Print("Error Subscribing to EventURL -- %d", ret);
 		}
 		break;
 	}
-
-            /*
-               ignore these cases, since this is not a device 
-             */
+	/* ignore these cases, since this is not a device */
 	case UPNP_EVENT_SUBSCRIPTION_REQUEST:
 	case UPNP_CONTROL_GET_VAR_REQUEST:
 	case UPNP_CONTROL_ACTION_REQUEST:
@@ -1320,12 +1267,12 @@ TvCtrlPointVerifyTimeouts( int incr )
  *    None
  *
  ********************************************************************************/
-void *
-TvCtrlPointTimerLoop( void *args )
+static int TvCtrlPointTimerLoopRun = 1;
+void *TvCtrlPointTimerLoop(void *args)
 {
     int incr = 30;              // how often to verify the timeouts, in seconds
 
-    while( 1 ) {
+    while (TvCtrlPointTimerLoopRun) {
         isleep( incr );
         TvCtrlPointVerifyTimeouts( incr );
     }
@@ -1348,62 +1295,72 @@ TvCtrlPointTimerLoop( void *args )
  *		TV_SUCCESS if everything went well, else TV_ERROR
  *
  ********************************************************************************/
-int
-TvCtrlPointStart( print_string printFunctionPtr,
-                  state_update updateFunctionPtr )
+int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionPtr)
 {
 	ithread_t timer_thread;
 	int rc;
-    short int port = 0;
+	unsigned short port = 0;
 	char *ip_address = NULL;
 
-    SampleUtil_Initialize( printFunctionPtr );
-    SampleUtil_RegisterUpdateFunction( updateFunctionPtr );
+	SampleUtil_Initialize(printFunctionPtr);
+	SampleUtil_RegisterUpdateFunction(updateFunctionPtr);
 
-    ithread_mutex_init( &DeviceListMutex, 0 );
+	ithread_mutex_init(&DeviceListMutex, 0);
 
-    SampleUtil_Print( "Intializing UPnP with ipaddress=%s port=%d",
-                      ip_address, port );
-    rc = UpnpInit( ip_address, port );
-    if( UPNP_E_SUCCESS != rc ) {
-        SampleUtil_Print( "WinCEStart: UpnpInit() Error: %d", rc );
-        //UpnpFinish(  );
-        //return TV_ERROR;
+	SampleUtil_Print(
+		"Initializing UPnP Sdk with\n"
+		"\tipaddress = %s port = %u\n",
+		ip_address, port);
+
+	rc = UpnpInit(ip_address, port);
+	if (rc != UPNP_E_SUCCESS) {
+		SampleUtil_Print("WinCEStart: UpnpInit() Error: %d", rc);
+		/*
+		UpnpFinish();
+		return TV_ERROR;
+		*/
+	}
+	if (!ip_address) {
+		ip_address = UpnpGetServerIpAddress();
+	}
+	if (!port) {
+		port = UpnpGetServerPort();
 	}
 
-    if( NULL == ip_address )
-        ip_address = UpnpGetServerIpAddress(  );
-    if( 0 == port )
-        port = UpnpGetServerPort(  );
+	SampleUtil_Print(
+		"UPnP Initialized\n"
+		"\tipaddress= %s port = %u\n",
+		ip_address, port);
 
-    SampleUtil_Print( "UPnP Initialized (%s:%d)", ip_address, port );
-
-    SampleUtil_Print( "Registering Control Point" );
-    rc = UpnpRegisterClient( TvCtrlPointCallbackEventHandler,
-                             &ctrlpt_handle, &ctrlpt_handle );
-    if( UPNP_E_SUCCESS != rc ) {
+	SampleUtil_Print("Registering Control Point");
+	rc = UpnpRegisterClient(TvCtrlPointCallbackEventHandler,
+		&ctrlpt_handle, &ctrlpt_handle);
+	if (rc != UPNP_E_SUCCESS) {
 		SampleUtil_Print( "Error registering CP: %d", rc );
-        UpnpFinish(  );
+		UpnpFinish();
+
 		return TV_ERROR;
 	}
 
-    SampleUtil_Print( "Control Point Registered" );
+	SampleUtil_Print("Control Point Registered");
 
-    TvCtrlPointRefresh(  );
+	TvCtrlPointRefresh();
 
-    // start a timer thread
-    ithread_create( &timer_thread, NULL, TvCtrlPointTimerLoop, NULL );
+	/* start a timer thread */
+	ithread_create(&timer_thread, NULL, TvCtrlPointTimerLoop, NULL);
+	ithread_detach(timer_thread);
 
 	return TV_SUCCESS;
 }
 
-int
-TvCtrlPointStop( void )
+int TvCtrlPointStop(void)
 {
-    TvCtrlPointRemoveAll(  );
+	TvCtrlPointTimerLoopRun = 0;
+	TvCtrlPointRemoveAll();
 	UpnpUnRegisterClient( ctrlpt_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+	UpnpFinish();
+	SampleUtil_Finish();
 
 	return TV_SUCCESS;
 }
+

upnp/sample/tvcombo/upnp_tv_ctrlpt.h

@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
 #ifndef UPNP_TV_CTRLPT_H
 #define UPNP_TV_CTRLPT_H
@@ -39,7 +39,9 @@ extern "C" {
 #include <stdio.h>
 
 #include "ithread.h"
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -109,8 +111,8 @@ extern ithread_mutex_t DeviceListMutex;
 extern UpnpClient_Handle ctrlpt_handle;
 
 void	TvCtrlPointPrintHelp( void );
-int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
-int		TvCtrlPointRemoveDevice(char*);
+int		TvCtrlPointDeleteNode(struct TvDeviceNode *);
+int		TvCtrlPointRemoveDevice(const char *);
 int		TvCtrlPointRemoveAll( void );
 int		TvCtrlPointRefresh( void );
 
@@ -138,11 +140,11 @@ int		TvCtrlPointGetBrightness(int);
 int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
 int		TvCtrlPointPrintList( void );
 int		TvCtrlPointPrintDevice(int);
-void	TvCtrlPointAddDevice (IXML_Document *, char *, int); 
-void    TvCtrlPointHandleGetVar(char *,char *,DOMString);
+void	TvCtrlPointAddDevice(IXML_Document *, const char *, int); 
+void    TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
 void	TvStateUpdate(char*,int, IXML_Document * , char **);
-void	TvCtrlPointHandleEvent(Upnp_SID, int, IXML_Document *); 
-void	TvCtrlPointHandleSubscribeUpdate(char *, Upnp_SID, int); 
+void	TvCtrlPointHandleEvent(const Upnp_SID, int, IXML_Document *); 
+void	TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); 
 int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
 void	TvCtrlPointVerifyTimeouts(int);
 void	TvCtrlPointPrintCommands( void );

upnp/sample/tvcombo/upnp_tv_device.c

@@ -1,40 +1,47 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
 #include "upnp_tv_device.h"
 
+
+#include <assert.h>
+
+
 #define DEFAULT_WEB_DIR "./web"
 
+
 #define DESC_URL_SIZE 200
 
+
 /*
    Device type for tv device 
  */
@@ -178,7 +185,6 @@ SetServiceTable( IN int serviceType,
     }
 
     return SetActionTable( serviceType, out );
-
 }
 
 /******************************************************************************
@@ -249,7 +255,6 @@ SetActionTable( IN int serviceType,
     }
 
     return 0;
-
 }
 
 /******************************************************************************
@@ -372,9 +377,9 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
 {
     unsigned int i = 0;         //,j=0;
 
-    // IXML_Document *PropSet=NULL;
+	// IXML_Document *PropSet = NULL;
 
-    //lock state mutex
+	// lock state mutex
 	ithread_mutex_lock( &TVDevMutex );
 
     for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
@@ -385,20 +390,23 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
             /*
 			PropSet = NULL;
 
-               for (j=0; j< tv_service_table[i].VariableCount; j++)
-               {
-               //add each variable to the property set
-               //for initial state dump
-               UpnpAddToPropertySet(&PropSet, 
+			for (j = 0; j< tv_service_table[i].VariableCount; ++j) {
+				// add each variable to the property set
+				// for initial state dump
+				UpnpAddToPropertySet(
+					&PropSet, 
 					tv_service_table[i].VariableName[j],
 					tv_service_table[i].VariableStrVal[j]);
 			}
 
-               //dump initial state 
-               UpnpAcceptSubscriptionExt(device_handle, sr_event->UDN, 
+			// dump initial state 
+			UpnpAcceptSubscriptionExt(
+				device_handle,
+				sr_event->UDN, 
 				sr_event->ServiceId,
-               PropSet,sr_event->Sid);
-               //free document
+				PropSet,
+				sr_event->Sid);
+			// free document
 			Document_free(PropSet);
 
              */
@@ -406,21 +414,22 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
 			UpnpAcceptSubscription( device_handle,
 				sr_event->UDN,
 				sr_event->ServiceId,
-                                    ( const char ** )tv_service_table[i].
+				(const char **)tv_service_table[i].
 				VariableName,
-                                    ( const char ** )tv_service_table[i].
+				(const char **)tv_service_table[i].
 				VariableStrVal,
 				tv_service_table[i].VariableCount,
-                                    sr_event->Sid );
+				sr_event->Sid);
 
 		}
 	}
 
 	ithread_mutex_unlock( &TVDevMutex );
 
-    return ( 1 );
+	return 1;
 }
 
+
 /******************************************************************************
  * TvDeviceHandleGetVarRequest
  *
@@ -437,8 +446,8 @@ int
 TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
                              *cgv_event )
 {
-    unsigned int i = 0,
-      j = 0;
+    unsigned int i = 0;
+    unsigned int j = 0;
     int getvar_succeeded = 0;
 
     cgv_event->CurrentVal = NULL;
@@ -446,12 +455,12 @@ TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
     ithread_mutex_lock( &TVDevMutex );
 
     for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
-        //check udn and service id
+        // check udn and service id
         if( ( strcmp( cgv_event->DevUDN, tv_service_table[i].UDN ) == 0 )
             &&
             ( strcmp( cgv_event->ServiceID, tv_service_table[i].ServiceId )
               == 0 ) ) {
-            //check variable name
+            // check variable name
             for( j = 0; j < tv_service_table[i].VariableCount; j++ ) {
                 if( strcmp( cgv_event->StateVarName,
                             tv_service_table[i].VariableName[j] ) == 0 ) {
@@ -496,7 +505,6 @@ TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
 int
 TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
 {
-
     /*
        Defaults if action not found 
      */
@@ -567,7 +575,7 @@ TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
         if( retCode == UPNP_E_SUCCESS ) {
             ca_event->ErrCode = UPNP_E_SUCCESS;
         } else {
-            //copy the error string 
+            // copy the error string
             strcpy( ca_event->ErrStr, errorString );
             switch ( retCode ) {
                 case UPNP_E_INVALID_PARAM:
@@ -649,7 +657,6 @@ TvDeviceSetServiceTableVar( IN unsigned int service,
     ithread_mutex_unlock( &TVDevMutex );
 
     return ( 1 );
-
 }
 
 /******************************************************************************
@@ -672,7 +679,7 @@ TvDeviceSetPower( IN int on )
 
     if( on != POWER_ON && on != POWER_OFF ) {
         SampleUtil_Print( "error: can't set power to value %d\n", on );
-        return ( 0 );
+        return 0;
     }
 
     /*
@@ -683,7 +690,7 @@ TvDeviceSetPower( IN int on )
     ret = TvDeviceSetServiceTableVar( TV_SERVICE_CONTROL, TV_CONTROL_POWER,
                                       value );
 
-    return ( ret );
+    return ret;
 }
 
 /******************************************************************************
@@ -700,9 +707,7 @@ TvDeviceSetPower( IN int on )
  *
  *****************************************************************************/
 int
-TvDevicePowerOn( IN IXML_Document * in,
-                 OUT IXML_Document ** out,
-                 OUT char **errorString )
+TvDevicePowerOn( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     ( *out ) = NULL;
     ( *errorString ) = NULL;
@@ -722,7 +727,6 @@ TvDevicePowerOn( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -740,7 +744,7 @@ TvDevicePowerOn( IN IXML_Document * in,
  *****************************************************************************/
 int
 TvDevicePowerOff( IN IXML_Document * in,
-                  OUT IXML_Document ** out,
+                  OUT IXML_Document **out,
                   OUT char **errorString )
 {
     ( *out ) = NULL;
@@ -779,11 +783,8 @@ TvDevicePowerOff( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetChannel( IN IXML_Document * in,
-                    OUT IXML_Document ** out,
-                    OUT char **errorString )
+TvDeviceSetChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
 
     int channel = 0;
@@ -828,7 +829,6 @@ TvDeviceSetChannel( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -846,13 +846,10 @@ TvDeviceSetChannel( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementChannel( IN int incr,
-                  IN IXML_Document * in,
-                  OUT IXML_Document ** out,
-                  OUT char **errorString )
+IncrementChannel( IN int incr, IN IXML_Document * in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curchannel,
-      newchannel;
+    int curchannel;
+    int newchannel;
 
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
@@ -914,12 +911,9 @@ IncrementChannel( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseChannel( IN IXML_Document * in,
-                         OUT IXML_Document ** out,
-                         OUT char **errorString )
+TvDeviceDecreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementChannel( -1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -936,12 +930,9 @@ TvDeviceDecreaseChannel( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseChannel( IN IXML_Document * in,
-                         OUT IXML_Document ** out,
-                         OUT char **errorString )
+TvDeviceIncreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementChannel( 1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -960,13 +951,9 @@ TvDeviceIncreaseChannel( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetVolume( IN IXML_Document * in,
-                   OUT IXML_Document ** out,
-                   OUT char **errorString )
+TvDeviceSetVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
-
     int volume = 0;
 
     ( *out ) = NULL;
@@ -1007,7 +994,6 @@ TvDeviceSetVolume( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1026,10 +1012,7 @@ TvDeviceSetVolume( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-IncrementVolume( IN int incr,
-                 IN IXML_Document * in,
-                 OUT IXML_Document ** out,
-                 OUT char **errorString )
+IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT char **errorString )
 {
     int curvolume,
       newvolume;
@@ -1066,8 +1049,7 @@ IncrementVolume( IN int incr,
                                     TV_CONTROL_VOLUME, value ) ) {
         if( UpnpAddToActionResponse( out, actionName,
                                      TvServiceType[TV_SERVICE_CONTROL],
-                                     "Volume", value ) != UPNP_E_SUCCESS )
-        {
+                                     "Volume", value ) != UPNP_E_SUCCESS ) {
             ( *out ) = NULL;
             ( *errorString ) = "Internal Error";
             return UPNP_E_INTERNAL_ERROR;
@@ -1077,7 +1059,6 @@ IncrementVolume( IN int incr,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1094,13 +1075,9 @@ IncrementVolume( IN int incr,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-TvDeviceIncreaseVolume( IN IXML_Document * in,
-                        OUT IXML_Document ** out,
-                        OUT char **errorString )
+TvDeviceIncreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementVolume( 1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -1117,13 +1094,9 @@ TvDeviceIncreaseVolume( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseVolume( IN IXML_Document * in,
-                        OUT IXML_Document ** out,
-                        OUT char **errorString )
+TvDeviceDecreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementVolume( -1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -1142,13 +1115,9 @@ TvDeviceDecreaseVolume( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetColor( IN IXML_Document * in,
-                  OUT IXML_Document ** out,
-                  OUT char **errorString )
+TvDeviceSetColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
-
     int color = 0;
 
     ( *out ) = NULL;
@@ -1188,7 +1157,6 @@ TvDeviceSetColor( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1205,16 +1173,11 @@ TvDeviceSetColor( IN IXML_Document * in,
  *    IXML_Document **out - action result document
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
-
 int
-IncrementColor( IN int incr,
-                IN IXML_Document * in,
-                OUT IXML_Document ** out,
-                OUT char **errorString )
+IncrementColor( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curcolor,
-      newcolor;
-
+    int curcolor;
+    int newcolor;
     char *actionName;
     char value[TV_MAX_VAL_LEN];
 
@@ -1272,11 +1235,8 @@ IncrementColor( IN int incr,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-TvDeviceDecreaseColor( IN IXML_Document * in,
-                       OUT IXML_Document ** out,
-                       OUT char **errorString )
+TvDeviceDecreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementColor( -1, in, out, errorString );
 }
 
@@ -1293,11 +1253,8 @@ TvDeviceDecreaseColor( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-TvDeviceIncreaseColor( IN IXML_Document * in,
-                       OUT IXML_Document ** out,
-                       OUT char **errorString )
+TvDeviceIncreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementColor( 1, in, out, errorString );
 }
 
@@ -1317,13 +1274,9 @@ TvDeviceIncreaseColor( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetTint( IN IXML_Document * in,
-                 OUT IXML_Document ** out,
-                 OUT char **errorString )
+TvDeviceSetTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
-
     int tint = -1;
 
     ( *out ) = NULL;
@@ -1382,14 +1335,10 @@ TvDeviceSetTint( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementTint( IN int incr,
-               IN IXML_Document * in,
-               OUT IXML_Document ** out,
-               OUT char **errorString )
+IncrementTint( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curtint,
-      newtint;
-
+    int curtint;
+    int newtint;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1432,7 +1381,6 @@ IncrementTint( IN int incr,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1449,11 +1397,8 @@ IncrementTint( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseTint( IN IXML_Document * in,
-                      OUT IXML_Document ** out,
-                      OUT char **errorString )
+TvDeviceIncreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementTint( 1, in, out, errorString );
 }
 
@@ -1471,11 +1416,8 @@ TvDeviceIncreaseTint( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseTint( IN IXML_Document * in,
-                      OUT IXML_Document ** out,
-                      OUT char **errorString )
+TvDeviceDecreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementTint( -1, in, out, errorString );
 }
 
@@ -1495,11 +1437,8 @@ TvDeviceDecreaseTint( IN IXML_Document * in,
  *
  ****************************************************************************/
 int
-TvDeviceSetContrast( IN IXML_Document * in,
-                     OUT IXML_Document ** out,
-                     OUT char **errorString )
+TvDeviceSetContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
     int contrast = -1;
 
@@ -1560,14 +1499,10 @@ TvDeviceSetContrast( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementContrast( IN int incr,
-                   IN IXML_Document * in,
-                   OUT IXML_Document ** out,
-                   OUT char **errorString )
+IncrementContrast( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curcontrast,
-      newcontrast;
-
+    int curcontrast;
+    int newcontrast;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1629,11 +1564,8 @@ IncrementContrast( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseContrast( IN IXML_Document * in,
-                          OUT IXML_Document ** out,
-                          OUT char **errorString )
+TvDeviceIncreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementContrast( 1, in, out, errorString );
 }
 
@@ -1651,9 +1583,7 @@ TvDeviceIncreaseContrast( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseContrast( IXML_Document * in,
-                          IXML_Document ** out,
-                          char **errorString )
+TvDeviceDecreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementContrast( -1, in, out, errorString );
 }
@@ -1671,11 +1601,8 @@ TvDeviceDecreaseContrast( IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetBrightness( IN IXML_Document * in,
-                       OUT IXML_Document ** out,
-                       OUT char **errorString )
+TvDeviceSetBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
     int brightness = -1;
 
@@ -1718,7 +1645,6 @@ TvDeviceSetBrightness( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1736,13 +1662,10 @@ TvDeviceSetBrightness( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementBrightness( IN int incr,
-                     IN IXML_Document * in,
-                     OUT IXML_Document ** out,
-                     OUT char **errorString )
+IncrementBrightness( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curbrightness,
-      newbrightness;
+    int curbrightness;
+    int newbrightness;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1803,9 +1726,7 @@ IncrementBrightness( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseBrightness( IN IXML_Document * in,
-                            OUT IXML_Document ** out,
-                            OUT char **errorString )
+TvDeviceIncreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementBrightness( 1, in, out, errorString );
 }
@@ -1823,9 +1744,7 @@ TvDeviceIncreaseBrightness( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseBrightness( IN IXML_Document * in,
-                            OUT IXML_Document ** out,
-                            OUT char **errorString )
+TvDeviceDecreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementBrightness( -1, in, out, errorString );
 }
@@ -1849,14 +1768,9 @@ TvDeviceDecreaseBrightness( IN IXML_Document * in,
  *   Cookie -- Optional data specified during callback registration
  *
  *****************************************************************************/
-int
-TvDeviceCallbackEventHandler( Upnp_EventType EventType,
-                              void *Event,
-                              void *Cookie )
+int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-
     switch ( EventType ) {
-
         case UPNP_EVENT_SUBSCRIPTION_REQUEST:
 
             TvDeviceHandleSubscriptionRequest( ( struct
@@ -1890,17 +1804,14 @@ TvDeviceCallbackEventHandler( Upnp_EventType EventType,
             break;
 
         default:
-            SampleUtil_Print
-                ( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
+            SampleUtil_Print( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
                 EventType );
     }
 
-    /*
-       Print a summary of the event received 
-     */
+    /* Print a summary of the event received */
     SampleUtil_PrintEvent( EventType, Event );
 
-    return ( 0 );
+    return 0;
 }
 
 /******************************************************************************
@@ -1913,12 +1824,13 @@ TvDeviceCallbackEventHandler( Upnp_EventType EventType,
  *
  *****************************************************************************/
 int
-TvDeviceStop(  )
+TvDeviceStop()
 {
     UpnpUnRegisterRootDevice( device_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+    UpnpFinish();
+    SampleUtil_Finish();
     ithread_mutex_destroy( &TVDevMutex );
+
     return UPNP_E_SUCCESS;
 }
 
@@ -1951,81 +1863,83 @@ TvDeviceStart( char *ip_address,
                print_string pfun )
 {
     int ret = UPNP_E_SUCCESS;
-
     char desc_doc_url[DESC_URL_SIZE];
 
     ithread_mutex_init( &TVDevMutex, NULL );
 
     SampleUtil_Initialize( pfun );
 
-    SampleUtil_Print
-        ( "Initializing UPnP Sdk with \n \t ipaddress = %s port = %d\n",
+    SampleUtil_Print(
+        "Initializing UPnP Sdk with\n"
+        "\tipaddress = %s port = %u\n",
         ip_address, port );
 
-    if( ( ret = UpnpInit( ip_address, port ) ) != UPNP_E_SUCCESS ) {
+    ret = UpnpInit( ip_address, port );
+    if( ret != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error with UpnpInit -- %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     }
 
-    if( ip_address == NULL ) {
-        ip_address = UpnpGetServerIpAddress(  );
-    }
+    ip_address = UpnpGetServerIpAddress();
+    port = UpnpGetServerPort();
 
-    if( port == 0 ) {
-        port = UpnpGetServerPort(  );
-    }
-
-    SampleUtil_Print( "UPnP Initialized\n \t ipaddress= %s port = %d\n",
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
         ip_address, port );
 
-    if( desc_doc_name == NULL )
+    if( desc_doc_name == NULL ) {
         desc_doc_name = "tvcombodesc.xml";
+    }
 
-    if( web_dir_path == NULL )
+    if( web_dir_path == NULL ) {
         web_dir_path = DEFAULT_WEB_DIR;
+    }
 
     snprintf( desc_doc_url, DESC_URL_SIZE, "http://%s:%d/%s", ip_address,
               port, desc_doc_name );
 
     SampleUtil_Print( "Specifying the webserver root directory -- %s\n",
                       web_dir_path );
-    if( ( ret =
-          UpnpSetWebServerRootDir( web_dir_path ) ) != UPNP_E_SUCCESS ) {
-        SampleUtil_Print
-            ( "Error specifying webserver root directory -- %s: %d\n",
+    ret = UpnpSetWebServerRootDir( web_dir_path );
+    if( ret != UPNP_E_SUCCESS ) {
+        SampleUtil_Print( "Error specifying webserver root directory -- %s: %d\n",
               web_dir_path, ret );
-        UpnpFinish(  );
+        UpnpFinish();
+
         return ret;
     }
 
-    SampleUtil_Print
-        ( "Registering the RootDevice\n\t with desc_doc_url: %s\n",
+    SampleUtil_Print(
+        "Registering the RootDevice\n"
+        "\t with desc_doc_url: %s\n",
         desc_doc_url );
 
-    if( ( ret = UpnpRegisterRootDevice( desc_doc_url,
-                                        TvDeviceCallbackEventHandler,
-                                        &device_handle, &device_handle ) )
-        != UPNP_E_SUCCESS ) {
+    ret = UpnpRegisterRootDevice( desc_doc_url, TvDeviceCallbackEventHandler,
+        &device_handle, &device_handle );
+    if( ret != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error registering the rootdevice : %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
+
         return ret;
     } else {
-        SampleUtil_Print( "RootDevice Registered\n" );
-
-        SampleUtil_Print( "Initializing State Table\n" );
+        SampleUtil_Print(
+            "RootDevice Registered\n"
+            "Initializing State Table\n");
         TvDeviceStateTableInit( desc_doc_url );
-        SampleUtil_Print( "State Table Initialized\n" );
-
-        if( ( ret =
-              UpnpSendAdvertisement( device_handle, default_advr_expire ) )
-            != UPNP_E_SUCCESS ) {
+        SampleUtil_Print("State Table Initialized\n");
+        ret = UpnpSendAdvertisement( device_handle, default_advr_expire );
+        if( ret != UPNP_E_SUCCESS ) {
             SampleUtil_Print( "Error sending advertisements : %d\n", ret );
-            UpnpFinish(  );
+            UpnpFinish();
+
             return ret;
         }
 
-        SampleUtil_Print( "Advertisements Sent\n" );
+        SampleUtil_Print("Advertisements Sent\n");
     }
+
     return UPNP_E_SUCCESS;
 }
+

upnp/sample/tvcombo/upnp_tv_device.h

@@ -41,7 +41,9 @@ extern "C" {
 
 #include "ithread.h"
 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 #include "upnp.h"
 #include "sample_util.h"

upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c

@@ -1,37 +1,40 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
-#include <stdio.h>
 #include "sample_util.h"
 #include "upnp_tv_ctrlpt.h"
+
+
+#include <stdio.h>
 #include <string.h>
 
 /*
@@ -124,108 +127,72 @@ TvCtrlPointPrintLongHelp( void )
     SampleUtil_Print( "* TV Control Point Help Info *" );
     SampleUtil_Print( "******************************" );
     SampleUtil_Print( "" );
-    SampleUtil_Print
-        ( "This sample control point application automatically searches" );
-    SampleUtil_Print
-        ( "for and subscribes to the services of television device emulator" );
-    SampleUtil_Print
-        ( "devices, described in the tvdevicedesc.xml description document." );
+    SampleUtil_Print( "This sample control point application automatically searches" );
+    SampleUtil_Print( "for and subscribes to the services of television device emulator" );
+    SampleUtil_Print( "devices, described in the tvdevicedesc.xml description document." );
     SampleUtil_Print( "" );
     SampleUtil_Print( "Commands:" );
     SampleUtil_Print( "  Help" );
     SampleUtil_Print( "       Print this help info." );
     SampleUtil_Print( "  ListDev" );
-    SampleUtil_Print
-        ( "       Print the current list of TV Device Emulators that this" );
-    SampleUtil_Print
-        ( "         control point is aware of.  Each device is preceded by a" );
-    SampleUtil_Print
-        ( "         device number which corresponds to the devnum argument of" );
+    SampleUtil_Print( "       Print the current list of TV Device Emulators that this" );
+    SampleUtil_Print( "         control point is aware of.  Each device is preceded by a" );
+    SampleUtil_Print( "         device number which corresponds to the devnum argument of" );
     SampleUtil_Print( "         commands listed below." );
     SampleUtil_Print( "  Refresh" );
-    SampleUtil_Print
-        ( "       Delete all of the devices from the device list and issue new" );
-    SampleUtil_Print
-        ( "         search request to rebuild the list from scratch." );
+    SampleUtil_Print( "       Delete all of the devices from the device list and issue new" );
+    SampleUtil_Print( "         search request to rebuild the list from scratch." );
     SampleUtil_Print( "  PrintDev       <devnum>" );
-    SampleUtil_Print
-        ( "       Print the state table for the device <devnum>." );
-    SampleUtil_Print
-        ( "         e.g., 'PrintDev 1' prints the state table for the first" );
+    SampleUtil_Print( "       Print the state table for the device <devnum>." );
+    SampleUtil_Print( "         e.g., 'PrintDev 1' prints the state table for the first" );
     SampleUtil_Print( "         device in the device list." );
     SampleUtil_Print( "  PowerOn        <devnum>" );
-    SampleUtil_Print
-        ( "       Sends the PowerOn action to the Control Service of" );
+    SampleUtil_Print( "       Sends the PowerOn action to the Control Service of" );
     SampleUtil_Print( "         device <devnum>." );
     SampleUtil_Print( "  PowerOff       <devnum>" );
-    SampleUtil_Print
-        ( "       Sends the PowerOff action to the Control Service of" );
+    SampleUtil_Print( "       Sends the PowerOff action to the Control Service of" );
     SampleUtil_Print( "         device <devnum>." );
     SampleUtil_Print( "  SetChannel     <devnum> <channel>" );
-    SampleUtil_Print
-        ( "       Sends the SetChannel action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the channel to be changed" );
+    SampleUtil_Print( "       Sends the SetChannel action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the channel to be changed" );
     SampleUtil_Print( "         to <channel>." );
     SampleUtil_Print( "  SetVolume      <devnum> <volume>" );
-    SampleUtil_Print
-        ( "       Sends the SetVolume action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the volume to be changed" );
+    SampleUtil_Print( "       Sends the SetVolume action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the volume to be changed" );
     SampleUtil_Print( "         to <volume>." );
     SampleUtil_Print( "  SetColor       <devnum> <color>" );
-    SampleUtil_Print
-        ( "       Sends the SetColor action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the color to be changed" );
+    SampleUtil_Print( "       Sends the SetColor action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the color to be changed" );
     SampleUtil_Print( "         to <color>." );
     SampleUtil_Print( "  SetTint        <devnum> <tint>" );
-    SampleUtil_Print
-        ( "       Sends the SetTint action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the tint to be changed" );
+    SampleUtil_Print( "       Sends the SetTint action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the tint to be changed" );
     SampleUtil_Print( "         to <tint>." );
     SampleUtil_Print( "  SetContrast    <devnum> <contrast>" );
-    SampleUtil_Print
-        ( "       Sends the SetContrast action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the contrast to be changed" );
+    SampleUtil_Print( "       Sends the SetContrast action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the contrast to be changed" );
     SampleUtil_Print( "         to <contrast>." );
     SampleUtil_Print( "  SetBrightness  <devnum> <brightness>" );
-    SampleUtil_Print
-        ( "       Sends the SetBrightness action to the Control Service of" );
-    SampleUtil_Print
-        ( "         device <devnum>, requesting the brightness to be changed" );
+    SampleUtil_Print( "       Sends the SetBrightness action to the Control Service of" );
+    SampleUtil_Print( "         device <devnum>, requesting the brightness to be changed" );
     SampleUtil_Print( "         to <brightness>." );
     SampleUtil_Print( "  CtrlAction     <devnum> <action>" );
-    SampleUtil_Print
-        ( "       Sends an action request specified by the string <action>" );
-    SampleUtil_Print
-        ( "         to the Control Service of device <devnum>.  This command" );
-    SampleUtil_Print
-        ( "         only works for actions that have no arguments." );
-    SampleUtil_Print
-        ( "         (e.g., \"CtrlAction 1 IncreaseChannel\")" );
+    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
+    SampleUtil_Print( "         to the Control Service of device <devnum>.  This command" );
+    SampleUtil_Print( "         only works for actions that have no arguments." );
+    SampleUtil_Print( "         (e.g., \"CtrlAction 1 IncreaseChannel\")" );
     SampleUtil_Print( "  PictAction     <devnum> <action>" );
-    SampleUtil_Print
-        ( "       Sends an action request specified by the string <action>" );
-    SampleUtil_Print
-        ( "         to the Picture Service of device <devnum>.  This command" );
-    SampleUtil_Print
-        ( "         only works for actions that have no arguments." );
-    SampleUtil_Print
-        ( "         (e.g., \"PictAction 1 DecreaseContrast\")" );
+    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
+    SampleUtil_Print( "         to the Picture Service of device <devnum>.  This command" );
+    SampleUtil_Print( "         only works for actions that have no arguments." );
+    SampleUtil_Print( "         (e.g., \"PictAction 1 DecreaseContrast\")" );
     SampleUtil_Print( "  CtrlGetVar     <devnum> <varname>" );
-    SampleUtil_Print
-        ( "       Requests the value of a variable specified by the string <varname>" );
-    SampleUtil_Print
-        ( "         from the Control Service of device <devnum>." );
+    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
+    SampleUtil_Print( "         from the Control Service of device <devnum>." );
     SampleUtil_Print( "         (e.g., \"CtrlGetVar 1 Volume\")" );
     SampleUtil_Print( "  PictGetVar     <devnum> <action>" );
-    SampleUtil_Print
-        ( "       Requests the value of a variable specified by the string <varname>" );
-    SampleUtil_Print
-        ( "         from the Picture Service of device <devnum>." );
+    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
+    SampleUtil_Print( "         from the Picture Service of device <devnum>." );
     SampleUtil_Print( "         (e.g., \"PictGetVar 1 Tint\")" );
     SampleUtil_Print( "  Exit" );
     SampleUtil_Print( "       Exits the control point application." );
@@ -242,7 +209,7 @@ TvCtrlPointPrintLongHelp( void )
  *
  ********************************************************************************/
 void
-TvCtrlPointPrintCommands(  )
+TvCtrlPointPrintCommands()
 {
     int i;
     int numofcmds = sizeof( cmdloop_cmdlist ) / sizeof( cmdloop_commands );
@@ -321,11 +288,11 @@ TvCtrlPointProcessCommand( char *cmdline )
 
     switch ( cmdnum ) {
         case PRTHELP:
-            TvCtrlPointPrintShortHelp(  );
+            TvCtrlPointPrintShortHelp();
             break;
 
         case PRTFULLHELP:
-            TvCtrlPointPrintLongHelp(  );
+            TvCtrlPointPrintLongHelp();
             break;
 
         case POWON:
@@ -411,15 +378,15 @@ TvCtrlPointProcessCommand( char *cmdline )
             break;
 
         case LSTDEV:
-            TvCtrlPointPrintList(  );
+            TvCtrlPointPrintList();
             break;
 
         case REFRESH:
-            TvCtrlPointRefresh(  );
+            TvCtrlPointRefresh();
             break;
 
         case EXITCMD:
-            rc = TvCtrlPointStop(  );
+            rc = TvCtrlPointStop();
             exit( rc );
             break;
 
@@ -434,26 +401,29 @@ TvCtrlPointProcessCommand( char *cmdline )
     return TV_SUCCESS;
 }
 
-int
-main( int argc,
-      char **argv )
+int main( int argc, char **argv )
 {
     int rc;
     ithread_t cmdloop_thread;
+#ifdef WIN32
+#else
     int sig;
     sigset_t sigs_to_catch;
+#endif
     int code;
 
+
     rc = TvCtrlPointStart( linux_print, NULL );
     if( rc != TV_SUCCESS ) {
         SampleUtil_Print( "Error starting UPnP TV Control Point" );
-        exit( rc );
+        return rc;
     }
-    // start a command loop thread
-    code =
-        ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop,
-                        NULL );
+    /* start a command loop thread */
+    code = ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL );
 
+#ifdef WIN32
+    ithread_join(cmdloop_thread, NULL);
+#else
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -461,7 +431,11 @@ main( int argc,
     sigaddset( &sigs_to_catch, SIGINT );
     sigwait( &sigs_to_catch, &sig );
 
-    SampleUtil_Print( "Shutting down on signal %d...", sig );
-    rc = TvCtrlPointStop(  );
-    exit( rc );
+    SampleUtil_Print( "Shutting down on signal %d...\n", sig );
+#endif
+
+    rc = TvCtrlPointStop();
+
+    return rc;
 }
+

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c

@@ -1,37 +1,42 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
 #include "upnp_tv_ctrlpt.h"
 
-/*
+
+#include "upnp.h"
+
+
+/*!
    Mutex for protecting the global device list
    in a multi-threaded, asynchronous environment.
    All functions should lock this mutex before reading
@@ -48,7 +53,7 @@ char *TvServiceType[] = {
 };
 char *TvServiceName[] = { "Control", "Picture" };
 
-/*
+/*!
    Global arrays for storing variable names and counts for 
    TvControl and TvPicture services 
  */
@@ -59,12 +64,12 @@ char *TvVarName[TV_SERVICE_SERVCOUNT][TV_MAXVARS] = {
 char TvVarCount[TV_SERVICE_SERVCOUNT] =
     { TV_CONTROL_VARCOUNT, TV_PICTURE_VARCOUNT };
 
-/*
+/*!
    Timeout to request during subscriptions 
  */
 int default_timeout = 1801;
 
-/*
+/*!
    The first node in the global device list, or NULL if empty 
  */
 struct TvDeviceNode *GlobalDeviceList = NULL;
@@ -139,10 +144,10 @@ TvCtrlPointDeleteNode( struct TvDeviceNode *node )
  *
  ********************************************************************************/
 int
-TvCtrlPointRemoveDevice( char *UDN )
+TvCtrlPointRemoveDevice(const char *UDN)
 {
-    struct TvDeviceNode *curdevnode,
-     *prevdevnode;
+    struct TvDeviceNode *curdevnode;
+    struct TvDeviceNode *prevdevnode;
 
     ithread_mutex_lock( &DeviceListMutex );
 
@@ -224,7 +229,7 @@ TvCtrlPointRefresh( void )
 {
     int rc;
 
-    TvCtrlPointRemoveAll(  );
+    TvCtrlPointRemoveAll();
 
     /*
        Search for all devices of type tvdevice version 1, 
@@ -539,7 +544,7 @@ TvCtrlPointGetDevice( int devnum,
  *
  ********************************************************************************/
 int
-TvCtrlPointPrintList(  )
+TvCtrlPointPrintList()
 {
     struct TvDeviceNode *tmpdevnode;
     int i = 0;
@@ -668,8 +673,8 @@ TvCtrlPointPrintDevice( int devnum )
  *
  ********************************************************************************/
 void
-TvCtrlPointAddDevice( IXML_Document * DescDoc,
-                      char *location,
+TvCtrlPointAddDevice( IXML_Document *DescDoc,
+                      const char *location,
                       int expires )
 {
     char *deviceType = NULL;
@@ -682,20 +687,19 @@ TvCtrlPointAddDevice( IXML_Document * DescDoc,
     char *eventURL[TV_SERVICE_SERVCOUNT] = { NULL, NULL };
     char *controlURL[TV_SERVICE_SERVCOUNT] = { NULL, NULL };
     Upnp_SID eventSID[TV_SERVICE_SERVCOUNT];
-    int TimeOut[TV_SERVICE_SERVCOUNT] =
-        { default_timeout, default_timeout };
+    int TimeOut[TV_SERVICE_SERVCOUNT] = {
+        default_timeout,
+        default_timeout };
     struct TvDeviceNode *deviceNode;
     struct TvDeviceNode *tmpdevnode;
     int ret = 1;
     int found = 0;
-    int service,
-      var;
+    int service;
+    int var;
 
     ithread_mutex_lock( &DeviceListMutex );
 
-    /*
-       Read key elements from description document 
-     */
+    /* Read key elements from description document */
     UDN = SampleUtil_GetFirstDocumentItem( DescDoc, "UDN" );
     deviceType = SampleUtil_GetFirstDocumentItem( DescDoc, "deviceType" );
     friendlyName =
@@ -703,9 +707,8 @@ TvCtrlPointAddDevice( IXML_Document * DescDoc,
     baseURL = SampleUtil_GetFirstDocumentItem( DescDoc, "URLBase" );
     relURL = SampleUtil_GetFirstDocumentItem( DescDoc, "presentationURL" );
 
-    ret =
-        UpnpResolveURL( ( baseURL ? baseURL : location ), relURL,
-                        presURL );
+    ret = UpnpResolveURL(
+        ( baseURL ? baseURL : location ), relURL, presURL);
 
     if( UPNP_E_SUCCESS != ret )
         SampleUtil_Print( "Error generating presURL from %s + %s", baseURL,
@@ -939,34 +942,36 @@ TvStateUpdate( char *UDN,
  *   changes -- The DOM document representing the changes
  *
  ********************************************************************************/
-void
-TvCtrlPointHandleEvent( Upnp_SID sid,
+void TvCtrlPointHandleEvent(
+	const Upnp_SID sid,
 	int evntkey,
-                        IXML_Document * changes )
+	IXML_Document *changes)
 {
 	struct TvDeviceNode *tmpdevnode;
 	int service;
 
-    ithread_mutex_lock( &DeviceListMutex );
+	ithread_mutex_lock(&DeviceListMutex);
 
 	tmpdevnode = GlobalDeviceList;
-    while( tmpdevnode ) {
-        for( service = 0; service < TV_SERVICE_SERVCOUNT; service++ ) {
-            if( strcmp( tmpdevnode->device.TvService[service].SID, sid ) ==
-                0 ) {
-                SampleUtil_Print( "Received Tv %s Event: %d for SID %s",
-                                  TvServiceName[service], evntkey, sid );
-
-                TvStateUpdate( tmpdevnode->device.UDN, service, changes,
-                               ( char ** )&tmpdevnode->device.
-                               TvService[service].VariableStrVal );
+	while (tmpdevnode) {
+		for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) {
+			if (strcmp(tmpdevnode->device.TvService[service].SID, sid) == 0) {
+				SampleUtil_Print("Received Tv %s Event: %d for SID %s",
+					TvServiceName[service],
+					evntkey,
+					sid);
+				TvStateUpdate(
+					tmpdevnode->device.UDN,
+					service,
+					changes,
+					(char **)&tmpdevnode->device.TvService[service].VariableStrVal);
 				break;
 			}
 		}
 		tmpdevnode = tmpdevnode->next;
 	}
 
-    ithread_mutex_unlock( &DeviceListMutex );
+	ithread_mutex_unlock(&DeviceListMutex);
 }
 
 /********************************************************************************
@@ -983,10 +988,10 @@ TvCtrlPointHandleEvent( Upnp_SID sid,
  *   timeout  -- The new timeout for the subscription
  *
  ********************************************************************************/
-void
-TvCtrlPointHandleSubscribeUpdate( char *eventURL,
-                                  Upnp_SID sid,
-                                  int timeout )
+void TvCtrlPointHandleSubscribeUpdate(
+	const char *eventURL,
+	const Upnp_SID sid,
+	int timeout)
 {
     struct TvDeviceNode *tmpdevnode;
     int service;
@@ -1015,9 +1020,9 @@ TvCtrlPointHandleSubscribeUpdate( char *eventURL,
 }
 
 void
-TvCtrlPointHandleGetVar( char *controlURL,
-                         char *varName,
-                         DOMString varValue )
+TvCtrlPointHandleGetVar( const char *controlURL,
+                         const char *varName,
+                         const DOMString varValue )
 {
 
     struct TvDeviceNode *tmpdevnode;
@@ -1026,14 +1031,11 @@ TvCtrlPointHandleGetVar( char *controlURL,
     ithread_mutex_lock( &DeviceListMutex );
 
     tmpdevnode = GlobalDeviceList;
-    while( tmpdevnode ) {
-        for( service = 0; service < TV_SERVICE_SERVCOUNT; service++ ) {
-            if( strcmp
-                ( tmpdevnode->device.TvService[service].ControlURL,
-                  controlURL ) == 0 ) {
-                SampleUtil_StateUpdate( varName, varValue,
-                                        tmpdevnode->device.UDN,
-                                        GET_VAR_COMPLETE );
+    while (tmpdevnode) {
+        for (service = 0; service < TV_SERVICE_SERVCOUNT; service++) {
+            if (strcmp(tmpdevnode->device.TvService[service].ControlURL, controlURL ) == 0 ) {
+                SampleUtil_StateUpdate(
+                    varName, varValue, tmpdevnode->device.UDN, GET_VAR_COMPLETE );
                 break;
             }
         }
@@ -1057,179 +1059,145 @@ TvCtrlPointHandleGetVar( char *controlURL,
  *   Cookie -- Optional data specified during callback registration
  *
  ********************************************************************************/
-int
-TvCtrlPointCallbackEventHandler( Upnp_EventType EventType,
-                                 void *Event,
-                                 void *Cookie )
+int TvCtrlPointCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-    SampleUtil_PrintEvent( EventType, Event );
+	/*int errCode = 0;*/
 
+	SampleUtil_PrintEvent(EventType, Event);
 	switch ( EventType ) {
-            /*
-               SSDP Stuff 
-             */
+	/* SSDP Stuff */
 	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
-        case UPNP_DISCOVERY_SEARCH_RESULT:
-            {
-                struct Upnp_Discovery *d_event =
-                    ( struct Upnp_Discovery * )Event;
+	case UPNP_DISCOVERY_SEARCH_RESULT: {
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 		IXML_Document *DescDoc = NULL;
 		int ret;
 
-                if( d_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print( "Error in Discovery Callback -- %d",
-                                      d_event->ErrCode );
+		if (d_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Discovery Callback -- %d", d_event->ErrCode);
 		}
 
-                if( ( ret =
-                      UpnpDownloadXmlDoc( d_event->Location,
-                                          &DescDoc ) ) !=
-                    UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error obtaining device description from %s -- error = %d",
+		ret = UpnpDownloadXmlDoc(d_event->Location, &DescDoc);
+		if (ret != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error obtaining device description from %s -- error = %d",
 				d_event->Location, ret );
 		} else {
-                    TvCtrlPointAddDevice( DescDoc, d_event->Location,
-                                          d_event->Expires );
+			TvCtrlPointAddDevice(
+				DescDoc, d_event->Location, d_event->Expires);
 		}
 
-                if( DescDoc )
-                    ixmlDocument_free( DescDoc );
+		if( DescDoc ) {
+			ixmlDocument_free(DescDoc);
+		}
 
-                TvCtrlPointPrintList(  );
+		TvCtrlPointPrintList();
 		break;
 	}
 
 	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
-            /*
-               Nothing to do here... 
-             */
+		/* Nothing to do here... */
 		break;
 
-        case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
-            {
-                struct Upnp_Discovery *d_event =
-                    ( struct Upnp_Discovery * )Event;
+	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 
-                if( d_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in Discovery ByeBye Callback -- %d",
-                          d_event->ErrCode );
+		if (d_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Discovery ByeBye Callback -- %d", d_event->ErrCode);
 		}
 
-                SampleUtil_Print( "Received ByeBye for Device: %s",
-                                  d_event->DeviceId );
-                TvCtrlPointRemoveDevice( d_event->DeviceId );
+		SampleUtil_Print("Received ByeBye for Device: %s", d_event->DeviceId);
+		TvCtrlPointRemoveDevice(d_event->DeviceId);
 
-                SampleUtil_Print( "After byebye:" );
-                TvCtrlPointPrintList(  );
+		SampleUtil_Print("After byebye:");
+		TvCtrlPointPrintList();
 
 		break;
 	}
+	/* SOAP Stuff */
+	case UPNP_CONTROL_ACTION_COMPLETE: {
+		struct Upnp_Action_Complete *a_event = (struct Upnp_Action_Complete *)Event;
 
-            /*
-               SOAP Stuff 
-             */
-        case UPNP_CONTROL_ACTION_COMPLETE:
-            {
-                struct Upnp_Action_Complete *a_event =
-                    ( struct Upnp_Action_Complete * )Event;
-
-                if( a_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in  Action Complete Callback -- %d",
-                          a_event->ErrCode );
+		if (a_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in  Action Complete Callback -- %d",
+				a_event->ErrCode);
 		}
 
-                /*
-                   No need for any processing here, just print out results.  Service state
-                   table updates are handled by events. 
-                 */
+		/* No need for any processing here, just print out results.
+		 * Service state table updates are handled by events. */
 
 		break;
 	}
+	case UPNP_CONTROL_GET_VAR_COMPLETE: {
+		struct Upnp_State_Var_Complete *sv_event = (struct Upnp_State_Var_Complete *)Event;
 
-        case UPNP_CONTROL_GET_VAR_COMPLETE:
-            {
-                struct Upnp_State_Var_Complete *sv_event =
-                    ( struct Upnp_State_Var_Complete * )Event;
-
-                if( sv_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in Get Var Complete Callback -- %d",
-                          sv_event->ErrCode );
+		if (sv_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Get Var Complete Callback -- %d",
+				sv_event->ErrCode);
 		} else {
-                    TvCtrlPointHandleGetVar( sv_event->CtrlUrl,
+			TvCtrlPointHandleGetVar(
+				sv_event->CtrlUrl,
 				sv_event->StateVarName,
-                                             sv_event->CurrentVal );
+				sv_event->CurrentVal);
 		}
-
 		break;
 	}
+	/* GENA Stuff */
+	case UPNP_EVENT_RECEIVED: {
+		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
 
-            /*
-               GENA Stuff 
-             */
-        case UPNP_EVENT_RECEIVED:
-            {
-                struct Upnp_Event *e_event = ( struct Upnp_Event * )Event;
-
-                TvCtrlPointHandleEvent( e_event->Sid, e_event->EventKey,
-                                        e_event->ChangedVariables );
+		TvCtrlPointHandleEvent(
+			e_event->Sid,
+			e_event->EventKey,
+			e_event->ChangedVariables);
 		break;
 	}
-
 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
 	case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
-        case UPNP_EVENT_RENEWAL_COMPLETE:
-            {
-                struct Upnp_Event_Subscribe *es_event =
-                    ( struct Upnp_Event_Subscribe * )Event;
+	case UPNP_EVENT_RENEWAL_COMPLETE: {
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 
-                if( es_event->ErrCode != UPNP_E_SUCCESS ) {
-                    SampleUtil_Print
-                        ( "Error in Event Subscribe Callback -- %d",
-                          es_event->ErrCode );
+		if (es_event->ErrCode != UPNP_E_SUCCESS) {
+			SampleUtil_Print(
+				"Error in Event Subscribe Callback -- %d",
+				es_event->ErrCode);
 		} else {
-                    TvCtrlPointHandleSubscribeUpdate( es_event->
-                                                      PublisherUrl,
+			TvCtrlPointHandleSubscribeUpdate(
+				es_event->PublisherUrl,
 				es_event->Sid,
-                                                      es_event->TimeOut );
+				es_event->TimeOut);
 		}
 
 		break;
 	}
-
 	case UPNP_EVENT_AUTORENEWAL_FAILED:
-        case UPNP_EVENT_SUBSCRIPTION_EXPIRED:
-            {
+	case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 		int TimeOut = default_timeout;
 		Upnp_SID newSID;
 		int ret;
 
-                struct Upnp_Event_Subscribe *es_event =
-                    ( struct Upnp_Event_Subscribe * )Event;
+		ret = UpnpSubscribe(
+			ctrlpt_handle,
+			es_event->PublisherUrl,
+			&TimeOut,
+			newSID);
 
-                ret =
-                    UpnpSubscribe( ctrlpt_handle, es_event->PublisherUrl,
-                                   &TimeOut, newSID );
-
-                if( ret == UPNP_E_SUCCESS ) {
-                    SampleUtil_Print( "Subscribed to EventURL with SID=%s",
-                                      newSID );
-                    TvCtrlPointHandleSubscribeUpdate( es_event->
-                                                      PublisherUrl, newSID,
-                                                      TimeOut );
+		if (ret == UPNP_E_SUCCESS) {
+			SampleUtil_Print("Subscribed to EventURL with SID=%s", newSID);
+			TvCtrlPointHandleSubscribeUpdate(
+				es_event->PublisherUrl,
+				newSID,
+				TimeOut);
 		} else {
-                    SampleUtil_Print
-                        ( "Error Subscribing to EventURL -- %d", ret );
+			SampleUtil_Print("Error Subscribing to EventURL -- %d", ret);
 		}
 		break;
 	}
-
-            /*
-               ignore these cases, since this is not a device 
-             */
+	/* ignore these cases, since this is not a device */
 	case UPNP_EVENT_SUBSCRIPTION_REQUEST:
 	case UPNP_CONTROL_GET_VAR_REQUEST:
 	case UPNP_CONTROL_ACTION_REQUEST:
@@ -1320,12 +1288,12 @@ TvCtrlPointVerifyTimeouts( int incr )
  *    None
  *
  ********************************************************************************/
-void *
-TvCtrlPointTimerLoop( void *args )
+static int TvCtrlPointTimerLoopRun = 1;
+void *TvCtrlPointTimerLoop(void *args)
 {
     int incr = 30;              // how often to verify the timeouts, in seconds
 
-    while( 1 ) {
+    while (TvCtrlPointTimerLoopRun) {
         isleep( incr );
         TvCtrlPointVerifyTimeouts( incr );
     }
@@ -1348,62 +1316,70 @@ TvCtrlPointTimerLoop( void *args )
  *		TV_SUCCESS if everything went well, else TV_ERROR
  *
  ********************************************************************************/
-int
-TvCtrlPointStart( print_string printFunctionPtr,
-                  state_update updateFunctionPtr )
+int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionPtr)
 {
 	ithread_t timer_thread;
 	int rc;
-    short int port = 0;
+	unsigned short port = 0;
 	char *ip_address = NULL;
 
-    SampleUtil_Initialize( printFunctionPtr );
-    SampleUtil_RegisterUpdateFunction( updateFunctionPtr );
+	SampleUtil_Initialize(printFunctionPtr);
+	SampleUtil_RegisterUpdateFunction(updateFunctionPtr);
 
-    ithread_mutex_init( &DeviceListMutex, 0 );
+	ithread_mutex_init(&DeviceListMutex, 0);
 
-    SampleUtil_Print( "Initializing UPnP with ipaddress=%s port=%d",
-                      ip_address, port );
-    rc = UpnpInit( ip_address, port );
-    if( UPNP_E_SUCCESS != rc ) {
-        SampleUtil_Print( "WinCEStart: UpnpInit() Error: %d", rc );
-        UpnpFinish(  );
+	SampleUtil_Print(
+		"Initializing UPnP Sdk with\n"
+		"\tipaddress = %s port = %u\n",
+		ip_address, port);
+
+	rc = UpnpInit(ip_address, port);
+	if (rc != UPNP_E_SUCCESS) {
+		SampleUtil_Print("WinCEStart: UpnpInit() Error: %d", rc);
+		UpnpFinish();
 		return TV_ERROR;
 	}
+	if (!ip_address) {
+		ip_address = UpnpGetServerIpAddress();
+	}
+	if (!port) {
+		port = UpnpGetServerPort();
+	}
 
-    if( NULL == ip_address )
-        ip_address = UpnpGetServerIpAddress(  );
-    if( 0 == port )
-        port = UpnpGetServerPort(  );
+	SampleUtil_Print(
+		"UPnP Initialized\n"
+		"\tipaddress= %s port = %u\n",
+		ip_address, port);
 
-    SampleUtil_Print( "UPnP Initialized (%s:%d)", ip_address, port );
-
-    SampleUtil_Print( "Registering Control Point" );
-    rc = UpnpRegisterClient( TvCtrlPointCallbackEventHandler,
-                             &ctrlpt_handle, &ctrlpt_handle );
-    if( UPNP_E_SUCCESS != rc ) {
+	SampleUtil_Print("Registering Control Point");
+	rc = UpnpRegisterClient(TvCtrlPointCallbackEventHandler,
+		&ctrlpt_handle, &ctrlpt_handle);
+	if (rc != UPNP_E_SUCCESS) {
 		SampleUtil_Print( "Error registering CP: %d", rc );
-        UpnpFinish(  );
+		UpnpFinish();
+
 		return TV_ERROR;
 	}
 
-    SampleUtil_Print( "Control Point Registered" );
+	SampleUtil_Print("Control Point Registered");
 
-    TvCtrlPointRefresh(  );
+	TvCtrlPointRefresh();
 
-    // start a timer thread
-    ithread_create( &timer_thread, NULL, TvCtrlPointTimerLoop, NULL );
+	/* start a timer thread */
+	ithread_create(&timer_thread, NULL, TvCtrlPointTimerLoop, NULL);
+	ithread_detach(timer_thread);
 
 	return TV_SUCCESS;
 }
 
-int
-TvCtrlPointStop( void )
+int TvCtrlPointStop(void)
 {
-    TvCtrlPointRemoveAll(  );
+	TvCtrlPointTimerLoopRun = 0;
+	TvCtrlPointRemoveAll();
 	UpnpUnRegisterClient( ctrlpt_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+	UpnpFinish();
+	SampleUtil_Finish();
 
 	return TV_SUCCESS;
 }
+

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h

@@ -1,53 +1,65 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
 
 #ifndef UPNP_TV_CTRLPT_H
 #define UPNP_TV_CTRLPT_H
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdio.h>
+
+#include "sample_util.h"
+
 
 #include "ithread.h"
-#include <unistd.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-
 #include "upnp.h"
 #include "upnptools.h"
-#include "sample_util.h"
+
+
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#ifdef WIN32
+	/* Do not #include <unistd.h> */
+#else
+	#include <unistd.h>
+#endif
+
 
 #define TV_SERVICE_SERVCOUNT	2
 #define TV_SERVICE_CONTROL		0
@@ -108,11 +120,11 @@ extern ithread_mutex_t DeviceListMutex;
 
 extern UpnpClient_Handle ctrlpt_handle;
 
-void	TvCtrlPointPrintHelp( void );
+void		TvCtrlPointPrintHelp(void);
 int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
-int		TvCtrlPointRemoveDevice(char*);
-int		TvCtrlPointRemoveAll( void );
-int		TvCtrlPointRefresh( void );
+int		TvCtrlPointRemoveDevice(const char *);
+int		TvCtrlPointRemoveAll(void);
+int		TvCtrlPointRefresh(void);
 
 
 int		TvCtrlPointSendAction(int, int, char *, char **, char **, int);
@@ -138,11 +150,11 @@ int		TvCtrlPointGetBrightness(int);
 int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
 int		TvCtrlPointPrintList( void );
 int		TvCtrlPointPrintDevice(int);
-void	TvCtrlPointAddDevice (IXML_Document *, char *, int); 
-void    TvCtrlPointHandleGetVar(char *,char *,DOMString);
+void	TvCtrlPointAddDevice(IXML_Document *, const char *, int); 
+void    TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
 void	TvStateUpdate(char*,int, IXML_Document * , char **);
-void	TvCtrlPointHandleEvent(Upnp_SID, int, IXML_Document *); 
-void	TvCtrlPointHandleSubscribeUpdate(char *, Upnp_SID, int); 
+void	TvCtrlPointHandleEvent(const Upnp_SID, int, IXML_Document *); 
+void	TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); 
 int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
 void	TvCtrlPointVerifyTimeouts(int);
 void	TvCtrlPointPrintCommands( void );

upnp/sample/tvdevice/linux/upnp_tv_device_main.c

@@ -1,38 +1,42 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
-#include <stdio.h>
 #include "sample_util.h"
 #include "upnp_tv_device.h"
 
+
+#include <stdio.h>
+
+
 /******************************************************************************
  * linux_print
  *
@@ -82,7 +86,7 @@ TvDeviceCommandLoop( void *args )
 
         if( strcasecmp( cmd, "exit" ) == 0 ) {
             SampleUtil_Print( "Shutting down...\n" );
-            TvDeviceStop(  );
+            TvDeviceStop();
             exit( 0 );
         } else {
             SampleUtil_Print( "\n   Unknown command: %s\n\n", cmd );
@@ -117,26 +121,27 @@ TvDeviceCommandLoop( void *args )
  *                 
  *
  *****************************************************************************/
-int
-main( IN int argc,
-      IN char **argv )
+int main( IN int argc, IN char **argv )
 {
 
     unsigned int portTemp = 0;
     char *ip_address = NULL,
      *desc_doc_name = NULL,
      *web_dir_path = NULL;
+    int rc;
     ithread_t cmdloop_thread;
-    int code;
-    unsigned int port = 0;
+#ifdef WIN32
+#else
     int sig;
     sigset_t sigs_to_catch;
-
+#endif
+    int code;
+    unsigned int port = 0;
     int i = 0;
 
     SampleUtil_Initialize( linux_print );
 
-    //Parse options
+    // Parse options
     for( i = 1; i < argc; i++ ) {
         if( strcmp( argv[i], "-ip" ) == 0 ) {
             ip_address = argv[++i];
@@ -163,21 +168,20 @@ main( IN int argc,
                 ( "\tweb_dir_path: Filesystem path where web files "
                   "related to the device are stored\n" );
             SampleUtil_Print( "\t\te.g.: /upnp/sample/tvdevice/web\n" );
-            exit( 1 );
+            return 1;
         }
     }
 
     port = ( unsigned short )portTemp;
 
-    TvDeviceStart( ip_address, port, desc_doc_name, web_dir_path,
-                   linux_print );
+    TvDeviceStart( ip_address, port, desc_doc_name, web_dir_path, linux_print );
 
-    /*
-       start a command loop thread 
-     */
-    code = ithread_create( &cmdloop_thread, NULL, TvDeviceCommandLoop,
-                           NULL );
+    /* start a command loop thread */
+    code = ithread_create( &cmdloop_thread, NULL, TvDeviceCommandLoop, NULL );
 
+#ifdef WIN32
+    ithread_join(cmdloop_thread, NULL);
+#else
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -186,6 +190,9 @@ main( IN int argc,
     sigwait( &sigs_to_catch, &sig );
 
     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
-    TvDeviceStop(  );
-    exit( 0 );
+#endif
+    rc = TvDeviceStop();
+    
+    return rc;
 }
+

upnp/sample/tvdevice/upnp_tv_device.c

@@ -1,40 +1,47 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
 #include "upnp_tv_device.h"
 
+
+#include <assert.h>
+
+
 #define DEFAULT_WEB_DIR "./web"
 
+
 #define DESC_URL_SIZE 200
 
+
 /*
    Device type for tv device 
  */
@@ -180,7 +187,6 @@ SetServiceTable( IN int serviceType,
     }
 
     return SetActionTable( serviceType, out );
-
 }
 
 /******************************************************************************
@@ -251,7 +257,6 @@ SetActionTable( IN int serviceType,
     }
 
     return 0;
-
 }
 
 /******************************************************************************
@@ -374,9 +379,9 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
 {
     unsigned int i = 0;         //,j=0;
 
-    // IXML_Document *PropSet=NULL;
+	// IXML_Document *PropSet = NULL;
 
-    //lock state mutex
+	// lock state mutex
 	ithread_mutex_lock( &TVDevMutex );
 
     for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
@@ -387,20 +392,23 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
             /*
 			PropSet = NULL;
 
-               for (j=0; j< tv_service_table[i].VariableCount; j++)
-               {
-               //add each variable to the property set
-               //for initial state dump
-               UpnpAddToPropertySet(&PropSet, 
+			for (j = 0; j< tv_service_table[i].VariableCount; ++j) {
+				// add each variable to the property set
+				// for initial state dump
+				UpnpAddToPropertySet(
+					&PropSet, 
 					tv_service_table[i].VariableName[j],
 					tv_service_table[i].VariableStrVal[j]);
 			}
 
-               //dump initial state 
-               UpnpAcceptSubscriptionExt(device_handle, sr_event->UDN, 
+			// dump initial state 
+			UpnpAcceptSubscriptionExt(
+				device_handle,
+				sr_event->UDN, 
 				sr_event->ServiceId,
-               PropSet,sr_event->Sid);
-               //free document
+				PropSet,
+				sr_event->Sid);
+			// free document
 			Document_free(PropSet);
 
              */
@@ -408,21 +416,22 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
 			UpnpAcceptSubscription( device_handle,
 				sr_event->UDN,
 				sr_event->ServiceId,
-                                    ( const char ** )tv_service_table[i].
+				(const char **)tv_service_table[i].
 				VariableName,
-                                    ( const char ** )tv_service_table[i].
+				(const char **)tv_service_table[i].
 				VariableStrVal,
 				tv_service_table[i].VariableCount,
-                                    sr_event->Sid );
+				sr_event->Sid);
 
 		}
 	}
 
 	ithread_mutex_unlock( &TVDevMutex );
 
-    return ( 1 );
+	return 1;
 }
 
+
 /******************************************************************************
  * TvDeviceHandleGetVarRequest
  *
@@ -439,8 +448,8 @@ int
 TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
                              *cgv_event )
 {
-    unsigned int i = 0,
-      j = 0;
+    unsigned int i = 0;
+    unsigned int j = 0;
     int getvar_succeeded = 0;
 
     cgv_event->CurrentVal = NULL;
@@ -448,12 +457,12 @@ TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
     ithread_mutex_lock( &TVDevMutex );
 
     for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
-        //check udn and service id
+        // check udn and service id
         if( ( strcmp( cgv_event->DevUDN, tv_service_table[i].UDN ) == 0 )
             &&
             ( strcmp( cgv_event->ServiceID, tv_service_table[i].ServiceId )
               == 0 ) ) {
-            //check variable name
+            // check variable name
             for( j = 0; j < tv_service_table[i].VariableCount; j++ ) {
                 if( strcmp( cgv_event->StateVarName,
                             tv_service_table[i].VariableName[j] ) == 0 ) {
@@ -498,7 +507,6 @@ TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
 int
 TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
 {
-
     /*
        Defaults if action not found 
      */
@@ -569,7 +577,7 @@ TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
         if( retCode == UPNP_E_SUCCESS ) {
             ca_event->ErrCode = UPNP_E_SUCCESS;
         } else {
-            //copy the error string 
+            // copy the error string
             strcpy( ca_event->ErrStr, errorString );
             switch ( retCode ) {
                 case UPNP_E_INVALID_PARAM:
@@ -651,7 +659,6 @@ TvDeviceSetServiceTableVar( IN unsigned int service,
     ithread_mutex_unlock( &TVDevMutex );
 
     return ( 1 );
-
 }
 
 /******************************************************************************
@@ -674,7 +681,7 @@ TvDeviceSetPower( IN int on )
 
     if( on != POWER_ON && on != POWER_OFF ) {
         SampleUtil_Print( "error: can't set power to value %d\n", on );
-        return ( 0 );
+        return 0;
     }
 
     /*
@@ -685,7 +692,7 @@ TvDeviceSetPower( IN int on )
     ret = TvDeviceSetServiceTableVar( TV_SERVICE_CONTROL, TV_CONTROL_POWER,
                                       value );
 
-    return ( ret );
+    return ret;
 }
 
 /******************************************************************************
@@ -702,9 +709,7 @@ TvDeviceSetPower( IN int on )
  *
  *****************************************************************************/
 int
-TvDevicePowerOn( IN IXML_Document * in,
-                 OUT IXML_Document ** out,
-                 OUT char **errorString )
+TvDevicePowerOn( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     ( *out ) = NULL;
     ( *errorString ) = NULL;
@@ -724,7 +729,6 @@ TvDevicePowerOn( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -742,7 +746,7 @@ TvDevicePowerOn( IN IXML_Document * in,
  *****************************************************************************/
 int
 TvDevicePowerOff( IN IXML_Document * in,
-                  OUT IXML_Document ** out,
+                  OUT IXML_Document **out,
                   OUT char **errorString )
 {
     ( *out ) = NULL;
@@ -781,11 +785,8 @@ TvDevicePowerOff( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetChannel( IN IXML_Document * in,
-                    OUT IXML_Document ** out,
-                    OUT char **errorString )
+TvDeviceSetChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
 
     int channel = 0;
@@ -830,7 +831,6 @@ TvDeviceSetChannel( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -848,13 +848,10 @@ TvDeviceSetChannel( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementChannel( IN int incr,
-                  IN IXML_Document * in,
-                  OUT IXML_Document ** out,
-                  OUT char **errorString )
+IncrementChannel( IN int incr, IN IXML_Document * in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curchannel,
-      newchannel;
+    int curchannel;
+    int newchannel;
 
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
@@ -916,12 +913,9 @@ IncrementChannel( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseChannel( IN IXML_Document * in,
-                         OUT IXML_Document ** out,
-                         OUT char **errorString )
+TvDeviceDecreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementChannel( -1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -938,12 +932,9 @@ TvDeviceDecreaseChannel( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseChannel( IN IXML_Document * in,
-                         OUT IXML_Document ** out,
-                         OUT char **errorString )
+TvDeviceIncreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementChannel( 1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -962,13 +953,9 @@ TvDeviceIncreaseChannel( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetVolume( IN IXML_Document * in,
-                   OUT IXML_Document ** out,
-                   OUT char **errorString )
+TvDeviceSetVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
-
     int volume = 0;
 
     ( *out ) = NULL;
@@ -1009,7 +996,6 @@ TvDeviceSetVolume( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1028,10 +1014,7 @@ TvDeviceSetVolume( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-IncrementVolume( IN int incr,
-                 IN IXML_Document * in,
-                 OUT IXML_Document ** out,
-                 OUT char **errorString )
+IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT char **errorString )
 {
     int curvolume,
       newvolume;
@@ -1068,8 +1051,7 @@ IncrementVolume( IN int incr,
                                     TV_CONTROL_VOLUME, value ) ) {
         if( UpnpAddToActionResponse( out, actionName,
                                      TvServiceType[TV_SERVICE_CONTROL],
-                                     "Volume", value ) != UPNP_E_SUCCESS )
-        {
+                                     "Volume", value ) != UPNP_E_SUCCESS ) {
             ( *out ) = NULL;
             ( *errorString ) = "Internal Error";
             return UPNP_E_INTERNAL_ERROR;
@@ -1079,7 +1061,6 @@ IncrementVolume( IN int incr,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1096,13 +1077,9 @@ IncrementVolume( IN int incr,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-TvDeviceIncreaseVolume( IN IXML_Document * in,
-                        OUT IXML_Document ** out,
-                        OUT char **errorString )
+TvDeviceIncreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementVolume( 1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -1119,13 +1096,9 @@ TvDeviceIncreaseVolume( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseVolume( IN IXML_Document * in,
-                        OUT IXML_Document ** out,
-                        OUT char **errorString )
+TvDeviceDecreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementVolume( -1, in, out, errorString );
-
 }
 
 /******************************************************************************
@@ -1144,13 +1117,9 @@ TvDeviceDecreaseVolume( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetColor( IN IXML_Document * in,
-                  OUT IXML_Document ** out,
-                  OUT char **errorString )
+TvDeviceSetColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
-
     int color = 0;
 
     ( *out ) = NULL;
@@ -1190,7 +1159,6 @@ TvDeviceSetColor( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1207,16 +1175,11 @@ TvDeviceSetColor( IN IXML_Document * in,
  *    IXML_Document **out - action result document
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
-
 int
-IncrementColor( IN int incr,
-                IN IXML_Document * in,
-                OUT IXML_Document ** out,
-                OUT char **errorString )
+IncrementColor( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curcolor,
-      newcolor;
-
+    int curcolor;
+    int newcolor;
     char *actionName;
     char value[TV_MAX_VAL_LEN];
 
@@ -1274,11 +1237,8 @@ IncrementColor( IN int incr,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-TvDeviceDecreaseColor( IN IXML_Document * in,
-                       OUT IXML_Document ** out,
-                       OUT char **errorString )
+TvDeviceDecreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementColor( -1, in, out, errorString );
 }
 
@@ -1295,11 +1255,8 @@ TvDeviceDecreaseColor( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-TvDeviceIncreaseColor( IN IXML_Document * in,
-                       OUT IXML_Document ** out,
-                       OUT char **errorString )
+TvDeviceIncreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementColor( 1, in, out, errorString );
 }
 
@@ -1319,13 +1276,9 @@ TvDeviceIncreaseColor( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetTint( IN IXML_Document * in,
-                 OUT IXML_Document ** out,
-                 OUT char **errorString )
+TvDeviceSetTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
-
     int tint = -1;
 
     ( *out ) = NULL;
@@ -1384,14 +1337,10 @@ TvDeviceSetTint( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementTint( IN int incr,
-               IN IXML_Document * in,
-               OUT IXML_Document ** out,
-               OUT char **errorString )
+IncrementTint( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curtint,
-      newtint;
-
+    int curtint;
+    int newtint;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1434,7 +1383,6 @@ IncrementTint( IN int incr,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1451,11 +1399,8 @@ IncrementTint( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseTint( IN IXML_Document * in,
-                      OUT IXML_Document ** out,
-                      OUT char **errorString )
+TvDeviceIncreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementTint( 1, in, out, errorString );
 }
 
@@ -1473,11 +1418,8 @@ TvDeviceIncreaseTint( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseTint( IN IXML_Document * in,
-                      OUT IXML_Document ** out,
-                      OUT char **errorString )
+TvDeviceDecreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementTint( -1, in, out, errorString );
 }
 
@@ -1497,11 +1439,8 @@ TvDeviceDecreaseTint( IN IXML_Document * in,
  *
  ****************************************************************************/
 int
-TvDeviceSetContrast( IN IXML_Document * in,
-                     OUT IXML_Document ** out,
-                     OUT char **errorString )
+TvDeviceSetContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
     int contrast = -1;
 
@@ -1562,14 +1501,10 @@ TvDeviceSetContrast( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementContrast( IN int incr,
-                   IN IXML_Document * in,
-                   OUT IXML_Document ** out,
-                   OUT char **errorString )
+IncrementContrast( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curcontrast,
-      newcontrast;
-
+    int curcontrast;
+    int newcontrast;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1631,11 +1566,8 @@ IncrementContrast( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseContrast( IN IXML_Document * in,
-                          OUT IXML_Document ** out,
-                          OUT char **errorString )
+TvDeviceIncreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     return IncrementContrast( 1, in, out, errorString );
 }
 
@@ -1653,9 +1585,7 @@ TvDeviceIncreaseContrast( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseContrast( IXML_Document * in,
-                          IXML_Document ** out,
-                          char **errorString )
+TvDeviceDecreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementContrast( -1, in, out, errorString );
 }
@@ -1673,11 +1603,8 @@ TvDeviceDecreaseContrast( IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceSetBrightness( IN IXML_Document * in,
-                       OUT IXML_Document ** out,
-                       OUT char **errorString )
+TvDeviceSetBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-
     char *value = NULL;
     int brightness = -1;
 
@@ -1720,7 +1647,6 @@ TvDeviceSetBrightness( IN IXML_Document * in,
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
-
 }
 
 /******************************************************************************
@@ -1738,13 +1664,10 @@ TvDeviceSetBrightness( IN IXML_Document * in,
  *    char **errorString - errorString (in case action was unsuccessful)
  *****************************************************************************/
 int
-IncrementBrightness( IN int incr,
-                     IN IXML_Document * in,
-                     OUT IXML_Document ** out,
-                     OUT char **errorString )
+IncrementBrightness( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
-    int curbrightness,
-      newbrightness;
+    int curbrightness;
+    int newbrightness;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1805,9 +1728,7 @@ IncrementBrightness( IN int incr,
  *
  *****************************************************************************/
 int
-TvDeviceIncreaseBrightness( IN IXML_Document * in,
-                            OUT IXML_Document ** out,
-                            OUT char **errorString )
+TvDeviceIncreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementBrightness( 1, in, out, errorString );
 }
@@ -1825,9 +1746,7 @@ TvDeviceIncreaseBrightness( IN IXML_Document * in,
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseBrightness( IN IXML_Document * in,
-                            OUT IXML_Document ** out,
-                            OUT char **errorString )
+TvDeviceDecreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
 {
     return IncrementBrightness( -1, in, out, errorString );
 }
@@ -1851,14 +1770,9 @@ TvDeviceDecreaseBrightness( IN IXML_Document * in,
  *   Cookie -- Optional data specified during callback registration
  *
  *****************************************************************************/
-int
-TvDeviceCallbackEventHandler( Upnp_EventType EventType,
-                              void *Event,
-                              void *Cookie )
+int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-
     switch ( EventType ) {
-
         case UPNP_EVENT_SUBSCRIPTION_REQUEST:
 
             TvDeviceHandleSubscriptionRequest( ( struct
@@ -1892,17 +1806,14 @@ TvDeviceCallbackEventHandler( Upnp_EventType EventType,
             break;
 
         default:
-            SampleUtil_Print
-                ( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
+            SampleUtil_Print( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
                 EventType );
     }
 
-    /*
-       Print a summary of the event received 
-     */
+    /* Print a summary of the event received */
     SampleUtil_PrintEvent( EventType, Event );
 
-    return ( 0 );
+    return 0;
 }
 
 /******************************************************************************
@@ -1915,12 +1826,13 @@ TvDeviceCallbackEventHandler( Upnp_EventType EventType,
  *
  *****************************************************************************/
 int
-TvDeviceStop(  )
+TvDeviceStop(void)
 {
     UpnpUnRegisterRootDevice( device_handle );
-    UpnpFinish(  );
-    SampleUtil_Finish(  );
+    UpnpFinish();
+    SampleUtil_Finish();
     ithread_mutex_destroy( &TVDevMutex );
+
     return UPNP_E_SUCCESS;
 }
 
@@ -1953,79 +1865,83 @@ TvDeviceStart( char *ip_address,
                print_string pfun )
 {
     int ret = UPNP_E_SUCCESS;
-
     char desc_doc_url[DESC_URL_SIZE];
 
     ithread_mutex_init( &TVDevMutex, NULL );
 
     SampleUtil_Initialize( pfun );
 
-    SampleUtil_Print
-        ( "Initializing UPnP Sdk with \n \t ipaddress = %s port = %d\n",
+    SampleUtil_Print(
+        "Initializing UPnP Sdk with\n"
+        "\tipaddress = %s port = %u\n",
         ip_address, port );
 
-    if( ( ret = UpnpInit( ip_address, port ) ) != UPNP_E_SUCCESS ) {
+    ret = UpnpInit( ip_address, port );
+    if( ret != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error with UpnpInit -- %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
         return ret;
     }
 
-    if( ip_address == NULL ) {
-        ip_address = UpnpGetServerIpAddress(  );
-    }
+    ip_address = UpnpGetServerIpAddress();
+    port = UpnpGetServerPort();
 
-        port = UpnpGetServerPort(  );
-
-    SampleUtil_Print( "UPnP Initialized\n \t ipaddress= %s port = %d\n",
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
         ip_address, port );
 
-    if( desc_doc_name == NULL )
+    if( desc_doc_name == NULL ) {
         desc_doc_name = "tvdevicedesc.xml";
+    }
 
-    if( web_dir_path == NULL )
+    if( web_dir_path == NULL ) {
         web_dir_path = DEFAULT_WEB_DIR;
+    }
 
     snprintf( desc_doc_url, DESC_URL_SIZE, "http://%s:%d/%s", ip_address,
               port, desc_doc_name );
 
     SampleUtil_Print( "Specifying the webserver root directory -- %s\n",
                       web_dir_path );
-    if( ( ret =
-          UpnpSetWebServerRootDir( web_dir_path ) ) != UPNP_E_SUCCESS ) {
-        SampleUtil_Print
-            ( "Error specifying webserver root directory -- %s: %d\n",
+    ret = UpnpSetWebServerRootDir( web_dir_path );
+    if( ret != UPNP_E_SUCCESS ) {
+        SampleUtil_Print( "Error specifying webserver root directory -- %s: %d\n",
               web_dir_path, ret );
-        UpnpFinish(  );
+        UpnpFinish();
+
         return ret;
     }
 
-    SampleUtil_Print
-        ( "Registering the RootDevice\n\t with desc_doc_url: %s\n",
+    SampleUtil_Print(
+        "Registering the RootDevice\n"
+        "\t with desc_doc_url: %s\n",
         desc_doc_url );
 
-    if( ( ret = UpnpRegisterRootDevice( desc_doc_url,
-                                        TvDeviceCallbackEventHandler,
-                                        &device_handle, &device_handle ) )
-        != UPNP_E_SUCCESS ) {
+    ret = UpnpRegisterRootDevice( desc_doc_url, TvDeviceCallbackEventHandler,
+        &device_handle, &device_handle );
+    if( ret != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error registering the rootdevice : %d\n", ret );
-        UpnpFinish(  );
+        UpnpFinish();
+
         return ret;
     } else {
-        SampleUtil_Print( "RootDevice Registered\n" );
-
-        SampleUtil_Print( "Initializing State Table\n" );
+        SampleUtil_Print(
+            "RootDevice Registered\n"
+            "Initializing State Table\n");
         TvDeviceStateTableInit( desc_doc_url );
-        SampleUtil_Print( "State Table Initialized\n" );
-
-        if( ( ret =
-              UpnpSendAdvertisement( device_handle, default_advr_expire ) )
-            != UPNP_E_SUCCESS ) {
+        SampleUtil_Print("State Table Initialized\n");
+        ret = UpnpSendAdvertisement( device_handle, default_advr_expire );
+        if( ret != UPNP_E_SUCCESS ) {
             SampleUtil_Print( "Error sending advertisements : %d\n", ret );
-            UpnpFinish(  );
+            UpnpFinish();
+
             return ret;
         }
 
-        SampleUtil_Print( "Advertisements Sent\n" );
+        SampleUtil_Print("Advertisements Sent\n");
     }
+
     return UPNP_E_SUCCESS;
 }
+

upnp/sample/tvdevice/upnp_tv_device.h

@@ -1,33 +1,34 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
 #ifndef UPNP_TV_DEVICE_H
 #define UPNP_TV_DEVICE_H
@@ -41,7 +42,9 @@ extern "C" {
 
 #include "ithread.h"
 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 #include "upnp.h"
 #include "sample_util.h"
@@ -629,7 +632,7 @@ int TvDeviceDecreaseBrightness(IN IXML_Document *in, OUT IXML_Document **out,
 
 int TvDeviceStart(char * ip_address, unsigned short port,char * desc_doc_name,
 				  char *web_dir_path, print_string pfun);
-int TvDeviceStop();
+int TvDeviceStop(void);
 
 #ifdef __cplusplus
 }

upnp/src/api/UpnpString.c

@@ -0,0 +1,156 @@
+
+
+/*!
+ * \addtogroup UpnpString
+ *
+ * Due to its heavy use, this class is coded for efficiency, not for beauty.
+ * Do not use this as example to other classes. Please take a look at any
+ * other one.
+ *
+ * \todo Always alloc a minimum size like 64 bytes or so and when shrinking
+ * do not perform a new memory allocation.
+ *
+ * @{
+ *
+ * \file
+ *
+ * \brief UpnpString object implementation.
+ */
+
+
+#include "config.h"
+
+
+#include "UpnpString.h"
+
+
+#include <stdlib.h> /* for calloc(), free() */
+#include <string.h> /* for strlen(), strdup() */
+
+
+/*!
+ * \brief Internal implementation of the class UpnpString.
+ *
+ * \internal
+ */
+struct SUpnpString
+{
+	/*! \brief Length of the string. */
+	int m_length;
+	/*! \brief Pointer to a dynamically allocated area that holds the NULL
+	 * terminated string. */
+	char *m_string;
+};
+
+
+UpnpString *UpnpString_new()
+{
+	// All bytes are zero, and so is the length of the string.
+	struct SUpnpString *p = calloc(1, sizeof (struct SUpnpString));
+	if (p == NULL) {
+		goto error_handler1;
+	}
+#if 0
+	p->m_length = 0;
+#endif
+
+	// This byte is zero, calloc does initialize it.
+	p->m_string = calloc(1, 1);
+	if (p->m_string == NULL) {
+		goto error_handler2;
+	}
+
+	return (UpnpString *)p;
+
+	//free(p->m_string);
+error_handler2:
+	free(p);
+error_handler1:
+	return NULL;
+}
+
+
+void UpnpString_delete(UpnpString *p)
+{
+	struct SUpnpString *q = (struct SUpnpString *)p;
+		
+	if (!q) return;
+
+	q->m_length = 0;
+
+	free(q->m_string);
+	q->m_string = NULL;
+
+	free(p);
+}
+
+
+UpnpString *UpnpString_dup(const UpnpString *p)
+{
+	struct SUpnpString *q = calloc(1, sizeof (struct SUpnpString));
+	if (q == NULL) {
+		goto error_handler1;
+	}
+	q->m_length = ((struct SUpnpString *)p)->m_length;
+	q->m_string = strdup(((struct SUpnpString *)p)->m_string);
+	if (q->m_string == NULL) {
+		goto error_handler2;
+	}
+
+	return (UpnpString *)q;
+
+	//free(q->m_string);
+error_handler2:
+	free(q);
+error_handler1:
+	return NULL;
+}
+
+
+void UpnpString_assign(UpnpString *p, const UpnpString *q)
+{
+	if (p != q) {
+		UpnpString_set_String(p, UpnpString_get_String(q));
+	}
+}
+
+
+int UpnpString_get_Length(const UpnpString *p)
+{
+	return ((struct SUpnpString *)p)->m_length;
+}
+
+
+const char *UpnpString_get_String(const UpnpString *p)
+{
+	return ((struct SUpnpString *)p)->m_string;
+}
+
+
+void UpnpString_set_String(UpnpString *p, const char *s)
+{
+	free(((struct SUpnpString *)p)->m_string);
+	((struct SUpnpString *)p)->m_length = strlen(s);
+	((struct SUpnpString *)p)->m_string = strdup(s);
+}
+
+
+void UpnpString_set_StringN(UpnpString *p, const char *s, int n)
+{
+	free(((struct SUpnpString *)p)->m_string);
+	((struct SUpnpString *)p)->m_length = n;
+	((struct SUpnpString *)p)->m_string = (char *)malloc(n+1);
+	strncpy(((struct SUpnpString *)p)->m_string, s, n);
+	((struct SUpnpString *)p)->m_string[n] = 0;
+}
+
+
+void UpnpString_clear(UpnpString *p)
+{
+	((struct SUpnpString *)p)->m_length = 0;
+	// No need to realloc now, will do later when needed
+	((struct SUpnpString *)p)->m_string[0] = 0;
+}
+
+/* @} UpnpString */
+

upnp/src/api/upnpdebug.c

@@ -1,177 +1,121 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
 #include "config.h"
+
+
+#include "ithread.h"
+#include "ixml.h"
+#include "upnp.h"
 #include "upnpdebug.h"
+
+
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "ithread.h"
-#include "upnp.h"
-#include <stdarg.h>
 #include <string.h>
 
 
 
-//Mutex to synchronize all the log file opeartions in the debug mode
+/*! Mutex to synchronize all the log file opeartions in the debug mode */
 static ithread_mutex_t GlobalDebugMutex;
 
-// Global log level
+/*! Global log level */
 static Upnp_LogLevel g_log_level = UPNP_DEFAULT_LOG_LEVEL;
 
-//File handle for the error log file
+/*! File handle for the error log file */
 static FILE *ErrFileHnd = NULL;
 
-//File handle for the information log file
+/*! File handle for the information log file */
 static FILE *InfoFileHnd = NULL;
 
-//Name of the error file
+/*! Name of the error file */
 static const char *errFileName = "IUpnpErrFile.txt";
 
-//Name of the info file
+/*! Name of the info file */
 static const char *infoFileName = "IUpnpInfoFile.txt";
 
 
+#ifdef DEBUG
 
-/***************************************************************************
- * Function : UpnpSetLogFileNames					
- *								
- * Parameters:							
- *	IN const char* ErrFileName: name of the error file
- *	IN const char *InfoFileName: name of the information file
- *	IN int size: Size of the buffer
- *	IN int starLength: This parameter provides the width of the banner
- *									
- * Description:							
- *	This functions takes the buffer and writes the buffer in the file as 
- *	per the requested banner					
- * Returns: void
- ***************************************************************************/
-void
-UpnpSetLogFileNames ( IN const char *ErrFileName,
-		      IN const char *InfoFileName )
+
+int UpnpInitLog(void)
 {
-    if( ErrFileName ) {
-        errFileName = ErrFileName;
-    }
-    if( InfoFileName ) {
-        infoFileName = InfoFileName;
-    }
-}
-
-
-/***************************************************************************
- * Function : UpnpInitLog
- *
- * Parameters:	void
- *
- * Description:
- *	This functions initializes the log files
- *
- * Returns: int
- *	-1 : If fails
- *	UPNP_E_SUCCESS : if success
- ***************************************************************************/
-int
-UpnpInitLog()
-{
-    ithread_mutex_init( &GlobalDebugMutex, NULL );
-
-    if( DEBUG_TARGET == 1 ) {
-        if( ( ErrFileHnd = fopen( errFileName, "a" ) ) == NULL )
+	ithread_mutex_init(&GlobalDebugMutex, NULL);
+	if(DEBUG_TARGET == 1) {
+		if((ErrFileHnd = fopen( errFileName, "a")) == NULL) {
 			return -1;
-        if( ( InfoFileHnd = fopen( infoFileName, "a" ) ) == NULL )
+		}
+		if((InfoFileHnd = fopen( infoFileName, "a")) == NULL) {
 			return -1;
 		}
+	}
 	return UPNP_E_SUCCESS;
 }
 
 
-/***************************************************************************
- * Function : UpnpSetLogLevel
- *				
- * Parameters:	Upnp_LogLevel log_level
- *
- * Description:							
- *	This functions set the log level (see {\tt Upnp_LogLevel}
- * Returns: void
- ***************************************************************************/
-void 
-UpnpSetLogLevel (Upnp_LogLevel log_level)
+void UpnpSetLogLevel(Upnp_LogLevel log_level)
 {
 	g_log_level = log_level;
 }
 
 
-/***************************************************************************
- * Function : UpnpCloseLog					
- *								
- * Parameters:	void					
- *								
- * Description:						
- *	This functions closes the log files
- * Returns: void
- ***************************************************************************/
-void
-UpnpCloseLog()
+void UpnpCloseLog(void)
 {
-    if( DEBUG_TARGET == 1 ) {
-        fflush( ErrFileHnd );
-        fflush( InfoFileHnd );
-        fclose( ErrFileHnd );
-        fclose( InfoFileHnd );
+	if (DEBUG_TARGET == 1) {
+		fflush(ErrFileHnd);
+		fflush(InfoFileHnd);
+		fclose(ErrFileHnd);
+		fclose(InfoFileHnd);
+	}
+	ithread_mutex_destroy(&GlobalDebugMutex);
+}
+
+
+void UpnpSetLogFileNames(
+	const char *ErrFileName,
+	const char *InfoFileName)
+{
+    if (ErrFileName) {
+        errFileName = ErrFileName;
+    }
+    if (InfoFileName) {
+        infoFileName = InfoFileName;
     }
-    ithread_mutex_destroy( &GlobalDebugMutex );
-
 }
 
 
-/***************************************************************************
- * Function : DebugAtThisLevel					
- *									
- * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *					
- * Description:					
- *	This functions returns true if debug output should be done in this
- *	module.
- *
- * Returns: int
- ***************************************************************************/
-#ifdef DEBUG
 int DebugAtThisLevel(
-	IN Upnp_LogLevel DLevel,
-	IN Dbg_Module Module)
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module)
 {
 	int ret = DLevel <= g_log_level;
 	ret &=
@@ -186,38 +130,15 @@ int DebugAtThisLevel(
 	
 	return ret;
 }
-#endif
 
 
-/***************************************************************************
- * Function : UpnpPrintf					
- *									
- * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *	IN char *DbgFileName: Name of the file from where debug statement is
- *							coming
- *	IN int DbgLineNo : Line number of the file from where debug statement 
- *				is coming
- *	IN char * FmtStr, ...: Variable number of arguments that will go 
- *				in the debug statement
- *					
- * Description:					
- *	This functions prints the debug statement either on the startdard 
- *	output or log file along with the information from where this debug 
- *	statement is coming
- * Returns: void
- ***************************************************************************/
-#ifdef DEBUG
 void UpnpPrintf(
-	IN Upnp_LogLevel DLevel,
-	IN Dbg_Module Module,
-	IN const char *DbgFileName,
-	IN int DbgLineNo,
-	IN const char *FmtStr,
-	... )
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	const char *DbgFileName,
+	int DbgLineNo,
+	const char *FmtStr,
+	...)
 {
 	va_list ArgList;
 	
@@ -249,27 +170,9 @@ void UpnpPrintf(
 	va_end(ArgList);
 	ithread_mutex_unlock(&GlobalDebugMutex);
 }
-#endif
 
 
-/***************************************************************************
- * Function : UpnpGetDebugFile					
- *				
- * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *								
- * Description:
- *	This function checks if the module is turned on for debug 
- *	and returns the file descriptor corresponding to the debug level
- * Returns: FILE *
- *	NULL : if the module is turn off for debug 
- *	else returns the right file descriptor
- ***************************************************************************/
-#ifdef DEBUG
-FILE *GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module )
+FILE *GetDebugFile(Upnp_LogLevel DLevel, Dbg_Module Module)
 {
 	FILE *ret;
 
@@ -287,65 +190,51 @@ FILE *GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module )
 
 	return ret;
 }
-#endif
 
 
-/***************************************************************************
- * Function : UpnpDisplayFileAndLine				
- *	
- * Parameters:	
- *	IN FILE *fd: File descriptor where line number and file name will be 
- *			written 
- *	IN char *DbgFileName: Name of the file  
- *	IN int DbgLineNo : Line number of the file
- *		
- * Description:
- *	This function writes the file name and file number from where
- *		debug statement is coming to the log file
- * Returns: void
- ***************************************************************************/
-#ifdef DEBUG
 void UpnpDisplayFileAndLine(
-	IN FILE * fd,
-	IN const char *DbgFileName,
-	IN int DbgLineNo)
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo)
 {
-	int starlength = 66;
-	const char *lines[2];
-	char FileAndLine[500];
-	lines[0] = "DEBUG";
-	if (DbgFileName) {
-		sprintf(FileAndLine,
-			"FILE: %s, LINE: %d",
-			DbgFileName, DbgLineNo);
-		lines[1] = FileAndLine;
+#define NLINES 2
+#define MAX_LINE_SIZE 512
+#define NUMBER_OF_STARS 80
+	const char *lines[NLINES];
+	char buf[NLINES][MAX_LINE_SIZE];
+	int i;
+
+	/* Initialize the pointer array */
+	for (i = 0; i < NLINES; i++) {
+		lines[i] = buf[i];
 	}
-	UpnpDisplayBanner(fd, lines, 2, starlength);
+
+	/* Put the debug lines in the buffer */
+	sprintf(buf[0], "DEBUG - THREAD ID: 0x%lX",
+#ifdef WIN32
+		(unsigned long int)ithread_self().p
+#else
+		(unsigned long int)ithread_self()
+#endif
+	);
+	if (DbgFileName) {
+		sprintf(buf[1],
+			"FILE: %s, LINE: %d",
+			DbgFileName,
+			DbgLineNo);
+	}
+
+	/* Show the lines centered */
+	UpnpDisplayBanner(fd, lines, NLINES, NUMBER_OF_STARS);
 	fflush(fd);
 }
-#endif
 
 
-/***************************************************************************
- * Function : UpnpDisplayBanner	
- *
- * Parameters:			
- *	IN FILE *fd: file descriptor where the banner will be written
- *	IN char **lines: The buffer that will be written
- *	IN int size: Size of the buffer
- *	IN int starLength: This parameter provides the width of the banner
- *	
- * Description:			
- *	This functions takes the buffer and writes the buffer in the file as 
- *	per the requested banner
- * Returns: void
- ***************************************************************************/
-#ifdef DEBUG
 void UpnpDisplayBanner(
-	IN FILE * fd,
-	IN const char **lines,
-	IN size_t size,
-	IN int starLength)
+	FILE * fd,
+	const char **lines,
+	size_t size,
+	int starLength)
 {
 	int leftMarginLength = starLength / 2 + 1;
 	int rightMarginLength = starLength / 2 + 1;
@@ -386,12 +275,81 @@ void UpnpDisplayBanner(
 		rightMargin[rightMarginLength] = 0;
 		fprintf( fd, "*%s%s%s*\n", leftMargin, line, rightMargin );
 	}
-	fprintf( fd, "%s\n\n", stars );
+	fprintf(fd, "%s\n\n", stars);
 
-	free( currentLine );
-	free( stars );
-	free( rightMargin );
-	free( leftMargin );
+	free(currentLine);
+	free(stars);
+	free(rightMargin);
+	free(leftMargin);
 }
-#endif
+
+
+void PrintThreadPoolStats(
+	ThreadPool *tp, 
+	const char *DbgFileName,
+	int DbgLineNo,
+	const char *msg)
+{
+	ThreadPoolStats stats;
+	ThreadPoolGetStats(tp, &stats);
+	UpnpPrintf(UPNP_INFO, API, DbgFileName, DbgLineNo, 
+		"%s\n"
+		"High Jobs pending: %d\n"
+		"Med Jobs Pending: %d\n"
+		"Low Jobs Pending: %d\n"
+		"Average wait in High Q in milliseconds: %lf\n"
+		"Average wait in Med Q in milliseconds: %lf\n"
+		"Average wait in Low Q in milliseconds: %lf\n"
+		"Max Threads Used: %d\n"
+		"Worker Threads: %d\n"
+		"Persistent Threads: %d\n"
+		"Idle Threads: %d\n"
+		"Total Threads: %d\n"
+		"Total Work Time: %lf\n"
+		"Total Idle Time: %lf\n",
+		msg,
+		stats.currentJobsHQ,
+		stats.currentJobsMQ,
+		stats.currentJobsLQ,
+		stats.avgWaitHQ,
+		stats.avgWaitMQ,
+		stats.avgWaitLQ,
+		stats.maxThreads,
+		stats.workerThreads,
+		stats.persistentThreads,
+		stats.idleThreads,
+		stats.totalThreads,
+		stats.totalWorkTime,
+		stats.totalIdleTime);
+}
+
+
+void printNodes(IXML_Node *tmpRoot, int depth)
+{
+    int i;
+    IXML_NodeList *NodeList1;
+    IXML_Node *ChildNode1;
+    unsigned short NodeType;
+    const DOMString NodeValue;
+    const DOMString NodeName;
+    NodeList1 = ixmlNode_getChildNodes(tmpRoot);
+    for (i = 0; i < 100; ++i) {
+        ChildNode1 = ixmlNodeList_item(NodeList1, i);
+        if (ChildNode1 == NULL) {
+            break;
+        }
+    
+        printNodes(ChildNode1, depth+1);
+        NodeType = ixmlNode_getNodeType(ChildNode1);
+        NodeValue = ixmlNode_getNodeValue(ChildNode1);
+        NodeName = ixmlNode_getNodeName(ChildNode1);
+        UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
+            "DEPTH-%2d-IXML_Node Type %d, "
+            "IXML_Node Name: %s, IXML_Node Value: %s\n",
+            depth, NodeType, NodeName, NodeValue);
+    }
+}
+
+
+#endif /* DEBUG */
 

upnp/src/api/upnptools.c

@@ -1,182 +1,191 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
 
 #include "config.h"
+
+
+/*!
+ * \file
+ */
+
+
 #if EXCLUDE_DOM == 0
-#include <stdarg.h>
+
+
+#include "upnp.h"
 #include "upnptools.h"
+
+
 #include "uri.h"
+
+
+#include <stdarg.h>
+#include <stdio.h>
+
+
+/*! Maximum action header buffer length. */
 #define HEADER_LENGTH 2000
 
-// Structure to maintain a error code and string associated with the 
-// error code
+
+/*!
+ * \brief Structure to maintain a error code and string associated with the
+ * error code.
+ */
 struct ErrorString {
-    int rc;                     /* error code */
-    const char *rcError;        /* error description */
-
+	/*! Error code. */
+	int rc;
+	/*! Error description. */
+	const char *rcError;
 };
 
-// Initializing the array of error structures. 
-struct ErrorString ErrorMessages[] = { {UPNP_E_SUCCESS, "UPNP_E_SUCCESS"},
-{UPNP_E_INVALID_HANDLE, "UPNP_E_INVALID_HANDLE"},
-{UPNP_E_INVALID_PARAM, "UPNP_E_INVALID_PARAM"},
-{UPNP_E_OUTOF_HANDLE, "UPNP_E_OUTOF_HANDLE"},
-{UPNP_E_OUTOF_CONTEXT, "UPNP_E_OUTOF_CONTEXT"},
-{UPNP_E_OUTOF_MEMORY, "UPNP_E_OUTOF_MEMOR"},
-{UPNP_E_INIT, "UPNP_E_INIT"},
-{UPNP_E_BUFFER_TOO_SMALL, "UPNP_E_BUFFER_TOO_SMALL"},
-{UPNP_E_INVALID_DESC, "UPNP_E_INVALID_DESC"},
-{UPNP_E_INVALID_URL, "UPNP_E_INVALID_URL"},
-{UPNP_E_INVALID_SID, "UPNP_E_INVALID_SID"},
-{UPNP_E_INVALID_DEVICE, "UPNP_E_INVALID_DEVICE"},
-{UPNP_E_INVALID_SERVICE, "UPNP_E_INVALID_SERVICE"},
-{UPNP_E_BAD_RESPONSE, "UPNP_E_BAD_RESPONSE"},
-{UPNP_E_BAD_REQUEST, "UPNP_E_BAD_REQUEST"},
-{UPNP_E_INVALID_ACTION, "UPNP_E_INVALID_ACTION"},
-{UPNP_E_FINISH, "UPNP_E_FINISH"},
-{UPNP_E_INIT_FAILED, "UPNP_E_INIT_FAILED"},
-{UPNP_E_BAD_HTTPMSG, "UPNP_E_BAD_HTTPMSG"},
-{UPNP_E_NETWORK_ERROR, "UPNP_E_NETWORK_ERROR"},
-{UPNP_E_SOCKET_WRITE, "UPNP_E_SOCKET_WRITE"},
-{UPNP_E_SOCKET_READ, "UPNP_E_SOCKET_READ"},
-{UPNP_E_SOCKET_BIND, "UPNP_E_SOCKET_BIND"},
-{UPNP_E_SOCKET_CONNECT, "UPNP_E_SOCKET_CONNECT"},
-{UPNP_E_OUTOF_SOCKET, "UPNP_E_OUTOF_SOCKET"},
-{UPNP_E_LISTEN, "UPNP_E_LISTEN"},
-{UPNP_E_EVENT_PROTOCOL, "UPNP_E_EVENT_PROTOCOL"},
-{UPNP_E_SUBSCRIBE_UNACCEPTED, "UPNP_E_SUBSCRIBE_UNACCEPTED"},
-{UPNP_E_UNSUBSCRIBE_UNACCEPTED, "UPNP_E_UNSUBSCRIBE_UNACCEPTED"},
-{UPNP_E_NOTIFY_UNACCEPTED, "UPNP_E_NOTIFY_UNACCEPTED"},
-{UPNP_E_INTERNAL_ERROR, "UPNP_E_INTERNAL_ERROR"},
-{UPNP_E_INVALID_ARGUMENT, "UPNP_E_INVALID_ARGUMENT"},
-{UPNP_E_OUTOF_BOUNDS, "UPNP_E_OUTOF_BOUNDS"}
+
+/*!
+ * \brief Array of error structures.
+ */
+struct ErrorString ErrorMessages[] = {
+	{UPNP_E_SUCCESS, "UPNP_E_SUCCESS"},
+	{UPNP_E_INVALID_HANDLE, "UPNP_E_INVALID_HANDLE"},
+	{UPNP_E_INVALID_PARAM, "UPNP_E_INVALID_PARAM"},
+	{UPNP_E_OUTOF_HANDLE, "UPNP_E_OUTOF_HANDLE"},
+	{UPNP_E_OUTOF_CONTEXT, "UPNP_E_OUTOF_CONTEXT"},
+	{UPNP_E_OUTOF_MEMORY, "UPNP_E_OUTOF_MEMORY"},
+	{UPNP_E_INIT, "UPNP_E_INIT"},
+	{UPNP_E_BUFFER_TOO_SMALL, "UPNP_E_BUFFER_TOO_SMALL"},
+	{UPNP_E_INVALID_DESC, "UPNP_E_INVALID_DESC"},
+	{UPNP_E_INVALID_URL, "UPNP_E_INVALID_URL"},
+	{UPNP_E_INVALID_SID, "UPNP_E_INVALID_SID"},
+	{UPNP_E_INVALID_DEVICE, "UPNP_E_INVALID_DEVICE"},
+	{UPNP_E_INVALID_SERVICE, "UPNP_E_INVALID_SERVICE"},
+	{UPNP_E_BAD_RESPONSE, "UPNP_E_BAD_RESPONSE"},
+	{UPNP_E_BAD_REQUEST, "UPNP_E_BAD_REQUEST"},
+	{UPNP_E_INVALID_ACTION, "UPNP_E_INVALID_ACTION"},
+	{UPNP_E_FINISH, "UPNP_E_FINISH"},
+	{UPNP_E_INIT_FAILED, "UPNP_E_INIT_FAILED"},
+	{UPNP_E_URL_TOO_BIG, "UPNP_E_URL_TOO_BIG"},
+	{UPNP_E_BAD_HTTPMSG, "UPNP_E_BAD_HTTPMSG"},
+	{UPNP_E_ALREADY_REGISTERED, "UPNP_E_ALREADY_REGISTERED"},
+	{UPNP_E_INVALID_INTERFACE, "UPNP_E_INVALID_INTERFACE"},
+	{UPNP_E_NETWORK_ERROR, "UPNP_E_NETWORK_ERROR"},
+	{UPNP_E_SOCKET_WRITE, "UPNP_E_SOCKET_WRITE"},
+	{UPNP_E_SOCKET_READ, "UPNP_E_SOCKET_READ"},
+	{UPNP_E_SOCKET_BIND, "UPNP_E_SOCKET_BIND"},
+	{UPNP_E_SOCKET_CONNECT, "UPNP_E_SOCKET_CONNECT"},
+	{UPNP_E_OUTOF_SOCKET, "UPNP_E_OUTOF_SOCKET"},
+	{UPNP_E_LISTEN, "UPNP_E_LISTEN"},
+	{UPNP_E_TIMEDOUT, "UPNP_E_TIMEDOUT"},
+	{UPNP_E_SOCKET_ERROR, "UPNP_E_SOCKET_ERROR"},
+	{UPNP_E_FILE_WRITE_ERROR, "UPNP_E_FILE_WRITE_ERROR"},
+	{UPNP_E_CANCELED, "UPNP_E_CANCELED"},
+	{UPNP_E_EVENT_PROTOCOL, "UPNP_E_EVENT_PROTOCOL"},
+	{UPNP_E_SUBSCRIBE_UNACCEPTED, "UPNP_E_SUBSCRIBE_UNACCEPTED"},
+	{UPNP_E_UNSUBSCRIBE_UNACCEPTED, "UPNP_E_UNSUBSCRIBE_UNACCEPTED"},
+	{UPNP_E_NOTIFY_UNACCEPTED, "UPNP_E_NOTIFY_UNACCEPTED"},
+	{UPNP_E_INVALID_ARGUMENT, "UPNP_E_INVALID_ARGUMENT"},
+	{UPNP_E_FILE_NOT_FOUND, "UPNP_E_FILE_NOT_FOUND"},
+	{UPNP_E_FILE_READ_ERROR, "UPNP_E_FILE_READ_ERROR"},
+	{UPNP_E_EXT_NOT_XML, "UPNP_E_EXT_NOT_XML"},
+	{UPNP_E_NO_WEB_SERVER, "UPNP_E_NO_WEB_SERVER"},
+	{UPNP_E_OUTOF_BOUNDS, "UPNP_E_OUTOF_BOUNDS"},
+	{UPNP_E_NOT_FOUND, "UPNP_E_NOT_FOUND"},
+	{UPNP_E_INTERNAL_ERROR, "UPNP_E_INTERNAL_ERROR"},
 };
 
-/************************************************************************
-* Function : UpnpGetErrorMessage
-*
-* Parameters:
-*	IN int rc: error code
-*
-* Description:
-*	This functions returns the error string mapped to the error code
-* Returns: const char *
-*	return either the right string or "Unknown Error"
-***************************************************************************/
-const char *
-UpnpGetErrorMessage( IN int rc )
+
+const char *UpnpGetErrorMessage(int rc)
 {
 	int i;
 
-    for( i = 0; i < sizeof( ErrorMessages ) / sizeof( ErrorMessages[0] );
-         i++ ) {
-        if( rc == ErrorMessages[i].rc )
+	for (i = 0; i < sizeof (ErrorMessages) / sizeof (ErrorMessages[0]); ++i) {
+		if (rc == ErrorMessages[i].rc) {
 			return ErrorMessages[i].rcError;
-
+		}
 	}
 
-    return "Unknown Error";
-
+	return "Unknown error code";
 }
 
-/************************************************************************
-* Function : UpnpResolveURL
-*
-* Parameters:
-*	IN char * BaseURL: Base URL string
-*	IN char * RelURL: relative URL string
-*	OUT char * AbsURL: Absolute URL string
-* Description:
-*	This functions concatinates the base URL and relative URL to generate
-*	the absolute URL
-* Returns: int
-*	return either UPNP_E_SUCCESS or appropriate error
-***************************************************************************/
-int
-UpnpResolveURL( IN const char *BaseURL,
-                IN const char *RelURL,
-                OUT char *AbsURL )
+
+/*!
+ * \todo There is some unnecessary allocation and deallocation going on here
+ * because of the way resolve_rel_url() was originally written and used. In the
+ * future it would be nice to clean this up.
+ */
+int UpnpResolveURL(
+	const char *BaseURL,
+	const char *RelURL,
+	char *AbsURL)
 {
-    // There is some unnecessary allocation and
-    // deallocation going on here because of the way
-    // resolve_rel_url was originally written and used
-    // in the future it would be nice to clean this up
+	int ret = UPNP_E_SUCCESS;
+	char *tempRel = NULL;
 
-    char *tempRel;
-
-    if( RelURL == NULL )
-        return UPNP_E_INVALID_PARAM;
-
-    tempRel = NULL;
-
-    tempRel = resolve_rel_url((char*) BaseURL, (char*) RelURL );
-
-    if( tempRel ) {
-        strcpy( AbsURL, tempRel );
-        free( tempRel );
-    } else {
-        return UPNP_E_INVALID_URL;
+	if (RelURL == NULL) {
+		ret = UPNP_E_INVALID_PARAM;
+		goto ExitFunction;
 	}
 
-    return UPNP_E_SUCCESS;
+	tempRel = resolve_rel_url((char *)BaseURL, (char *)RelURL);
+	if (tempRel) {
+		strcpy(AbsURL, tempRel);
+		free(tempRel);
+	} else {
+		ret = UPNP_E_INVALID_URL;
+	}
 
+ExitFunction:
+	return UPNP_E_SUCCESS;
 }
 
-/************************************************************************
-* Function : addToAction
-*
-* Parameters:
-*	IN int response: flag to tell if the ActionDoc is for response
-*		or request
-*	INOUT IXML_Document **ActionDoc: request or response document
-*	IN char *ActionName: Name of the action request or response
-*	IN char *ServType: Service type
-*	IN char * ArgName: Name of the argument
-*	IN char * ArgValue: Value of the argument
-*
-* Description:
-*	This function adds the argument in the action request or response.
-* This function creates the action request or response if it is a first
-* argument else it will add the argument in the document
-*
-* Returns: int
-*	returns UPNP_E_SUCCESS if successful else returns appropriate error
-***************************************************************************/
-static int
-addToAction( IN int response,
-             INOUT IXML_Document ** ActionDoc,
-             IN const char *ActionName,
-             IN const char *ServType,
-             IN const char *ArgName,
-             IN const char *ArgValue )
+
+/*!
+ * \brief Adds the argument in the action request or response.
+ *
+ * This function creates the action request or response if it is a first
+ * argument, otherwise it will add the argument in the document.
+ *
+ * \returns UPNP_E_SUCCESS if successful, otherwise the appropriate error.
+ */
+static int addToAction(
+	/*! [in] flag to tell if the ActionDoc is for response or request. */
+	int response,
+	/*! [in,out] Request or response document. */
+	IXML_Document **ActionDoc,
+	/*! [in] Name of the action request or response. */
+	const char *ActionName,
+	/*! [in] Service type. */
+	const char *ServType,
+	/*! [in] Name of the argument. */
+	const char *ArgName,
+	/*! [in] Value of the argument. */
+	const char *ArgValue)
 {
 	char *ActBuff = NULL;
 	IXML_Node *node = NULL;
@@ -184,30 +193,30 @@ addToAction( IN int response,
 	IXML_Node *Txt = NULL;
 	int rc = 0;
 
-    if( ActionName == NULL || ServType == NULL ) {
+	if (ActionName == NULL || ServType == NULL) {
 		return UPNP_E_INVALID_PARAM;
 	}
 
-    if( *ActionDoc == NULL ) {
-        ActBuff = ( char * )malloc( HEADER_LENGTH );
-        if( ActBuff == NULL ) {
+	if (*ActionDoc == NULL) {
+		ActBuff = (char *)malloc(HEADER_LENGTH);
+		if (ActBuff == NULL) {
 			return UPNP_E_OUTOF_MEMORY;
 		}
 
-        if( response ) {
-            sprintf( ActBuff,
+		if (response) {
+			sprintf(ActBuff,
 				"<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
-                ActionName, ServType, ActionName );
+				ActionName, ServType, ActionName);
 		} else {
-            sprintf( ActBuff,
+			sprintf(ActBuff,
 				"<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
-                ActionName, ServType, ActionName );
+				ActionName, ServType, ActionName);
 		}
 
-        rc = ixmlParseBufferEx( ActBuff, ActionDoc );
-        free( ActBuff );
-        if( rc != IXML_SUCCESS ) {
-            if( rc == IXML_INSUFFICIENT_MEMORY ) {
+		rc = ixmlParseBufferEx(ActBuff, ActionDoc);
+		free(ActBuff);
+		if (rc != IXML_SUCCESS) {
+			if (rc == IXML_INSUFFICIENT_MEMORY) {
 				return UPNP_E_OUTOF_MEMORY;
 			} else {
 				return UPNP_E_INVALID_DESC;
@@ -215,46 +224,39 @@ addToAction( IN int response,
 		}
 	}
 
-    if( ArgName != NULL /*&& ArgValue != NULL */  ) {
-        node = ixmlNode_getFirstChild( ( IXML_Node * ) * ActionDoc );
-        Ele = ixmlDocument_createElement( *ActionDoc, ArgName );
-        if( ArgValue ) {
-            Txt = ixmlDocument_createTextNode( *ActionDoc, ArgValue );
-            ixmlNode_appendChild( ( IXML_Node * ) Ele, Txt );
+	if (ArgName != NULL /*&& ArgValue != NULL */) {
+		node = ixmlNode_getFirstChild((IXML_Node *)*ActionDoc);
+		Ele = ixmlDocument_createElement(*ActionDoc, ArgName);
+		if(ArgValue) {
+			Txt = ixmlDocument_createTextNode(*ActionDoc, ArgValue);
+			ixmlNode_appendChild((IXML_Node *)Ele, Txt);
 		}
-
-        ixmlNode_appendChild( node, ( IXML_Node * ) Ele );
+		ixmlNode_appendChild(node, (IXML_Node *)Ele);
 	}
 
 	return UPNP_E_SUCCESS;
 }
 
-/************************************************************************
-* Function : makeAction
-*
-* Parameters:
-*	IN int response: flag to tell if the ActionDoc is for response
-*		or request
-*	IN char * ActionName: Name of the action request or response
-*	IN char * ServType: Service type
-*	IN int NumArg :Number of arguments in the action request or response
-*	IN char * Arg : pointer to the first argument
-*	IN va_list ArgList: Argument list
-*
-* Description:
-*	This function creates the action request or response from the argument
-* list.
-* Returns: IXML_Document *
-*	returns action request or response document if successful
-*	else returns NULL
-***************************************************************************/
-static IXML_Document *
-makeAction( IN int response,
-            IN const char *ActionName,
-            IN const char *ServType,
-            IN int NumArg,
-            IN const char *Arg,
-            IN va_list ArgList )
+
+/*!
+ * \brief Creates the action request or response from the argument list.
+ *
+ * \return Action request or response document if successful, otherwise
+ * 	returns NULL
+ */
+static IXML_Document *makeAction(
+	/*! [in] flag to tell if the ActionDoc is for response or request. */
+	int response,
+	/*! [in] Name of the action request or response. */
+	const char *ActionName,
+	/*! [in] Service type. */
+	const char *ServType,
+	/*! [in] Number of arguments in the action request or response. */
+	int NumArg,
+	/*! [in] pointer to the first argument. */
+	const char *Arg,
+	/*! [in] Argument list. */
+	va_list ArgList)
 {
 	const char *ArgName;
 	const char *ArgValue;
@@ -265,56 +267,50 @@ makeAction( IN int response,
 	IXML_Element *Ele;
 	IXML_Node *Txt = NULL;
 
-    if( ActionName == NULL || ServType == NULL ) {
+	if (ActionName == NULL || ServType == NULL) {
 		return NULL;
 	}
 
-    ActBuff = ( char * )malloc( HEADER_LENGTH );
-    if( ActBuff == NULL ) {
+	ActBuff = (char *)malloc(HEADER_LENGTH);
+	if (ActBuff == NULL) {
 		return NULL;
 	}
 
-    if( response ) {
-        sprintf( ActBuff,
+	if (response) {
+		sprintf(ActBuff,
 			"<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
-            ActionName, ServType, ActionName );
+			ActionName, ServType, ActionName);
 	} else {
-        sprintf( ActBuff,
+		sprintf(ActBuff,
 			"<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
-            ActionName, ServType, ActionName );
+			ActionName, ServType, ActionName);
 	}
-
-    if( ixmlParseBufferEx( ActBuff, &ActionDoc ) != IXML_SUCCESS ) {
-        free( ActBuff );
+	if (ixmlParseBufferEx(ActBuff, &ActionDoc) != IXML_SUCCESS) {
+		free(ActBuff);
 		return NULL;
 	}
 
-    free( ActBuff );
-
-    if( ActionDoc == NULL ) {
+	free(ActBuff);
+	if(ActionDoc == NULL) {
 		return NULL;
 	}
 
-    if( NumArg > 0 ) {
+	if (NumArg > 0) {
 		//va_start(ArgList, Arg);
 		ArgName = Arg;
 		for ( ; ; ) {
-            ArgValue = va_arg( ArgList, const char * );
-
-            if( ArgName != NULL ) {
-                node = ixmlNode_getFirstChild( ( IXML_Node * ) ActionDoc );
-                Ele = ixmlDocument_createElement( ActionDoc, ArgName );
-                if( ArgValue ) {
-                    Txt =
-                        ixmlDocument_createTextNode( ActionDoc, ArgValue );
-                    ixmlNode_appendChild( ( IXML_Node * ) Ele, Txt );
+			ArgValue = va_arg(ArgList, const char *);
+			if (ArgName != NULL) {
+				node = ixmlNode_getFirstChild((IXML_Node *)ActionDoc);
+				Ele = ixmlDocument_createElement(ActionDoc, ArgName);
+				if (ArgValue) {
+					Txt = ixmlDocument_createTextNode(ActionDoc, ArgValue);
+					ixmlNode_appendChild((IXML_Node *)Ele, Txt);
 				}
-
-                ixmlNode_appendChild( node, ( IXML_Node * ) Ele );
+				ixmlNode_appendChild(node, (IXML_Node *)Ele);
 			}
-
 			if (++Idx < NumArg) {
-                ArgName = va_arg( ArgList, const char * );
+				ArgName = va_arg(ArgList, const char *);
 			} else {
 				break;
 			}
@@ -325,219 +321,75 @@ makeAction( IN int response,
 	return ActionDoc;
 }
 
-/************************************************************************
-* Function : UpnpMakeAction
-*
-* Parameters:
-*	IN char * ActionName: Name of the action request or response
-*	IN char * ServType: Service type
-*	IN int NumArg :Number of arguments in the action request or response
-*	IN char * Arg : pointer to the first argument
-*	IN ... : variable argument list
-*	IN va_list ArgList: Argument list
-*
-* Description:
-*	This function creates the action request from the argument
-* list. Its a wrapper function that calls makeAction function to create
-* the action request.
-*
-* Returns: IXML_Document *
-*	returns action request document if successful 
-*	else returns NULL
-***************************************************************************/
-IXML_Document *
-UpnpMakeAction( const char *ActionName,
+
+IXML_Document *UpnpMakeAction(
+	const char *ActionName,
 	const char *ServType,
 	int NumArg,
 	const char *Arg,
-                ... )
+	...)
 {
 	va_list ArgList;
 	IXML_Document *out = NULL;
 
-    va_start( ArgList, Arg );
-    out = makeAction( 0, ActionName, ServType, NumArg, Arg, ArgList );
-    va_end( ArgList );
+	va_start(ArgList, Arg);
+	out = makeAction(0, ActionName, ServType, NumArg, Arg, ArgList);
+	va_end(ArgList);
 
 	return out;
 }
 
-/************************************************************************
-* Function : UpnpMakeActionResponse
-*
-* Parameters:
-*	IN char * ActionName: Name of the action request or response
-*	IN char * ServType: Service type
-*	IN int NumArg :Number of arguments in the action request or response
-*	IN char * Arg : pointer to the first argument
-*	IN ... : variable argument list
-*	IN va_list ArgList: Argument list
-*
-* Description:
-*	This function creates the action response from the argument
-* list. Its a wrapper function that calls makeAction function to create
-* the action response.
-*
-* Returns: IXML_Document *
-*	returns action response document if successful
-*	else returns NULL
-***************************************************************************/
-IXML_Document *
-UpnpMakeActionResponse( const char *ActionName,
+
+IXML_Document *UpnpMakeActionResponse(
+	const char *ActionName,
 	const char *ServType,
 	int NumArg,
 	const char *Arg,
-                        ... )
+	...)
 {
 	va_list ArgList;
 	IXML_Document *out = NULL;
 
-    va_start( ArgList, Arg );
-    out = makeAction( 1, ActionName, ServType, NumArg, Arg, ArgList );
-    va_end( ArgList );
+	va_start(ArgList, Arg);
+	out = makeAction(1, ActionName, ServType, NumArg, Arg, ArgList);
+	va_end(ArgList);
 
 	return out;
 }
 
-/************************************************************************
-* Function : UpnpAddToActionResponse
-*
-* Parameters:
-*	INOUT IXML_Document **ActionResponse: action response document
-*	IN char * ActionName: Name of the action request or response
-*	IN char * ServType: Service type
-*	IN int ArgName :Name of argument to be added in the action response
-*	IN char * ArgValue : value of the argument
-*
-* Description:
-*	This function adds the argument in the action response. Its a wrapper
-* function that calls addToAction function to add the argument in the
-* action response.
-*
-* Returns: int
-*	returns UPNP_E_SUCCESS if successful
-*	else returns appropriate error
-***************************************************************************/
-int
-UpnpAddToActionResponse( INOUT IXML_Document ** ActionResponse,
-                         IN const char *ActionName,
-                         IN const char *ServType,
-                         IN const char *ArgName,
-                         IN const char *ArgValue )
-{
-    return addToAction( 1, ActionResponse, ActionName, ServType, ArgName,
-                        ArgValue );
-}
 
-/************************************************************************
-* Function : UpnpAddToAction
-*
-* Parameters:
-*	INOUT IXML_Document **ActionDoc: action request document
-*	IN char * ActionName: Name of the action request or response
-*	IN char * ServType: Service type
-*	IN int ArgName :Name of argument to be added in the action response
-*	IN char * ArgValue : value of the argument
-*
-* Description:
-*	This function adds the argument in the action request. Its a wrapper
-* function that calls addToAction function to add the argument in the
-* action request.
-*
-* Returns: int
-*	returns UPNP_E_SUCCESS if successful
-*	else returns appropriate error
-***************************************************************************/
-int
-UpnpAddToAction( IXML_Document ** ActionDoc,
+int UpnpAddToAction(
+	IXML_Document **ActionDoc,
 	const char *ActionName,
 	const char *ServType,
 	const char *ArgName,
-                 const char *ArgValue )
+	const char *ArgValue)
 {
-
-    return addToAction( 0, ActionDoc, ActionName, ServType, ArgName,
-                        ArgValue );
+	return addToAction(0, ActionDoc, ActionName, ServType, ArgName, ArgValue);
 }
 
-/************************************************************************
-* Function : UpnpAddToPropertySet
-*
-* Parameters:
-*	INOUT IXML_Document **PropSet: propertyset document
-*	IN char *ArgName: Name of the argument
-*	IN char *ArgValue: value of the argument
-*
-* Description:
-*	This function adds the argument in the propertyset node
-*
-* Returns: int
-*	returns UPNP_E_SUCCESS if successful else returns appropriate error
-***************************************************************************/
-int
-UpnpAddToPropertySet( INOUT IXML_Document ** PropSet,
-                      IN const char *ArgName,
-                      IN const char *ArgValue )
+
+int UpnpAddToActionResponse(
+	IXML_Document **ActionResponse,
+	const char *ActionName,
+	const char *ServType,
+	const char *ArgName,
+	const char *ArgValue)
 {
-
-    char BlankDoc[] = "<e:propertyset xmlns:e=\"urn:schemas"
-        "-upnp-org:event-1-0\"></e:propertyset>";
-    IXML_Node *node;
-    IXML_Element *Ele;
-    IXML_Element *Ele1;
-    IXML_Node *Txt;
-    int rc;
-
-    if( ArgName == NULL ) {
-        return UPNP_E_INVALID_PARAM;
-    }
-
-    if( *PropSet == NULL ) {
-        rc = ixmlParseBufferEx( BlankDoc, PropSet );
-        if( rc != IXML_SUCCESS ) {
-            return UPNP_E_OUTOF_MEMORY;
-        }
-    }
-
-    node = ixmlNode_getFirstChild( ( IXML_Node * ) * PropSet );
-
-    Ele1 = ixmlDocument_createElement( *PropSet, "e:property" );
-    Ele = ixmlDocument_createElement( *PropSet, ArgName );
-
-    if( ArgValue ) {
-        Txt = ixmlDocument_createTextNode( *PropSet, ArgValue );
-        ixmlNode_appendChild( ( IXML_Node * ) Ele, Txt );
-    }
-
-    ixmlNode_appendChild( ( IXML_Node * ) Ele1, ( IXML_Node * ) Ele );
-    ixmlNode_appendChild( node, ( IXML_Node * ) Ele1 );
-
-    return UPNP_E_SUCCESS;
+	return addToAction(1, ActionResponse, ActionName, ServType, ArgName, ArgValue);
 }
 
-/************************************************************************
-* Function : UpnpCreatePropertySet
-*
-* Parameters:
-*	IN int NumArg: Number of argument that will go in the propertyset node
-*	IN char * Args: argument strings
-*
-* Description:
-*	This function creates a propertyset node and put all the input
-*	parameters in the node as elements
-*
-* Returns: IXML_Document *
-*	returns the document containing propertyset node.
-***************************************************************************/
-IXML_Document *
-UpnpCreatePropertySet( IN int NumArg,
-                       IN const char *Arg,
-                       ... )
+
+IXML_Document *UpnpCreatePropertySet(
+	int NumArg,
+	const char *Arg,
+	...)
 {
 	va_list ArgList;
 	int Idx = 0;
-    char BlankDoc[] = "<e:propertyset xmlns:e=\"urn:schemas-"
-        "upnp-org:event-1-0\"></e:propertyset>";
+	char BlankDoc[] =
+		"<e:propertyset xmlns:e=\"urn:schemas-upnp-org:event-1-0\">"
+		"</e:propertyset>";
 	const char *ArgName,
 	*ArgValue;
 	IXML_Node *node;
@@ -546,40 +398,78 @@ UpnpCreatePropertySet( IN int NumArg,
 	IXML_Node *Txt;
 	IXML_Document *PropSet;
 
-    if( ixmlParseBufferEx( BlankDoc, &PropSet ) != IXML_SUCCESS ) {
+	if(ixmlParseBufferEx(BlankDoc, &PropSet) != IXML_SUCCESS) {
 		return NULL;
 	}
 
-    if( NumArg < 1 ) {
-        return NULL;
+	if (NumArg < 1) {
+		return PropSet;
 	}
 
-    va_start( ArgList, Arg );
+	va_start(ArgList, Arg);
 	ArgName = Arg;
-
-    while( Idx++ != NumArg ) {
-        ArgValue = va_arg( ArgList, const char * );
-
-        if( ArgName != NULL /*&& ArgValue != NULL */  ) {
-            node = ixmlNode_getFirstChild( ( IXML_Node * ) PropSet );
-            Ele1 = ixmlDocument_createElement( PropSet, "e:property" );
-            Ele = ixmlDocument_createElement( PropSet, ArgName );
-            if( ArgValue ) {
-                Txt = ixmlDocument_createTextNode( PropSet, ArgValue );
-                ixmlNode_appendChild( ( IXML_Node * ) Ele, Txt );
+	while (Idx++ != NumArg) {
+		ArgValue = va_arg(ArgList, const char *);
+		if (ArgName != NULL /*&& ArgValue != NULL */) {
+			node = ixmlNode_getFirstChild((IXML_Node *)PropSet);
+			Ele1 = ixmlDocument_createElement(PropSet, "e:property");
+			Ele = ixmlDocument_createElement(PropSet, ArgName);
+			if (ArgValue) {
+				Txt = ixmlDocument_createTextNode(PropSet, ArgValue);
+				ixmlNode_appendChild((IXML_Node *)Ele, Txt);
 			}
-
-            ixmlNode_appendChild( ( IXML_Node * ) Ele1,
-                                  ( IXML_Node * ) Ele );
-            ixmlNode_appendChild( node, ( IXML_Node * ) Ele1 );
+			ixmlNode_appendChild((IXML_Node *)Ele1, (IXML_Node *)Ele);
+			ixmlNode_appendChild(             node, (IXML_Node *)Ele1);
 		}
-
-        ArgName = va_arg( ArgList, const char * );
-
+		ArgName = va_arg(ArgList, const char *);
 	}
-    va_end( ArgList );
+	va_end(ArgList);
+
 	return PropSet;
 }
 
-#endif // EXCLUDE_DOM == 0
+
+int UpnpAddToPropertySet(
+	IXML_Document **PropSet,
+	const char *ArgName,
+	const char *ArgValue)
+{
+	char BlankDoc[] =
+		"<e:propertyset xmlns:e=\"urn:schemas-upnp-org:event-1-0\">"
+		"</e:propertyset>";
+	IXML_Node *node;
+	IXML_Element *Ele;
+	IXML_Element *Ele1;
+	IXML_Node *Txt;
+	int rc;
+
+	if (ArgName == NULL) {
+		return UPNP_E_INVALID_PARAM;
+	}
+
+	if (*PropSet == NULL) {
+		rc = ixmlParseBufferEx(BlankDoc, PropSet);
+		if (rc != IXML_SUCCESS) {
+			return UPNP_E_OUTOF_MEMORY;
+		}
+	}
+
+	node = ixmlNode_getFirstChild((IXML_Node *)*PropSet);
+
+	Ele1 = ixmlDocument_createElement(*PropSet, "e:property");
+	Ele = ixmlDocument_createElement(*PropSet, ArgName);
+
+	if (ArgValue) {
+		Txt = ixmlDocument_createTextNode(*PropSet, ArgValue);
+		ixmlNode_appendChild((IXML_Node *)Ele, Txt);
+	}
+
+	ixmlNode_appendChild((IXML_Node *)Ele1, (IXML_Node *)Ele);
+	ixmlNode_appendChild(node, (IXML_Node *)Ele1);
+
+	return UPNP_E_SUCCESS;
+}
+
+
+#endif /* EXCLUDE_DOM == 0 */
 

upnp/src/genlib/client_table/client_table.c

@@ -1,209 +1,329 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
 /************************************************************************
-* Purpose: This file defines the functions for clients. It defines 
-* functions for adding and removing clients to and from the client table, 
-* adding and accessing subscription and other attributes pertaining to the 
-* client  
-************************************************************************/
+ * Purpose: This file defines the functions for clients. It defines 
+ * functions for adding and removing clients to and from the client table, 
+ * adding and accessing subscription and other attributes pertaining to the 
+ * client  
+ ************************************************************************/
+
 
 #include "config.h"
+
+
 #include "client_table.h"
 
-/************************************************************************
-*	Function :	copy_client_subscription
-*
-*	Parameters :
-*		client_subscription * in ;	- source client subscription
-*		client_subscription * out ;	- destination client subscription
-*
-*	Description :	Make a copy of the client subscription data
-*
-*	Return : int ;
-*		UPNP_E_OUTOF_MEMORY - On Failure to allocate memory
-*		HTTP_SUCCESS - On Success
-*
-*	Note :
-************************************************************************/
-CLIENTONLY( int copy_client_subscription( client_subscription * in,
-                                          client_subscription * out ) {
-            int len = strlen( in->ActualSID ) + 1;
-            int len1 = strlen( in->EventURL ) + 1;
-            memcpy( out->sid, in->sid, SID_SIZE );
-            out->sid[SID_SIZE] = 0;
-            out->ActualSID = ( char * )malloc( len );
-            if( out->ActualSID == NULL )
-                return UPNP_E_OUTOF_MEMORY;
-            out->EventURL = ( char * )malloc( len1 );
-            if( out->EventURL == NULL ) {
-                free(out->ActualSID);
-                return UPNP_E_OUTOF_MEMORY;
-            }
-            memcpy( out->ActualSID, in->ActualSID, len );
-            memcpy( out->EventURL, in->EventURL, len1 );
-            //copies do not get RenewEvent Ids or next
-            out->RenewEventId = -1; out->next = NULL; return HTTP_SUCCESS;}
 
-/************************************************************************
-*	Function :	free_client_subscription
-*
-*	Parameters :
-*		client_subscription * sub ;	- Client subscription to be freed
-*
-*	Description :	Free memory allocated for client subscription data.
-*		Remove timer thread associated with this subscription event.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-            void free_client_subscription( client_subscription * sub ) {
-            upnp_timeout * event; ThreadPoolJob tempJob; if( sub ) {
-            if( sub->ActualSID )
-            free( sub->ActualSID ); if( sub->EventURL )
-            free( sub->EventURL ); if( sub->RenewEventId != -1 )    //do not remove timer event of copy
-            //invalid timer event id
-            {
-            if( TimerThreadRemove
-                ( &gTimerThread, sub->RenewEventId, &tempJob ) == 0 ) {
-            event = ( upnp_timeout * ) tempJob.arg;
-            free_upnp_timeout( event );}
-            }
+#ifdef INCLUDE_CLIENT_APIS
 
-            sub->RenewEventId = -1;}
-            }
 
-/************************************************************************
-*	Function :	freeClientSubList
-*
-*	Parameters :
-*		client_subscription * list ; Client subscription 
-*
-*	Description :	Free the client subscription table.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-            void freeClientSubList( client_subscription * list ) {
-            client_subscription * next; while( list ) {
-            free_client_subscription( list );
-            next = list->next; free( list ); list = next;}
-            }
+#include <stdlib.h> // for calloc(), free()
 
-/************************************************************************
-*	Function :	RemoveClientSubClientSID
-*
-*	Parameters :
-*		client_subscription **head ; Head of the subscription list	
-*		const Upnp_SID sid ;		 Subscription ID to be mactched
-*
-*	Description :	Remove the client subscription matching the 
-*		subscritpion id represented by the const Upnp_SID sid parameter 
-*		from the table and update the table.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-            void RemoveClientSubClientSID( client_subscription ** head,
-                                           const Upnp_SID sid ) {
-            client_subscription * finger = ( *head );
-            client_subscription * previous = NULL; while( finger ) {
-            if( !( strcmp( sid, finger->sid ) ) ) {
-            if( previous )
-            previous->next = finger->next;
-            else
-            ( *head ) = finger->next;
-            finger->next = NULL;
-            freeClientSubList( finger ); finger = NULL;}
-            else
-            {
-            previous = finger; finger = finger->next;}
-            }
-            }
 
-/************************************************************************
-*	Function :	GetClientSubClientSID
-*
-*	Parameters :
-*		client_subscription *head ; Head of the subscription list	
-*		const Upnp_SID sid ;		Subscription ID to be matched
-*
-*	Description :	Return the client subscription from the client table 
-*		that matches const Upnp_SID sid subscrition id value. 
-*
-*	Return : client_subscription * ; The matching subscription
-*
-*	Note :
-************************************************************************/
-            client_subscription *
-            GetClientSubClientSID( client_subscription * head,
-                                   const Upnp_SID sid ) {
-            client_subscription * next = head; while( next ) {
-            if( !strcmp( next->sid, sid ) )
+struct SClientSubscription {
+	int m_renewEventId;
+	UpnpString *m_SID;
+	UpnpString *m_actualSID;
+	UpnpString *m_eventURL;
+	struct SClientSubscription *m_next;
+};
+
+
+/** Constructor */
+ClientSubscription *UpnpClientSubscription_new()
+{
+	struct SClientSubscription *p = calloc(1, sizeof (struct SClientSubscription));
+#if 0
+	p->renewEventId =  0;
+#endif
+	p->m_SID = UpnpString_new();
+	p->m_actualSID = UpnpString_new();
+	p->m_eventURL = UpnpString_new();
+	p->m_next = NULL;
+
+	return (ClientSubscription *)p;
+}
+
+
+/** Destructor */
+void UpnpClientSubscription_delete(ClientSubscription *p)
+{
+	struct SClientSubscription *q = (struct SClientSubscription *)p;
+
+	if (!q) return;
+
+	q->m_renewEventId = 0;
+
+	UpnpString_delete(q->m_SID);
+	q->m_SID = NULL;
+
+	UpnpString_delete(q->m_actualSID);
+	q->m_actualSID = NULL;
+
+	UpnpString_delete(q->m_eventURL);
+	q->m_eventURL = NULL;
+
+	q->m_next = NULL;
+
+	free(p);
+}
+
+
+/** Copy Constructor */
+ClientSubscription *UpnpClientSubscription_dup(const ClientSubscription *p)
+{
+	ClientSubscription *q = UpnpClientSubscription_new();
+	
+	UpnpClientSubscription_assign(q, p);
+	
+	return q;
+}
+
+
+/** Assignment operator */
+void UpnpClientSubscription_assign(ClientSubscription *q, const ClientSubscription *p)
+{
+	if (q != p) {
+		// Do not copy RenewEventId
+		((struct SClientSubscription *)q)->m_renewEventId = -1;
+		UpnpClientSubscription_set_SID(q, UpnpClientSubscription_get_SID(p));
+		UpnpClientSubscription_set_ActualSID(q, UpnpClientSubscription_get_ActualSID(p));
+		UpnpClientSubscription_set_EventURL(q, UpnpClientSubscription_get_EventURL(p));
+		// Do not copy m_next
+		((struct SClientSubscription *)q)->m_next = NULL;
+	}
+}
+
+
+int UpnpClientSubscription_get_RenewEventId(const ClientSubscription *p)
+{
+	return ((struct SClientSubscription *)p)->m_renewEventId;
+}
+
+
+void UpnpClientSubscription_set_RenewEventId(ClientSubscription *p, int n)
+{
+	((struct SClientSubscription *)p)->m_renewEventId = n;
+}
+
+
+const UpnpString *UpnpClientSubscription_get_SID(const ClientSubscription *p)
+{
+	return ((struct SClientSubscription *)p)->m_SID;
+}
+
+const char *UpnpClientSubscription_get_SID_cstr(const ClientSubscription *p)
+{
+	return UpnpString_get_String(UpnpClientSubscription_get_SID(p));
+}
+
+
+void UpnpClientSubscription_set_SID(ClientSubscription *p, const UpnpString *s)
+{
+	UpnpString_delete(((struct SClientSubscription *)p)->m_SID);
+	((struct SClientSubscription *)p)->m_SID = UpnpString_dup(s);
+}
+
+
+void UpnpClientSubscription_strcpy_SID(ClientSubscription *p, const char *s)
+{
+	UpnpString_delete(((struct SClientSubscription *)p)->m_SID);
+	((struct SClientSubscription *)p)->m_SID = UpnpString_new();
+	UpnpString_set_String(((struct SClientSubscription *)p)->m_SID, s);
+}
+
+
+
+const UpnpString *UpnpClientSubscription_get_ActualSID(const ClientSubscription *p)
+{
+	return ((struct SClientSubscription *)p)->m_actualSID;
+}
+
+
+const char *UpnpClientSubscription_get_ActualSID_cstr(const ClientSubscription *p)
+{
+	return UpnpString_get_String(UpnpClientSubscription_get_ActualSID(p));
+}
+
+
+void UpnpClientSubscription_set_ActualSID(ClientSubscription *p, const UpnpString *s)
+{
+	UpnpString_delete(((struct SClientSubscription *)p)->m_actualSID);
+	((struct SClientSubscription *)p)->m_actualSID = UpnpString_dup(s);
+}
+
+
+void UpnpClientSubscription_strcpy_ActualSID(ClientSubscription *p, const char *s)
+{
+	UpnpString_delete(((struct SClientSubscription *)p)->m_actualSID);
+	((struct SClientSubscription *)p)->m_actualSID = UpnpString_new();
+	UpnpString_set_String(((struct SClientSubscription *)p)->m_actualSID, s);
+}
+
+
+const UpnpString *UpnpClientSubscription_get_EventURL(const ClientSubscription *p)
+{
+	return ((struct SClientSubscription *)p)->m_eventURL;
+}
+
+
+const char *UpnpClientSubscription_get_EventURL_cstr(const ClientSubscription *p)
+{
+	return UpnpString_get_String(UpnpClientSubscription_get_EventURL(p));
+}
+
+
+void UpnpClientSubscription_set_EventURL(ClientSubscription *p, const UpnpString *s)
+{
+	UpnpString_delete(((struct SClientSubscription *)p)->m_eventURL);
+	((struct SClientSubscription *)p)->m_eventURL = UpnpString_dup(s);
+}
+
+
+void UpnpClientSubscription_strcpy_EventURL(ClientSubscription *p, const char *s)
+{
+	UpnpString_delete(((struct SClientSubscription *)p)->m_eventURL);
+	((struct SClientSubscription *)p)->m_eventURL = UpnpString_new();
+	UpnpString_set_String(((struct SClientSubscription *)p)->m_eventURL, s);
+}
+
+
+ClientSubscription *UpnpClientSubscription_get_Next(const ClientSubscription *p)
+{
+	return (ClientSubscription *)(((struct SClientSubscription *)p)->m_next);
+}
+
+
+void UpnpClientSubscription_set_Next(ClientSubscription *p, ClientSubscription *q)
+{
+	((struct SClientSubscription *)p)->m_next = (struct SClientSubscription *)q;
+}
+
+
+void free_client_subscription(ClientSubscription *sub)
+{
+	upnp_timeout *event;
+	ThreadPoolJob tempJob;
+	if (sub) {
+		int renewEventId = UpnpClientSubscription_get_RenewEventId(sub);
+		UpnpClientSubscription_strcpy_ActualSID(sub, "");
+		UpnpClientSubscription_strcpy_EventURL(sub, "");
+		if (renewEventId != -1) {
+			// do not remove timer event of copy
+			// invalid timer event id
+			if (TimerThreadRemove(&gTimerThread, renewEventId, &tempJob) == 0) {
+				event = (upnp_timeout *)tempJob.arg;
+				free_upnp_timeout(event);
+			}
+		}
+		UpnpClientSubscription_set_RenewEventId(sub, -1);
+	}
+}
+
+
+void freeClientSubList(ClientSubscription *list)
+{
+	ClientSubscription *next;
+	while (list) {
+		free_client_subscription(list);
+		next = UpnpClientSubscription_get_Next(list);
+		UpnpClientSubscription_delete(list);
+		list = next;
+	}
+}
+
+
+void RemoveClientSubClientSID(ClientSubscription **head, const UpnpString *sid)
+{
+	ClientSubscription *finger = *head;
+	ClientSubscription *previous = NULL;
+	int found = 0;
+	while (finger) {
+		found = !strcmp(
+			UpnpString_get_String(sid),
+			UpnpClientSubscription_get_SID_cstr(finger));
+		if (found) {
+			if (previous) {
+				UpnpClientSubscription_set_Next(previous,
+					UpnpClientSubscription_get_Next(finger));
+			} else {
+				*head = UpnpClientSubscription_get_Next(finger);
+			}
+			UpnpClientSubscription_set_Next(finger, NULL);
+			freeClientSubList(finger);
+			finger = NULL;
+		} else {
+			previous = finger;
+			finger = UpnpClientSubscription_get_Next(finger);
+		}
+	}
+}
+
+
+ClientSubscription *GetClientSubClientSID(ClientSubscription *head, const UpnpString *sid)
+{
+	ClientSubscription *next = head;
+	int found = 0;
+	while (next) {
+		found = !strcmp(
+			UpnpClientSubscription_get_SID_cstr(next),
+			UpnpString_get_String(sid));
+		if(found) {
 			break;
-            else
-            {
-            next = next->next;}
+		} else {
+			next = UpnpClientSubscription_get_Next(next);
+		}
 	}
-            return next;}
 
-/************************************************************************
-*	Function :	GetClientSubActualSID
-*
-*	Parameters :
-*		client_subscription *head ;	Head of the subscription list		
-*		token * sid ;				Subscription ID to be matched
-*
-*	Description :	Returns the client subscription from the client 
-*		subscription table that has the matching token * sid buffer
-*		value.
-*
-*	Return : client_subscription * ; The matching subscription
-*
-*	Note :
-************************************************************************/
-            client_subscription *
-            GetClientSubActualSID( client_subscription * head,
-                                   token * sid ) {
-            client_subscription * next = head; while( next ) {
+	return next;
+}
 
-            if( !memcmp( next->ActualSID, sid->buff, sid->size ) )
+
+ClientSubscription *GetClientSubActualSID(ClientSubscription *head, token *sid)
+{
+	ClientSubscription *next = head;
+	while (next) {
+		if (!memcmp(
+			UpnpClientSubscription_get_ActualSID_cstr(next),
+			sid->buff, sid->size)) {
 			break;
-            else
-            {
-            next = next->next;}
+		} else {
+			next = UpnpClientSubscription_get_Next(next);
+		}
 	}
-            return next;}
 
- )
+	return next;
+}
+
+
+ #endif /* INCLUDE_CLIENT_APIS */
+

upnp/src/genlib/net/http/httpparser.c

@@ -1,52 +1,65 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+
+/*
+ * \file
+ *
+ * \brief Contains functions for scanner and parser for http messages.
+ */
 
-/************************************************************************
-* Purpose: This file contains functions for scanner and parser for http 
-* messages.
-************************************************************************/
 
 #define _GNU_SOURCE	// For strcasestr() in string.h
+
+
 #include "config.h"
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdarg.h>
+
+
 #include "strintmap.h"
 #include "httpparser.h"
 #include "statcodes.h"
 #include "unixutil.h"
+#include "upnpdebug.h"
+
+
+#include <assert.h>
+#include <ctype.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+
+/* entity positions */
 
-// entity positions
 
 #define NUM_HTTP_METHODS 9
 static str_int_entry Http_Method_Table[NUM_HTTP_METHODS] = {
@@ -122,8 +135,8 @@ str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES] = {
 * Note :
 ************************************************************************/
 static UPNP_INLINE void
-scanner_init( OUT scanner_t * scanner,
-              IN membuffer * bufptr )
+scanner_init( OUT scanner_t *scanner,
+              IN membuffer *bufptr )
 {
     scanner->cursor = 0;
     scanner->msg = bufptr;
@@ -395,8 +408,13 @@ scanner_get_str( IN scanner_t * scanner )
 *
 * Note :
 ************************************************************************/
-#warning The only use of the function 'scanner_pushback()' in the code is commented out.
-#warning 'scanner_pushback()' is a candidate for removal.
+#ifdef WIN32
+	#pragma message ("The only use of the function 'scanner_pushback()' in the code is commented out.")
+	#pragma message ("'scanner_pushback()' is a candidate for removal.")
+#else
+	#warning The only use of the function 'scanner_pushback()' in the code is commented out.
+	#warning 'scanner_pushback()' is a candidate for removal.
+#endif
 static UPNP_INLINE void
 scanner_pushback( INOUT scanner_t * scanner,
                   IN size_t pushback_bytes )
@@ -965,8 +983,13 @@ read_until_crlf( INOUT scanner_t * scanner,
 *   PARSE_FAILURE
 *   PARSE_INCOMPLETE
 ************************************************************************/
-#warning There are currently no uses of the function 'skip_to_end_of_header()' in the code.
-#warning 'skip_to_end_of_header()' is a candidate for removal.
+#ifdef WIN32
+	#pragma message("There are currently no uses of the function 'skip_to_end_of_header()' in the code.")
+	#pragma message("'skip_to_end_of_header()' is a candidate for removal.")
+#else
+	#warning There are currently no uses of the function 'skip_to_end_of_header()' in the code.
+	#warning 'skip_to_end_of_header()' is a candidate for removal.
+#endif
 static UPNP_INLINE int
 skip_to_end_of_header( INOUT scanner_t * scanner )
 {
@@ -1522,7 +1545,9 @@ parser_parse_responseline( INOUT http_parser_t * parser )
 
     if( num_scanned != 3 ||
         hmsg->major_version < 0 ||
-        hmsg->minor_version < 0 || hmsg->status_code < 0 ) {
+        /* HTTP version equals to 1.0 should fail as required by the
+         * UPnP certification tool */
+        hmsg->minor_version < 1 || hmsg->status_code < 0 ) {
         // bad response line
         return PARSE_FAILURE;
     }
@@ -2486,26 +2511,15 @@ method_to_str( IN http_method_t method )
     return index == -1 ? NULL : Http_Method_Table[index].name;
 }
 
-/************************************************************************
-* Function: print_http_headers
-*
-* Parameters:
-*	http_message_t* hmsg ; HTTP Message object
-*
-* Description:
-*
-* Returns:
-*	 void
-************************************************************************/
+
 #ifdef DEBUG
-void
-print_http_headers( http_message_t * hmsg )
+void print_http_headers(http_message_t *hmsg)
 {
     ListNode *node;
-    // NNS:  dlist_node *node;
+    /* NNS:  dlist_node *node; */
     http_header_t *header;
 
-    // print start line
+    /* print start line */
     if( hmsg->is_request ) {
         printf( "method = %d, version = %d.%d, url = %.*s\n", 
             hmsg->method, hmsg->major_version, hmsg->minor_version,
@@ -2516,18 +2530,18 @@ print_http_headers( http_message_t * hmsg )
             (int)hmsg->status_msg.length, hmsg->status_msg.buf);
     }
 
-    // print headers
+    /* print headers */
     node = ListHead( &hmsg->headers );
-    // NNS: node = dlist_first_node( &hmsg->headers );
+    /* NNS: node = dlist_first_node( &hmsg->headers ); */
     while( node != NULL ) {
         header = ( http_header_t * ) node->item;
-        // NNS: header = (http_header_t *)node->data;
+        /* NNS: header = (http_header_t *)node->data; */
         printf( "hdr name: %.*s, value: %.*s\n", 
             (int)header->name.length, header->name.buf,
             (int)header->value.length, header->value.buf );
 
         node = ListNext( &hmsg->headers, node );
-        // NNS: node = dlist_next( &hmsg->headers, node );
+        /* NNS: node = dlist_next( &hmsg->headers, node ); */
     }
 }
 #endif

upnp/src/genlib/net/http/httpreadwrite.c

@@ -1,33 +1,34 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
 /************************************************************************
 * Purpose: This file defines the functionality making use of the http 
@@ -35,10 +36,28 @@
 * messages
 ************************************************************************/
 
+
 #include "config.h"
 
+
+#include "httpreadwrite.h"
+
+
+#include "unixutil.h"
+#include "upnp.h"
+#include "upnpapi.h"
+#include "membuffer.h"
+#include "uri.h"
+#include "statcodes.h"
+#include "sock.h"
+#include "UpnpInet.h"
+#include "webserver.h"
+
+
 #include <assert.h>
 #include <stdarg.h>
+
+
 #ifndef UPNP_USE_BCBPP
 	#ifndef UPNP_USE_MSVCPP
 		#include <inttypes.h>
@@ -46,33 +65,31 @@
 	#endif
 #endif
 
-#ifndef WIN32
+
+#ifdef WIN32
+	#include <malloc.h>
+#else
 	#include <arpa/inet.h>
 	#include <fcntl.h>
-	#include <netinet/in.h>
 	#include <sys/types.h>
 	#include <sys/socket.h>
 	#include <sys/time.h>
 	#include <sys/wait.h>
 	#include <unistd.h>
 	#include <sys/utsname.h>
-#else
-	#include <winsock2.h>
-	#include <malloc.h>
 #endif
-#include "unixutil.h"
-#include "upnp.h"
-#include "upnpapi.h"
-#include "membuffer.h"
-#include "uri.h"
-#include "statcodes.h"
-#include "httpreadwrite.h"
-#include "sock.h"
-#include "webserver.h"
 
 
+/* 
+ * Please, do not change these to const int while MSVC cannot understand
+ * const int in array dimensions.
+ */
+/*
 const int CHUNK_HEADER_SIZE = 10;
 const int CHUNK_TAIL_SIZE = 10;
+*/
+#define CHUNK_HEADER_SIZE 10
+#define CHUNK_TAIL_SIZE 10
 
 
 /************************************************************************
@@ -118,9 +135,9 @@ http_FixUrl( IN uri_type * url,
  * Function: http_FixStrUrl
  *
  * Parameters:
- *	IN char* urlstr ; 		Character string as a URL
- *	IN int urlstrlen ; 		Length of the character string
- *	OUT uri_type* fixed_url	;	Fixed and corrected URL
+ *	IN const char* urlstr;		Character string as a URL
+ *	IN int urlstrlen;		Length of the character string
+ *	OUT uri_type* fixed_url;	Fixed and corrected URL
  *
  * Description:
  *	Parses URL and then validates URL
@@ -130,7 +147,7 @@ http_FixUrl( IN uri_type * url,
  * 	 UPNP_E_SUCCESS
  ************************************************************************/
 int
-http_FixStrUrl( IN char *urlstr,
+http_FixStrUrl( IN const char *urlstr,
                 IN int urlstrlen,
                 OUT uri_type * fixed_url )
 {
@@ -167,13 +184,13 @@ http_Connect( IN uri_type * destination_url,
 
     http_FixUrl( destination_url, url );
 
-    connfd = socket( AF_INET, SOCK_STREAM, 0 );
+    connfd = socket( url->hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
     if( connfd == -1 ) {
         return UPNP_E_OUTOF_SOCKET;
     }
 
-    if( connect( connfd, ( struct sockaddr * )&url->hostport.IPv4address,
-                 sizeof( struct sockaddr_in ) ) == -1 ) {
+    if( connect( connfd, ( struct sockaddr * )&url->hostport.IPaddress,
+                 sizeof( url->hostport.IPaddress ) ) == -1 ) {
 #ifdef WIN32
         UpnpPrintf(UPNP_CRITICAL, HTTP, __FILE__, __LINE__,
             "connect error: %d\n", WSAGetLastError());
@@ -187,8 +204,12 @@ http_Connect( IN uri_type * destination_url,
 }
 
 
-/************************************************************************
- * Function: http_RecvMessage
+/*!
+ * \brief Get the data on the socket and take actions based on the read data to
+ * modify the parser objects buffer.
+ *
+ * If an error is reported while parsing the data, the error code is passed in
+ * the http_errr_code parameter.
  *
  * Parameters:
  *	IN SOCKINFO *info;			Socket information object
@@ -197,81 +218,96 @@ http_Connect( IN uri_type * destination_url,
  *	IN OUT int* timeout_secs;		time out
  *	OUT int* http_error_code;		HTTP error code returned
  *
- * Description:
- *	Get the data on the socket and take actions based on the read data
- *	to modify the parser objects buffer. If an error is reported while
- *	parsing the data, the error code is passed in the http_errr_code
- *	parameter
- *
- * Returns:
- *	 UPNP_E_BAD_HTTPMSG
+ * \return
  * 	 UPNP_E_SUCCESS
- ************************************************************************/
-int
-http_RecvMessage( IN SOCKINFO * info,
-                  OUT http_parser_t * parser,
+ *	 UPNP_E_BAD_HTTPMSG
+ */
+int http_RecvMessage(
+	IN SOCKINFO *info,
+	OUT http_parser_t *parser,
 	IN http_method_t request_method,
 	IN OUT int *timeout_secs,
-                  OUT int *http_error_code )
+	OUT int *http_error_code)
 {
+	int ret = UPNP_E_SUCCESS;
+	int line = 0;
 	parse_status_t status;
 	int num_read;
 	xboolean ok_on_close = FALSE;
 	char buf[2 * 1024];
 
-    if( request_method == HTTPMETHOD_UNKNOWN ) {
-        parser_request_init( parser );
+	if (request_method == HTTPMETHOD_UNKNOWN) {
+		parser_request_init(parser);
 	} else {
-        parser_response_init( parser, request_method );
+		parser_response_init(parser, request_method);
 	}
 
-    while( TRUE ) {
-        num_read = sock_read( info, buf, sizeof( buf ), timeout_secs );
-        if( num_read > 0 ) {
+	while (TRUE) {
+		num_read = sock_read(info, buf, sizeof buf, timeout_secs);
+		if (num_read > 0) {
 			// got data
-            status = parser_append( parser, buf, num_read );
-
-            if( status == PARSE_SUCCESS ) {
+			status = parser_append(parser, buf, num_read);
+			if (status == PARSE_SUCCESS) {
 				UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
 					"<<< (RECVD) <<<\n%s\n-----------------\n",
 					parser->msg.msg.buf );
 				print_http_headers( &parser->msg );
-
-                if( parser->content_length >
-                    ( unsigned int )g_maxContentLength ) {
+				if (parser->content_length > (unsigned int)g_maxContentLength) {
 					*http_error_code = HTTP_REQ_ENTITY_TOO_LARGE;
-                    return UPNP_E_OUTOF_BOUNDS;
+					line = __LINE__;
+					ret = UPNP_E_OUTOF_BOUNDS;
+					goto ExitFunction;
 				}
-
-                return 0;
-            } else if( status == PARSE_FAILURE ) {
+				line = __LINE__;
+				ret = 0;
+				goto ExitFunction;
+			} else if (status == PARSE_FAILURE) {
 				*http_error_code = parser->http_error_code;
-                return UPNP_E_BAD_HTTPMSG;
-            } else if( status == PARSE_INCOMPLETE_ENTITY ) {
+				line = __LINE__;
+				ret = UPNP_E_BAD_HTTPMSG;
+				goto ExitFunction;
+			} else if (status == PARSE_INCOMPLETE_ENTITY) {
 				// read until close
 				ok_on_close = TRUE;
-            } else if( status == PARSE_CONTINUE_1 ) //Web post request. murari
-            {
-                return PARSE_SUCCESS;
+			} else if (status == PARSE_CONTINUE_1) {
+				// Web post request.
+				line = __LINE__;
+				ret = PARSE_SUCCESS;
+				goto ExitFunction;
 			}
-        } else if( num_read == 0 ) {
-            if( ok_on_close ) {
+		} else if (num_read == 0) {
+			if (ok_on_close) {
 				UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
 					"<<< (RECVD) <<<\n%s\n-----------------\n",
 					parser->msg.msg.buf );
-                    print_http_headers( &parser->msg );
-
-                    return 0;
+				print_http_headers(&parser->msg);
+				line = __LINE__;
+				ret = 0;
+				goto ExitFunction;
 			} else {
 				// partial msg
 				*http_error_code = HTTP_BAD_REQUEST;    // or response
-                return UPNP_E_BAD_HTTPMSG;
+				line = __LINE__;
+				ret = UPNP_E_BAD_HTTPMSG;
+				goto ExitFunction;
 			}
 		} else {
 			*http_error_code = parser->http_error_code;
-            return num_read;
+			line = __LINE__;
+			ret = num_read;
+			goto ExitFunction;
 		}
 	}
+
+ExitFunction:
+	if (ret != UPNP_E_SUCCESS) {
+		UpnpPrintf(UPNP_ALL, HTTP, __FILE__, line,
+			"(http_RecvMessage): Error %d, http_error_code = %d.\n",
+			ret,
+			*http_error_code);
+	}
+
+	return ret;
 }
 
 
@@ -513,7 +549,7 @@ http_RequestAndResponse( IN uri_type * destination,
     int http_error_code;
     SOCKINFO info;
 
-    tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
+    tcp_connection = socket( destination->hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
     if( tcp_connection == -1 ) {
         parser_response_init( response, req_method );
         return UPNP_E_SOCKET_ERROR;
@@ -527,7 +563,7 @@ http_RequestAndResponse( IN uri_type * destination,
     // connect
     ret_code = connect( info.socket,
                         ( struct sockaddr * )&destination->hostport.
-                        IPv4address, sizeof( struct sockaddr_in ) );
+                        IPaddress, sizeof( struct sockaddr_storage ) );
 
     if( ret_code == -1 ) {
         sock_destroy( &info, SD_BOTH );
@@ -634,8 +670,9 @@ http_Download( IN const char *url_str,
         return ret_code;
     }
 
-    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-        "HTTP Buffer:\n %s\n----------END--------\n", request.buf );
+    UpnpPrintf(UPNP_INFO, HTTP, __FILE__, __LINE__,
+        "HTTP Buffer:\n%s\n" "----------END--------\n",
+        request.buf);
     // get doc msg
     ret_code =
         http_RequestAndResponse( &url, request.buf, request.length,
@@ -805,9 +842,9 @@ MakePostMessage( const char *url_str,
         return ret_code;
     }
 
-    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-        "HTTP Buffer:\n %s\n" "----------END--------\n",
-        request->buf );
+    UpnpPrintf(UPNP_INFO, HTTP, __FILE__, __LINE__,
+        "HTTP Buffer:\n%s\n" "----------END--------\n",
+        request->buf);
 
     return UPNP_E_SUCCESS;
 }
@@ -997,7 +1034,7 @@ http_OpenHttpPost( IN const char *url_str,
 
     handle->contentLength = contentLength;
 
-    tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
+    tcp_connection = socket( url.hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
     if( tcp_connection == -1 ) {
         ret_code = UPNP_E_SOCKET_ERROR;
         goto errorHandler;
@@ -1011,8 +1048,8 @@ http_OpenHttpPost( IN const char *url_str,
     }
 
     ret_code = connect( handle->sock_info.socket,
-                        ( struct sockaddr * )&url.hostport.IPv4address,
-                        sizeof( struct sockaddr_in ) );
+                        ( struct sockaddr * )&url.hostport.IPaddress,
+                        sizeof( struct sockaddr_storage ) );
 
     if( ret_code == -1 ) {
         sock_destroy( &handle->sock_info, SD_BOTH );
@@ -1124,9 +1161,9 @@ MakeGetMessage( const char *url_str,
         return ret_code;
     }
 
-    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-        "HTTP Buffer:\n %s\n" "----------END--------\n",
-        request->buf );
+    UpnpPrintf(UPNP_INFO, HTTP, __FILE__, __LINE__,
+        "HTTP Buffer:\n%s\n" "----------END--------\n",
+        request->buf);
 
     return UPNP_E_SUCCESS;
 }
@@ -1579,7 +1616,7 @@ http_OpenHttpGetProxy( IN const char *url_str,
     handle->cancel = 0;
     parser_response_init( &handle->response, HTTPMETHOD_GET );
 
-    tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
+    tcp_connection = socket( peer->hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
     if( tcp_connection == -1 ) {
         ret_code = UPNP_E_SOCKET_ERROR;
         goto errorHandler;
@@ -1593,8 +1630,8 @@ http_OpenHttpGetProxy( IN const char *url_str,
     }
 
     ret_code = connect( handle->sock_info.socket,
-                        ( struct sockaddr * )&peer->hostport.IPv4address,
-                        sizeof( struct sockaddr_in ) );
+                        ( struct sockaddr * )&peer->hostport.IPaddress,
+                        sizeof( struct sockaddr_storage ) );
 
     if( ret_code == -1 ) {
         sock_destroy( &handle->sock_info, SD_BOTH );
@@ -2130,9 +2167,9 @@ MakeGetMessageEx( const char *url_str,
         }
     } while( 0 );
 
-    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-        "HTTP Buffer:\n %s\n" "----------END--------\n",
-        request->buf );
+    UpnpPrintf(UPNP_INFO, HTTP, __FILE__, __LINE__,
+        "HTTP Buffer:\n%s\n" "----------END--------\n",
+        request->buf);
 
     return errCode;
 }
@@ -2228,7 +2265,7 @@ http_OpenHttpGetEx( IN const char *url_str,
         handle->entity_offset = 0;
         parser_response_init( &handle->response, HTTPMETHOD_GET );
 
-        tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
+        tcp_connection = socket( url.hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
         if( tcp_connection == -1 ) {
             errCode = UPNP_E_SOCKET_ERROR;
             free( handle );
@@ -2244,8 +2281,8 @@ http_OpenHttpGetEx( IN const char *url_str,
         }
 
         errCode = connect( handle->sock_info.socket,
-                           ( struct sockaddr * )&url.hostport.IPv4address,
-                           sizeof( struct sockaddr_in ) );
+                           ( struct sockaddr * )&url.hostport.IPaddress,
+                           sizeof( struct sockaddr_storage ) );
         if( errCode == -1 ) {
             sock_destroy( &handle->sock_info, SD_BOTH );
             errCode = UPNP_E_SOCKET_CONNECT;

upnp/src/genlib/net/http/statcodes.c

@@ -176,7 +176,7 @@ http_get_code_text( int statusCode )
     int table_num;
 
     if( !gInitialized ) {
-        init_tables(  );
+        init_tables();
     }
 
     if( statusCode < 100 && statusCode >= 600 ) {

upnp/src/genlib/net/http/webserver.c

@@ -1,65 +1,81 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
 
 /******************************************************************************
  * Purpose: This file defines the Web Server and has functions to carry out
  * operations of the Web Server.
  ******************************************************************************/
 
+
 #include "config.h"
-#include <assert.h>
-#include <fcntl.h>
-#ifndef UPNP_USE_BCBPP
-#ifndef UPNP_USE_MSVCPP
-    #include <inttypes.h>
-    #include <stdint.h>
-#endif
-#endif
-#include "util.h"
-#include "strintmap.h"
-#include "membuffer.h"
+
+
+#include "webserver.h"
+
+
 #include "httpparser.h"
 #include "httpreadwrite.h"
+#include "ithread.h"
+#include "membuffer.h"
+#include "ssdplib.h"
 #include "statcodes.h"
-#include "webserver.h"
+#include "strintmap.h"
+#include "unixutil.h"
 #include "upnp.h"
 #include "upnpapi.h"
-#include "ssdplib.h"
+#include "util.h"
+#include "VirtualDir.h"
 
-#ifndef WIN32
+
+#include <assert.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+
+#ifdef UPNP_USE_BCBPP
+    /* Do not #include <inttypes.h> */
+    /* Do not #include <stdint.h> */
+#else
+    #include <inttypes.h>
+    #include <stdint.h>
+#endif /* !UPNP_USE_BCBPP */
+
+
+#ifdef WIN32
+    /* Do not #include <unistd.h> */
+#else
     #include <unistd.h>
 #endif
-#include <sys/stat.h>
-#include "ithread.h"
-#include "unixutil.h"
+
 
 /*
    Response Types 
@@ -296,8 +312,8 @@ get_content_type( IN const char *filename,
                   OUT DOMString * content_type )
 {
     const char *extension;
-    const char *type,
-     *subtype;
+    const char *type;
+    const char *subtype;
     xboolean ctype_found = FALSE;
     char *temp = NULL;
     int length = 0;
@@ -306,13 +322,13 @@ get_content_type( IN const char *filename,
 
     // get ext
     extension = strrchr( filename, '.' );
-    if( extension != NULL ) {
+    if (extension != NULL) {
         if( search_extension( extension + 1, &type, &subtype ) == 0 ) {
             ctype_found = TRUE;
         }
     }
 
-    if( !ctype_found ) {
+    if (!ctype_found) {
         // unknown content type
         type = gMediaTypes[APPLICATION_INDEX];
         subtype = "octet-stream";
@@ -320,15 +336,13 @@ get_content_type( IN const char *filename,
 
     length = strlen( type ) + strlen( "/" ) + strlen( subtype ) + 1;
     temp = ( char * )malloc( length );
-
-    if( !temp ) {
+    if (!temp) {
         return UPNP_E_OUTOF_MEMORY;
     }
-
     sprintf( temp, "%s/%s", type, subtype );
     ( *content_type ) = ixmlCloneDOMString( temp );
 
-    free( temp );
+    free(temp);
 
     if( !content_type ) {
         return UPNP_E_OUTOF_MEMORY;
@@ -516,40 +530,33 @@ web_server_set_alias( IN const char *alias_name,
     return UPNP_E_OUTOF_MEMORY;
 }
 
-/************************************************************************
- * Function: web_server_init
- *
- * Parameters:
- *	none
- *
- * Description: Initilialize the different documents. Initialize the
- *	memory for root directory for web server. Call to initialize global
- *	XML document. Sets bWebServerState to WEB_SERVER_ENABLED
- *
- * Returns:
- *	0 - OK
- *	UPNP_E_OUTOF_MEMORY: note: alias_content is not freed here
- ************************************************************************/
-int
-web_server_init( void )
+
+int web_server_init()
 {
-    int ret_code;
-
-    if( bWebServerState == WEB_SERVER_DISABLED ) {
-        media_list_init(  );    // decode media list
-        membuffer_init( &gDocumentRootDir );
-        glob_alias_init(  );
-
+	int ret = 0;
+	if (bWebServerState == WEB_SERVER_DISABLED) {
+		// decode media list
+		media_list_init();
+		membuffer_init(&gDocumentRootDir);
+		glob_alias_init();
 		pVirtualDirList = NULL;
 
-        ret_code = ithread_mutex_init( &gWebMutex, NULL );
-        if( ret_code == -1 ) {
-            return UPNP_E_OUTOF_MEMORY;
-        }
+		// Initialize callbacks
+		virtualDirCallback.get_info = NULL;
+		virtualDirCallback.open = NULL;
+		virtualDirCallback.read = NULL;
+		virtualDirCallback.write = NULL;
+		virtualDirCallback.seek = NULL;
+		virtualDirCallback.close = NULL;
+
+		if (ithread_mutex_init(&gWebMutex, NULL) == -1) {
+			ret = UPNP_E_OUTOF_MEMORY;
+		} else {
 			bWebServerState = WEB_SERVER_ENABLED;
 		}
+	}
 
-    return 0;
+	return ret;
 }
 
 /************************************************************************
@@ -588,7 +595,7 @@ web_server_destroy( void )
  * Function: get_file_info
  *
  * Parameters:
- *	IN const char* filename ;     Filename having the description document
+ *	IN const char *filename;   Filename having the description document
  *	OUT struct File_Info * info ; File information object having file 
  *		attributes such as filelength, when was the file last
  *		modified, whether a file or a directory and whether the
@@ -612,24 +619,24 @@ get_file_info( IN const char *filename,
 
     info->content_type = NULL;
 
-    code = stat( filename, &s );
-    if( code == -1 ) {
+	code = stat(filename, &s);
+	if (code == -1) {
 		return -1;
 	}
 
-    if( S_ISDIR( s.st_mode ) ) {
+	if (S_ISDIR(s.st_mode)) {
         info->is_directory = TRUE;
-    } else if( S_ISREG( s.st_mode ) ) {
+	} else if (S_ISREG(s.st_mode)) {
         info->is_directory = FALSE;
 	} else {
 		return -1;
 	}
 
 	// check readable
-    fp = fopen( filename, "r" );
+	fp = fopen(filename, "r");
     info->is_readable = ( fp != NULL );
-    if( fp ) {
-        fclose( fp );
+	if (fp) {
+		fclose(fp);
 	}
 
     info->file_length = s.st_size;
@@ -685,7 +692,7 @@ web_server_set_root_dir( IN const char *root_dir )
  * Function: get_alias
  *
  * Parameters:
- *	IN const char* request_file ; request file passed in to be compared with
+ *	IN const char *request_file;    request file passed in to be compared with
  *	OUT struct xml_alias_t* alias ; xml alias object which has a file name
  *		stored
  *   OUT struct File_Info * info	 ; File information object which will be
@@ -704,10 +711,8 @@ get_alias( IN const char *request_file,
 	OUT struct xml_alias_t *alias,
            OUT struct File_Info *info )
 {
-    int cmp;
-
-    cmp = strcmp( alias->name.buf, request_file );
-    if( cmp == 0 ) {
+	int cmp = strcmp(alias->name.buf, request_file);
+	if (cmp == 0) {
 		// fill up info
         info->file_length = alias->doc.length;
         info->is_readable = TRUE;
@@ -1204,11 +1209,11 @@ process_request( IN http_message_t * req,
     xboolean using_virtual_dir;
     uri_type *url;
     char *temp_str;
-    int resp_major,
-      resp_minor;
+    int resp_major;
+    int resp_minor;
     xboolean alias_grabbed;
     size_t dummy;
-    struct UpnpVirtualDirCallbacks *pVirtualDirCallback;
+    const char *extra_headers = NULL;
 
     print_http_headers( req );
 
@@ -1260,15 +1265,13 @@ process_request( IN http_message_t * req,
         }
 
     } else {
-        //
-        // try using alias
-        //
-        if( is_valid_alias( &gAliasDoc ) ) {
-            alias_grab( alias );
+        /* try using alias */
+        if (is_valid_alias(&gAliasDoc)) {
+            alias_grab(alias);
             alias_grabbed = TRUE;
 
             using_alias = get_alias( request_doc, alias, &finfo );
-            if( using_alias == TRUE ) {
+            if (using_alias == TRUE) {
                 finfo.content_type = ixmlCloneDOMString( "text/xml" );
 
                 if( finfo.content_type == NULL ) {
@@ -1278,29 +1281,26 @@ process_request( IN http_message_t * req,
         }
     }
 
-    if( using_virtual_dir ) {
-        if( req->method != HTTPMETHOD_POST ) {
+    if (using_virtual_dir) {
+        if (req->method != HTTPMETHOD_POST) {
             // get file info
-            pVirtualDirCallback = &virtualDirCallback;
-            if( pVirtualDirCallback->get_info( filename->buf, &finfo ) !=
-                0 ) {
+            if (virtualDirCallback.get_info(filename->buf, &finfo) != 0) {
                 err_code = HTTP_NOT_FOUND;
                 goto error_handler;
             }
             // try index.html if req is a dir
             if( finfo.is_directory ) {
-                if( filename->buf[filename->length - 1] == '/' ) {
+                if (filename->buf[filename->length - 1] == '/') {
                     temp_str = "index.html";
                 } else {
                     temp_str = "/index.html";
                 }
-                if( membuffer_append_str( filename, temp_str ) != 0 ) {
+                if ( membuffer_append_str(filename, temp_str) != 0) {
                     goto error_handler;
                 }
                 // get info
-                if( ( pVirtualDirCallback->
-                      get_info( filename->buf, &finfo ) != UPNP_E_SUCCESS )
-                    || finfo.is_directory ) {
+                if( (virtualDirCallback.get_info(filename->buf, &finfo ) != UPNP_E_SUCCESS ) ||
+                    finfo.is_directory) {
                     err_code = HTTP_NOT_FOUND;
                     goto error_handler;
                 }
@@ -1316,7 +1316,7 @@ process_request( IN http_message_t * req,
             //  goto error_handler;
             // }
         }
-    } else if( !using_alias ) {
+    } else if (!using_alias) {
         if( gDocumentRootDir.length == 0 ) {
             goto error_handler;
         }
@@ -1387,34 +1387,40 @@ process_request( IN http_message_t * req,
         goto error_handler;
     }
 
+    /*extra_headers = UpnpFileInfo_get_ExtraHeaders(finfo);*/
+    if (!extra_headers) {
+	    extra_headers = "";
+    }
+
     if( RespInstr->IsRangeActive && RespInstr->IsChunkActive ) {
         // Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         // Transfer-Encoding: chunked
         if (http_MakeMessage(
             headers, resp_major, resp_minor,
-            "R" "T" "GKD" "s" "tcS" "XcCc",
+            "R" "T" "GKD" "s" "tcS" "Xc" "sCc",
             HTTP_PARTIAL_CONTENT,           // status code
             finfo.content_type,   // content type
             RespInstr,                      // range info
             "LAST-MODIFIED: ",
 	    &finfo.last_modified,
-            X_USER_AGENT) != 0 ) {
+            X_USER_AGENT,
+            extra_headers) != 0 ) {
             goto error_handler;
         }
     } else if( RespInstr->IsRangeActive && !RespInstr->IsChunkActive ) {
-
         // Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         // Transfer-Encoding: chunked
         if (http_MakeMessage(
             headers, resp_major, resp_minor,
-            "R" "N" "T" "GD" "s" "tcS" "XcCc",
+            "R" "N" "T" "GD" "s" "tcS" "Xc" "sCc",
             HTTP_PARTIAL_CONTENT,           // status code
             RespInstr->ReadSendSize,        // content length
             finfo.content_type,       // content type
             RespInstr,                      // range info
             "LAST-MODIFIED: ",
 	    &finfo.last_modified,
-            X_USER_AGENT) != 0 ) {
+            X_USER_AGENT,
+            extra_headers) != 0 ) {
             goto error_handler;
         }
 
@@ -1423,12 +1429,13 @@ process_request( IN http_message_t * req,
         // Transfer-Encoding: chunked
         if (http_MakeMessage(
             headers, resp_major, resp_minor,
-            "RK" "TD" "s" "tcS" "XcCc",
+            "RK" "TD" "s" "tcS" "Xc" "sCc",
             HTTP_OK,                        // status code
             finfo.content_type, // content type
             "LAST-MODIFIED: ",
 	    &finfo.last_modified,
-            X_USER_AGENT) != 0 ) {
+            X_USER_AGENT,
+            extra_headers) != 0 ) {
             goto error_handler;
         }
 
@@ -1438,13 +1445,14 @@ process_request( IN http_message_t * req,
             // Transfer-Encoding: chunked
             if (http_MakeMessage(
                 headers, resp_major, resp_minor,
-                "R" "N" "TD" "s" "tcS" "XcCc",
+                "R" "N" "TD" "s" "tcS" "Xc" "sCc",
                 HTTP_OK,                        // status code
                 RespInstr->ReadSendSize,        // content length
                 finfo.content_type,      // content type
                 "LAST-MODIFIED: ",
 		&finfo.last_modified,
-                X_USER_AGENT) != 0 ) {
+                X_USER_AGENT,
+                extra_headers) != 0 ) {
                 goto error_handler;
             }
         } else {
@@ -1452,12 +1460,13 @@ process_request( IN http_message_t * req,
             // Transfer-Encoding: chunked
             if (http_MakeMessage(
                 headers, resp_major, resp_minor,
-                "R" "TD" "s" "tcS" "XcCc",
+                "R" "TD" "s" "tcS" "b" "Xc" "sCc",
                 HTTP_OK,                        // status code
                 finfo.content_type, // content type
                 "LAST-MODIFIED: ",
 		&finfo.last_modified,
-                X_USER_AGENT) != 0 ) {
+                X_USER_AGENT,
+                extra_headers) != 0 ) {
                 goto error_handler;
             }
         }
@@ -1483,11 +1492,11 @@ process_request( IN http_message_t * req,
 
     err_code = UPNP_E_SUCCESS;
 
-  error_handler:
-    free( request_doc );
+error_handler:
+    free(request_doc);
     ixmlFreeDOMString( finfo.content_type );
-    if( err_code != UPNP_E_SUCCESS && alias_grabbed ) {
-        alias_release( alias );
+    if (err_code != UPNP_E_SUCCESS && alias_grabbed) {
+        alias_release(alias);
     }
 
     return err_code;
@@ -1512,8 +1521,8 @@ process_request( IN http_message_t * req,
  *	HTTP_OK
  ************************************************************************/
 int
-http_RecvPostMessage( http_parser_t * parser,
-                      IN SOCKINFO * info,
+http_RecvPostMessage( http_parser_t *parser,
+                      IN SOCKINFO *info,
                       char *filename,
                       struct SendInstruction *Instr )
 {
@@ -1530,12 +1539,10 @@ http_RecvPostMessage( http_parser_t * parser,
     int ret_code = 0;
 
     if( Instr && Instr->IsVirtualFile ) {
-
         Fp = (virtualDirCallback.open)( filename, UPNP_WRITE );
         if( Fp == NULL ) {
             return HTTP_INTERNAL_SERVER_ERROR;
         }
-
     } else {
         Fp = fopen( filename, "wb" );
         if( Fp == NULL ) {

upnp/src/genlib/net/sock.c

@@ -1,57 +1,55 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
 
 /************************************************************************
-* Purpose: This file implements the sockets functionality 
-************************************************************************/
+ * Purpose: This file implements the sockets functionality 
+ ************************************************************************/
+
 
 #include "config.h"
+
+
+#include "sock.h"
+
+
+#include "unixutil.h" /* for socklen_t, EAFNOSUPPORT */
+#include "upnp.h"
+
+
 #include <assert.h>
 #include <errno.h>
 #include <time.h>
 #include <string.h>
 
-#include "sock.h"
-#include "upnp.h"
-#ifndef WIN32
- #include <arpa/inet.h>
- #include <netinet/in.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <unistd.h>
-#else
- #include <winsock2.h>
-#endif
-#include "unixutil.h"
 
 #ifndef MSG_NOSIGNAL
 	#define MSG_NOSIGNAL 0
@@ -62,7 +60,7 @@
 *
 *	Parameters :
 *		OUT SOCKINFO* info ;	Socket Information Object
-*		IN int sockfd ;			Socket Descriptor
+*		IN SOCKET sockfd ;	Socket Descriptor
 *
 *	Description :	Assign the passed in socket descriptor to socket 
 *		descriptor in the SOCKINFO structure.
@@ -76,7 +74,7 @@
 ************************************************************************/
 int
 sock_init( OUT SOCKINFO * info,
-           IN int sockfd )
+           IN SOCKET sockfd )
 {
     assert( info );
 
@@ -92,9 +90,8 @@ sock_init( OUT SOCKINFO * info,
 *
 *	Parameters :
 *		OUT SOCKINFO* info ;		Socket Information Object
-*		IN int sockfd ;						Socket Descriptor
-*		IN struct in_addr foreign_ip_addr ;	Remote IP Address
-*		IN unsigned short foreign_ip_port ;	Remote Port number
+*		IN SOCKET sockfd ;		Socket Descriptor
+*		IN struct sockaddr* foreign_sockaddr; remote socket address.
 *
 *	Description :	Calls the sock_init function and assigns the passed in
 *		IP address and port to the IP address and port in the SOCKINFO
@@ -109,9 +106,8 @@ sock_init( OUT SOCKINFO * info,
 ************************************************************************/
 int
 sock_init_with_ip( OUT SOCKINFO * info,
-                   IN int sockfd,
-                   IN struct in_addr foreign_ip_addr,
-                   IN unsigned short foreign_ip_port )
+                   IN SOCKET sockfd,
+                   IN struct sockaddr* foreign_sockaddr )
 {
     int ret;
 
@@ -120,8 +116,8 @@ sock_init_with_ip( OUT SOCKINFO * info,
         return ret;
     }
 
-    info->foreign_ip_addr = foreign_ip_addr;
-    info->foreign_ip_port = foreign_ip_port;
+    memcpy( &info->foreign_sockaddr, foreign_sockaddr, 
+        sizeof( info->foreign_sockaddr) );
 
     return UPNP_E_SUCCESS;
 }
@@ -149,10 +145,12 @@ int
 sock_destroy( INOUT SOCKINFO * info,
               int ShutdownMethod )
 {
+    if( info->socket != INVALID_SOCKET ) {
         shutdown( info->socket, ShutdownMethod );
         if( UpnpCloseSocket( info->socket ) == -1 ) {
             return UPNP_E_SOCKET_ERROR;
         }
+    }
 
     return UPNP_E_SUCCESS;
 }
@@ -190,7 +188,7 @@ sock_read_write( IN SOCKINFO * info,
     struct timeval timeout;
     int numBytes;
     time_t start_time = time( NULL );
-    int sockfd = info->socket;
+    SOCKET sockfd = info->socket;
     long bytes_sent = 0,
       byte_left = 0,
       num_written;
@@ -202,9 +200,9 @@ sock_read_write( IN SOCKINFO * info,
     FD_ZERO( &readSet );
     FD_ZERO( &writeSet );
     if( bRead ) {
-        FD_SET( ( unsigned )sockfd, &readSet );
+        FD_SET( sockfd, &readSet );
     } else {
-        FD_SET( ( unsigned )sockfd, &writeSet );
+        FD_SET( sockfd, &writeSet );
     }
 
     timeout.tv_sec = *timeoutSecs;

upnp/src/genlib/service_table/service_table.c

@@ -1,33 +1,34 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
 
 /************************************************************************
 * Purpose: This file defines the functions for services. It defines 
@@ -116,25 +117,8 @@ RemoveSubscriptionSID( Upnp_SID sid,
 
 }
 
-/************************************************************************
-*	Function :	GetSubscriptionSID
-*
-*	Parameters :
-*		Upnp_SID sid ;	subscription ID
-*		service_info * service ;	service object providing the list of
-*						subscriptions
-*
-*	Description :	Return the subscription from the service table 
-*		that matches const Upnp_SID sid value. 
-*
-*	Return : subscription * - Pointer to the matching subscription 
-*		node;
-*
-*	Note :
-************************************************************************/
-subscription *
-GetSubscriptionSID( Upnp_SID sid,
-                    service_info * service )
+
+subscription *GetSubscriptionSID(const Upnp_SID sid, service_info *service)
 {
     subscription *next = service->subscriptionList;
     subscription *previous = NULL;

upnp/src/genlib/util/membuffer.c

@@ -1,33 +1,33 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
 /************************************************************************
 * Purpose: This file contains functions that operate on memory and 
@@ -491,6 +491,8 @@ membuffer_delete( INOUT membuffer * m,
 
     assert( m != NULL );
 
+    if (!m) return;
+
     if( m->length == 0 ) {
         return;
     }

upnp/src/genlib/util/util.c

@@ -1,43 +1,48 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
 /************************************************************************
 * Purpose: This file contains functions for copying strings based on 
 * different options.
 ************************************************************************/
 
+
 #include "config.h"
 #include "upnp.h"
 #include "util.h"
 
+
+#include <string.h>
+
+
 /************************************************************************
 *	Function :	linecopy
 *

upnp/src/inc/VirtualDir.h

@@ -0,0 +1,69 @@
+
+
+#ifndef VIRTUALDIR_H
+#define VIRTUALDIR_H
+
+
+/** The \b VirtualDirCallbacks structure contains the pointers to
+ *  file-related callback functions a device application can register to
+ *  virtualize URLs.  
+ */
+struct VirtualDirCallbacks
+{
+	/** Called by the web server to query information on a file.  The callback
+	 *  should return 0 on success or -1 on an error. */
+	VDCallback_GetInfo get_info;
+
+	/** Called by the web server to open a file.  The callback should return
+	 *  a valid handle if the file can be opened.  Otherwise, it should return
+	 *  \c NULL to signify an error. */
+	VDCallback_Open open;
+
+	/** Called by the web server to perform a sequential read from an open
+	 *  file.  The callback should copy \b buflen bytes from the file into
+	 *  the buffer.
+	 *  @return An integer representing one of the following:
+	 *      \li <tt>   0</tt>:  The file contains no more data (EOF).
+	 *      \li <tt> > 0</tt>: A successful read of the number of bytes in the
+	 *      	return code.
+	 *      \li <tt> < 0</tt>: An error occurred reading the file.
+	 */
+	VDCallback_Read read;
+
+	/** Called by the web server to perform a sequential write to an open
+	 *  file.  The callback should write \b buflen bytes into the file from
+	 *  the buffer.  It should return the actual number of bytes written, 
+	 *  which might be less than \b buflen in the case of a write error.
+	 */
+	VDCallback_Write write;
+
+	/** Called by the web server to move the file pointer, or offset, into
+	 *  an open file.  The \b origin parameter determines where to start
+	 *  moving the file pointer.  A value of \c SEEK_CUR moves the
+	 *  file pointer relative to where it is.  The \b offset parameter can
+	 *  be either positive (move forward) or negative (move backward).  
+	 *  \c SEEK_END moves relative to the end of the file.  A positive 
+	 *  \b offset extends the file.  A negative \b offset moves backward 
+	 *  in the file.  Finally, \c SEEK_SET moves to an absolute position in 
+	 *  the file. In this case, \b offset must be positive.  The callback 
+	 *  should return 0 on a successful seek or a non-zero value on an error.
+	 */
+	VDCallback_Seek seek;
+
+	/** Called by the web server to close a file opened via the \b open
+	 *  callback.  It should return 0 on success, or a non-zero value on an 
+	 *  error.
+	 */
+	VDCallback_Close close;
+};
+
+
+typedef struct virtual_Dir_List
+{
+	struct virtual_Dir_List *next;
+	char dirName[NAME_SIZE];
+} virtualDirList;
+
+
+#endif /* VIRTUALDIR_H */
+

upnp/src/inc/client_table.h

@@ -1,167 +1,248 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
 
-#ifndef _CLIENT_TABLE
-#define _CLIENT_TABLE
+#ifndef CLIENT_TABLE_H
+#define CLIENT_TABLE_H
+
+
+/*!
+ * \file
+ */
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
+#include "service_table.h"
 #include "upnp.h"
+#include "UpnpString.h"
+#include "upnp_timeout.h"
+#include "uri.h"
+#include "TimerThread.h"
+
 
 #include <stdio.h>
-//#include <malloc.h>
 #include <stdlib.h>
 #include <time.h>
-#include "uri.h"
-#include "service_table.h"
 
-#include "TimerThread.h"
-#include "upnp_timeout.h"
 
 extern TimerThread gTimerThread;
 
-CLIENTONLY(
-typedef struct CLIENT_SUBSCRIPTION {
-  Upnp_SID sid;
-  char * ActualSID;
-  char * EventURL;
-  int RenewEventId;
-  struct CLIENT_SUBSCRIPTION * next;
-} client_subscription;
 
-/************************************************************************
-*	Function :	copy_client_subscription
-*
-*	Parameters :
-*		client_subscription * in ;	- source client subscription
-*		client_subscription * out ;	- destination client subscription
-*
-*	Description :	Make a copy of the client subscription data
-*
-*	Return : int ;
-*		UPNP_E_OUTOF_MEMORY - On Failure to allocate memory
-*		HTTP_SUCCESS - On Success
-*
-*	Note :
-************************************************************************/
-int copy_client_subscription(client_subscription * in, client_subscription * out);
-
-/************************************************************************
-*	Function :	free_client_subscription
-*
-*	Parameters :
-*		client_subscription * sub ;	- Client subscription to be freed
-*
-*	Description :	Free memory allocated for client subscription data.
-*		Remove timer thread associated with this subscription event.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void free_client_subscription(client_subscription * sub);
+#ifdef INCLUDE_CLIENT_APIS
 
 
-/************************************************************************
-*	Function :	freeClientSubList
-*
-*	Parameters :
-*		client_subscription * list ; Client subscription 
-*
-*	Description :	Free the client subscription table.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void freeClientSubList(client_subscription * list);
+typedef struct s_ClientSubscription ClientSubscription;
 
-/************************************************************************
-*	Function :	RemoveClientSubClientSID
-*
-*	Parameters :
-*		client_subscription **head ; Head of the subscription list	
-*		const Upnp_SID sid ;		 Subscription ID to be mactched
-*
-*	Description :	Remove the client subscription matching the 
-*		subscritpion id represented by the const Upnp_SID sid parameter 
-*		from the table and update the table.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void RemoveClientSubClientSID(client_subscription **head, 
-				       const Upnp_SID sid);
 
-/************************************************************************
-*	Function :	GetClientSubClientSID
-*
-*	Parameters :
-*		client_subscription *head ; Head of the subscription list	
-*		const Upnp_SID sid ;		Subscription ID to be matched
-*
-*	Description :	Return the client subscription from the client table 
-*		that matches const Upnp_SID sid subscrition id value. 
-*
-*	Return : client_subscription * ; The matching subscription
-*
-*	Note :
-************************************************************************/
-client_subscription * GetClientSubClientSID(client_subscription *head
-						     , const Upnp_SID sid);
+/*!
+ * \brief Constructor.
+ */
+ClientSubscription *UpnpClientSubscription_new();
+
+
+/*!
+ * \brief Destructor.
+ */
+void UpnpClientSubscription_delete(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p);
+
+
+/*!
+ * \brief Copy Constructor.
+ */
+ClientSubscription *UpnpClientSubscription_dup(
+	/*! [in] The \b this pointer. */
+	const ClientSubscription *p);
+
+
+/*!
+ * \brief Assignment operator.
+ */
+void UpnpClientSubscription_assign(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *q,
+	const ClientSubscription *p);
+
+
+/*!
+ * \brief 
+ */
+int UpnpClientSubscription_get_RenewEventId(
+	/*! [in] The \b this pointer. */
+	const ClientSubscription *p);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_set_RenewEventId(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	/*! [in] . */
+	int n);
+
+
+/*!
+ * \brief 
+ */
+const UpnpString *UpnpClientSubscription_get_SID(
+	/*! [in] The \b this pointer. */
+	const ClientSubscription *p);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_set_SID(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	const UpnpString *s);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_strcpy_SID(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	const char *s);
+
+
+/*!
+ * \brief 
+ */
+const UpnpString *UpnpClientSubscription_get_ActualSID(
+	/*! [in] The \b this pointer. */
+	const ClientSubscription *p);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_set_ActualSID(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	const UpnpString *s);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_strcpy_ActualSID(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	const char *s);
+
+
+/*!
+ * \brief 
+ */
+const UpnpString *UpnpClientSubscription_get_EventURL(
+	/*! [in] The \b this pointer. */
+	const ClientSubscription *p);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_set_EventURL(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	const UpnpString *s);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_strcpy_EventURL(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	const char *s);
+
+
+/*!
+ * \brief 
+ */
+ClientSubscription *UpnpClientSubscription_get_Next(
+	/*! [in] The \b this pointer. */
+	const ClientSubscription *p);
+
+
+/*!
+ * \brief 
+ */
+void UpnpClientSubscription_set_Next(
+	/*! [in] The \b this pointer. */
+	ClientSubscription *p,
+	ClientSubscription *q);
+
+
+
+/*!
+ * \brief Free memory allocated for client subscription data.
+ *
+ * Remove timer thread associated with this subscription event.
+ */
+void free_client_subscription(
+	/*! [in] Client subscription to be freed. */
+	ClientSubscription *sub);
+
+
+/*!
+ * \brief Free the client subscription table.
+ */
+void freeClientSubList(
+	/*! [in] Client subscription list to be freed. */
+	ClientSubscription *list);
+
+
+/*!
+ * \brief Remove the client subscription matching the subscritpion id
+ * represented by the const Upnp_SID sid parameter from the table and
+ * update the table.
+ */
+void RemoveClientSubClientSID(
+	/*! [in] Head of the subscription list. */
+	ClientSubscription **head,
+	/*! [in] Subscription ID to be mactched. */
+	const UpnpString *sid);
+
+
+/*!
+ * \brief Return the client subscription from the client table that matches
+ * const Upnp_SID sid subscrition id value.
+ *
+ * \return The matching subscription.
+ */
+ClientSubscription *GetClientSubClientSID(
+	/*! [in] Head of the subscription list. */
+	ClientSubscription *head,
+	/*! [in] Subscription ID to be mactched. */
+	const UpnpString *sid);
+
+
+/*!
+ * \brief Returns the client subscription from the client subscription table
+ * that has the matching token *sid buffer value.
+ *
+ * \return The matching subscription.
+ */
+ClientSubscription *GetClientSubActualSID(
+	/*! [in] Head of the subscription list. */
+	ClientSubscription *head,
+	/*! [in] Subscription ID to be mactched. */
+	token *sid);
+
+
+#endif /* INCLUDE_CLIENT_APIS */
 
-/************************************************************************
-*	Function :	GetClientSubActualSID
-*
-*	Parameters :
-*		client_subscription *head ;	Head of the subscription list		
-*		token * sid ;				Subscription ID to be matched
-*
-*	Description :	Returns the client subscription from the client 
-*		subscription table that has the matching token * sid buffer
-*		value.
-*
-*	Return : client_subscription * ; The matching subscription
-*
-*	Note :
-************************************************************************/
-client_subscription * GetClientSubActualSID(client_subscription *head
-						     , token * sid);
-)
 
 #ifdef __cplusplus
 }
-#endif
+#endif /* __cplusplus */
+
+
+#endif /* CLIENT_TABLE_H */
 
-#endif /*	_CLIENT_TABLE */

upnp/src/inc/config.h

@@ -32,6 +32,7 @@
 #ifndef INTERNAL_CONFIG_H
 #define INTERNAL_CONFIG_H 
 
+
 #include "autoconfig.h"
 
 

upnp/src/inc/gena.h

@@ -1,65 +1,83 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+
+#ifndef GENA_H
+#define GENA_H
+
+
+/*!
+ * \file
+ */
+
 
-#ifndef _GENA_
-#define _GENA_
 #include "config.h"
-#include "service_table.h"
-#include "miniserver.h"
-#include "uri.h"
-#include "upnp.h"
 
-#include <time.h>
-#include "ThreadPool.h"
+
 #include <string.h>
+#include <time.h>
+
+
 #include "client_table.h"
 #include "httpparser.h"
+#include "miniserver.h"
+#include "service_table.h"
 #include "sock.h"
+#include "ThreadPool.h"
+#include "upnp.h"
+#include "UpnpString.h"
+#include "uri.h"
+
 
 #ifdef __cplusplus
-#define EXTERN_C extern "C"
-#else 
-#ifndef EXTERN_C
+	#define EXTERN_C extern "C"
+#else /* __cplusplus */
+	#ifndef EXTERN_C
 		#define EXTERN_C 
-#endif
-#endif
+	#endif /* EXTERN_C */
+#endif /* __cplusplus */
 
+
+/*!
+ * \brief XML version comment. Not used because it is not interopeable with
+ * other UPnP vendors.
+ */
 #define XML_VERSION "<?xml version='1.0' encoding='ISO-8859-1' ?>\n"
 #define XML_PROPERTYSET_HEADER \
 	"<e:propertyset xmlns:e=\"urn:schemas-upnp-org:event-1-0\">\n"
 
+
 #define UNABLE_MEMORY "HTTP/1.1 500 Internal Server Error\r\n\r\n"
 #define UNABLE_SERVICE_UNKNOWN "HTTP/1.1 404 Not Found\r\n\r\n"
-#define UNABLE_SERVICE_NOT_ACCEPT \
-			"HTTP/1.1 503 Service Not Available\r\n\r\n"
+#define UNABLE_SERVICE_NOT_ACCEPT "HTTP/1.1 503 Service Not Available\r\n\r\n"
 
 
 #define NOT_IMPLEMENTED "HTTP/1.1 501 Not Implemented\r\n\r\n"
@@ -74,6 +92,8 @@
 #define MAX_SECONDS 10
 #define MAX_EVENTS 20
 #define MAX_PORT_SIZE 10
+
+
 #define GENA_E_BAD_RESPONSE UPNP_E_BAD_RESPONSE
 #define GENA_E_BAD_SERVICE UPNP_E_INVALID_SERVICE
 #define GENA_E_SUBSCRIPTION_UNACCEPTED UPNP_E_SUBSCRIBE_UNACCEPTED
@@ -82,16 +102,23 @@
 #define GENA_E_NOTIFY_UNACCEPTED UPNP_E_NOTIFY_UNACCEPTED
 #define GENA_E_NOTIFY_UNACCEPTED_REMOVE_SUB -9
 #define GENA_E_BAD_HANDLE UPNP_E_INVALID_HANDLE
+
+
 #define XML_ERROR -5
 #define XML_SUCCESS UPNP_E_SUCCESS
 #define GENA_SUCCESS UPNP_E_SUCCESS
+
+
 #define CALLBACK_SUCCESS 0
 #define DEFAULT_TIMEOUT 1801
 
 
 extern ithread_mutex_t GlobalClientSubscribeMutex;
 
-// Lock the subscription
+
+/*!
+ * \brief Locks the subscription.
+ */
 #define SubscribeLock() \
 	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
 		"Trying Subscribe Lock");  \
@@ -99,7 +126,10 @@ extern ithread_mutex_t GlobalClientSubscribeMutex;
 	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
 		"Subscribe Lock");
 
-// Unlock the subscription
+
+/*!
+ * \brief Unlocks the subscription.
+ */
 #define SubscribeUnlock() \
 	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
 		"Trying Subscribe UnLock"); \
@@ -108,12 +138,14 @@ extern ithread_mutex_t GlobalClientSubscribeMutex;
 		"Subscribe UnLock");
 
 
-// Structure to send NOTIFY message to all subscribed control points
+/*!
+ * Structure to send NOTIFY message to all subscribed control points
+ */
 typedef struct NOTIFY_THREAD_STRUCT {
-  char * headers;
+	char *headers;
 	DOMString propertySet;
-  char * servId;
-  char * UDN;
+	char *servId;
+	char *UDN;
 	Upnp_SID sid;
 	int eventKey;
 	int *reference_count;
@@ -121,282 +153,233 @@ typedef struct NOTIFY_THREAD_STRUCT {
 } notify_thread_struct;
 
 
-/************************************************************************
-* Function : genaCallback									
-*																	
-* Parameters:														
-*	IN http_parser_t *parser: represents the parse state of the request
-*	IN http_message_t* request: HTTP message containing GENA request
-*	INOUT SOCKINFO *info: Structure containing information about the socket
-*
-* Description:														
-*	This is the callback function called by the miniserver to handle 
-*	incoming GENA requests. 
-*
-* Returns: int
-*	UPNP_E_SUCCESS if successful else appropriate error
-***************************************************************************/
-EXTERN_C void genaCallback (IN http_parser_t *parser, 
-							IN http_message_t* request, 
-							IN SOCKINFO *info);
+/*!
+ * \brief This is the callback function called by the miniserver to handle
+ *	incoming GENA requests.
+ *
+ * \return UPNP_E_SUCCESS if successful, otherwise appropriate error code.
+ */
+EXTERN_C void genaCallback(
+	/*! [in] represents the parse state of the request */
+	http_parser_t *parser, 
+	/*! [in] HTTP message containing GENA request */
+	http_message_t* request,
+	/*! [in,out] Structure containing information about the socket */
+	SOCKINFO *info);
 
-/************************************************************************
-* Function : genaSubscribe
-*																	
-* Parameters:														
-*	IN UpnpClient_Handle client_handle: 
-*	IN char * PublisherURL: NULL Terminated, of the form : 
-*						"http://134.134.156.80:4000/RedBulb/Event"
-*	INOUT int * TimeOut: requested Duration, if -1, then "infinite".
-*						in the OUT case: actual Duration granted 
-*						by Service, -1 for infinite
-*	OUT Upnp_SID out_sid:sid of subscription, memory passed in by caller
-*
-* Description:														
-*	This function subscribes to a PublisherURL ( also mentioned as EventURL
-*	some places). It sends SUBSCRIBE http request to service processes 
-*	request. Finally adds a Subscription to 
-*	the clients subscription list, if service responds with OK
-*
-* Returns: int
-*	return UPNP_E_SUCCESS if service response is OK else 
-*	returns appropriate error
-***************************************************************************/
+ 
+/*!
+ * \brief This function subscribes to a PublisherURL (also mentioned as EventURL
+ * in some places).
+ *
+ * It sends SUBSCRIBE http request to service processes request. Finally adds a
+ * Subscription to the clients subscription list, if service responds with OK.
+ *
+ * \return UPNP_E_SUCCESS if service response is OK, otherwise returns the 
+ *	appropriate error code
+ */
 #ifdef INCLUDE_CLIENT_APIS
 EXTERN_C int genaSubscribe(
+	/*! [in] The client handle. */
 	UpnpClient_Handle client_handle,
-	char * PublisherURL,
-	int * TimeOut, 
-	Upnp_SID  out_sid );
-#endif
+	/*! [in] Of the form: "http://134.134.156.80:4000/RedBulb/Event */
+	const UpnpString *PublisherURL,
+	/*! [in,out] requested Duration:
+	 * \li if -1, then "infinite".
+	 * \li in the OUT case: actual Duration granted by Service,
+	 * 	-1 for infinite. */
+	int *TimeOut,
+	/*! [out] sid of subscription, memory passed in by caller. */
+	UpnpString *out_sid);
+#endif /* INCLUDE_CLIENT_APIS */
 
 
-/************************************************************************
-* Function : genaUnSubscribe
-*																	
-* Parameters:														
-*	IN UpnpClient_Handle client_handle: UPnP client handle
-*	IN SID in_sid: The subscription ID
-*
-* Description:														
-*	This function unsubscribes a SID. It first validates the SID and 
-*	client_handle,copies the subscription, sends UNSUBSCRIBE http request 
-*	to service processes request and finally removes the subscription
-*
-* Returns: int
-*	return UPNP_E_SUCCESS if service response is OK else 
-*	returns appropriate error
-***************************************************************************/
+/*!
+ * \brief Unsubscribes a SID.
+ *
+ * It first validates the SID and client_handle,copies the subscription, sends
+ * UNSUBSCRIBE http request to service processes request and finally removes
+ * the subscription.
+ *
+ * \return UPNP_E_SUCCESS if service response is OK, otherwise returns the
+ * 	appropriate error code.
+ */
 #ifdef INCLUDE_CLIENT_APIS
 EXTERN_C int genaUnSubscribe(
+	/*! [in] UPnP client handle. */
 	UpnpClient_Handle client_handle,
-	const Upnp_SID in_sid);
-#endif
+	/*! [in] The subscription ID. */
+	const UpnpString *in_sid);
+#endif /* INCLUDE_CLIENT_APIS */
 
-/************************************************************************
-* Function : genaUnregisterClient									
-*																	
-* Parameters:														
-*	IN UpnpClient_Handle client_handle: Handle containing all the control
-*			point related information
-*
-* Description:														
-*	This function unsubcribes all the outstanding subscriptions and cleans
-*	the subscription list. This function is called when control point 
-*	unregisters.
-*
-* Returns: int
-*	return UPNP_E_SUCCESS if successful else returns appropriate error
-***************************************************************************/
+
+/*!
+ * \brief Unsubcribes all the outstanding subscriptions and cleans the
+ * 	subscription list.
+ *
+ * This function is called when control point unregisters.
+ *
+ * \returns UPNP_E_SUCCESS if successful, otherwise returns the appropriate
+ * 	error code.
+ */
 #ifdef INCLUDE_CLIENT_APIS
-EXTERN_C int genaUnregisterClient(UpnpClient_Handle client_handle);
-#endif
+EXTERN_C int genaUnregisterClient(
+	/*! [in] Handle containing all the control point related information. */
+	UpnpClient_Handle client_handle);
+#endif /* INCLUDE_CLIENT_APIS */
 
-//server
-/************************************************************************
-* Function : genaUnregisterDevice
-*																	
-* Parameters:														
-*	IN UpnpDevice_Handle device_handle: Handle of the root device
-*
-* Description:														
-*	This function cleans the service table of the device. 
-*
-* Returns: int
-*	returns UPNP_E_SUCCESS if successful else returns GENA_E_BAD_HANDLE
-****************************************************************************/
+
+/*
+ * DEVICE
+ */
+
+
+/*!
+ * \brief Cleans the service table of the device.
+ *
+ * \return UPNP_E_SUCCESS if successful, otherwise returns GENA_E_BAD_HANDLE
+ */
 #ifdef INCLUDE_DEVICE_APIS
-EXTERN_C int genaUnregisterDevice(UpnpDevice_Handle device_handle);
-#endif
+EXTERN_C int genaUnregisterDevice(
+ 	/*! [in] Handle of the root device */
+	UpnpDevice_Handle device_handle);
+#endif /* INCLUDE_CLIENT_APIS */
 
 
-/************************************************************************
-* Function : genaRenewSubscription
-*																	
-* Parameters:														
-*	IN UpnpClient_Handle client_handle: Client handle
-*	IN const Upnp_SID in_sid: subscription ID
-*	INOUT int * TimeOut: requested Duration, if -1, then "infinite".
-*						in the OUT case: actual Duration granted 
-*						by Service, -1 for infinite
-*
-* Description:														
-*	This function renews a SID. It first validates the SID and 
-*	client_handle and copies the subscription. It sends RENEW 
-*	(modified SUBSCRIBE) http request to service and processes
-*	the response.
-*
-* Returns: int
-*	return UPNP_E_SUCCESS if service response is OK else 
-*	returns appropriate error
-***************************************************************************/
+/*!
+ * \brief Renews a SID.
+ *
+ * It first validates the SID and client_handle and copies the subscription.
+ * It sends RENEW (modified SUBSCRIBE) http request to service and processes
+ * the response.
+ *
+ * \return UPNP_E_SUCCESS if service response is OK, otherwise the
+ * 	appropriate error code.
+ */
 #ifdef INCLUDE_CLIENT_APIS
 EXTERN_C int genaRenewSubscription(
-	IN UpnpClient_Handle client_handle,
-	IN const Upnp_SID in_sid,
-	OUT int * TimeOut);
-#endif
-/****************************************************************************
-*	Function :	genaNotifyAll
-*
-*	Parameters :
-*		IN UpnpDevice_Handle device_handle : Device handle
-*		IN char *UDN :	Device udn
-*		IN char *servId :	Service ID
-*	    IN char **VarNames : array of varible names
-*	    IN char **VarValues :	array of variable values
-*		IN int var_count	 :	number of variables
-*
-*	Description : 	This function sends a notification to all the subscribed
-*	control points
-*
-*	Return :	int
-*
-*	Note : This function is similar to the genaNotifyAllExt. The only difference
-*			is it takes event variable array instead of xml document.
-****************************************************************************/
+	/*! [in] Client handle. */
+	UpnpClient_Handle client_handle,
+	/*! [in] Subscription ID. */
+	const UpnpString *in_sid,
+	/*! [in,out] requested Duration, if -1, then "infinite". In the OUT case:
+	 * actual Duration granted by Service, -1 for infinite. */
+	int *TimeOut);
+#endif /* INCLUDE_CLIENT_APIS */
+
+
+/*!
+ * \brief Sends a notification to all the subscribed control points.
+ *
+ * \return int
+ *
+ * \note This function is similar to the genaNotifyAllExt. The only difference
+ *	is it takes event variable array instead of xml document.
+ */
 #ifdef INCLUDE_DEVICE_APIS
 EXTERN_C int genaNotifyAll(
+	/*! [in] Device handle. */
 	UpnpDevice_Handle device_handle,
+	/*! [in] Device udn. */
 	char *UDN,
+	/*! [in] Service ID. */
 	char *servId,
+	/*! [in] Array of varible names. */
 	char **VarNames,
+	/*! [in] Array of variable values. */
 	char **VarValues,
+	/*! [in] Number of variables. */
 	int var_count);
-#endif
+#endif /* INCLUDE_DEVICE_APIS */
 
-/****************************************************************************
-* Function :	genaNotifyAllExt
-*
-* Parameters :
-*	IN UpnpDevice_Handle device_handle : Device handle
-*	IN char *UDN :			Device udn
-*	IN char *servId :		Service ID
-*	IN IXML_Document *PropSet :	XML document Event varible property set
-*
-* Description : This function sends a notification to all the subscribed
-*	control points
-*
-* Return : int
-*
-* Note : This function is similar to the genaNotifyAll. the only difference
-*	is it takes the document instead of event variable array
-****************************************************************************/
+
+/*!
+ * \brief Sends a notification to all the subscribed control points.
+ *
+ * \return int
+ *
+ * \note This function is similar to the genaNotifyAll. the only difference
+ *	is it takes the document instead of event variable array.
+ */
 #ifdef INCLUDE_DEVICE_APIS
 EXTERN_C int genaNotifyAllExt(
+	/*! [in] Device handle. */
 	UpnpDevice_Handle device_handle, 
+	/*! [in] Device udn. */
 	char *UDN,
+	/*! [in] Service ID. */
 	char *servId,
-	IN IXML_Document *PropSet);
-#endif
+	/*! [in] XML document Event varible property set. */
+	IXML_Document *PropSet);
+#endif /* INCLUDE_DEVICE_APIS */
 
-/****************************************************************************
-*	Function :	genaInitNotify
-*
-*	Parameters :
-*		   IN UpnpDevice_Handle device_handle :	Device handle
-*		   IN char *UDN :	Device udn
-*		   IN char *servId :	Service ID
-*		   IN char **VarNames :	Array of variable names
-*		   IN char **VarValues :	Array of variable values
-*		   IN int var_count :	array size
-*		   IN Upnp_SID sid :	subscription ID
-*
-*	Description :	This function sends the intial state table dump to 
-*		newly subscribed control point. 
-*
-*	Return :	int
-*		returns GENA_E_SUCCESS if successful else returns appropriate error
-* 
-*	Note : No other event will be sent to this control point before the 
-*			intial state table dump.
-****************************************************************************/
+
+/*!
+ * \brief Sends the intial state table dump to newly subscribed control point.
+ *
+ * \return GENA_E_SUCCESS if successful, otherwise the appropriate error code.
+ * 
+ * \note  No other event will be sent to this control point before the 
+ *	intial state table dump.
+ */
 #ifdef INCLUDE_DEVICE_APIS
-EXTERN_C int genaInitNotify(IN UpnpDevice_Handle device_handle,
-	IN char *UDN,
-	IN char *servId,
-	IN char **VarNames,
-	IN char **VarValues,
-	IN int var_count,
-	IN Upnp_SID sid);
-#endif
+EXTERN_C int genaInitNotify(
+	/*! [in] Device handle. */
+	UpnpDevice_Handle device_handle,
+	/*! [in] Device udn. */
+	char *UDN,
+	/*! [in] Service ID. */
+	char *servId,
+	/*! [in] Array of variable names. */
+	char **VarNames,
+	/*! [in] Array of variable values. */
+	char **VarValues,
+	/*! [in] Array size. */
+	int var_count,
+	/*! [in] Subscription ID. */
+	const Upnp_SID sid);
+#endif /* INCLUDE_DEVICE_APIS */
 
-/****************************************************************************
-*	Function :	genaInitNotifyExt
-*
-*	Parameters :
-*		   IN UpnpDevice_Handle device_handle :	Device handle
-*		   IN char *UDN :	Device udn
-*		   IN char *servId :	Service ID
-*		   IN IXML_Document *PropSet :	Document of the state table
-*		   IN Upnp_SID sid :	subscription ID
-*
-*	Description :	This function is similar to the genaInitNofity. The only 
-*	difference is that it takes the xml document for the state table and 
-*	sends the intial state table dump to newly subscribed control point. 
-*
-*	Return :	int
-*		returns GENA_E_SUCCESS if successful else returns appropriate error
-* 
-*	Note : No other event will be sent to this control point before the 
-*			intial state table dump.
-****************************************************************************/
+
+/*!
+ * \brief Similar to the genaInitNofity. The only difference is that it
+ * takes the xml document for the state table and sends the intial state
+ * table dump to newly subscribed control point.
+ *
+ * \return GENA_E_SUCCESS if successful, otherwise the appropriate error code.
+ * 
+ * \note No other event will be sent to this control point before the 
+ * 	intial state table dump.
+ */
 #ifdef INCLUDE_DEVICE_APIS
 EXTERN_C  int genaInitNotifyExt(
-	IN UpnpDevice_Handle device_handle, 
-	IN char *UDN, 
-	IN char *servId,
-	IN IXML_Document *PropSet, 
-	IN Upnp_SID sid);
-#endif
-
-
-/************************************************************************
-* Function : error_respond									
-*																	
-* Parameters:														
-*	IN SOCKINFO *info: Structure containing information about the socket
-*	IN int error_code: error code that will be in the GENA response
-*	IN http_message_t* hmsg: GENA request Packet 
-*
-* Description:														
-*	This function send an error message to the control point in the case
-*	incorrect GENA requests.
-*
-* Returns: int
-*	UPNP_E_SUCCESS if successful else appropriate error
-***************************************************************************/
-void error_respond( IN SOCKINFO *info, IN int error_code,
-				    IN http_message_t* hmsg );
-
-
-#endif // GENA
-
-
-
-
+	/*! [in] Device handle. */
+	UpnpDevice_Handle device_handle, 
+	/*! [in] Device udn. */
+	char *UDN, 
+	/*! [in] Service ID. */
+	char *servId,
+	/*! [in] Document of the state table. */
+	IXML_Document *PropSet, 
+	/*! [in] subscription ID. */
+	const Upnp_SID sid);
+#endif /* INCLUDE_DEVICE_APIS */
 
 
+/*!
+ * \brief Sends an error message to the control point in the case of incorrect
+ * 	GENA requests.
+ *
+ * \return UPNP_E_SUCCESS if successful, otherwise appropriate error code.
+ */
+void error_respond(
+	/*! [in] Structure containing information about the socket. */
+	SOCKINFO *info,
+	/*! [in] error code that will be in the GENA response. */
+	int error_code,
+	/*! [in] GENA request Packet. */
+	http_message_t* hmsg);
 
 
+#endif /* GENA_H */
 

upnp/src/inc/global.h

@@ -1,44 +1,50 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
+
+#ifndef GLOBAL_H
+#define GLOBAL_H
+
 
 /* GLOBAL.H - RSAREF types and constants */
 /* PROTOTYPES should be set to one if and only if the compiler supports
   function argument prototyping.
 
-  The following makes PROTOTYPES default to 0 if it has not already
+  The following makes PROTOTYPES default to 1 if it has not already
   been defined with C compiler flags.
 */
 
+
 #ifndef PROTOTYPES
-#define PROTOTYPES 0
+	#define PROTOTYPES 1
 #endif
 
 /* POINTER defines a generic pointer type */
@@ -50,13 +56,17 @@ typedef unsigned short int UINT2;
 /* UINT4 defines a four byte word */
 typedef unsigned long int UINT4;
 
-/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
-   If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-   returns an empty list.
+/*
+ * PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+ * If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
+ * returns an empty list.
  */
-
 #if PROTOTYPES
-#define PROTO_LIST(list) list
+	#define PROTO_LIST(list) list
 #else
-#define PROTO_LIST(list) ()
+	#define PROTO_LIST(list) ()
 #endif
+
+
+#endif /* GLOBAL_H */
+

upnp/src/inc/http_client.h

@@ -1,314 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef _http_client_h_
-#define _http_client_h_
-#ifdef __cplusplus
-#define EXTERN_C extern "C"
-#else
-#define EXTERN_C
-#endif
-#include "genlib/closesocket/upnpclosesocket.h"
-#include <fcntl.h>
-#include <string.h>
-#include <sys/types.h>
-//#include <malloc.h>
-#include <time.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <sys/time.h>
-#include "tools/config.h"
-#include "upnp.h"
-//#include "upnp_debug.h"
-
-
-#define HTTP_DATE_LENGTH 37 // length for HTTP DATE: 
-                            //"DATE: Sun, 01 Jul 2000 08:15:23 GMT<cr><lf>"
-#define SEPARATORS "()<>@,;:\\\"/[]?={} \t"
-#define MARK "-_.!~*'()"
-#define RESERVED ";/?:@&=+$,"
-#define HTTP_SUCCESS 1
-#define HTTP_E_BAD_URL UPNP_E_INVALID_URL
-#define HTTP_E_READ_SOCKET  UPNP_E_SOCKET_READ
-#define HTTP_E_BIND_SOCKET  UPNP_E_SOCKET_BIND
-#define HTTP_E_WRITE_SOCKET  UPNP_E_SOCKET_WRITE
-#define HTTP_E_CONNECT_SOCKET  UPNP_E_SOCKET_CONNECT
-#define HTTP_E_SOCKET    UPNP_E_OUTOF_SOCKET
-#define HTTP_E_BAD_RESPONSE UPNP_E_BAD_RESPONSE
-#define HTTP_E_BAD_REQUEST UPNP_E_BAD_REQUEST
-#define HTTP_E_BAD_IP_ADDRESS UPNP_E_INVALID_URL
-#define FALSE 0
-#define TAB 9
-#define CR 13
-#define LF 10
-#define RESPONSE_TIMEOUT 30
-#define SOCKET_BUFFER_SIZE 5000
-
-enum hostType { HOSTNAME, IPv4address };
-enum pathType { ABS_PATH, REL_PATH, OPAQUE_PART };
-enum uriType  { ABSOLUTE, RELATIVE };
-
-//Buffer used to store data read from 
-//a socket during an http transfer
-//in function read_bytes.
-typedef struct SOCKET_BUFFER{
-  char buff[SOCKET_BUFFER_SIZE];
-  int size;
-  struct SOCKET_BUFFER *next;
-} socket_buffer;
-
-//Buffer used in parsing
-//http messages, urls, etc.
-//generally this simply
-//holds a pointer into a larger array
-typedef struct TOKEN {
-   char * buff;
-  size_t size;
-} token;
-
-
-//Represents a host port:
-//e.g. :"127.127.0.1:80"
-//text is a token pointing to 
-//the full string representation
-typedef struct HOSTPORT {
-  token text; //full host port
-  struct sockaddr_in IPv4address; //Network Byte Order  
-} hostport_type;
-
-//Represents a URI
-//used in parse_uri and elsewhere
-typedef struct URI{
-  enum uriType type;
-  token scheme;
-  enum pathType path_type;
-  token pathquery;
-  token fragment;
-  hostport_type hostport;
-} uri_type;
-
-//Represents a list of URLs as in 
-//the "callback" header of SUBSCRIBE
-//message in GENA
-//char * URLs holds dynamic memory
-typedef struct URL_LIST {
-  int size;
-  char * URLs; //all the urls, delimited by <>
-  uri_type *parsedURLs;
-} URL_list;
-
-typedef struct HTTP_HEADER {
-  token header;
-  token value;
-  struct HTTP_HEADER * next;
-} http_header;
-
-typedef struct HTTP_STATUS_LINE{
-  token http_version;
-  token status_code;
-  token reason_phrase;
-} http_status;
-
-typedef struct HTTP_REQUEST_LINE {
-  token http_version;
-  uri_type request_uri;
-  token method;
-} http_request;
-
-//Represents a parsed HTTP_MESSAGE
-//head_list is dynamically allocated
-typedef struct HTTP_MESSAGE {
-  http_status status;
-  http_request request;
-  http_header * header_list;
-  token content;
-} http_message;
-
-
-EXTERN_C int transferHTTP( char * request,  char * toSend, 
-			  int toSendSize, char **out,  char * Url);
-
-
-EXTERN_C int transferHTTPRaw( char * toSend, int toSendSize, 
-			     char **out,  char *URL);
-
-//helper function
-EXTERN_C int transferHTTPparsedURL( char * request, 
-				    char * toSend, int toSendSize, 
-				   char **out, uri_type *URL);
-
-//assumes that char * out has enough space ( 38 characters)
-//outputs the current time in the following null terminated string:
-// "DATE: Sun, Jul 06 2000 08:53:01 GMT\r\n"
-EXTERN_C void currentTmToHttpDate(char *out);
-
-//returns dynamic memory or NULL on error
-EXTERN_C char * resolve_rel_url( char * base_url,  char * rel_url);
-
-EXTERN_C int parse_uri(  char * in, int max, uri_type * out);
-
-EXTERN_C int token_cmp( token *in1,  token *in2);
-
-EXTERN_C int token_string_casecmp( token * in1,  char * in2);
-
-EXTERN_C int token_string_cmp( token * in1,  char * in2);
-
-EXTERN_C int parse_http_response(  char * in, http_message * out, 
-				  int max_len);
-
-EXTERN_C int parse_http_request( char * in, http_message *out, 
-				int max_len);
-
-EXTERN_C int search_for_header( http_message * in, 
-			        char * header, token *out_value);
-
-
-
-EXTERN_C int parse_hostport(  char* in, int max, hostport_type *out );
-
-EXTERN_C size_t write_bytes(int fd,   char * bytes, size_t n, 
-			    int timeout);
-EXTERN_C void free_http_message(http_message * message);
-EXTERN_C int copy_URL_list( URL_list *in, URL_list *out);
-EXTERN_C void free_URL_list(URL_list * list);
-EXTERN_C int parse_port(int max,   char * port, unsigned short int * out);
-
-EXTERN_C int parse_http_line(  char * in, int max_size);
-EXTERN_C int parse_not_LWS(  char *in, token *out, int max_size);
-EXTERN_C int parse_LWS( char * in, int max_size);
-EXTERN_C int parse_token( char * in, token * out, int max_size);
-EXTERN_C ssize_t readLine(int fd, char *out, int max, int *timeout);
-EXTERN_C int remove_dots(char * in, int size);
-
-
-#ifdef DEBUG
-EXTERN_C void print_http_request(
-	http_message *message,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_http_request(
-	http_message *message,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
-
-#ifdef DEBUG
-EXTERN_C void print_http_response(
-	http_message *message,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_http_response(
-	http_message *message,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
-
-#ifdef DEBUG
-EXTERN_C void print_token(
-	token *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_token(
-	token *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
-
-#ifdef DEBUG
-EXTERN_C void print_status_line(
-	http_status *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_status_line(
-	http_status *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
-
-#ifdef DEBUG
-EXTERN_C void print_request_line(
-	http_request *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_request_line(
-	http_request *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
-
-#ifdef DEBUG
-EXTERN_C void print_uri(
-	uri_type *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_uri(
-	uri_type *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
-
-#endif
-

upnp/src/inc/httpreadwrite.h

@@ -81,7 +81,7 @@ int http_FixUrl( IN uri_type* url, OUT uri_type* fixed_url );
  *	 UPNP_E_INVALID_URL
  * 	 UPNP_E_SUCCESS
  ************************************************************************/
-int http_FixStrUrl( IN char* urlstr, IN int urlstrlen, OUT uri_type* fixed_url );
+int http_FixStrUrl( IN const char* urlstr, IN int urlstrlen, OUT uri_type* fixed_url );
 
 
 /************************************************************************

upnp/src/inc/inet_pton.h

@@ -1,103 +1,100 @@
-#ifdef WIN32
+
+
 #ifndef INET_PTON
 #define INET_PTON
 
-#include <winsock2.h>
+
+#ifdef WIN32
+
+
+#include "unixutil.h"
+
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-typedef int socklen_t;
-#define EAFNOSUPPORT 97
 
-/*
- * WARNING: Don't even consider trying to compile this on a system where
+
+/*!
+ * \file
+ *
+ * \author: Paul Vixie, 1996.
+ *
+ * \brief Network support routines missing in WIN32.
+ *
+ * \warning Don't even consider trying to compile this on a system where
  * sizeof(int) < 4.  sizeof(int) 4 is fine; all the world's not a VAX.
+ *
  */
 
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
+/*!
+ * \brief format an IPv4 address
+ *
+ * \return `dst' (as a const)
+ *
+ * \note
+ *	\li (1) uses no statics
+ *	\li (2) takes a u_char* not an in_addr as input
+ *
  */
-extern const char * inet_ntop4(const u_char src, char *dst, socklen_t size);
+extern const char *inet_ntop4(const u_char src, char *dst, socklen_t size);
 
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
+
+/*!
+ * \brief convert IPv6 binary address into presentation (printable) format
  */
-
 #ifdef INET_IPV6
-
-extern const char * inet_ntop6(src, dst, size);
-
+extern const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
 #endif /* INET_IPV6 */
 
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
+
+/*!
+ * \brief like inet_aton() but without all the hexadecimal and shorthand.
+ *
+ * \return 1 if `src' is a valid dotted quad, else 0.
+ *
+ * \note does not touch `dst' unless it's returning 1.
  */
 extern inet_pton4(const char *src,u_char *dst);
 
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
+
+/*!
+ * \brief convert presentation level address to network order binary form.
+ *
+ * \return 1 if `src' is a valid [RFC1884 2.2] address, else 0.
+ *
+ * \note
+ *	\li (1) does not touch `dst' unless it's returning 1.
+ *	\li (2) :: in a full address is silently ignored.
  */
-
 #ifdef INET_IPV6
-
-extern int inet_pton6(src, dst);
-
+extern int inet_pton6(const char *src, u_char *dst);
 #endif /* INET_IPV6 */
 
 
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
+/*!
+ * \brief convert a network format address to presentation format.
+ *
+ * \return
  *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
  */
 extern const char *inet_ntop(int af,const void *src,char *dst,socklen_t size);
 
 
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
+/*!
+ * \brief convert from presentation format (which usually means ASCII printable)
  * to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
+ *
+ * \return
+ *	\li 1 if the address was valid for the specified address family
+ *	\li 0 if the address wasn't valid (`dst' is untouched in this case)
+ *	\li -1 if some other error occurred (`dst' is untouched in this case, too)
  */
 extern int inet_pton(int af,const char *src,void *dst);
 
-#endif
-#endif
+
+#endif /* WIN32 */
+
+
+#endif /* INET_PTON */
+

upnp/src/inc/miniserver.h

@@ -42,17 +42,22 @@ extern SOCKET gMiniServerStopSock;
 
 typedef struct MServerSockArray {
 	/* socket for listening for miniserver requests */
-	int miniServerSock;
+	SOCKET miniServerSock4;
+	SOCKET miniServerSock6;
 	/* socket for stopping miniserver */
-	int miniServerStopSock;
+	SOCKET miniServerStopSock;
 	/* socket for incoming advertisments and search requests */
-	int ssdpSock;
+	SOCKET ssdpSock4;
+	SOCKET ssdpSock6;
+	SOCKET ssdpSock6UlaGua;
 
-	int stopPort;
-	int miniServerPort;
+	SOCKET stopPort;
+	SOCKET miniServerPort4;
+	SOCKET miniServerPort6;
 
 	/* socket for sending search requests and receiving search replies */
-	CLIENTONLY(int ssdpReqSock;)
+	CLIENTONLY(SOCKET ssdpReqSock4;)
+	CLIENTONLY(SOCKET ssdpReqSock6;)
 } MiniServerSockArray;
 
 
@@ -66,78 +71,62 @@ typedef void (*MiniServerCallback)(
 extern "C" {
 #endif
 
-/************************************************************************
- * Function: SetHTTPGetCallback
- *
- * Parameters:
- *	MiniServerCallback callback; - HTTP Callback to be invoked 
- *
- * Description:	Set HTTP Get Callback
- *
- * Return: void
- ************************************************************************/
-void SetHTTPGetCallback( MiniServerCallback callback );
 
-/************************************************************************
- * Function: SetSoapCallback
- *
- * Parameters:
- *	MiniServerCallback callback; - SOAP Callback to be invoked 
- *
- * Description: Set SOAP Callback
- *
- * Return: void
- ************************************************************************/
+/*!
+ * \brief Set HTTP Get Callback.
+ */
+void SetHTTPGetCallback(
+	/*! [in] HTTP Callback to be invoked . */
+	MiniServerCallback callback);
+
+
+/*!
+ * \brief Set SOAP Callback.
+ */
 #ifdef INCLUDE_DEVICE_APIS
-void SetSoapCallback( MiniServerCallback callback );
+void SetSoapCallback(
+	/*! [in] SOAP Callback to be invoked . */
+	MiniServerCallback callback);
 #else  /* INCLUDE_DEVICE_APIS */
-static inline void SetSoapCallback( MiniServerCallback callback ) {}
+static inline void SetSoapCallback(MiniServerCallback callback) {}
 #endif /* INCLUDE_DEVICE_APIS */
 
-/************************************************************************
- * Function: SetGenaCallback
- *
- * Parameters:
- *	MiniServerCallback callback; - GENA Callback to be invoked
- *
- * D6escription: Set GENA Callback
- *
- * Return: void
- ************************************************************************/
-void SetGenaCallback( MiniServerCallback callback );
 
-/************************************************************************
- * Function: StartMiniServer
+/*!
+ * \brief Set GENA Callback.
+ */
+void SetGenaCallback(
+	/*! [in] GENA Callback to be invoked. */
+	MiniServerCallback callback);
+
+
+/*!
+ * \brief Initialize the sockets functionality for the Miniserver.
  *
- * Parameters:
- *	unsigned short listen_port ; Port on which the server listens for 
- *	incoming connections
+ * Initialize a thread pool job to run the MiniServer and the job to the
+ * thread pool.
  *
- * Description: Initialize the sockets functionality for the 
- *	Miniserver. Initialize a thread pool job to run the MiniServer
- *	and the job to the thread pool. If listen port is 0, port is 
- *	dynamically picked
+ * If listen port is 0, port is dynamically picked.
  *
  * Use timer mechanism to start the MiniServer, failure to meet the 
  * allowed delay aborts the attempt to launch the MiniServer.
  *
- * Return: int;
- *	Actual port socket is bound to - On Success: 
- *	A negative number UPNP_E_XXX - On Error   			
- ************************************************************************/
-int StartMiniServer( unsigned short listen_port );
+ * \return
+ *	\li On success: UPNP_E_SUCCESS.
+ *	\li On error: UPNP_E_XXX.
+ */
+int StartMiniServer(
+	/*! [in,out] Port on which the server listens for incoming IPv4 connections. */
+	unsigned short *listen_port4, 
+	/*! [in,out] Port on which the server listens for incoming IPv6 connections. */
+	unsigned short *listen_port6);
 
-/************************************************************************
- * Function: StopMiniServer
+
+/*!
+ * \brief Stop and Shutdown the MiniServer and free socket resources.
  *
- * Parameters:
- *	void;	
- *
- * Description: Stop and Shutdown the MiniServer and free socket resources.
- *
- * Return : int;
- *	Always returns 0 
- ************************************************************************/
+ * \return Always returns 0.
+ */
 int StopMiniServer();
 
 

upnp/src/inc/service_table.h

@@ -1,54 +1,66 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+
+#ifndef SERVICE_TABLE_H
+#define SERVICE_TABLE_H
+
+
+/*!
+ * \file
+ */
 
-#ifndef _SERVICE_TABLE
-#define _SERVICE_TABLE
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 #include "config.h"
 #include "uri.h"
 #include "ixml.h"
-
 #include "upnp.h"
+#include "upnpdebug.h"
+
+
 #include <stdio.h>
-//#include <malloc.h>
 #include <time.h>
 
+
 #define SID_SIZE  41
 
+
 #ifdef INCLUDE_DEVICE_APIS
 
+
 typedef struct SUBSCRIPTION {
 	Upnp_SID sid;
 	int eventKey;
@@ -83,191 +95,137 @@ typedef struct SERVICE_TABLE {
 
 /* Functions for Subscriptions */
 
-/************************************************************************
-*	Function :	copy_subscription
-*
-*	Parameters :
-*		subscription *in ;	Source subscription
-*		subscription *out ;	Destination subscription
-*
-*	Description :	Makes a copy of the subscription
-*
-*	Return : int ;
-*		HTTP_SUCCESS - On Sucess
-*
-*	Note :
-************************************************************************/
-int copy_subscription(subscription *in, subscription *out);
 
-/************************************************************************
-*	Function :	RemoveSubscriptionSID
-*
-*	Parameters :
-*		Upnp_SID sid ;	subscription ID
-*		service_info * service ;	service object providing the list of
-*						subscriptions
-*
-*	Description :	Remove the subscription represented by the
-*		const Upnp_SID sid parameter from the service table and update 
-*		the service table.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void RemoveSubscriptionSID(Upnp_SID sid, service_info * service);
+/*!
+ * \brief Makes a copy of the subscription.
+ *
+ * \return HTTP_SUCCESS on Sucess.
+ */
+int copy_subscription(
+	/*! [in] Source subscription. */
+	subscription *in,
+	/*! [in] Destination subscription. */
+	subscription *out);
 
-/************************************************************************
-*	Function :	GetSubscriptionSID
-*
-*	Parameters :
-*		Upnp_SID sid ;	subscription ID
-*		service_info * service ;	service object providing the list of
-*						subscriptions
-*
-*	Description :	Return the subscription from the service table 
-*		that matches const Upnp_SID sid value. 
-*
-*	Return : subscription * - Pointer to the matching subscription 
-*		node;
-*
-*	Note :
-************************************************************************/
-subscription * GetSubscriptionSID(Upnp_SID sid,service_info * service); 
 
-//returns a pointer to the subscription with the SID, NULL if not found
+/*
+ * \brief Remove the subscription represented by the const Upnp_SID sid parameter
+ * from the service table and update the service table.
+ */
+void RemoveSubscriptionSID(
+	/*! [in] Subscription ID. */
+	Upnp_SID sid,
+	/*! [in] Service object providing the list of subscriptions. */
+	service_info *service);
 
-subscription * CheckSubscriptionSID(Upnp_SID sid,service_info * service);
 
-//returns a pointer to the first subscription
-subscription * GetFirstSubscription(service_info *service);
+/*!
+ * \brief Return the subscription from the service table that matches
+ * const Upnp_SID sid value.
+ *
+ * \return Pointer to the matching subscription node.
+ */
+subscription *GetSubscriptionSID(
+	/*! [in] Subscription ID. */
+	const Upnp_SID sid,
+	/*! [in] Service object providing the list of subscriptions. */
+	service_info *service); 
   
-/************************************************************************
-*	Function :	GetNextSubscription
-*
-*	Parameters :
-*		service_info * service ; service object providing the list of
-*						subscriptions
-*		subscription *current ;	current subscription object
-*
-*	Description :	Get current and valid subscription from the service 
-*		table.
-*
-*	Return : subscription * - Pointer to the next subscription node;
-*
-*	Note :
-************************************************************************/	
-subscription * GetNextSubscription(service_info * service, subscription *current);
 
-/************************************************************************
-*	Function :	freeSubscription
-*
-*	Parameters :
-*		subscription * sub ;	subscription to be freed
-*
-*	Description :	Free's the memory allocated for storing the URL of 
-*		the subscription.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void freeSubscription(subscription * sub);
+/*!
+ * \brief Gets pointer to the first subscription node in the service table.
+ *
+ * \return Pointer to the first subscription node.
+ */
+subscription *GetFirstSubscription(
+	/*! [in] Service object providing the list of subscriptions. */
+	service_info *service);
 
-/************************************************************************
-*	Function :	freeSubscriptionList
-*
-*	Parameters :
-*		subscription * head ;	head of the subscription list
-*
-*	Description :	Free's memory allocated for all the subscriptions 
-*		in the service table. 
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void freeSubscriptionList(subscription * head);
 
-/************************************************************************
-*	Function :	FindServiceId
-*
-*	Parameters :
-*		service_table *table ;	service table
-*		const char * serviceId ;string representing the service id 
-*								to be found among those in the table	
-*		const char * UDN ;		string representing the UDN 
-*								to be found among those in the table	
-*
-*	Description :	Traverses through the service table and returns a 
-*		pointer to the service node that matches a known service  id 
-*		and a known UDN
-*
-*	Return : service_info * - pointer to the matching service_info node;
-*
-*	Note :
-************************************************************************/
-service_info *FindServiceId( service_table * table, 
-			     const char * serviceId, const char * UDN);
+/*!
+ * \brief Get current and valid subscription from the service table.
+ *
+ * \return Pointer to the next subscription node.
+ */
+subscription *GetNextSubscription(
+	/*! [in] Service object providing the list of subscriptions. */
+	service_info *service,
+	/*! [in] Current subscription object. */
+	subscription *current);
 
-/************************************************************************
-*	Function :	FindServiceEventURLPath
-*
-*	Parameters :
-*		service_table *table ;	service table
-*		char * eventURLPath ;	event URL path used to find a service 
-*								from the table  
-*
-*	Description :	Traverses the service table and finds the node whose
-*		event URL Path matches a know value 
-*
-*	Return : service_info * - pointer to the service list node from the 
-*		service table whose event URL matches a known event URL;
-*
-*	Note :
-************************************************************************/
-service_info * FindServiceEventURLPath( service_table *table,
-					  char * eventURLPath
-					 );
 
-/************************************************************************
-*	Function :	FindServiceControlURLPath
-*
-*	Parameters :
-*		service_table * table ;	service table
-*		char * controlURLPath ;	control URL path used to find a service 
-*								from the table  
-*
-*	Description :	Traverses the service table and finds the node whose
-*		control URL Path matches a know value 
-*
-*	Return : service_info * - pointer to the service list node from the 
-*		service table whose control URL Path matches a known value;
-*
-*	Note :
-************************************************************************/
-service_info * FindServiceControlURLPath( service_table *table,
-					  const char * controlURLPath);
+/*!
+ * \brief Free's the memory allocated for storing the URL of the subscription.
+ */
+void freeSubscription(
+	/*! [in] Subscription object to be freed. */
+	subscription *sub);
 
-/************************************************************************
-*	Function :	printService
-*
-*	Parameters :
-*		service_info *service ;Service whose information is to be printed
-*		Upnp_LogLevel level ; Debug level specified to the print function
-*		Dbg_Module module ;	Debug module specified to the print function
-*
-*	Description :	For debugging purposes prints information from the 
-*		service passed into the function.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+
+/*!
+ * \brief Free's memory allocated for all the subscriptions in the service table.
+ */
+void freeSubscriptionList(
+	/*! [in] Head of the subscription list. */
+	subscription * head);
+
+
+/*!
+ * \brief Traverses through the service table and returns a pointer to the
+ * service node that matches a known service id and a known UDN.
+ *
+ * \return Pointer to the matching service_info node.
+ */
+service_info *FindServiceId(
+	/*! [in] Service table. */
+	service_table *table, 
+	/*! [in] String representing the service id to be found among those
+	 * in the table. */
+	const char *serviceId,
+	/*! [in] String representing the UDN to be found among those in the
+	 * table. */
+	const char *UDN);
+
+
+/*!
+ * \brief Traverses the service table and finds the node whose event URL Path
+ * matches a know value.
+ *
+ * \return Pointer to the service list node from the service table whose event
+ * URL matches a known event URL.
+ */
+service_info *FindServiceEventURLPath(
+	/*! [in] Service table. */
+	service_table *table,
+	/*! [in] Event URL path used to find a service from the table. */
+	char *eventURLPath);
+
+
+/*!
+ * \brief Traverses the service table and finds the node whose control URL Path
+ * matches a know value.
+ *
+ * \return Pointer to the service list node from the service table whose control
+ * URL Path matches a known value.
+ */
+service_info * FindServiceControlURLPath(
+	/*! [in] Service table. */
+	service_table *table,
+	/*! [in] Control URL path used to find a service from the table. */
+	const char *controlURLPath);
+
+
+/*!
+ * \brief For debugging purposes prints information from the service passed
+ * into the function.
+ */
 #ifdef DEBUG
 void printService(
+	/*! [in] Service whose information is to be printed. */
 	service_info *service,
+	/*! [in] Debug level specified to the print function. */
 	Upnp_LogLevel level,
+	/*! [in] Debug module specified to the print function. */
 	Dbg_Module module);
 #else
 static UPNP_INLINE void printService(
@@ -276,25 +234,18 @@ static UPNP_INLINE void printService(
 	Dbg_Module module) {}
 #endif
 
-/************************************************************************
-*	Function :	printServiceList
-*
-*	Parameters :
-*		service_info *service ;	Service whose information is to be printed
-*		Upnp_LogLevel level ;	Debug level specified to the print function
-*		Dbg_Module module ;	Debug module specified to the print function
-*
-*	Description :	For debugging purposes prints information of each 
-*		service from the service table passed into the function.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+
+/*!
+ * \brief For debugging purposes prints information of each service from the
+ * service table passed into the function.
+ */
 #ifdef DEBUG
 void printServiceList(
+	/*! [in] Service whose information is to be printed. */
 	service_info *service,
+	/*! [in] Debug level specified to the print function. */
 	Upnp_LogLevel level,
+	/*! [in] Debug module specified to the print function. */
 	Dbg_Module module);
 #else
 static UPNP_INLINE void printServiceList(
@@ -303,26 +254,18 @@ static UPNP_INLINE void printServiceList(
 	Dbg_Module module) {}
 #endif
 
-/************************************************************************
-*	Function :	printServiceTable
-*
-*	Parameters :
-*		service_table * table ;	Service table to be printed
-*		Upnp_LogLevel level ;	Debug level specified to the print function
-*		Dbg_Module module ;	Debug module specified to the print function
-*
-*	Description :	For debugging purposes prints the URL base of the table
-*		and information of each service from the service table passed into 
-*		the function.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+
+/*!
+ * \brief For debugging purposes prints the URL base of the table and information
+ * of each service from the service table passed into the function.
+ */
 #ifdef DEBUG
 void printServiceTable(
+	/*! [in] Service table to be printed. */
 	service_table *table,
+	/*! [in] Debug level specified to the print function. */
 	Upnp_LogLevel level,
+	/*! [in] Debug module specified to the print function. */
 	Dbg_Module module);
 #else
 static UPNP_INLINE void printServiceTable(
@@ -331,149 +274,105 @@ static UPNP_INLINE void printServiceTable(
 	Dbg_Module module) {}
 #endif
 
-/************************************************************************
-*	Function :	freeService
-*
-*	Parameters :
-*		service_info *in ;	service information that is to be freed
-*
-*	Description :	Free's memory allocated for the various components 
-*		of the service entry in the service table.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void freeService(service_info * in);
 
-/************************************************************************
-*	Function :	freeServiceList
-*
-*	Parameters :
-*		service_info * head ;	Head of the service list to be freed
-*
-*	Description :	Free's memory allocated for the various components 
-*		of each service entry in the service table.
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void freeServiceList(service_info * head);
+/*!
+ * \brief Free's memory allocated for the various components of the service
+ * entry in the service table.
+ */
+void freeService(
+	/*! [in] Service information that is to be freed. */
+	service_info *in);
 
 
-/************************************************************************
-*	Function :	freeServiceTable
-*
-*	Parameters :
-*		service_table * table ;	Service table whose memory needs to be 
-*								freed
-*
-*	Description : Free's dynamic memory in table.
-*		(does not free table, only memory within the structure)
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
-void freeServiceTable(service_table * table);
+/*!
+ * \brief Free's memory allocated for the various components of each service
+ * entry in the service table.
+ */
+void freeServiceList(
+	/*! [in] Head of the service list to be freed. */
+	service_info *head);
 
-/************************************************************************
-*	Function :	removeServiceTable
-*
-*	Parameters :
-*		IXML_Node *node ;	XML node information
-*		service_table *in ;	service table from which services will be 
-*							removed
-*
-*	Description :	This function assumes that services for a particular 
-*		root device are placed linearly in the service table, and in the 
-*		order in which they are found in the description document
-*		all services for this root device are removed from the list
-*
-*	Return : int ;
-*
-*	Note :
-************************************************************************/
-int removeServiceTable(IXML_Node *node,
+
+/*!
+ * \brief Free's dynamic memory in table (does not free table, only memory
+ * within the structure).
+ */
+void freeServiceTable(
+	/*! [in] Service table whose internal memory needs to be freed. */
+	service_table *table);
+
+
+/*!
+ * \brief This function assumes that services for a particular root device are
+ * placed linearly in the service table, and in the order in which they are
+ * found in the description document all services for this root device are
+ * removed from the list.
+ *
+ * \return An integer.
+ */
+int removeServiceTable(
+	/*! [in] XML node information. */
+	IXML_Node *node,
+	/*! [in] Service table from which services will be removed. */
 	service_table *in);
 
 
-/************************************************************************
-*	Function :	addServiceTable
-*
-*	Parameters :
-*		IXML_Node *node ;	XML node information 
-*		service_table *in ;	service table that will be initialized with 
-*							services
-*		const char *DefaultURLBase ; Default base URL on which the URL 
-*							will be returned to the service list.
-*
-*	Description :	Add Service to the table.
-*
-*	Return : int ;
-*
-*	Note :
-************************************************************************/
-int addServiceTable(IXML_Node *node, service_table *in, const char *DefaultURLBase);
+/*!
+ * \brief Add Service to the table.
+ */
+int addServiceTable(
+	/*! [in] XML node information. */
+	IXML_Node *node,
+	/*! [in] Service table that will be initialized with services. */
+	service_table *in,
+	/*! [in] Default base URL on which the URL will be returned to the
+	 * service list. */
+	const char *DefaultURLBase);
 
-/************************************************************************
-*	Function :	getServiceTable
-*
-*	Parameters :
-*		IXML_Node *node ;	XML node information
-*		service_table *out ;	output parameter which will contain the 
-*							service list and URL 
-*		const char *DefaultURLBase ; Default base URL on which the URL 
-*							will be returned.
-*
-*	Description :	Retrieve service from the table
-*
-*	Return : int ;
-*
-*	Note :
-************************************************************************/
-int getServiceTable(IXML_Node *node, service_table * out, const char * DefaultURLBase);
+
+/*!
+ * \brief Retrieve service from the table.
+ *
+ * \return An integer
+ */
+int getServiceTable(
+	/*! [in] XML node information. */
+	IXML_Node *node,
+	/*! [in] Output parameter which will contain the service list and URL. */
+	service_table *out,
+	/*! [in] Default base URL on which the URL will be returned. */
+	const char *DefaultURLBase);
 
 
 /*	Misc helper functions	*/
 
 
-/************************************************************************
-*	Function :	getElementValue
-*
-*	Parameters :
-*		IXML_Node *node ;	Input node which provides the list of child 
-*							nodes
-*
-*	Description :	Returns the clone of the element value
-*
-*	Return : DOMString ;
-*
-*	Note : value must be freed with DOMString_free
-************************************************************************/
-DOMString getElementValue(IXML_Node *node);
+/*!
+ * \brief Returns the clone of the element value.
+ *
+ * \note Value must be freed with DOMString_free.
+ *
+ * \return DOMString
+ */
+DOMString getElementValue(
+	/*! [in] Input node which provides the list of child nodes. */
+	IXML_Node *node);
 
-/************************************************************************
-*	Function :	getSubElement
-*
-*	Parameters :
-*		const char *element_name ;	sub element name to be searched for
-*		IXML_Node *node ;	Input node which provides the list of child 
-*							nodes
-*		IXML_Node **out ;	Ouput node to which the matched child node is
-*							returned.
-*
-*	Description :	Traverses through a list of XML nodes to find the 
-*		node with the known element name.
-*
-*	Return : int ;
-*		1 - On Success
-*		0 - On Failure
-*
-*	Note :
-************************************************************************/
-int getSubElement(const char *element_name, IXML_Node *node, 
+
+/*!
+ * \brief Traverses through a list of XML nodes to find the node with the
+ * known element name.
+ *
+ * \return
+ * 	\li 1 - On Success
+ * 	\li 0 - On Failure
+ */
+int getSubElement(
+	/*! [in] Sub element name to be searched for. */
+	const char *element_name,
+	/*! [in] Input node which provides the list of child nodes. */
+	IXML_Node *node, 
+	/*! [out] Ouput node to which the matched child node is returned. */
 	IXML_Node **out);
 
 
@@ -483,5 +382,5 @@ int getSubElement(const char *element_name, IXML_Node *node,
 }
 #endif
 
-#endif /* _SERVICE_TABLE */
+#endif /* SERVICE_TABLE */
 

upnp/src/inc/sock.h

@@ -1,44 +1,50 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
 
 #ifndef GENLIB_NET_SOCK_H
 #define GENLIB_NET_SOCK_H
 
+
 #include "util.h"
 
-#ifndef WIN32
+
+#ifdef WIN32
+	/* Do not #include <netinet/in.h> */
+#else
 	#include <netinet/in.h>
 #endif
 
-//Following variable is not defined under winsock.h
+
+/* Following variable is not defined under winsock.h */
 #ifndef SD_RECEIVE
 #define SD_RECEIVE      0x00
 #define SD_SEND         0x01
@@ -48,24 +54,25 @@
 
 typedef struct 
 {
-	int socket;		// handle/descriptor to a socket
-
-    // the following two fields are filled only in incoming requests;
-    struct in_addr foreign_ip_addr;
-    unsigned short foreign_ip_port;
+	/* handle/descriptor to a socket */
+	SOCKET socket;
 
+	/* the following two fields are filled only in incoming requests; */
+	struct sockaddr_storage foreign_sockaddr;
 } SOCKINFO;
 
+
 #ifdef __cplusplus
 #extern "C" {
 #endif
 
+
 /************************************************************************
 *	Function :	sock_init
 *
 *	Parameters :
 *		OUT SOCKINFO* info ;	Socket Information Object
-*		IN int sockfd ;			Socket Descriptor
+*		IN SOCKET sockfd ;	Socket Descriptor
 *
 *	Description :	Assign the passed in socket descriptor to socket 
 *		descriptor in the SOCKINFO structure.
@@ -76,16 +83,15 @@ typedef struct
 *		UPNP_E_SOCKET_ERROR
 *	Note :
 ************************************************************************/
-int sock_init( OUT SOCKINFO* info, IN int sockfd );
+int sock_init(OUT SOCKINFO* info, IN SOCKET sockfd);
 
 /************************************************************************
 *	Function :	sock_init_with_ip
 *
 *	Parameters :
 *		OUT SOCKINFO* info ;	Socket Information Object
-*		IN int sockfd ;						Socket Descriptor
-*		IN struct in_addr foreign_ip_addr ;	Remote IP Address
-*		IN unsigned short foreign_ip_port ;	Remote Port number
+*		IN SOCKET sockfd ;	Socket Descriptor
+*		IN struct sockaddr* foreign_sockaddr;	Remote socket address
 *
 *	Description :	Calls the sock_init function and assigns the passed in
 *		IP address and port to the IP address and port in the SOCKINFO
@@ -98,8 +104,10 @@ int sock_init( OUT SOCKINFO* info, IN int sockfd );
 *
 *	Note :
 ************************************************************************/
-int sock_init_with_ip( OUT SOCKINFO* info, IN int sockfd, 
-        IN struct in_addr foreign_ip_addr, IN unsigned short foreign_ip_port );
+int sock_init_with_ip(
+	OUT SOCKINFO* info,
+	IN SOCKET sockfd, 
+        IN struct sockaddr *foreign_sockaddr);
 
 /************************************************************************
 *	Function :	sock_read
@@ -162,11 +170,13 @@ int sock_write( IN SOCKINFO *info, IN char* buffer, IN size_t bufsize,
 *
 *	Note :
 ************************************************************************/
-int sock_destroy( INOUT SOCKINFO* info,int );
+int sock_destroy(INOUT SOCKINFO* info, int);
+
 
 #ifdef __cplusplus
-}	// #extern "C"
+}	/* #extern "C" */
 #endif
 
 
-#endif // GENLIB_NET_SOCK_H
+#endif /* GENLIB_NET_SOCK_H */
+

upnp/src/inc/ssdplib.h

@@ -1,59 +1,64 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
 
 #ifndef SSDPLIB_H
 #define SSDPLIB_H 
 
+#include "httpparser.h"
+#include "httpreadwrite.h"
+#include "miniserver.h"
+#include "UpnpInet.h"
+
+
 #include <sys/types.h>
 #include <signal.h>
 #include <setjmp.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "httpparser.h"
-#include "httpreadwrite.h"
-#include "miniserver.h"
-#ifndef WIN32
+
+
+#ifdef WIN32
+#else
 	#include <syslog.h>
 	#include <sys/socket.h>
- #include <netinet/in.h>
 	#include <netinet/in_systm.h>
 	#include <netinet/ip.h>
 	#include <netinet/ip_icmp.h>
 	#include <sys/time.h>
 	#include <arpa/inet.h>
-#else
-#include <winsock2.h>
 #endif
 
-//Enumeration to define all different types of ssdp searches
+
+/* Enumeration to define all different types of ssdp searches */
 typedef enum SsdpSearchType{
 	SSDP_SERROR=-1,
 	SSDP_ALL,SSDP_ROOTDEVICE,
@@ -63,8 +68,9 @@ typedef enum SsdpSearchType{
 } SType;
 
 
-//Enumeration to define all different type of ssdp messages
-typedef enum SsdpCmdType{SSDP_ERROR=-1,
+/* Enumeration to define all different type of ssdp messages */
+typedef enum SsdpCmdType{
+	SSDP_ERROR=-1,
 	SSDP_OK,
 	SSDP_ALIVE,
 	SSDP_BYEBYE,
@@ -75,16 +81,19 @@ typedef enum SsdpCmdType{SSDP_ERROR=-1,
 
 
 
-//Constant
+/* Constant */
 #define BUFSIZE   2500
 #define SSDP_IP   "239.255.255.250"
+#define SSDP_IPV6_LINKLOCAL "FF02::C"
+#define SSDP_IPV6_SITELOCAL "FF05::C"
 #define SSDP_PORT 1900
 #define NUM_TRY 3
 #define NUM_COPY 1
 #define THREAD_LIMIT 50
 #define COMMAND_LEN  300
 
-#ifndef X_USER_AGENT // can be overwritten by configure CFLAGS argument
+/* can be overwritten by configure CFLAGS argument */
+#ifndef X_USER_AGENT
 /** @name X_USER_AGENT
  *  The {\tt X_USER_AGENT} constant specifies the value of the X-User-Agent:
  *  HTTP header. The value "redsonic" is needed for the DSM-320. See
@@ -94,7 +103,7 @@ typedef enum SsdpCmdType{SSDP_ERROR=-1,
  #define X_USER_AGENT "redsonic"
 #endif
 
-//Error code
+/* Error code */
 #define NO_ERROR_FOUND    0
 #define E_REQUEST_INVALID  	-3
 #define E_RES_EXPIRED		-4
@@ -105,7 +114,7 @@ typedef enum SsdpCmdType{SSDP_ERROR=-1,
 
 
 
-//Structure to store the SSDP information
+/* Structure to store the SSDP information */
 typedef struct SsdpEventStruct
 {
   enum SsdpCmdType Cmd;
@@ -121,7 +130,7 @@ typedef struct SsdpEventStruct
   char Os[LINE_SIZE];
   char Ext[LINE_SIZE];
   char Date[LINE_SIZE];
-  struct sockaddr_in * DestAddr;
+  struct sockaddr *DestAddr;
   void * Cookie;
 } Event;
 
@@ -143,7 +152,7 @@ typedef struct TData
    int Mx;
    void * Cookie;
    char * Data;
-   struct sockaddr_in DestAddr;
+   struct sockaddr_storage DestAddr;
    
 }ThreadData;
 
@@ -151,7 +160,7 @@ typedef struct ssdpsearchreply
 {
   int MaxAge;
   UpnpDevice_Handle handle;
-  struct sockaddr_in dest_addr;
+  struct sockaddr_storage dest_addr;
   SsdpEvent event;
   
 }SsdpSearchReply;
@@ -168,21 +177,18 @@ typedef struct ssdpsearcharg
 typedef struct 
 {
   http_parser_t parser;
-  struct sockaddr_in dest_addr;
+  struct sockaddr_storage dest_addr;
 } ssdp_thread_data;
 
 
 /* globals */
 
-CLIENTONLY(extern SOCKET gSsdpReqSocket;);
+CLIENTONLY(extern SOCKET gSsdpReqSocket4;);
+CLIENTONLY(extern SOCKET gSsdpReqSocket6;);
 
 typedef int (*ParserFun)(char *, Event *);
 
 
-//void InitParser();
-
-//int AnalyzeCommand(char * szCommand, Event * Evt);
-
 /************************************************************************
 * Function : Make_Socket_NoBlocking
 *
@@ -214,11 +220,11 @@ int Make_Socket_NoBlocking (int sock);
 #ifdef INCLUDE_DEVICE_APIS
 void ssdp_handle_device_request(
 	IN http_message_t* hmsg, 
-	IN struct sockaddr_in* dest_addr );
+	IN struct sockaddr* dest_addr );
 #else
 static inline void ssdp_handle_device_request(
 	IN http_message_t* hmsg, 
-	IN struct sockaddr_in* dest_addr ) {}
+	IN struct sockaddr* dest_addr ) {}
 #endif
 
 /************************************************************************
@@ -226,7 +232,7 @@ static inline void ssdp_handle_device_request(
 *
 * Parameters:
 *	IN http_message_t* hmsg: SSDP message from the device
-*	IN struct sockaddr_in* dest_addr: Address of the device
+*	IN struct sockaddr* dest_addr: Address of the device
 *	IN xboolean timeout: timeout kept by the control point while sending 
 *		search message
 *	IN void* cookie: Cookie stored by the control point application. 
@@ -243,7 +249,7 @@ static inline void ssdp_handle_device_request(
 ***************************************************************************/
 void ssdp_handle_ctrlpt_msg(
 	IN http_message_t* hmsg, 
-	IN struct sockaddr_in* dest_addr,
+	IN struct sockaddr* dest_addr,
 	IN xboolean timeout,
 	IN void* cookie );
 
@@ -356,6 +362,7 @@ int SearchByTarget(IN int Mx, IN char *St, IN void *Cookie);
 *	IN char *Udn     :
 *	IN char *Location: Location URL.
 *	IN int Duration  : Service duration in sec.
+*	IN int AddressFamily: Device address family.
 *
 * Description:
 *	This function creates the device advertisement request based on
@@ -369,7 +376,8 @@ int DeviceAdvertisement(
 	IN int RootDev,
 	IN char *Udn, 
 	IN char *Location,
-	IN int Duration);
+	IN int Duration,
+	IN int AddressFamily);
 
 
 /************************************************************************
@@ -382,6 +390,7 @@ int DeviceAdvertisement(
 *	IN char *_Server:
 *	IN char *Location: Location URL
 *	IN int Duration :Device duration in sec.
+*	IN int AddressFamily: Device address family.
 *
 * Description:
 *	This function creates a HTTP device shutdown request packet 
@@ -396,13 +405,14 @@ int DeviceShutdown(
 	IN char *Udn, 
 	IN char *_Server, 
 	IN char *Location, 
-	IN int Duration);
+	IN int Duration,
+	IN int AddressFamily);
 
 /************************************************************************
 * Function : DeviceReply
 *
 * Parameters:	
-*	IN struct sockaddr_in * DestAddr:destination IP address.
+*	IN struct sockaddr *DestAddr: destination IP address.
 *	IN char *DevType: Device type
 *	IN int RootDev: 1 means root device 0 means embedded device.
 *	IN char *Udn: Device UDN
@@ -417,17 +427,18 @@ int DeviceShutdown(
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int DeviceReply(
-	IN struct sockaddr_in * DestAddr, 
+	IN struct sockaddr *DestAddr, 
 	IN char *DevType, 
 	IN int RootDev, 
 	IN char *Udn, 
-	IN char *Location, IN int  Duration);
+	IN char *Location, 
+	IN int  Duration);
 
 /************************************************************************
 * Function : SendReply
 *
 * Parameters:	
-*	IN struct sockaddr_in * DestAddr:destination IP address.
+*	IN struct sockaddr *DestAddr: destination IP address.
 *	IN char *DevType: Device type
 *	IN int RootDev: 1 means root device 0 means embedded device.
 *	IN char * Udn: Device UDN
@@ -444,7 +455,7 @@ int DeviceReply(
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int SendReply(
-	IN struct sockaddr_in * DestAddr, 
+	IN struct sockaddr *DestAddr, 
 	IN char *DevType, 
 	IN int RootDev, 
 	IN char *Udn, 
@@ -459,7 +470,8 @@ int SendReply(
 *	IN char * Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
-*	IN int Duration :Life time of this device.
+*	IN int Duration: Life time of this device.
+*	IN int AddressFamily: Device address family
 *
 * Description:
 *	This function creates the advertisement packet based 
@@ -472,13 +484,14 @@ int ServiceAdvertisement(
 	IN char *Udn, 
 	IN char *ServType,
 	IN char *Location,
-	IN int Duration);
+	IN int Duration,
+	IN int AddressFamily);
 
 /************************************************************************
 * Function : ServiceReply
 *
 * Parameters:	
-*	IN struct sockaddr_in *DestAddr:
+*	IN struct sockaddr *DestAddr:
 *	IN char *Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char *Server: Not used
@@ -493,7 +506,7 @@ int ServiceAdvertisement(
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int ServiceReply(
-	IN struct sockaddr_in *DestAddr,  
+	IN struct sockaddr *DestAddr,  
 	IN char *ServType, 
 	IN char *Udn, 
 	IN char *Location,
@@ -507,6 +520,7 @@ int ServiceReply(
 *	IN char *ServType: Service Type.
 *	IN char *Location: Location of Device description document.
 *	IN int Duration :Service duration in sec.
+*	IN int AddressFamily: Device address family
 *
 * Description:
 *	This function creates a HTTP service shutdown request packet 
@@ -519,7 +533,8 @@ int ServiceShutdown(
 	IN char *Udn,
 	IN char *ServType,
 	IN char *Location,
-	IN int Duration);
+	IN int Duration,
+	IN int AddressFamily);
 
 
 /************************************************************************
@@ -546,7 +561,7 @@ void *advertiseAndReplyThread(IN void * data);
 *			1 = Send Advertisement
 *	IN UpnpDevice_Handle Hnd: Device handle
 *	IN enum SsdpSearchType SearchType:Search type for sending replies
-*	IN struct sockaddr_in *DestAddr:Destination address
+*	IN struct sockaddr *DestAddr:Destination address
 *	IN char *DeviceType:Device type
 *	IN char *DeviceUDN:Device UDN
 *	IN char *ServiceType:Service type
@@ -562,10 +577,10 @@ int AdvertiseAndReply(
 	IN int AdFlag, 
 	IN UpnpDevice_Handle Hnd, 
 	IN enum SsdpSearchType SearchType, 
-	IN struct sockaddr_in *DestAddr,
+	IN struct sockaddr *DestAddr,
 	IN char *DeviceType, 
 	IN char *DeviceUDN, 
 	IN char *ServiceType, int Exp);
 
-#endif
+#endif /* SSDPLIB_H */
 

upnp/src/inc/sysdep.h

@@ -1,65 +1,90 @@
-  /*
-  ** Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-  ** Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. &
-  ** Digital Equipment Corporation, Maynard, Mass.
-  ** Copyright (c) 1998 Microsoft.
-  ** To anyone who acknowledges that this file is provided "AS IS"
-  ** without any express or implied warranty: permission to use, copy,
-  ** modify, and distribute this file for any purpose is hereby
-  ** granted without fee, provided that the above copyright notices and
-  ** this notice appears in all source code copies, and that none of
-  ** the names of Open Software Foundation, Inc., Hewlett-Packard
-  ** Company, or Digital Equipment Corporation be used in advertising
-  ** or publicity pertaining to distribution of the software without
-  ** specific, written prior permission.  Neither Open Software
-  ** Foundation, Inc., Hewlett-Packard Company, Microsoft, nor Digital Equipment
-  ** Corporation makes any representations about the suitability of
-  ** this software for any purpose.
+/*
+ * Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+ * Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. &
+ * Digital Equipment Corporation, Maynard, Mass.
+ * Copyright (c) 1998 Microsoft.
+ * To anyone who acknowledges that this file is provided "AS IS"
+ * without any express or implied warranty: permission to use, copy,
+ * modify, and distribute this file for any purpose is hereby
+ * granted without fee, provided that the above copyright notices and
+ * this notice appears in all source code copies, and that none of
+ * the names of Open Software Foundation, Inc., Hewlett-Packard
+ * Company, or Digital Equipment Corporation be used in advertising
+ * or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Neither Open Software
+ * Foundation, Inc., Hewlett-Packard Company, Microsoft, nor Digital Equipment
+ * Corporation makes any representations about the suitability of
+ * this software for any purpose.
  */
 
-#include <sys/types.h>
-#ifndef WIN32
- #include <sys/time.h>
-#endif
-//#include <sys/sysinfo.h>
+
+#ifndef SYSDEP_H
+#define SYSDEP_H
+
+
 #include "ithread.h"
 
+
 /* change to point to where MD5 .h's live */
 /* get MD5 sample implementation from RFC 1321 */
 #include "global.h"
 #include "md5.h"
 
+
+#include <sys/types.h>
+
+
+#ifdef WIN32
+	/* Do not #include <sys/time.h> */
+#else
+	#include <sys/time.h>
+#endif
+
+
 /* set the following to the number of 100ns ticks of the actual
    resolution of
    your system's clock */
 #define UUIDS_PER_TICK 1024
 
+
 /* Set the following to a call to acquire a system wide global lock
  */
 extern ithread_mutex_t gUUIDMutex;
 
+
 #define UUIDLock()      ithread_mutex_lock(&gUUIDMutex)
 #define UUIDUnlock()    ithread_mutex_unlock(&gUUIDMutex)
 
+
 typedef unsigned long   unsigned32;
 typedef unsigned short  unsigned16;
 typedef unsigned char   unsigned8;
 typedef unsigned char   byte;
 
+
 /* Set this to what your compiler uses for 64 bit data type */
-#ifndef WIN32
- #define unsigned64_t unsigned long long
-#else
+#ifdef WIN32
 	#define unsigned64_t __int64
+#else
+	#define unsigned64_t unsigned long long
 #endif
+
+
 #define I64(C) C##LL
 
+
 typedef unsigned64_t uuid_time_t;
+
+
 typedef struct {
 	char nodeID[6];
 } uuid_node_t;
 
+
 void get_ieee_node_identifier(uuid_node_t *node);
 void get_system_time(uuid_time_t *uuid_time);
-void get_random_info(char seed[16]);
+void get_random_info(unsigned char seed[16]);
+
+
+#endif /* SYSDEP_H */
 

upnp/src/inc/unixutil.h

@@ -1,46 +1,56 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+
+/* Unix-specific network utilities */
 
-// Unix-specific network utilities
 
 #ifndef GENLIB_NET_UNIXUTIL_H
 #define	GENLIB_NET_UNIXUTIL_H
 
-#include <sys/types.h>
-#ifndef WIN32
-	#include <sys/socket.h>
-#else
+
+#include "UpnpInet.h"
+
+
+#ifdef WIN32
 	typedef int socklen_t;
 	#define EAFNOSUPPORT 97
+#else
+	#include <arpa/inet.h>
+	#include <sys/socket.h>
+	#include <sys/time.h>
+	#include <sys/wait.h>
+	#include <unistd.h>
 #endif
 
-#endif // GENLIB_NET_UNIXUTIL_H
+
+#endif /* GENLIB_NET_UNIXUTIL_H */
 

upnp/src/inc/upnpapi.h

@@ -1,45 +1,47 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * * Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
 
-// File : upnpapi.h
 
-#ifndef UPNPDK_H
-#define UPNPDK_H
+#ifndef UPNPAPI_H
+#define UPNPAPI_H
+
+
+/*!
+ * \file
+ */
+
 
-#include "upnp.h"
 #include "client_table.h"
-
-//#include "../ssdp/ssdplib.h"
-
-
+#include "upnp.h"
+#include "VirtualDir.h"		/* for struct VirtualDirCallbacks */
 
 
 #define MAX_INTERFACES 256
@@ -48,8 +50,6 @@
 
 #define DEV_LIMIT 200
 
-#define NUM_HANDLE 200
-
 #define DEFAULT_MX 5
 
 #define DEFAULT_MAXAGE 1800
@@ -59,80 +59,145 @@
 
 extern size_t g_maxContentLength;
 
-// 30-second timeout
+/* 30-second timeout */
 #define UPNP_TIMEOUT	30
 
 typedef enum {HND_INVALID=-1,HND_CLIENT,HND_DEVICE} Upnp_Handle_Type;
 
-// Data to be stored in handle table for
+/* Data to be stored in handle table for */
 struct Handle_Info
 {
+	/*! . */
 	Upnp_Handle_Type HType;
-    Upnp_FunPtr  Callback; // Callback function pointer.
-    char * Cookie;
+	/*! Callback function pointer. */
+	Upnp_FunPtr  Callback;
+	/*! . */
+	char *Cookie;
+	/*! 0 = not installed; otherwise installed. */
+	int   aliasInstalled;
 
-    // Device Only
+	/* Device Only */
 #ifdef INCLUDE_DEVICE_APIS
-    char  DescURL[LINE_SIZE];   // URL for the use of SSDP
-    char  DescXML[LINE_SIZE];   // XML file path for device 
-                                //description
-
-    int MaxAge;                 // Advertisement timeout
-    IXML_Document *DescDocument;// Description parsed in 
-                                //terms of DOM document 
-    IXML_NodeList *DeviceList;  // List of devices in the 
-                                //description document
-    IXML_NodeList *ServiceList; // List of services in the 
-                                // description document
-    service_table ServiceTable; //table holding subscriptions and 
-                                //URL information
+	/*! URL for the use of SSDP. */
+	char  DescURL[LINE_SIZE];
+	/*! XML file path for device description. */
+	char  DescXML[LINE_SIZE];
+	/* Advertisement timeout */
+	int MaxAge;
+	/*! Description parsed in terms of DOM document. */
+	IXML_Document *DescDocument;
+	/*! List of devices in the description document. */
+	IXML_NodeList *DeviceList;
+	/*! List of services in the description document. */
+	IXML_NodeList *ServiceList;
+	/*! Table holding subscriptions and URL information. */
+	service_table ServiceTable;
+	/*! . */
 	int MaxSubscriptions;
+	/*! . */
 	int MaxSubscriptionTimeOut;
+	/*! Address family: AF_INET or AF_INET6. */
+	int DeviceAf;
 #endif
 
-    // Client only
+	/* Client only */
 #ifdef INCLUDE_CLIENT_APIS
-    client_subscription *ClientSubList; //client subscription list
-    LinkedList SsdpSearchList; // active ssdp searches   
+	/*! Client subscription list. */
+	ClientSubscription *ClientSubList;
+	/*! Active SSDP searches. */
+	LinkedList SsdpSearchList;
 #endif
-    int   aliasInstalled;       // 0 = not installed; otherwise installed
 };
 
+
 extern ithread_rwlock_t GlobalHndRWLock;
-Upnp_Handle_Type GetHandleInfo(int Hnd, struct Handle_Info **HndInfo); 
+
+
+/*!
+ * \brief Get handle information.
+ *
+ * \return HND_DEVICE, UPNP_E_INVALID_HANDLE
+ */
+Upnp_Handle_Type GetHandleInfo(
+	/*! handle pointer (key for the client handle structure). */
+	int Hnd,
+	/*! handle structure passed by this function. */
+	struct Handle_Info **HndInfo); 
+
 
 #define HandleLock() HandleWriteLock()
 
+
 #define HandleWriteLock()  \
 	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying a write lock"); \
 	ithread_rwlock_wrlock(&GlobalHndRWLock); \
 	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Write lock acquired");
 
+
 #define HandleReadLock()  \
 	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying a read lock"); \
 	ithread_rwlock_rdlock(&GlobalHndRWLock); \
 	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Read lock acquired");
 
+
 #define HandleUnlock() \
 	UpnpPrintf(UPNP_INFO, API,__FILE__, __LINE__, "Trying Unlock"); \
 	ithread_rwlock_unlock(&GlobalHndRWLock); \
 	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Unlocked rwlock");
 
-Upnp_Handle_Type GetClientHandleInfo(int *client_handle_out, 
+
+/*!
+ * \brief Get client handle info.
+ *
+ * \note The logic around the use of this function should be revised.
+ *
+ * \return HND_CLIENT, HND_INVALID
+ */
+Upnp_Handle_Type GetClientHandleInfo(
+	/*! [in] client handle pointer (key for the client handle structure). */
+	int *client_handle_out, 
+	/*! [out] Client handle structure passed by this function. */
 	struct Handle_Info **HndInfo);
-Upnp_Handle_Type GetDeviceHandleInfo(int *device_handle_out, 
+/*!
+ * \brief Retrieves the device handle and information of the first device of
+ * 	the address family spcified.
+ *
+ * \return HND_DEVICE or HND_INVALID
+ */
+Upnp_Handle_Type GetDeviceHandleInfo(
+	/*! [in] Address family. */
+	const int AddressFamily,
+	/*! [out] Device handle pointer. */
+	int *device_handle_out, 
+	/*! [out] Device handle structure passed by this function. */
 	struct Handle_Info **HndInfo);
 
 
-extern char LOCAL_HOST[LINE_SIZE];
+extern char gIF_NAME[LINE_SIZE];
+/*! INET_ADDRSTRLEN. */
+extern char gIF_IPV4[22];
+/*! INET6_ADDRSTRLEN. */
+extern char gIF_IPV6[65];
+
+extern char gIF_IPV6_ULA_GUA[INET6_ADDRSTRLEN];
+
+extern int  gIF_INDEX;
+
+
+extern unsigned short LOCAL_PORT_V4;
+extern unsigned short LOCAL_PORT_V6;
+
+
+/*! NLS uuid. */
+extern Upnp_SID gUpnpSdkNLSuuid;
 
-extern unsigned short LOCAL_PORT;
 
 extern TimerThread gTimerThread;
 extern ThreadPool gRecvThreadPool;
 extern ThreadPool gSendThreadPool;
 extern ThreadPool gMiniServerThreadPool;
 
+
 typedef enum {
 	SUBSCRIBE,
 	UNSUBSCRIBE,
@@ -143,7 +208,9 @@ typedef enum {
 	DEVDESCRIPTION,
 	SERVDESCRIPTION,
 	MINI,
-    RENEW} UpnpFunName;
+	RENEW
+} UpnpFunName;
+
 
 struct  UpnpNonblockParam 
 {
@@ -167,26 +234,81 @@ struct  UpnpNonblockParam
 
 
 extern virtualDirList *pVirtualDirList;
-extern struct UpnpVirtualDirCallbacks virtualDirCallback;
+extern struct VirtualDirCallbacks virtualDirCallback;
 
 
-typedef enum { WEB_SERVER_DISABLED, WEB_SERVER_ENABLED } WebServerState;
+typedef enum {
+	WEB_SERVER_DISABLED,
+	WEB_SERVER_ENABLED
+} WebServerState;
+
 
 #define E_HTTP_SYNTAX -6
 
-void InitHandleList();
-int GetFreeHandle();
-int FreeHandle(int Handle);
+
+/*!
+ * \brief Retrieve interface information and keep it in global variables.
+ * If NULL, we'll find the first suitable interface for operation.
+ *
+ * The interface must fulfill these requirements:
+ * \li Be UP.
+ * \li Not be LOOPBACK.
+ * \li Support MULTICAST.
+ * \li Have a valid IPv4 or IPv6 address.
+ *
+ * We'll retrieve the following information from the interface:
+ * \li gIF_NAME -> Interface name (by input or found).
+ * \li gIF_IPV4 -> IPv4 address (if any).
+ * \li gIF_IPV6 -> IPv6 address (if any).
+ * \li gIF_IPV6_ULA_GUA -> ULA or GUA IPv6 address (if any)
+ * \li gIF_INDEX -> Interface index number.
+ *
+ * \return UPNP_E_SUCCESS on success.
+ */
+int UpnpGetIfInfo(
+	/*! [in] Interface name (can be NULL). */
+	const char *IfName);
+
+
 void UpnpThreadDistribution(struct UpnpNonblockParam * Param);
 
 
-void AutoAdvertise(void *input); 
-int getlocalhostname(char *out);
+/*!
+ * \brief This function is a timer thread scheduled by UpnpSendAdvertisement
+ * to the send advetisement again.
+ */
+void AutoAdvertise(
+	/*! [in] Information provided to the thread. */
+	void *input); 
+
+
+/*!
+ * \brief Get local IP address.
+ *
+ * Gets the ip address for the DEFAULT_INTERFACE interface which is up and not
+ * a loopback. Assumes at most MAX_INTERFACES interfaces
+ *
+ * \return UPNP_E_SUCCESS  if successful or UPNP_E_INIT.
+ */
+int getlocalhostname(
+	/*! [out] IP address of the interface. */
+	char *out,
+	/*! [in] Length of the output buffer. */
+	const int out_len);
+
+
+/*!
+ * \brief Print handle info.
+ *	
+ * \return UPNP_E_SUCCESS if successful, otherwise returns appropriate error.
+ */
+int PrintHandleInfo(
+	/*! [in] Handle index. */
+	UpnpClient_Handle Hnd);
+
 
 extern WebServerState bWebServerState;
 
-#endif
 
+#endif /* UPNPAPI_H */
 
-
-/************************ END OF upnpapi.h **********************/

upnp/src/inc/urlconfig.h

@@ -1,84 +1,90 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
+/**************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * - Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * - Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * - Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ **************************************************************************/
+
 
 #ifndef URLCONFIG_H
 #define URLCONFIG_H
-#ifndef WIN32
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
+
+
+#include "UpnpInet.h"
+
+
+#ifdef WIN32
 #else
- #include <winsock2.h>
+	#include <arpa/inet.h>
+	#include <sys/socket.h>
 #endif
 
-// functions available only if the web server is included 
+
+/* functions available only if the web server is included */
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 /************************************************************************
-*	Function :	configure_urlbase
-*
-*	Parameters :
-*		INOUT IXML_Document *doc ;	IXML Description document
-*		IN const struct sockaddr_in* serverAddr ;	socket address object
-*					providing the IP address and port information
-*		IN const char* alias ;	string containing the alias
-*		IN time_t last_modified ;	time when the XML document was 
-*					downloaded
-*		OUT char docURL[LINE_SIZE] ;	buffer to hold the URL of the 
-*					document.
-*
-*	Description : Configure the full URL for the description document.
-*		Create the URL document and add alias, description information.
-*		The doc is added to the web server to be served using the given 
-*		alias.
-*
-*	Return : int ;
-*		UPNP_E_SUCCESS - On Success
-*		UPNP_E_OUTOF_MEMORY - Default Error
-*
-*	Note :
-****************************************************************************/
+ * Function: configure_urlbase
+ * 
+ * Parameters :
+ * 	INOUT IXML_Document *doc ;	IXML Description document
+ * 	IN const struct sockaddr *serverAddr;	socket address object
+ * 		providing the IP address and port information
+ * 	IN const char* alias ;		string containing the alias
+ * 	IN time_t last_modified ;	time when the XML document was 
+ * 		downloaded
+ * 	OUT char docURL[LINE_SIZE] ;	buffer to hold the URL of the 
+ * 		document.
+ * 
+ * Description : Configure the full URL for the description document.
+ * 	Create the URL document and add alias, description information.
+ * 	The doc is added to the web server to be served using the given 
+ * 	alias.
+ * 
+ * Return : int ;
+ * 	UPNP_E_SUCCESS - On Success
+ * 	UPNP_E_OUTOF_MEMORY - Default Error
+ ****************************************************************************/
 int configure_urlbase( INOUT IXML_Document *doc,
-    IN const struct sockaddr_in* serverAddr,
+	IN const struct sockaddr* serverAddr,
 	IN const char* alias,
 	IN time_t last_modified,
-    OUT char docURL[LINE_SIZE] );
+	OUT char docURL[LINE_SIZE]);
 
 
 #ifdef __cplusplus
-} // extern C
+} /* extern C */
 #endif
 
+
 #endif /* URLCONFIG_H */
 

upnp/src/inc/util.h

@@ -31,19 +31,22 @@
 
 #ifndef UTIL_H
 #define UTIL_H
+
+
 #include "upnp.h"
 
+
 // usually used to specify direction of parameters in functions
 #ifndef IN
-#define IN
+	#define IN
 #endif
 
 #ifndef OUT
-#define OUT
+	#define OUT
 #endif
 
 #ifndef INOUT
-#define INOUT
+	#define INOUT
 #endif
 
 
@@ -52,23 +55,18 @@
 #define EVENT_TERMINATE	-3
 
 
-#ifndef WIN32
- #define max(a, b)   (((a)>(b))? (a):(b))
- #define min(a, b)   (((a)<(b))? (a):(b))
-#endif
-
-
 // boolean type in C
 typedef char xboolean;
 
 #ifndef TRUE
-#define TRUE 1
+	#define TRUE 1
 #endif
 
 #ifndef FALSE
-#define FALSE 0
+	#define FALSE 0
 #endif
 
+
 ///////////////////////////
 // funcs
 
@@ -76,58 +74,62 @@ typedef char xboolean;
 extern "C" {
 #endif
 
+/************************************************************************
+ * Function: logerror
+ *
+ * Parameters:
+ * 	IN const char *fmt;	format string
+ *
+ * Description: Log an error message.
+ *
+ * Return: void
+ ************************************************************************/
 void log_error( IN const char *fmt, ... );
 
 /************************************************************************
-*	Function :	linecopy
-*
-*	Parameters :
-*		OUT char dest[LINE_SIZE] ;	output buffer
-*		IN const char* src ;	input buffer
-*
-*	Description : Copy no of bytes spcified by the LINE_SIZE constant, 
-*		from the source buffer. Null terminate the destination buffer
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+ * Function: linecopy
+ *
+ * Parameters:
+ *	OUT char dest[LINE_SIZE];	output buffer
+ *	IN const char *src;		input buffer
+ *
+ * Description: Copy no of bytes spcified by the LINE_SIZE constant, 
+ *	from the source buffer. Null terminate the destination buffer.
+ *
+ * Return: void
+ ************************************************************************/
 void linecopy( OUT char dest[LINE_SIZE], IN const char* src );
 
 /************************************************************************
-*	Function :	namecopy
-*
-*	Parameters :
-*		OUT char dest[NAME_SIZE] ;	output buffer
-*		IN const char* src ;	input buffer
-*
-*	Description : Copy no of bytes spcified by the NAME_SIZE constant, 
-*		from the source buffer. Null terminate the destination buffer
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+ * Function: namecopy
+ *
+ * Parameters:
+ * 	OUT char dest[NAME_SIZE];	output buffer
+ * 	IN const char *src;		input buffer
+ *
+ * Description: Copy no of bytes spcified by the NAME_SIZE constant, 
+ * 	from the source buffer. Null terminate the destination buffer
+ *
+ * Return: void
+ ************************************************************************/
 void namecopy( OUT char dest[NAME_SIZE], IN const char* src );
 
 /************************************************************************
-*	Function :	linecopylen
-*
-*	Parameters :
-*		OUT char dest[LINE_SIZE] ;	output buffer
-*		IN const char* src ;	input buffer
-*		IN size_t srclen ;	bytes to be copied.
-*
-*	Description : Determine if the srclen passed in paramter is less than 
-*		the permitted LINE_SIZE. If it is use the passed parameter, if not
-*		use the permitted LINE_SIZE as the length parameter
-*		Copy no of bytes spcified by the LINE_SIZE constant, 
-*		from the source buffer. Null terminate the destination buffer
-*
-*	Return : void ;
-*
-*	Note :
-************************************************************************/
+ * Function:	linecopylen
+ *
+ * Parameters:
+ *	OUT char dest[LINE_SIZE];	output buffer
+ *	IN const char *src;		input buffer
+ *	IN size_t srclen;		bytes to be copied.
+ *
+ * Description : Determine if the srclen passed in paramter is less than 
+ *	the permitted LINE_SIZE. If it is use the passed parameter, if not
+ *	use the permitted LINE_SIZE as the length parameter
+ *	Copy no of bytes spcified by the LINE_SIZE constant, 
+ *	from the source buffer. Null terminate the destination buffer
+ *
+ * Return: void
+ ************************************************************************/
 void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen );
 
 
@@ -135,6 +137,9 @@ void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen
 } // extern C
 #endif
 
+/* Size of the errorBuffer variable, passed to the strerror_r() function */
+#define ERROR_BUFFER_LEN 256
+
 //////////////////////////////////
 // C specific
 #ifndef __cplusplus
@@ -155,9 +160,14 @@ void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen
 
 	#define sleep(a)		Sleep((a)*1000)
 	#define usleep(a)		Sleep((a)/1000)
-#endif
+
+	#define strerror_r(a,b,c)	(strerror_s((b),(c),(a)))
+#else
+	#define max(a, b)   (((a)>(b))? (a):(b))
+	#define min(a, b)   (((a)<(b))? (a):(b))
+#endif /* WIN32 */
 
 #endif // __cplusplus
 
-#endif /* GENLIB_UTIL_UTIL_H */
+#endif /* UTIL_H */
 

upnp/src/inc/uuid.h

@@ -1,50 +1,90 @@
-  /*
-  ** Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
-  ** Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. &
-  ** Digital Equipment Corporation, Maynard, Mass.
-  ** Copyright (c) 1998 Microsoft.
-  ** To anyone who acknowledges that this file is provided "AS IS"
-  ** without any express or implied warranty: permission to use, copy,
-  ** modify, and distribute this file for any purpose is hereby
-  ** granted without fee, provided that the above copyright notices and
-  ** this notice appears in all source code copies, and that none of
-  ** the names of Open Software Foundation, Inc., Hewlett-Packard
-  ** Company, or Digital Equipment Corporation be used in advertising
-  ** or publicity pertaining to distribution of the software without
-  ** specific, written prior permission.  Neither Open Software
-  ** Foundation, Inc., Hewlett-Packard Company, Microsoft, nor Digital Equipment
-  ** Corporation makes any representations about the suitability of
-  ** this software for any purpose.
+/*
+ * Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
+ * Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. &
+ * Digital Equipment Corporation, Maynard, Mass.
+ * Copyright (c) 1998 Microsoft.
+ * To anyone who acknowledges that this file is provided "AS IS"
+ * without any express or implied warranty: permission to use, copy,
+ * modify, and distribute this file for any purpose is hereby
+ * granted without fee, provided that the above copyright notices and
+ * this notice appears in all source code copies, and that none of
+ * the names of Open Software Foundation, Inc., Hewlett-Packard
+ * Company, or Digital Equipment Corporation be used in advertising
+ * or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Neither Open Software
+ * Foundation, Inc., Hewlett-Packard Company, Microsoft, nor Digital Equipment
+ * Corporation makes any representations about the suitability of
+ * this software for any purpose.
  */
 
-  typedef struct _uuid_upnp {
+
+#include "sysdep.h"
+
+
+/*! . */
+typedef struct _uuid_upnp {
+	/*! . */
 	unsigned32 time_low;
+	/*! . */
 	unsigned16 time_mid;
+	/*! . */
 	unsigned16 time_hi_and_version;
+	/*! . */
 	unsigned8 clock_seq_hi_and_reserved;
+	/*! . */
 	unsigned8 clock_seq_low;
+	/*! . */
 	byte node[6];
-  } uuid_upnp;
+} uuid_upnp;
 
-  /* uuid_create -- generate a UUID */
-  int uuid_create(uuid_upnp * id);
-  void uuid_unpack(uuid_upnp *u, char *out);	// out will be xxxx-xx-xx-xx-xxxxxx format
 
-  /* uuid_create_from_name -- create a UUID using a "name"
-     from a "name space" */
-  void uuid_create_from_name(
-    uuid_upnp * uid,        /* resulting UUID */
-    uuid_upnp nsid,          /* UUID to serve as context, so identical
-                             names from different name spaces generate
-                             different UUIDs */
-    void * name,          /* the name from which to generate a UUID */
-    int namelen           /* the length of the name */
-  );
-
-  /* uuid_compare --  Compare two UUID's "lexically" and return
-          -1   u1 is lexically before u2
-           0   u1 is equal to u2
-           1   u1 is lexically after u2
-     Note:   lexical ordering is not temporal ordering!
+/*!
+ * \brief Generate a UUID.
  */
-  int uuid_compare(uuid_upnp *u1, uuid_upnp *u2);
+int uuid_create(
+	/*! . */
+	uuid_upnp * id);
+
+
+/*!
+ * \brief Out will be xxxx-xx-xx-xx-xxxxxx format.
+ */
+void uuid_unpack(
+	/*! . */
+	uuid_upnp *u,
+	/*! . */
+	char *out);
+
+
+/*!
+ * \brief Create a UUID using a "name" from a "name space"
+ */
+void uuid_create_from_name(
+	/*! Resulting UUID. */
+	uuid_upnp *uid,
+	/*! UUID to serve as context, so identical names from different name
+	 * spaces generate different UUIDs. */
+	uuid_upnp nsid,
+	/*! The name from which to generate a UUID. */
+	void *name,
+	/*! The length of the name. */
+	int namelen
+);
+
+
+/*!
+ * \brief Compare two UUID's "lexically".
+ *
+ * \return
+ *	-1   u1 is lexically before u2
+ *	 0   u1 is equal to u2
+ *	 1   u1 is lexically after u2
+ *
+ * \note Lexical ordering is not temporal ordering!
+ */
+int uuid_compare(
+	/*! . */
+	uuid_upnp *u1,
+	/*! . */
+	uuid_upnp *u2);
+