Creation of the tag for release-1.6.6.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/tags/release-1.6.6@352 119443c7-1b9e-41f8-b6fc-b9c35fce742c

ChangeLog

@@ -1,507 +1,3 @@
-*******************************************************************************
-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
 *******************************************************************************
@@ -723,7 +219,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éphane Corthésy (davelopper),
+	* Merge of Mac OS X patch from St<EFBFBD>phane Corth<EFBFBD>sy (davelopper),
 	SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
 	Some of the proposed changes were already done by Rene Hexel's patch.
 
@@ -1147,14 +643,14 @@ Version 1.4.0
 FORK FROM DEAD libupnp
 *******************************************************************************
 
-2006-04-29  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-29  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-08  R<EFBFBD>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 
@@ -1165,20 +661,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émi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-03  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/Makefile.am: install upnp samples in $(docdir)/examples
 
-2006-03-28  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-28  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-27  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/test: add simple test suite for xml parser
 
-2006-03-26  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-26  R<EFBFBD>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
@@ -1189,18 +685,18 @@ FORK FROM DEAD libupnp
 	  option, and move samples compilation from check_PROGRAMS to
 	  noinst_PROGRAMS
 
-2006-03-25  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-25  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-21  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/test/test_init.c: add some version checks and exit if failure
 
-2006-03-05  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-05  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* libupnp version 1.3.1
 
@@ -1215,11 +711,11 @@ FORK FROM DEAD libupnp
 	  dependencies between upnp and ixml / threadutil, so that programs 
 	  linking against upnp only still work.
 
-2006-03-04  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-04  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* libupnp version 1.3.0
 
-2006-03-03  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-03  R<EFBFBD>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
@@ -1227,7 +723,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émi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-28  R<EFBFBD>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
@@ -1236,7 +732,7 @@ FORK FROM DEAD libupnp
 	  the librarie LDFLAGS in order to export only the symbols defined 
 	  in the API
 
-2006-02-27  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-27  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add libtool versions for the 3 libraries
 
@@ -1244,7 +740,7 @@ FORK FROM DEAD libupnp
 
 	* threadutil/src/ThreadPool.c (SetSeed): add missing 'static' 
 
-2006-02-26  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-26  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/inc/iasnprintf.h: add gcc __printf__ format attribute
 	  to "iasnprintf"
@@ -1265,11 +761,11 @@ FORK FROM DEAD libupnp
 	  the configuration of the installed libraries (generates installed
 	  file <upnp/upnpconfig.h>)
 
-2006-02-22  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-22  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/ : add missing include of config.h in some .c files
 
-2006-02-21  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-21  R<EFBFBD>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"
@@ -1277,12 +773,12 @@ FORK FROM DEAD libupnp
 	* import all modifications below from libupnp in djmount 0.51
 	  into official libupnp
 	
-2006-01-17  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-17  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/Makefile.am (libthreadutil_la_SOURCES): remove extraneous
 	  file
 
-2006-01-15  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-15  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add checks for large-file support
 
@@ -1302,53 +798,53 @@ FORK FROM DEAD libupnp
 	* ixml/src/node.c (ixmlNode_getNodeType): fix compilation warning
 	  on const return type
 
-2006-01-12  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-12  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/inc/readwrite.h : suppress unused C++ header file
 
-2006-01-11  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-11  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-12-05  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-11-01  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-18  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-16  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/src/Makefile (clean): remove built library
 
-2005-08-28  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-28  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-02  R<EFBFBD>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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-06-09  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/element.c (ixmlElement_removeAttributeNode): 
 	  remove some compilation warning
@@ -1359,7 +855,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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-28  R<EFBFBD>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)
@@ -1380,7 +876,7 @@ FORK FROM DEAD libupnp
 	* upnp/src/genlib/net/http/httpreadwrite.c : corrected an incorrect
 	  sprintf format
 	
-2005-05-27  Rémi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-27  R<EFBFBD>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/makefile, upnp/src/makefile, 
 	  ixml/Makefile, ixml/src/Makefile, 
@@ -1388,7 +884,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émi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-26  R<EFBFBD>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.6.7
+PROJECT_NUMBER         = 1.4.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    = YES
+ALWAYS_DETAILED_SEC    = NO
 
 # 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          = YES
+INTERNAL_DOCS          = NO
 
 # 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        = YES
+MACRO_EXPANSION        = NO
 
 # 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             = DEBUG UPNP_HAVE_TOOLS INCLUDE_DEVICE_APIS INCLUDE_CLIENT_APIS EXCLUDE_GENA=0 EXCLUDE_DOM=0
+PREDEFINED             = 
 
 # 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émi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 ACLOCAL_AMFLAGS = -I m4
@@ -16,7 +16,6 @@ SUBDIRS = \
 
 
 EXTRA_DIST = \
-	Doxyfile \
 	libupnp.pc.in \
 	LICENSE \
 	THANKS \
@@ -28,22 +27,7 @@ EXTRA_DIST = \
 	build/inc/autoconfig.h \
 	build/inc/config.h \
 	build/inc/upnpconfig.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 
+	build/msvc/inttypes.h
 
 
 # This variable must have 'exec' in its name, in order to be installed 

THANKS

@@ -8,15 +8,12 @@ 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
@@ -40,15 +37,12 @@ exempt of errors.
 - 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/vc8/ixml.vcproj

@@ -1,217 +1,223 @@
-<?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>
+<?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"
+				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"
+			/>
+			<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="..\..\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\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\src\inc\ixmlmembuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlparser.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/libupnp.vcproj

@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="libupnp"
 	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
-	RootNamespace="libupnp"
 	>
 	<Platforms>
 		<Platform
@@ -16,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -49,19 +48,18 @@
 				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"
+				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"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libupnp.pch"
-				AssemblerListingLocation="$(OutDir)\"
-				ObjectFile="$(OutDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -76,8 +74,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib  iphlpapi.lib"
-				OutputFile="$(OutDir)\libupnp.dll"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
+				OutputFile=".\Release/libupnp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/libupnp.pdb"
@@ -146,7 +144,7 @@
 				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"
+				PreprocessorDefinitions="DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -158,7 +156,6 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -173,11 +170,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
 				OutputFile="$(OutDir)\libupnp.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)\..\ixml"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
 				ImportLibrary="$(OutDir)\libupnp.lib"
@@ -218,14 +214,6 @@
 			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"
 				>
@@ -234,10 +222,6 @@
 				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\Discovery.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\document.c"
 				>
@@ -246,18 +230,6 @@
 				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"
 				>
@@ -358,10 +330,6 @@
 				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"
 				>
@@ -370,22 +338,10 @@
 				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"
 				>
@@ -410,10 +366,6 @@
 				RelativePath="..\..\upnp\src\api\upnpdebug.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\UpnpString.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\api\upnptools.c"
 				>
@@ -447,14 +399,6 @@
 			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"
 				>
@@ -463,22 +407,6 @@
 				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"
 				>
@@ -551,10 +479,6 @@
 				RelativePath="..\..\upnp\src\inc\sock.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\ssdplib.h"
 				>
@@ -563,14 +487,6 @@
 				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"
 				>
@@ -579,10 +495,6 @@
 				RelativePath="..\..\upnp\src\inc\strintmap.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\sysdep.h"
 				>
@@ -591,10 +503,6 @@
 				RelativePath="..\..\upnp\src\inc\unixutil.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\upnp.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
 				>
@@ -611,14 +519,6 @@
 				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"
 				>
@@ -644,6 +544,11 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="resources"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
 		<File
 			RelativePath="..\..\..\..\libupnp_win32.patch"
 			>

build/vc9/ixml.vcproj

@@ -20,7 +20,7 @@
 			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,8 +40,8 @@
 			<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"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc"
+				PreprocessorDefinitions="DEBUG;WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -78,10 +78,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="0"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -103,8 +103,6 @@
 				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"
@@ -120,11 +118,18 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -134,6 +139,9 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -163,10 +171,6 @@
 				RelativePath="..\..\ixml\src\ixml.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmldebug.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\ixmlmembuf.c"
 				>
@@ -197,10 +201,6 @@
 				RelativePath="..\..\ixml\inc\ixml.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\ixml\inc\ixmldebug.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
 				>
@@ -210,6 +210,12 @@
 				>
 			</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>

build/vc9/libupnp.sln

@@ -1,29 +1,35 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 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}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+	EndProjectSection
 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}
+		{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}") = "tvdevice", "tvdevice.vcproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{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}") = "tvcombo", "tvcombo.vcproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
 	EndProjectSection
 EndProject
 Global

build/vc9/libupnp.vcproj

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="libupnp"
 	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
-	RootNamespace="libupnp"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -17,13 +16,13 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -51,9 +50,9 @@
 				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"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libupnp.pch"
 				AssemblerListingLocation=".\Release/"
@@ -76,7 +75,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
 				OutputFile=".\Release/libupnp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -118,7 +117,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -145,10 +144,10 @@
 				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"
+				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="$(OutDir)\libupnp.pch"
 				AssemblerListingLocation="$(OutDir)\"
 				ObjectFile="$(OutDir)\"
@@ -171,7 +170,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib $(TargetDir)..\ixml\ixml.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
 				OutputFile="$(OutDir)\libupnp.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -214,14 +213,6 @@
 			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"
 				>
@@ -230,10 +221,6 @@
 				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\Discovery.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\document.c"
 				>
@@ -242,18 +229,6 @@
 				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"
 				>
@@ -354,10 +329,6 @@
 				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"
 				>
@@ -366,22 +337,10 @@
 				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"
 				>
@@ -406,10 +365,6 @@
 				RelativePath="..\..\upnp\src\api\upnpdebug.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\UpnpString.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\api\upnptools.c"
 				>
@@ -443,14 +398,6 @@
 			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"
 				>
@@ -459,22 +406,6 @@
 				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"
 				>
@@ -547,10 +478,6 @@
 				RelativePath="..\..\upnp\src\inc\sock.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\ssdplib.h"
 				>
@@ -559,14 +486,6 @@
 				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"
 				>
@@ -575,10 +494,6 @@
 				RelativePath="..\..\upnp\src\inc\strintmap.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\sysdep.h"
 				>
@@ -587,10 +502,6 @@
 				RelativePath="..\..\upnp\src\inc\unixutil.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\upnp.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
 				>
@@ -607,14 +518,6 @@
 				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"
 				>
@@ -640,6 +543,11 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="resources"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
 		<File
 			RelativePath="..\..\..\..\libupnp_win32.patch"
 			>

build/vc9/threadutil.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="threadutil"
 	ProjectGUID="{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
 	RootNamespace="threadutil"
@@ -20,7 +20,7 @@
 			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -41,13 +41,12 @@
 				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"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -81,10 +80,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="0"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -106,13 +105,10 @@
 				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"

build/vc9/tvcombo.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="tvcombo"
 	ProjectGUID="{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
 	RootNamespace="tvcombo"
@@ -47,7 +47,6 @@
 				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -60,8 +59,8 @@
 			/>
 			<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;"
+				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"
 			/>
@@ -89,8 +88,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -118,7 +117,6 @@
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

configure.ac

@@ -4,12 +4,12 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005-2007 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 AC_PREREQ(2.60)
 
-AC_INIT([libupnp], [1.6.7], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.6], [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:
@@ -144,24 +144,8 @@ 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], [5:0:2])
+AC_SUBST([LT_VERSION_THREADUTIL], [4:3:2])
 AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
 dnl ############################################################################
 dnl # Repeating the algorithm to place it closer to the modificatin place:
@@ -341,26 +325,9 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
 
 
 #
-# 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)
+# Checks for header files
 #
 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(
@@ -376,43 +343,19 @@ 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
-
-# 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
+TYPE_SOCKLEN_T
 
 
 #
@@ -421,11 +364,6 @@ fi
 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,23 +24,15 @@ libixml_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
 			  -export-symbols-regex '^ixml.*'
 
 libixml_la_SOURCES	= \
-			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/ixml.c src/node.c src/ixmlparser.c \
+			src/ixmlmembuf.c src/nodeList.c \
+			src/element.c src/attr.c src/document.c \
 			src/namedNodeMap.c \
-			src/node.c \
-			src/nodeList.c
+			src/inc/ixmlmembuf.h src/inc/ixmlparser.h
 
 upnpincludedir		= $(includedir)/upnp
-upnpinclude_HEADERS	= \
-			inc/ixml.h \
-			inc/ixmldebug.h
+upnpinclude_HEADERS	= inc/ixml.h 
+
 
 check_PROGRAMS          = test_document
 TESTS                   = test/test_document.sh
@@ -55,3 +47,4 @@ dist-hook:
 clean-local:
 	@if [ -d bin ] ; then  rm -rf bin ; fi
 
+

ixml/inc/ixmldebug.h

@@ -1,41 +0,0 @@
-
-
-#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,53 +1,60 @@
-/*******************************************************************************
- *
- * 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"
 
-
-#include <string.h>
-
-
-void ixmlAttr_init(IN IXML_Attr *attr)
+/*================================================================
+*   Function: Attr_init
+*       Initializes an attribute node
+*       External function.
+*
+*=================================================================*/
+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 ) );
+    }
 }
 
-
-void ixmlAttr_free(IN IXML_Attr *attr)
+/*================================================================
+*   Function: Attr_free
+*       Frees an attribute node.
+*       external function.
+*
+*=================================================================*/
+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,173 +1,73 @@
-/**************************************************************************
- *
- * 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
- */
+///////////////////////////////////////////////////////////////////////////
+//
+// 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
 
+#include <stdlib.h>
 #include "ixml.h"
 
-
-#include <stdlib.h> /* for size_t */
-
-
-#define MINVAL(a, b) ( (a) < (b) ? (a) : (b) )
-#define MAXVAL(a, b) ( (a) > (b) ? (a) : (b) )
-
+#define MINVAL( a, b ) ( (a) < (b) ? (a) : (b) )
+#define MAXVAL( a, b ) ( (a) > (b) ? (a) : (b) )
 
 #define MEMBUF_DEF_SIZE_INC 20
 
 
-/*!
- * \brief The ixml_membuf type.
- */
-typedef struct
+typedef struct // ixml_membuf 
 {
-	char *buf;	
-	size_t length;
-	size_t capacity;
-	size_t size_inc;
+	char	*buf;
+				
+	size_t	length;
+	size_t	capacity;
+	size_t	size_inc;
+
 } ixml_membuf;
 
+//--------------------------------------------------
+//////////////// functions /////////////////////////
+//--------------------------------------------------
+/*
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+*/
 
-/*!
- * \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 */
+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 );
 
+#endif // _IXML_MEMBUF_H

ixml/src/inc/ixmlparser.h

@@ -1,49 +1,41 @@
-/**************************************************************************
- *
- * 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
- */
-
+///////////////////////////////////////////////////////////////////////////
+//
+// 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
 
 #include "ixml.h"
 #include "ixmlmembuf.h"
 
-
-/* Parser definitions */
+// Parser definitions
 #define QUOT        """
 #define LT          "<"
 #define GT          ">"
@@ -52,218 +44,77 @@
 #define ESC_HEX     "&#x"
 #define ESC_DEC     "&#"
 
-
 typedef struct _IXML_NamespaceURI 
 {
-	char *nsURI;
-	char *prefix;
-	struct _IXML_NamespaceURI *nextNsURI;
+    char                        *nsURI;
+    char                        *prefix;
+    struct _IXML_NamespaceURI   *nextNsURI;
 } IXML_NamespaceURI;
 
 
 typedef struct _IXML_ElementStack
 {
-	char *element;
-	char *prefix;
-	char *namespaceUri;
-	IXML_NamespaceURI *pNsURI;
-	struct _IXML_ElementStack *nextElement;
+    char                    *element;
+    char                    *prefix;
+    char                    *namespaceUri;
+    IXML_NamespaceURI            *pNsURI;
+    struct _IXML_ElementStack    *nextElement;
 } IXML_ElementStack;
 
 
 typedef enum
 {
-	eELEMENT,
-	eATTRIBUTE,
-	eCONTENT,
+    eELEMENT,
+    eATTRIBUTE,
+    eCONTENT,
 } PARSER_STATE;
 
-
 typedef struct _Parser
 {
-	/*! 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;
+    char            *dataBuffer;	//data buffer
+    char            *curPtr;		//ptr to the token parsed 
+    char            *savePtr;		//Saves for backup
+    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);
 
+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);
 
-/*!
- * \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);
+void    Parser_setErrorChar( char c );
 
+void    ixmlAttr_free(IXML_Attr *attrNode);
+void    ixmlAttr_init(IXML_Attr *attrNode);
 
-/*!
- * \brief Fees a node contents.
- */
-void Parser_freeNodeContent(
-	/*! [in] The Node to process. */
-	IXML_Node *IXML_Nodeptr);
+int     ixmlElement_setTagName(IXML_Element *element, const char *tagName);
 
-int Parser_LoadDocument(IXML_Document **retDoc, const char * xmlFile, BOOL file);
+void    ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap);
+int     ixmlNamedNodeMap_addToNamedNodeMap(IXML_NamedNodeMap **nnMap, IXML_Node *add);
 
-int Parser_setNodePrefixAndLocalName(IXML_Node *newIXML_NodeIXML_Attr);
+void    ixmlNode_init(IXML_Node *IXML_Nodeptr);
+BOOL    ixmlNode_compare(IXML_Node *srcIXML_Node, IXML_Node *destIXML_Node);
 
+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);
 
-void ixmlAttr_init(IXML_Attr *attrNode);
+int     ixmlNode_setNodeProperties(IXML_Node* node, IXML_Node *src);
+int     ixmlNode_setNodeName( IXML_Node* node, const DOMString qualifiedName);
 
-/*!
- * \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    ixmlNodeList_init(IXML_NodeList *nList);
+int     ixmlNodeList_addToNodeList(IXML_NodeList **nList, IXML_Node *add);
 
-
-/*!
- * \brief Initializes a NamedNodeMap object.
- */
-void ixmlNamedNodeMap_init(
-	/*! [in] The named node map to process. */
-	IXML_NamedNodeMap *nnMap);
-
-
-/*!
- * \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);
-
-/*!
- * \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);
-
-
-/*!
- * \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 */
+#endif  // _IXMLPARSER_H
 

ixml/src/ixml.c

@@ -1,469 +1,531 @@
-/**************************************************************************
- *
- * 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"
 
-
-#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)
+/*================================================================
+*   copy_with_escape
+*
+*
+*=================================================================*/
+static void
+copy_with_escape( INOUT ixml_membuf * buf,
+                  IN const char *p )
 {
-	int i;
-	int plen;
+    int i;
+    int plen;
 
-	if (p == NULL) {
-		return;
-	}
+    if( p == NULL )
+        return;
 
-	plen = strlen( p );
+    plen = strlen( p );
 
-	for (i = 0; i < plen; i++) {
-		switch (p[i]) {
-		case '<':
-			ixml_membuf_append_str(buf, "&lt;");
-			break;
+    for( i = 0; i < plen; i++ ) {
+        switch ( p[i] ) {
+            case '<':
+                ixml_membuf_append_str( buf, "&lt;" );
+                break;
 
-		case '>':
-			ixml_membuf_append_str(buf, "&gt;");
-			break;
+            case '>':
+                ixml_membuf_append_str( buf, "&gt;" );
+                break;
 
-		case '&':
-			ixml_membuf_append_str(buf, "&amp;");
-			break;
+            case '&':
+                ixml_membuf_append_str( buf, "&amp;" );
+                break;
 
-		case '\'':
-			ixml_membuf_append_str(buf, "&apos;");
-			break;
+            case '\'':
+                ixml_membuf_append_str( buf, "&apos;" );
+                break;
 
-		case '\"':
-			ixml_membuf_append_str(buf, "&quot;");
-			break;
+            case '\"':
+                ixml_membuf_append_str( buf, "&quot;" );
+                break;
 
-		default:
-			ixml_membuf_append(buf, &p[i]);
-			break;
-		}
-	}
+            default:
+                ixml_membuf_append( buf, &p[i] );
+        }
+    }
+}
+
+/*================================================================
+*	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 )
+{
+    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 ) ) {
+
+            case eTEXT_NODE:
+                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, "]]>" );
+                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" );
+                break;
+
+            case eDOCUMENT_NODE:
+                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 );
+                }
+                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 );
+                }
+
+                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, ">" );
+                }
+
+                //  output the children
+                ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild
+                                           ( nodeptr ), buf );
+
+                // Done with children.  Output the end tag.
+                ixml_membuf_append_str( buf, "</" );
+                ixml_membuf_append_str( buf, nodeName );
+
+                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 );
+                break;
+
+            default:
+                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 )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL;
+
+    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+        return;
+    }
+
+    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 );
+            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, "\"" );
+            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 );
+            }
+
+            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, ">" );
+            }
+
+            //  output the children
+            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" );
+            break;
+
+        default:
+            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 )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL;
+
+    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+        return;
+    }
+
+    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 );
+            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, "\"" );
+            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 );
+            }
+
+            child = ixmlNode_getFirstChild( nodeptr );
+            if( ( child != NULL )
+                && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
+                ixml_membuf_append_str( buf, ">" );
+            } else {
+                ixml_membuf_append_str( buf, ">" );
+            }
+
+            //  output the children
+            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, ">" );
+            break;
+
+        default:
+            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 ) ) {
+        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 );
 }
 
 
-/*!
- * \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)
+/*================================================================
+*   ixmlParseBufferEx
+*       Parse xml file stored in buffer.
+*       External function.
+*
+*=================================================================*/
+int
+ixmlParseBufferEx( IN const char *buffer,
+                   IXML_Document ** retDoc )
 {
-	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)) {
-		case eTEXT_NODE:
-			copy_with_escape(buf, nodeValue);
-			break;
+    if( ( buffer == NULL ) || ( retDoc == NULL ) ) {
+        return IXML_INVALID_PARAMETER;
+    }
 
-		case eCDATA_SECTION_NODE:
-			ixml_membuf_append_str(buf, "<![CDATA[");
-			ixml_membuf_append_str(buf, nodeValue);
-			ixml_membuf_append_str(buf, "]]>");
-			break;
+    if( buffer[0] == '\0' ) {
+        return IXML_INVALID_PARAMETER;
+    }
 
-		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");
-			break;
-
-		case eDOCUMENT_NODE:
-			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);
-			}
-			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);
-			}
-			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, ">");
-			}
-			//  output the children
-			ixmlPrintDomTreeRecursive(
-				ixmlNode_getFirstChild(nodeptr), buf);
-
-			// Done with children.  Output the end tag.
-			ixml_membuf_append_str(buf, "</");
-			ixml_membuf_append_str(buf, nodeName);
-
-			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);
-			break;
-
-		default:
-			IxmlPrintf("(%s::ixmlPrintDomTreeRecursive) line %d: "
-				"Warning, unknown node type %d\n",
-				__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
-			break;
-		}
-	}
+    return Parser_LoadDocument( retDoc, buffer, FALSE );
 }
 
-
-/*!
- * \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)
+/*================================================================
+*   ixmlParseBuffer
+*       Parse xml file stored in buffer.
+*       External function.
+*
+*=================================================================*/
+IXML_Document *
+ixmlParseBuffer( IN const char *buffer )
 {
-	const char *nodeName = NULL;
-	const char *nodeValue = NULL;
-	IXML_Node *child = NULL;
+    IXML_Document *doc = NULL;
 
-	if (nodeptr == NULL || buf == NULL) {
-		return;
-	}
-
-	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);
-		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, "\"");
-		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);
-		}
-		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, ">");
-		}
-
-		// output the children
-		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");
-		break;
-
-	default:
-		IxmlPrintf("(%s::ixmlPrintDomTree) line %d: "
-			"Warning, unknown node type %d\n",
-			__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
-		break;
-	}
+    ixmlParseBufferEx( buffer, &doc );
+    return doc;
 }
 
-
-/*!
- * \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)
+/*================================================================
+*   ixmlCloneDOMString
+*       Clones a DOM String.
+*       External function.
+*
+*=================================================================*/
+DOMString
+ixmlCloneDOMString( IN const DOMString src )
 {
-	const char *nodeName = NULL;
-	const char *nodeValue = NULL;
-	IXML_Node *child = NULL;
+    if( src == NULL ) {
+        return NULL;
+    }
 
-	if (nodeptr == NULL || buf == NULL) {
-		return;
-	}
-
-	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);
-		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, "\"");
-		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);
-		}
-		child = ixmlNode_getFirstChild(nodeptr);
-		if (child != NULL &&
-		    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
-			ixml_membuf_append_str(buf, ">");
-		} else {
-			ixml_membuf_append_str(buf, ">");
-		}
-
-		//  output the children
-		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, ">");
-		break;
-
-	default:
-		IxmlPrintf("(%s::ixmlDomTreetoString) line %d: "
-			"Warning, unknown node type %d\n",
-			__FILE__, __LINE__, ixmlNode_getNodeType(nodeptr));
-		break;
-	}
+    return ( strdup( src ) );
 }
 
-
-int ixmlLoadDocumentEx(const char *xmlFile, IXML_Document **doc)
+/*================================================================
+*   ixmlFreeDOMString
+*       Frees a DOM String.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlFreeDOMString( IN DOMString buf )
 {
-	if (xmlFile == NULL || doc == NULL) {
-		return IXML_INVALID_PARAMETER;
-	}
-
-	return Parser_LoadDocument(doc, xmlFile, TRUE);
+    if( buf != NULL ) {
+        free( buf );
+    }
 }
-
-
-IXML_Document *ixmlLoadDocument(const char *xmlFile)
-{
-	IXML_Document *doc = NULL;
-
-	ixmlLoadDocumentEx(xmlFile, &doc);
-
-	return doc;
-}
-
-
-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;
-}
-
-
-DOMString ixmlPrintNode(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;
-}
-
-
-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

@@ -1,31 +0,0 @@
-
-
-/*!
- * \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,218 +1,236 @@
-/**************************************************************************
- *
- * 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"
-
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include "ixmlmembuf.h"
+#include "ixml.h"
 
-
-/*!
- * \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)
+/*================================================================
+*   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 )
 {
-	size_t diff;
-	size_t alloc_len;
-	char *temp_buf;
+    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) {
-			/* have enough mem; done */
-			return 0;
-		}
+    if( new_length >= m->length )   // increase length
+    {
+        // need more mem?
+        if( new_length <= m->capacity ) {
+            return 0;           // have enough mem; done
+        }
 
-		diff = new_length - m->length;
-		alloc_len = MAXVAL(m->size_inc, diff) + m->capacity;
-	} else {
-		// decrease length
-		assert(new_length <= m->length);
+        diff = 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) {
-			return 0;
-		}
-		alloc_len = new_length + m->size_inc;
-	}
+        // if diff is 0..m->size_inc, don't free
+        if( ( m->capacity - new_length ) <= m->size_inc ) {
+            return 0;
+        }
 
-	assert(alloc_len >= new_length);
+        alloc_len = new_length + m->size_inc;
+    }
 
-	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) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-	}
-	/* save */
-	m->buf = temp_buf;
-	m->capacity = alloc_len;
+    assert( alloc_len >= new_length );
 
-	return 0;
+    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 ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+    }
+    // save
+    m->buf = temp_buf;
+    m->capacity = alloc_len;
+    return 0;
 }
 
-
-void ixml_membuf_init(ixml_membuf *m)
+/*================================================================
+*   membuffer_init
+*
+*
+*=================================================================*/
+void
+ixml_membuf_init( INOUT ixml_membuf * m )
 {
-	assert(m != NULL);
+    assert( m != NULL );
 
-	m->size_inc = MEMBUF_DEF_SIZE_INC;
-	m->buf = NULL;
-	m->length = 0;
-	m->capacity = 0;
+    m->size_inc = MEMBUF_DEF_SIZE_INC;
+    m->buf = NULL;
+    m->length = 0;
+    m->capacity = 0;
 }
 
-
-void ixml_membuf_destroy(ixml_membuf *m)
+/*================================================================
+*   membuffer_destroy
+*
+*
+*=================================================================*/
+void
+ixml_membuf_destroy( INOUT ixml_membuf * m )
 {
-	if (m == NULL) {
-		return;
-	}
+    if( m == NULL ) {
+        return;
+    }
 
-	free(m->buf);
-	ixml_membuf_init(m);
+    free( m->buf );
+    ixml_membuf_init( m );
 }
 
-
-int ixml_membuf_assign(
-	ixml_membuf *m,
-	const void *buf,
-	size_t buf_len)
+/*================================================================
+*   ixml_membuf_assign
+*
+*
+*=================================================================*/
+int
+ixml_membuf_assign( INOUT ixml_membuf * m,
+                    IN const void *buf,
+                    IN size_t buf_len )
 {
-	int return_code;
+    int return_code;
 
-	assert(m != NULL);
+    assert( m != NULL );
 
-	// set value to null
-	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 return_code;
-	}
+    // set value to null
+    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 return_code;
+    }
+    // copy
+    memcpy( m->buf, buf, buf_len );
+    m->buf[buf_len] = 0;        // null-terminate
 
-	// copy
-	memcpy(m->buf, buf, buf_len);
+    m->length = buf_len;
 
-	// null-terminate
-	m->buf[buf_len] = 0;
-	m->length = buf_len;
+    return IXML_SUCCESS;
 
-	return IXML_SUCCESS;
 }
 
-
-int ixml_membuf_assign_str(
-	ixml_membuf *m,
-	const char *c_str)
+/*================================================================
+*   ixml_membuf_assign_str
+*
+*
+*=================================================================*/
+int
+ixml_membuf_assign_str( INOUT ixml_membuf * m,
+                        IN const char *c_str )
 {
-	return ixml_membuf_assign(m, c_str, strlen(c_str));
+    return ixml_membuf_assign( m, c_str, strlen( c_str ) );
 }
 
-
-int ixml_membuf_append(
-	INOUT ixml_membuf *m,
-	IN const void *buf)
+/*================================================================
+*   ixml_membuf_append
+*
+*
+*=================================================================*/
+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 );
 }
 
-
-int ixml_membuf_append_str(
-	INOUT ixml_membuf *m,
-	IN const char *c_str)
+/*================================================================
+*   ixml_membuf_append_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 );
 }
 
-
-int ixml_membuf_insert(
-	INOUT ixml_membuf *m,
-	IN const void *buf,
-	IN size_t buf_len,
-	int index)
+/*================================================================
+*   ixml_membuf_insert
+*
+*
+*=================================================================*/
+int
+ixml_membuf_insert( INOUT ixml_membuf * m,
+                    IN const void *buf,
+                    IN size_t buf_len,
+                    int index )
 {
-	int return_code = 0;
+    int return_code;
 
-	assert(m != NULL);
+    assert( m != NULL );
 
-	if (index < 0 || index > (int)m->length) {
-		return IXML_INDEX_SIZE_ERR;
-	}
+    if( index < 0 || index > ( int )m->length )
+        return IXML_INDEX_SIZE_ERR;
 
-	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) {
-		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);
-	m->length += buf_len;
-	/* Null terminate */
-	m->buf[m->length] = 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 ) {
+        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 );
+    m->length += buf_len;
+    m->buf[m->length] = 0;      // null-terminate
 
-	return 0;
+    return 0;
 }
-

ixml/src/namedNodeMap.c

@@ -1,195 +1,242 @@
-/**************************************************************************
- *
- * 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
- */
-
+///////////////////////////////////////////////////////////////////////////
+//
+// 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"
 
-
-#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)
+/*================================================================
+*   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 )
 {
-	IXML_Node *tempNode;
-	unsigned long returnItemNo = 0;
+    IXML_Node *tempNode;
+    unsigned long returnItemNo = 0;
 
-	assert(nnMap != NULL && name != NULL);
-	if (nnMap == NULL || name == NULL) {
-		return IXML_INVALID_ITEM_NUMBER;
-	}
+    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) {
-			return returnItemNo;
-		}
-		tempNode = tempNode->nextSibling;
-		returnItemNo++;
-	}
+    tempNode = nnMap->nodeItem;
+    while( tempNode != NULL ) {
+        if( strcmp( name, tempNode->nodeName ) == 0 ) {
+            return returnItemNo;
+        }
 
-	return IXML_INVALID_ITEM_NUMBER;
+        tempNode = tempNode->nextSibling;
+        returnItemNo++;
+    }
+
+    return IXML_INVALID_ITEM_NUMBER;
 }
 
-
-void ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap)
+/*================================================================
+*   NamedNodeMap_init
+*       Initializes a NamedNodeMap object.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNamedNodeMap_init( IN IXML_NamedNodeMap * nnMap )
 {
-	assert(nnMap != NULL);
-
-	memset(nnMap, 0, sizeof (IXML_NamedNodeMap));
+    assert( nnMap != NULL );
+    memset( nnMap, 0, sizeof( IXML_NamedNodeMap ) );
 }
 
-
-IXML_Node *ixmlNamedNodeMap_getNamedItem(
-	IXML_NamedNodeMap *nnMap,
-	const DOMString name)
+/*================================================================
+*   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 )
 {
-	long index;
+    long index;
 
-	if (nnMap == NULL || name == NULL) {
-		return NULL;
-	}
+    if( ( nnMap == NULL ) || ( name == NULL ) ) {
+        return NULL;
+    }
 
-	index = ixmlNamedNodeMap_getItemNumber(nnMap, name);
-	if (index == IXML_INVALID_ITEM_NUMBER) {
-		return NULL;
-	} else {
-		return ixmlNamedNodeMap_item(nnMap, (unsigned long)index);
-	}
+    index = ixmlNamedNodeMap_getItemNumber( nnMap, name );
+    if( index == IXML_INVALID_ITEM_NUMBER ) {
+        return NULL;
+    } else {
+        return ( ixmlNamedNodeMap_item( nnMap, ( unsigned long )index ) );
+    }
 }
 
-
-IXML_Node *ixmlNamedNodeMap_item(
-	IN IXML_NamedNodeMap *nnMap,
-	IN 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,
+                       IN unsigned long index )
 {
-	IXML_Node *tempNode;
-	unsigned int i;
+    IXML_Node *tempNode;
+    unsigned int i;
 
-	if (nnMap == NULL) {
-		return NULL;
-	}
+    if( nnMap == NULL ) {
+        return NULL;
+    }
 
-	if (index > ixmlNamedNodeMap_getLength(nnMap) - 1) {
-		return NULL;
-	}
+    if( index > ixmlNamedNodeMap_getLength( nnMap ) - 1 ) {
+        return NULL;
+    }
 
-	tempNode = nnMap->nodeItem;
-	for (i = 0; i < index && tempNode != NULL; ++i) {
-		tempNode = tempNode->nextSibling;
-	}
+    tempNode = nnMap->nodeItem;
+    for( i = 0; i < index && tempNode != NULL; ++i ) {
+        tempNode = tempNode->nextSibling;
+    }
 
-	return tempNode;
+    return tempNode;
 }
 
-
-unsigned long ixmlNamedNodeMap_getLength(IXML_NamedNodeMap *nnMap)
+/*================================================================
+*   NamedNodeMap_getLength	
+*       Return the number of Nodes in this map.       
+*       External function.
+*   
+*   Parameters:
+*
+*=================================================================*/
+unsigned long
+ixmlNamedNodeMap_getLength( IN IXML_NamedNodeMap * nnMap )
 {
-	IXML_Node *tempNode;
-	unsigned long length = 0;
+    IXML_Node *tempNode;
+    unsigned long length = 0;
 
-	if (nnMap != NULL) {
-		tempNode = nnMap->nodeItem;
-		for (length = 0; tempNode != NULL; ++length) {
-			tempNode = tempNode->nextSibling;
-		}
-	}
-
-	return length;
+    if( nnMap != NULL ) {
+        tempNode = nnMap->nodeItem;
+        for( length = 0; tempNode != NULL; ++length ) {
+            tempNode = tempNode->nextSibling;
+        }
+    }
+    return length;
 }
 
-
-void ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap)
+/*================================================================
+*   ixmlNamedNodeMap_free
+*       frees a NamedNodeMap.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNamedNodeMap_free( IXML_NamedNodeMap * nnMap )
 {
-	IXML_NamedNodeMap *pNext;
+    IXML_NamedNodeMap *pNext;
 
-	while (nnMap != NULL) {
-		pNext = nnMap->next;
-		free(nnMap);
-		nnMap = pNext;
-	}
+    while( nnMap != NULL ) {
+        pNext = nnMap->next;
+        free( nnMap );
+        nnMap = pNext;
+    }
 }
 
-
-int ixmlNamedNodeMap_addToNamedNodeMap(
-	IXML_NamedNodeMap **nnMap,
-	IXML_Node *add)
+/*================================================================
+*   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 )
 {
-	IXML_NamedNodeMap *traverse = NULL;
-	IXML_NamedNodeMap *p = NULL;
-	IXML_NamedNodeMap *newItem = NULL;
+    IXML_NamedNodeMap *traverse = NULL,
+     *p = NULL;
+    IXML_NamedNodeMap *newItem = NULL;
 
-	if(add == NULL) {
-		return IXML_SUCCESS;
-	}
+    if( add == NULL ) {
+        return IXML_SUCCESS;
+    }
 
-	if (*nnMap == NULL) {
-		// nodelist is empty
-		*nnMap = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
-		if (*nnMap == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-		ixmlNamedNodeMap_init(*nnMap);
-	}
-	if ((*nnMap)->nodeItem == NULL) {
-		(*nnMap)->nodeItem = add;
-	} else {
-		traverse = *nnMap;
-		p = traverse;
-		while (traverse != NULL) {
-			p = traverse;
-			traverse = traverse->next;
-		}
-		newItem = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
-		if (newItem == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-		p->next = newItem;
-		newItem->nodeItem = add;
-		newItem->next = NULL;
-	}
+    if( *nnMap == NULL )        // nodelist is empty
+    {
+        *nnMap =
+            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
+        if( *nnMap == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+        ixmlNamedNodeMap_init( *nnMap );
+    }
 
-	return IXML_SUCCESS;
+    if( ( *nnMap )->nodeItem == NULL ) {
+        ( *nnMap )->nodeItem = add;
+    } else {
+        traverse = *nnMap;
+        p = traverse;
+        while( traverse != NULL ) {
+            p = traverse;
+            traverse = traverse->next;
+        }
+
+        newItem =
+            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
+        if( newItem == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+        p->next = newItem;
+        newItem->nodeItem = add;
+        newItem->next = NULL;
+    }
+
+    return IXML_SUCCESS;
 }
-

ixml/src/nodeList.c

@@ -1,152 +1,176 @@
-/*******************************************************************************
- *
- * 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
- */
-
+///////////////////////////////////////////////////////////////////////////
+//
+// 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"
 
-
-#include <assert.h>
-#include <string.h>
-
-
-void ixmlNodeList_init(IXML_NodeList *nList)
+/*================================================================
+*   ixmlNodeList_init
+*       initializes a nodelist 
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNodeList_init( IXML_NodeList * nList )
 {
-	assert(nList != NULL);
+    assert( nList != NULL );
+
+    memset( nList, 0, sizeof( IXML_NodeList ) );
 
-	memset(nList, 0, sizeof (IXML_NodeList));
 }
 
-
-IXML_Node *ixmlNodeList_item(
-	IXML_NodeList *nList,
-	unsigned long index)
+/*================================================================
+*   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_NodeList *next;
-	unsigned int i;
+    IXML_NodeList *next;
+    unsigned int i;
 
-	// if the list ptr is NULL
-	if (nList == NULL) {
-		return NULL;
-	}
-	// if index is more than list length
-	if (index > ixmlNodeList_length(nList) - 1) {
-		return NULL;
-	}
+    // if the list ptr is NULL
+    if( nList == NULL ) {
+        return NULL;
+    }
+    // if index is more than list length
+    if( index > ixmlNodeList_length( nList ) - 1 ) {
+        return NULL;
+    }
 
-	next = nList;
-	for (i = 0; i < index && next != NULL; ++i) {
-		next = next->next;
-	}
+    next = nList;
+    for( i = 0; i < index && next != NULL; ++i ) {
+        next = next->next;
+    }
 
-	if (next == NULL) {
-		return NULL;
-	}
+    if( next == NULL ) return NULL;
+
+    return next->nodeItem;
 
-	return next->nodeItem;
 }
 
-int ixmlNodeList_addToNodeList(
-	IXML_NodeList **nList,
-	IXML_Node *add)
+/*================================================================
+*   ixmlNodeList_addToNodeList
+*       Add a node to nodelist
+*       Internal to parser only.
+*
+*=================================================================*/
+int
+ixmlNodeList_addToNodeList( IN IXML_NodeList ** nList,
+                            IN IXML_Node * add )
 {
-	IXML_NodeList *traverse = NULL;
-	IXML_NodeList *p = NULL;
-	IXML_NodeList *newListItem;
+    IXML_NodeList *traverse,
+     *p = NULL;
+    IXML_NodeList *newListItem;
 
-	assert(add != NULL);
+    assert( add != NULL );
 
-	if (add == NULL) {
-		return IXML_FAILED;
-	}
+    if( add == NULL ) {
+        return IXML_FAILED;
+    }
 
-	if (*nList == NULL) {
-		// nodelist is empty
-		*nList = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
-		if (*nList == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
+    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;
-	} else {
-		traverse = *nList;
-		while (traverse != NULL) {
-			p = traverse;
-			traverse = traverse->next;
-		}
+    if( ( *nList )->nodeItem == NULL ) {
+        ( *nList )->nodeItem = add;
+    } else {
+        traverse = *nList;
+        while( traverse != NULL ) {
+            p = traverse;
+            traverse = traverse->next;
+        }
 
-		newListItem = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
-		if (newListItem == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-		p->next = newListItem;
-		newListItem->nodeItem = add;
-		newListItem->next = NULL;
-	}
+        newListItem =
+            ( IXML_NodeList * ) malloc( sizeof( IXML_NodeList ) );
+        if( newListItem == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+        p->next = newListItem;
+        newListItem->nodeItem = add;
+        newListItem->next = NULL;
+    }
 
-	return IXML_SUCCESS;
+    return IXML_SUCCESS;
 }
 
-
-unsigned long ixmlNodeList_length(IXML_NodeList *nList)
+/*================================================================
+*   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 )
 {
-	IXML_NodeList *list;
-	unsigned long length = 0;
+    IXML_NodeList *list;
+    unsigned long length = 0;
 
-	list = nList;
-	while (list != NULL) {
-		++length;
-		list = list->next;
-	}
+    list = nList;
+    while( list != NULL ) {
+        ++length;
+        list = list->next;
+    }
 
-	return length;
+    return length;
 }
 
-
-void ixmlNodeList_free(IXML_NodeList *nList)
+/*================================================================
+*   ixmlNodeList_free
+*       frees a nodeList
+*       External function
+*       
+*=================================================================*/
+void
+ixmlNodeList_free( IN IXML_NodeList * nList )
 {
-	IXML_NodeList *next;
+    IXML_NodeList *next;
+
+    while( nList != NULL ) {
+        next = nList->next;
+
+        free( nList );
+        nList = next;
+    }
 
-	while (nList != NULL) {
-		next = nList->next;
-		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_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
+Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
 Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
 

libupnp.spec

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

threadutil/inc/ThreadPool.h

@@ -29,134 +29,80 @@
  *
  ******************************************************************************/
 
-
 #ifndef THREADPOOL_H
 #define THREADPOOL_H
 
-
-/*!
- * \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
-
+#ifdef UPNP_USE_MSVCPP
+	#define UPNP_INLINE
+#else
+	#define UPNP_INLINE inline
 #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 duration {
-	SHORT_TERM,
-	PERSISTENT
-} Duration;
+typedef enum priority {LOW_PRIORITY,
+		       MED_PRIORITY,
+		       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 */
 
-typedef enum priority {
-	LOW_PRIORITY,
-	MED_PRIORITY,
-	HIGH_PRIORITY
-} ThreadPriority;
-
-
-/*! 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.
- */
+/* Statistics */
+/* always include stats because code change is minimal */
 #define STATS 1
 
-
 #ifdef _DEBUG
 	#define DEBUG 1
 #endif
 
+#include "LinkedList.h"
+
+#ifdef WIN32
+    #include <time.h>
+    #include <winsock2.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/time.h> /* for gettimeofday() */
+#endif
+
+#include "FreeList.h"
+
+#include "ithread.h"
+#include <errno.h>
+
+#define EXPORT
 
 typedef int PolicyType;
-
-
 #define DEFAULT_POLICY SCHED_OTHER
-
-
-/*! Default priority */
-#define DEFAULT_SCHED_PARAM 0
-
+#define DEFAULT_SCHED_PARAM 0 /* default priority */
 
 /****************************************************************************
  * Name: free_routine
@@ -166,7 +112,6 @@ typedef int PolicyType;
  *****************************************************************************/
 typedef void (*free_routine)(void *arg);
 
-
 /****************************************************************************
  * Name: ThreadPoolAttr
  *
@@ -200,7 +145,6 @@ typedef struct THREADPOOLATTR
 	PolicyType schedPolicy;
 } ThreadPoolAttr;
 
-
 /****************************************************************************
  * Name: ThreadPool
  *
@@ -217,13 +161,13 @@ typedef struct THREADPOOLJOB
 	int jobId;
 } ThreadPoolJob;
 
-
 /****************************************************************************
  * Name: ThreadPoolStats
  *
  *  Description:
  *     Structure to hold statistics
  *****************************************************************************/
+
 typedef struct TPOOLSTATS
 {
 	double totalTimeHQ;
@@ -248,43 +192,50 @@ typedef struct TPOOLSTATS
 } ThreadPoolStats;
 
 
-/*!
- * \brief A thread pool similar to the thread pool in the UPnP SDK.
+/****************************************************************************
+ * Name: ThreadPool
  *
- * 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
- * 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
- * then the worker thread will exit. If when 
- * scheduling a job the current job to thread ratio
- * becomes greater than the set ratio and the thread pool currently has
- * less than the maximum threads then a new thread will
- * be created.
- */
+ *  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
+ *     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
+ *     then the worker thread will exit. If when 
+ *     scheduling a job the current job to thread ratio
+ *     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 */
-	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 */
+	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 */
+	int lastJobId; /* ids for jobs */
+	int shutdown;  /* whether or not we are shutting down */
+	int totalThreads;      /* total number of threads */
+	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 */
 	ThreadPoolStats stats;
 } ThreadPool;
 
 
+
 /****************************************************************************
  * Function: ThreadPoolInit
  *
@@ -323,7 +274,6 @@ typedef struct THREADPOOL
  *****************************************************************************/
 int ThreadPoolInit(ThreadPool *tp, ThreadPoolAttr *attr);
 
-
 /****************************************************************************
  * Function: ThreadPoolAddPersistent
  *
@@ -346,7 +296,6 @@ int ThreadPoolInit(ThreadPool *tp, ThreadPoolAttr *attr);
  *****************************************************************************/
 int ThreadPoolAddPersistent(ThreadPool*tp, ThreadPoolJob *job, int *jobId);
 
-
 /****************************************************************************
  * Function: ThreadPoolGetAttr
  *
@@ -361,8 +310,6 @@ int ThreadPoolAddPersistent(ThreadPool*tp, ThreadPoolJob *job, int *jobId);
  *      Always returns 0.
  *****************************************************************************/
 int ThreadPoolGetAttr(ThreadPool *tp, ThreadPoolAttr *out);
-
-
 /****************************************************************************
  * Function: ThreadPoolSetAttr
  *
@@ -378,7 +325,6 @@ int ThreadPoolGetAttr(ThreadPool *tp, ThreadPoolAttr *out);
  *****************************************************************************/
 int ThreadPoolSetAttr(ThreadPool *tp, ThreadPoolAttr *attr);
 
-
 /****************************************************************************
  * Function: ThreadPoolAdd
  *
@@ -398,7 +344,6 @@ int ThreadPoolSetAttr(ThreadPool *tp, ThreadPoolAttr *attr);
  *****************************************************************************/
 int ThreadPoolAdd (ThreadPool*tp, ThreadPoolJob *job, int *jobId);
 
-
 /****************************************************************************
  * Function: ThreadPoolRemove
  *
@@ -451,7 +396,6 @@ int ThreadPoolShutdown(ThreadPool *tp);
  *****************************************************************************/
 int TPJobInit(ThreadPoolJob *job, start_routine func, void *arg);
 
-
 /****************************************************************************
  * Function: TPJobSetPriority
  *
@@ -465,7 +409,6 @@ int TPJobInit(ThreadPoolJob *job, start_routine func, void *arg);
  *****************************************************************************/
 int TPJobSetPriority(ThreadPoolJob *job, ThreadPriority priority);
 
-
 /****************************************************************************
  * Function: TPJobSetFreeFunction
  *
@@ -479,7 +422,6 @@ int TPJobSetPriority(ThreadPoolJob *job, ThreadPriority priority);
  *****************************************************************************/
 int TPJobSetFreeFunction(ThreadPoolJob *job, free_routine func);
 
-
 /****************************************************************************
  * Function: TPAttrInit
  *
@@ -493,7 +435,6 @@ int TPJobSetFreeFunction(ThreadPoolJob *job, free_routine func);
  *****************************************************************************/
 int TPAttrInit(ThreadPoolAttr *attr);
 
-
 /****************************************************************************
  * Function: TPAttrSetMaxThreads
  *
@@ -507,7 +448,6 @@ int TPAttrInit(ThreadPoolAttr *attr);
  *****************************************************************************/
 int TPAttrSetMaxThreads(ThreadPoolAttr *attr, int maxThreads);
 
-
 /****************************************************************************
  * Function: TPAttrSetMinThreads
  *
@@ -521,7 +461,6 @@ int TPAttrSetMaxThreads(ThreadPoolAttr *attr, int maxThreads);
  *****************************************************************************/
 int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads);
 
-
 /****************************************************************************
  * Function: TPAttrSetIdleTime
  *
@@ -534,7 +473,6 @@ int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads);
  *****************************************************************************/
 int TPAttrSetIdleTime(ThreadPoolAttr *attr, int idleTime);
 
-
 /****************************************************************************
  * Function: TPAttrSetJobsPerThread
  *
@@ -548,7 +486,6 @@ int TPAttrSetIdleTime(ThreadPoolAttr *attr, int idleTime);
  *****************************************************************************/
 int TPAttrSetJobsPerThread(ThreadPoolAttr *attr, int jobsPerThread);
 
-
 /****************************************************************************
  * Function: TPAttrSetStarvationTime
  *
@@ -562,7 +499,6 @@ int TPAttrSetJobsPerThread(ThreadPoolAttr *attr, int jobsPerThread);
  *****************************************************************************/
 int TPAttrSetStarvationTime(ThreadPoolAttr *attr, int starvationTime);
 
-
 /****************************************************************************
  * Function: TPAttrSetSchedPolicy
  *
@@ -590,7 +526,6 @@ int TPAttrSetSchedPolicy(ThreadPoolAttr *attr, PolicyType schedPolicy);
  *****************************************************************************/
 int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
 
-
 /****************************************************************************
  * Function: ThreadPoolGetStats
  *
@@ -605,20 +540,18 @@ int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
  *      Always returns 0.
  *****************************************************************************/
 #ifdef STATS
-	EXPORT_SPEC int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
+	EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
 
-	EXPORT_SPEC void ThreadPoolPrintStats(ThreadPoolStats *stats);
+	EXPORT 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_H */
+#endif /* ThreadPool */
 

threadutil/inc/ithread.h

@@ -29,42 +29,22 @@
  *
  ******************************************************************************/
 
-
-#ifndef ITHREAD_H
-#define ITHREAD_H
-
-
-/*!
- * \file
- */
-
-
-#if !defined(WIN32)
-	#include <sys/param.h>
-#endif
-
-
-#include "UpnpGlobal.h" /* For UPNP_INLINE, EXPORT_SPEC */
-
-
+#ifndef ITHREADH
+#define ITHREADH
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
 #include <pthread.h>
-#ifdef WIN32
-	/* Do not #include <unistd.h> */
-#else
+#ifndef WIN32
 	#include <unistd.h>
 #endif
 
-
-#if defined(BSD)
+#ifdef __FreeBSD__
 	#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
@@ -94,8 +74,7 @@ extern "C" {
  *      typedef to pthread_t.
  *      Internal Use Only.
  ***************************************************************************/
-typedef pthread_t ithread_t;
-
+typedef pthread_t ithread_t; 
   
 /****************************************************************************
  * Name: ithread_attr_t
@@ -115,7 +94,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);
 
   
 /****************************************************************************
@@ -182,96 +161,7 @@ typedef pthread_rwlockattr_t ithread_rwlockattr_t;
  *      typedef to pthread_rwlock_t
  *      Internal Use Only
  ***************************************************************************/
-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;
-}
-
+typedef pthread_rwlock_t ithread_rwlock_t;	
 
 /****************************************************************************
  * Function: ithread_mutexattr_init
@@ -512,8 +402,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      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.
@@ -528,7 +418,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *  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:
@@ -545,7 +435,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *  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:
@@ -563,7 +453,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      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:
@@ -583,7 +473,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *		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.
@@ -600,8 +490,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      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
@@ -609,6 +499,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 #define ithread_cond_init pthread_cond_init
 
 
+
 /****************************************************************************
  * Function: ithread_cond_signal
  *
@@ -616,7 +507,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      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:
@@ -633,7 +524,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      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:
@@ -651,7 +542,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      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 
@@ -667,19 +558,23 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   /****************************************************************************
    * 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
-   *	call times out and returns.
-   *		Associated mutex MUST be locked by thread before entering this call.
-   *		Mutex is reacquired when call returns.
+   *  Description:      
+   *      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.
+   *      Mutex is reacquired when call returns.
    *  Parameters:
-   *      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)
-   *      	Mutex must be locked.
-   *      const struct timespec *abstime (absolute time, measured from Jan 1, 1970)
+   *      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)
+   *      Mutex must be locked.
+   *      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
@@ -695,7 +590,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    *      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:
@@ -751,7 +646,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_exit pthread_exit
 
-
 /****************************************************************************
    * Function: ithread_get_current_thread_id
    *
@@ -775,7 +669,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_self pthread_self
 
-
   /****************************************************************************
    * Function: ithread_detach
    *
@@ -789,7 +682,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_detach pthread_detach  
 
-
   /****************************************************************************
    * Function: ithread_join
    *
@@ -809,6 +701,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 #define ithread_join pthread_join
   
 
+
 /****************************************************************************
  * Function: isleep
  *
@@ -822,13 +715,12 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
-#ifdef WIN32
-	#define isleep(x) Sleep((x)*1000)
+#ifndef WIN32
+#define isleep sleep
 #else
-	#define isleep sleep
+#define isleep(x) Sleep((x)*1000)
 #endif
 
-
 /****************************************************************************
  * Function: isleep
  *
@@ -842,10 +734,25 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *		0 on success, Nonzero on failure.
  *              See man page for sleep (man 3 sleep)
  *****************************************************************************/
-#ifdef WIN32
-	#define imillisleep Sleep
+#ifndef WIN32
+#define imillisleep(x) usleep(1000*x)
 #else
-	#define imillisleep(x) usleep(1000*x)
+#define imillisleep	Sleep
+#endif
+
+#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
+#else
+	#define EXPORT_SPEC
 #endif
 
 
@@ -854,11 +761,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
 #endif
 
-
 #ifdef __cplusplus
 }
 #endif
 
-
-#endif /* ITHREAD_H */
+#endif /* ITHREADH */
 

upnp/Makefile.am

@@ -1,7 +1,7 @@
 #
 # "Makefile.am" for "libupnp/upnp"
 #
-# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 SUBDIRS = doc . sample
@@ -19,11 +19,8 @@ LDADD = \
 
 upnpincludedir = $(includedir)/upnp
 upnpinclude_HEADERS = \
-	inc/UpnpString.h \
 	inc/upnp.h \
-	inc/upnpdebug.h \
-	inc/UpnpGlobal.h \
-	inc/UpnpInet.h
+	inc/upnpdebug.h
 
 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
@@ -49,6 +46,7 @@ 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 \
@@ -74,7 +72,6 @@ libupnp_la_SOURCES = \
 	src/inc/util.h \
 	src/inc/utilall.h \
 	src/inc/uuid.h \
-	src/inc/VirtualDir.h \
 	src/inc/webserver.h
 
 # ssdp
@@ -113,14 +110,10 @@ libupnp_la_SOURCES += \
 	src/gena/gena_callback2.c
 
 # api
-libupnp_la_SOURCES += \
-	src/api/UpnpString.c \
-	src/api/upnpapi.c
-
+libupnp_la_SOURCES += 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
@@ -137,12 +130,6 @@ 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
@@ -151,7 +138,8 @@ test_init_SOURCES = test/test_init.c
 
 EXTRA_DIST = \
 	LICENSE \
-	m4/libupnp.m4 \
+	src/inc/inet_pton.h \
+	src/inet_pton.c \
 	src/win_dll.c
 
 

upnp/inc/UpnpGlobal.h

@@ -1,120 +0,0 @@
-
-
-#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

@@ -1,30 +0,0 @@
-
-
-#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

@@ -1,133 +0,0 @@
-
-
-#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

@@ -7,12 +7,12 @@
  * 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,34 +33,25 @@
 #ifndef UPNP_DEBUG_H
 #define UPNP_DEBUG_H 
 
-
-/*!
- * \file
- */
-
-
-#include "ThreadPool.h"
+#include "upnp.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 \c UpnpSetLogLevel. 
+ *  see {\tt 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 
@@ -69,11 +60,14 @@ 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.
- *    \li \c UPNP_CRITICAL [0]
- *    \li \c UPNP_PACKET [1]
- *    \li \c UPNP_INFO [2]
- *    \li \c UPNP_ALL [3]
+ *  \begin{itemize}
+ *    \item {\tt UPNP_CRITICAL [0]}
+ *    \item {\tt UPNP_PACKET [1]}
+ *    \item {\tt UPNP_INFO [2]}
+ *    \item {\tt UPNP_ALL [3]}
+ *  \end{itemize}
  */
+
 typedef enum Upnp_Module {
 	SSDP,
 	SOAP,
@@ -85,69 +79,91 @@ 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 \c Upnp_LogLevel
+ * Default log level : see {\tt Upnp_LogLevel}
  */
 #define UPNP_DEFAULT_LOG_LEVEL	UPNP_ALL
 
 
 
-/*!
- * \brief Initialize the log files.
+/***************************************************************************
+ * Function : UpnpInitLog
  *
- * \return -1 if fails or UPNP_E_SUCCESS if succeeds.
- */
+ * Parameters:	void
+ *
+ * Description:
+ *	This functions initializes the log files
+ *
+ * Returns: int
+ *	-1 : If fails
+ *	UPNP_E_SUCCESS : if success
+ ***************************************************************************/
 #ifdef DEBUG
-int UpnpInitLog(void);
+int UpnpInitLog();
 #else
-static UPNP_INLINE int UpnpInitLog(void)
-{
-	return UPNP_E_SUCCESS;
-}
+static UPNP_INLINE int UpnpInitLog() { return UPNP_E_SUCCESS; }
 #endif
 
 
-/*!
- * \brief Set the log level (see \c Upnp_LogLevel).
- */
+/***************************************************************************
+ * Function : UpnpSetLogLevel
+ *				
+ * Parameters: Upnp_LogLevel log_level
+ *
+ * Description:							
+ *	This functions set the log level (see {\tt Upnp_LogLevel}
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
-void UpnpSetLogLevel(
-	/*! [in] Log level. */
-	Upnp_LogLevel log_level);
+void UpnpSetLogLevel(Upnp_LogLevel log_level);
 #else
 static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
 #endif
 
 
-/*!
- * \brief Closes the log files.
- */
+/***************************************************************************
+ * Function : UpnpCloseLog						
+ *								
+ * Parameters:	void					
+ *								
+ * Description:							
+ *	This functions closes the log files
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
-void UpnpCloseLog(void);
+void UpnpCloseLog();
 #else
-static UPNP_INLINE void UpnpCloseLog(void) {}
+static UPNP_INLINE void UpnpCloseLog() {}
 #endif
 
 
-/*!
- * \brief Set the name for error and information files, respectively.
- */
+/***************************************************************************
+ * 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
+ ***************************************************************************/
 #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(
@@ -156,20 +172,24 @@ static UPNP_INLINE void UpnpSetLogFileNames(
 #endif
 
 
-/*!
- * \brief Check if the module is turned on for debug and returns the file
- * descriptor corresponding to the debug level
- *
- * \return NULL if the module is turn off for debug otheriwse returns the
- *	right file descriptor.
- */
+/***************************************************************************
+ * 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 *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);
+FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module);
 #else
 static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module)
 {
@@ -178,47 +198,60 @@ static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module
 #endif
 
 
-/*!
- * \brief Returns true if debug output should be done in this module.
+/***************************************************************************
+ * 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.
  *
- * \return Nonzero value if true, zero if false.
- */
+ * Returns: int
+ ***************************************************************************/
 #ifdef DEBUG
 int DebugAtThisLevel(
-	/*! [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 Upnp_LogLevel DLevel,
+	IN Dbg_Module Module);
 #else
 static UPNP_INLINE int DebugAtThisLevel(
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module)
-{
-	return 0;
-}
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module) { return 0; }
 #endif
 
 
-/*!
- * \brief Prints the debug statement either on the standard output or log file
- * along with the information from where this debug statement is coming.
- */ 
+/***************************************************************************
+ * 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] 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 */
@@ -232,44 +265,29 @@ static UPNP_INLINE void UpnpPrintf(
 	const char* DbgFileName,
 	int DbgLineNo,
 	const char* FmtStr,
-	...)
-{
-}
+	...) {}
 #endif /* DEBUG */
 
 
-/*!
- * \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
- */
+/***************************************************************************
+ * 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 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(
@@ -280,49 +298,33 @@ static UPNP_INLINE void UpnpDisplayBanner(
 #endif
 
 
-/*!
- * \brief Prints thread pool statistics.
- */
+/***************************************************************************
+ * 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 PrintThreadPoolStats(
-	/*! [in] The thread pool. */
-	ThreadPool *tp, 
-	/*! [in] The file name that called this function, use the macro __FILE__. */
+void UpnpDisplayFileAndLine(
+	FILE *fd,
 	const char *DbgFileName,
-	/*! [in] The line number that the function was called, use the macro __LINE__. */
-	int DbgLineNo,
-	/*! [in] The message. */
-	const char *msg);
+	int DbgLineNo);
 #else
-static UPNP_INLINE void PrintThreadPoolStats(
-	ThreadPool *tp, 
+static UPNP_INLINE void UpnpDisplayFileAndLine(
+	FILE *fd,
 	const char *DbgFileName,
-	int DbgLineNo,
-	const char *msg)
-{
-}
+	int DbgLineNo) {}
 #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

@@ -1,97 +0,0 @@
-#							-*- 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,9 +69,8 @@ upnp_tv_combo_SOURCES = \
 if WITH_DOCUMENTATION
 examplesdir = $(docdir)/examples
 examples_DATA = \
-		$(sort \
-			$(upnp_tv_ctrlpt_SOURCES) \
-			$(upnp_tv_device_SOURCES))
+		$(upnp_tv_ctrlpt_SOURCES) \
+		$(upnp_tv_device_SOURCES)
 endif
 
 

upnp/sample/common/sample_util.h

@@ -166,7 +166,7 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType,
  ********************************************************************************/
 int SampleUtil_FindAndParseService (
 	IN IXML_Document *DescDoc,
-	IN const char *location,
+	IN char* location, 
 	IN char *serviceType,
 	OUT char **serviceId, 
 	OUT char **eventURL,

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,8 +130,7 @@ 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, described in the tvdevicedesc.xml description document." );
-    SampleUtil_Print( "It also registers itself as a tv device." );
+    SampleUtil_Print( "devices. While registers a tv device itself." );
     SampleUtil_Print( "" );
     SampleUtil_Print( "Commands:" );
     SampleUtil_Print( "  Help" );
@@ -457,8 +456,7 @@ int main( int argc, char **argv )
 {
     int rc;
     ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
+#ifndef WIN32
     int sig;
     sigset_t sigs_to_catch;
 #endif
@@ -473,9 +471,7 @@ int main( int argc, char **argv )
     /* start a command loop thread */
     code = ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL );
 
-#ifdef WIN32
-    ithread_join(cmdloop_thread, NULL);
-#else
+#ifndef WIN32
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -484,8 +480,12 @@ int main( int argc, char **argv )
     sigwait( &sigs_to_catch, &sig );
 
     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
+#else
+	ithread_join(cmdloop_thread, NULL);
 #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,10 +138,11 @@ TvCtrlPointDeleteNode( struct TvDeviceNode *node )
  *   UDN -- The Unique Device Name for the device to remove
  *
  ********************************************************************************/
-int TvCtrlPointRemoveDevice(const char *UDN)
+int
+TvCtrlPointRemoveDevice( char *UDN )
 {
-    struct TvDeviceNode *curdevnode;
-    struct TvDeviceNode *prevdevnode;
+    struct TvDeviceNode *curdevnode,
+     *prevdevnode;
 
     ithread_mutex_lock( &DeviceListMutex );
 
@@ -667,8 +668,8 @@ TvCtrlPointPrintDevice( int devnum )
  *
  ********************************************************************************/
 void
-TvCtrlPointAddDevice( IXML_Document *DescDoc,
-                      const char *location,
+TvCtrlPointAddDevice( IXML_Document * DescDoc,
+                      char *location,
                       int expires )
 {
     char *deviceType = NULL;
@@ -681,19 +682,20 @@ 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;
-    int var;
+    int service,
+      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 =
@@ -701,8 +703,9 @@ 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,
@@ -936,36 +939,34 @@ TvStateUpdate( char *UDN,
  *   changes -- The DOM document representing the changes
  *
  ********************************************************************************/
-void TvCtrlPointHandleEvent(
-	const Upnp_SID sid,
-	int evntkey,
-	IXML_Document *changes)
+void
+TvCtrlPointHandleEvent( Upnp_SID sid,
+                        int evntkey,
+                        IXML_Document * changes )
 {
-	struct TvDeviceNode *tmpdevnode;
-	int service;
+    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);
-				break;
-			}
-		}
-		tmpdevnode = tmpdevnode->next;
-	}
+    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 );
 
-	ithread_mutex_unlock(&DeviceListMutex);
+                TvStateUpdate( tmpdevnode->device.UDN, service, changes,
+                               ( char ** )&tmpdevnode->device.
+                               TvService[service].VariableStrVal );
+                break;
+            }
+        }
+        tmpdevnode = tmpdevnode->next;
+    }
+
+    ithread_mutex_unlock( &DeviceListMutex );
 }
 
 /********************************************************************************
@@ -982,10 +983,10 @@ void TvCtrlPointHandleEvent(
  *   timeout  -- The new timeout for the subscription
  *
  ********************************************************************************/
-void TvCtrlPointHandleSubscribeUpdate(
-	const char *eventURL,
-	const Upnp_SID sid,
-	int timeout)
+void
+TvCtrlPointHandleSubscribeUpdate( char *eventURL,
+                                  Upnp_SID sid,
+                                  int timeout )
 {
     struct TvDeviceNode *tmpdevnode;
     int service;
@@ -1013,10 +1014,10 @@ void TvCtrlPointHandleSubscribeUpdate(
     ithread_mutex_unlock( &DeviceListMutex );
 }
 
-void TvCtrlPointHandleGetVar(
-	const char *controlURL,
-	const char *varName,
-	const DOMString varValue)
+void
+TvCtrlPointHandleGetVar( char *controlURL,
+                         char *varName,
+                         DOMString varValue )
 {
 
     struct TvDeviceNode *tmpdevnode;
@@ -1025,11 +1026,14 @@ void TvCtrlPointHandleGetVar(
     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;
             }
         }
@@ -1053,137 +1057,186 @@ void TvCtrlPointHandleGetVar(
  *   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 )
 {
-	/*int errCode = 0;*/
+    SampleUtil_PrintEvent( EventType, Event );
 
-	SampleUtil_PrintEvent(EventType, Event);
-	switch ( EventType ) {
-	/* SSDP Stuff */
-	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
-	case UPNP_DISCOVERY_SEARCH_RESULT: {
-		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
-		IXML_Document *DescDoc = NULL;
-		int ret;
+    switch ( EventType ) {
+            /*
+               SSDP Stuff 
+             */
+        case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
+        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);
-		}
-		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);
-		}
-		if (DescDoc) {
-			ixmlDocument_free(DescDoc);
-		}
-		TvCtrlPointPrintList();
-		break;
-	}
-	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
-		/* Nothing to do here... */
-		break;
-	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 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();
-		break;
-	}
-	/* SOAP Stuff */
-	case UPNP_CONTROL_ACTION_COMPLETE: {
-		struct Upnp_Action_Complete *a_event = (struct Upnp_Action_Complete *)Event;
+                if( ( ret =
+                      UpnpDownloadXmlDoc( d_event->Location,
+                                          &DescDoc ) ) !=
+                    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 );
+                }
 
-		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. */
-		break;
-	}
-	case UPNP_CONTROL_GET_VAR_COMPLETE: {
-		struct Upnp_State_Var_Complete *sv_event = (struct Upnp_State_Var_Complete *)Event;
+                if( DescDoc )
+                    ixmlDocument_free( DescDoc );
 
-		if (sv_event->ErrCode != UPNP_E_SUCCESS) {
-			SampleUtil_Print(
-				"Error in Get Var Complete Callback -- %d", sv_event->ErrCode);
-		} else {
-			TvCtrlPointHandleGetVar(
-				sv_event->CtrlUrl,
-				sv_event->StateVarName,
-				sv_event->CurrentVal);
-		}
-		break;
-	}
-	/* GENA Stuff */
-	case UPNP_EVENT_RECEIVED: {
-		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+                TvCtrlPointPrintList();
+                break;
+            }
 
-		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_DISCOVERY_SEARCH_TIMEOUT:
+            /*
+               Nothing to do here... 
+             */
+            break;
 
-		if (es_event->ErrCode != UPNP_E_SUCCESS) {
-			SampleUtil_Print(
-				"Error in Event Subscribe Callback -- %d", es_event->ErrCode);
-		} else {
-			TvCtrlPointHandleSubscribeUpdate(
-				es_event->PublisherUrl,
-				es_event->Sid,
-				es_event->TimeOut);
-		}
-		break;
-	}
-	case UPNP_EVENT_AUTORENEWAL_FAILED:
-	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;
+        case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
+            {
+                struct Upnp_Discovery *d_event =
+                    ( struct Upnp_Discovery * )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);
-		} else {
-			SampleUtil_Print("Error Subscribing to EventURL -- %d", ret);
-		}
-		break;
-	}
-	/* 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:
-		break;
-	}
+                if( d_event->ErrCode != UPNP_E_SUCCESS ) {
+                    SampleUtil_Print
+                        ( "Error in Discovery ByeBye Callback -- %d",
+                          d_event->ErrCode );
+                }
 
-	return 0;
+                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;
+
+                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. 
+                 */
+
+                break;
+            }
+
+        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 );
+                } else {
+                    TvCtrlPointHandleGetVar( sv_event->CtrlUrl,
+                                             sv_event->StateVarName,
+                                             sv_event->CurrentVal );
+                }
+
+                break;
+            }
+
+            /*
+               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 );
+                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;
+
+                if( es_event->ErrCode != UPNP_E_SUCCESS ) {
+                    SampleUtil_Print
+                        ( "Error in Event Subscribe Callback -- %d",
+                          es_event->ErrCode );
+                } else {
+                    TvCtrlPointHandleSubscribeUpdate( es_event->
+                                                      PublisherUrl,
+                                                      es_event->Sid,
+                                                      es_event->TimeOut );
+                }
+
+                break;
+            }
+
+        case UPNP_EVENT_AUTORENEWAL_FAILED:
+        case UPNP_EVENT_SUBSCRIPTION_EXPIRED:
+            {
+                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 );
+                } else {
+                    SampleUtil_Print
+                        ( "Error Subscribing to EventURL -- %d", ret );
+                }
+                break;
+            }
+
+            /*
+               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:
+            break;
+    }
+
+    return 0;
 }
 
 /********************************************************************************
@@ -1267,12 +1320,12 @@ TvCtrlPointVerifyTimeouts( int incr )
  *    None
  *
  ********************************************************************************/
-static int TvCtrlPointTimerLoopRun = 1;
-void *TvCtrlPointTimerLoop(void *args)
+void *
+TvCtrlPointTimerLoop( void *args )
 {
     int incr = 30;              // how often to verify the timeouts, in seconds
 
-    while (TvCtrlPointTimerLoopRun) {
+    while( 1 ) {
         isleep( incr );
         TvCtrlPointVerifyTimeouts( incr );
     }
@@ -1295,72 +1348,70 @@ void *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;
-	unsigned short port = 0;
-	char *ip_address = NULL;
+    ithread_t timer_thread;
+    int rc;
+    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 Sdk with\n"
-		"\tipaddress = %s port = %u\n",
-		ip_address, port);
+    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();
-	}
+    rc = UpnpInit( ip_address, port );
+    if( UPNP_E_SUCCESS != rc ) {
+        SampleUtil_Print( "WinCEStart: UpnpInit() Error: %d", rc );
+        //UpnpFinish();
+        //return TV_ERROR;
+    }
 
-	SampleUtil_Print(
-		"UPnP Initialized\n"
-		"\tipaddress= %s port = %u\n",
-		ip_address, port);
+    if( NULL == ip_address ) {
+        ip_address = UpnpGetServerIpAddress();
+    }
+    if( 0 == port ) {
+        port = UpnpGetServerPort();
+    }
 
-	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();
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
+        ip_address, port );
 
-		return TV_ERROR;
-	}
+    SampleUtil_Print( "Registering Control Point" );
+    rc = UpnpRegisterClient( TvCtrlPointCallbackEventHandler,
+                             &ctrlpt_handle, &ctrlpt_handle );
+    if( UPNP_E_SUCCESS != rc ) {
+        SampleUtil_Print( "Error registering CP: %d", rc );
+        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);
-	ithread_detach(timer_thread);
+    // start a timer thread
+    ithread_create( &timer_thread, NULL, TvCtrlPointTimerLoop, NULL );
 
-	return TV_SUCCESS;
+    return TV_SUCCESS;
 }
 
-int TvCtrlPointStop(void)
+int
+TvCtrlPointStop( void )
 {
-	TvCtrlPointTimerLoopRun = 0;
-	TvCtrlPointRemoveAll();
-	UpnpUnRegisterClient( ctrlpt_handle );
-	UpnpFinish();
-	SampleUtil_Finish();
+    TvCtrlPointRemoveAll();
+    UpnpUnRegisterClient( ctrlpt_handle );
+    UpnpFinish();
+    SampleUtil_Finish();
 
-	return TV_SUCCESS;
+    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
@@ -111,8 +111,8 @@ extern ithread_mutex_t DeviceListMutex;
 extern UpnpClient_Handle ctrlpt_handle;
 
 void	TvCtrlPointPrintHelp( void );
-int		TvCtrlPointDeleteNode(struct TvDeviceNode *);
-int		TvCtrlPointRemoveDevice(const char *);
+int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
+int		TvCtrlPointRemoveDevice(char*);
 int		TvCtrlPointRemoveAll( void );
 int		TvCtrlPointRefresh( void );
 
@@ -140,11 +140,11 @@ int		TvCtrlPointGetBrightness(int);
 int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
 int		TvCtrlPointPrintList( void );
 int		TvCtrlPointPrintDevice(int);
-void	TvCtrlPointAddDevice(IXML_Document *, const char *, int); 
-void    TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
+void	TvCtrlPointAddDevice (IXML_Document *, char *, int); 
+void    TvCtrlPointHandleGetVar(char *,char *,DOMString);
 void	TvStateUpdate(char*,int, IXML_Document * , char **);
-void	TvCtrlPointHandleEvent(const Upnp_SID, int, IXML_Document *); 
-void	TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); 
+void	TvCtrlPointHandleEvent(Upnp_SID, int, IXML_Document *); 
+void	TvCtrlPointHandleSubscribeUpdate(char *, Upnp_SID, int); 
 int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
 void	TvCtrlPointVerifyTimeouts(int);
 void	TvCtrlPointPrintCommands( void );

upnp/sample/tvcombo/upnp_tv_device.c

@@ -1,47 +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 "upnp_tv_device.h"
 
-
-#include <assert.h>
-
-
 #define DEFAULT_WEB_DIR "./web"
 
-
 #define DESC_URL_SIZE 200
 
-
 /*
    Device type for tv device 
  */
@@ -185,6 +178,7 @@ SetServiceTable( IN int serviceType,
     }
 
     return SetActionTable( serviceType, out );
+
 }
 
 /******************************************************************************
@@ -255,6 +249,7 @@ SetActionTable( IN int serviceType,
     }
 
     return 0;
+
 }
 
 /******************************************************************************
@@ -377,10 +372,10 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
 {
     unsigned int i = 0;         //,j=0;
 
-	// IXML_Document *PropSet = NULL;
+    // IXML_Document *PropSet=NULL;
 
-	// lock state mutex
-	ithread_mutex_lock( &TVDevMutex );
+    //lock state mutex
+    ithread_mutex_lock( &TVDevMutex );
 
     for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
         if( ( strcmp( sr_event->UDN, tv_service_table[i].UDN ) == 0 ) &&
@@ -388,48 +383,44 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
               == 0 ) ) {
 
             /*
-			PropSet = NULL;
+               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, 
-					tv_service_table[i].VariableName[j],
-					tv_service_table[i].VariableStrVal[j]);
-			}
+               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, 
-				sr_event->ServiceId,
-				PropSet,
-				sr_event->Sid);
-			// free document
-			Document_free(PropSet);
+               //dump initial state 
+               UpnpAcceptSubscriptionExt(device_handle, sr_event->UDN, 
+               sr_event->ServiceId,
+               PropSet,sr_event->Sid);
+               //free document
+               Document_free(PropSet);
 
              */
 
-			UpnpAcceptSubscription( device_handle,
-				sr_event->UDN,
-				sr_event->ServiceId,
-				(const char **)tv_service_table[i].
-				VariableName,
-				(const char **)tv_service_table[i].
-				VariableStrVal,
-				tv_service_table[i].VariableCount,
-				sr_event->Sid);
+            UpnpAcceptSubscription( device_handle,
+                                    sr_event->UDN,
+                                    sr_event->ServiceId,
+                                    ( const char ** )tv_service_table[i].
+                                    VariableName,
+                                    ( const char ** )tv_service_table[i].
+                                    VariableStrVal,
+                                    tv_service_table[i].VariableCount,
+                                    sr_event->Sid );
 
-		}
-	}
+        }
+    }
 
-	ithread_mutex_unlock( &TVDevMutex );
+    ithread_mutex_unlock( &TVDevMutex );
 
-	return 1;
+    return ( 1 );
 }
 
-
 /******************************************************************************
  * TvDeviceHandleGetVarRequest
  *
@@ -446,8 +437,8 @@ int
 TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
                              *cgv_event )
 {
-    unsigned int i = 0;
-    unsigned int j = 0;
+    unsigned int i = 0,
+      j = 0;
     int getvar_succeeded = 0;
 
     cgv_event->CurrentVal = NULL;
@@ -455,12 +446,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 ) {
@@ -505,6 +496,7 @@ TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
 int
 TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
 {
+
     /*
        Defaults if action not found 
      */
@@ -557,7 +549,7 @@ TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
                                                            ActionRequest,
                                                            &ca_event->
                                                            ActionResult,
-                    &errorString );
+                                                           &errorString );
             } else {
                 errorString = "Power is Off";
                 retCode = UPNP_E_INTERNAL_ERROR;
@@ -575,7 +567,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:
@@ -657,6 +649,7 @@ TvDeviceSetServiceTableVar( IN unsigned int service,
     ithread_mutex_unlock( &TVDevMutex );
 
     return ( 1 );
+
 }
 
 /******************************************************************************
@@ -679,7 +672,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 );
     }
 
     /*
@@ -690,7 +683,7 @@ TvDeviceSetPower( IN int on )
     ret = TvDeviceSetServiceTableVar( TV_SERVICE_CONTROL, TV_CONTROL_POWER,
                                       value );
 
-    return ret;
+    return ( ret );
 }
 
 /******************************************************************************
@@ -707,7 +700,9 @@ 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;
@@ -727,6 +722,7 @@ TvDevicePowerOn( IN IXML_Document *in, OUT IXML_Document **out, OUT char **error
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -744,7 +740,7 @@ TvDevicePowerOn( IN IXML_Document *in, OUT IXML_Document **out, OUT char **error
  *****************************************************************************/
 int
 TvDevicePowerOff( IN IXML_Document * in,
-                  OUT IXML_Document **out,
+                  OUT IXML_Document ** out,
                   OUT char **errorString )
 {
     ( *out ) = NULL;
@@ -783,8 +779,11 @@ 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;
@@ -829,6 +828,7 @@ TvDeviceSetChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **er
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -846,10 +846,13 @@ TvDeviceSetChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **er
  *    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;
-    int newchannel;
+    int curchannel,
+      newchannel;
 
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
@@ -911,9 +914,12 @@ IncrementChannel( IN int incr, IN IXML_Document * in, OUT IXML_Document **out, O
  *
  *****************************************************************************/
 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 );
+
 }
 
 /******************************************************************************
@@ -930,9 +936,12 @@ TvDeviceDecreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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 );
+
 }
 
 /******************************************************************************
@@ -951,9 +960,13 @@ TvDeviceIncreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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;
@@ -994,6 +1007,7 @@ TvDeviceSetVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **err
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1012,7 +1026,10 @@ TvDeviceSetVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **err
  *
  *****************************************************************************/
 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;
@@ -1049,7 +1066,8 @@ IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT
                                     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;
@@ -1059,6 +1077,7 @@ IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1075,9 +1094,13 @@ IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT
  *    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 );
+
 }
 
 /******************************************************************************
@@ -1094,9 +1117,13 @@ TvDeviceIncreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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 );
+
 }
 
 /******************************************************************************
@@ -1115,9 +1142,13 @@ TvDeviceDecreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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;
@@ -1157,6 +1188,7 @@ TvDeviceSetColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **erro
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1173,11 +1205,16 @@ TvDeviceSetColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **erro
  *    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;
-    int newcolor;
+    int curcolor,
+      newcolor;
+
     char *actionName;
     char value[TV_MAX_VAL_LEN];
 
@@ -1235,8 +1272,11 @@ IncrementColor( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT
  *    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 );
 }
 
@@ -1253,8 +1293,11 @@ TvDeviceDecreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
  *    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 );
 }
 
@@ -1274,9 +1317,13 @@ TvDeviceIncreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
  *
  *****************************************************************************/
 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;
@@ -1335,10 +1382,14 @@ TvDeviceSetTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **error
  *    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;
-    int newtint;
+    int curtint,
+      newtint;
+
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1381,6 +1432,7 @@ IncrementTint( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT c
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1397,8 +1449,11 @@ IncrementTint( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *
  *****************************************************************************/
 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 );
 }
 
@@ -1416,8 +1471,11 @@ TvDeviceIncreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **
  *
  *****************************************************************************/
 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 );
 }
 
@@ -1437,8 +1495,11 @@ TvDeviceDecreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **
  *
  ****************************************************************************/
 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;
 
@@ -1499,10 +1560,14 @@ TvDeviceSetContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **e
  *    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;
-    int newcontrast;
+    int curcontrast,
+      newcontrast;
+
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1564,8 +1629,11 @@ IncrementContrast( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, O
  *
  *****************************************************************************/
 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 );
 }
 
@@ -1583,7 +1651,9 @@ TvDeviceIncreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT cha
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
+TvDeviceDecreaseContrast( IXML_Document * in,
+                          IXML_Document ** out,
+                          char **errorString )
 {
     return IncrementContrast( -1, in, out, errorString );
 }
@@ -1601,8 +1671,11 @@ TvDeviceDecreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT cha
  *
  *****************************************************************************/
 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;
 
@@ -1645,6 +1718,7 @@ TvDeviceSetBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1662,10 +1736,13 @@ TvDeviceSetBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
  *    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;
-    int newbrightness;
+    int curbrightness,
+      newbrightness;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1726,7 +1803,9 @@ IncrementBrightness( IN int incr, IN IXML_Document *in, OUT IXML_Document **out,
  *
  *****************************************************************************/
 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 );
 }
@@ -1744,7 +1823,9 @@ TvDeviceIncreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *
  *****************************************************************************/
 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 );
 }
@@ -1768,9 +1849,14 @@ TvDeviceDecreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *   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
@@ -1804,14 +1890,17 @@ int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Co
             break;
 
         default:
-            SampleUtil_Print( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
-                EventType );
+            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 );
 }
 
 /******************************************************************************
@@ -1830,7 +1919,6 @@ TvDeviceStop()
     UpnpFinish();
     SampleUtil_Finish();
     ithread_mutex_destroy( &TVDevMutex );
-
     return UPNP_E_SUCCESS;
 }
 
@@ -1863,6 +1951,7 @@ TvDeviceStart( char *ip_address,
                print_string pfun )
 {
     int ret = UPNP_E_SUCCESS;
+
     char desc_doc_url[DESC_URL_SIZE];
 
     ithread_mutex_init( &TVDevMutex, NULL );
@@ -1874,15 +1963,19 @@ TvDeviceStart( char *ip_address,
         "\tipaddress = %s port = %u\n",
         ip_address, port );
 
-    ret = UpnpInit( ip_address, port );
-    if( ret != UPNP_E_SUCCESS ) {
+    if( ( ret = UpnpInit( ip_address, port ) ) != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error with UpnpInit -- %d\n", ret );
         UpnpFinish();
         return ret;
     }
 
-    ip_address = UpnpGetServerIpAddress();
-    port = UpnpGetServerPort();
+    if( ip_address == NULL ) {
+        ip_address = UpnpGetServerIpAddress();
+    }
+
+    if( port == 0 ) {
+        port = UpnpGetServerPort();
+    }
 
     SampleUtil_Print(
         "UPnP Initialized\n"
@@ -1902,12 +1995,12 @@ TvDeviceStart( char *ip_address,
 
     SampleUtil_Print( "Specifying the webserver root directory -- %s\n",
                       web_dir_path );
-    ret = UpnpSetWebServerRootDir( web_dir_path );
-    if( ret != UPNP_E_SUCCESS ) {
-        SampleUtil_Print( "Error specifying webserver root directory -- %s: %d\n",
+    if( ( ret =
+          UpnpSetWebServerRootDir( web_dir_path ) ) != UPNP_E_SUCCESS ) {
+        SampleUtil_Print
+            ( "Error specifying webserver root directory -- %s: %d\n",
               web_dir_path, ret );
         UpnpFinish();
-
         return ret;
     }
 
@@ -1916,12 +2009,12 @@ TvDeviceStart( char *ip_address,
         "\t with desc_doc_url: %s\n",
         desc_doc_url );
 
-    ret = UpnpRegisterRootDevice( desc_doc_url, TvDeviceCallbackEventHandler,
-        &device_handle, &device_handle );
-    if( ret != UPNP_E_SUCCESS ) {
+    if( ( ret = UpnpRegisterRootDevice( desc_doc_url,
+                                        TvDeviceCallbackEventHandler,
+                                        &device_handle, &device_handle ) )
+        != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error registering the rootdevice : %d\n", ret );
         UpnpFinish();
-
         return ret;
     } else {
         SampleUtil_Print(
@@ -1929,17 +2022,17 @@ TvDeviceStart( char *ip_address,
             "Initializing State Table\n");
         TvDeviceStateTableInit( desc_doc_url );
         SampleUtil_Print("State Table Initialized\n");
-        ret = UpnpSendAdvertisement( device_handle, default_advr_expire );
-        if( ret != UPNP_E_SUCCESS ) {
+
+        if( ( ret =
+              UpnpSendAdvertisement( device_handle, default_advr_expire ) )
+            != UPNP_E_SUCCESS ) {
             SampleUtil_Print( "Error sending advertisements : %d\n", ret );
             UpnpFinish();
-
             return ret;
         }
 
         SampleUtil_Print("Advertisements Sent\n");
     }
-
     return UPNP_E_SUCCESS;
 }
 

upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_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"
@@ -401,29 +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
+#ifndef WIN32
     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" );
         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
+#ifndef WIN32
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -431,11 +431,11 @@ int main( int argc, char **argv )
     sigaddset( &sigs_to_catch, SIGINT );
     sigwait( &sigs_to_catch, &sig );
 
-    SampleUtil_Print( "Shutting down on signal %d...\n", sig );
+    SampleUtil_Print( "Shutting down on signal %d...", sig );
+#else
+	ithread_join(cmdloop_thread, NULL);
 #endif
 
     rc = TvCtrlPointStop();
-
     return rc;
 }
-

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c

@@ -1,42 +1,37 @@
-/*******************************************************************************
- *
- * 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
@@ -53,7 +48,7 @@ char *TvServiceType[] = {
 };
 char *TvServiceName[] = { "Control", "Picture" };
 
-/*!
+/*
    Global arrays for storing variable names and counts for 
    TvControl and TvPicture services 
  */
@@ -64,12 +59,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;
@@ -144,10 +139,10 @@ TvCtrlPointDeleteNode( struct TvDeviceNode *node )
  *
  ********************************************************************************/
 int
-TvCtrlPointRemoveDevice(const char *UDN)
+TvCtrlPointRemoveDevice( char *UDN )
 {
-    struct TvDeviceNode *curdevnode;
-    struct TvDeviceNode *prevdevnode;
+    struct TvDeviceNode *curdevnode,
+     *prevdevnode;
 
     ithread_mutex_lock( &DeviceListMutex );
 
@@ -673,8 +668,8 @@ TvCtrlPointPrintDevice( int devnum )
  *
  ********************************************************************************/
 void
-TvCtrlPointAddDevice( IXML_Document *DescDoc,
-                      const char *location,
+TvCtrlPointAddDevice( IXML_Document * DescDoc,
+                      char *location,
                       int expires )
 {
     char *deviceType = NULL;
@@ -687,19 +682,20 @@ 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;
-    int var;
+    int service,
+      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 =
@@ -707,8 +703,9 @@ 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,
@@ -942,36 +939,34 @@ TvStateUpdate( char *UDN,
  *   changes -- The DOM document representing the changes
  *
  ********************************************************************************/
-void TvCtrlPointHandleEvent(
-	const Upnp_SID sid,
-	int evntkey,
-	IXML_Document *changes)
+void
+TvCtrlPointHandleEvent( Upnp_SID sid,
+                        int evntkey,
+                        IXML_Document * changes )
 {
-	struct TvDeviceNode *tmpdevnode;
-	int service;
+    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);
-				break;
-			}
-		}
-		tmpdevnode = tmpdevnode->next;
-	}
+    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 );
 
-	ithread_mutex_unlock(&DeviceListMutex);
+                TvStateUpdate( tmpdevnode->device.UDN, service, changes,
+                               ( char ** )&tmpdevnode->device.
+                               TvService[service].VariableStrVal );
+                break;
+            }
+        }
+        tmpdevnode = tmpdevnode->next;
+    }
+
+    ithread_mutex_unlock( &DeviceListMutex );
 }
 
 /********************************************************************************
@@ -988,10 +983,10 @@ void TvCtrlPointHandleEvent(
  *   timeout  -- The new timeout for the subscription
  *
  ********************************************************************************/
-void TvCtrlPointHandleSubscribeUpdate(
-	const char *eventURL,
-	const Upnp_SID sid,
-	int timeout)
+void
+TvCtrlPointHandleSubscribeUpdate( char *eventURL,
+                                  Upnp_SID sid,
+                                  int timeout )
 {
     struct TvDeviceNode *tmpdevnode;
     int service;
@@ -1020,9 +1015,9 @@ void TvCtrlPointHandleSubscribeUpdate(
 }
 
 void
-TvCtrlPointHandleGetVar( const char *controlURL,
-                         const char *varName,
-                         const DOMString varValue )
+TvCtrlPointHandleGetVar( char *controlURL,
+                         char *varName,
+                         DOMString varValue )
 {
 
     struct TvDeviceNode *tmpdevnode;
@@ -1031,11 +1026,14 @@ TvCtrlPointHandleGetVar( const 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;
             }
         }
@@ -1059,152 +1057,186 @@ TvCtrlPointHandleGetVar( const 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 )
 {
-	/*int errCode = 0;*/
+    SampleUtil_PrintEvent( EventType, Event );
 
-	SampleUtil_PrintEvent(EventType, Event);
-	switch ( EventType ) {
-	/* SSDP Stuff */
-	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
-	case UPNP_DISCOVERY_SEARCH_RESULT: {
-		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
-		IXML_Document *DescDoc = NULL;
-		int ret;
+    switch ( EventType ) {
+            /*
+               SSDP Stuff 
+             */
+        case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
+        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 );
+                }
 
-		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);
-		}
+                if( ( ret =
+                      UpnpDownloadXmlDoc( d_event->Location,
+                                          &DescDoc ) ) !=
+                    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 );
+                }
 
-		if( DescDoc ) {
-			ixmlDocument_free(DescDoc);
-		}
+                if( DescDoc )
+                    ixmlDocument_free( DescDoc );
 
-		TvCtrlPointPrintList();
-		break;
-	}
+                TvCtrlPointPrintList();
+                break;
+            }
 
-	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
-		/* Nothing to do here... */
-		break;
+        case UPNP_DISCOVERY_SEARCH_TIMEOUT:
+            /*
+               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;
+                break;
+            }
 
-		if (a_event->ErrCode != UPNP_E_SUCCESS) {
-			SampleUtil_Print(
-				"Error in  Action Complete Callback -- %d",
-				a_event->ErrCode);
-		}
+            /*
+               SOAP Stuff 
+             */
+        case UPNP_CONTROL_ACTION_COMPLETE:
+            {
+                struct Upnp_Action_Complete *a_event =
+                    ( struct Upnp_Action_Complete * )Event;
 
-		/* No need for any processing here, just print out results.
-		 * Service state table updates are handled by events. */
+                if( a_event->ErrCode != UPNP_E_SUCCESS ) {
+                    SampleUtil_Print
+                        ( "Error in  Action Complete Callback -- %d",
+                          a_event->ErrCode );
+                }
 
-		break;
-	}
-	case UPNP_CONTROL_GET_VAR_COMPLETE: {
-		struct Upnp_State_Var_Complete *sv_event = (struct Upnp_State_Var_Complete *)Event;
+                /*
+                   No need for any processing here, just print out results.  Service state
+                   table updates are handled by events. 
+                 */
 
-		if (sv_event->ErrCode != UPNP_E_SUCCESS) {
-			SampleUtil_Print(
-				"Error in Get Var Complete Callback -- %d",
-				sv_event->ErrCode);
-		} else {
-			TvCtrlPointHandleGetVar(
-				sv_event->CtrlUrl,
-				sv_event->StateVarName,
-				sv_event->CurrentVal);
-		}
-		break;
-	}
-	/* GENA Stuff */
-	case UPNP_EVENT_RECEIVED: {
-		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+                break;
+            }
 
-		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_CONTROL_GET_VAR_COMPLETE:
+            {
+                struct Upnp_State_Var_Complete *sv_event =
+                    ( struct Upnp_State_Var_Complete * )Event;
 
-		if (es_event->ErrCode != UPNP_E_SUCCESS) {
-			SampleUtil_Print(
-				"Error in Event Subscribe Callback -- %d",
-				es_event->ErrCode);
-		} else {
-			TvCtrlPointHandleSubscribeUpdate(
-				es_event->PublisherUrl,
-				es_event->Sid,
-				es_event->TimeOut);
-		}
+                if( sv_event->ErrCode != UPNP_E_SUCCESS ) {
+                    SampleUtil_Print
+                        ( "Error in Get Var Complete Callback -- %d",
+                          sv_event->ErrCode );
+                } else {
+                    TvCtrlPointHandleGetVar( sv_event->CtrlUrl,
+                                             sv_event->StateVarName,
+                                             sv_event->CurrentVal );
+                }
 
-		break;
-	}
-	case UPNP_EVENT_AUTORENEWAL_FAILED:
-	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;
+                break;
+            }
 
-		ret = UpnpSubscribe(
-			ctrlpt_handle,
-			es_event->PublisherUrl,
-			&TimeOut,
-			newSID);
+            /*
+               GENA Stuff 
+             */
+        case UPNP_EVENT_RECEIVED:
+            {
+                struct Upnp_Event *e_event = ( struct Upnp_Event * )Event;
 
-		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);
-		}
-		break;
-	}
-	/* 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:
-		break;
-	}
+                TvCtrlPointHandleEvent( e_event->Sid, e_event->EventKey,
+                                        e_event->ChangedVariables );
+                break;
+            }
 
-	return 0;
+        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;
+
+                if( es_event->ErrCode != UPNP_E_SUCCESS ) {
+                    SampleUtil_Print
+                        ( "Error in Event Subscribe Callback -- %d",
+                          es_event->ErrCode );
+                } else {
+                    TvCtrlPointHandleSubscribeUpdate( es_event->
+                                                      PublisherUrl,
+                                                      es_event->Sid,
+                                                      es_event->TimeOut );
+                }
+
+                break;
+            }
+
+        case UPNP_EVENT_AUTORENEWAL_FAILED:
+        case UPNP_EVENT_SUBSCRIPTION_EXPIRED:
+            {
+                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 );
+                } else {
+                    SampleUtil_Print
+                        ( "Error Subscribing to EventURL -- %d", ret );
+                }
+                break;
+            }
+
+            /*
+               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:
+            break;
+    }
+
+    return 0;
 }
 
 /********************************************************************************
@@ -1288,12 +1320,12 @@ TvCtrlPointVerifyTimeouts( int incr )
  *    None
  *
  ********************************************************************************/
-static int TvCtrlPointTimerLoopRun = 1;
-void *TvCtrlPointTimerLoop(void *args)
+void *
+TvCtrlPointTimerLoop( void *args )
 {
     int incr = 30;              // how often to verify the timeouts, in seconds
 
-    while (TvCtrlPointTimerLoopRun) {
+    while( 1 ) {
         isleep( incr );
         TvCtrlPointVerifyTimeouts( incr );
     }
@@ -1316,70 +1348,70 @@ void *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;
-	unsigned short port = 0;
-	char *ip_address = NULL;
+    ithread_t timer_thread;
+    int rc;
+    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 Sdk with\n"
-		"\tipaddress = %s port = %u\n",
-		ip_address, port);
+    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();
-	}
+    rc = UpnpInit( ip_address, port );
+    if( UPNP_E_SUCCESS != rc ) {
+        SampleUtil_Print( "WinCEStart: UpnpInit() Error: %d", rc );
+        UpnpFinish();
+        return TV_ERROR;
+    }
 
-	SampleUtil_Print(
-		"UPnP Initialized\n"
-		"\tipaddress= %s port = %u\n",
-		ip_address, port);
+    if( NULL == ip_address ) {
+        ip_address = UpnpGetServerIpAddress();
+    }
+    if( 0 == port ) {
+        port = UpnpGetServerPort();
+    }
 
-	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();
+    SampleUtil_Print(
+        "UPnP Initialized\n"
+	"\tipaddress= %s port = %u\n",
+        ip_address, port );
 
-		return TV_ERROR;
-	}
+    SampleUtil_Print( "Registering Control Point" );
+    rc = UpnpRegisterClient( TvCtrlPointCallbackEventHandler,
+                             &ctrlpt_handle, &ctrlpt_handle );
+    if( UPNP_E_SUCCESS != rc ) {
+        SampleUtil_Print( "Error registering CP: %d", rc );
+        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);
-	ithread_detach(timer_thread);
+    // start a timer thread
+    ithread_create( &timer_thread, NULL, TvCtrlPointTimerLoop, NULL );
 
-	return TV_SUCCESS;
+    return TV_SUCCESS;
 }
 
-int TvCtrlPointStop(void)
+int
+TvCtrlPointStop( void )
 {
-	TvCtrlPointTimerLoopRun = 0;
-	TvCtrlPointRemoveAll();
-	UpnpUnRegisterClient( ctrlpt_handle );
-	UpnpFinish();
-	SampleUtil_Finish();
+    TvCtrlPointRemoveAll();
+    UpnpUnRegisterClient( ctrlpt_handle );
+    UpnpFinish();
+    SampleUtil_Finish();
 
-	return TV_SUCCESS;
+    return TV_SUCCESS;
 }
-

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h

@@ -1,65 +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.
+//
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef UPNP_TV_CTRLPT_H
 #define UPNP_TV_CTRLPT_H
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-#include "sample_util.h"
-
+#include <stdio.h>
 
 #include "ithread.h"
-#include "upnp.h"
-#include "upnptools.h"
-
-
-#include <signal.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <signal.h>
 #include <string.h>
 
-
-#ifdef WIN32
-	/* Do not #include <unistd.h> */
-#else
-	#include <unistd.h>
-#endif
-
+#include "upnp.h"
+#include "upnptools.h"
+#include "sample_util.h"
 
 #define TV_SERVICE_SERVCOUNT	2
 #define TV_SERVICE_CONTROL		0
@@ -78,12 +68,12 @@ extern "C" {
 
 #define TV_MAX_VAL_LEN			5
 
-#define TV_SUCCESS			0
-#define TV_ERROR			(-1)
-#define TV_WARNING			1
+#define TV_SUCCESS				0
+#define TV_ERROR				(-1)
+#define TV_WARNING				1
 
 /* This should be the maximum VARCOUNT from above */
-#define TV_MAXVARS			TV_PICTURE_VARCOUNT
+#define TV_MAXVARS				TV_PICTURE_VARCOUNT
 
 extern char TvDeviceType[];
 extern char *TvServiceType[];
@@ -120,11 +110,11 @@ extern ithread_mutex_t DeviceListMutex;
 
 extern UpnpClient_Handle ctrlpt_handle;
 
-void		TvCtrlPointPrintHelp(void);
+void	TvCtrlPointPrintHelp( void );
 int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
-int		TvCtrlPointRemoveDevice(const char *);
-int		TvCtrlPointRemoveAll(void);
-int		TvCtrlPointRefresh(void);
+int		TvCtrlPointRemoveDevice(char*);
+int		TvCtrlPointRemoveAll( void );
+int		TvCtrlPointRefresh( void );
 
 
 int		TvCtrlPointSendAction(int, int, char *, char **, char **, int);
@@ -150,11 +140,11 @@ int		TvCtrlPointGetBrightness(int);
 int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
 int		TvCtrlPointPrintList( void );
 int		TvCtrlPointPrintDevice(int);
-void	TvCtrlPointAddDevice(IXML_Document *, const char *, int); 
-void    TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
+void	TvCtrlPointAddDevice (IXML_Document *, char *, int); 
+void    TvCtrlPointHandleGetVar(char *,char *,DOMString);
 void	TvStateUpdate(char*,int, IXML_Document * , char **);
-void	TvCtrlPointHandleEvent(const Upnp_SID, int, IXML_Document *); 
-void	TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); 
+void	TvCtrlPointHandleEvent(Upnp_SID, int, IXML_Document *); 
+void	TvCtrlPointHandleSubscribeUpdate(char *, 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,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,8 +130,7 @@ int main( IN int argc, IN char **argv )
      *web_dir_path = NULL;
     int rc;
     ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
+#ifndef WIN32
     int sig;
     sigset_t sigs_to_catch;
 #endif
@@ -179,9 +178,7 @@ int main( IN int argc, IN char **argv )
     /* start a command loop thread */
     code = ithread_create( &cmdloop_thread, NULL, TvDeviceCommandLoop, NULL );
 
-#ifdef WIN32
-    ithread_join(cmdloop_thread, NULL);
-#else
+#ifndef WIN32
     /*
        Catch Ctrl-C and properly shutdown 
      */
@@ -190,6 +187,8 @@ int main( IN int argc, IN char **argv )
     sigwait( &sigs_to_catch, &sig );
 
     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
+#else
+	ithread_join(cmdloop_thread, NULL);
 #endif
     rc = TvDeviceStop();
     

upnp/sample/tvdevice/upnp_tv_device.c

@@ -1,47 +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 "upnp_tv_device.h"
 
-
-#include <assert.h>
-
-
 #define DEFAULT_WEB_DIR "./web"
 
-
 #define DESC_URL_SIZE 200
 
-
 /*
    Device type for tv device 
  */
@@ -187,6 +180,7 @@ SetServiceTable( IN int serviceType,
     }
 
     return SetActionTable( serviceType, out );
+
 }
 
 /******************************************************************************
@@ -257,6 +251,7 @@ SetActionTable( IN int serviceType,
     }
 
     return 0;
+
 }
 
 /******************************************************************************
@@ -379,10 +374,10 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
 {
     unsigned int i = 0;         //,j=0;
 
-	// IXML_Document *PropSet = NULL;
+    // IXML_Document *PropSet=NULL;
 
-	// lock state mutex
-	ithread_mutex_lock( &TVDevMutex );
+    //lock state mutex
+    ithread_mutex_lock( &TVDevMutex );
 
     for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
         if( ( strcmp( sr_event->UDN, tv_service_table[i].UDN ) == 0 ) &&
@@ -390,48 +385,44 @@ TvDeviceHandleSubscriptionRequest( IN struct Upnp_Subscription_Request
               == 0 ) ) {
 
             /*
-			PropSet = NULL;
+               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, 
-					tv_service_table[i].VariableName[j],
-					tv_service_table[i].VariableStrVal[j]);
-			}
+               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, 
-				sr_event->ServiceId,
-				PropSet,
-				sr_event->Sid);
-			// free document
-			Document_free(PropSet);
+               //dump initial state 
+               UpnpAcceptSubscriptionExt(device_handle, sr_event->UDN, 
+               sr_event->ServiceId,
+               PropSet,sr_event->Sid);
+               //free document
+               Document_free(PropSet);
 
              */
 
-			UpnpAcceptSubscription( device_handle,
-				sr_event->UDN,
-				sr_event->ServiceId,
-				(const char **)tv_service_table[i].
-				VariableName,
-				(const char **)tv_service_table[i].
-				VariableStrVal,
-				tv_service_table[i].VariableCount,
-				sr_event->Sid);
+            UpnpAcceptSubscription( device_handle,
+                                    sr_event->UDN,
+                                    sr_event->ServiceId,
+                                    ( const char ** )tv_service_table[i].
+                                    VariableName,
+                                    ( const char ** )tv_service_table[i].
+                                    VariableStrVal,
+                                    tv_service_table[i].VariableCount,
+                                    sr_event->Sid );
 
-		}
-	}
+        }
+    }
 
-	ithread_mutex_unlock( &TVDevMutex );
+    ithread_mutex_unlock( &TVDevMutex );
 
-	return 1;
+    return ( 1 );
 }
 
-
 /******************************************************************************
  * TvDeviceHandleGetVarRequest
  *
@@ -448,8 +439,8 @@ int
 TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
                              *cgv_event )
 {
-    unsigned int i = 0;
-    unsigned int j = 0;
+    unsigned int i = 0,
+      j = 0;
     int getvar_succeeded = 0;
 
     cgv_event->CurrentVal = NULL;
@@ -457,12 +448,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 ) {
@@ -507,6 +498,7 @@ TvDeviceHandleGetVarRequest( INOUT struct Upnp_State_Var_Request
 int
 TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
 {
+
     /*
        Defaults if action not found 
      */
@@ -559,7 +551,7 @@ TvDeviceHandleActionRequest( INOUT struct Upnp_Action_Request *ca_event )
                                                            ActionRequest,
                                                            &ca_event->
                                                            ActionResult,
-                    &errorString );
+                                                           &errorString );
             } else {
                 errorString = "Power is Off";
                 retCode = UPNP_E_INTERNAL_ERROR;
@@ -577,7 +569,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:
@@ -659,6 +651,7 @@ TvDeviceSetServiceTableVar( IN unsigned int service,
     ithread_mutex_unlock( &TVDevMutex );
 
     return ( 1 );
+
 }
 
 /******************************************************************************
@@ -681,7 +674,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 );
     }
 
     /*
@@ -692,7 +685,7 @@ TvDeviceSetPower( IN int on )
     ret = TvDeviceSetServiceTableVar( TV_SERVICE_CONTROL, TV_CONTROL_POWER,
                                       value );
 
-    return ret;
+    return ( ret );
 }
 
 /******************************************************************************
@@ -709,7 +702,9 @@ 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;
@@ -729,6 +724,7 @@ TvDevicePowerOn( IN IXML_Document *in, OUT IXML_Document **out, OUT char **error
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -746,7 +742,7 @@ TvDevicePowerOn( IN IXML_Document *in, OUT IXML_Document **out, OUT char **error
  *****************************************************************************/
 int
 TvDevicePowerOff( IN IXML_Document * in,
-                  OUT IXML_Document **out,
+                  OUT IXML_Document ** out,
                   OUT char **errorString )
 {
     ( *out ) = NULL;
@@ -785,8 +781,11 @@ 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;
@@ -831,6 +830,7 @@ TvDeviceSetChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **er
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -848,10 +848,13 @@ TvDeviceSetChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char **er
  *    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;
-    int newchannel;
+    int curchannel,
+      newchannel;
 
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
@@ -913,9 +916,12 @@ IncrementChannel( IN int incr, IN IXML_Document * in, OUT IXML_Document **out, O
  *
  *****************************************************************************/
 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 );
+
 }
 
 /******************************************************************************
@@ -932,9 +938,12 @@ TvDeviceDecreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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 );
+
 }
 
 /******************************************************************************
@@ -953,9 +962,13 @@ TvDeviceIncreaseChannel( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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;
@@ -996,6 +1009,7 @@ TvDeviceSetVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **err
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1014,7 +1028,10 @@ TvDeviceSetVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char **err
  *
  *****************************************************************************/
 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;
@@ -1051,7 +1068,8 @@ IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT
                                     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;
@@ -1061,6 +1079,7 @@ IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1077,9 +1096,13 @@ IncrementVolume( IN int incr, IN IXML_Document *in,OUT IXML_Document **out, OUT
  *    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 );
+
 }
 
 /******************************************************************************
@@ -1096,9 +1119,13 @@ TvDeviceIncreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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 );
+
 }
 
 /******************************************************************************
@@ -1117,9 +1144,13 @@ TvDeviceDecreaseVolume( IN IXML_Document *in, OUT IXML_Document **out, OUT char
  *
  *****************************************************************************/
 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;
@@ -1159,6 +1190,7 @@ TvDeviceSetColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **erro
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1175,11 +1207,16 @@ TvDeviceSetColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char **erro
  *    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;
-    int newcolor;
+    int curcolor,
+      newcolor;
+
     char *actionName;
     char value[TV_MAX_VAL_LEN];
 
@@ -1237,8 +1274,11 @@ IncrementColor( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT
  *    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 );
 }
 
@@ -1255,8 +1295,11 @@ TvDeviceDecreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
  *    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 );
 }
 
@@ -1276,9 +1319,13 @@ TvDeviceIncreaseColor( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
  *
  *****************************************************************************/
 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;
@@ -1337,10 +1384,14 @@ TvDeviceSetTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **error
  *    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;
-    int newtint;
+    int curtint,
+      newtint;
+
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1383,6 +1434,7 @@ IncrementTint( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT c
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1399,8 +1451,11 @@ IncrementTint( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *
  *****************************************************************************/
 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 );
 }
 
@@ -1418,8 +1473,11 @@ TvDeviceIncreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **
  *
  *****************************************************************************/
 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 );
 }
 
@@ -1439,8 +1497,11 @@ TvDeviceDecreaseTint( IN IXML_Document *in, OUT IXML_Document **out, OUT char **
  *
  ****************************************************************************/
 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;
 
@@ -1501,10 +1562,14 @@ TvDeviceSetContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **e
  *    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;
-    int newcontrast;
+    int curcontrast,
+      newcontrast;
+
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1566,8 +1631,11 @@ IncrementContrast( IN int incr, IN IXML_Document *in, OUT IXML_Document **out, O
  *
  *****************************************************************************/
 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 );
 }
 
@@ -1585,7 +1653,9 @@ TvDeviceIncreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT cha
  *
  *****************************************************************************/
 int
-TvDeviceDecreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT char **errorString )
+TvDeviceDecreaseContrast( IXML_Document * in,
+                          IXML_Document ** out,
+                          char **errorString )
 {
     return IncrementContrast( -1, in, out, errorString );
 }
@@ -1603,8 +1673,11 @@ TvDeviceDecreaseContrast( IN IXML_Document *in, OUT IXML_Document **out, OUT cha
  *
  *****************************************************************************/
 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;
 
@@ -1647,6 +1720,7 @@ TvDeviceSetBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
         ( *errorString ) = "Internal Error";
         return UPNP_E_INTERNAL_ERROR;
     }
+
 }
 
 /******************************************************************************
@@ -1664,10 +1738,13 @@ TvDeviceSetBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT char *
  *    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;
-    int newbrightness;
+    int curbrightness,
+      newbrightness;
     char *actionName = NULL;
     char value[TV_MAX_VAL_LEN];
 
@@ -1728,7 +1805,9 @@ IncrementBrightness( IN int incr, IN IXML_Document *in, OUT IXML_Document **out,
  *
  *****************************************************************************/
 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 );
 }
@@ -1746,7 +1825,9 @@ TvDeviceIncreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *
  *****************************************************************************/
 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 );
 }
@@ -1770,9 +1851,14 @@ TvDeviceDecreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *   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
@@ -1806,14 +1892,17 @@ int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Co
             break;
 
         default:
-            SampleUtil_Print( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
-                EventType );
+            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 );
 }
 
 /******************************************************************************
@@ -1826,13 +1915,12 @@ int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Co
  *
  *****************************************************************************/
 int
-TvDeviceStop(void)
+TvDeviceStop()
 {
     UpnpUnRegisterRootDevice( device_handle );
     UpnpFinish();
     SampleUtil_Finish();
     ithread_mutex_destroy( &TVDevMutex );
-
     return UPNP_E_SUCCESS;
 }
 
@@ -1865,6 +1953,7 @@ TvDeviceStart( char *ip_address,
                print_string pfun )
 {
     int ret = UPNP_E_SUCCESS;
+
     char desc_doc_url[DESC_URL_SIZE];
 
     ithread_mutex_init( &TVDevMutex, NULL );
@@ -1876,14 +1965,16 @@ TvDeviceStart( char *ip_address,
         "\tipaddress = %s port = %u\n",
         ip_address, port );
 
-    ret = UpnpInit( ip_address, port );
-    if( ret != UPNP_E_SUCCESS ) {
+    if( ( ret = UpnpInit( ip_address, port ) ) != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error with UpnpInit -- %d\n", ret );
         UpnpFinish();
         return ret;
     }
 
-    ip_address = UpnpGetServerIpAddress();
+    if( ip_address == NULL ) {
+        ip_address = UpnpGetServerIpAddress();
+    }
+
     port = UpnpGetServerPort();
 
     SampleUtil_Print(
@@ -1904,12 +1995,12 @@ TvDeviceStart( char *ip_address,
 
     SampleUtil_Print( "Specifying the webserver root directory -- %s\n",
                       web_dir_path );
-    ret = UpnpSetWebServerRootDir( web_dir_path );
-    if( ret != UPNP_E_SUCCESS ) {
-        SampleUtil_Print( "Error specifying webserver root directory -- %s: %d\n",
+    if( ( ret =
+          UpnpSetWebServerRootDir( web_dir_path ) ) != UPNP_E_SUCCESS ) {
+        SampleUtil_Print
+            ( "Error specifying webserver root directory -- %s: %d\n",
               web_dir_path, ret );
         UpnpFinish();
-
         return ret;
     }
 
@@ -1918,12 +2009,12 @@ TvDeviceStart( char *ip_address,
         "\t with desc_doc_url: %s\n",
         desc_doc_url );
 
-    ret = UpnpRegisterRootDevice( desc_doc_url, TvDeviceCallbackEventHandler,
-        &device_handle, &device_handle );
-    if( ret != UPNP_E_SUCCESS ) {
+    if( ( ret = UpnpRegisterRootDevice( desc_doc_url,
+                                        TvDeviceCallbackEventHandler,
+                                        &device_handle, &device_handle ) )
+        != UPNP_E_SUCCESS ) {
         SampleUtil_Print( "Error registering the rootdevice : %d\n", ret );
         UpnpFinish();
-
         return ret;
     } else {
         SampleUtil_Print(
@@ -1931,17 +2022,17 @@ TvDeviceStart( char *ip_address,
             "Initializing State Table\n");
         TvDeviceStateTableInit( desc_doc_url );
         SampleUtil_Print("State Table Initialized\n");
-        ret = UpnpSendAdvertisement( device_handle, default_advr_expire );
-        if( ret != UPNP_E_SUCCESS ) {
+
+        if( ( ret =
+              UpnpSendAdvertisement( device_handle, default_advr_expire ) )
+            != UPNP_E_SUCCESS ) {
             SampleUtil_Print( "Error sending advertisements : %d\n", ret );
             UpnpFinish();
-
             return ret;
         }
 
         SampleUtil_Print("Advertisements Sent\n");
     }
-
     return UPNP_E_SUCCESS;
 }
 

upnp/sample/tvdevice/upnp_tv_device.h

@@ -1,34 +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_DEVICE_H
 #define UPNP_TV_DEVICE_H
@@ -632,7 +631,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(void);
+int TvDeviceStop();
 
 #ifdef __cplusplus
 }

upnp/src/api/UpnpString.c

@@ -1,156 +0,0 @@
-
-
-/*!
- * \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,121 +1,177 @@
-/*******************************************************************************
- *
- * 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
 
-
-int UpnpInitLog(void)
+/***************************************************************************
+ * 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 )
 {
-	ithread_mutex_init(&GlobalDebugMutex, NULL);
-	if(DEBUG_TARGET == 1) {
-		if((ErrFileHnd = fopen( errFileName, "a")) == NULL) {
-			return -1;
-		}
-		if((InfoFileHnd = fopen( infoFileName, "a")) == NULL) {
-			return -1;
-		}
-	}
-	return UPNP_E_SUCCESS;
-}
-
-
-void UpnpSetLogLevel(Upnp_LogLevel log_level)
-{
-	g_log_level = log_level;
-}
-
-
-void UpnpCloseLog(void)
-{
-	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) {
+    if( ErrFileName ) {
         errFileName = ErrFileName;
     }
-    if (InfoFileName) {
+    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 )
+            return -1;
+        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)
+{
+	g_log_level = log_level;
+}
+
+
+/***************************************************************************
+ * Function : UpnpCloseLog					
+ *								
+ * Parameters:	void					
+ *								
+ * Description:						
+ *	This functions closes the log files
+ * Returns: void
+ ***************************************************************************/
+void
+UpnpCloseLog()
+{
+    if( DEBUG_TARGET == 1 ) {
+        fflush( ErrFileHnd );
+        fflush( InfoFileHnd );
+        fclose( ErrFileHnd );
+        fclose( InfoFileHnd );
+    }
+    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(
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module)
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module)
 {
 	int ret = DLevel <= g_log_level;
 	ret &=
@@ -130,15 +186,38 @@ 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(
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	const char *DbgFileName,
-	int DbgLineNo,
-	const char *FmtStr,
-	...)
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module,
+	IN const char *DbgFileName,
+	IN int DbgLineNo,
+	IN const char *FmtStr,
+	... )
 {
 	va_list ArgList;
 	
@@ -170,9 +249,27 @@ void UpnpPrintf(
 	va_end(ArgList);
 	ithread_mutex_unlock(&GlobalDebugMutex);
 }
+#endif
 
 
-FILE *GetDebugFile(Upnp_LogLevel DLevel, Dbg_Module Module)
+/***************************************************************************
+ * 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 *ret;
 
@@ -190,12 +287,28 @@ 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(
-	FILE *fd,
-	const char *DbgFileName,
-	int DbgLineNo)
+	IN FILE * fd,
+	IN const char *DbgFileName,
+	IN int DbgLineNo)
 {
 #define NLINES 2
 #define MAX_LINE_SIZE 512
@@ -211,12 +324,7 @@ void UpnpDisplayFileAndLine(
 
 	/* 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
-	);
+		(unsigned long int)ithread_self());
 	if (DbgFileName) {
 		sprintf(buf[1],
 			"FILE: %s, LINE: %d",
@@ -228,13 +336,29 @@ void UpnpDisplayFileAndLine(
 	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(
-	FILE * fd,
-	const char **lines,
-	size_t size,
-	int starLength)
+	IN FILE * fd,
+	IN const char **lines,
+	IN size_t size,
+	IN int starLength)
 {
 	int leftMarginLength = starLength / 2 + 1;
 	int rightMarginLength = starLength / 2 + 1;
@@ -275,81 +399,12 @@ 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 );
 }
-
-
-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 */
-
+#endif
+ 

upnp/src/api/upnptools.c

@@ -1,475 +1,585 @@
-/**************************************************************************
- *
- * 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 "upnp.h"
-#include "upnptools.h"
-
-
-#include "uri.h"
-
-
 #include <stdarg.h>
-#include <stdio.h>
-
-
-/*! Maximum action header buffer length. */
+#include "upnptools.h"
+#include "uri.h"
 #define HEADER_LENGTH 2000
 
-
-/*!
- * \brief Structure to maintain a error code and string associated with the
- * error code.
- */
+// Structure to maintain a error code and string associated with the 
+// error code
 struct ErrorString {
-	/*! Error code. */
-	int rc;
-	/*! Error description. */
-	const char *rcError;
+    int rc;                     /* error code */
+    const char *rcError;        /* error description */
+
 };
 
-
-/*!
- * \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"},
+// 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"}
 };
 
-
-const char *UpnpGetErrorMessage(int rc)
+/************************************************************************
+* 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 )
 {
-	int i;
+    int i;
 
-	for (i = 0; i < sizeof (ErrorMessages) / sizeof (ErrorMessages[0]); ++i) {
-		if (rc == ErrorMessages[i].rc) {
-			return ErrorMessages[i].rcError;
-		}
-	}
+    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";
 }
 
-
-/*!
- * \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)
+/************************************************************************
+* 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 )
 {
-	int ret = UPNP_E_SUCCESS;
-	char *tempRel = NULL;
+    // 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
 
-	if (RelURL == NULL) {
-		ret = UPNP_E_INVALID_PARAM;
-		goto ExitFunction;
-	}
+    char *tempRel;
 
-	tempRel = resolve_rel_url((char *)BaseURL, (char *)RelURL);
-	if (tempRel) {
-		strcpy(AbsURL, tempRel);
-		free(tempRel);
-	} else {
-		ret = UPNP_E_INVALID_URL;
-	}
+    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;
+    }
+
+    return UPNP_E_SUCCESS;
 
-ExitFunction:
-	return UPNP_E_SUCCESS;
 }
 
-
-/*!
- * \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)
+/************************************************************************
+* 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 )
 {
-	char *ActBuff = NULL;
-	IXML_Node *node = NULL;
-	IXML_Element *Ele = NULL;
-	IXML_Node *Txt = NULL;
-	int rc = 0;
+    char *ActBuff = NULL;
+    IXML_Node *node = NULL;
+    IXML_Element *Ele = NULL;
+    IXML_Node *Txt = NULL;
+    int rc = 0;
 
-	if (ActionName == NULL || ServType == NULL) {
-		return UPNP_E_INVALID_PARAM;
-	}
+    if( ActionName == NULL || ServType == NULL ) {
+        return UPNP_E_INVALID_PARAM;
+    }
 
-	if (*ActionDoc == NULL) {
-		ActBuff = (char *)malloc(HEADER_LENGTH);
-		if (ActBuff == NULL) {
-			return UPNP_E_OUTOF_MEMORY;
-		}
+    if( *ActionDoc == NULL ) {
+        ActBuff = ( char * )malloc( HEADER_LENGTH );
+        if( ActBuff == NULL ) {
+            return UPNP_E_OUTOF_MEMORY;
+        }
 
-		if (response) {
-			sprintf(ActBuff,
-				"<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
-				ActionName, ServType, ActionName);
-		} else {
-			sprintf(ActBuff,
-				"<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
-				ActionName, ServType, ActionName);
-		}
+        if( response ) {
+            sprintf( ActBuff,
+                "<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
+                ActionName, ServType, ActionName );
+        } else {
+            sprintf( ActBuff,
+                "<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
+                ActionName, ServType, ActionName );
+        }
 
-		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;
-			}
-		}
-	}
+        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;
+            }
+        }
+    }
 
-	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);
-	}
+    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 );
+        }
 
-	return UPNP_E_SUCCESS;
+        ixmlNode_appendChild( node, ( IXML_Node * ) Ele );
+    }
+
+    return UPNP_E_SUCCESS;
 }
 
-
-/*!
- * \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)
+/************************************************************************
+* 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 )
 {
-	const char *ArgName;
-	const char *ArgValue;
-	char *ActBuff;
-	int Idx = 0;
-	IXML_Document *ActionDoc;
-	IXML_Node *node;
-	IXML_Element *Ele;
-	IXML_Node *Txt = NULL;
+    const char *ArgName;
+    const char *ArgValue;
+    char *ActBuff;
+    int Idx = 0;
+    IXML_Document *ActionDoc;
+    IXML_Node *node;
+    IXML_Element *Ele;
+    IXML_Node *Txt = NULL;
 
-	if (ActionName == NULL || ServType == NULL) {
-		return NULL;
-	}
+    if( ActionName == NULL || ServType == NULL ) {
+        return NULL;
+    }
 
-	ActBuff = (char *)malloc(HEADER_LENGTH);
-	if (ActBuff == NULL) {
-		return NULL;
-	}
+    ActBuff = ( char * )malloc( HEADER_LENGTH );
+    if( ActBuff == NULL ) {
+        return NULL;
+    }
 
-	if (response) {
-		sprintf(ActBuff,
-			"<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
-			ActionName, ServType, ActionName);
-	} else {
-		sprintf(ActBuff,
-			"<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
-			ActionName, ServType, ActionName);
-	}
-	if (ixmlParseBufferEx(ActBuff, &ActionDoc) != IXML_SUCCESS) {
-		free(ActBuff);
-		return NULL;
-	}
+    if( response ) {
+        sprintf( ActBuff,
+            "<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
+            ActionName, ServType, ActionName );
+    } else {
+        sprintf( ActBuff,
+            "<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
+            ActionName, ServType, ActionName );
+    }
 
-	free(ActBuff);
-	if(ActionDoc == NULL) {
-		return NULL;
-	}
+    if( ixmlParseBufferEx( ActBuff, &ActionDoc ) != IXML_SUCCESS ) {
+        free( ActBuff );
+        return NULL;
+    }
 
-	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);
-				}
-				ixmlNode_appendChild(node, (IXML_Node *)Ele);
-			}
-			if (++Idx < NumArg) {
-				ArgName = va_arg(ArgList, const char *);
-			} else {
-				break;
-			}
-		}
-		//va_end(ArgList);
-	}
+    free( ActBuff );
 
-	return ActionDoc;
+    if( ActionDoc == NULL ) {
+        return NULL;
+    }
+
+    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 );
+                }
+
+                ixmlNode_appendChild( node, ( IXML_Node * ) Ele );
+            }
+
+            if (++Idx < NumArg) {
+                ArgName = va_arg( ArgList, const char * );
+            } else {
+                break;
+            }
+        }
+        //va_end(ArgList);
+    }
+
+    return ActionDoc;
 }
 
-
-IXML_Document *UpnpMakeAction(
-	const char *ActionName,
-	const char *ServType,
-	int NumArg,
-	const char *Arg,
-	...)
+/************************************************************************
+* 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,
+                const char *ServType,
+                int NumArg,
+                const char *Arg,
+                ... )
 {
-	va_list ArgList;
-	IXML_Document *out = NULL;
+    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;
+    return out;
 }
 
-
-IXML_Document *UpnpMakeActionResponse(
-	const char *ActionName,
-	const char *ServType,
-	int NumArg,
-	const char *Arg,
-	...)
+/************************************************************************
+* 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,
+                        const char *ServType,
+                        int NumArg,
+                        const char *Arg,
+                        ... )
 {
-	va_list ArgList;
-	IXML_Document *out = NULL;
+    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;
+    return out;
 }
 
-
-int UpnpAddToAction(
-	IXML_Document **ActionDoc,
-	const char *ActionName,
-	const char *ServType,
-	const char *ArgName,
-	const char *ArgValue)
+/************************************************************************
+* 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(0, ActionDoc, ActionName, ServType, ArgName, ArgValue);
+    return addToAction( 1, ActionResponse, ActionName, ServType, ArgName,
+                        ArgValue );
 }
 
-
-int UpnpAddToActionResponse(
-	IXML_Document **ActionResponse,
-	const char *ActionName,
-	const char *ServType,
-	const char *ArgName,
-	const char *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,
+                 const char *ActionName,
+                 const char *ServType,
+                 const char *ArgName,
+                 const char *ArgValue )
 {
-	return addToAction(1, ActionResponse, ActionName, ServType, ArgName, ArgValue);
+
+    return addToAction( 0, ActionDoc, ActionName, ServType, ArgName,
+                        ArgValue );
 }
 
-
-IXML_Document *UpnpCreatePropertySet(
-	int NumArg,
-	const char *Arg,
-	...)
+/************************************************************************
+* 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 )
 {
-	va_list ArgList;
-	int Idx = 0;
-	char BlankDoc[] =
-		"<e:propertyset xmlns:e=\"urn:schemas-upnp-org:event-1-0\">"
-		"</e:propertyset>";
-	const char *ArgName,
-	*ArgValue;
-	IXML_Node *node;
-	IXML_Element *Ele;
-	IXML_Element *Ele1;
-	IXML_Node *Txt;
-	IXML_Document *PropSet;
 
-	if(ixmlParseBufferEx(BlankDoc, &PropSet) != IXML_SUCCESS) {
-		return NULL;
-	}
+    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 (NumArg < 1) {
-		return PropSet;
-	}
+    if( ArgName == NULL ) {
+        return UPNP_E_INVALID_PARAM;
+    }
 
-	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);
-			}
-			ixmlNode_appendChild((IXML_Node *)Ele1, (IXML_Node *)Ele);
-			ixmlNode_appendChild(             node, (IXML_Node *)Ele1);
-		}
-		ArgName = va_arg(ArgList, const char *);
-	}
-	va_end(ArgList);
+    if( *PropSet == NULL ) {
+        rc = ixmlParseBufferEx( BlankDoc, PropSet );
+        if( rc != IXML_SUCCESS ) {
+            return UPNP_E_OUTOF_MEMORY;
+        }
+    }
 
-	return PropSet;
+    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;
 }
 
-
-int UpnpAddToPropertySet(
-	IXML_Document **PropSet,
-	const char *ArgName,
-	const char *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,
+                       ... )
 {
-	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;
+    va_list ArgList;
+    int Idx = 0;
+    char BlankDoc[] = "<e:propertyset xmlns:e=\"urn:schemas-"
+        "upnp-org:event-1-0\"></e:propertyset>";
+    const char *ArgName,
+     *ArgValue;
+    IXML_Node *node;
+    IXML_Element *Ele;
+    IXML_Element *Ele1;
+    IXML_Node *Txt;
+    IXML_Document *PropSet;
 
-	if (ArgName == NULL) {
-		return UPNP_E_INVALID_PARAM;
-	}
+    if( ixmlParseBufferEx( BlankDoc, &PropSet ) != IXML_SUCCESS ) {
+        return NULL;
+    }
 
-	if (*PropSet == NULL) {
-		rc = ixmlParseBufferEx(BlankDoc, PropSet);
-		if (rc != IXML_SUCCESS) {
-			return UPNP_E_OUTOF_MEMORY;
-		}
-	}
+    if( NumArg < 1 ) {
+        return NULL;
+    }
 
-	node = ixmlNode_getFirstChild((IXML_Node *)*PropSet);
+    va_start( ArgList, Arg );
+    ArgName = Arg;
 
-	Ele1 = ixmlDocument_createElement(*PropSet, "e:property");
-	Ele = ixmlDocument_createElement(*PropSet, ArgName);
+    while( Idx++ != NumArg ) {
+        ArgValue = va_arg( ArgList, const char * );
 
-	if (ArgValue) {
-		Txt = ixmlDocument_createTextNode(*PropSet, ArgValue);
-		ixmlNode_appendChild((IXML_Node *)Ele, Txt);
-	}
+        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 );
+        }
 
-	return UPNP_E_SUCCESS;
+        ArgName = va_arg( ArgList, const char * );
+
+    }
+    va_end( ArgList );
+    return PropSet;
 }
 
-
-#endif /* EXCLUDE_DOM == 0 */
+#endif // EXCLUDE_DOM == 0
 

upnp/src/genlib/client_table/client_table.c

@@ -1,329 +1,209 @@
-/*******************************************************************************
- *
- * 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"
 
-
-#ifdef INCLUDE_CLIENT_APIS
-
-
-#include <stdlib.h> // for calloc(), free()
-
-
-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 = UpnpClientSubscription_get_Next(next);
-		}
-	}
-
-	return next;
-}
-
-
-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 = UpnpClientSubscription_get_Next(next);
-		}
-	}
-
-	return next;
-}
-
-
- #endif /* INCLUDE_CLIENT_APIS */
-
+/************************************************************************
+*	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 );}
+            }
+
+            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;}
+            }
+
+/************************************************************************
+*	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 ) )
+            break;
+            else
+            {
+            next = 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 ) {
+
+            if( !memcmp( next->ActualSID, sid->buff, sid->size ) )
+            break;
+            else
+            {
+            next = next->next;}
+            }
+            return next;}
+
+ )

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

@@ -1,65 +1,52 @@
-/*******************************************************************************
- *
- * 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.
- */
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 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] = {
@@ -135,8 +122,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;
@@ -408,12 +395,12 @@ scanner_get_str( IN scanner_t * scanner )
 *
 * Note :
 ************************************************************************/
-#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.")
+#ifndef WIN32
+#warning The only use of the function 'scanner_pushback()' in the code is commented out.
+#warning '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.
+#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.")
 #endif
 static UPNP_INLINE void
 scanner_pushback( INOUT scanner_t * scanner,
@@ -983,12 +970,12 @@ read_until_crlf( INOUT scanner_t * scanner,
 *   PARSE_FAILURE
 *   PARSE_INCOMPLETE
 ************************************************************************/
-#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.")
+#ifndef WIN32
+#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.
 #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.
+#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.")
 #endif
 static UPNP_INLINE int
 skip_to_end_of_header( INOUT scanner_t * scanner )
@@ -1545,9 +1532,7 @@ parser_parse_responseline( INOUT http_parser_t * parser )
 
     if( num_scanned != 3 ||
         hmsg->major_version < 0 ||
-        /* HTTP version equals to 1.0 should fail as required by the
-         * UPnP certification tool */
-        hmsg->minor_version < 1 || hmsg->status_code < 0 ) {
+        hmsg->minor_version < 0 || hmsg->status_code < 0 ) {
         // bad response line
         return PARSE_FAILURE;
     }
@@ -2511,15 +2496,26 @@ 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,
@@ -2530,18 +2526,18 @@ void 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,34 +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 defines the functionality making use of the http 
@@ -36,28 +35,10 @@
 * 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>
@@ -65,19 +46,29 @@
 	#endif
 #endif
 
-
-#ifdef WIN32
-	#include <malloc.h>
-#else
+#ifndef WIN32
 	#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"
 
 
 /* 
@@ -135,9 +126,9 @@ http_FixUrl( IN uri_type * url,
  * Function: http_FixStrUrl
  *
  * Parameters:
- *	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
+ *	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
  *
  * Description:
  *	Parses URL and then validates URL
@@ -147,7 +138,7 @@ http_FixUrl( IN uri_type * url,
  * 	 UPNP_E_SUCCESS
  ************************************************************************/
 int
-http_FixStrUrl( IN const char *urlstr,
+http_FixStrUrl( IN char *urlstr,
                 IN int urlstrlen,
                 OUT uri_type * fixed_url )
 {
@@ -184,13 +175,13 @@ http_Connect( IN uri_type * destination_url,
 
     http_FixUrl( destination_url, url );
 
-    connfd = socket( url->hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
+    connfd = socket( AF_INET, SOCK_STREAM, 0 );
     if( connfd == -1 ) {
         return UPNP_E_OUTOF_SOCKET;
     }
 
-    if( connect( connfd, ( struct sockaddr * )&url->hostport.IPaddress,
-                 sizeof( url->hostport.IPaddress ) ) == -1 ) {
+    if( connect( connfd, ( struct sockaddr * )&url->hostport.IPv4address,
+                 sizeof( struct sockaddr_in ) ) == -1 ) {
 #ifdef WIN32
         UpnpPrintf(UPNP_CRITICAL, HTTP, __FILE__, __LINE__,
             "connect error: %d\n", WSAGetLastError());
@@ -204,12 +195,8 @@ http_Connect( IN uri_type * destination_url,
 }
 
 
-/*!
- * \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.
+/************************************************************************
+ * Function: http_RecvMessage
  *
  * Parameters:
  *	IN SOCKINFO *info;			Socket information object
@@ -218,96 +205,81 @@ http_Connect( IN uri_type * destination_url,
  *	IN OUT int* timeout_secs;		time out
  *	OUT int* http_error_code;		HTTP error code returned
  *
- * \return
- * 	 UPNP_E_SUCCESS
+ * 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
- */
-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)
+ * 	 UPNP_E_SUCCESS
+ ************************************************************************/
+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 )
 {
-	int ret = UPNP_E_SUCCESS;
-	int line = 0;
-	parse_status_t status;
-	int num_read;
-	xboolean ok_on_close = FALSE;
-	char buf[2 * 1024];
+    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);
-	} else {
-		parser_response_init(parser, request_method);
-	}
+    if( request_method == HTTPMETHOD_UNKNOWN ) {
+        parser_request_init( parser );
+    } else {
+        parser_response_init( parser, request_method );
+    }
 
-	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) {
-				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) {
-					*http_error_code = HTTP_REQ_ENTITY_TOO_LARGE;
-					line = __LINE__;
-					ret = UPNP_E_OUTOF_BOUNDS;
-					goto ExitFunction;
-				}
-				line = __LINE__;
-				ret = 0;
-				goto ExitFunction;
-			} else if (status == PARSE_FAILURE) {
-				*http_error_code = parser->http_error_code;
-				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.
-				line = __LINE__;
-				ret = PARSE_SUCCESS;
-				goto ExitFunction;
-			}
-		} 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);
-				line = __LINE__;
-				ret = 0;
-				goto ExitFunction;
-			} else {
-				// partial msg
-				*http_error_code = HTTP_BAD_REQUEST;    // or response
-				line = __LINE__;
-				ret = UPNP_E_BAD_HTTPMSG;
-				goto ExitFunction;
-			}
-		} else {
-			*http_error_code = parser->http_error_code;
-			line = __LINE__;
-			ret = num_read;
-			goto ExitFunction;
-		}
-	}
+    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 );
 
-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);
-	}
+            if( status == PARSE_SUCCESS ) {
+                UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+                    "<<< (RECVD) <<<\n%s\n-----------------\n",
+                    parser->msg.msg.buf );
+                    print_http_headers( &parser->msg );
 
-	return ret;
+                if( parser->content_length >
+                    ( unsigned int )g_maxContentLength ) {
+                    *http_error_code = HTTP_REQ_ENTITY_TOO_LARGE;
+                    return UPNP_E_OUTOF_BOUNDS;
+                }
+
+                return 0;
+            } else if( status == PARSE_FAILURE ) {
+                *http_error_code = parser->http_error_code;
+                return UPNP_E_BAD_HTTPMSG;
+            } 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( 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;
+            } else {
+                // partial msg
+                *http_error_code = HTTP_BAD_REQUEST;    // or response
+                return UPNP_E_BAD_HTTPMSG;
+            }
+        } else {
+            *http_error_code = parser->http_error_code;
+            return num_read;
+        }
+    }
 }
 
 
@@ -549,7 +521,7 @@ http_RequestAndResponse( IN uri_type * destination,
     int http_error_code;
     SOCKINFO info;
 
-    tcp_connection = socket( destination->hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
+    tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
     if( tcp_connection == -1 ) {
         parser_response_init( response, req_method );
         return UPNP_E_SOCKET_ERROR;
@@ -563,7 +535,7 @@ http_RequestAndResponse( IN uri_type * destination,
     // connect
     ret_code = connect( info.socket,
                         ( struct sockaddr * )&destination->hostport.
-                        IPaddress, sizeof( struct sockaddr_storage ) );
+                        IPv4address, sizeof( struct sockaddr_in ) );
 
     if( ret_code == -1 ) {
         sock_destroy( &info, SD_BOTH );
@@ -670,9 +642,8 @@ 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,
@@ -842,9 +813,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;
 }
@@ -1034,7 +1005,7 @@ http_OpenHttpPost( IN const char *url_str,
 
     handle->contentLength = contentLength;
 
-    tcp_connection = socket( url.hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
+    tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
     if( tcp_connection == -1 ) {
         ret_code = UPNP_E_SOCKET_ERROR;
         goto errorHandler;
@@ -1048,8 +1019,8 @@ http_OpenHttpPost( IN const char *url_str,
     }
 
     ret_code = connect( handle->sock_info.socket,
-                        ( struct sockaddr * )&url.hostport.IPaddress,
-                        sizeof( struct sockaddr_storage ) );
+                        ( struct sockaddr * )&url.hostport.IPv4address,
+                        sizeof( struct sockaddr_in ) );
 
     if( ret_code == -1 ) {
         sock_destroy( &handle->sock_info, SD_BOTH );
@@ -1161,9 +1132,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;
 }
@@ -1616,7 +1587,7 @@ http_OpenHttpGetProxy( IN const char *url_str,
     handle->cancel = 0;
     parser_response_init( &handle->response, HTTPMETHOD_GET );
 
-    tcp_connection = socket( peer->hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
+    tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
     if( tcp_connection == -1 ) {
         ret_code = UPNP_E_SOCKET_ERROR;
         goto errorHandler;
@@ -1630,8 +1601,8 @@ http_OpenHttpGetProxy( IN const char *url_str,
     }
 
     ret_code = connect( handle->sock_info.socket,
-                        ( struct sockaddr * )&peer->hostport.IPaddress,
-                        sizeof( struct sockaddr_storage ) );
+                        ( struct sockaddr * )&peer->hostport.IPv4address,
+                        sizeof( struct sockaddr_in ) );
 
     if( ret_code == -1 ) {
         sock_destroy( &handle->sock_info, SD_BOTH );
@@ -2167,9 +2138,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;
 }
@@ -2265,7 +2236,7 @@ http_OpenHttpGetEx( IN const char *url_str,
         handle->entity_offset = 0;
         parser_response_init( &handle->response, HTTPMETHOD_GET );
 
-        tcp_connection = socket( url.hostport.IPaddress.ss_family, SOCK_STREAM, 0 );
+        tcp_connection = socket( AF_INET, SOCK_STREAM, 0 );
         if( tcp_connection == -1 ) {
             errCode = UPNP_E_SOCKET_ERROR;
             free( handle );
@@ -2281,8 +2252,8 @@ http_OpenHttpGetEx( IN const char *url_str,
         }
 
         errCode = connect( handle->sock_info.socket,
-                           ( struct sockaddr * )&url.hostport.IPaddress,
-                           sizeof( struct sockaddr_storage ) );
+                           ( struct sockaddr * )&url.hostport.IPv4address,
+                           sizeof( struct sockaddr_in ) );
         if( errCode == -1 ) {
             sock_destroy( &handle->sock_info, SD_BOTH );
             errCode = UPNP_E_SOCKET_CONNECT;

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

@@ -1,81 +1,63 @@
-/**************************************************************************
- *
- * 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 "webserver.h"
-
-
-#include "httpparser.h"
-#include "httpreadwrite.h"
-#include "ithread.h"
-#include "membuffer.h"
-#include "ssdplib.h"
-#include "statcodes.h"
-#include "strintmap.h"
-#include "unixutil.h"
-#include "upnp.h"
-#include "upnpapi.h"
-#include "util.h"
-#include "VirtualDir.h"
-
-
 #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
+#ifndef UPNP_USE_BCBPP
     #include <inttypes.h>
     #include <stdint.h>
-#endif /* !UPNP_USE_BCBPP */
+#endif
+#include "util.h"
+#include "strintmap.h"
+#include "membuffer.h"
+#include "httpparser.h"
+#include "httpreadwrite.h"
+#include "statcodes.h"
+#include "webserver.h"
+#include "upnp.h"
+#include "upnpapi.h"
+#include "ssdplib.h"
 
-
-#ifdef WIN32
-    /* Do not #include <unistd.h> */
-#else
+#ifndef WIN32
     #include <unistd.h>
 #endif
-
+#include <sys/stat.h>
+#include "ithread.h"
+#include "unixutil.h"
 
 /*
    Response Types 
@@ -312,8 +294,8 @@ get_content_type( IN const char *filename,
                   OUT DOMString * content_type )
 {
     const char *extension;
-    const char *type;
-    const char *subtype;
+    const char *type,
+     *subtype;
     xboolean ctype_found = FALSE;
     char *temp = NULL;
     int length = 0;
@@ -322,13 +304,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";
@@ -336,13 +318,15 @@ 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;
@@ -530,33 +514,40 @@ web_server_set_alias( IN const char *alias_name,
     return UPNP_E_OUTOF_MEMORY;
 }
 
-
-int web_server_init()
+/************************************************************************
+ * 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 ret = 0;
-	if (bWebServerState == WEB_SERVER_DISABLED) {
-		// decode media list
-		media_list_init();
-		membuffer_init(&gDocumentRootDir);
-		glob_alias_init();
-		pVirtualDirList = NULL;
+    int ret_code;
 
-		// Initialize callbacks
-		virtualDirCallback.get_info = NULL;
-		virtualDirCallback.open = NULL;
-		virtualDirCallback.read = NULL;
-		virtualDirCallback.write = NULL;
-		virtualDirCallback.seek = NULL;
-		virtualDirCallback.close = NULL;
+    if( bWebServerState == WEB_SERVER_DISABLED ) {
+        media_list_init();    // decode media list
+        membuffer_init( &gDocumentRootDir );
+        glob_alias_init();
 
-		if (ithread_mutex_init(&gWebMutex, NULL) == -1) {
-			ret = UPNP_E_OUTOF_MEMORY;
-		} else {
-			bWebServerState = WEB_SERVER_ENABLED;
-		}
-	}
+        pVirtualDirList = NULL;
 
-	return ret;
+        ret_code = ithread_mutex_init( &gWebMutex, NULL );
+        if( ret_code == -1 ) {
+            return UPNP_E_OUTOF_MEMORY;
+        }
+        bWebServerState = WEB_SERVER_ENABLED;
+    }
+
+    return 0;
 }
 
 /************************************************************************
@@ -595,7 +586,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,45 +603,45 @@ static int
 get_file_info( IN const char *filename,
                OUT struct File_Info *info )
 {
-	int code;
-	struct stat s;
-	FILE *fp;
-	int rc = 0;
+    int code;
+    struct stat s;
+    FILE *fp;
+    int rc = 0;
 
     info->content_type = NULL;
 
-	code = stat(filename, &s);
-	if (code == -1) {
-		return -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;
-	}
+    } else {
+        return -1;
+    }
 
-	// check readable
-	fp = fopen(filename, "r");
+    // check readable
+    fp = fopen( filename, "r" );
     info->is_readable = ( fp != NULL );
-	if (fp) {
-		fclose(fp);
-	}
+    if( fp ) {
+        fclose( fp );
+    }
 
     info->file_length = s.st_size;
     info->last_modified = s.st_mtime;
 
     rc = get_content_type( filename, &info->content_type );
 
-	UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-		"file info: %s, length: %lld, last_mod=%s readable=%d\n",
+    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+        "file info: %s, length: %lld, last_mod=%s readable=%d\n",
         filename, (long long)info->file_length,
         asctime( gmtime( &info->last_modified ) ),
         info->is_readable );
 
-	return rc;
+    return rc;
 }
 
 /************************************************************************
@@ -692,7 +683,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
@@ -708,19 +699,21 @@ web_server_set_root_dir( IN const char *root_dir )
  ************************************************************************/
 static UPNP_INLINE xboolean
 get_alias( IN const char *request_file,
-	OUT struct xml_alias_t *alias,
+           OUT struct xml_alias_t *alias,
            OUT struct File_Info *info )
 {
-	int cmp = strcmp(alias->name.buf, request_file);
-	if (cmp == 0) {
-		// fill up info
+    int cmp;
+
+    cmp = strcmp( alias->name.buf, request_file );
+    if( cmp == 0 ) {
+        // fill up info
         info->file_length = alias->doc.length;
         info->is_readable = TRUE;
         info->is_directory = FALSE;
         info->last_modified = alias->last_modified;
-	}
+    }
 
-	return cmp == 0;
+    return cmp == 0;
 }
 
 /************************************************************************
@@ -1209,11 +1202,11 @@ process_request( IN http_message_t * req,
     xboolean using_virtual_dir;
     uri_type *url;
     char *temp_str;
-    int resp_major;
-    int resp_minor;
+    int resp_major,
+      resp_minor;
     xboolean alias_grabbed;
     size_t dummy;
-    const char *extra_headers = NULL;
+    struct UpnpVirtualDirCallbacks *pVirtualDirCallback;
 
     print_http_headers( req );
 
@@ -1265,13 +1258,15 @@ 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 ) {
@@ -1281,26 +1276,29 @@ 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
-            if (virtualDirCallback.get_info(filename->buf, &finfo) != 0) {
+            pVirtualDirCallback = &virtualDirCallback;
+            if( pVirtualDirCallback->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( (virtualDirCallback.get_info(filename->buf, &finfo ) != UPNP_E_SUCCESS ) ||
-                    finfo.is_directory) {
+                if( ( pVirtualDirCallback->
+                      get_info( filename->buf, &finfo ) != UPNP_E_SUCCESS )
+                    || finfo.is_directory ) {
                     err_code = HTTP_NOT_FOUND;
                     goto error_handler;
                 }
@@ -1316,7 +1314,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,40 +1385,34 @@ 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" "Xc" "sCc",
-            HTTP_PARTIAL_CONTENT,           // status code
+            "R" "T" "GKD" "s" "tcS" "XcCc",
+            HTTP_PARTIAL_CONTENT, // status code
             finfo.content_type,   // content type
-            RespInstr,                      // range info
+            RespInstr,            // range info
             "LAST-MODIFIED: ",
 	    &finfo.last_modified,
-            X_USER_AGENT,
-            extra_headers) != 0 ) {
+            X_USER_AGENT) != 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" "Xc" "sCc",
-            HTTP_PARTIAL_CONTENT,           // status code
-            RespInstr->ReadSendSize,        // content length
+            "R" "N" "T" "GD" "s" "tcS" "XcCc",
+            HTTP_PARTIAL_CONTENT,     // status code
+            RespInstr->ReadSendSize,  // content length
             finfo.content_type,       // content type
-            RespInstr,                      // range info
+            RespInstr,                // range info
             "LAST-MODIFIED: ",
 	    &finfo.last_modified,
-            X_USER_AGENT,
-            extra_headers) != 0 ) {
+            X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
@@ -1429,13 +1421,12 @@ process_request( IN http_message_t * req,
         // Transfer-Encoding: chunked
         if (http_MakeMessage(
             headers, resp_major, resp_minor,
-            "RK" "TD" "s" "tcS" "Xc" "sCc",
-            HTTP_OK,                        // status code
+            "RK" "TD" "s" "tcS" "XcCc",
+            HTTP_OK,            // status code
             finfo.content_type, // content type
             "LAST-MODIFIED: ",
 	    &finfo.last_modified,
-            X_USER_AGENT,
-            extra_headers) != 0 ) {
+            X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
@@ -1445,14 +1436,13 @@ process_request( IN http_message_t * req,
             // Transfer-Encoding: chunked
             if (http_MakeMessage(
                 headers, resp_major, resp_minor,
-                "R" "N" "TD" "s" "tcS" "Xc" "sCc",
-                HTTP_OK,                        // status code
-                RespInstr->ReadSendSize,        // content length
+                "R" "N" "TD" "s" "tcS" "XcCc",
+                HTTP_OK,                 // status code
+                RespInstr->ReadSendSize, // content length
                 finfo.content_type,      // content type
                 "LAST-MODIFIED: ",
 		&finfo.last_modified,
-                X_USER_AGENT,
-                extra_headers) != 0 ) {
+                X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         } else {
@@ -1460,13 +1450,12 @@ process_request( IN http_message_t * req,
             // Transfer-Encoding: chunked
             if (http_MakeMessage(
                 headers, resp_major, resp_minor,
-                "R" "TD" "s" "tcS" "b" "Xc" "sCc",
-                HTTP_OK,                        // status code
+                "R" "TD" "s" "tcS" "XcCc",
+                HTTP_OK,            // status code
                 finfo.content_type, // content type
                 "LAST-MODIFIED: ",
 		&finfo.last_modified,
-                X_USER_AGENT,
-                extra_headers) != 0 ) {
+                X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         }
@@ -1492,11 +1481,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;
@@ -1521,8 +1510,8 @@ error_handler:
  *	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 )
 {
@@ -1539,10 +1528,12 @@ 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,58 +1,60 @@
-/**************************************************************************
- *
- * 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
+ #define MSG_NOSIGNAL 0
 #endif
 
 /************************************************************************
@@ -60,7 +62,7 @@
 *
 *	Parameters :
 *		OUT SOCKINFO* info ;	Socket Information Object
-*		IN SOCKET sockfd ;	Socket Descriptor
+*		IN int sockfd ;			Socket Descriptor
 *
 *	Description :	Assign the passed in socket descriptor to socket 
 *		descriptor in the SOCKINFO structure.
@@ -74,7 +76,7 @@
 ************************************************************************/
 int
 sock_init( OUT SOCKINFO * info,
-           IN SOCKET sockfd )
+           IN int sockfd )
 {
     assert( info );
 
@@ -89,9 +91,10 @@ sock_init( OUT SOCKINFO * info,
 *	Function :	sock_init_with_ip
 *
 *	Parameters :
-*		OUT SOCKINFO* info ;		Socket Information Object
-*		IN SOCKET sockfd ;		Socket Descriptor
-*		IN struct sockaddr* foreign_sockaddr; remote socket address.
+*		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
 *
 *	Description :	Calls the sock_init function and assigns the passed in
 *		IP address and port to the IP address and port in the SOCKINFO
@@ -106,8 +109,9 @@ sock_init( OUT SOCKINFO * info,
 ************************************************************************/
 int
 sock_init_with_ip( OUT SOCKINFO * info,
-                   IN SOCKET sockfd,
-                   IN struct sockaddr* foreign_sockaddr )
+                   IN int sockfd,
+                   IN struct in_addr foreign_ip_addr,
+                   IN unsigned short foreign_ip_port )
 {
     int ret;
 
@@ -116,8 +120,8 @@ sock_init_with_ip( OUT SOCKINFO * info,
         return ret;
     }
 
-    memcpy( &info->foreign_sockaddr, foreign_sockaddr, 
-        sizeof( info->foreign_sockaddr) );
+    info->foreign_ip_addr = foreign_ip_addr;
+    info->foreign_ip_port = foreign_ip_port;
 
     return UPNP_E_SUCCESS;
 }
@@ -145,11 +149,9 @@ 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;
-        }
+    shutdown( info->socket, ShutdownMethod );
+    if( UpnpCloseSocket( info->socket ) == -1 ) {
+        return UPNP_E_SOCKET_ERROR;
     }
 
     return UPNP_E_SUCCESS;
@@ -188,7 +190,7 @@ sock_read_write( IN SOCKINFO * info,
     struct timeval timeout;
     int numBytes;
     time_t start_time = time( NULL );
-    SOCKET sockfd = info->socket;
+    int sockfd = info->socket;
     long bytes_sent = 0,
       byte_left = 0,
       num_written;
@@ -200,9 +202,9 @@ sock_read_write( IN SOCKINFO * info,
     FD_ZERO( &readSet );
     FD_ZERO( &writeSet );
     if( bRead ) {
-        FD_SET( sockfd, &readSet );
+        FD_SET( ( unsigned )sockfd, &readSet );
     } else {
-        FD_SET( sockfd, &writeSet );
+        FD_SET( ( unsigned )sockfd, &writeSet );
     }
 
     timeout.tv_sec = *timeoutSecs;

upnp/src/genlib/service_table/service_table.c

@@ -1,34 +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 defines the functions for services. It defines 
@@ -117,8 +116,25 @@ RemoveSubscriptionSID( Upnp_SID sid,
 
 }
 
-
-subscription *GetSubscriptionSID(const Upnp_SID sid, service_info *service)
+/************************************************************************
+*	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 *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,8 +491,6 @@ membuffer_delete( INOUT membuffer * m,
 
     assert( m != NULL );
 
-    if (!m) return;
-
     if( m->length == 0 ) {
         return;
     }

upnp/src/genlib/util/util.c

@@ -1,48 +1,43 @@
-/*******************************************************************************
- *
- * 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

@@ -1,69 +0,0 @@
-
-
-#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,248 +1,167 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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_H
-#define CLIENT_TABLE_H
-
-
-/*!
- * \file
- */
-
+#ifndef _CLIENT_TABLE
+#define _CLIENT_TABLE
 
 #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;
 
-#ifdef INCLUDE_CLIENT_APIS
+/************************************************************************
+*	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);
 
 
-typedef struct s_ClientSubscription ClientSubscription;
+/************************************************************************
+*	Function :	freeClientSubList
+*
+*	Parameters :
+*		client_subscription * list ; Client subscription 
+*
+*	Description :	Free the client subscription table.
+*
+*	Return : void ;
+*
+*	Note :
+************************************************************************/
+void freeClientSubList(client_subscription * list);
 
+/************************************************************************
+*	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);
 
-/*!
- * \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 :	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);
 
+/************************************************************************
+*	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 /* __cplusplus */
-
-
-#endif /* CLIENT_TABLE_H */
+#endif
 
+#endif /*	_CLIENT_TABLE */

upnp/src/inc/gena.h

@@ -1,83 +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.
- *
- ******************************************************************************/
-
-
-#ifndef GENA_H
-#define GENA_H
-
-
-/*!
- * \file
- */
-
+///////////////////////////////////////////////////////////////////////////
+//
+// 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_
+#define _GENA_
 #include "config.h"
+#include "service_table.h"
+#include "miniserver.h"
+#include "uri.h"
+#include "upnp.h"
 
-
-#include <string.h>
 #include <time.h>
-
-
+#include "ThreadPool.h"
+#include <string.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 /* __cplusplus */
-	#ifndef EXTERN_C
-		#define EXTERN_C 
-	#endif /* EXTERN_C */
-#endif /* __cplusplus */
+#define EXTERN_C extern "C"
+#else 
+#ifndef EXTERN_C
+ #define EXTERN_C 
+#endif
+#endif
 
-
-/*!
- * \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"
-
+		"<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"
@@ -92,8 +74,6 @@
 #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
@@ -102,23 +82,16 @@
 #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;
 
-
-/*!
- * \brief Locks the subscription.
- */
+// Lock the subscription
 #define SubscribeLock() \
 	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
 		"Trying Subscribe Lock");  \
@@ -126,10 +99,7 @@ extern ithread_mutex_t GlobalClientSubscribeMutex;
 	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
 		"Subscribe Lock");
 
-
-/*!
- * \brief Unlocks the subscription.
- */
+// Unlock the subscription
 #define SubscribeUnlock() \
 	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
 		"Trying Subscribe UnLock"); \
@@ -138,248 +108,295 @@ 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;
-	DOMString propertySet;
-	char *servId;
-	char *UDN;
-	Upnp_SID sid;
-	int eventKey;
-	int *reference_count;
-	UpnpDevice_Handle device_handle;
+  char * headers;
+  DOMString propertySet;
+  char * servId;
+  char * UDN;
+  Upnp_SID sid;
+  int eventKey;
+  int *reference_count;
+  UpnpDevice_Handle device_handle;
 } notify_thread_struct;
 
 
-/*!
- * \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 : 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 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
- */
+/************************************************************************
+* 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
+***************************************************************************/
 #ifdef INCLUDE_CLIENT_APIS
 EXTERN_C int genaSubscribe(
-	/*! [in] The client handle. */
 	UpnpClient_Handle client_handle,
-	/*! [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 */
+	char * PublisherURL,
+	int * TimeOut, 
+	Upnp_SID  out_sid );
+#endif
 
 
-/*!
- * \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.
- */
+/************************************************************************
+* 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
+***************************************************************************/
 #ifdef INCLUDE_CLIENT_APIS
 EXTERN_C int genaUnSubscribe(
-	/*! [in] UPnP client handle. */
 	UpnpClient_Handle client_handle,
-	/*! [in] The subscription ID. */
-	const UpnpString *in_sid);
-#endif /* INCLUDE_CLIENT_APIS */
+	const Upnp_SID in_sid);
+#endif
 
-
-/*!
- * \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.
- */
+/************************************************************************
+* 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
+***************************************************************************/
 #ifdef INCLUDE_CLIENT_APIS
-EXTERN_C int genaUnregisterClient(
-	/*! [in] Handle containing all the control point related information. */
-	UpnpClient_Handle client_handle);
-#endif /* INCLUDE_CLIENT_APIS */
+EXTERN_C int genaUnregisterClient(UpnpClient_Handle client_handle);
+#endif
 
-
-/*
- * DEVICE
- */
-
-
-/*!
- * \brief Cleans the service table of the device.
- *
- * \return UPNP_E_SUCCESS if successful, otherwise returns GENA_E_BAD_HANDLE
- */
+//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
+****************************************************************************/
 #ifdef INCLUDE_DEVICE_APIS
-EXTERN_C int genaUnregisterDevice(
- 	/*! [in] Handle of the root device */
-	UpnpDevice_Handle device_handle);
-#endif /* INCLUDE_CLIENT_APIS */
+EXTERN_C int genaUnregisterDevice(UpnpDevice_Handle device_handle);
+#endif
 
 
-/*!
- * \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.
- */
+/************************************************************************
+* 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
+***************************************************************************/
 #ifdef INCLUDE_CLIENT_APIS
 EXTERN_C int genaRenewSubscription(
-	/*! [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.
- */
+	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.
+****************************************************************************/
 #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 /* INCLUDE_DEVICE_APIS */
+#endif
 
-
-/*!
- * \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.
- */
+/****************************************************************************
+* 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
+****************************************************************************/
 #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] XML document Event varible property set. */
-	IXML_Document *PropSet);
-#endif /* INCLUDE_DEVICE_APIS */
+	IN IXML_Document *PropSet);
+#endif
 
-
-/*!
- * \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.
- */
+/****************************************************************************
+*	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.
+****************************************************************************/
 #ifdef INCLUDE_DEVICE_APIS
-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 */
+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
 
-
-/*!
- * \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.
- */
+/****************************************************************************
+*	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.
+****************************************************************************/
 #ifdef INCLUDE_DEVICE_APIS
 EXTERN_C  int genaInitNotifyExt(
-	/*! [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 */
+	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
+
+
+
+
 
 
-/*!
- * \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,50 +1,44 @@
-/**************************************************************************
- *
- * 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
-
+///////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+///////////////////////////////////////////////////////////////////////////
 
 /* 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 1 if it has not already
+  The following makes PROTOTYPES default to 0 if it has not already
   been defined with C compiler flags.
 */
 
-
 #ifndef PROTOTYPES
-	#define PROTOTYPES 1
+#define PROTOTYPES 0
 #endif
 
 /* POINTER defines a generic pointer type */
@@ -56,17 +50,13 @@ 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

@@ -0,0 +1,314 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 const char* urlstr, IN int urlstrlen, OUT uri_type* fixed_url );
+int http_FixStrUrl( IN char* urlstr, IN int urlstrlen, OUT uri_type* fixed_url );
 
 
 /************************************************************************

upnp/src/inc/inet_pton.h

@@ -1,100 +1,103 @@
-
-
+#ifdef WIN32
 #ifndef INET_PTON
 #define INET_PTON
 
-
-#ifdef WIN32
-
-
-#include "unixutil.h"
-
+#include <winsock2.h>
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+typedef int socklen_t;
+#define EAFNOSUPPORT 97
 
-
-/*!
- * \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
+/*
+ * 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.
- *
  */
 
-/*!
- * \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
- *
+/* 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.
  */
-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);
 
-
-/*!
- * \brief convert IPv6 binary address into presentation (printable) format
+/* const char *
+ * inet_ntop6(src, dst, size)
+ *	convert IPv6 binary address into presentation (printable) format
+ * author:
+ *	Paul Vixie, 1996.
  */
+
 #ifdef INET_IPV6
-extern const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
+
+extern const char * inet_ntop6(src, dst, size);
+
 #endif /* INET_IPV6 */
 
-
-/*!
- * \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.
+/* 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.
  */
 extern inet_pton4(const char *src,u_char *dst);
 
-
-/*!
- * \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.
+/* 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.
  */
+
 #ifdef INET_IPV6
-extern int inet_pton6(const char *src, u_char *dst);
+
+extern int inet_pton6(src, dst);
+
 #endif /* INET_IPV6 */
 
 
-/*!
- * \brief convert a network format address to presentation format.
- *
- * \return
+
+/* char *
+ * inet_ntop(af, src, dst, size)
+ *	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);
 
 
-/*!
- * \brief convert from presentation format (which usually means ASCII printable)
- * to network format (which is usually some kind of binary format).
- *
- * \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)
+/* int
+ * inet_pton(af, src, dst)
+ *	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.
  */
 extern int inet_pton(int af,const char *src,void *dst);
 
-
-#endif /* WIN32 */
-
-
-#endif /* INET_PTON */
-
+#endif
+#endif

upnp/src/inc/miniserver.h

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

upnp/src/inc/service_table.h

@@ -1,231 +1,273 @@
-/*******************************************************************************
- *
- * 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
- */
+///////////////////////////////////////////////////////////////////////////
+//
+// 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
+#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;
-	int ToSendEventKey;
-	time_t expireTime;
-	int active;
-	URL_list DeliveryURLs;
-	struct SUBSCRIPTION *next;
+  Upnp_SID sid;
+  int eventKey;
+  int ToSendEventKey;
+  time_t expireTime;
+  int active;
+  URL_list DeliveryURLs;
+  struct SUBSCRIPTION *next;
 } subscription;
 
 
 typedef struct SERVICE_INFO {
-	DOMString	serviceType;
-	DOMString	serviceId;
-	char		*SCPDURL ;
-	char		*controlURL;
-	char		*eventURL;
-	DOMString	UDN;
-	int		active;
-	int		TotalSubscriptions;
-	subscription	*subscriptionList;
-	struct SERVICE_INFO	 *next;
+  DOMString	serviceType;
+  DOMString	serviceId;
+  char		*SCPDURL ;
+  char		*controlURL;
+  char		*eventURL;
+  DOMString	UDN;
+  int		active;
+  int		TotalSubscriptions;
+  subscription	*subscriptionList;
+  struct SERVICE_INFO	 *next;
 } service_info;
 
 
 typedef struct SERVICE_TABLE {
-	DOMString URLBase;
-	service_info *serviceList;
-	service_info *endServiceList;
+  DOMString URLBase;
+  service_info *serviceList;
+  service_info *endServiceList;
 } 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);
 
-/*!
- * \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 :	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 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);
-
-
-/*!
- * \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 :	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 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);
+subscription * CheckSubscriptionSID(Upnp_SID sid,service_info * service);
 
+//returns a pointer to the first subscription
+subscription * GetFirstSubscription(service_info *service);
 
-/*!
- * \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 :	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 Free's the memory allocated for storing the URL of the subscription.
- */
-void freeSubscription(
-	/*! [in] Subscription object to be freed. */
-	subscription *sub);
+/************************************************************************
+*	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 Free's memory allocated for all the subscriptions in the service table.
- */
-void freeSubscriptionList(
-	/*! [in] Head of the subscription list. */
-	subscription * head);
+/************************************************************************
+*	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 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.
- */
+/************************************************************************
+*	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 :
+************************************************************************/
 #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(
@@ -234,18 +276,25 @@ static UPNP_INLINE void printService(
 	Dbg_Module module) {}
 #endif
 
-
-/*!
- * \brief For debugging purposes prints information of each service from the
- * service table passed into the function.
- */
+/************************************************************************
+*	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 :
+************************************************************************/
 #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(
@@ -254,18 +303,26 @@ static UPNP_INLINE void printServiceList(
 	Dbg_Module module) {}
 #endif
 
-
-/*!
- * \brief For debugging purposes prints the URL base of the table and information
- * of each service from the service table passed into the function.
- */
+/************************************************************************
+*	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 :
+************************************************************************/
 #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(
@@ -274,106 +331,150 @@ 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);
 
-/*!
- * \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 :	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 each service
- * entry in the service table.
- */
-void freeServiceList(
-	/*! [in] Head of the service list to be freed. */
-	service_info *head);
+/************************************************************************
+*	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);
+
+/************************************************************************
+*	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,
+				service_table *in);
 
 
-/*!
- * \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);
+/************************************************************************
+*	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);
+
+/************************************************************************
+*	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 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);
+/*						Misc helper functions						   */
 
 
-/*!
- * \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 :	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 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	*/
-
-
-/*!
- * \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);
-
-
-/*!
- * \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);
+/************************************************************************
+*	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, 
+		  IXML_Node **out);
 
 
 #endif /* INCLUDE_DEVICE_APIS */
@@ -382,5 +483,5 @@ int getSubElement(
 }
 #endif
 
-#endif /* SERVICE_TABLE */
+#endif /* _SERVICE_TABLE */
 

upnp/src/inc/sock.h

@@ -1,50 +1,44 @@
-/**************************************************************************
- *
- * 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"
 
-
-#ifdef WIN32
-	/* Do not #include <netinet/in.h> */
-#else
-	#include <netinet/in.h>
+#ifndef WIN32
+ #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
@@ -54,25 +48,24 @@
 
 typedef struct 
 {
-	/* handle/descriptor to a socket */
-	SOCKET socket;
+	int socket;		// handle/descriptor to a socket
 
-	/* the following two fields are filled only in incoming requests; */
-	struct sockaddr_storage foreign_sockaddr;
+    // the following two fields are filled only in incoming requests;
+    struct in_addr foreign_ip_addr;
+    unsigned short foreign_ip_port;
+    
 } SOCKINFO;
 
-
 #ifdef __cplusplus
 #extern "C" {
 #endif
 
-
 /************************************************************************
 *	Function :	sock_init
 *
 *	Parameters :
 *		OUT SOCKINFO* info ;	Socket Information Object
-*		IN SOCKET sockfd ;	Socket Descriptor
+*		IN int sockfd ;			Socket Descriptor
 *
 *	Description :	Assign the passed in socket descriptor to socket 
 *		descriptor in the SOCKINFO structure.
@@ -83,15 +76,16 @@ typedef struct
 *		UPNP_E_SOCKET_ERROR
 *	Note :
 ************************************************************************/
-int sock_init(OUT SOCKINFO* info, IN SOCKET sockfd);
+int sock_init( OUT SOCKINFO* info, IN int sockfd );
 
 /************************************************************************
 *	Function :	sock_init_with_ip
 *
 *	Parameters :
-*		OUT SOCKINFO* info ;	Socket Information Object
-*		IN SOCKET sockfd ;	Socket Descriptor
-*		IN struct sockaddr* foreign_sockaddr;	Remote socket address
+*		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
 *
 *	Description :	Calls the sock_init function and assigns the passed in
 *		IP address and port to the IP address and port in the SOCKINFO
@@ -104,10 +98,8 @@ int sock_init(OUT SOCKINFO* info, IN SOCKET sockfd);
 *
 *	Note :
 ************************************************************************/
-int sock_init_with_ip(
-	OUT SOCKINFO* info,
-	IN SOCKET sockfd, 
-        IN struct sockaddr *foreign_sockaddr);
+int sock_init_with_ip( OUT SOCKINFO* info, IN int sockfd, 
+        IN struct in_addr foreign_ip_addr, IN unsigned short foreign_ip_port );
 
 /************************************************************************
 *	Function :	sock_read
@@ -170,13 +162,11 @@ 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,64 +1,59 @@
-/**************************************************************************
- *
- * 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>
-
-
-#ifdef WIN32
+#include "httpparser.h"
+#include "httpreadwrite.h"
+#include "miniserver.h"
+#ifndef WIN32
+ #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 <syslog.h>
-	#include <sys/socket.h>
-	#include <netinet/in_systm.h>
-	#include <netinet/ip.h>
-	#include <netinet/ip_icmp.h>
-	#include <sys/time.h>
-	#include <arpa/inet.h>
+#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,
@@ -68,9 +63,8 @@ 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,
@@ -81,19 +75,16 @@ typedef enum SsdpCmdType{
 
 
 
-/* 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
+//Constant
+#define	 BUFSIZE   2500
+#define  SSDP_IP   "239.255.255.250"
+#define  SSDP_PORT 1900
+#define  NUM_TRY 3
+#define  NUM_COPY 1
+#define  THREAD_LIMIT 50
+#define  COMMAND_LEN  300
 
-/* can be overwritten by configure CFLAGS argument */
-#ifndef X_USER_AGENT
+#ifndef X_USER_AGENT // can be overwritten by configure CFLAGS argument
 /** @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
@@ -103,7 +94,7 @@ typedef enum SsdpCmdType{
  #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
@@ -114,7 +105,7 @@ typedef enum SsdpCmdType{
 
 
 
-/* Structure to store the SSDP information */
+//Structure to store the SSDP information
 typedef struct SsdpEventStruct
 {
   enum SsdpCmdType Cmd;
@@ -130,7 +121,7 @@ typedef struct SsdpEventStruct
   char Os[LINE_SIZE];
   char Ext[LINE_SIZE];
   char Date[LINE_SIZE];
-  struct sockaddr *DestAddr;
+  struct sockaddr_in * DestAddr;
   void * Cookie;
 } Event;
 
@@ -152,7 +143,7 @@ typedef struct TData
    int Mx;
    void * Cookie;
    char * Data;
-   struct sockaddr_storage DestAddr;
+   struct sockaddr_in DestAddr;
    
 }ThreadData;
 
@@ -160,7 +151,7 @@ typedef struct ssdpsearchreply
 {
   int MaxAge;
   UpnpDevice_Handle handle;
-  struct sockaddr_storage dest_addr;
+  struct sockaddr_in dest_addr;
   SsdpEvent event;
   
 }SsdpSearchReply;
@@ -177,18 +168,21 @@ typedef struct ssdpsearcharg
 typedef struct 
 {
   http_parser_t parser;
-  struct sockaddr_storage dest_addr;
+  struct sockaddr_in dest_addr;
 } ssdp_thread_data;
 
 
 /* globals */
 
-CLIENTONLY(extern SOCKET gSsdpReqSocket4;);
-CLIENTONLY(extern SOCKET gSsdpReqSocket6;);
+CLIENTONLY(extern SOCKET gSsdpReqSocket;);
 
 typedef int (*ParserFun)(char *, Event *);
 
 
+//void InitParser();
+
+//int AnalyzeCommand(char * szCommand, Event * Evt);
+
 /************************************************************************
 * Function : Make_Socket_NoBlocking
 *
@@ -220,11 +214,11 @@ int Make_Socket_NoBlocking (int sock);
 #ifdef INCLUDE_DEVICE_APIS
 void ssdp_handle_device_request(
 	IN http_message_t* hmsg, 
-	IN struct sockaddr* dest_addr );
+	IN struct sockaddr_in* dest_addr );
 #else
 static inline void ssdp_handle_device_request(
 	IN http_message_t* hmsg, 
-	IN struct sockaddr* dest_addr ) {}
+	IN struct sockaddr_in* dest_addr ) {}
 #endif
 
 /************************************************************************
@@ -232,7 +226,7 @@ static inline void ssdp_handle_device_request(
 *
 * Parameters:
 *	IN http_message_t* hmsg: SSDP message from the device
-*	IN struct sockaddr* dest_addr: Address of the device
+*	IN struct sockaddr_in* 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. 
@@ -249,7 +243,7 @@ static inline void ssdp_handle_device_request(
 ***************************************************************************/
 void ssdp_handle_ctrlpt_msg(
 	IN http_message_t* hmsg, 
-	IN struct sockaddr* dest_addr,
+	IN struct sockaddr_in* dest_addr,
 	IN xboolean timeout,
 	IN void* cookie );
 
@@ -362,7 +356,6 @@ 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
@@ -376,8 +369,7 @@ int DeviceAdvertisement(
 	IN int RootDev,
 	IN char *Udn, 
 	IN char *Location,
-	IN int Duration,
-	IN int AddressFamily);
+	IN int Duration);
 
 
 /************************************************************************
@@ -390,7 +382,6 @@ 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 
@@ -405,14 +396,13 @@ int DeviceShutdown(
 	IN char *Udn, 
 	IN char *_Server, 
 	IN char *Location, 
-	IN int Duration,
-	IN int AddressFamily);
+	IN int Duration);
 
 /************************************************************************
 * Function : DeviceReply
 *
 * Parameters:	
-*	IN struct sockaddr *DestAddr: destination IP address.
+*	IN struct sockaddr_in * 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
@@ -427,18 +417,17 @@ int DeviceShutdown(
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int DeviceReply(
-	IN struct sockaddr *DestAddr, 
+	IN struct sockaddr_in * 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 *DestAddr: destination IP address.
+*	IN struct sockaddr_in * 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
@@ -455,7 +444,7 @@ int DeviceReply(
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int SendReply(
-	IN struct sockaddr *DestAddr, 
+	IN struct sockaddr_in * DestAddr, 
 	IN char *DevType, 
 	IN int RootDev, 
 	IN char *Udn, 
@@ -470,8 +459,7 @@ 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 AddressFamily: Device address family
+*	IN int Duration :Life time of this device.
 *
 * Description:
 *	This function creates the advertisement packet based 
@@ -484,14 +472,13 @@ int ServiceAdvertisement(
 	IN char *Udn, 
 	IN char *ServType,
 	IN char *Location,
-	IN int Duration,
-	IN int AddressFamily);
+	IN int Duration);
 
 /************************************************************************
 * Function : ServiceReply
 *
 * Parameters:	
-*	IN struct sockaddr *DestAddr:
+*	IN struct sockaddr_in *DestAddr:
 *	IN char *Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char *Server: Not used
@@ -506,7 +493,7 @@ int ServiceAdvertisement(
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int ServiceReply(
-	IN struct sockaddr *DestAddr,  
+	IN struct sockaddr_in *DestAddr,  
 	IN char *ServType, 
 	IN char *Udn, 
 	IN char *Location,
@@ -520,7 +507,6 @@ 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 
@@ -533,8 +519,7 @@ int ServiceShutdown(
 	IN char *Udn,
 	IN char *ServType,
 	IN char *Location,
-	IN int Duration,
-	IN int AddressFamily);
+	IN int Duration);
 
 
 /************************************************************************
@@ -561,7 +546,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 *DestAddr:Destination address
+*	IN struct sockaddr_in *DestAddr:Destination address
 *	IN char *DeviceType:Device type
 *	IN char *DeviceUDN:Device UDN
 *	IN char *ServiceType:Service type
@@ -577,10 +562,10 @@ int AdvertiseAndReply(
 	IN int AdFlag, 
 	IN UpnpDevice_Handle Hnd, 
 	IN enum SsdpSearchType SearchType, 
-	IN struct sockaddr *DestAddr,
+	IN struct sockaddr_in *DestAddr,
 	IN char *DeviceType, 
 	IN char *DeviceUDN, 
 	IN char *ServiceType, int Exp);
 
-#endif /* SSDPLIB_H */
+#endif
 

upnp/src/inc/sysdep.h

@@ -1,90 +1,65 @@
-/*
- * 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.
- */
-
-
-#ifndef SYSDEP_H
-#define SYSDEP_H
-
+  /*
+  ** 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>
 #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 */
-#ifdef WIN32
-	#define unsigned64_t __int64
+#ifndef WIN32
+ #define unsigned64_t unsigned long long
 #else
-	#define unsigned64_t unsigned long long
+ #define unsigned64_t __int64
 #endif
-
-
 #define I64(C) C##LL
 
-
 typedef unsigned64_t uuid_time_t;
-
-
 typedef struct {
-	char nodeID[6];
+    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(unsigned char seed[16]);
-
-
-#endif /* SYSDEP_H */
+void get_random_info(char seed[16]);
 

upnp/src/inc/unixutil.h

@@ -1,56 +1,46 @@
-/*******************************************************************************
- *
- * 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 */
+///////////////////////////////////////////////////////////////////////////
+//
+// 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
 
 #ifndef GENLIB_NET_UNIXUTIL_H
 #define	GENLIB_NET_UNIXUTIL_H
 
-
-#include "UpnpInet.h"
-
-
-#ifdef WIN32
+#include <sys/types.h>
+#ifndef WIN32
+	#include <sys/socket.h>
+#else
 	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,48 +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.
+//
+///////////////////////////////////////////////////////////////////////////
 
+// File : upnpapi.h
 
-#ifndef UPNPAPI_H
-#define UPNPAPI_H
+#ifndef UPNPDK_H
+#define UPNPDK_H
 
-
-/*!
- * \file
- */
-
-
-#include "client_table.h"
 #include "upnp.h"
-#include "VirtualDir.h"		/* for struct VirtualDirCallbacks */
-
+#include "client_table.h"
+//#include "../ssdp/ssdplib.h"
 
 #define MAX_INTERFACES 256
 
@@ -50,6 +44,8 @@
 
 #define DEV_LIMIT 200
 
+#define NUM_HANDLE 200
+
 #define DEFAULT_MX 5
 
 #define DEFAULT_MAXAGE 1800
@@ -59,256 +55,134 @@
 
 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;
-	/*! Callback function pointer. */
-	Upnp_FunPtr  Callback;
-	/*! . */
-	char *Cookie;
-	/*! 0 = not installed; otherwise installed. */
-	int   aliasInstalled;
+    Upnp_Handle_Type HType;
+    Upnp_FunPtr  Callback; // Callback function pointer.
+    char * Cookie;
 
-	/* Device Only */
+    // Device Only
 #ifdef INCLUDE_DEVICE_APIS
-	/*! 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
+    char  DescURL[LINE_SIZE];   // URL for the use of SSDP
+    char  DescXML[LINE_SIZE];   // XML file path for device 
+                                //description
 
-	/* Client only */
-#ifdef INCLUDE_CLIENT_APIS
-	/*! Client subscription list. */
-	ClientSubscription *ClientSubList;
-	/*! Active SSDP searches. */
-	LinkedList SsdpSearchList;
+    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
+    int MaxSubscriptions;
+    int MaxSubscriptionTimeOut;
 #endif
+     
+    // Client only
+#ifdef INCLUDE_CLIENT_APIS
+    client_subscription *ClientSubList; //client subscription list
+    LinkedList SsdpSearchList; // active ssdp searches   
+#endif
+    int   aliasInstalled;       // 0 = not installed; otherwise installed
 };
 
-
 extern ithread_rwlock_t GlobalHndRWLock;
-
-
-/*!
- * \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); 
-
+Upnp_Handle_Type GetHandleInfo(int Hnd, 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");
 
-
-/*!
- * \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);
-/*!
- * \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);
+Upnp_Handle_Type GetClientHandleInfo(int *client_handle_out, 
+                                     struct Handle_Info **HndInfo);
+Upnp_Handle_Type GetDeviceHandleInfo(int *device_handle_out, 
+                                     struct Handle_Info **HndInfo);
 
 
-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 char LOCAL_HOST[LINE_SIZE];
 
+extern unsigned short LOCAL_PORT;
 
 extern TimerThread gTimerThread;
 extern ThreadPool gRecvThreadPool;
 extern ThreadPool gSendThreadPool;
 extern ThreadPool gMiniServerThreadPool;
 
-
 typedef enum {
-	SUBSCRIBE,
-	UNSUBSCRIBE,
-	DK_NOTIFY,
-	QUERY,
-	ACTION,
-	STATUS,
-	DEVDESCRIPTION,
-	SERVDESCRIPTION,
-	MINI,
-	RENEW
-} UpnpFunName;
-
+    SUBSCRIBE,
+    UNSUBSCRIBE,
+    DK_NOTIFY,
+    QUERY,
+    ACTION,
+    STATUS,
+    DEVDESCRIPTION,
+    SERVDESCRIPTION,
+    MINI,
+    RENEW} UpnpFunName;
 
 struct  UpnpNonblockParam 
-{
-	UpnpFunName FunName;
-	int Handle;
-	int TimeOut;
-	char VarName[NAME_SIZE];
-	char NewVal[NAME_SIZE];
-	char DevType[NAME_SIZE];
-	char DevId[NAME_SIZE];
-	char ServiceType[NAME_SIZE];
-	char ServiceVer[NAME_SIZE];
-	char Url[NAME_SIZE];
-	Upnp_SID SubsId;
-	char *Cookie;
-	Upnp_FunPtr Fun;
+{ 
+    UpnpFunName  FunName;
+    int   Handle;
+    int   TimeOut;
+    char  VarName[NAME_SIZE];
+    char  NewVal[NAME_SIZE];
+    char  DevType[NAME_SIZE];
+    char  DevId[NAME_SIZE];
+    char  ServiceType[NAME_SIZE];
+    char  ServiceVer[NAME_SIZE];
+    char  Url[NAME_SIZE];
+    Upnp_SID   SubsId;
+    char  *Cookie;
+    Upnp_FunPtr Fun;
 	IXML_Document *Header;
-	IXML_Document *Act;
-	struct DevDesc *Devdesc;
+    IXML_Document *Act;
+    struct DevDesc *Devdesc;
 };
 
 
 extern virtualDirList *pVirtualDirList;
-extern struct VirtualDirCallbacks virtualDirCallback;
+extern struct UpnpVirtualDirCallbacks virtualDirCallback;
 
 
-typedef enum {
-	WEB_SERVER_DISABLED,
-	WEB_SERVER_ENABLED
-} WebServerState;
-
+typedef enum { WEB_SERVER_DISABLED, WEB_SERVER_ENABLED } WebServerState;
 
 #define E_HTTP_SYNTAX -6
 
-
-/*!
- * \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 InitHandleList();
+int GetFreeHandle();
+int FreeHandle(int Handle);
 void UpnpThreadDistribution(struct UpnpNonblockParam * Param);
 
 
-/*!
- * \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);
-
+void AutoAdvertise(void *input); 
+int getlocalhostname(char *out);
 
 extern WebServerState bWebServerState;
 
+#endif
 
-#endif /* UPNPAPI_H */
 
+
+/************************ END OF upnpapi.h **********************/

upnp/src/inc/urlconfig.h

@@ -1,90 +1,84 @@
-/**************************************************************************
- *
- * 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
-
-
-#include "UpnpInet.h"
-
-
-#ifdef WIN32
+#ifndef WIN32
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
 #else
-	#include <arpa/inet.h>
-	#include <sys/socket.h>
+ #include <winsock2.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 *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
- ****************************************************************************/
+*	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 :
+****************************************************************************/
 int configure_urlbase( INOUT IXML_Document *doc,
-	IN const struct sockaddr* serverAddr,
-	IN const char* alias,
+    IN const struct sockaddr_in* 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/uuid.h

@@ -1,90 +1,50 @@
-/*
- * 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 {
+      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;
 
-#include "sysdep.h"
+  /* 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 */
+  );
 
-/*! . */
-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;
-
-
-/*!
- * \brief Generate a UUID.
- */
-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);
-
+  /* 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!
+  */
+  int uuid_compare(uuid_upnp *u1, uuid_upnp *u2);

upnp/src/inet_pton.c

@@ -1,3 +1,4 @@
+#ifdef WIN32
 /*
  * Copyright (c) 1996-1999 by Internet Software Consortium.
  *
@@ -15,15 +16,39 @@
  * SOFTWARE.
  */
 
+/*#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
-/* This file is WIN32 only */
-#ifdef WIN32
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>*/
+#include <winsock2.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
+ * sizeof(int) < 4.  sizeof(int) 4 is fine; all the world's not a VAX.
+ */
 
 
-#include "inet_pton.h"
-
-
-static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size)
+/* 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.
+ */
+static const char *
+inet_ntop4(const u_char *src, char *dst, socklen_t size)
 {
 	char tmp[sizeof ("255.255.255.255") + 1] = "\0";
 	int octet;
@@ -57,8 +82,20 @@ static 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.
+ */
+
 #ifdef INET_IPV6
-static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size)
+
+static const char *
+inet_ntop6(src, dst, size)
+	const u_char *src;
+	char *dst;
+	socklen_t size;
 {
 	/*
 	 * Note that int32_t and int16_t need only be "at least" large enough
@@ -145,7 +182,18 @@ static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size)
 #endif /* INET_IPV6 */
 
 
-static int inet_pton4(const char *src,u_char *dst)
+/* 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.
+ */
+static int
+inet_pton4(const char *src,u_char *dst)
 {
 	int saw_digit, octets, ch;
 	u_char tmp[4], *tp;
@@ -177,12 +225,29 @@ static int inet_pton4(const char *src,u_char *dst)
 	if (octets < 4)
 		return (0);
 	memcpy(dst, tmp, 4);
-	return 1;
+	return (1);
 }
 
+/* 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.
+ */
 
 #ifdef INET_IPV6
-static int inet_pton6(const char *src, u_char *dst)
+
+static int
+inet_pton6(src, dst)
+	const char *src;
+	u_char *dst;
 {
 	static const char xdigits[] = "0123456789abcdef";
 	u_char tmp[16], *tp, *endp, *colonp;
@@ -265,10 +330,20 @@ static int inet_pton6(const char *src, u_char *dst)
 	memcpy(dst, tmp, 16);
 	return (1);
 }
+
 #endif /* INET_IPV6 */
 
 
-const char *inet_ntop(int af,const void *src,char *dst,socklen_t size)
+
+/* char *
+ * inet_ntop(af, src, dst, size)
+ *	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)
 {
 	switch (af) {
 	case AF_INET:
@@ -278,13 +353,24 @@ const char *inet_ntop(int af,const void *src,char *dst,socklen_t size)
 		return (inet_ntop6(src, dst, size));
 #endif
 	default:
-		/*__set_errno(EAFNOSUPPORT);*/
-		return NULL;
+		//__set_errno (EAFNOSUPPORT);
+		return (NULL);
 	}
 	/* NOTREACHED */
 }
 
 
+/* int
+ * inet_pton(af, src, dst)
+ *	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.
+ */
 int inet_pton(int af,const char *src,void *dst)
 {
 	switch (af) {
@@ -295,12 +381,9 @@ int inet_pton(int af,const char *src,void *dst)
 		return (inet_pton6(src, dst));
 #endif
 	default:
-		/*__set_errno(EAFNOSUPPORT);*/
-		return -1;
+		//__set_errno (EAFNOSUPPORT);
+		return (-1);
 	}
 	/* NOTREACHED */
 }
-
-
-#endif /* WIN32 */
-
+#endif

upnp/src/soap/soap_ctrlpt.c

@@ -368,9 +368,8 @@ soap_request_and_response( IN membuffer * request,
 
         // try again
         ret_code = http_RequestAndResponse( destination_url, request->buf,
-                                            request->length,
                                             HTTPMETHOD_MPOST,
-                                            UPNP_TIMEOUT,
+                                            request->length, UPNP_TIMEOUT,
                                             response );
         if( ret_code != 0 ) {
             httpmsg_destroy( &response->msg );
@@ -932,7 +931,7 @@ SoapGetServiceVarStatus( IN char *action_url,
     content_length = strlen( xml_start ) + strlen( var_name ) + strlen( xml_end );
     if (http_MakeMessage(
 	&request, 1, 1,
-	"Q" "sbc" "N" "s" "sc" "Ucc" "sss",
+	"Q" "sbc" "N" "s" "s" "Ucc" "sss",
 	SOAPMETHOD_POST, path.buf, path.length,
 	"HOST: ", host.buf, host.length,
 	content_length,

upnp/src/soap/soap_device.c

@@ -1,68 +1,57 @@
-/*******************************************************************************
- *
- * 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
- */
-
+///////////////////////////////////////////////////////////////////////////
+//
+// 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"
-
-
 #ifdef INCLUDE_DEVICE_APIS
 #if EXCLUDE_SOAP == 0
 
-
 #define SOAP_BODY "Body"
 #define SOAP_URN "http:/""/schemas.xmlsoap.org/soap/envelope/"
 
 #define QUERY_STATE_VAR_URN "urn:schemas-upnp-org:control-1-0"
 
+#include "upnpapi.h"
+#include "parsetools.h"
+#include "statcodes.h"
 #include "httpparser.h"
 #include "httpreadwrite.h"
-#include "parsetools.h"
+#include "unixutil.h"
 #include "soaplib.h"
 #include "ssdplib.h"
-#include "statcodes.h"
-#include "unixutil.h"
-#include "upnpapi.h"
-
 
 #ifdef WIN32
-	#define snprintf _snprintf
+ #define snprintf _snprintf
 #endif
 
-
-/*! timeout duration in secs for transmission/reception */
+// timeout duration in secs for transmission/reception
 #define SOAP_TIMEOUT UPNP_TIMEOUT
 
 #define SREQ_HDR_NOT_FOUND	 -1
@@ -76,14 +65,13 @@
 
 static const char *Soap_Invalid_Action = "Invalid Action";
 
-/*static const char* Soap_Invalid_Args = "Invalid Args"; */
+//static const char* Soap_Invalid_Args = "Invalid Args";
 static const char *Soap_Action_Failed = "Action Failed";
 static const char *Soap_Invalid_Var = "Invalid Var";
 
 const char *ContentTypeHeader =
     "CONTENT-TYPE: text/xml; charset=\"utf-8\"\r\n";
 
-
 /****************************************************************************
 *	Function :	get_request_type
 *
@@ -584,7 +572,7 @@ check_soap_action_header( IN http_message_t * request,
 *		OUT char device_udn[LINE_SIZE] :	Device UDN string
 *		OUT char service_id[LINE_SIZE] :	Service ID string
 *		OUT Upnp_FunPtr *callback :	callback function of the device 
-*						application
+*									application
 *		OUT void** cookie :	cookie stored by device application 
 *							
 *	Description :	This function retrives all the information needed to 
@@ -598,13 +586,12 @@ check_soap_action_header( IN http_message_t * request,
 *	Note :
 ****************************************************************************/
 static int
-get_device_info( IN http_message_t *request,
+get_device_info( IN http_message_t * request,
                  IN int isQuery,
-                 IN IXML_Document *actionDoc,
-                 IN int AddressFamily,
+                 IN IXML_Document * actionDoc,
                  OUT char device_udn[LINE_SIZE],
                  OUT char service_id[LINE_SIZE],
-                 OUT Upnp_FunPtr *callback,
+                 OUT Upnp_FunPtr * callback,
                  OUT void **cookie )
 {
     struct Handle_Info *device_info;
@@ -622,8 +609,7 @@ get_device_info( IN http_message_t *request,
 
     HandleLock();
 
-    if( GetDeviceHandleInfo( AddressFamily, 
-        &device_hnd, &device_info ) != HND_DEVICE ) {
+    if( GetDeviceHandleInfo( &device_hnd, &device_info ) != HND_DEVICE ) {
         goto error_handler;
     }
 
@@ -854,10 +840,10 @@ error_handler:
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE void handle_query_variable(
-	IN SOCKINFO *info,
-	IN http_message_t *request,
-	IN IXML_Document *xml_doc )
+static UPNP_INLINE void
+handle_query_variable( IN SOCKINFO * info,
+                       IN http_message_t * request,
+                       IN IXML_Document * xml_doc )
 {
     Upnp_FunPtr soap_event_callback;
     void *cookie;
@@ -873,14 +859,9 @@ static UPNP_INLINE void handle_query_variable(
         return;
     }
     // get info for event
-    err_code = get_device_info(
-		request, 1, xml_doc,
-		info->foreign_sockaddr.ss_family,
-		variable.DevUDN,
-		variable.ServiceID,
-                &soap_event_callback,
-                &cookie);
-    if( err_code != 0 ) {
+    if( get_device_info( request, 1, xml_doc, variable.DevUDN,
+                         variable.ServiceID,
+                         &soap_event_callback, &cookie ) != 0 ) {
         send_error_response( info, SOAP_INVALID_VAR,
                              Soap_Invalid_Var, request );
         return;
@@ -890,7 +871,7 @@ static UPNP_INLINE void handle_query_variable(
     variable.ErrCode = UPNP_E_SUCCESS;
     namecopy( variable.StateVarName, var_name );
     variable.CurrentVal = NULL;
-    variable.CtrlPtIPAddr = info->foreign_sockaddr;
+    variable.CtrlPtIPAddr = info->foreign_ip_addr;
 
     // send event
     soap_event_callback( UPNP_CONTROL_GET_VAR_REQUEST, &variable, cookie );
@@ -902,8 +883,8 @@ static UPNP_INLINE void handle_query_variable(
     if( variable.CurrentVal == NULL ) {
         err_code = SOAP_ACTION_FAILED;
         err_str = Soap_Action_Failed;
-        send_error_response( info, SOAP_INVALID_VAR, Soap_Invalid_Var, request );
-
+        send_error_response( info, SOAP_INVALID_VAR,
+                             Soap_Invalid_Var, request );
         return;
     }
     if( variable.ErrCode != UPNP_E_SUCCESS ) {
@@ -970,15 +951,9 @@ handle_invoke_action( IN SOCKINFO * info,
         goto error_handler;
     }
     // get device info for action event
-    err_code = get_device_info(
-        request,
-	0,
-	xml_doc,
-	info->foreign_sockaddr.ss_family,
-	action.DevUDN,
-	action.ServiceID,
-	&soap_event_callback,
-        &cookie );
+    err_code = get_device_info( request, 0, xml_doc, action.DevUDN,
+                                action.ServiceID, &soap_event_callback,
+                                &cookie );
 
     if( err_code != UPNP_E_SUCCESS ) {
         goto error_handler;
@@ -989,9 +964,10 @@ handle_invoke_action( IN SOCKINFO * info,
     action.ActionRequest = resp_node;
     action.ActionResult = NULL;
     action.ErrCode = UPNP_E_SUCCESS;
-    action.CtrlPtIPAddr = info->foreign_sockaddr;
+    action.CtrlPtIPAddr = info->foreign_ip_addr;
 
-    UpnpPrintf(UPNP_INFO, SOAP, __FILE__, __LINE__, "Calling Callback\n");
+    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+                         "Calling Callback\n" );
 
     soap_event_callback( UPNP_CONTROL_ACTION_REQUEST, &action, cookie );
 
@@ -1017,7 +993,7 @@ handle_invoke_action( IN SOCKINFO * info,
     err_code = 0;
 
     // error handling and cleanup
-error_handler:
+  error_handler:
     ixmlDocument_free( action.ActionResult );
     ixmlDocument_free( resp_node );
     action_name.buf[action_name.length] = save_char;    // restore

upnp/src/ssdp/ssdp_ctrlpt.c

@@ -1,78 +1,72 @@
-/**************************************************************************
- *
- * 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 "util.h"
-
-
 #ifdef INCLUDE_CLIENT_APIS
 #if EXCLUDE_SSDP == 0
 
+#include "ssdplib.h"
+#include "upnpapi.h"
+#include <stdio.h>
+#include "ThreadPool.h"
 
 #include "httpparser.h"
 #include "httpreadwrite.h"
-/*#include "ssdp_ResultData.h"*/
-#include "ssdplib.h"
 #include "statcodes.h"
+
 #include "unixutil.h"
-#include "upnpapi.h"
-#include "UpnpInet.h"
-#include "ThreadPool.h"
-
-
-#include <stdio.h>
-
 
 #ifdef WIN32
+	#include <ws2tcpip.h>
+	#include <winsock2.h>
 	#include <string.h>
 #endif /* WIN32 */
 
 
 /************************************************************************
- * Function: send_search_result
- *
- * Parameters:
- *	IN void *data: Search reply from the device
- *
- * Description:
- *	This function sends a callback to the control point application with 
- *	a SEARCH result
- *
- * Returns: void
- *
- ***************************************************************************/
-void send_search_result(IN void *data)
+* Function : send_search_result
+*
+* Parameters:
+*	IN void *data: Search reply from the device
+*
+* Description:
+*	This function sends a callback to the control point application with 
+*	a SEARCH result
+*
+* Returns: void
+*
+***************************************************************************/
+void
+send_search_result( IN void *data )
 {
     ResultData *temp = ( ResultData * ) data;
 
@@ -82,34 +76,31 @@ void send_search_result(IN void *data)
 }
 
 /************************************************************************
- * Function: ssdp_handle_ctrlpt_msg
- *
- * Parameters:
- *	IN http_message_t *hmsg:
- *		SSDP message from 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. 
- *		This cookie will be returned to the control point
- *		in the callback 
- *
- * Description:
- *	This function handles the ssdp messages from the devices. These 
- *	messages includes the search replies, advertisement of device coming 
- *	alive and bye byes.
- *
- * Returns: void
- *
- ***************************************************************************/
-void ssdp_handle_ctrlpt_msg(
-	IN http_message_t *hmsg,
-	IN struct sockaddr *dest_addr,
-	IN xboolean timeout, // only in search reply
-	IN void *cookie)    // only in search reply
+* Function : ssdp_handle_ctrlpt_msg
+*
+* Parameters:
+*	IN http_message_t* hmsg: SSDP message from the device
+*	IN struct sockaddr_in* 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. 
+*		This cookie will be returned to the control point
+*		in the callback 
+*
+* Description:
+*	This function handles the ssdp messages from the devices. These 
+*	messages includes the search replies, advertisement of device coming 
+*	alive and bye byes.
+*
+* Returns: void
+*
+***************************************************************************/
+void
+ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
+                        IN struct sockaddr_in *dest_addr,
+                        IN xboolean timeout,    // only in search reply
+
+                        IN void *cookie )   // only in search reply
 {
     int handle;
     struct Handle_Info *ctrlpt_info = NULL;
@@ -117,9 +108,9 @@ void ssdp_handle_ctrlpt_msg(
     xboolean is_byebye;         // byebye or alive
     struct Upnp_Discovery param;
     SsdpEvent event;
-    xboolean nt_found;
-    xboolean usn_found;
-    xboolean st_found;
+    xboolean nt_found,
+      usn_found,
+      st_found;
     char save_char;
     Upnp_EventType event_type;
     Upnp_FunPtr ctrlpt_callback;
@@ -134,7 +125,7 @@ void ssdp_handle_ctrlpt_msg(
 
     HandleReadLock();
 
-    if ( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
+    if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
         HandleUnlock();
         return;
     }
@@ -144,7 +135,7 @@ void ssdp_handle_ctrlpt_msg(
     HandleUnlock();
 
     // search timeout
-    if ( timeout ) {
+    if( timeout ) {
         ctrlpt_callback( UPNP_DISCOVERY_SEARCH_TIMEOUT, NULL, cookie );
         return;
     }
@@ -197,22 +188,26 @@ void ssdp_handle_ctrlpt_msg(
 
     nt_found = FALSE;
 
-    if ( httpmsg_find_hdr( hmsg, HDR_NT, &hdr_value ) != NULL ) {
+    if( httpmsg_find_hdr( hmsg, HDR_NT, &hdr_value ) != NULL ) {
         save_char = hdr_value.buf[hdr_value.length];
         hdr_value.buf[hdr_value.length] = '\0';
+
         nt_found = ( ssdp_request_type( hdr_value.buf, &event ) == 0 );
+
         hdr_value.buf[hdr_value.length] = save_char;
     }
 
     usn_found = FALSE;
-    if ( httpmsg_find_hdr( hmsg, HDR_USN, &hdr_value ) != NULL ) {
+    if( httpmsg_find_hdr( hmsg, HDR_USN, &hdr_value ) != NULL ) {
         save_char = hdr_value.buf[hdr_value.length];
         hdr_value.buf[hdr_value.length] = '\0';
+
         usn_found = ( unique_service_name( hdr_value.buf, &event ) == 0 );
+
         hdr_value.buf[hdr_value.length] = save_char;
     }
 
-    if ( nt_found || usn_found ) {
+    if( nt_found || usn_found ) {
         strcpy( param.DeviceId, event.UDN );
         strcpy( param.DeviceType, event.DeviceType );
         strcpy( param.ServiceType, event.ServiceType );
@@ -221,10 +216,11 @@ void ssdp_handle_ctrlpt_msg(
     // ADVERT. OR BYEBYE
     if( hmsg->is_request ) {
         // use NTS hdr to determine advert., or byebye
-        if ( httpmsg_find_hdr( hmsg, HDR_NTS, &hdr_value ) == NULL ) {
+        //
+        if( httpmsg_find_hdr( hmsg, HDR_NTS, &hdr_value ) == NULL ) {
             return;             // error; NTS header not found
         }
-        if ( memptr_cmp( &hdr_value, "ssdp:alive" ) == 0 ) {
+        if( memptr_cmp( &hdr_value, "ssdp:alive" ) == 0 ) {
             is_byebye = FALSE;
         } else if( memptr_cmp( &hdr_value, "ssdp:byebye" ) == 0 ) {
             is_byebye = TRUE;
@@ -232,7 +228,7 @@ void ssdp_handle_ctrlpt_msg(
             return;             // bad value
         }
 
-        if ( is_byebye ) {
+        if( is_byebye ) {
             // check device byebye
             if( !nt_found || !usn_found ) {
                 return;         // bad byebye
@@ -247,6 +243,7 @@ void ssdp_handle_ctrlpt_msg(
                 strlen( param.Location ) == 0 || param.Expires <= 0 ) {
                 return;         // bad advertisement
             }
+
             event_type = UPNP_DISCOVERY_ADVERTISEMENT_ALIVE;
         }
 
@@ -285,50 +282,61 @@ void ssdp_handle_ctrlpt_msg(
             matched = 0;
             // check for match of ST header and search target
             switch ( searchArg->requestType ) {
-            case SSDP_ALL:
+                case SSDP_ALL:
+                    {
                         matched = 1;
                         break;
-            case SSDP_ROOTDEVICE:
+                    }
+                case SSDP_ROOTDEVICE:
+                    {
                         matched = ( event.RequestType == SSDP_ROOTDEVICE );
                         break;
-            case SSDP_DEVICEUDN:
+                    }
+                case SSDP_DEVICEUDN:
+                    {
                         matched = !( strncmp( searchArg->searchTarget,
                                               hdr_value.buf,
                                               hdr_value.length ) );
                         break;
-            case SSDP_DEVICETYPE: {
-                        int m = min( hdr_value.length,
-                                     strlen( searchArg->searchTarget ) );
-                        matched = !( strncmp( searchArg->searchTarget,
-                                              hdr_value.buf, m ) );
-                        break;
-            }
-            case SSDP_SERVICE: {
+                    }
+                case SSDP_DEVICETYPE:
+                    {
                         int m = min( hdr_value.length,
                                      strlen( searchArg->searchTarget ) );
 
                         matched = !( strncmp( searchArg->searchTarget,
                                               hdr_value.buf, m ) );
                         break;
-            }
-            default:
+                    }
+                case SSDP_SERVICE:
+                    {
+                        int m = min( hdr_value.length,
+                                     strlen( searchArg->searchTarget ) );
+
+                        matched = !( strncmp( searchArg->searchTarget,
+                                              hdr_value.buf, m ) );
+                        break;
+                    }
+                default:
+                    {
                         matched = 0;
                         break;
+                    }
             }
 
-            if (matched) {
+            if( matched ) {
                 // schedule call back
                 threadData =
                     ( ResultData * ) malloc( sizeof( ResultData ) );
-                if (threadData != NULL) {
+                if( threadData != NULL ) {
                     threadData->param = param;
                     threadData->cookie = searchArg->cookie;
                     threadData->ctrlpt_callback = ctrlpt_callback;
                     TPJobInit( &job, ( start_routine ) send_search_result,
                                threadData );
-                    TPJobSetPriority(&job, MED_PRIORITY);
+                    TPJobSetPriority( &job, MED_PRIORITY );
                     TPJobSetFreeFunction( &job, ( free_routine ) free );
-                    ThreadPoolAdd(&gRecvThreadPool, &job, NULL);
+                    ThreadPoolAdd( &gRecvThreadPool, &job, NULL );
                 }
             }
             node = ListNext( &ctrlpt_info->SsdpSearchList, node );
@@ -339,6 +347,50 @@ void ssdp_handle_ctrlpt_msg(
     }
 }
 
+/************************************************************************
+* Function : process_reply
+*
+* Parameters:
+*	IN char* request_buf: the response came from the device
+*	IN int buf_len: The length of the response buffer
+*	IN struct sockaddr_in* dest_addr: The address of the device
+*	IN void *cookie : cookie passed by the control point application
+*		at the time of sending search message
+*
+* Description:
+*	This function processes reply recevied from a search
+*
+* Returns: void
+*
+***************************************************************************/
+#ifndef WIN32
+#warning There are currently no uses of the function 'process_reply()' in the code.
+#warning 'process_reply()' is a candidate for removal.
+#else
+#pragma message("There are currently no uses of the function 'process_reply()' in the code.")
+#pragma message("'process_reply()' is a candidate for removal.")
+#endif
+static UPNP_INLINE void
+process_reply( IN char *request_buf,
+               IN int buf_len,
+               IN struct sockaddr_in *dest_addr,
+               IN void *cookie )
+{
+    http_parser_t parser;
+
+    parser_response_init( &parser, HTTPMETHOD_MSEARCH );
+
+    // parse
+    if( parser_append( &parser, request_buf, buf_len ) != PARSE_SUCCESS ) {
+        httpmsg_destroy( &parser.msg );
+        return;
+    }
+    // handle reply
+    ssdp_handle_ctrlpt_msg( &parser.msg, dest_addr, FALSE, cookie );
+
+    // done
+    httpmsg_destroy( &parser.msg );
+}
 
 /************************************************************************
 * Function : CreateClientRequestPacket
@@ -348,7 +400,6 @@ void ssdp_handle_ctrlpt_msg(
 *	IN char *SearchTarget:Search Target
 *	IN int Mx dest_addr: Number of seconds to wait to 
 *		collect all the responses
-*	IN int AddressFamily: search address family
 *
 * Description:
 *	This function creates a HTTP search request packet 
@@ -360,18 +411,13 @@ void ssdp_handle_ctrlpt_msg(
 static void
 CreateClientRequestPacket( IN char *RqstBuf,
                            IN int Mx,
-                           IN char *SearchTarget,
-                           IN int AddressFamily )
+                           IN char *SearchTarget )
 {
     char TempBuf[COMMAND_LEN];
 
     strcpy( RqstBuf, "M-SEARCH * HTTP/1.1\r\n" );
 
-    if (AddressFamily == AF_INET) {
-        sprintf( TempBuf, "HOST: %s:%d\r\n", SSDP_IP, SSDP_PORT );
-    } else if (AddressFamily == AF_INET6) {
-        sprintf( TempBuf, "HOST: [%s]:%d\r\n", SSDP_IPV6_LINKLOCAL, SSDP_PORT );
-    }
+    sprintf( TempBuf, "HOST: %s:%d\r\n", SSDP_IP, SSDP_PORT );
     strcat( RqstBuf, TempBuf );
     strcat( RqstBuf, "MAN: \"ssdp:discover\"\r\n" );
 
@@ -385,37 +431,9 @@ CreateClientRequestPacket( IN char *RqstBuf,
         strcat( RqstBuf, TempBuf );
     }
     strcat( RqstBuf, "\r\n" );
+
 }
 
-
-static void CreateClientRequestPacketUlaGua(
-	IN char *RqstBuf,
-	IN int Mx,
-	IN char *SearchTarget,
-	IN int AddressFamily)
-{
-	char TempBuf[COMMAND_LEN];
-
-	strcpy(RqstBuf, "M-SEARCH * HTTP/1.1\r\n");
-	if (AddressFamily == AF_INET) {
-		sprintf(TempBuf, "HOST: %s:%d\r\n", SSDP_IP, SSDP_PORT);
-	} else if (AddressFamily == AF_INET6) {
-		sprintf(TempBuf, "HOST: [%s]:%d\r\n", SSDP_IPV6_SITELOCAL, SSDP_PORT);
-	}
-	strcat(RqstBuf, TempBuf);
-	strcat(RqstBuf, "MAN: \"ssdp:discover\"\r\n");
-	if (Mx > 0) {
-		sprintf(TempBuf, "MX: %d\r\n", Mx);
-		strcat(RqstBuf, TempBuf);
-	}
-	if (SearchTarget) {
-		sprintf(TempBuf, "ST: %s\r\n", SearchTarget);
-		strcat(RqstBuf, TempBuf);
-	}
-	strcat(RqstBuf, "\r\n");
-}
-
-
 /************************************************************************
 * Function : searchExpired
 *
@@ -489,168 +507,117 @@ searchExpired( void *arg )
 *		This cokie will be returned to application in the callback.
 *
 * Description:
-*   This function implements the search request of the discovery phase.
-*   A M-SEARCH request is sent on the SSDP channel for both IPv4 and
-*   IPv6 addresses. The search target(ST) is required and must be one of
-*   the following:
-*       - "ssdp:all" : Search for all devices and services.
-*       - "ssdp:rootdevice" : Search for root devices only.
-*       - "uuid:<device-uuid>" : Search for a particular device.
-*       - "urn:schemas-upnp-org:device:<deviceType:v>"
-*       - "urn:schemas-upnp-org:service:<serviceType:v>"
-*       - "urn:<domain-name>:device:<deviceType:v>"
-*       - "urn:<domain-name>:service:<serviceType:v>"
+*	This function creates and send the search request for a specific URL.
 *
 * Returns: int
 *	1 if successful else appropriate error
 ***************************************************************************/
-int SearchByTarget(
-	IN int Mx,
-	IN char *St,
-	IN void *Cookie)
+int
+SearchByTarget( IN int Mx,
+                IN char *St,
+                IN void *Cookie )
 {
-	char errorBuffer[ERROR_BUFFER_LEN];
-	int socklen = sizeof( struct sockaddr_storage );
-	int *id = NULL;
-	int ret = 0;
-	char ReqBufv4[BUFSIZE];
-	char ReqBufv6[BUFSIZE];
-	char ReqBufv6UlaGua[BUFSIZE];
-	struct sockaddr_storage __ss_v4;
-	struct sockaddr_storage __ss_v6;
-	struct sockaddr_in* destAddr4 = (struct sockaddr_in*)&__ss_v4;
-	struct sockaddr_in6* destAddr6 = (struct sockaddr_in6*)&__ss_v6;
-	fd_set wrSet;
-	SsdpSearchArg *newArg = NULL;
-	int timeTillRead = 0;
-	int handle;
-	struct Handle_Info *ctrlpt_info = NULL;
-	enum SsdpSearchType requestType;
-	unsigned long addrv4 = inet_addr(gIF_IPV4);
-	int max_fd = 0;
+    char errorBuffer[ERROR_BUFFER_LEN];
+    int socklen = sizeof( struct sockaddr_in );
+    int *id = NULL;
+    int ret = 0;
+    char *ReqBuf;
+    struct sockaddr_in destAddr;
+    fd_set wrSet;
+    SsdpSearchArg *newArg = NULL;
+    int timeTillRead = 0;
+    int handle;
+    struct Handle_Info *ctrlpt_info = NULL;
+    enum SsdpSearchType requestType;
+    unsigned long addr = inet_addr( LOCAL_HOST );
 
-	//ThreadData *ThData;
-	ThreadPoolJob job;
+    //ThreadData *ThData;
+    ThreadPoolJob job;
 
-	requestType = ssdp_request_type1(St);
-	if (requestType == SSDP_SERROR) {
-		return UPNP_E_INVALID_PARAM;
-	}
+    requestType = ssdp_request_type1( St );
+    if( requestType == SSDP_SERROR ) {
+        return UPNP_E_INVALID_PARAM;
+    }
 
-	UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__, "Inside SearchByTarget\n");
+    ReqBuf = (char *)malloc( BUFSIZE );
+    if( ReqBuf == NULL ) {
+        return UPNP_E_OUTOF_MEMORY;
+    }
 
-	timeTillRead = Mx;
-	if (timeTillRead < MIN_SEARCH_TIME) {
-		timeTillRead = MIN_SEARCH_TIME;
-	} else if (timeTillRead > MAX_SEARCH_TIME) {
-		timeTillRead = MAX_SEARCH_TIME;
-	}
+    UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__, ">>> SSDP SEND >>>\n");
 
-	CreateClientRequestPacket(ReqBufv4, timeTillRead, St, AF_INET);
-	CreateClientRequestPacket(ReqBufv6, timeTillRead, St, AF_INET6);
-	CreateClientRequestPacketUlaGua(ReqBufv6UlaGua, timeTillRead, St, AF_INET6);
+    timeTillRead = Mx;
 
-	memset(&__ss_v4, 0, sizeof(__ss_v4));
-	destAddr4->sin_family = AF_INET;
-	inet_pton(AF_INET, SSDP_IP, &destAddr4->sin_addr);
-	destAddr4->sin_port = htons(SSDP_PORT);
+    if( timeTillRead < MIN_SEARCH_TIME ) {
+        timeTillRead = MIN_SEARCH_TIME;
+    } else if( timeTillRead > MAX_SEARCH_TIME ) {
+        timeTillRead = MAX_SEARCH_TIME;
+    }
 
-	memset(&__ss_v6, 0, sizeof(__ss_v6));
-	destAddr6->sin6_family = AF_INET6;
-	inet_pton(AF_INET6, SSDP_IPV6_SITELOCAL, &destAddr6->sin6_addr);
-	destAddr6->sin6_port = htons(SSDP_PORT);
-	destAddr6->sin6_scope_id = gIF_INDEX;
+    CreateClientRequestPacket( ReqBuf, timeTillRead, St );
+    memset( ( char * )&destAddr, 0, sizeof( struct sockaddr_in ) );
 
-	/* add search criteria to list */
-	HandleLock();
-	if (GetClientHandleInfo(&handle, &ctrlpt_info) != HND_CLIENT) {
-		HandleUnlock();
+    destAddr.sin_family = AF_INET;
+    destAddr.sin_addr.s_addr = inet_addr( SSDP_IP );
+    destAddr.sin_port = htons( SSDP_PORT );
 
-		return UPNP_E_INTERNAL_ERROR;
-	}
+    FD_ZERO( &wrSet );
+    FD_SET( gSsdpReqSocket, &wrSet );
 
-	newArg = (SsdpSearchArg *)malloc(sizeof(SsdpSearchArg));
-	newArg->searchTarget = strdup(St);
-	newArg->cookie = Cookie;
-	newArg->requestType = requestType;
+    // add search criteria to list
+    HandleLock();
+    if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
+        HandleUnlock();
+        free( ReqBuf );
+        return UPNP_E_INTERNAL_ERROR;
+    }
 
-	id = (int *)malloc(sizeof(int));
-	TPJobInit(&job, (start_routine)searchExpired, id);
-	TPJobSetPriority(&job, MED_PRIORITY);
-	TPJobSetFreeFunction(&job, (free_routine)free);
+    newArg = ( SsdpSearchArg * ) malloc( sizeof( SsdpSearchArg ) );
+    newArg->searchTarget = strdup( St );
+    newArg->cookie = Cookie;
+    newArg->requestType = requestType;
 
-	/* Schedule a timeout event to remove search Arg */
-	TimerThreadSchedule(&gTimerThread, timeTillRead,
-		REL_SEC, &job, SHORT_TERM, id);
-	newArg->timeoutEventId = *id;
+    id = ( int * )malloc( sizeof( int ) );
+    TPJobInit( &job, ( start_routine ) searchExpired, id );
+    TPJobSetPriority( &job, MED_PRIORITY );
+    TPJobSetFreeFunction( &job, ( free_routine ) free );
 
-	ListAddTail(&ctrlpt_info->SsdpSearchList, newArg);
-	HandleUnlock();
-	/* End of lock */
+    // Schedule a timeout event to remove search Arg
+    TimerThreadSchedule( &gTimerThread, timeTillRead,
+                         REL_SEC, &job, SHORT_TERM, id );
+    newArg->timeoutEventId = ( *id );
 
-	FD_ZERO(&wrSet);
-	if (gSsdpReqSocket4 != INVALID_SOCKET) {
-		setsockopt(gSsdpReqSocket4, IPPROTO_IP, IP_MULTICAST_IF,
-			(char *)&addrv4, sizeof (addrv4));
-		FD_SET(gSsdpReqSocket4, &wrSet);
-		max_fd = max(max_fd, gSsdpReqSocket4);
-	}
-	if (gSsdpReqSocket6 != INVALID_SOCKET) {
-		setsockopt(gSsdpReqSocket6, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-			(char *)&gIF_INDEX, sizeof (gIF_INDEX));
-		FD_SET(gSsdpReqSocket6, &wrSet);
-		max_fd = max(max_fd, gSsdpReqSocket6);
-	}
+    ListAddTail( &ctrlpt_info->SsdpSearchList, newArg );
+    HandleUnlock();
 
-	ret = select(max_fd + 1, NULL, &wrSet, NULL, NULL);
-	if (ret == -1) {
-		strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
-		UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__,
-			"SSDP_LIB: Error in select(): %s\n",
-			errorBuffer);
-		shutdown(gSsdpReqSocket4, SD_BOTH);
-		UpnpCloseSocket(gSsdpReqSocket4);
-		shutdown(gSsdpReqSocket6, SD_BOTH);
-		UpnpCloseSocket(gSsdpReqSocket6);
+    ret = setsockopt( gSsdpReqSocket, IPPROTO_IP, IP_MULTICAST_IF,
+        (char *)&addr, sizeof (addr) );
 
-		return UPNP_E_INTERNAL_ERROR;
-	}
-	if (gSsdpReqSocket6 != INVALID_SOCKET && 
-	    FD_ISSET(gSsdpReqSocket6, &wrSet)) {
-		int NumCopy = 0;
+    ret = select( gSsdpReqSocket + 1, NULL, &wrSet, NULL, NULL );
+    if( ret == -1 ) {
+        strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            "SSDP_LIB: Error in select(): %s\n",
+            errorBuffer );
+	shutdown( gSsdpReqSocket, SD_BOTH );
+        UpnpCloseSocket( gSsdpReqSocket );
+        free( ReqBuf );
 
-		while (NumCopy < NUM_SSDP_COPY) {
-			sendto(gSsdpReqSocket6,
-				ReqBufv6UlaGua, strlen(ReqBufv6UlaGua), 0,
-				(struct sockaddr *)&__ss_v6, socklen);
-			NumCopy++;
-			imillisleep(SSDP_PAUSE);
-		}
-		NumCopy = 0;
-		inet_pton(AF_INET6, SSDP_IPV6_LINKLOCAL, &destAddr6->sin6_addr);
-		while (NumCopy < NUM_SSDP_COPY) {
-			sendto(gSsdpReqSocket6,
-				ReqBufv6, strlen(ReqBufv6), 0,
-				(struct sockaddr *)&__ss_v6, socklen);
-			NumCopy++;
-			imillisleep(SSDP_PAUSE);
-		}
-	}
-	if (gSsdpReqSocket4 != INVALID_SOCKET && 
-	    FD_ISSET(gSsdpReqSocket4, &wrSet)) {
-		int NumCopy = 0;
+        return UPNP_E_INTERNAL_ERROR;
+    } else if( FD_ISSET( gSsdpReqSocket, &wrSet ) ) {
+        int NumCopy = 0;
+        while( NumCopy < NUM_SSDP_COPY ) {
+            sendto( gSsdpReqSocket, ReqBuf, strlen( ReqBuf ), 0,
+                (struct sockaddr *)&destAddr, socklen );
+            NumCopy++;
+            imillisleep( SSDP_PAUSE );
+        }
+    }
 
-		while (NumCopy < NUM_SSDP_COPY) {
-			sendto(gSsdpReqSocket4,
-				ReqBufv4, strlen(ReqBufv4), 0,
-				(struct sockaddr *)&__ss_v4, socklen);
-			NumCopy++;
-			imillisleep(SSDP_PAUSE);
-		}
-	} 
-
-	return 1;
+    free( ReqBuf );
+    return 1;
 }
 
 #endif // EXCLUDE_SSDP
 #endif // INCLUDE_CLIENT_APIS
+

upnp/src/ssdp/ssdp_device.c

@@ -1,62 +1,60 @@
-/**************************************************************************
- *
- * 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"
 
-
 #ifdef INCLUDE_DEVICE_APIS
 #if EXCLUDE_SSDP == 0
 
-
-#include "httpparser.h"
-#include "httpreadwrite.h"
-#include "ssdplib.h"
-#include "statcodes.h"
-#include "ThreadPool.h"
-#include "unixutil.h"
-#include "upnpapi.h"
-#include "UpnpInet.h"
-
-
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "ssdplib.h"
+#include "upnpapi.h"
+#include "ThreadPool.h"
+#include "httpparser.h"
+#include "httpreadwrite.h"
+#include "statcodes.h"
+#include "unixutil.h"
+
+#ifdef WIN32
+	#include <ws2tcpip.h>
+	#include <winsock2.h>
+#endif /* WIN32 */
 
 #define MSGTYPE_SHUTDOWN	0
 #define MSGTYPE_ADVERTISEMENT	1
 #define MSGTYPE_REPLY		2
 
-
 /************************************************************************
 * Function : advertiseAndReplyThread
 *
@@ -77,7 +75,7 @@ advertiseAndReplyThread( IN void *data )
 
     AdvertiseAndReply( 0, arg->handle,
                        arg->event.RequestType,
-                       (struct sockaddr*)&arg->dest_addr,
+                       &arg->dest_addr,
                        arg->event.DeviceType,
                        arg->event.UDN,
                        arg->event.ServiceType, arg->MaxAge );
@@ -90,8 +88,8 @@ advertiseAndReplyThread( IN void *data )
 * Function : ssdp_handle_device_request
 *
 * Parameters:
-*	IN http_message_t *hmsg: SSDP search request from the control point
-*	IN struct sockaddr *dest_addr: The address info of control point
+*	IN http_message_t* hmsg: SSDP search request from the control point
+*	IN struct sockaddr_in* dest_addr: The address info of control point
 *
 * Description:
 *	This function handles the search request. It do the sanity checks of
@@ -103,8 +101,8 @@ advertiseAndReplyThread( IN void *data )
 ***************************************************************************/
 #ifdef INCLUDE_DEVICE_APIS
 void
-ssdp_handle_device_request( IN http_message_t *hmsg,
-                            IN struct sockaddr *dest_addr )
+ssdp_handle_device_request( IN http_message_t * hmsg,
+                            IN struct sockaddr_in *dest_addr )
 {
 #define MX_FUDGE_FACTOR 10
 
@@ -144,8 +142,7 @@ ssdp_handle_device_request( IN http_message_t *hmsg,
 
     HandleLock();
     // device info
-    if( GetDeviceHandleInfo( dest_addr->sa_family, 
-        &handle, &dev_info ) != HND_DEVICE ) {
+    if( GetDeviceHandleInfo( &handle, &dev_info ) != HND_DEVICE ) {
         HandleUnlock();
         return;                 // no info found
     }
@@ -173,7 +170,7 @@ ssdp_handle_device_request( IN http_message_t *hmsg,
         return;
     }
     threadArg->handle = handle;
-    memcpy( &threadArg->dest_addr, dest_addr, sizeof(threadArg->dest_addr) );
+    threadArg->dest_addr = ( *dest_addr );
     threadArg->event = event;
     threadArg->MaxAge = maxAge;
 
@@ -204,7 +201,7 @@ ssdp_handle_device_request( IN http_message_t *hmsg,
 * Function : NewRequestHandler
 *
 * Parameters:
-*		IN struct sockaddr *DestAddr: Ip address, to send the reply.
+*		IN struct sockaddr_in * DestAddr: Ip address, to send the reply.
 *		IN int NumPacket: Number of packet to be sent.
 *		IN char **RqPacket:Number of packet to be sent.
 *
@@ -216,21 +213,19 @@ ssdp_handle_device_request( IN http_message_t *hmsg,
 *	1 if successful else appropriate error
 ***************************************************************************/
 static int
-NewRequestHandler( IN struct sockaddr *DestAddr,
+NewRequestHandler( IN struct sockaddr_in *DestAddr,
                    IN int NumPacket,
                    IN char **RqPacket )
 {
     char errorBuffer[ERROR_BUFFER_LEN];
-    SOCKET ReplySock;
-    int socklen = sizeof( struct sockaddr_storage );
+    int ReplySock;
+    int socklen = sizeof( struct sockaddr_in );
     int NumCopy;
     int Index;
-    unsigned long replyAddr = inet_addr( gIF_IPV4 );
+    unsigned long replyAddr = inet_addr( LOCAL_HOST );
     int ttl = 4; // a/c to UPNP Spec
-    int hops = 1;
-    char buf_ntop[64];
 
-    ReplySock = socket( DestAddr->sa_family, SOCK_DGRAM, 0 );
+    ReplySock = socket( AF_INET, SOCK_DGRAM, 0 );
     if ( ReplySock == -1 ) {
         strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
         UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
@@ -239,25 +234,11 @@ NewRequestHandler( IN struct sockaddr *DestAddr,
 
         return UPNP_E_OUTOF_SOCKET;
     }
- 
-    if( DestAddr->sa_family == AF_INET ) {
-        inet_ntop(AF_INET, &((struct sockaddr_in*)DestAddr)->sin_addr, 
-            buf_ntop, sizeof(buf_ntop));
-        setsockopt( ReplySock, IPPROTO_IP, IP_MULTICAST_IF,
-            (char *)&replyAddr, sizeof (replyAddr) );
-        setsockopt( ReplySock, IPPROTO_IP, IP_MULTICAST_TTL,
-            (char *)&ttl, sizeof (int) );
-    } else if( DestAddr->sa_family == AF_INET6 ) {
-        inet_ntop(AF_INET6, &((struct sockaddr_in6*)DestAddr)->sin6_addr, 
-            buf_ntop, sizeof(buf_ntop));
-        setsockopt( ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-            (char *)&gIF_INDEX, sizeof(gIF_INDEX) );
-        setsockopt( ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
-            (char *)&hops, sizeof(hops) );
-    } else {
-        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-            "Invalid destination address specified." );
-    }
+
+    setsockopt( ReplySock, IPPROTO_IP, IP_MULTICAST_IF,
+        (char *)&replyAddr, sizeof (replyAddr) );
+    setsockopt( ReplySock, IPPROTO_IP, IP_MULTICAST_TTL,
+        (char *)&ttl, sizeof (int) );
 
     for( Index = 0; Index < NumPacket; Index++ ) {
         int rc;
@@ -275,11 +256,11 @@ NewRequestHandler( IN struct sockaddr *DestAddr,
         NumCopy = 0;
         while( NumCopy < NUM_COPY ) {
             UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                ">>> SSDP SEND to %s >>>\n%s\n",
-                buf_ntop, *( RqPacket + Index ) );
+                ">>> SSDP SEND >>>\n%s\n",
+                *( RqPacket + Index ) );
             rc = sendto( ReplySock, *( RqPacket + Index ),
                          strlen( *( RqPacket + Index ) ),
-                         0, DestAddr, socklen );
+                         0, ( struct sockaddr * )DestAddr, socklen );
             imillisleep( SSDP_PAUSE );
             ++NumCopy;
         }
@@ -291,61 +272,6 @@ NewRequestHandler( IN struct sockaddr *DestAddr,
     return UPNP_E_SUCCESS;
 }
 
-/**
- * return 1 if an inet6 @ has been found
- */
-int extractIPv6address(char *url, char *address)
-{
-	int i = 0;
-	int j = 0;
-	int ret = 0;
-
-	while (url[i] != '[' && url[i] != '\0') {
-		i++;
-	}
-	if( url[i] == '\0') {
-		goto exit_function;
-	}
-
-	/* bracket has been found, we deal with an IPv6 address */
-	i++;
-	while (url[i] != '\0' &&  url[i] != ']' ) {
-		address[j] = url[i];
-		i++;
-		j++;
-	}
-	if (url[i] == '\0') {
-		goto exit_function;
-	}
-
-	if (url[i] == ']') {
-		address[j] = '\0';
-		ret = 1;
-	}
-
-exit_function:
-	return ret;
-}
-
-
-/**
- * return 1 if the Url contains an ULA or GUA IPv6 address
- * 0 otherwise
- */
-int isUrlV6UlaGua(char *descdocUrl)
-{
-	char address[INET6_ADDRSTRLEN];
-	struct in6_addr v6_addr;
-
-	if (extractIPv6address(descdocUrl, address)) {
-		inet_pton(AF_INET6, address, &v6_addr);
-		return !IN6_IS_ADDR_LINKLOCAL(&v6_addr);
-	}
-
-	return 0;
-}
-
-
 /************************************************************************
 * Function : CreateServiceRequestPacket
 *
@@ -357,7 +283,6 @@ int isUrlV6UlaGua(char *descdocUrl)
 *	IN char * location :Location URL.
 *	IN int  duration :Service duration in sec.
 *	OUT char** packet :Output buffer filled with HTTP statement.
-*	IN int AddressFamily: Address family of the HTTP request.
 *
 * Description:
 *	This function creates a HTTP request packet.  Depending
@@ -367,92 +292,78 @@ int isUrlV6UlaGua(char *descdocUrl)
 * Returns: void
 *
 ***************************************************************************/
-void CreateServicePacket(
-	IN int msg_type,
-	IN char *nt,
-	IN char *usn,
-	IN char *location,
-	IN int duration,
-	OUT char **packet,
-	IN int AddressFamily)
+void
+CreateServicePacket( IN int msg_type,
+                     IN char *nt,
+                     IN char *usn,
+                     IN char *location,
+                     IN int duration,
+                     OUT char **packet )
 {
-	int ret_code;
-	char *nts;
-	membuffer buf;
+    int ret_code;
+    char *nts;
+    membuffer buf;
 
-	/* Notf == 0 means service shutdown,
-	 * Notf == 1 means service advertisement,
-	 * Notf == 2 means reply */
-	membuffer_init(&buf);
-	buf.size_inc = 30;
-	*packet = NULL;
+    //Notf=0 means service shutdown, 
+    //Notf=1 means service advertisement, Notf =2 means reply   
 
-	if (msg_type == MSGTYPE_REPLY) {
-		ret_code = http_MakeMessage(
-			&buf, 1, 1,
-			"R" "sdc" "D" "sc" "ssc" "ssc" "ssc" "S" "Xc" "ssc" "sscc",
-			HTTP_OK,
-			"CACHE-CONTROL: max-age=", duration,
-			"EXT:",
-			"LOCATION: ", location,
-			"OPT: ", "\"http://schemas.upnp.org/upnp/1/0/\"; ns=01",
-			"01-NLS: ", gUpnpSdkNLSuuid,
-			X_USER_AGENT,
-			"ST: ", nt,
-			"USN: ", usn);
-		if (ret_code != 0) {
-			return;
-		}
-	} else if (msg_type == MSGTYPE_ADVERTISEMENT ||
-		   msg_type == MSGTYPE_SHUTDOWN) {
-		if (msg_type == MSGTYPE_ADVERTISEMENT) {
-			nts = "ssdp:alive";
-		} else {
-      			/* shutdown */
-			nts = "ssdp:byebye";
-		}
-		/* NOTE: The CACHE-CONTROL and LOCATION headers are not present in
-		 * a shutdown msg, but are present here for MS WinMe interop. */
-		char *host = NULL;
-		if (AddressFamily == AF_INET) {
-			host = SSDP_IP;
-		} else {
-			if (isUrlV6UlaGua(location)) {
-				host = "[" SSDP_IPV6_SITELOCAL "]";
-			} else {
-				host = "[" SSDP_IPV6_LINKLOCAL "]";
-			}
-		}
-		ret_code = http_MakeMessage(
-			&buf, 1, 1,
-			"Q" "sssdc" "sdc" "ssc" "ssc" "ssc" "ssc" "ssc" "S" "Xc" "sscc",
-			HTTPMETHOD_NOTIFY, "*", (size_t)1,
-			"HOST: ", host,
-			":", SSDP_PORT,
-			"CACHE-CONTROL: max-age=", duration,
-			"LOCATION: ", location,
-			"OPT: ", "\"http://schemas.upnp.org/upnp/1/0/\"; ns=01",
-			"01-NLS: ", gUpnpSdkNLSuuid,
-			"NT: ", nt,
-			"NTS: ", nts,
-			X_USER_AGENT,
-			"USN: ", usn );
-		if (ret_code != 0) {
-			return;
-		}
-	} else {
-		/* unknown msg */
-		assert(0);
-	}
+    membuffer_init( &buf );
+    buf.size_inc = 30;
 
-	/* return msg */
-	*packet = membuffer_detach(&buf);
-	membuffer_destroy(&buf);
+    *packet = NULL;
 
-	return;
+    if( msg_type == MSGTYPE_REPLY ) {
+        ret_code = http_MakeMessage(
+            &buf, 1, 1,
+            "R" "sdc" "D" "sc" "ssc" "S" "Xc" "ssc" "sscc",
+            HTTP_OK,
+            "CACHE-CONTROL: max-age=", duration,
+	    "EXT:",
+            "LOCATION: ", location,
+            X_USER_AGENT,
+            "ST: ", nt,
+            "USN: ", usn);
+        if( ret_code != 0 ) {
+            return;
+        }
+    } else if( msg_type == MSGTYPE_ADVERTISEMENT ||
+               msg_type == MSGTYPE_SHUTDOWN ) {
+        if( msg_type == MSGTYPE_ADVERTISEMENT ) {
+            nts = "ssdp:alive";
+        } else                  // shutdown
+        {
+            nts = "ssdp:byebye";
+        }
+
+        // NOTE: The CACHE-CONTROL and LOCATION headers are not present in
+        //  a shutdown msg, but are present here for MS WinMe interop.
+        
+        ret_code = http_MakeMessage(
+            &buf, 1, 1,
+            "Q" "sssdc" "sdc" "ssc" "ssc" "ssc" "S" "Xc" "sscc",
+            HTTPMETHOD_NOTIFY, "*", (size_t)1,
+            "HOST: ", SSDP_IP, ":", SSDP_PORT,
+            "CACHE-CONTROL: max-age=", duration,
+            "LOCATION: ", location,
+            "NT: ", nt,
+            "NTS: ", nts,
+            X_USER_AGENT,
+            "USN: ", usn );
+        if( ret_code != 0 ) {
+            return;
+        }
+
+    } else {
+        assert( 0 );            // unknown msg
+    }
+
+    *packet = membuffer_detach( &buf ); // return msg
+
+    membuffer_destroy( &buf );
+
+    return;
 }
 
-
 /************************************************************************
 * Function : DeviceAdvertisement
 *
@@ -476,12 +387,9 @@ DeviceAdvertisement( IN char *DevType,
                      int RootDev,
                      char *Udn,
                      IN char *Location,
-                     IN int Duration,
-                     IN int AddressFamily)
+                     IN int Duration )
 {
-    struct sockaddr_storage __ss;
-    struct sockaddr_in* DestAddr4 = (struct sockaddr_in*)&__ss;
-    struct sockaddr_in6* DestAddr6 = (struct sockaddr_in6*)&__ss;
+    struct sockaddr_in DestAddr;
 
     //char Mil_Nt[LINE_SIZE]
     char Mil_Usn[LINE_SIZE];
@@ -489,24 +397,11 @@ DeviceAdvertisement( IN char *DevType,
     int ret_code;
 
     UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-        "In function DeviceAdvertisement\n" );
+        "In function SendDeviceAdvertisemenrt\n" );
 
-    memset( &__ss, 0, sizeof(__ss) );
-    if( AddressFamily == AF_INET ) {
-        DestAddr4->sin_family = AF_INET;
-        inet_pton( AF_INET, SSDP_IP, &DestAddr4->sin_addr );
-        DestAddr4->sin_port = htons( SSDP_PORT );
-    } else if( AddressFamily == AF_INET6 ) {
-        DestAddr6->sin6_family = AF_INET6;
-	inet_pton(AF_INET6,
-		(isUrlV6UlaGua(Location)) ? SSDP_IPV6_SITELOCAL : SSDP_IPV6_LINKLOCAL,
-		&DestAddr6->sin6_addr );
-        DestAddr6->sin6_port = htons( SSDP_PORT );
-        DestAddr6->sin6_scope_id = gIF_INDEX;
-    } else {
-        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-            "Invalid device address family.\n" );
-    }
+    DestAddr.sin_family = AF_INET;
+    DestAddr.sin_addr.s_addr = inet_addr( SSDP_IP );
+    DestAddr.sin_port = htons( SSDP_PORT );
 
     msgs[0] = NULL;
     msgs[1] = NULL;
@@ -517,17 +412,17 @@ DeviceAdvertisement( IN char *DevType,
     if( RootDev ) {
         sprintf( Mil_Usn, "%s::upnp:rootdevice", Udn );
         CreateServicePacket( MSGTYPE_ADVERTISEMENT, "upnp:rootdevice",
-            Mil_Usn, Location, Duration, &msgs[0], AddressFamily );
+                             Mil_Usn, Location, Duration, &msgs[0] );
     }
     // both root and sub-devices need to send these two messages
     //
 
     CreateServicePacket( MSGTYPE_ADVERTISEMENT, Udn, Udn,
-                         Location, Duration, &msgs[1], AddressFamily );
+                         Location, Duration, &msgs[1] );
 
     sprintf( Mil_Usn, "%s::%s", Udn, DevType );
     CreateServicePacket( MSGTYPE_ADVERTISEMENT, DevType, Mil_Usn,
-                         Location, Duration, &msgs[2], AddressFamily );
+                         Location, Duration, &msgs[2] );
 
     // check error
     if( ( RootDev && msgs[0] == NULL ) ||
@@ -540,11 +435,11 @@ DeviceAdvertisement( IN char *DevType,
     // send packets
     if( RootDev ) {
         // send 3 msg types
-        ret_code = NewRequestHandler( (struct sockaddr*)&__ss, 3, &msgs[0] );
+        ret_code = NewRequestHandler( &DestAddr, 3, &msgs[0] );
     } else                      // sub-device
     {
         // send 2 msg types
-        ret_code = NewRequestHandler( (struct sockaddr*)&__ss, 2, &msgs[1] );
+        ret_code = NewRequestHandler( &DestAddr, 2, &msgs[1] );
     }
 
     // free msgs
@@ -559,7 +454,7 @@ DeviceAdvertisement( IN char *DevType,
 * Function : SendReply
 *
 * Parameters:
-*	IN struct sockaddr * DestAddr:destination IP address.
+*	IN struct sockaddr_in * 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
@@ -575,7 +470,7 @@ DeviceAdvertisement( IN char *DevType,
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int
-SendReply( IN struct sockaddr *DestAddr,
+SendReply( IN struct sockaddr_in *DestAddr,
            IN char *DevType,
            IN int RootDev,
            IN char *Udn,
@@ -598,7 +493,7 @@ SendReply( IN struct sockaddr *DestAddr,
 
         sprintf( Mil_Usn, "%s::upnp:rootdevice", Udn );
         CreateServicePacket( MSGTYPE_REPLY, "upnp:rootdevice",
-            Mil_Usn, Location, Duration, &msgs[0], DestAddr->sa_family );
+                             Mil_Usn, Location, Duration, &msgs[0] );
     } else {
         // two msgs for embedded devices
         num_msgs = 1;
@@ -606,11 +501,11 @@ SendReply( IN struct sockaddr *DestAddr,
         //NK: FIX for extra response when someone searches by udn
         if( !ByType ) {
             CreateServicePacket( MSGTYPE_REPLY, Udn, Udn, Location,
-                Duration, &msgs[0], DestAddr->sa_family );
+                                 Duration, &msgs[0] );
         } else {
             sprintf( Mil_Usn, "%s::%s", Udn, DevType );
             CreateServicePacket( MSGTYPE_REPLY, DevType, Mil_Usn,
-                Location, Duration, &msgs[0], DestAddr->sa_family );
+                                 Location, Duration, &msgs[0] );
         }
     }
 
@@ -636,7 +531,7 @@ SendReply( IN struct sockaddr *DestAddr,
 * Function : DeviceReply
 *
 * Parameters:
-*	IN struct sockaddr *DestAddr:destination IP address.
+*	IN struct sockaddr_in * 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
@@ -650,12 +545,12 @@ SendReply( IN struct sockaddr *DestAddr,
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int
-DeviceReply( IN struct sockaddr *DestAddr,
+DeviceReply( IN struct sockaddr_in *DestAddr,
              IN char *DevType,
              IN int RootDev,
              IN char *Udn,
              IN char *Location,
-             IN int Duration)
+             IN int Duration )
 {
     char *szReq[3],
       Mil_Nt[LINE_SIZE],
@@ -673,18 +568,18 @@ DeviceReply( IN struct sockaddr *DestAddr,
         strcpy( Mil_Nt, "upnp:rootdevice" );
         sprintf( Mil_Usn, "%s::upnp:rootdevice", Udn );
         CreateServicePacket( MSGTYPE_REPLY, Mil_Nt, Mil_Usn,
-            Location, Duration, &szReq[0], DestAddr->sa_family );
+                             Location, Duration, &szReq[0] );
     }
 
     sprintf( Mil_Nt, "%s", Udn );
     sprintf( Mil_Usn, "%s", Udn );
     CreateServicePacket( MSGTYPE_REPLY, Mil_Nt, Mil_Usn,
-        Location, Duration, &szReq[1], DestAddr->sa_family );
+                         Location, Duration, &szReq[1] );
 
     sprintf( Mil_Nt, "%s", DevType );
     sprintf( Mil_Usn, "%s::%s", Udn, DevType );
     CreateServicePacket( MSGTYPE_REPLY, Mil_Nt, Mil_Usn,
-        Location, Duration, &szReq[2], DestAddr->sa_family );
+                         Location, Duration, &szReq[2] );
 
     // check error
 
@@ -718,7 +613,6 @@ DeviceReply( IN struct sockaddr *DestAddr,
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Life time of this device.
-*	IN int AddressFamily: Device address family
 * Description:
 *	This function creates the advertisement packet based
 *	on the input parameter, and send it to the multicast channel.
@@ -730,44 +624,28 @@ int
 ServiceAdvertisement( IN char *Udn,
                       IN char *ServType,
                       IN char *Location,
-                      IN int Duration,
-                      IN int AddressFamily)
+                      IN int Duration )
 {
     char Mil_Usn[LINE_SIZE];
     char *szReq[1];
+    struct sockaddr_in DestAddr;
     int RetVal;
-    struct sockaddr_storage __ss;
-    struct sockaddr_in* DestAddr4 = (struct sockaddr_in*)&__ss;
-    struct sockaddr_in6* DestAddr6 = (struct sockaddr_in6*)&__ss;
 
-    memset( &__ss, 0, sizeof(__ss) );
-    if( AddressFamily == AF_INET ) {
-        DestAddr4->sin_family = AF_INET;
-        inet_pton( AF_INET, SSDP_IP, &DestAddr4->sin_addr );
-        DestAddr4->sin_port = htons( SSDP_PORT );
-    } else if( AddressFamily == AF_INET6 ) {
-        DestAddr6->sin6_family = AF_INET6;
-	inet_pton(AF_INET6,
-		(isUrlV6UlaGua(Location)) ? SSDP_IPV6_SITELOCAL : SSDP_IPV6_LINKLOCAL,
-		&DestAddr6->sin6_addr );
-        DestAddr6->sin6_port = htons( SSDP_PORT );
-        DestAddr6->sin6_scope_id = gIF_INDEX;
-    } else {
-        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-            "Invalid device address family.\n" );
-    }
+    DestAddr.sin_family = AF_INET;
+    DestAddr.sin_addr.s_addr = inet_addr( SSDP_IP );
+    DestAddr.sin_port = htons( SSDP_PORT );
 
     sprintf( Mil_Usn, "%s::%s", Udn, ServType );
 
     //CreateServiceRequestPacket(1,szReq[0],Mil_Nt,Mil_Usn,
     //Server,Location,Duration);
     CreateServicePacket( MSGTYPE_ADVERTISEMENT, ServType, Mil_Usn,
-                         Location, Duration, &szReq[0], AddressFamily );
+                         Location, Duration, &szReq[0] );
     if( szReq[0] == NULL ) {
         return UPNP_E_OUTOF_MEMORY;
     }
 
-    RetVal = NewRequestHandler( (struct sockaddr*)&__ss, 1, szReq );
+    RetVal = NewRequestHandler( &DestAddr, 1, szReq );
 
     free( szReq[0] );
     return RetVal;
@@ -777,7 +655,7 @@ ServiceAdvertisement( IN char *Udn,
 * Function : ServiceReply
 *
 * Parameters:
-*	IN struct sockaddr *DestAddr:
+*	IN struct sockaddr_in *DestAddr:
 *	IN char * Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
@@ -790,7 +668,7 @@ ServiceAdvertisement( IN char *Udn,
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
 int
-ServiceReply( IN struct sockaddr *DestAddr,
+ServiceReply( IN struct sockaddr_in *DestAddr,
               IN char *ServType,
               IN char *Udn,
               IN char *Location,
@@ -805,7 +683,7 @@ ServiceReply( IN struct sockaddr *DestAddr,
     sprintf( Mil_Usn, "%s::%s", Udn, ServType );
 
     CreateServicePacket( MSGTYPE_REPLY, ServType, Mil_Usn,
-        Location, Duration, &szReq[0], DestAddr->sa_family );
+                         Location, Duration, &szReq[0] );
     if( szReq[0] == NULL ) {
         return UPNP_E_OUTOF_MEMORY;
     }
@@ -824,7 +702,6 @@ ServiceReply( IN struct sockaddr *DestAddr,
 *	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 
 *	and sent it to the multicast channel through RequestHandler.
@@ -836,43 +713,27 @@ int
 ServiceShutdown( IN char *Udn,
                  IN char *ServType,
                  IN char *Location,
-                 IN int Duration,
-                 IN int AddressFamily)
+                 IN int Duration )
 {
     char Mil_Usn[LINE_SIZE];
     char *szReq[1];
-    struct sockaddr_storage __ss;
-    struct sockaddr_in* DestAddr4 = (struct sockaddr_in*)&__ss;
-    struct sockaddr_in6* DestAddr6 = (struct sockaddr_in6*)&__ss;
+    struct sockaddr_in DestAddr;
     int RetVal;
 
-    memset( &__ss, 0, sizeof(__ss) );
-    if( AddressFamily == AF_INET ) {
-        DestAddr4->sin_family = AF_INET;
-        inet_pton( AF_INET, SSDP_IP, &DestAddr4->sin_addr );
-        DestAddr4->sin_port = htons( SSDP_PORT );
-    } else if( AddressFamily == AF_INET6 ) {
-        DestAddr6->sin6_family = AF_INET6;
-	inet_pton(AF_INET6,
-		(isUrlV6UlaGua(Location)) ? SSDP_IPV6_SITELOCAL : SSDP_IPV6_LINKLOCAL,
-		&DestAddr6->sin6_addr );
-        DestAddr6->sin6_port = htons( SSDP_PORT );
-        DestAddr6->sin6_scope_id = gIF_INDEX;
-    } else {
-        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-            "Invalid device address family.\n" );
-    }
+    DestAddr.sin_family = AF_INET;
+    DestAddr.sin_addr.s_addr = inet_addr( SSDP_IP );
+    DestAddr.sin_port = htons( SSDP_PORT );
 
     //sprintf(Mil_Nt,"%s",ServType);
     sprintf( Mil_Usn, "%s::%s", Udn, ServType );
     //CreateServiceRequestPacket(0,szReq[0],Mil_Nt,Mil_Usn,
     //Server,Location,Duration);
     CreateServicePacket( MSGTYPE_SHUTDOWN, ServType, Mil_Usn,
-                         Location, Duration, &szReq[0], AddressFamily );
+                         Location, Duration, &szReq[0] );
     if( szReq[0] == NULL ) {
         return UPNP_E_OUTOF_MEMORY;
     }
-    RetVal = NewRequestHandler( (struct sockaddr*)&__ss, 1, szReq );
+    RetVal = NewRequestHandler( &DestAddr, 1, szReq );
 
     free( szReq[0] );
     return RetVal;
@@ -887,7 +748,6 @@ ServiceShutdown( IN char *Udn,
 *	IN char * Udn: Device UDN
 *	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 
@@ -902,12 +762,9 @@ DeviceShutdown( IN char *DevType,
                 IN char *Udn,
                 IN char *_Server,
                 IN char *Location,
-                IN int Duration, 
-                IN int AddressFamily)
+                IN int Duration )
 {
-    struct sockaddr_storage __ss;
-    struct sockaddr_in* DestAddr4 = (struct sockaddr_in*)&__ss;
-    struct sockaddr_in6* DestAddr6 = (struct sockaddr_in6*)&__ss;
+    struct sockaddr_in DestAddr;
     char *msgs[3];
     char Mil_Usn[LINE_SIZE];
     int ret_code;
@@ -916,39 +773,26 @@ DeviceShutdown( IN char *DevType,
     msgs[1] = NULL;
     msgs[2] = NULL;
 
-    memset( &__ss, 0, sizeof(__ss) );
-    if( AddressFamily == AF_INET ) {
-        DestAddr4->sin_family = AF_INET;
-        inet_pton( AF_INET, SSDP_IP, &DestAddr4->sin_addr );
-        DestAddr4->sin_port = htons( SSDP_PORT );
-    } else if( AddressFamily == AF_INET6 ) {
-        DestAddr6->sin6_family = AF_INET6;
-	inet_pton(AF_INET6,
-		(isUrlV6UlaGua(Location)) ? SSDP_IPV6_SITELOCAL : SSDP_IPV6_LINKLOCAL,
-		&DestAddr6->sin6_addr );
-        DestAddr6->sin6_port = htons( SSDP_PORT );
-        DestAddr6->sin6_scope_id = gIF_INDEX;
-    } else {
-        UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-            "Invalid device address family.\n" );
-    }
+    DestAddr.sin_family = AF_INET;
+    DestAddr.sin_addr.s_addr = inet_addr( SSDP_IP );
+    DestAddr.sin_port = htons( SSDP_PORT );
 
     // root device has one extra msg
     if( RootDev ) {
         sprintf( Mil_Usn, "%s::upnp:rootdevice", Udn );
         CreateServicePacket( MSGTYPE_SHUTDOWN, "upnp:rootdevice",
-            Mil_Usn, Location, Duration, &msgs[0], AddressFamily );
+                             Mil_Usn, Location, Duration, &msgs[0] );
     }
 
     UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
         "In function DeviceShutdown\n" );
     // both root and sub-devices need to send these two messages
     CreateServicePacket( MSGTYPE_SHUTDOWN, Udn, Udn,
-                         Location, Duration, &msgs[1], AddressFamily );
+                         Location, Duration, &msgs[1] );
 
     sprintf( Mil_Usn, "%s::%s", Udn, DevType );
     CreateServicePacket( MSGTYPE_SHUTDOWN, DevType, Mil_Usn,
-                         Location, Duration, &msgs[2], AddressFamily );
+                         Location, Duration, &msgs[2] );
 
     // check error
     if( ( RootDev && msgs[0] == NULL ) ||
@@ -961,11 +805,11 @@ DeviceShutdown( IN char *DevType,
     // send packets
     if( RootDev ) {
         // send 3 msg types
-        ret_code = NewRequestHandler( (struct sockaddr*)&__ss, 3, &msgs[0] );
+        ret_code = NewRequestHandler( &DestAddr, 3, &msgs[0] );
     } else                      // sub-device
     {
         // send 2 msg types
-        ret_code = NewRequestHandler( (struct sockaddr*)&__ss, 2, &msgs[1] );
+        ret_code = NewRequestHandler( &DestAddr, 2, &msgs[1] );
     }
 
     // free msgs

upnp/src/urlconfig/urlconfig.c

@@ -1,66 +1,57 @@
-/**************************************************************************
- *
- * 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 "membuffer.h"
-#include "unixutil.h"
+#include <assert.h>
+#ifndef WIN32
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+#else
+ #include <winsock2.h>
+#endif
 #include "upnp.h"
-#include "upnpdebug.h"
-#include "UpnpInet.h"
-#include "uri.h"
-#include "urlconfig.h"
 #include "util.h"
 #include "webserver.h"
-
-
-#include <assert.h>
-#include <stdio.h>
-
-
-#ifdef WIN32
-#else
-	#include <arpa/inet.h>
-	#include <sys/types.h>
-	#include <sys/socket.h>
-#endif
-
+#include "uri.h"
+#include "membuffer.h"
+#include "urlconfig.h"
+#include "unixutil.h"
 
 /************************************************************************
 *	Function :	addrToString
 *
 *	Parameters :
-*		IN const struct sockaddr* addr ;	socket address object with 
+*		IN const struct sockaddr_in* addr ;	socket address object with 
 *					the IP Address and port information
 *		OUT char ipaddr_port[] ;	character array which will hold the 
 *					IP Address  in a string format.
@@ -73,20 +64,11 @@
 *	Note :
 ************************************************************************/
 static UPNP_INLINE void
-addrToString( IN const struct sockaddr *addr,
+addrToString( IN const struct sockaddr_in *addr,
               OUT char ipaddr_port[] )
 {
-    char buf_ntop[64];
-
-    if( addr->sa_family == AF_INET ) {
-        struct sockaddr_in* sa4 = (struct sockaddr_in*)addr;
-        inet_ntop(AF_INET, &sa4->sin_addr, buf_ntop, sizeof(buf_ntop) );
-        sprintf( ipaddr_port, "%s:%d", buf_ntop, ntohs( sa4->sin_port ) );
-    } else if( addr->sa_family == AF_INET6 ) {
-        struct sockaddr_in6* sa6 = (struct sockaddr_in6*)addr;
-        inet_ntop(AF_INET6, &sa6->sin6_addr, buf_ntop, sizeof(buf_ntop) );
-        sprintf( ipaddr_port, "[%s]:%d", buf_ntop, ntohs( sa6->sin6_port ) );
-    }
+    sprintf( ipaddr_port, "%s:%d", inet_ntoa( addr->sin_addr ),
+             ntohs( addr->sin_port ) );
 }
 
 /************************************************************************
@@ -362,7 +344,7 @@ config_description_doc( INOUT IXML_Document * doc,
 *
 *	Parameters :
 *		INOUT IXML_Document *doc ;	IXML Description document
-*		IN const struct sockaddr* serverAddr ;	socket address object
+*		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 
@@ -370,7 +352,7 @@ config_description_doc( INOUT IXML_Document * doc,
 *		OUT char docURL[LINE_SIZE] ;	buffer to hold the URL of the 
 *					document.
 *		INOUT IXML_Document *doc:dom document whose urlbase is to be modified
-*		IN const struct sockaddr* serverAddr : ip address and port of 
+*		IN const struct sockaddr_in* serverAddr : ip address and port of 
 *													the miniserver
 *		IN const char* alias : a name to be used for the temp; e.g.:"foo.xml"
 *		IN time_t last_modified :	time
@@ -389,7 +371,7 @@ config_description_doc( INOUT IXML_Document * doc,
 ************************************************************************/
 int
 configure_urlbase( INOUT IXML_Document * doc,
-                   IN const struct sockaddr *serverAddr,
+                   IN const struct sockaddr_in *serverAddr,
                    IN const char *alias,
                    IN time_t last_modified,
                    OUT char docURL[LINE_SIZE] )

upnp/src/uuid/sysdep.c

@@ -18,16 +18,14 @@
  */
 
 #include "config.h"
-
-
-#include "sysdep.h"
-
-
-#include "UpnpInet.h"
-
-
+#ifdef WIN32
+	#include <winsock2.h>
+#else /* WIN32 */
+	#include <unistd.h>
+#endif /* WIN32 */
 #include <string.h>
 #include <stdio.h>
+#include "sysdep.h"
 
 /*-----------------------------------------------------------------------------*/
 /*
@@ -37,7 +35,7 @@
 void
 get_ieee_node_identifier(uuid_node_t *node)
 {
-    unsigned char seed[16];
+    char seed[16];
     static int inited = 0;
     static uuid_node_t saved_node;
 
@@ -142,7 +140,7 @@ get_system_time(uuid_time_t *uuid_time)
 
 /*-----------------------------------------------------------------------------*/
 void
-get_random_info(unsigned char seed[16])
+get_random_info(char seed[16])
 {
 	MD5_CTX c;
 	typedef struct {
@@ -161,7 +159,7 @@ get_random_info(unsigned char seed[16])
 
 	/* MD5 it */
 	MD5Init(&c);
-	MD5Update(&c, (unsigned char *)&r, sizeof r);
+	MD5Update(&c, &r, sizeof r);
 	MD5Final(seed, &c);
 };
 

upnp/src/uuid/uuid.c

@@ -1,39 +1,34 @@
-/**************************************************************************
- *
- * 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 "config.h"
-
-
-#include "uuid.h"
-
-
-#include "UpnpInet.h"
-
-
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-
+#ifndef WIN32
+ #include <netinet/in.h>
+#else
+ #include <winsock2.h>
+#endif
+#include "sysdep.h"
+#include "uuid.h"
 
 /*
    various forward declarations 
@@ -320,7 +315,7 @@ uuid_create_from_name( uuid_upnp * uid, /* resulting UUID */
     net_nsid.time_hi_and_version=htons( net_nsid.time_hi_and_version );
 
     MD5Init( &c );
-    MD5Update( &c, (unsigned char *)&net_nsid, sizeof(uuid_upnp) );
+    MD5Update( &c, &net_nsid, sizeof( uuid_upnp ) );
     MD5Update( &c, name, namelen );
     MD5Final( hash, &c );
 
@@ -391,4 +386,3 @@ uuid_compare( uuid_upnp * u1,
 
     return 0;
 };
-