Fixes in configure.ac for release.

Fix a bug in miniserver.c, in which maxMiniSock was wrongly declared as
unsigned int and as a result it was beeng set to ((unsigned int)(-1)).
As a result, after beeing incremented, it became zero, and this value
was beeing used in the select() call.

Thanks to Fabrice Fontaine for helping and testing with this issue.

.gitignore

@@ -0,0 +1,105 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
+# Normal rules
+#
+.*
+*.o
+*.o.*
+*.a
+*.s
+*.ko
+*.so
+*.so.dbg
+*.mod.c
+*.i
+*.lst
+*.symtypes
+*.order
+modules.builtin
+*.elf
+*.bin
+*.gz
+*.bz2
+*.lzma
+*.patch
+*.gcno
+
+#
+# Top-level generic files
+#
+/tags
+/TAGS
+/linux
+/vmlinux
+/vmlinuz
+/System.map
+/Module.markers
+/Module.symvers
+
+#
+# git files that we don't want to ignore even it they are dot-files
+#
+!.gitignore
+!.mailmap
+
+#
+# Generated include files
+#
+include/config
+include/linux/version.h
+include/generated
+
+# stgit generated dirs
+patches-*
+
+# quilt's files
+patches
+series
+
+# cscope files
+cscope.*
+ncscope.*
+
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
+*.orig
+*~
+\#*#
+*.lo
+*.la
+Makefile
+Makefile.in
+aclocal.m4
+autoconfig.h
+autoconfig.h.in
+autom4te.cache/
+build-aux/
+config.log
+config.status
+configure
+libtool
+libupnp.pc
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+stamp-h1
+upnp/inc/stamp-h2
+upnp/inc/upnpconfig.h
+upnp/sample/upnp_tv_combo
+upnp/sample/upnp_tv_ctrlpt
+upnp/sample/upnp_tv_device
+docs/doxygen
+

ChangeLog

@@ -1,221 +1,239 @@
 *******************************************************************************
-Version 1.8.0
+Version 1.6.8
 *******************************************************************************
 
-2010-08-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* upnp/src/api/Discovery.c: Fix a serious bug and memory leak in
-	UpnpDiscovery_strcpy_DeviceType(). Thanks to David Blanchet for the
-	patch.
+2010-10-20 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
 
-2010-04-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	Separation of the ClientSubscription object.
+	Fix a long date memory leak in webserver.c:StrStr().
 
-2010-04-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	Protect the object destructors agains null pointers on deletion, which
-	should be something valid.
+2010-10-19 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
 
-2010-03-27 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	SF Patch Tracker [ 2987390 ] upnp_debug vs. ixml_debug
-	Thanks for the load of updates, I'm still assimilating them ! Could I make
-	a suggestion though? The addition of printNodes(IXML_Node) to upnpdebug a
-	dds a new dependency on ixml.h for anything using upnpdebug.h. I'm making
-	quite a bit of use of upnpdebug in porting things to version 1.8.0, and I'd
-	prefer it if printNodes could be added to ixmldebug.h instead. I'm attach
-	ing a patch, what do you think ?
-
-	Nick
-
-2010-03-27 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Forward port of svn revision 505:
-	SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
-	Submitted By: zephyrus ( zephyrus00jp )
-
-2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* 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-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Forward port of svn revision 502:
-	SF Patch Tracker [ 2836704 ] Search for nested serviceList (not
-	stopping at the first lis
-	Submitted By: zephyrus ( zephyrus00jp )
+	Bug fix in select of miniserver.c
 	
-	Internet Gateway Device description contains nested serviceList (rootdevice
-	-> servicelist, subdevice
-	and subdevice has the lower-level serviceList, etc..)
+	Fix a bug in miniserver.c, in which maxMiniSock was wrongly declared as
+	unsigned int and as a result it was beeng set to ((unsigned int)(-1)).
+	As a result, after beeing incremented, it became zero, and this value
+	was beeing used in the select() call.
 
-	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.
+	Thanks to Fabrice Fontaine for helping and testing with this issue.
 
-	Attached patch modifies this behavior and looks for the service by
-	visiting all the serviceList in xml document in turn.
+2010-10-15 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
 
-	With the modified patch (ad additional modification), I could
-	simulate an IGD device and created a modified control program for that.
+	Fix for 100% CPU issue in select() in miniserv.c. I have also removed
+	the sleep() call, it was just a workaround.
 
-	Patch against 1.6.6
+	SF Bug Tracker [ 3086852 ] 99% CPU loop in miniserver.c on a non ipv6
+	system.
 
-	TIA.
+	Submitted by: Jin ( jin_eld ) - 2010-10-13 19:29:13 UTC
 
-2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Patch Tracker [ 2973319 ] Problem in commit 499
-	Submitted By: Nick Leverton (leveret)
-	Afraid that this doesn't compile, it seems retval should be retVal in two
-	places.
+	I cross compiled libupnp 1.6.7 for ARM9 using the --disable-ipv6
+	option, my system is an ipv4 only setup.
 
-2010-03-16 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fix for the ithread_mutex_unlock() logic in UpnpInit().
-	Thanks for Nicholas Kraft.
+	I do not know why this problem only appears when running the app in the
+	background (for instance using nohup &), but then it starts using 99%
+	CPU.
 
-2010-03-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Patch Tracker [ 2962606 ] Autorenewal errors: invalid SID,
-	too-short renewal interval
-	Submitted By: Nick Leverton (leveret)
-	
-	Auto-renewals send an invalid SID due to a missing UpnpString_get_String
-	call. They also send a renewal interval of 0 instead of copying it from
-	the original subscription.
+	I traced the problem down to the select() call in miniserver.c in the
+	RunMiniServer() function. Select returns code 1, but errno is set to
+	"Socket operation on non-socket", I also see this when running my app
+	under strace.
 
-2010-03-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Patch Tracker [ 2964685 ] patch for avoiding inet_ntoa (1.8.0)
-	Submitted By: Nick Leverton (leveret)
-	
-	Seems like SF's tracker won't let me add a patch to someone else's issue ?!
-	This refers to https://sourceforge.net/support/tracker.php?aid=2724578
-	
-	The calls to inet_ntoa are in getlocalhostname(), which is called from
-	UpnpInit when it is returning the bound IP address. 
-	UpnpInit/getlocalhostname hasn't been updated to IPv6, I presume this is
-	deliberate so that it doesn't start returning IPv6 addresses and
-	overwriting the caller's IPv4-sized allocation.
-	
-	The attached patch just updates getlocalhostname to use inet_ntop instead
-	of inet_ntoa, and also documents the fact that UpnpInit is IPv4 only whilst
-	UpnpInnit2 is both IPv4 and IPv6.
-	
-	A fuller solution might be to change UpnpInit to use some variant on
-	UpnpGetIfInfo. UpnpInit could still be left as IPv4 only if desired -
-	perhaps UpnpGetIfInfo could take an option for the desired address family.
-	getlocalhostname and its own copy of the interface scanning code would then
-	be redundant. I don't have IPv6 capability here though so I'm reluctant to
-	change the IPv6 code, as I have no way to test it.
-
-2010-03-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Patch Tracker [ 2724578 ] patch for avoiding memory leaks when
-	add devices
-	
-	each time a device been added, UpnpInit() is called, on exit, UpnpFinish()
-	is called, but the memories allocated by ThreadPoolInit() may lost because
-	there's no code to call ThreadPoolShutdown() to release the memories. And
-	inet_ntoa() is not thread safe, so in my patch, I substitute inet_ntoa()
-	with inet_ntop().
-
-2010-03-14 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Patch Tracker [ 2964687 ] Add new string based accessors to upnp
-	object API
-
-	As per email to pupnp-devel, this is the patch to add the _strget_
-	accessors for string-like objects in the interface.
-	
-	Will add a further patch shortly to udpate the sample programs.
-
-2008-06-27 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Nicholas Kraft's patch to fix some IPv6 copy/paste issues. He
-	reported to be getting infinite loops with the svn code.
-
-2008-06-13 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1984541 ]
-	ixmlDocumenttoString does not render the namespace tag.
-	Submitted By: Beliveau - belivo
-
-	Undoing the patch that fixed this problem. In fact, there was no
-	problem and the patch was wrong.
-
-2008-06-11 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Ingo Hofmann's patch for "Content-Type in Subscription responses".
-	Adds charset="utf-8" attribute to the CONTENT-TYPE header line.
-
-	Hi,
-
-	I have found an inconsistency regarding the text/xml content-type
-	returned by libupnp. It looks like only subscription responses send
-	"text/xml" where all other messages contain "text/xml; charset="utf-8"".
-	Since I'm working on an DLNA device the latter behaviour is mandatory.
-	I changed the according lines in gena_device.c (see attached patch).
-	I'm not sure if it would be ok for other device to have the charset
-	field but it would help me a lot :)
-
-	Best regards,
-	Ingo
-
-2008-06-04 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1984541 ]
-	ixmlDocumenttoString does not render the namespace tag.
-	Submitted By: Beliveau - belivo
-
-	The problem occurs when converting a xml document using
-	ixmlDocumenttoString containing a namespace tag created with
-	ixmlDocument_createElementNS. The namespace tag doesn't get rendered.
-
-	example: The following code fragment prints:
-
-	<?xml version="1.0"?>
-	<root></root>
-
-	instead of:
-	<?xml version="1.0"?>
-	<root xmlns="urn:schemas-upnp-org:device-1-0"></root>
-	
-	Code:
-
-	#include <stdlib.h>
-	#include <upnp/ixml.h>
-
-	int main()
-	{
-		IXML_Document* wDoc = ixmlDocument_createDocument();
-		IXML_Element* wRoot = ixmlDocument_createElementNS(wDoc,
-			"urn:schemas-upnp-org:device-1-0", "root");
-		ixmlNode_appendChild((IXML_Node *)wDoc,(IXML_Node *)wRoot);
-		DOMString wString = ixmlDocumenttoString(wDoc);
-		printf(wString);
-		free(wString);
-		ixmlDocument_free(wDoc);
-		
-		return 0;
-	}
-
-	The problem was in the printing routine, not in the library data
-	structure.
-
-2008-05-31 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Charles Nepveu's suggestion of not allocating a thread for
-	MiniServer when it is not compiled.
-
-2008-05-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Ported Peter Hartley's patch to compile with mingw.
-
-2008-05-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added some debug capability to ixml.
-
-2008-05-02 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Merged Charles Nepveu's IPv6 work. libupnp now is IPv6 enabled.
-
-2008-02-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Breaking API so that we now hide internal data structures.
-
-2008-02-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Rewrote Peter Hartley's patch to include a new extra header field in
-	FileInfo.
+	I set all ...Sock6 variables to INVALID_SOCKET to make sure that they
+	do not get added to the FD_SET and the problem is gone.
 
 *******************************************************************************
 Version 1.6.7
 *******************************************************************************
 
+2010-10-01 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
+
+	Adding --disable-notification-reordering option
+
+	Adding a configure flag to disable GENA notification reordering as even
+	with an imillisleep(1), this mechanism consumes too much CPU on embedded
+	devices when there is a burst of notifications.
+
+2010-09-30 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
+
+	Bug fix when there is no service in embedded devices
+
+	When a device with embedded devices (like IGD) when created and one of
+	the embedded devices did not have any service, there was a Segmentation
+	Fault (see SF Tracker [ 2688125 ]).
+
+	Original SF Tracker issue follows:
+
+	SF Tracker [ 2688125 ] v1.6.6 crashes on subdevices without services
+	Submitted by: Arno Willig ( akw ) - 2009-03-15 22:45:23 BRT
+
+	I discovered a bug, which will make libupnp (1.6.6) segfault, when you
+	create a upnp description document with multiple devices which have
+	subdevices, but no own services.
+
+	The crash occurs in genlib/service_table.c in line 977:
+	end->next =
+		getServiceList( currentDevice, &next_end, URLBase );
+
+	In this case "end" seems not to be defined, so end->next crashes.
+
+	Can anyone confirm this, please?
+
+2010-09-28 Marc Essayan <marc.essayan(at)orange-ftgroup.com>
+
+	Bug fix on burst of GENA notification
+
+	When a lot of notifications were generated by a device in a short
+	period of time then 100% of the CPU was used to reorder those
+	notifications by pushing back the thread in the job queue. This
+	mechanism has been modified so now thread sleep 1 ms before being
+	pushed back into the job queue.
+
+	Removing DEFAULT_SCHED_PARAM parameter and use
+	sched_get_priority_min(DEFAULT_POLICY) instead.
+
+2010-09-22 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
+
+	Bug fix on M-SEARCH response
+
+	Devices must respond to M-SEARCH requests for any supported version and the
+	response should specify the same version as was contained in the search target.
+	Previously, the device did not answer if the M-SEARCH request did not
+	contain the same version number than the version number of the device.
+
+2010-09-21 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
+
+	Add Content-Language iff Accept-Language
+
+	Add Content-Language header in the response if and only if there is an
+	Accept-Language header in the request.
+
+2010-09-21 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
+
+	Addition of WEB_SERVER_CONTENT_LANGUAGE parameter
+
+	This patch adds the WEB_SERVER_CONTENT_LANGUAGE parameter so the user can specify
+	the language used by the device during Description and Presentation steps of UPnP
+	through the HTTP CONTENT-LANGUAGE header.
+	By default, the WEB_SERVER_CONTENT_LANGUAGE is an empty string so no
+	CONTENT-LANGUAGE is added.
+
+2010-09-18 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
+
+	Customize the stack size of the threads used by pupnp through the new
+	THREAD_STACK_SIZE variable.
+
+	This patch allows a user to customize the stack size of the threads used by
+	pupnp through the new THREAD_STACK_SIZE variable. This is especially useful
+	on embedded systems with limited memory where the user can set THREAD_STACK_SIZE
+	to ITHREAD_STACK_MIN.
+
+	However, as this modification can have side effects, I set 0 as the default
+	value, so threads will continue to use the default stack size of the system
+	(which varies greatly as stated in
+	https://computing.llnl.gov/tutorials/pthreads/).
+
+2010-09-16 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
+
+	Broken IPv6.
+	IPv6 is currently broken in latest release of branch-1.6.x, so find a
+	patch attached that correct the issue (small fixes on define, undef and
+	retVal).
+
+2010-09-10 Warwick Harvey <warwick.harvey(at)tieto.com>
+	Patch to take notice of UPNP_USE_RWLOCK flag
+
+	The configure.ac file included with UPnP checks for the presence of the
+	pthread_rwlock_t type, and then sets the value of the UPNP_USE_RWLOCK
+	flag appropriately.  However, this flag is not referenced at all in the
+	source code, and thus the code does not compile on systems that don't
+	have the pthread_rwlock_t type (such as Android).
+	
+	Please find attached a patch (against the current 1.6.x head) that checks
+	the value of this flag and falls back on using mutexes if read-write
+	locks are not available.
+
+2010-09-10 Jean Sigwald <jean.sigwald(at)orange-ftgroup.com>
+	I discovered a reliable denial-of-service issue on the last stable
+	release of libupnp (1.6.6) remotely triggerable by any
+	unauthenticated user. The issue is related with a bad parsing of
+	malformed XML.
+
+2010-09-10 Chandra Penke <chandrapenke(at)mcntech.com>
+	* SF Patch Tracker [ 2854711 ] Patch for Solaris10 compilation and usage
+	Submitted By: zephyrus ( zephyrus00jp )
+	
+	Patch for Solaris10 compilation and usage.
+
+2010-09-10 Chandra Penke <chandrapenke(at)mcntech.com>
+	Add support for conditionally enabling ipv6.
+
+2010-09-10 Chandra Penke <chandrapenke(at)mcntech.com>
+	Fix for compilation in debug builds.
+
+	Ensure internal methods are declared as static since debug builds don't inline.
+
+2010-09-09 Chandra Penke <chandrapenke(at)mcntech.com>
+	Fix for regression in SSDP code to send/receive messages over UDP
+
+	Sending messages over UDP is broken in some Apple OSes
+	such as OS X and iOS. This might be broken in other OSes to but didn't
+	verify.
+
+	The fix is to modify the socket lenght argument of sendto to use the correct
+	sockaddr lenght dependng on whether the socket is IPV4 or IPV6.
+
+	Also added some error checks and debugging related to the issue
+
+2010-09-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	Using UpnpReadHttpGet to download large files causes the application to
+	crash. This happens when the file being downloaded exceeds the device
+	memory - entirely possible when transferring video files.
+	The programmatic cause is that the logic implemented in the function
+	http_ReadHttpGet (which UpnpReadHttpGet calls) reads the entire file
+	into memory. The fix modifies the existing logic to discard data after
+	it's been read; there's no reason to keep it around since the caller
+	of UpnpReadHttpGet already has a copy of it.
+	
+	This issue exists in 1.6.6 as well as the latest sources.
+
+	Patch submitted by Chandra (inactiveneurons).
+
+2010-09-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	In the latest sources, http_RequestAndResponse and other methods that
+	use connect() are broken. More specifically, connect() in these methods
+	is returning with an EINVAL. The programatic cause is that the address_len
+	argument passed to connect() is different in IPV4 vs IPV6 (as described in:
+	http://www.opengroup.org/onlinepubs/009695399/functions/connect.html).
+	The current code always uses the IPV6 size. The fix modifies each use of
+	connect() to use the correct size based on the address family being used.
+
+	Patch submitted by Chandra (inactiveneurons).
+
+2010-09-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	Fix compilation error in upnp/src/gena/gena_ctrlpt.c (this is most
+	likely an error on all platforms).
+
+	Patch submitted by Chandra (inactiveneurons).
+
+2010-09-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	Fix compilation error in upnp/src/inc/ssdplib.h when compiling in OS X
+	(the netinet/* headers are not available).
+
+	Patch submitted by Chandra (inactiveneurons).
+
+2010-09-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	Fix compilation error in ixml/inc/ixml.h when compiling with an
+	Objective-C compiler (when cross-compiling for iPhone devices).
+
+	Patch submitted by Chandra (inactiveneurons).
+
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Issue regarding the GENA notifications. A string termination indicator
+	was added at the end of the notification ("\r\n") in
+	notify_send_and_recv() in upnp/src/gena/gena_device.c.
+	Patch by Fabrice Fontaine.
+
 2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* The last part of Ronan Menard's patch.
 

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.8.0
+PROJECT_NUMBER         = 1.6.8
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

Makefile.am

@@ -1,7 +1,7 @@
 #
 # Top-level "Makefile.am" for libupnp
 #
-# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 ACLOCAL_AMFLAGS = -I m4
@@ -26,7 +26,6 @@ EXTRA_DIST = \
 	build/libupnp.dsp \
 	build/libupnp.dsw \
 	build/inc/autoconfig.h \
-	build/inc/config.h \
 	build/inc/upnpconfig.h \
 	build/msvc/inttypes.h \
 	build/msvc/stdint.h \

README

@@ -1,7 +1,7 @@
 Portable SDK for UPnP* Devices (libupnp)
 
 Copyright (c) 2000-2003 Intel Corporation - All Rights Reserved.
-Copyright (c) 2005-2006 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+Copyright (c) 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
 Copyright (c) 2006 Michel Pfeiffer and others <virtual_worlds@gmx.de>
 
 See LICENSE for details.

THANKS

@@ -13,6 +13,7 @@ exempt of errors.
 - Arno Willig
 - Bob Ciora
 - Carlo Parata
+- Chandra (inactiveneurons)
 - Chaos
 - Charles Nepveu (cnepveu)
 - Chris Pickel

TODO

@@ -2,29 +2,5 @@
 To Be Done
 ==========
 
-- add FreeBSD patches
-  ( http://sf.net/tracker/index.php?func=detail&aid=1332618&group_id=7189&atid=307189 ?)
-
 - non-regression testing 
 
-- replace doc++ by Doxygen for documentation generation
-
-- incorporate public patches and fix reported bugs : 
-http://sourceforge.net/tracker/?group_id=7189&atid=107189 and 
-http://sourceforge.net/tracker/?group_id=7189&atid=307189
-
-- RPM packaging (a preliminary one here :
-    https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176617 )
-
-- make API clean for large files and 64 bits
-
-- Why is NUM_HANDLE defined to 200 when we can register only:
-  A) One client(1)
-  B) An IPv4 and IPv6 device (2)
-  NUM_HANDLE should be 3
-
-- A sane way to implement the virtual directory callback initialization and checking
-against NULL pointers.
-
-
-

build/inc/autoconfig.h

@@ -67,9 +67,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-#define HAVE_SYS_TIMEB_H 1
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
@@ -85,11 +82,15 @@
 /* Define to 1 if you have the <ws2tcpip.h> header file. */
 /* #undef HAVE_WS2TCPIP_H */
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
 /* Define to 1 to prevent compilation of assert() */
-/* #undef NDEBUG */
+#define NDEBUG 1
 
 /* Define to 1 to prevent some debug code */
-/* #undef NO_DEBUG */
+#define NO_DEBUG 1
 
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 /* #undef NO_MINUS_C_MINUS_O */
@@ -104,13 +105,13 @@
 #define PACKAGE_NAME "libupnp"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libupnp 1.8.0"
+#define PACKAGE_STRING "libupnp 1.6.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libupnp"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.8.0"
+#define PACKAGE_VERSION "1.6.8"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -119,11 +120,17 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
+/* see upnpconfig.h */
+/* #undef UPNP_ENABLE_IPV6 */
+
+/* see upnpconfig.h */
+#define UPNP_ENABLE_NOTIFICATION_REORDERING 1
+
 /* see upnpconfig.h */
 #define UPNP_HAVE_CLIENT 1
 
 /* see upnpconfig.h */
-#define UPNP_HAVE_DEBUG 1
+/* #undef UPNP_HAVE_DEBUG */
 
 /* see upnpconfig.h */
 #define UPNP_HAVE_DEVICE 1
@@ -141,16 +148,16 @@
 #define UPNP_VERSION_MAJOR 1
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_MINOR 8
+#define UPNP_VERSION_MINOR 6
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_PATCH 0
+#define UPNP_VERSION_PATCH 8
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_STRING "1.8.0"
+#define UPNP_VERSION_STRING "1.6.8"
 
 /* Version number of package */
-#define VERSION "1.8.0"
+#define VERSION "1.6.8"
 
 /* File Offset size */
 #define _FILE_OFFSET_BITS 64
@@ -159,7 +166,7 @@
 /* #undef _LARGEFILE_SOURCE */
 
 /* Large files support */
-#define _LARGE_FILE_SOURCE 
+#define _LARGE_FILE_SOURCE /**/
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

build/inc/config.h

@@ -1,411 +0,0 @@
-/**************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- **************************************************************************/
-
-
-#ifndef INTERNAL_CONFIG_H
-#define INTERNAL_CONFIG_H 
-
-
-#include "autoconfig.h"
-
-
-/*!
- *  \name Compile time configuration options
- *
- *  The Linux SDK for UPnP Devices contains some compile-time parameters 
- *  that effect the behavior of the SDK.  All configuration options are 
- *  located in {\tt src/inc/config.h}.
- *
- * @{
- */
-
-
-/*!
- *  \name THREAD_IDLE_TIME
- *
- *  The {\tt THREAD_IDLE_TIME} constant determines when a thread will be
- *  removed from the thread pool and returned to the operating system. When 
- *  a thread in the thread pool has been idle for this number of milliseconds
- *  the thread will be released from the thread pool.  The default value is
- *  5000 milliseconds (5 seconds).
- *
- * @{
- */
-#define THREAD_IDLE_TIME 5000
-/* @} */
-
-
-/*!
- * \name JOBS_PER_THREAD
- *
- * The {\tt JOBS_PER_THREAD} constant determines when a new thread will be
- * allocated to the thread pool inside the  SDK. The thread pool will
- * try and maintain this jobs/thread ratio. When the jobs/thread ratio 
- * becomes greater than this, then a new thread (up to the max) will be 
- * allocated to the thread pool.  The default ratio is 10 jobs/thread.
- *
- * @{
- */
-#define JOBS_PER_THREAD 10
-/* @} */
-
-
-/*!
- * \name MIN_THREADS
- *
- * The {\tt MIN_THREADS} constant defines the minimum number of threads the
- * thread pool inside the SDK will create.  The thread pool will
- * always have this number of threads. These threads are used
- * for both callbacks into applications built on top of the SDK and also
- * for making connections to other control points and devices. This number
- * includes persistent threads.  The default value is two threads.
- *
- * @{
- */
-#define MIN_THREADS 2 
-/* @} */
-
-
-/*!
- * \name MAX_THREADS
- *
- * The {\tt MAX_THREADS} constant defines the maximum number of threads the
- * thread pool inside the SDK will create.  These threads are used
- * for both callbacks into applications built on top of the library and also 
- * for making connections to other control points and devices.  It is not 
- * recommended that this value be below 10, since the threads are 
- * necessary for correct operation.  This value can be increased for greater
- * performance in operation at the expense of greater memory overhead.  The 
- * default value is 12.
- *
- * @{
- */
-#define MAX_THREADS 12 
-/* @} */
-
-
-/*! \name MAX_JOBS_TOTAL
- *
- *  The {\tt MAX_JOBS_TOTAL} constant determines the maximum number of jobs
- *  that can be queued. If this limit is reached further jobs will be thrown
- *  to avoid memory exhaustion. The default value 100.
- *  (Added by Axis.)
- *
- * @{
- */
-#define MAX_JOBS_TOTAL 100
-/* @} */
-
-
-/*!
- * \name DEFAULT_SOAP_CONTENT_LENGTH
- *
- * SOAP messages will read at most {\tt DEFAULT_SOAP_CONTENT_LENGTH} bytes.  
- * This prevents devices that have a misbehaving web server to send 
- * a large amount of data to the control point causing it to crash.  
- * This can be adjusted dynamically with {\tt UpnpSetMaxContentLength}.
- *
- * @{
- */
-#define DEFAULT_SOAP_CONTENT_LENGTH 16000
-/* @} */
-
-
-/*!
- * \name NUM_SSDP_COPY
- *
- * This configuration parameter determines how many copies of each SSDP 
- * advertisement and search packets will be sent. By default it will send two 
- * copies of every packet.  
- *
- * @{
- */
-#define NUM_SSDP_COPY  2
-/* @} */
-
-
-/*!
- * \name SSDP_PAUSE
- *
- * This configuration parameter determines the pause between identical SSDP 
- * advertisement and search packets. The pause is measured in milliseconds
- * and defaults to 100.
- *
- * @{
- */
-#define SSDP_PAUSE  100
-/* @} */
-
-/*!
- * \name WEB_SERVER_BUF_SIZE
- * 
- * This configuration parameter sets the maximum buffer size for the 
- * webserver. The default value is 1MB.
- *
- * @{
- */
-#define WEB_SERVER_BUF_SIZE  (1024*1024)
-/* @} */
-
-/*!
- * \name AUTO_RENEW_TIME
- *
- * The {\tt AUTO_RENEW_TIME} is the time, in seconds, before a subscription
- * expires that the SDK automatically resubscribes.  The default 
- * value is 10 seconds.  Setting this value too low can result in the 
- * subscription renewal not making it to the device in time, causing the 
- * subscription to timeout. In order to avoid continually resubscribing
- * the minimum subscription time is five seconds more than the auto renew
- * time.
- *
- * @{
- */
-#define AUTO_RENEW_TIME 10
-/* @} */
-
-/*!
- * \name CP_MINIMUM_SUBSCRIPTION_TIME
- *
- * The {\tt CP_MINIMUM_SUBSCRIPTION_TIME} is the minimum subscription time
- * allowed for a control point using the SDK. Subscribing for less than
- * this time automatically results in a subscription for this amount.  The 
- * default value is 5 seconds more than the {\tt AUTO_RENEW_TIME}, or 15
- * seconds.
- *
- * @{
- */
-#define CP_MINIMUM_SUBSCRIPTION_TIME (AUTO_RENEW_TIME + 5)
-/* @} */
-
-
-/*!
- * \name MAX_SEARCH_TIME
- *
- * The {\tt MAX_SEARCH_TIME} is the maximum time
- * allowed for an SSDP search by a control point. Searching for greater than
- * this time automatically results in a search for this amount.  The default 
- * value is 80 seconds.
- *
- * @{
- */
-#define MAX_SEARCH_TIME 80
-/* @} */
-
-
-/*!
- * \name MIN_SEARCH_TIME
- *
- * The {\tt MIN_SEARCH_TIME} is the minimumm time
- * allowed for an SSDP search by a control point. Searching for less than
- * this time automatically results in a search for this amount.  The default 
- * value is 2 seconds.
- *
- * @{
- */
-#define MIN_SEARCH_TIME 2
-/* @} */
-
-
-/*!
- * \name AUTO_ADVERTISEMENT_TIME
- *
- * The {\tt AUTO_ADVERTISEMENT_TIME} is the time, in seconds, before an
- * device advertisements expires before a renewed advertisement is sent.
- * The default time is 30 seconds.
- *
- * @{
- */
-#define AUTO_ADVERTISEMENT_TIME 30
-/* @} */
-
-
-/*!
- * \name SSDP_PACKET_DISTRIBUTE
- *
- * The {\tt SSDP_PACKET_DISTRIBUTE} enables the SSDP packets to be sent
- * at an interval equal to half of the expiration time of SSDP packets
- * minus the AUTO_ADVERTISEMENT_TIME. This is used to increase
- * the probability of SSDP packets reaching to control points.
- * It is recommended that this flag be turned on for embedded wireless 
- * devices.
- *
- * @{
- */
-#define SSDP_PACKET_DISTRIBUTE 1
-/* @} */
-
-
-/*!
- * \name Module Exclusion
- *
- * Depending on the requirements, the user can selectively discard any of 
- * the major modules like SOAP, GENA, SSDP or the Internal web server. By 
- * default everything is included inside the SDK.  By setting any of
- * the values below to 0, that component will not be included in the final
- * SDK.
- * \begin{itemize}
- *   \item {\tt EXCLUDE_SOAP[0,1]}
- *   \item {\tt EXCLUDE_GENA[0,1]}
- *   \item {\tt EXCLUDE_SSDP[0,1]}
- *   \item {\tt EXCLUDE_DOM [0,1]}
- *   \item {\tt EXCLUDE_MINISERVER[0,1]}
- *   \item {\tt EXCLUDE_WEB_SERVER[0,1]}
- *   \item {\tt EXCLUDE_JNI[0,1]}
- * \end{itemize}
- *
- * @{
- */
-#define EXCLUDE_SSDP 0
-#define EXCLUDE_SOAP 0
-#define EXCLUDE_GENA 0
-#define EXCLUDE_DOM  0
-#define EXCLUDE_MINISERVER 0
-#define EXCLUDE_WEB_SERVER 0
-#ifdef USE_JNI
-#	define EXCLUDE_JNI 0
-#else
-#	define EXCLUDE_JNI 1
-#endif
-/* @} */
-
-    
-/*!
- * \name DEBUG_TARGET
- *
- * The user has the option to redirect the library output debug messages 
- * to either the screen or to a log file.  All the output messages with 
- * debug level 0 will go to {\tt upnp.err} and messages with debug level 
- * greater than zero will be redirected to {\tt upnp.out}.
- *
- * @{
- */
-#define DEBUG_TARGET		1   
-/* @} */
-
-
-/*!
- * \name Other debugging features
- *
- * The UPnP SDK contains other features to aid in debugging:
- * see <upnp/inc/upnpdebug.h>
- */
-
-#define DEBUG_ALL		1
-#define DEBUG_SSDP		0
-#define DEBUG_SOAP		0
-#define DEBUG_GENA		0
-#define DEBUG_TPOOL		0
-#define DEBUG_MSERV		0
-#define DEBUG_DOM		0
-#define DEBUG_HTTP		0
-#define DEBUG_API		0
-
-
-/*
- * @} Compile time configuration options
- */
-
-
-/***************************************************************************
- * Do not change, Internal purpose only!!!
- ***************************************************************************/ 
-
-/*!
- * @{
- */
-
-
-/*
- * Set additional defines based on requested configuration 
- */
-
-
-/* configure --enable-client */
-#if UPNP_HAVE_CLIENT
-#	define INCLUDE_CLIENT_APIS	1
-#endif
-
-
-/* configure --enable-device */
-#if UPNP_HAVE_DEVICE
-#	define INCLUDE_DEVICE_APIS	1
-#endif
-
-
-/* configure --enable-webserver --enable-device */
-#if UPNP_HAVE_WEBSERVER
-#	define INTERNAL_WEB_SERVER	1
-#endif
-
-
-#undef  EXCLUDE_WEB_SERVER
-#undef  EXCLUDE_MINISERVER
-#ifdef  INTERNAL_WEB_SERVER
-#	define EXCLUDE_WEB_SERVER 0
-#	define EXCLUDE_MINISERVER 0
-#else
-#	define EXCLUDE_WEB_SERVER 1
-#	define EXCLUDE_MINISERVER 1
-#endif
-
-
-#if EXCLUDE_GENA == 1 && EXCLUDE_SOAP == 1 && EXCLUDE_WEB_SERVER == 1
-#	undef  EXCLUDE_MINISERVER
-#	define EXCLUDE_MINISERVER 1
-#	if INTERNAL_WEB_SERVER
-#		error "conflicting settings: use configure --disable-webserver"
-#	endif
-#endif
-
-
-#if EXCLUDE_GENA == 0 || EXCLUDE_SOAP == 0 || EXCLUDE_WEB_SERVER == 0
-#	undef  EXCLUDE_MINISERVER
-#	define EXCLUDE_MINISERVER 0
-#	if EXCLUDE_WEB_SERVER == 0 && !defined INTERNAL_WEB_SERVER
-#		error "conflicting settings : use configure --enable-webserver"
-#	endif
-#endif
-
-
-#ifdef INCLUDE_CLIENT_APIS
-#	define CLIENTONLY(x) x
-#else /* INCLUDE_CLIENT_APIS */
-#	define CLIENTONLY(x)
-#endif /* INCLUDE_CLIENT_APIS */
-
-
-/*
- * @}
- */
-
-
-#endif /* INTERNAL_CONFIG_H */
-

build/inc/upnpconfig.h

@@ -2,7 +2,7 @@
 /* -*- C -*- */
 /*******************************************************************************
  *
- * Copyright (c) 2006 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
  * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
@@ -40,20 +40,20 @@
  ***************************************************************************/ 
 
 /** The library version (string) e.g. "1.3.0" */
-#define UPNP_VERSION_STRING "1.8.0"
+#define UPNP_VERSION_STRING "1.6.8"
 
 /** Major version of the library */
 #define UPNP_VERSION_MAJOR 1
 
 /** Minor version of the library */
-#define UPNP_VERSION_MINOR 8
+#define UPNP_VERSION_MINOR 6
 
 /** Patch version of the library */
-#define UPNP_VERSION_PATCH 0
+#define UPNP_VERSION_PATCH 8
 
 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
-  ((UPNP_VERSION_MAJOR*100 + UPNP_VERSION_MINOR)*100 + UPNP_VERSION_PATCH)
+  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
 
 
 
@@ -69,7 +69,7 @@
 
 /** Defined to 1 if the library has been compiled with DEBUG enabled 
  *  (i.e. configure --enable-debug) : <upnp/upnpdebug.h> file is available */
-#define UPNP_HAVE_DEBUG 1
+/* #undef UPNP_HAVE_DEBUG */
 
 
 /** Defined to 1 if the library has been compiled with client API enabled 
@@ -91,6 +91,9 @@
  *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
 #define UPNP_HAVE_TOOLS 1
 
+/** Defined to 1 if the library has been compiled with ipv6 support
+ *  (i.e. configure --enable-ipv6) */
+/* #undef UPNP_ENABLE_IPV6 */
 
 #endif /* UPNP_CONFIG_H */
 

build/libupnp.dsp

@@ -5,17 +5,17 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
 CFG=libupnp - Win32 Debug
-!MESSAGE Dies ist kein g<EFBFBD>ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f<EFBFBD>hren Sie den Befehl
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
 !MESSAGE 
 !MESSAGE NMAKE /f "libupnp.mak".
 !MESSAGE 
-!MESSAGE Sie k<EFBFBD>nnen beim Ausf<EFBFBD>hren von NMAKE eine Konfiguration angeben
+!MESSAGE Sie können beim Ausf?hren von NMAKE eine Konfiguration angeben
 !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
 !MESSAGE 
 !MESSAGE NMAKE /f "libupnp.mak" CFG="libupnp - Win32 Debug"
 !MESSAGE 
-!MESSAGE F<EFBFBD>r die Konfiguration stehen zur Auswahl:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
 !MESSAGE 
 !MESSAGE "libupnp - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libupnp - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
@@ -389,10 +389,6 @@ SOURCE=..\upnp\src\inc\upnpapi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\upnp\src\inc\upnpclosesocket.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\upnp\src\inc\uri.h
 # End Source File
 # Begin Source File

build/vc8/libupnp.vcproj

@@ -603,10 +603,6 @@
 				RelativePath="..\..\upnp\src\inc\upnpapi.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\upnpclosesocket.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\inc\upnpdebug.h"
 				>

build/vc9/libupnp.vcproj

@@ -599,10 +599,6 @@
 				RelativePath="..\..\upnp\src\inc\upnpapi.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\inc\upnpclosesocket.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\inc\upnpdebug.h"
 				>

configure.ac

@@ -9,7 +9,7 @@
 
 AC_PREREQ(2.60)
 
-AC_INIT([libupnp], [1.8.0], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.8], [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,30 +144,45 @@ dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:3:2])
 dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
 dnl #
 dnl ############################################################################
-dnl # Release 1.8.0:
+dnl # Release 1.6.7:
 dnl # "current:revision:age"
 dnl #
+dnl # - Code has changed in threadutil
+dnl #	revision: 3 -> 4
 dnl # - Code has changed in upnp
 dnl #	revision: 5 -> 6
 dnl # - Interfaces have been changed, added and removed in upnp
 dnl #	current: 3 -> 4
 dnl #   revision: 6 -> 0
-dnl # - Interface has been removed in upnp
-dnl #   age = 0
-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 # - Interfaces removed in upnp:
+dnl #   age: -> 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 # Obs.: 1.6.7 was released with a version error, the correct nubers should
+dnl # have been:
 dnl #AC_SUBST([LT_VERSION_UPNP],       [4:0:0])
 dnl #
 dnl ############################################################################
-AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [5:0:2])
-AC_SUBST([LT_VERSION_UPNP],       [4:0:0])
+dnl # Release 1.6.8:
+dnl # "current:revision:age"
+dnl #
+dnl # - Code has changed in ixml
+dnl #	revision: 4 -> 5
+dnl # - Code has changed in threadutil
+dnl #	revision: 0 -> 1
+dnl # - Code has changed in upnp
+dnl #	revision: 0 -> 1
+dnl #AC_SUBST([LT_VERSION_IXML],       [2:5:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:1:2])
+dnl #AC_SUBST([LT_VERSION_UPNP],       [4:1:0])
+dnl #
+dnl ############################################################################
+AC_SUBST([LT_VERSION_IXML],       [2:5:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [5:1:2])
+AC_SUBST([LT_VERSION_UPNP],       [4:1:0])
 dnl ############################################################################
 dnl # Repeating the algorithm to place it closer to the modificatin place:
 dnl # 	- library code modified:		revision++
@@ -261,6 +276,16 @@ if test "x$enable_tools" = xyes ; then
 	AC_DEFINE(UPNP_HAVE_TOOLS, 1, [see upnpconfig.h])
 fi
 
+RT_BOOL_ARG_ENABLE([ipv6], [no], [ipv6 support])
+if test "x$enable_ipv6" = xyes ; then
+        AC_DEFINE(UPNP_ENABLE_IPV6, 1, [see upnpconfig.h])
+fi
+
+RT_BOOL_ARG_ENABLE([notification_reordering], [yes], [GENA notification reordering in gena_device.c])
+if test "x$enable_notification_reordering" = xyes ; then
+        AC_DEFINE(UPNP_ENABLE_NOTIFICATION_REORDERING, 1, [see upnpconfig.h])
+fi
+
 
 RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
 
@@ -487,3 +512,11 @@ AC_CONFIG_FILES([
 
 AC_OUTPUT
 
+#
+# Files copied for windows compilation.
+#
+echo "configure: copying \"autoconfig.h\"          to \"build/inc/autoconfig.h\""
+cp autoconfig.h build/inc/autoconfig.h
+echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\""
+cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h
+

ixml/Makefile.am

@@ -2,7 +2,7 @@
 #
 # "Makefile.am" for "libupnp/ixml"
 #
-# (C) Copyright 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 Rémi Turboult <r3mi@users.sourceforge.net>
 #
 
 SUBDIRS 		= doc

ixml/inc/ixml.h

@@ -45,9 +45,13 @@
 
 #include "UpnpGlobal.h" /* For EXPORT_SPEC */
 
-
-typedef int BOOL;
-
+/* Define BOOL. */
+#ifndef __OBJC__ 
+	typedef int BOOL;
+#else
+	/* For Objective C compilers, include objc.h which defines BOOL. */
+	#include <objc/objc.h>
+#endif
 
 /*!
  * \brief The type of DOM strings.

ixml/src/ixmlparser.c

@@ -582,11 +582,14 @@ static int Parser_isValidEndElement(
 	IXML_Node *newNode)
 {
 	assert(xmlParser);
-	assert(xmlParser->pCurElement);
 	assert(xmlParser->pCurElement->element);
 	assert(newNode);
 	assert(newNode->nodeName);
 
+	if (xmlParser->pCurElement == NULL) {
+		return 0;
+	}
+
 	return strcmp(xmlParser->pCurElement->element, newNode->nodeName) == 0;
 }
 

libupnp.spec

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

threadutil/inc/ThreadPool.h

@@ -115,6 +115,10 @@ typedef enum priority {
 #define DEFAULT_MAX_THREADS 10
 
 
+/*! default stack size used by TPAttrInit */
+#define DEFAULT_STACK_SIZE 0
+
+
 /*! default jobs per thread used by TPAttrInit */
 #define DEFAULT_JOBS_PER_THREAD 10
 
@@ -154,10 +158,6 @@ typedef int PolicyType;
 #define DEFAULT_POLICY SCHED_OTHER
 
 
-/*! Default priority */
-#define DEFAULT_SCHED_PARAM 0
-
-
 /****************************************************************************
  * Name: free_routine
  *
@@ -182,6 +182,10 @@ typedef struct THREADPOOLATTR
 	/* maxThreads, ThreadPool will never have more than this number of threads */
 	int maxThreads;
 
+	/* stackSize (in bytes), this is the minimum stack size allocated for each
+	 * thread */
+	size_t stackSize;
+
 	/* maxIdleTime (in milliseconds) this is the maximum time a thread will
 	 * remain idle before dying */
 	int maxIdleTime;
@@ -522,6 +526,20 @@ int TPAttrSetMaxThreads(ThreadPoolAttr *attr, int maxThreads);
 int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads);
 
 
+/****************************************************************************
+ * Function: TPAttrSetStackSize
+ *
+ *  Description:
+ *      Sets the stack size for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.
+ *      stackSize - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetStackSize(ThreadPoolAttr *attr, size_t stackSize);
+
+
 /****************************************************************************
  * Function: TPAttrSetIdleTime
  *

threadutil/inc/ithread.h

@@ -85,7 +85,10 @@ extern "C" {
 
 #define ITHREAD_CANCELED PTHREAD_CANCELED
 
-  
+
+#define ITHREAD_STACK_MIN PTHREAD_STACK_MIN
+
+
 /***************************************************************************
  * Name: ithread_t
  *
@@ -171,7 +174,9 @@ typedef pthread_condattr_t ithread_condattr_t;
  *      typedef to pthread_rwlockattr_t
  *      Internal Use Only
  ***************************************************************************/
+#if UPNP_USE_RWLOCK
 typedef pthread_rwlockattr_t ithread_rwlockattr_t;	
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -182,7 +187,9 @@ typedef pthread_rwlockattr_t ithread_rwlockattr_t;
  *      typedef to pthread_rwlock_t
  *      Internal Use Only
  ***************************************************************************/
+#if UPNP_USE_RWLOCK
 typedef pthread_rwlock_t ithread_rwlock_t;
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -443,7 +450,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlockattr_init
  ***************************************************************************/
-#define ithread_rwlockattr_init pthread_rwlockattr_init
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlockattr_init pthread_rwlockattr_init
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -459,7 +468,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlockattr_destroy
  ***************************************************************************/
-#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
+#endif /* UPNP_USE_RWLOCK */
   
   
 /****************************************************************************
@@ -480,7 +491,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Returns EINVAL if the kind is not supported.
  *      See man page for pthread_rwlockattr_setkind_np
  *****************************************************************************/
-#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -501,7 +514,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlockatttr_getpshared
  *****************************************************************************/
-#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared
+#endif /* UPNP_USE_RWLOCK */
 
   
 /****************************************************************************
@@ -519,7 +534,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_init
  *****************************************************************************/
-#define ithread_rwlock_init pthread_rwlock_init
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlock_init pthread_rwlock_init
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -536,7 +553,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_rdlock
  *****************************************************************************/
-#define ithread_rwlock_rdlock pthread_rwlock_rdlock
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlock_rdlock pthread_rwlock_rdlock
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -553,7 +572,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_wrlock
  *****************************************************************************/
-#define ithread_rwlock_wrlock pthread_rwlock_wrlock
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlock_wrlock pthread_rwlock_wrlock
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -571,7 +592,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_unlock
  *****************************************************************************/
-#define ithread_rwlock_unlock pthread_rwlock_unlock
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlock_unlock pthread_rwlock_unlock
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -590,7 +613,9 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  *      Always returns 0.
  *      See man page for pthread_rwlock_destroy
  *****************************************************************************/
-#define ithread_rwlock_destroy pthread_rwlock_destroy
+#if UPNP_USE_RWLOCK
+	#define ithread_rwlock_destroy pthread_rwlock_destroy
+#endif /* UPNP_USE_RWLOCK */
 
 
 /****************************************************************************
@@ -704,6 +729,49 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    ***************************************************************************/
 #define ithread_cond_destroy pthread_cond_destroy
 
+  /****************************************************************************
+   * Function: ithread_attr_init
+   *
+   *  Description:
+   *      Initialises thread attribute object.
+   *  Parameters:
+   *      ithread_attr_t *attr (must be valid non NULL pointer to
+   *      ithread_attr_t)
+   *  Returns:
+   *      0 on success. Nonzero on failure.
+   *      See man page for pthread_attr_init
+   ***************************************************************************/
+#define ithread_attr_init pthread_attr_init
+
+  /****************************************************************************
+   * Function: ithread_attr_destroy
+   *
+   *  Description:
+   *      Destroys thread attribute object.
+   *  Parameters:
+   *      ithread_attr_t *attr (must be valid non NULL pointer to
+   *      ithread_attr_t)
+   *  Returns:
+   *      0 on success. Nonzero on failure.
+   *      See man page for pthread_attr_destroy
+   ***************************************************************************/
+#define ithread_attr_destroy pthread_attr_destroy
+
+  /****************************************************************************
+   * Function: ithread_attr_setstacksize
+   *
+   *  Description:
+   *      Sets stack size of a thread attribute object.
+   *  Parameters:
+   *      ithread_attr_t *attr (must be valid non NULL pointer to
+   *      ithread_attr_t)
+   *      size_t stacksize (value of stacksize must be greater than
+   *      ITHREAD_STACK_MIN and lower than system-imposed limits
+   *  Returns:
+   *      0 on success. Nonzero on failure.
+   *      See man page for pthread_attr_setstacksize
+   ***************************************************************************/
+#define ithread_attr_setstacksize pthread_attr_setstacksize
 
   /****************************************************************************
    * Function: ithread_create
@@ -713,7 +781,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
    *      and argument.
    *  Parameters:
    *      ithread_t * thread (must be valid non NULL pointer to pthread_t)
-   *      ithread_attr_t *attr, IGNORED
+   *      ithread_attr_t *attr
    *      void * (start_routine) (void *arg) (start routine)
    *      void * arg - argument.
    *  Returns:

threadutil/src/ThreadPool.c

@@ -246,7 +246,7 @@ static int SetPolicyType(PolicyType in)
 
 	memset(&current, 0, sizeof(current));
 	sched_getparam(0, &current);
-	current.sched_priority = DEFAULT_SCHED_PARAM;
+	current.sched_priority = sched_get_priority_min(DEFAULT_POLICY);
 	sched_result = sched_setscheduler(0, in, &current);
 	retVal = (sched_result != -1 || errno == EPERM) ? 0 : errno;
 #else
@@ -609,12 +609,16 @@ static int CreateWorker(ThreadPool *tp)
 	ithread_t temp;
 	int rc = 0;
 	int currentThreads = tp->totalThreads + 1;
+	ithread_attr_t attr;
 
 	if (tp->attr.maxThreads != INFINITE_THREADS &&
 	    currentThreads > tp->attr.maxThreads) {
 		return EMAXTHREADS;
 	}
-	rc = ithread_create(&temp, NULL, WorkerThread, tp);
+	ithread_attr_init(&attr);
+	ithread_attr_setstacksize(&attr, tp->attr.stackSize);
+	rc = ithread_create(&temp, &attr, WorkerThread, tp);
+	ithread_attr_destroy(&attr);
 	if (rc == 0) {
 		rc = ithread_detach(temp);
 		while (tp->totalThreads < currentThreads) {
@@ -1174,6 +1178,7 @@ int TPAttrInit(ThreadPoolAttr *attr)
 	attr->maxIdleTime    = DEFAULT_IDLE_TIME;
 	attr->maxThreads     = DEFAULT_MAX_THREADS;
 	attr->minThreads     = DEFAULT_MIN_THREADS;
+	attr->stackSize      = DEFAULT_STACK_SIZE;
 	attr->schedPolicy    = DEFAULT_POLICY;
 	attr->starvationTime = DEFAULT_STARVATION_TIME;
 	attr->maxJobsTotal   = DEFAULT_MAX_JOBS_TOTAL;
@@ -1298,6 +1303,28 @@ int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads)
 	return 0;
 }
 
+/****************************************************************************
+ * Function: TPAttrSetStackSize
+ *
+ *  Description:
+ *      Sets the stack size for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.
+ *      stackSize - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetStackSize(ThreadPoolAttr *attr, size_t stackSize)
+{
+        if (!attr) {
+                return EINVAL;
+        }
+        attr->stackSize = stackSize;
+
+        return 0;
+}
+
+
 /****************************************************************************
  * Function: TPAttrSetIdleTime
  *

upnp/Makefile.am

@@ -19,15 +19,6 @@ LDADD = \
 
 upnpincludedir = $(includedir)/upnp
 upnpinclude_HEADERS = \
-	inc/ActionComplete.h \
-	inc/ActionRequest.h \
-	inc/Discovery.h \
-	inc/Event.h \
-	inc/EventSubscribe.h \
-	inc/FileInfo.h \
-	inc/StateVarComplete.h \
-	inc/StateVarRequest.h \
-	inc/SubscriptionRequest.h \
 	inc/UpnpString.h \
 	inc/upnp.h \
 	inc/upnpdebug.h \
@@ -53,7 +44,6 @@ libupnp_la_LDFLAGS = \
 libupnp_la_SOURCES = \
 	src/inc/config.h \
 	src/inc/client_table.h \
-	src/inc/ClientSubscription.h \
 	src/inc/gena.h \
 	src/inc/gena_ctrlpt.h \
 	src/inc/gena_device.h \
@@ -77,7 +67,6 @@ libupnp_la_SOURCES = \
 	src/inc/sysdep.h \
 	src/inc/unixutil.h \
 	src/inc/upnpapi.h \
-	src/inc/upnpclosesocket.h \
 	src/inc/upnp_timeout.h \
 	src/inc/uri.h \
 	src/inc/urlconfig.h \
@@ -89,8 +78,6 @@ libupnp_la_SOURCES = \
 
 # ssdp
 libupnp_la_SOURCES += \
-	src/ssdp/ssdp_ResultData.c \
-	src/ssdp/ssdp_ResultData.h \
 	src/ssdp/ssdp_device.c \
 	src/ssdp/ssdp_ctrlpt.c \
 	src/ssdp/ssdp_server.c
@@ -104,13 +91,12 @@ libupnp_la_SOURCES += \
 # genlib
 libupnp_la_SOURCES += \
 	src/genlib/miniserver/miniserver.c \
-	src/genlib/client_table/client_table.c \
-	src/genlib/client_table/ClientSubscription.c \
 	src/genlib/service_table/service_table.c \
 	src/genlib/util/membuffer.c \
 	src/genlib/util/strintmap.c \
 	src/genlib/util/upnp_timeout.c \
 	src/genlib/util/util.c \
+	src/genlib/client_table/client_table.c \
 	src/genlib/net/sock.c \
 	src/genlib/net/http/httpparser.c \
 	src/genlib/net/http/httpreadwrite.c \
@@ -127,15 +113,6 @@ libupnp_la_SOURCES += \
 
 # api
 libupnp_la_SOURCES += \
-	src/api/ActionComplete.c \
-	src/api/ActionRequest.c \
-	src/api/Discovery.c \
-	src/api/Event.c \
-	src/api/EventSubscribe.c \
-	src/api/FileInfo.c \
-	src/api/StateVarComplete.c \
-	src/api/StateVarRequest.c \
-	src/api/SubscriptionRequest.c \
 	src/api/UpnpString.c \
 	src/api/upnpapi.c
 

upnp/inc/ActionComplete.h

@@ -1,173 +0,0 @@
-
-
-#ifndef ACTIONCOMPLETE_H
-#define ACTIONCOMPLETE_H
-
-
-/*!
- * \file
- *
- * \brief UpnpActionComplete object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*!
- * \brief The type of an UpnpActionComplete object.
- */
-typedef struct s_UpnpActionComplete UpnpActionComplete;
-
-
-#include "ixml.h"       /* for IXML_Document */
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*!
- * \brief Constructor.
- *
- * \return Pointer to the newly created object.
- */
-EXPORT_SPEC UpnpActionComplete *UpnpActionComplete_new();
-
-
-/*!
- * \brief Destructor.
- */
-EXPORT_SPEC void UpnpActionComplete_delete(
-	/*! [in] \b this pointer. */
-	UpnpActionComplete *p);
-
-
-/*!
- * \brief Copy Constructor.
- */
-EXPORT_SPEC UpnpActionComplete *UpnpActionComplete_dup(
-	/*! [in] \b this pointer. */
-	const UpnpActionComplete *p);
-
-
-/*!
- * \brief Assignment operator.
- */
-EXPORT_SPEC void UpnpActionComplete_assign(
-	/*! [in] \b this pointer. */
-	UpnpActionComplete *p,
-	/*! [in] \b that pointer. */
-	const UpnpActionComplete *q);
-
-
-/*!
- * \brief Error code getter.
- */
-EXPORT_SPEC int UpnpActionComplete_get_ErrCode(
-	/*! [in] \b this pointer. */
-	const UpnpActionComplete *p);
-
-
-/*!
- * \brief Error code setter.
- */
-EXPORT_SPEC void UpnpActionComplete_set_ErrCode(
-	/*! [in] \b this pointer. */
-	UpnpActionComplete *p,
-	/*! [in] The error code to set. */
-	int n);
-
-
-/*!
- * \brief Control URL getter.
- *
- * \return The control URL string.
- */
-EXPORT_SPEC const UpnpString *UpnpActionComplete_get_CtrlUrl(
-	/*! [in] \b this pointer. */
-	const UpnpActionComplete *p);
-
-/*!
- * \brief Control URL getter as a C string
- *
- * \return The control URL string.
- */
-EXPORT_SPEC const char *UpnpActionComplete_get_CtrlUrl_cstr(
-	/*! [in] \b this pointer. */
-	const UpnpActionComplete *p);
-
-
-/*!
- * \brief Control URL setter.
- */
-EXPORT_SPEC void UpnpActionComplete_set_CtrlUrl(
-	/*! [in] \b this pointer. */
-	UpnpActionComplete *p,
-	/*! [in] The control URL string to copy. */
-	const UpnpString *s);
-
-
-/*!
- * \brief Set the control URL from a null terminated C string.
- */
-EXPORT_SPEC void UpnpActionComplete_strcpy_CtrlUrl(
-	/*! [in] \b this pointer. */
-	UpnpActionComplete *p,
-	/*! [in] The null terminated control URL C string to copy. */
-	const char *s);
-
-
-/*!
- * \brief ActionRequest document getter.
- *
- * \return A pointer to the document object.
- */
-EXPORT_SPEC IXML_Document *UpnpActionComplete_get_ActionRequest(
-	/*! [in] \b this pointer. */
-	const UpnpActionComplete *p);
-
-
-/*!
- * \brief ActionRequest document setter.
- *
- * \note The ActionComplete object takes ownership of the document parameter,
- * i.e. it is responsible for deleting it upon destruction.
- */
-EXPORT_SPEC void UpnpActionComplete_set_ActionRequest(
-	/*! [in] \b this pointer. */
-	UpnpActionComplete *p,
-	/*! [in] Document to copy. */
-	IXML_Document *d);
-
-
-/*!
- * \brief ActionResult document getter.
- */
-EXPORT_SPEC IXML_Document *UpnpActionComplete_get_ActionResult(
-	/*! [in] \b this pointer. */
-	const UpnpActionComplete *p);
-
-
-/*!
- * \brief ActionResult document setter.
- *
- * \note The ActionComplete object takes ownership of the document parameter,
- * i.e. it is responsible for deleting it upon destruction.
- */
-EXPORT_SPEC void UpnpActionComplete_set_ActionResult(
-	/*! [in] \b this pointer. */
-	UpnpActionComplete *p,
-	/*! [in]  Document to copy. */
-	IXML_Document *d);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* ACTIONCOMPLETE_H */
-

upnp/inc/ActionRequest.h

@@ -1,96 +0,0 @@
-
-
-#ifndef ACTIONREQUEST_H
-#define ACTIONREQUEST_H
-
-
-/*!
- * \file
- *
- * \brief UpnpActionRequest object declaration.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Returned as part of a \b UPNP_CONTROL_ACTION_COMPLETE callback.  */
-typedef struct s_UpnpActionRequest UpnpActionRequest;
-
-
-#include "ixml.h"       /* for IXML_Document */
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpInet.h"   /* for sockaddr, sockaddr_storage */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpActionRequest *UpnpActionRequest_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpActionRequest_delete(UpnpActionRequest *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpActionRequest *UpnpActionRequest_dup(const UpnpActionRequest *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpActionRequest_assign(UpnpActionRequest *p, const UpnpActionRequest *q);
-
-/*! The result of the operation */
-EXPORT_SPEC int UpnpActionRequest_get_ErrCode(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_ErrCode(UpnpActionRequest *p, int n);
-
-/*! The socket number of the connection to the requestor */
-EXPORT_SPEC int UpnpActionRequest_get_Socket(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_Socket(UpnpActionRequest *p, int n);
-
-/*! The error string in case of error */
-EXPORT_SPEC const UpnpString *UpnpActionRequest_get_ErrStr(const UpnpActionRequest *p);
-EXPORT_SPEC const char *UpnpActionRequest_get_ErrStr_cstr(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_ErrStr(UpnpActionRequest *p, const UpnpString *s);
-EXPORT_SPEC void UpnpActionRequest_strcpy_ErrStr(UpnpActionRequest *p, const char *s);
-
-/*! The Action Name */
-EXPORT_SPEC const UpnpString *UpnpActionRequest_get_ActionName(const UpnpActionRequest *p);
-EXPORT_SPEC const char *UpnpActionRequest_get_ActionName_cstr(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_ActionName(UpnpActionRequest *p, const UpnpString *s);
-EXPORT_SPEC void UpnpActionRequest_strcpy_ActionName(UpnpActionRequest *p, const char *s);
-
-/*! The unique device ID */
-EXPORT_SPEC const UpnpString *UpnpActionRequest_get_DevUDN(const UpnpActionRequest *p);
-EXPORT_SPEC const char *UpnpActionRequest_get_DevUDN_cstr(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_DevUDN(UpnpActionRequest *p, const UpnpString *s);
-
-/*! The service ID */
-EXPORT_SPEC const UpnpString *UpnpActionRequest_get_ServiceID(const UpnpActionRequest *p);
-EXPORT_SPEC const char *UpnpActionRequest_get_ServiceID_cstr(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_ServiceID(UpnpActionRequest *p, const UpnpString *s);
-
-/*! The DOM document describing the action */
-EXPORT_SPEC IXML_Document *UpnpActionRequest_get_ActionRequest(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_ActionRequest(UpnpActionRequest *p, IXML_Document *d);
-
-/*! The DOM document describing the result of the action */
-EXPORT_SPEC IXML_Document *UpnpActionRequest_get_ActionResult(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_ActionResult(UpnpActionRequest *p, IXML_Document *d);
-
-/*! The DOM document containing the information from the SOAP header */
-EXPORT_SPEC IXML_Document *UpnpActionRequest_get_SoapHeader(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_SoapHeader(UpnpActionRequest *p, IXML_Document *d);
-
-/*! IP address of the control point requesting this action */
-EXPORT_SPEC const struct sockaddr *UpnpActionRequest_get_CtrlPtIPAddr(const UpnpActionRequest *p);
-EXPORT_SPEC void UpnpActionRequest_set_CtrlPtIPAddr(UpnpActionRequest *p, const struct sockaddr *sa);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* ACTIONREQUEST_H */
-

upnp/inc/Discovery.h

@@ -1,112 +0,0 @@
-
-
-#ifndef DISCOVERY_H
-#define DISCOVERY_H
-
-
-/*!
- * \file
- *
- * \brief UpnpDiscovery object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Returned in a \b UPNP_DISCOVERY_RESULT callback. */
-typedef struct s_UpnpDiscovery UpnpDiscovery;
-
-
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpInet.h"   /* for sockaddr, sockaddr_storage */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpDiscovery *UpnpDiscovery_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpDiscovery_delete(UpnpDiscovery *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpDiscovery *UpnpDiscovery_dup(const UpnpDiscovery *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpDiscovery_assign(UpnpDiscovery *p, const UpnpDiscovery *q);
-
-/*! The result code of the \b UpnpSearchAsync call. */
-EXPORT_SPEC int UpnpDiscovery_get_ErrCode(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_ErrCode(UpnpDiscovery *p, int n);
-
-/*! The expiration time of the advertisement. */
-EXPORT_SPEC int UpnpDiscovery_get_Expires(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_Expires(UpnpDiscovery *p, int n);
-
-/*! The unique device identifier. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_DeviceID(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_DeviceID_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_DeviceID(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_DeviceID(UpnpDiscovery *p, const char *s);
-
-/*! The device type. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_DeviceType(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_DeviceType_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_DeviceType(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_DeviceType(UpnpDiscovery *p, const char *s);
-
-/*! The ServiceType. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_ServiceType(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_ServiceType_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_ServiceType(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_ServiceType(UpnpDiscovery *p, const char *s);
-
-/*! The service version. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_ServiceVer(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_ServiceVer_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_ServiceVer(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_ServiceVer(UpnpDiscovery *p, const char *s);
-
-/*! The URL to the UPnP description document for the device. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Location(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_Location_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_Location(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_Location(UpnpDiscovery *p, const char *s);
-EXPORT_SPEC void UpnpDiscovery_strncpy_Location(UpnpDiscovery *p, const char *s, int n);
-
-/*! The operating system the device is running. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Os(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_Os_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_Os(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_Os(UpnpDiscovery *p, const char *s);
-EXPORT_SPEC void UpnpDiscovery_strncpy_Os(UpnpDiscovery *p, const char *s, int n);
-
-/*! Date when the response was generated. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Date(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_Date_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_Date(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_Date(UpnpDiscovery *p, const char *s);
-
-/*! Confirmation that the MAN header was understood by the device. */
-EXPORT_SPEC const UpnpString *UpnpDiscovery_get_Ext(const UpnpDiscovery *p);
-EXPORT_SPEC const char *UpnpDiscovery_get_Ext_cstr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_Ext(UpnpDiscovery *p, const UpnpString *s);
-EXPORT_SPEC void UpnpDiscovery_strcpy_Ext(UpnpDiscovery *p, const char *s);
-EXPORT_SPEC void UpnpDiscovery_strncpy_Ext(UpnpDiscovery *p, const char *s, int n);
-
-/*! The host address of the device responding to the search. */
-EXPORT_SPEC const struct sockaddr *UpnpDiscovery_get_DestAddr(const UpnpDiscovery *p);
-EXPORT_SPEC void UpnpDiscovery_set_DestAddr(UpnpDiscovery *p, const struct sockaddr *sa);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* DISCOVERY_H */
-

upnp/inc/Event.h

@@ -1,62 +0,0 @@
-
-
-#ifndef EVENT_H
-#define EVENT_H
-
-
-/*!
- * \file
- *
- * \brief UpnpEvent object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Returned along with a \b UPNP_EVENT_RECEIVED callback.  */
-typedef struct s_UpnpEvent UpnpEvent;
-
-
-#include "ixml.h"       /* for IXML_Document */
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpEvent *UpnpEvent_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpEvent_delete(UpnpEvent *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpEvent *UpnpEvent_dup(const UpnpEvent *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpEvent_assign(UpnpEvent *p, const UpnpEvent *q);
-
-/*! The event sequence number. */
-EXPORT_SPEC int UpnpEvent_get_EventKey(const UpnpEvent *p);
-EXPORT_SPEC void UpnpEvent_set_EventKey(UpnpEvent *p, int n);
-
-/*! The DOM tree representing the changes generating the event. */
-EXPORT_SPEC IXML_Document *UpnpEvent_get_ChangedVariables(const UpnpEvent *p);
-EXPORT_SPEC void UpnpEvent_set_ChangedVariables(UpnpEvent *p, IXML_Document *d);
-
-/*! The subscription ID for this subscription. */
-EXPORT_SPEC const UpnpString *UpnpEvent_get_SID(const UpnpEvent *p);
-EXPORT_SPEC const char *UpnpEvent_get_SID_cstr(const UpnpEvent *p);
-EXPORT_SPEC void UpnpEvent_set_SID(UpnpEvent *p, const UpnpString *s);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* EVENT_H */
-

upnp/inc/EventSubscribe.h

@@ -1,74 +0,0 @@
-
-
-#ifndef EVENTSUBSCRIBE_H
-#define EVENTSUBSCRIBE_H
-
-
-/*!
- * \file
- *
- * \brief UpnpEventSubscribe object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Returned along with a \b UPNP_EVENT_SUBSCRIBE_COMPLETE or
- * \b UPNP_EVENT_UNSUBSCRIBE_COMPLETE callback.  */
-typedef struct s_UpnpEventSubscribe UpnpEventSubscribe;
-
-
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpEventSubscribe *UpnpEventSubscribe_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpEventSubscribe_delete(UpnpEventSubscribe *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpEventSubscribe *UpnpEventSubscribe_dup(const UpnpEventSubscribe *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpEventSubscribe_assign(UpnpEventSubscribe *p, const UpnpEventSubscribe *q);
-
-/*! The result of the operation. */
-EXPORT_SPEC int UpnpEventSubscribe_get_ErrCode(const UpnpEventSubscribe *p);
-EXPORT_SPEC void UpnpEventSubscribe_set_ErrCode(UpnpEventSubscribe *p, int n);
-
-/*! The actual subscription time (for subscriptions only). */
-EXPORT_SPEC int UpnpEventSubscribe_get_TimeOut(const UpnpEventSubscribe *p);
-EXPORT_SPEC void UpnpEventSubscribe_set_TimeOut(UpnpEventSubscribe *p, int n);
-
-/*! The SID for this subscription.  For subscriptions, this only
- *  contains a valid SID if the \b Upnp_EventSubscribe.result field
- *  contains a \b UPNP_E_SUCCESS result code.  For unsubscriptions,
- *  this contains the SID from which the subscription is being
- *  unsubscribed.  */
-EXPORT_SPEC const UpnpString *UpnpEventSubscribe_get_SID(const UpnpEventSubscribe *p);
-EXPORT_SPEC const char *UpnpEventSubscribe_get_SID_cstr(const UpnpEventSubscribe *p);
-EXPORT_SPEC void UpnpEventSubscribe_set_SID(UpnpEventSubscribe *p, const UpnpString *s);
-EXPORT_SPEC void UpnpEventSubscribe_strcpy_SID(UpnpEventSubscribe *p, const char *s);
-
-
-/*! The event URL being subscribed to or removed from. */
-EXPORT_SPEC const UpnpString *UpnpEventSubscribe_get_PublisherUrl(const UpnpEventSubscribe *p);
-EXPORT_SPEC const char *UpnpEventSubscribe_get_PublisherUrl_cstr(const UpnpEventSubscribe *p);
-EXPORT_SPEC void UpnpEventSubscribe_set_PublisherUrl(UpnpEventSubscribe *p, const UpnpString *s);
-EXPORT_SPEC void UpnpEventSubscribe_strcpy_PublisherUrl(UpnpEventSubscribe *p, const char *s);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* EVENTSUBSCRIBE_H */
-

upnp/inc/FileInfo.h

@@ -1,84 +0,0 @@
-
-
-#ifndef FILEINFO_H
-#define FILEINFO_H
-
-
-/*!
- * \file
- *
- * \brief UpnpFileInfo object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Detailed description of this class should go here */
-typedef struct s_UpnpFileInfo UpnpFileInfo;
-
-
-#include "ixml.h"       /* for DOMString */
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-
-
-#include <sys/types.h>  /* for off_t */
-#include <time.h>       /* for time_t */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpFileInfo *UpnpFileInfo_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpFileInfo_delete(UpnpFileInfo *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpFileInfo *UpnpFileInfo_dup(const UpnpFileInfo *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpFileInfo_assign(UpnpFileInfo *p, const UpnpFileInfo *q);
-
-/*! The length of the file. A length less than 0 indicates the size 
- *  is unknown, and data will be sent until 0 bytes are returned from
- *  a read call. */
-EXPORT_SPEC off_t UpnpFileInfo_get_FileLength(const UpnpFileInfo *p);
-EXPORT_SPEC void UpnpFileInfo_set_FileLength(UpnpFileInfo *p, off_t l);
-
-/*! The time at which the contents of the file was modified;
- *  The time system is always local (not GMT). */
-EXPORT_SPEC const time_t *UpnpFileInfo_get_LastModified(const UpnpFileInfo *p);
-EXPORT_SPEC void UpnpFileInfo_set_LastModified(UpnpFileInfo *p, const time_t *t);
-
-/*! If the file is a directory, \b is_directory contains
- * a non-zero value. For a regular file, it should be 0. */
-EXPORT_SPEC int UpnpFileInfo_get_IsDirectory(const UpnpFileInfo *p);
-EXPORT_SPEC void UpnpFileInfo_set_IsDirectory(UpnpFileInfo *p, int b);
-
-/*! If the file or directory is readable, this contains 
- * a non-zero value. If unreadable, it should be set to 0. */
-EXPORT_SPEC int UpnpFileInfo_get_IsReadable(const UpnpFileInfo *p);
-EXPORT_SPEC void UpnpFileInfo_set_IsReadable(UpnpFileInfo *p, int b);
-
-/*! The content type of the file. */
-EXPORT_SPEC const DOMString UpnpFileInfo_get_ContentType(const UpnpFileInfo *p);
-EXPORT_SPEC const char *UpnpFileInfo_get_ContentType_cstr(const UpnpFileInfo *p);
-EXPORT_SPEC void UpnpFileInfo_set_ContentType(UpnpFileInfo *p, const DOMString s);
-
-/*! Additional HTTP headers to return. Each header line should be
- *  followed by "\r\n". */
-EXPORT_SPEC const DOMString UpnpFileInfo_get_ExtraHeaders(const UpnpFileInfo *p);
-EXPORT_SPEC const char *UpnpFileInfo_get_ExtraHeaders_cstr(const UpnpFileInfo *p);
-EXPORT_SPEC void UpnpFileInfo_set_ExtraHeaders(UpnpFileInfo *p, const DOMString s);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* FILEINFO_H */
-

upnp/inc/StateVarComplete.h

@@ -1,72 +0,0 @@
-
-
-#ifndef STATEVARCOMPLETE_H
-#define STATEVARCOMPLETE_H
-
-
-/*!
- * \file
- *
- * \brief UpnpStateVarComplete object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Represents the reply for the current value of a state variable in an
- * asynchronous call. */
-typedef struct s_UpnpStateVarComplete UpnpStateVarComplete;
-
-
-#include "ixml.h"       /* for DOMString */
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpStateVarComplete *UpnpStateVarComplete_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpStateVarComplete_delete(UpnpStateVarComplete *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpStateVarComplete *UpnpStateVarComplete_dup(const UpnpStateVarComplete *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpStateVarComplete_assign(UpnpStateVarComplete *p, const UpnpStateVarComplete *q);
-
-/*! The result of the operation */
-EXPORT_SPEC int UpnpStateVarComplete_get_ErrCode(const UpnpStateVarComplete *p);
-EXPORT_SPEC void UpnpStateVarComplete_set_ErrCode(UpnpStateVarComplete *p, int n);
-
-/*! The control URL for the service. */
-EXPORT_SPEC const UpnpString *UpnpStateVarComplete_get_CtrlUrl(const UpnpStateVarComplete *p);
-EXPORT_SPEC const char *UpnpStateVarComplete_get_CtrlUrl_cstr(const UpnpStateVarComplete *p);
-EXPORT_SPEC void UpnpStateVarComplete_set_CtrlUrl(UpnpStateVarComplete *p, const UpnpString *s);
-EXPORT_SPEC void UpnpStateVarComplete_strcpy_CtrlUrl(UpnpStateVarComplete *p, const char *s);
-
-/*! The name of the variable. */
-EXPORT_SPEC const UpnpString *UpnpStateVarComplete_get_StateVarName(const UpnpStateVarComplete *p);
-EXPORT_SPEC const char *UpnpStateVarComplete_get_StateVarName_cstr(const UpnpStateVarComplete *p);
-EXPORT_SPEC void UpnpStateVarComplete_set_StateVarName(UpnpStateVarComplete *p, const UpnpString *s);
-EXPORT_SPEC void UpnpStateVarComplete_strcpy_StateVarName(UpnpStateVarComplete *p, const char *s);
-
-/*! The current value of the variable. This needs to be allocated by 
- *  the caller.  When finished with it, the SDK frees this \b DOMString. */
-EXPORT_SPEC const DOMString UpnpStateVarComplete_get_CurrentVal(const UpnpStateVarComplete *p);
-EXPORT_SPEC const char *UpnpStateVarComplete_get_CurrentVal_cstr(const UpnpStateVarComplete *p);
-EXPORT_SPEC void UpnpStateVarComplete_set_CurrentVal(UpnpStateVarComplete *p, const DOMString s);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* STATEVARCOMPLETE_H */
-

upnp/inc/StateVarRequest.h

@@ -1,91 +0,0 @@
-
-
-#ifndef STATEVARREQUEST_H
-#define STATEVARREQUEST_H
-
-
-/*!
- * \file
- *
- * \brief UpnpStateVarRequest object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Represents the request for current value of a state variable in a service
- *  state table.  */
-typedef struct s_UpnpStateVarRequest UpnpStateVarRequest;
-
-
-#include "ixml.h"       /* for DOMString */
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpInet.h"   /* for sockaddr, sockaddr_storage */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpStateVarRequest *UpnpStateVarRequest_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpStateVarRequest_delete(UpnpStateVarRequest *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpStateVarRequest *UpnpStateVarRequest_dup(const UpnpStateVarRequest *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpStateVarRequest_assign(UpnpStateVarRequest *p, const UpnpStateVarRequest *q);
-
-/*! The result of the operation */
-EXPORT_SPEC int UpnpStateVarRequest_get_ErrCode(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_ErrCode(UpnpStateVarRequest *p, int n);
-
-/*! The socket number of the connection to the requestor */
-EXPORT_SPEC int UpnpStateVarRequest_get_Socket(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_Socket(UpnpStateVarRequest *p, int n);
-
-/*! The error string in case of error */
-EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_ErrStr(const UpnpStateVarRequest *p);
-EXPORT_SPEC const char *UpnpStateVarRequest_get_ErrStr_cstr(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_ErrStr(UpnpStateVarRequest *p, const UpnpString *s);
-EXPORT_SPEC void UpnpStateVarRequest_strcpy_ErrStr(UpnpStateVarRequest *p, const char *s);
-
-/*! The unique device ID */
-EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_DevUDN(const UpnpStateVarRequest *p);
-EXPORT_SPEC const char *UpnpStateVarRequest_get_DevUDN_cstr(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_DevUDN(UpnpStateVarRequest *p, const UpnpString *s);
-
-/*! The service ID */
-EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_ServiceID(const UpnpStateVarRequest *p);
-EXPORT_SPEC const char *UpnpStateVarRequest_get_ServiceID_cstr(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_ServiceID(UpnpStateVarRequest *p, const UpnpString *s);
-
-/*! The name of the variable. */
-EXPORT_SPEC const UpnpString *UpnpStateVarRequest_get_StateVarName(const UpnpStateVarRequest *p);
-EXPORT_SPEC const char *UpnpStateVarRequest_get_StateVarName_cstr(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_StateVarName(UpnpStateVarRequest *p, const UpnpString *s);
-EXPORT_SPEC void UpnpStateVarRequest_strcpy_StateVarName(UpnpStateVarRequest *p, const char *s);
-
-/*! IP address of sender requesting the state variable. */
-EXPORT_SPEC const struct sockaddr *UpnpStateVarRequest_get_CtrlPtIPAddr(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_CtrlPtIPAddr(UpnpStateVarRequest *p, const struct sockaddr *sa);
-
-/*! The current value of the variable. This needs to be allocated by 
- *  the caller.  When finished with it, the SDK frees this \b DOMString. */
-EXPORT_SPEC const DOMString UpnpStateVarRequest_get_CurrentVal(const UpnpStateVarRequest *p);
-EXPORT_SPEC const char *UpnpStateVarRequest_get_CurrentVal_cstr(const UpnpStateVarRequest *p);
-EXPORT_SPEC void UpnpStateVarRequest_set_CurrentVal(UpnpStateVarRequest *p, const DOMString s);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* STATEVARREQUEST_H */
-

upnp/inc/SubscriptionRequest.h

@@ -1,66 +0,0 @@
-
-
-#ifndef SUBSCRIPTIONREQUEST_H
-#define SUBSCRIPTIONREQUEST_H
-
-
-/*!
- * \file
- *
- * \brief UpnpSubscriptionRequest object declararion.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-/*! Returned along with a \b UPNP_EVENT_SUBSCRIPTION_REQUEST callback. */
-typedef struct s_UpnpSubscriptionRequest UpnpSubscriptionRequest;
-
-
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-#include "UpnpString.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*! Constructor */
-EXPORT_SPEC UpnpSubscriptionRequest *UpnpSubscriptionRequest_new();
-
-/*! Destructor */
-EXPORT_SPEC void UpnpSubscriptionRequest_delete(UpnpSubscriptionRequest *p);
-
-/*! Copy Constructor */
-EXPORT_SPEC UpnpSubscriptionRequest *UpnpSubscriptionRequest_dup(const UpnpSubscriptionRequest *p);
-
-/*! Assignment operator */
-EXPORT_SPEC void UpnpSubscriptionRequest_assign(UpnpSubscriptionRequest *p, const UpnpSubscriptionRequest *q);
-
-/*! The identifier for the service being subscribed to. */
-EXPORT_SPEC const UpnpString *UpnpSubscriptionRequest_get_ServiceId(const UpnpSubscriptionRequest *p);
-EXPORT_SPEC const char *UpnpSubscriptionRequest_get_ServiceId_cstr(const UpnpSubscriptionRequest *p);
-EXPORT_SPEC void UpnpSubscriptionRequest_set_ServiceId(UpnpSubscriptionRequest *p, const UpnpString *s);
-EXPORT_SPEC void UpnpSubscriptionRequest_strcpy_ServiceId(UpnpSubscriptionRequest *p, const char *s);
-
-/*! Universal device name. */
-EXPORT_SPEC const UpnpString *UpnpSubscriptionRequest_get_UDN(const UpnpSubscriptionRequest *p);
-EXPORT_SPEC const char *UpnpSubscriptionRequest_get_UDN_cstr(const UpnpSubscriptionRequest *p);
-EXPORT_SPEC void UpnpSubscriptionRequest_set_UDN(UpnpSubscriptionRequest *p, const UpnpString *s);
-EXPORT_SPEC void UpnpSubscriptionRequest_strcpy_UDN(UpnpSubscriptionRequest *p, const char *s);
-
-/*! The assigned subscription ID for this subscription. */
-EXPORT_SPEC const UpnpString *UpnpSubscriptionRequest_get_SID(const UpnpSubscriptionRequest *p);
-EXPORT_SPEC const char *UpnpSubscriptionRequest_get_SID_cstr(const UpnpSubscriptionRequest *p);
-EXPORT_SPEC void UpnpSubscriptionRequest_set_SID(UpnpSubscriptionRequest *p, const UpnpString *s);
-EXPORT_SPEC void UpnpSubscriptionRequest_strcpy_SID(UpnpSubscriptionRequest *p, const char *s);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* SUBSCRIPTIONREQUEST_H */
-

upnp/inc/UpnpInet.h

@@ -12,8 +12,11 @@
 
 
 #ifdef WIN32
+	#include <iphlpapi.h>
 	#include <winsock2.h>
 	#include <Ws2tcpip.h>
+
+	#define UpnpCloseSocket closesocket
 #else
 	#include <sys/param.h>
 	#if (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
@@ -23,6 +26,11 @@
 		#include <sys/socket.h>
 	#endif
 	#include <netinet/in.h>
+
+	#include <unistd.h> /* for close(). Do not include in WIN32. */
+	#define SOCKET int
+	#define INVALID_SOCKET ((SOCKET)(-1))
+	#define UpnpCloseSocket close
 #endif
 
 

upnp/inc/UpnpString.h

@@ -24,6 +24,9 @@
 #include "UpnpGlobal.h" /* for EXPORT_SPEC */
 
 
+#include <stdlib.h> /* for size_t */
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -76,11 +79,22 @@ EXPORT_SPEC void UpnpString_assign(
  *
  * \return The length of the string.
  * */
-EXPORT_SPEC int UpnpString_get_Length(
+EXPORT_SPEC size_t UpnpString_get_Length(
 	/*! [in] The \em \b this pointer. */
 	const UpnpString *p);
 
 
+/*!
+ * \brief Truncates the string to the specified lenght, or does nothing
+ * if the current lenght is less than or equal to the requested length.
+ * */
+EXPORT_SPEC void UpnpString_set_Length(
+	/*! [in] The \em \b this pointer. */
+	UpnpString *p,
+	/*! [in] The requested length. */
+	size_t n);
+
+
 /*!
  * \brief Returns the pointer to char.
  *
@@ -94,7 +108,7 @@ EXPORT_SPEC const char *UpnpString_get_String(
 /*!
  * \brief Sets the string from a pointer to char.
  */
-EXPORT_SPEC void UpnpString_set_String(
+EXPORT_SPEC int UpnpString_set_String(
 	/*! [in] The \em \b this pointer. */
 	UpnpString *p,
 	/*! [in] (char *) to copy from. */
@@ -104,13 +118,13 @@ EXPORT_SPEC void UpnpString_set_String(
 /*!
  * \brief Sets the string from a pointer to char using a maximum of N chars.
  */
-EXPORT_SPEC void UpnpString_set_StringN(
+EXPORT_SPEC int 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);
+	size_t n);
 
 
 /*!
@@ -121,6 +135,30 @@ EXPORT_SPEC void UpnpString_clear(
 	UpnpString *p);
 
 
+/*!
+ * \brief Compares two strings for equality. Case matters.
+ *
+ * \return The result of strcmp().
+ */
+EXPORT_SPEC int UpnpString_cmp(
+	/*! [in] The \em \b the first string. */
+	UpnpString *p,
+	/*! [in] The \em \b the second string. */
+	UpnpString *q);
+
+
+/*!
+ * \brief Compares two strings for equality. Case does not matter.
+ *
+ * \return The result of strcasecmp().
+ */
+EXPORT_SPEC int UpnpString_casecmp(
+	/*! [in] The \em \b the first string. */
+	UpnpString *p,
+	/*! [in] The \em \b the second string. */
+	UpnpString *q);
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

upnp/inc/upnp.h

@@ -69,22 +69,6 @@
 #endif
 
 
-#ifdef WIN32
-	#include <iphlpapi.h>
-#else
-	#define SOCKET int
-	#define INVALID_SOCKET (SOCKET)(~0)
-#endif
-
-
-#ifdef WIN32
-	#define UpnpCloseSocket closesocket
-	#define fseeko fseek
-#else
-	#define UpnpCloseSocket close
-#endif
-
-
 #define LINE_SIZE  180
 #define NAME_SIZE  256
 #define MNFT_NAME_SIZE  64
@@ -417,6 +401,7 @@
 #endif
 
 
+#if UPNP_VERSION >= 10800
 /* 
  * Opaque data structures. The following includes are data structures that
  * must be externally visible. Since version 1.8.0, only an opaque typedef
@@ -436,6 +421,7 @@
 #include "StateVarComplete.h"
 #include "StateVarRequest.h"
 #include "SubscriptionRequest.h"
+#endif /* UPNP_VERSION >= 10800 */
 
 
 /*!
@@ -635,6 +621,234 @@ enum Upnp_DescType_e {
 typedef enum Upnp_DescType_e Upnp_DescType;
 
 
+#if UPNP_VERSION < 10800
+/** Returned as part of a {\bf UPNP_CONTROL_ACTION_COMPLETE} callback.  */
+
+struct Upnp_Action_Request
+{
+  /** The result of the operation. */
+  int ErrCode;
+
+  /** The socket number of the connection to the requestor. */
+  int Socket;
+
+  /** The error string in case of error. */
+  char ErrStr[LINE_SIZE];
+
+ /** The Action Name. */
+  char ActionName[NAME_SIZE];
+
+  /** The unique device ID. */
+  char DevUDN[NAME_SIZE];
+
+  /** The service ID. */
+  char ServiceID[NAME_SIZE];
+
+  /** The DOM document describing the action. */
+  IXML_Document *ActionRequest;
+
+  /** The DOM document describing the result of the action. */
+  IXML_Document *ActionResult;
+
+  /** IP address of the control point requesting this action. */
+  struct sockaddr_storage CtrlPtIPAddr;
+
+  /** The DOM document containing the information from the
+      the SOAP header. */
+  IXML_Document *SoapHeader;
+};
+
+struct Upnp_Action_Complete
+{
+  /** The result of the operation. */
+  int ErrCode;
+
+  /** The control URL for service. */
+  char CtrlUrl[NAME_SIZE];
+
+  /** The DOM document describing the action. */
+  IXML_Document *ActionRequest;
+
+  /** The DOM document describing the result of the action. */
+  IXML_Document *ActionResult;
+
+};
+
+/** Represents the request for current value of a state variable in a service
+ *  state table.  */
+
+struct Upnp_State_Var_Request
+{
+  /** The result of the operation. */
+  int ErrCode;
+
+  /** The socket number of the connection to the requestor. */
+  int Socket;
+
+  /** The error string in case of error. */
+  char ErrStr[LINE_SIZE];
+
+  /** The unique device ID. */
+  char DevUDN[NAME_SIZE];
+
+  /** The  service ID. */
+  char ServiceID[NAME_SIZE];
+
+  /** The name of the variable. */
+  char StateVarName[NAME_SIZE];
+
+  /** IP address of sender requesting the state variable. */
+  struct sockaddr_storage CtrlPtIPAddr;
+
+  /** The current value of the variable. This needs to be allocated by 
+   *  the caller.  When finished with it, the SDK frees this {\bf DOMString}. */
+  DOMString CurrentVal;
+};
+
+/** Represents the reply for the current value of a state variable in an
+    asynchronous call. */
+
+struct Upnp_State_Var_Complete
+{
+  /** The result of the operation. */
+  int ErrCode;
+
+  /** The control URL for the service. */
+  char CtrlUrl[NAME_SIZE];
+
+  /** The name of the variable. */
+  char StateVarName[NAME_SIZE];
+
+  /** The current value of the variable or error string in case of error. */
+  DOMString CurrentVal;
+};
+
+/** Returned along with a {\bf UPNP_EVENT_RECEIVED} callback.  */
+
+struct Upnp_Event
+{
+  /** The subscription ID for this subscription. */
+  Upnp_SID Sid;
+
+  /** The event sequence number. */
+  int EventKey;
+
+  /** The DOM tree representing the changes generating the event. */
+  IXML_Document *ChangedVariables;
+
+};
+
+/*
+ * This typedef is required by Doc++ to parse the last entry of the 
+ * Upnp_Discovery structure correctly.
+ */
+
+
+/** Returned in a {\bf UPNP_DISCOVERY_RESULT} callback. */
+struct Upnp_Discovery
+{
+	/** The result code of the {\bf UpnpSearchAsync} call. */
+	int  ErrCode;                  
+				     
+	/** The expiration time of the advertisement. */
+	int  Expires;                  
+				     
+	/** The unique device identifier. */
+	char DeviceId[LINE_SIZE];      
+
+	/** The device type. */
+	char DeviceType[LINE_SIZE];    
+
+	/** The service type. */
+	char ServiceType[LINE_SIZE];
+
+	/** The service version. */
+	char ServiceVer[LINE_SIZE];    
+
+	/** The URL to the UPnP description document for the device. */
+	char Location[LINE_SIZE];      
+
+	/** The operating system the device is running. */
+	char Os[LINE_SIZE];            
+				     
+	/** Date when the response was generated. */
+	char Date[LINE_SIZE];            
+				     
+	/** Confirmation that the MAN header was understood by the device. */
+	char Ext[LINE_SIZE];           
+				     
+	/** The host address of the device responding to the search. */
+	struct sockaddr_in DestAddr; 
+};
+
+/** Returned along with a {\bf UPNP_EVENT_SUBSCRIBE_COMPLETE} or {\bf
+ * UPNP_EVENT_UNSUBSCRIBE_COMPLETE} callback.  */
+
+struct Upnp_Event_Subscribe {
+
+  /** The SID for this subscription.  For subscriptions, this only
+   *  contains a valid SID if the {\bf Upnp_EventSubscribe.result} field
+   *  contains a {\tt UPNP_E_SUCCESS} result code.  For unsubscriptions,
+   *  this contains the SID from which the subscription is being
+   *  unsubscribed.  */
+
+  Upnp_SID Sid;            
+
+  /** The result of the operation. */
+  int ErrCode;              
+
+  /** The event URL being subscribed to or removed from. */
+  char PublisherUrl[NAME_SIZE]; 
+
+  /** The actual subscription time (for subscriptions only). */
+  int TimeOut;              
+                              
+};
+  
+/** Returned along with a {\bf UPNP_EVENT_SUBSCRIPTION_REQUEST}
+ *  callback.  */
+
+struct Upnp_Subscription_Request
+{
+  /** The identifier for the service being subscribed to. */
+  char *ServiceId; 
+
+  /** Universal device name. */
+  char *UDN;       
+
+  /** The assigned subscription ID for this subscription. */
+  Upnp_SID Sid;
+
+};
+
+
+struct File_Info
+{
+	/** The length of the file. A length less than 0 indicates the size 
+	*  is unknown, and data will be sent until 0 bytes are returned from
+	*  a read call. */
+	off_t file_length;
+
+	/** The time at which the contents of the file was modified;
+	*  The time system is always local (not GMT). */
+	time_t last_modified;
+
+	/** If the file is a directory, {\bf is_directory} contains
+	* a non-zero value. For a regular file, it should be 0. */
+	int is_directory;
+
+	/** If the file or directory is readable, this contains 
+	* a non-zero value. If unreadable, it should be set to 0. */
+	int is_readable;
+
+	/** The content type of the file. This string needs to be allocated 
+	*  by the caller using {\bf ixmlCloneDOMString}.  When finished 
+	*  with it, the SDK frees the {\bf DOMString}. */
+	DOMString content_type;
+};
+#endif /* UPNP_VERSION < 10800 */
+
+
 /*!
  *  All callback functions share the same prototype, documented below.
  *  Note that any memory passed to the callback function
@@ -757,6 +971,7 @@ EXPORT_SPEC int UpnpInit(
  *     \li \c UPNP_E_INVALID_INTERFACE: IfName is invalid or does not
  *             have a valid IPv4 or IPv6 addresss configured.
  */
+#ifdef UPNP_ENABLE_IPV6
 EXPORT_SPEC int UpnpInit2( 
 	/*! The interface name to use by the UPnP SDK operations.
 	 * Examples: "eth0", "xl0", "Local Area Connection", \c NULL to
@@ -765,6 +980,7 @@ EXPORT_SPEC int UpnpInit2(
 	/*!  Local Port to listen for incoming connections.
 	 * \c NULL will pick an arbitrary free port. */
 	unsigned short DestPort);
+#endif
 
 
 /*!
@@ -814,8 +1030,9 @@ EXPORT_SPEC unsigned short UpnpGetServerPort(void);
  *		related requests.
  *	\li On error: 0 is returned if \b UpnpInit has not succeeded.
  */
+#ifdef UPNP_ENABLE_IPV6
 EXPORT_SPEC unsigned short UpnpGetServerPort6(void);
-
+#endif
 /*!
  * \brief Returns the local IPv4 listening ip address.
  *
@@ -841,10 +1058,11 @@ EXPORT_SPEC char *UpnpGetServerIpAddress(void);
  * 		listening for UPnP related requests.
  * 	\li On error: \c NULL is returned if \b UpnpInit has not succeeded.
  */
+#ifdef UPNP_ENABLE_IPV6
 EXPORT_SPEC char *UpnpGetServerIp6Address(void);
 
 EXPORT_SPEC char *UpnpGetServerUlaGuaIp6Address(void);
-
+#endif
 /*!
  * \brief Registers a device application with the UPnP Library.
  *
@@ -1121,6 +1339,8 @@ EXPORT_SPEC int UpnpSetContentLength(
  * behaviour if the size of the incoming SOAP message exceeds the memory that
  * device can allocate.
  *
+ * If set to 0 then checking will be disabled.
+ *
  * The default maximum content-length is \c DEFAULT_SOAP_CONTENT_LENGTH 
  * = 16K bytes.
  *  
@@ -2416,7 +2636,12 @@ typedef int (*VDCallback_GetInfo)(
 		/*! [in] The name of the file to query. */
 		const char *filename,
 		/*! [out] Pointer to a structure to store the information on the file. */
-		UpnpFileInfo *info);
+#if UPNP_VERSION < 10800
+		struct File_Info *info
+#else
+		UpnpFileInfo *info
+#endif /* UPNP_VERSION < 10800 */
+		);
 
 
 /*!

upnp/inc/upnpconfig.h.in

@@ -1,7 +1,7 @@
 /* -*- C -*- */
 /*******************************************************************************
  *
- * Copyright (c) 2006 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
  * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
@@ -52,7 +52,7 @@
 
 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
-  ((UPNP_VERSION_MAJOR*100 + UPNP_VERSION_MINOR)*100 + UPNP_VERSION_PATCH)
+  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
 
 
 
@@ -90,6 +90,9 @@
  *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
 #undef UPNP_HAVE_TOOLS
 
+/** Defined to 1 if the library has been compiled with ipv6 support
+ *  (i.e. configure --enable-ipv6) */
+#undef UPNP_ENABLE_IPV6
 
 #endif /* UPNP_CONFIG_H */
 

upnp/sample/common/sample_util.c

@@ -43,7 +43,8 @@
 #endif
 
 
-int initialize = 1;
+static int initialize_init = 1;
+static int initialize_register = 1;
 
 /*! Function pointers to use for displaying formatted strings.
  * Set on Initialization of device. */
@@ -67,7 +68,7 @@ ithread_mutex_t display_mutex;
  ******************************************************************************/
 int SampleUtil_Initialize(print_string print_function)
 {
-	if (initialize) {
+	if (initialize_init) {
 		ithread_mutexattr_t attr;
 
 		ithread_mutexattr_init(&attr);
@@ -80,7 +81,7 @@ int SampleUtil_Initialize(print_string print_function)
 		gPrintFun = print_function;
 		ithread_mutex_unlock(&display_mutex);
 
-		initialize = 0;
+		initialize_init = 0;
 	} else {
 		SampleUtil_Print("***** SampleUtil_Initialize was called multiple times!\n");
 		abort();
@@ -99,12 +100,9 @@ int SampleUtil_Initialize(print_string print_function)
  ******************************************************************************/
 int SampleUtil_RegisterUpdateFunction(state_update update_function)
 {
-	/* Intialize only once. */
-	static int initialize = 1;
-
-	if (initialize) {
+	if (initialize_register) {
 		gStateUpdateFun = update_function;
-		initialize = 0;
+		initialize_register = 0;
 	}
 
 	return UPNP_E_SUCCESS;
@@ -123,7 +121,9 @@ int SampleUtil_Finish()
 {
 	ithread_mutex_destroy(&display_mutex);
 	gPrintFun = NULL;
-	initialize = 1;
+	gStateUpdateFun = NULL;
+	initialize_init = 1;
+	initialize_register = 1;
 
 	return UPNP_E_SUCCESS;
 }
@@ -437,28 +437,18 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType, IN void *Event)
 	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
 	case UPNP_DISCOVERY_SEARCH_RESULT: {
-		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
-		SampleUtil_Print(
-		"ErrCode     =  %d\n"
-		"Expires     =  %d\n"
-		"DeviceId    =  %s\n"
-		"DeviceType  =  %s\n"
-		"ServiceType =  %s\n"
-		"ServiceVer  =  %s\n"
-		"Location    =  %s\n"
-		"OS          =  %s\n"
-		"Date        =  %s\n"
-		"Ext         =  %s\n",
-		UpnpDiscovery_get_ErrCode(d_event),
-		UpnpDiscovery_get_Expires(d_event),
-		UpnpString_get_String(UpnpDiscovery_get_DeviceID(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_DeviceType(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_ServiceType(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_ServiceVer(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Location(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Os(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Date(d_event)),
-		UpnpString_get_String(UpnpDiscovery_get_Ext(d_event)));
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
+
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(d_event->ErrCode), d_event->ErrCode);
+		SampleUtil_Print("Expires     =  %d\n",  d_event->Expires);
+		SampleUtil_Print("DeviceId    =  %s\n",  d_event->DeviceId);
+		SampleUtil_Print("DeviceType  =  %s\n",  d_event->DeviceType);
+		SampleUtil_Print("ServiceType =  %s\n",  d_event->ServiceType);
+		SampleUtil_Print("ServiceVer  =  %s\n",  d_event->ServiceVer);
+		SampleUtil_Print("Location    =  %s\n",  d_event->Location);
+		SampleUtil_Print("OS          =  %s\n",  d_event->Os);
+		SampleUtil_Print("Ext         =  %s\n",  d_event->Ext);
 		break;
 	}
 	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
@@ -466,25 +456,18 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType, IN void *Event)
 		break;
 	/* SOAP */
 	case UPNP_CONTROL_ACTION_REQUEST: {
-		UpnpActionRequest *a_event = (UpnpActionRequest *)Event;
-		IXML_Document *actionRequestDoc = NULL;
-		IXML_Document *actionResultDoc = NULL;
+		struct Upnp_Action_Request *a_event =
+			(struct Upnp_Action_Request *)Event;
 		char *xmlbuff = NULL;
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"ErrStr      =  %s\n"
-			"ActionName  =  %s\n"
-			"UDN         =  %s\n"
-			"ServiceID   =  %s\n",
-			UpnpActionRequest_get_ErrCode(a_event),
-			UpnpString_get_String(UpnpActionRequest_get_ErrStr(a_event)),
-			UpnpString_get_String(UpnpActionRequest_get_ActionName(a_event)),
-			UpnpString_get_String(UpnpActionRequest_get_DevUDN(a_event)),
-			UpnpString_get_String(UpnpActionRequest_get_ServiceID(a_event)));
-		actionRequestDoc = UpnpActionRequest_get_ActionRequest(a_event);
-		if (actionRequestDoc) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionRequestDoc);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(a_event->ErrCode), a_event->ErrCode);
+		SampleUtil_Print("ErrStr      =  %s\n", a_event->ErrStr);
+		SampleUtil_Print("ActionName  =  %s\n", a_event->ActionName);
+		SampleUtil_Print("UDN         =  %s\n", a_event->DevUDN);
+		SampleUtil_Print("ServiceID   =  %s\n", a_event->ServiceID);
+		if (a_event->ActionRequest) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionRequest);
 			if (xmlbuff) {
 				SampleUtil_Print("ActRequest  =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
@@ -493,9 +476,8 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType, IN void *Event)
 		} else {
 			SampleUtil_Print("ActRequest  =  (null)\n");
 		}
-		actionResultDoc = UpnpActionRequest_get_ActionResult(a_event);
-		if (actionResultDoc) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionResultDoc);
+		if (a_event->ActionResult) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionResult);
 			if (xmlbuff) {
 				SampleUtil_Print("ActResult   =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
@@ -507,22 +489,15 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType, IN void *Event)
 		break;
 	}
 	case UPNP_CONTROL_ACTION_COMPLETE: {
-		UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
+		struct Upnp_Action_Complete *a_event =
+			(struct Upnp_Action_Complete *)Event;
 		char *xmlbuff = NULL;
-		int errCode = UpnpActionComplete_get_ErrCode(a_event);
-		const char *ctrlURL = UpnpString_get_String(
-			UpnpActionComplete_get_CtrlUrl(a_event));
-		IXML_Document *actionRequest =
-			UpnpActionComplete_get_ActionRequest(a_event);
-		IXML_Document *actionResult =
-			UpnpActionComplete_get_ActionResult(a_event);
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"CtrlUrl     =  %s\n",
-			errCode, ctrlURL);
-		if (actionRequest) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionRequest);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",  
+			UpnpGetErrorMessage(a_event->ErrCode), a_event->ErrCode);
+		SampleUtil_Print("CtrlUrl     =  %s\n", a_event->CtrlUrl);
+		if (a_event->ActionRequest) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionRequest);
 			if (xmlbuff) {
 				SampleUtil_Print("ActRequest  =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
@@ -531,8 +506,8 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType, IN void *Event)
 		} else {
 			SampleUtil_Print("ActRequest  =  (null)\n");
 		}
-		if (actionResult) {
-			xmlbuff = ixmlPrintNode((IXML_Node *)actionResult);
+		if (a_event->ActionResult) {
+			xmlbuff = ixmlPrintNode((IXML_Node *)a_event->ActionResult);
 			if (xmlbuff) {
 				SampleUtil_Print("ActResult   =  %s\n", xmlbuff);
 				ixmlFreeDOMString(xmlbuff);
@@ -544,107 +519,84 @@ int SampleUtil_PrintEvent(IN Upnp_EventType EventType, IN void *Event)
 		break;
 	}
 	case UPNP_CONTROL_GET_VAR_REQUEST: {
-		UpnpStateVarRequest *sv_event = (UpnpStateVarRequest *)Event;
+		struct Upnp_State_Var_Request *sv_event =
+			(struct Upnp_State_Var_Request *)Event;
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"ErrStr      =  %s\n"
-			"UDN         =  %s\n"
-			"ServiceID   =  %s\n"
-			"StateVarName=  %s\n"
-			"CurrentVal  =  %s\n",
-			UpnpStateVarRequest_get_ErrCode(sv_event),
-			UpnpString_get_String(UpnpStateVarRequest_get_ErrStr(sv_event)),
-			UpnpString_get_String(UpnpStateVarRequest_get_DevUDN(sv_event)),
-			UpnpString_get_String(UpnpStateVarRequest_get_ServiceID(sv_event)),
-			UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(sv_event)),
-			UpnpStateVarRequest_get_CurrentVal(sv_event));
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(sv_event->ErrCode), sv_event->ErrCode);
+		SampleUtil_Print("ErrStr      =  %s\n", sv_event->ErrStr);
+		SampleUtil_Print("UDN         =  %s\n", sv_event->DevUDN);
+		SampleUtil_Print("ServiceID   =  %s\n", sv_event->ServiceID);
+		SampleUtil_Print("StateVarName=  %s\n", sv_event->StateVarName);
+		SampleUtil_Print("CurrentVal  =  %s\n", sv_event->CurrentVal);
 		break;
 	}
 	case UPNP_CONTROL_GET_VAR_COMPLETE: {
-		UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
+		struct Upnp_State_Var_Complete *sv_event =
+			(struct Upnp_State_Var_Complete *)Event;
 
-		SampleUtil_Print(
-			"ErrCode     =  %d\n"
-			"CtrlUrl     =  %s\n"
-			"StateVarName=  %s\n"
-			"CurrentVal  =  %s\n",
-			UpnpStateVarComplete_get_ErrCode(sv_event),
-			UpnpString_get_String(UpnpStateVarComplete_get_CtrlUrl(sv_event)),
-			UpnpString_get_String(UpnpStateVarComplete_get_StateVarName(sv_event)),
-			UpnpStateVarComplete_get_CurrentVal(sv_event));
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(sv_event->ErrCode), sv_event->ErrCode);
+		SampleUtil_Print("CtrlUrl     =  %s\n", sv_event->CtrlUrl);
+		SampleUtil_Print("StateVarName=  %s\n", sv_event->StateVarName);
+		SampleUtil_Print("CurrentVal  =  %s\n", sv_event->CurrentVal);
 		break;
 	}
 
 	/* GENA */
 	case UPNP_EVENT_SUBSCRIPTION_REQUEST: {
-		UpnpSubscriptionRequest *sr_event = (UpnpSubscriptionRequest *)Event;
+		struct Upnp_Subscription_Request *sr_event =
+			(struct Upnp_Subscription_Request *)Event;
 
-		SampleUtil_Print(
-			"ServiceID   =  %s\n"
-			"UDN         =  %s\n"
-			"SID         =  %s\n",
-			UpnpString_get_String(UpnpSubscriptionRequest_get_ServiceId(sr_event)),
-			UpnpString_get_String(UpnpSubscriptionRequest_get_UDN(sr_event)),
-			UpnpString_get_String(UpnpSubscriptionRequest_get_SID(sr_event)));
+		SampleUtil_Print("ServiceID   =  %s\n", sr_event->ServiceId);
+		SampleUtil_Print("UDN         =  %s\n", sr_event->UDN);
+		SampleUtil_Print("SID         =  %s\n", sr_event->Sid);
 		break;
 	}
 	case UPNP_EVENT_RECEIVED: {
-		UpnpEvent *e_event = (UpnpEvent *)Event;
+		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
 		char *xmlbuff = NULL;
 
-		xmlbuff = ixmlPrintNode(
-			(IXML_Node *)UpnpEvent_get_ChangedVariables(e_event));
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"EventKey    =  %d\n"
-			"ChangedVars =  %s\n",
-			UpnpString_get_String(UpnpEvent_get_SID(e_event)),
-			UpnpEvent_get_EventKey(e_event),
-			xmlbuff);
+		SampleUtil_Print("SID         =  %s\n", e_event->Sid);
+		SampleUtil_Print("EventKey    =  %d\n",	e_event->EventKey);
+		xmlbuff = ixmlPrintNode((IXML_Node *)e_event->ChangedVariables);
+		SampleUtil_Print("ChangedVars =  %s\n", xmlbuff);
 		ixmlFreeDOMString(xmlbuff);
+		xmlbuff = NULL;
 		break;
 	}
 	case UPNP_EVENT_RENEWAL_COMPLETE: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event =
+			(struct Upnp_Event_Subscribe *)Event;
 
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"ErrCode     =  %d\n"
-			"TimeOut     =  %d\n",
-			UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-			UpnpEventSubscribe_get_ErrCode(es_event),
-			UpnpEventSubscribe_get_TimeOut(es_event));
+		SampleUtil_Print("SID         =  %s\n", es_event->Sid);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
+		SampleUtil_Print("TimeOut     =  %d\n", es_event->TimeOut);
 		break;
 	}
 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
 	case UPNP_EVENT_UNSUBSCRIBE_COMPLETE: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event =
+			(struct Upnp_Event_Subscribe *)Event;
 
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"ErrCode     =  %d\n"
-			"PublisherURL=  %s\n"
-			"TimeOut     =  %d\n",
-			UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-			UpnpEventSubscribe_get_ErrCode(es_event),
-			UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
-			UpnpEventSubscribe_get_TimeOut(es_event));
+		SampleUtil_Print("SID         =  %s\n", es_event->Sid);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",
+			UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
+		SampleUtil_Print("PublisherURL=  %s\n", es_event->PublisherUrl);
+		SampleUtil_Print("TimeOut     =  %d\n", es_event->TimeOut);
 		break;
 	}
 	case UPNP_EVENT_AUTORENEWAL_FAILED:
 	case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event =
+			(struct Upnp_Event_Subscribe *)Event;
 
-		SampleUtil_Print(
-			"SID         =  %s\n"
-			"ErrCode     =  %d\n"
-			"PublisherURL=  %s\n"
-			"TimeOut     =  %d\n",
-			UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-			UpnpEventSubscribe_get_ErrCode(es_event),
-			UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
-			UpnpEventSubscribe_get_TimeOut(es_event));
+		SampleUtil_Print("SID         =  %s\n", es_event->Sid);
+		SampleUtil_Print("ErrCode     =  %s(%d)\n",  
+			UpnpGetErrorMessage(es_event->ErrCode), es_event->ErrCode);
+		SampleUtil_Print("PublisherURL=  %s\n", es_event->PublisherUrl);
+		SampleUtil_Print("TimeOut     =  %d\n", es_event->TimeOut);
 		break;
 	}
 	}

upnp/sample/tvcombo/upnp_tv_ctrlpt.c

@@ -29,9 +29,14 @@
  *
  ******************************************************************************/
 
+
 #include "upnp_tv_ctrlpt.h"
 
-/*
+
+#include "upnp.h"
+
+
+/*!
    Mutex for protecting the global device list
    in a multi-threaded, asynchronous environment.
    All functions should lock this mutex before reading
@@ -48,7 +53,7 @@ char *TvServiceType[] = {
 };
 char *TvServiceName[] = { "Control", "Picture" };
 
-/*
+/*!
    Global arrays for storing variable names and counts for 
    TvControl and TvPicture services 
  */
@@ -59,12 +64,12 @@ char *TvVarName[TV_SERVICE_SERVCOUNT][TV_MAXVARS] = {
 char TvVarCount[TV_SERVICE_SERVCOUNT] =
     { TV_CONTROL_VARCOUNT, TV_PICTURE_VARCOUNT };
 
-/*
+/*!
    Timeout to request during subscriptions 
  */
 int default_timeout = 1801;
 
-/*
+/*!
    The first node in the global device list, or NULL if empty 
  */
 struct TvDeviceNode *GlobalDeviceList = NULL;
@@ -937,25 +942,23 @@ TvStateUpdate( char *UDN,
  *
  ********************************************************************************/
 void TvCtrlPointHandleEvent(
-	const UpnpString *sid,
+	const char *sid,
 	int evntkey,
 	IXML_Document *changes)
 {
 	struct TvDeviceNode *tmpdevnode;
 	int service;
-	const char *aux_sid = NULL;
 
 	ithread_mutex_lock(&DeviceListMutex);
 
 	tmpdevnode = GlobalDeviceList;
 	while (tmpdevnode) {
 		for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) {
-			aux_sid = UpnpString_get_String(sid);
-			if (strcmp(tmpdevnode->device.TvService[service].SID, aux_sid) ==  0) {
+			if (strcmp(tmpdevnode->device.TvService[service].SID, sid) ==  0) {
 				SampleUtil_Print("Received Tv %s Event: %d for SID %s",
 					TvServiceName[service],
 					evntkey,
-					aux_sid);
+					sid);
 				TvStateUpdate(
 					tmpdevnode->device.UDN,
 					service,
@@ -1057,31 +1060,29 @@ void TvCtrlPointHandleGetVar(
  ********************************************************************************/
 int TvCtrlPointCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-	int errCode = 0;
+	/*int errCode = 0;*/
 
 	SampleUtil_PrintEvent(EventType, Event);
 	switch ( EventType ) {
 	/* SSDP Stuff */
 	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
 	case UPNP_DISCOVERY_SEARCH_RESULT: {
-		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 		IXML_Document *DescDoc = NULL;
-		const char *location = NULL;
-		int errCode = UpnpDiscovery_get_ErrCode(d_event);
+		int ret;
 
-		if (errCode != UPNP_E_SUCCESS) {
+		if (d_event->ErrCode != UPNP_E_SUCCESS) {
 			SampleUtil_Print(
-				"Error in Discovery Callback -- %d", errCode);
+				"Error in Discovery Callback -- %d", d_event->ErrCode);
 		}
-		location = UpnpString_get_String(UpnpDiscovery_get_Location(d_event));
-		errCode = UpnpDownloadXmlDoc(location, &DescDoc);
-		if (errCode != UPNP_E_SUCCESS) {
+		ret = UpnpDownloadXmlDoc(d_event->Location, &DescDoc);
+		if (ret != UPNP_E_SUCCESS) {
 			SampleUtil_Print(
 				"Error obtaining device description from %s -- error = %d",
-				location, errCode);
+				d_event->Location, ret);
 		} else {
 			TvCtrlPointAddDevice(
-				DescDoc, location, UpnpDiscovery_get_Expires(d_event));
+				DescDoc, d_event->Location, d_event->Expires);
 		}
 		if (DescDoc) {
 			ixmlDocument_free(DescDoc);
@@ -1093,93 +1094,90 @@ int TvCtrlPointCallbackEventHandler(Upnp_EventType EventType, void *Event, void
 		/* Nothing to do here... */
 		break;
 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
-		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
-		int errCode = UpnpDiscovery_get_ErrCode(d_event);
-		const char *deviceId = UpnpString_get_String(
-		UpnpDiscovery_get_DeviceID(d_event));
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 
-		if (errCode != UPNP_E_SUCCESS) {
+		if (d_event->ErrCode != UPNP_E_SUCCESS) {
 			SampleUtil_Print(
-				"Error in Discovery ByeBye Callback -- %d", errCode);
+				"Error in Discovery ByeBye Callback -- %d", d_event->ErrCode);
 		}
-		SampleUtil_Print("Received ByeBye for Device: %s", deviceId);
-		TvCtrlPointRemoveDevice(deviceId);
+		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: {
-		UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
-		int errCode = UpnpActionComplete_get_ErrCode(a_event);
-		if (errCode != UPNP_E_SUCCESS) {
+		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",
-				errCode);
+				"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: {
-		UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
-		int errCode = UpnpStateVarComplete_get_ErrCode(sv_event);
-		if (errCode != UPNP_E_SUCCESS) {
+		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", errCode);
+				"Error in Get Var Complete Callback -- %d", sv_event->ErrCode);
 		} else {
 			TvCtrlPointHandleGetVar(
-				UpnpString_get_String(UpnpStateVarComplete_get_CtrlUrl(sv_event)),
-				UpnpString_get_String(UpnpStateVarComplete_get_StateVarName(sv_event)),
-				UpnpStateVarComplete_get_CurrentVal(sv_event));
+				sv_event->CtrlUrl,
+				sv_event->StateVarName,
+				sv_event->CurrentVal);
 		}
 		break;
 	}
 	/* GENA Stuff */
 	case UPNP_EVENT_RECEIVED: {
-		UpnpEvent *e_event = (UpnpEvent *)Event;
+		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+
 		TvCtrlPointHandleEvent(
-			UpnpEvent_get_SID(e_event),
-			UpnpEvent_get_EventKey(e_event),
-			UpnpEvent_get_ChangedVariables(e_event));
+			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: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 
-		errCode = UpnpEventSubscribe_get_ErrCode(es_event);
-		if (errCode != UPNP_E_SUCCESS) {
+		if (es_event->ErrCode != UPNP_E_SUCCESS) {
 			SampleUtil_Print(
-				"Error in Event Subscribe Callback -- %d", errCode);
+				"Error in Event Subscribe Callback -- %d", es_event->ErrCode);
 		} else {
 			TvCtrlPointHandleSubscribeUpdate(
-				UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
-				UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-				UpnpEventSubscribe_get_TimeOut(es_event));
+				es_event->PublisherUrl,
+				es_event->Sid,
+				es_event->TimeOut);
 		}
 		break;
 	}
 	case UPNP_EVENT_AUTORENEWAL_FAILED:
 	case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 		int TimeOut = default_timeout;
 		Upnp_SID newSID;
+		int ret;
 
-		errCode = UpnpSubscribe(
+		ret = UpnpSubscribe(
 			ctrlpt_handle,
-			UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
+			es_event->PublisherUrl,
 			&TimeOut,
 			newSID);
-		if (errCode == UPNP_E_SUCCESS) {
+		if (ret == UPNP_E_SUCCESS) {
 			SampleUtil_Print("Subscribed to EventURL with SID=%s", newSID);
 			TvCtrlPointHandleSubscribeUpdate(
-				UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
+				es_event->PublisherUrl,
 				newSID,
 				TimeOut);
 		} else {
-			SampleUtil_Print("Error Subscribing to EventURL -- %d", errCode);
+			SampleUtil_Print("Error Subscribing to EventURL -- %d", ret);
 		}
 		break;
 	}
@@ -1317,7 +1315,8 @@ int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionP
 	SampleUtil_Print(
 		"Initializing UPnP Sdk with\n"
 		"\tipaddress = %s port = %u\n",
-		ip_address, port);
+		ip_address ? ip_address : "{NULL}",
+		port);
 
 	rc = UpnpInit(ip_address, port);
 	if (rc != UPNP_E_SUCCESS) {
@@ -1336,8 +1335,9 @@ int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionP
 
 	SampleUtil_Print(
 		"UPnP Initialized\n"
-		"\tipaddress= %s port = %u\n",
-		ip_address, port);
+		"\tipaddress = %s port = %u\n",
+		ip_address ? ip_address : "{NULL}",
+		port);
 
 	SampleUtil_Print("Registering Control Point");
 	rc = UpnpRegisterClient(TvCtrlPointCallbackEventHandler,

upnp/sample/tvcombo/upnp_tv_ctrlpt.h

@@ -44,6 +44,7 @@ extern "C" {
 
 #include "ithread.h"
 #include "upnp.h"
+#include "UpnpString.h"
 #include "upnptools.h"
 
 
@@ -120,11 +121,11 @@ extern ithread_mutex_t DeviceListMutex;
 
 extern UpnpClient_Handle ctrlpt_handle;
 
-void	TvCtrlPointPrintHelp();
-int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
+void	TvCtrlPointPrintHelp(void);
+int		TvCtrlPointDeleteNode(struct TvDeviceNode *);
 int		TvCtrlPointRemoveDevice(const char *);
-int		TvCtrlPointRemoveAll();
-int		TvCtrlPointRefresh();
+int		TvCtrlPointRemoveAll(void);
+int		TvCtrlPointRefresh(void);
 
 
 int		TvCtrlPointSendAction(int, int, char *, char **, char **, int);
@@ -148,20 +149,20 @@ int		TvCtrlPointGetContrast(int);
 int		TvCtrlPointGetBrightness(int);
 
 int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
-int		TvCtrlPointPrintList( void );
+int		TvCtrlPointPrintList(void);
 int		TvCtrlPointPrintDevice(int);
 void	TvCtrlPointAddDevice(IXML_Document *, const char *, int); 
 void    TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
 void	TvStateUpdate(char*,int, IXML_Document * , char **);
-void	TvCtrlPointHandleEvent(const UpnpString *, int, IXML_Document *); 
+void	TvCtrlPointHandleEvent(const char *, int, IXML_Document *); 
 void	TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); 
 int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
 void	TvCtrlPointVerifyTimeouts(int);
-void	TvCtrlPointPrintCommands( void );
-void*	TvCtrlPointCommandLoop( void* );
-int		TvCtrlPointStart( print_string printFunctionPtr, state_update updateFunctionPtr );
-int		TvCtrlPointStop( void );
-int		TvCtrlPointProcessCommand( char *cmdline );
+void	TvCtrlPointPrintCommands(void);
+void*	TvCtrlPointCommandLoop(void *);
+int		TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionPtr);
+int		TvCtrlPointStop(void);
+int		TvCtrlPointProcessCommand(char *cmdline);
 
 #ifdef __cplusplus
 };

upnp/sample/tvcombo/upnp_tv_device.c

@@ -38,8 +38,10 @@
 
 #define DEFAULT_WEB_DIR "./web"
 
+
 #define DESC_URL_SIZE 200
 
+
 /*
    Device type for tv device 
  */
@@ -369,23 +371,21 @@ TvDeviceStateTableInit( IN char *DescDocURL )
  *   sr_event -- The subscription request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleSubscriptionRequest(IN const UpnpSubscriptionRequest *sr_event)
+int TvDeviceHandleSubscriptionRequest(IN struct Upnp_Subscription_Request *sr_event)
 {
 	unsigned int i = 0;
-	//unsigned int j = 0;
 	int cmp1 = 0;
 	int cmp2 = 0;
 	const char *l_serviceId = NULL;
 	const char *l_udn = NULL;
 	const char *l_sid = NULL;
-	// IXML_Document *PropSet = NULL;
 
 	// lock state mutex
-	ithread_mutex_lock( &TVDevMutex );
+	ithread_mutex_lock(&TVDevMutex);
 
-	l_serviceId = UpnpString_get_String(UpnpSubscriptionRequest_get_ServiceId(sr_event));
-	l_udn = UpnpString_get_String(UpnpSubscriptionRequest_get_UDN(sr_event));
-	l_sid = UpnpString_get_String(UpnpSubscriptionRequest_get_SID(sr_event));
+	l_serviceId = sr_event->ServiceId;
+	l_udn = sr_event->UDN;
+	l_sid = sr_event->Sid;
 	for (i = 0; i < TV_SERVICE_SERVCOUNT; ++i) {
 		cmp1 = strcmp(l_udn, tv_service_table[i].UDN);
 		cmp2 = strcmp(l_serviceId, tv_service_table[i].ServiceId);
@@ -425,7 +425,7 @@ int TvDeviceHandleSubscriptionRequest(IN const UpnpSubscriptionRequest *sr_event
 		}
 	}
 
-	ithread_mutex_unlock( &TVDevMutex );
+	ithread_mutex_unlock(&TVDevMutex);
 
 	return 1;
 }
@@ -443,53 +443,52 @@ int TvDeviceHandleSubscriptionRequest(IN const UpnpSubscriptionRequest *sr_event
  *   cgv_event -- The control get variable request event structure
  *
  *****************************************************************************/
-int
-TvDeviceHandleGetVarRequest( INOUT UpnpStateVarRequest *cgv_event )
+int TvDeviceHandleGetVarRequest(INOUT struct Upnp_State_Var_Request *cgv_event)
 {
-    unsigned int i = 0;
-    unsigned int j = 0;
-    int getvar_succeeded = 0;
+	unsigned int i = 0;
+	unsigned int j = 0;
+	int getvar_succeeded = 0;
 
-    UpnpStateVarRequest_set_CurrentVal(cgv_event, NULL);
+	cgv_event->CurrentVal = NULL;
 
-    ithread_mutex_lock( &TVDevMutex );
+	ithread_mutex_lock(&TVDevMutex);
 
-    for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
-        // check udn and service id
-        const char *devUDN =
-            UpnpString_get_String(UpnpStateVarRequest_get_DevUDN(cgv_event));
-        const char *serviceID =
-            UpnpString_get_String(UpnpStateVarRequest_get_ServiceID(cgv_event));
-        if( ( strcmp( devUDN,    tv_service_table[i].UDN )       == 0 ) &&
-            ( strcmp( serviceID, tv_service_table[i].ServiceId ) == 0 ) ) {
-            // check variable name
-            for( j = 0; j < tv_service_table[i].VariableCount; j++ ) {
-                const char *stateVarName =
-                    UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(cgv_event));
-                if( strcmp( stateVarName, tv_service_table[i].VariableName[j] ) == 0 ) {
-                    getvar_succeeded = 1;
-                    UpnpStateVarRequest_set_CurrentVal(cgv_event,
-                        tv_service_table[i].VariableStrVal[j] );
-                    break;
-                }
-            }
-        }
-    }
+	for (i = 0; i < TV_SERVICE_SERVCOUNT; i++) {
+		// check udn and service id
+		const char *devUDN =
+			cgv_event->DevUDN;
+		const char *serviceID =
+			cgv_event->ServiceID;
+		if (strcmp(devUDN, tv_service_table[i].UDN) == 0 &&
+		    strcmp(serviceID, tv_service_table[i].ServiceId) == 0) {
+			// check variable name
+			for (j = 0; j < tv_service_table[i].VariableCount; j++) {
+				const char *stateVarName =
+					cgv_event->StateVarName;
+				if (strcmp(stateVarName,
+					   tv_service_table[i].VariableName[j]) == 0) {
+					getvar_succeeded = 1;
+					cgv_event->CurrentVal = ixmlCloneDOMString(
+						tv_service_table[i].VariableStrVal[j]);
+					break;
+				}
+			}
+		}
+	}
+	if (getvar_succeeded) {
+		cgv_event->ErrCode = UPNP_E_SUCCESS;
+	} else {
+		SampleUtil_Print(
+			"Error in UPNP_CONTROL_GET_VAR_REQUEST callback:\n"
+			"   Unknown variable name = %s\n",
+			cgv_event->StateVarName);
+		cgv_event->ErrCode = 404;
+		strcpy(cgv_event->ErrStr, "Invalid Variable");
+	}
 
-    if( getvar_succeeded ) {
-        UpnpStateVarRequest_set_ErrCode(cgv_event, UPNP_E_SUCCESS);
-    } else {
-        SampleUtil_Print(
-            "Error in UPNP_CONTROL_GET_VAR_REQUEST callback:\n" 
-            "   Unknown variable name = %s\n",
-            UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(cgv_event)) );
-        UpnpStateVarRequest_set_ErrCode(cgv_event, 404);
-        UpnpStateVarRequest_strcpy_ErrStr(cgv_event, "Invalid Variable" );
-    }
+	ithread_mutex_unlock(&TVDevMutex);
 
-    ithread_mutex_unlock( &TVDevMutex );
-
-    return UpnpStateVarRequest_get_ErrCode(cgv_event) == UPNP_E_SUCCESS;
+	return cgv_event->ErrCode == UPNP_E_SUCCESS;
 }
 
 /******************************************************************************
@@ -504,86 +503,79 @@ TvDeviceHandleGetVarRequest( INOUT UpnpStateVarRequest *cgv_event )
  *   ca_event -- The control action request event structure
  *
  *****************************************************************************/
-int
-TvDeviceHandleActionRequest( INOUT UpnpActionRequest *ca_event )
+int TvDeviceHandleActionRequest(INOUT struct Upnp_Action_Request *ca_event)
 {
-    /*
-       Defaults if action not found 
-     */
-    int action_found = 0;
-    int i = 0;
-    int service = -1;
-    int retCode = 0;
-    char *errorString = NULL;
-    const char *devUDN = NULL;
-    const char *serviceID = NULL;
-    const char *actionName = NULL;
-    IXML_Document *actionResult = NULL;
+	/* Defaults if action not found. */
+	int action_found = 0;
+	int i = 0;
+	int service = -1;
+	int retCode = 0;
+	char *errorString = NULL;
+	const char *devUDN = NULL;
+	const char *serviceID = NULL;
+	const char *actionName = NULL;
 
-    UpnpActionRequest_set_ErrCode(ca_event, 0);
-    UpnpActionRequest_set_ActionResult(ca_event, NULL);
+	ca_event->ErrCode = 0;
+	ca_event->ActionResult = NULL;
 
-    devUDN     = UpnpString_get_String(UpnpActionRequest_get_DevUDN(    ca_event));
-    serviceID  = UpnpString_get_String(UpnpActionRequest_get_ServiceID( ca_event));
-    actionName = UpnpString_get_String(UpnpActionRequest_get_ActionName(ca_event));
-    if( ( strcmp( devUDN,    tv_service_table[TV_SERVICE_CONTROL].UDN ) == 0 ) &&
-        ( strcmp( serviceID, tv_service_table[TV_SERVICE_CONTROL].ServiceId ) == 0 ) ) {
-        /* Request for action in the TvDevice Control Service */
-        service = TV_SERVICE_CONTROL;
-    } else if( ( strcmp( devUDN,    tv_service_table[TV_SERVICE_PICTURE].UDN ) == 0 ) &&
-               ( strcmp( serviceID, tv_service_table[TV_SERVICE_PICTURE].ServiceId ) == 0 ) ) {
-        /* Request for action in the TvDevice Picture Service */
-        service = TV_SERVICE_PICTURE;
-    }
-    /* Find and call appropriate procedure based on action name
-     * Each action name has an associated procedure stored in the
-     * service table. These are set at initialization. */
-    for( i = 0; i < TV_MAXACTIONS && tv_service_table[service].ActionNames[i] != NULL; i++ ) {
-        if( !strcmp( actionName, tv_service_table[service].ActionNames[i] ) ) {
-            if( ( !strcmp( tv_service_table[TV_SERVICE_CONTROL].VariableStrVal[TV_CONTROL_POWER], "1" ) ) ||
-                ( !strcmp( actionName, "PowerOn" ) ) ) {
-                retCode = tv_service_table[service].actions[i](
-                    UpnpActionRequest_get_ActionRequest(ca_event),
-                    &actionResult,
-                    &errorString );
-		UpnpActionRequest_set_ActionResult(ca_event, actionResult);
-            } else {
-                errorString = "Power is Off";
-                retCode = UPNP_E_INTERNAL_ERROR;
-            }
-            action_found = 1;
-            break;
-        }
-    }
+	devUDN     = ca_event->DevUDN;
+	serviceID  = ca_event->ServiceID;
+	actionName = ca_event->ActionName;
+	if (strcmp(devUDN,    tv_service_table[TV_SERVICE_CONTROL].UDN) == 0 &&
+	    strcmp(serviceID, tv_service_table[TV_SERVICE_CONTROL].ServiceId) == 0) {
+		/* Request for action in the TvDevice Control Service. */
+		service = TV_SERVICE_CONTROL;
+	} else if (strcmp(devUDN,    tv_service_table[TV_SERVICE_PICTURE].UDN) == 0 &&
+		   strcmp(serviceID, tv_service_table[TV_SERVICE_PICTURE].ServiceId) == 0) {
+		/* Request for action in the TvDevice Picture Service. */
+		service = TV_SERVICE_PICTURE;
+	}
+	/* Find and call appropriate procedure based on action name.
+	 * Each action name has an associated procedure stored in the
+	 * service table. These are set at initialization. */
+	for (i = 0;
+	     i < TV_MAXACTIONS && tv_service_table[service].ActionNames[i] != NULL;
+	     i++) {
+		if (!strcmp(actionName, tv_service_table[service].ActionNames[i])) {
+			if (!strcmp(tv_service_table[TV_SERVICE_CONTROL].
+					VariableStrVal[TV_CONTROL_POWER], "1") ||
+			    !strcmp(actionName, "PowerOn")) {
+				retCode = tv_service_table[service].actions[i](
+					ca_event->ActionRequest,
+					&ca_event->ActionResult,
+					&errorString);
+			} else {
+				errorString = "Power is Off";
+				retCode = UPNP_E_INTERNAL_ERROR;
+			}
+			action_found = 1;
+			break;
+		}
+	}
 
-    if( !action_found ) {
-        UpnpActionRequest_set_ActionResult(ca_event, NULL);
-        UpnpActionRequest_strcpy_ErrStr(ca_event, "Invalid Action" );
-        UpnpActionRequest_set_ErrCode(ca_event, 401);
-    } else {
-        if( retCode == UPNP_E_SUCCESS ) {
-        	UpnpActionRequest_set_ErrCode(ca_event, UPNP_E_SUCCESS);
-        } else {
-            // copy the error string
-            UpnpActionRequest_strcpy_ErrStr(ca_event, errorString );
-            switch ( retCode ) {
-                case UPNP_E_INVALID_PARAM:
-                    {
-                        UpnpActionRequest_set_ErrCode(ca_event, 402);
-                        break;
-                    }
-                case UPNP_E_INTERNAL_ERROR:
-                default:
-                    {
-                        UpnpActionRequest_set_ErrCode(ca_event, 501);
-                        break;
-                    }
+	if (!action_found) {
+		ca_event->ActionResult = NULL;
+		strcpy(ca_event->ErrStr, "Invalid Action");
+		ca_event->ErrCode = 401;
+	} else {
+		if (retCode == UPNP_E_SUCCESS) {
+			ca_event->ErrCode = UPNP_E_SUCCESS;
+		} else {
+			// copy the error string
+			strcpy(ca_event->ErrStr, errorString);
+			switch (retCode) {
+			case UPNP_E_INVALID_PARAM:
+				ca_event->ErrCode = 402;
+				break;
+			case UPNP_E_INTERNAL_ERROR:
+			default:
+				ca_event->ErrCode = 501;
+				break;
+			}
+		}
+	}
 
-            }
-        }
-    }
-
-    return UpnpActionRequest_get_ErrCode(ca_event);
+	return ca_event->ErrCode;
 }
 
 /******************************************************************************
@@ -1759,43 +1751,43 @@ TvDeviceDecreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *****************************************************************************/
 int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-    switch ( EventType ) {
-        case UPNP_EVENT_SUBSCRIPTION_REQUEST:
-            TvDeviceHandleSubscriptionRequest((UpnpSubscriptionRequest *)Event);
-            break;
+	switch (EventType) {
+	case UPNP_EVENT_SUBSCRIPTION_REQUEST:
+		TvDeviceHandleSubscriptionRequest((struct Upnp_Subscription_Request *)Event);
+		break;
 
-        case UPNP_CONTROL_GET_VAR_REQUEST:
-            TvDeviceHandleGetVarRequest( (UpnpStateVarRequest *)Event );
-            break;
+	case UPNP_CONTROL_GET_VAR_REQUEST:
+		TvDeviceHandleGetVarRequest((struct Upnp_State_Var_Request *)Event);
+		break;
 
-        case UPNP_CONTROL_ACTION_REQUEST:
-            TvDeviceHandleActionRequest( (UpnpActionRequest *)Event );
-            break;
+	case UPNP_CONTROL_ACTION_REQUEST:
+		TvDeviceHandleActionRequest((struct Upnp_Action_Request *)Event);
+		break;
 
-            /*
-               ignore these cases, since this is not a control point 
-             */
-        case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
-        case UPNP_DISCOVERY_SEARCH_RESULT:
-        case UPNP_DISCOVERY_SEARCH_TIMEOUT:
-        case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
-        case UPNP_CONTROL_ACTION_COMPLETE:
-        case UPNP_CONTROL_GET_VAR_COMPLETE:
-        case UPNP_EVENT_RECEIVED:
-        case UPNP_EVENT_RENEWAL_COMPLETE:
-        case UPNP_EVENT_SUBSCRIBE_COMPLETE:
-        case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
-            break;
+	/*
+	ignore these cases, since this is not a control point 
+	*/
+	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
+	case UPNP_DISCOVERY_SEARCH_RESULT:
+	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
+	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
+	case UPNP_CONTROL_ACTION_COMPLETE:
+	case UPNP_CONTROL_GET_VAR_COMPLETE:
+	case UPNP_EVENT_RECEIVED:
+	case UPNP_EVENT_RENEWAL_COMPLETE:
+	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
+	case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
+		break;
 
-        default:
-            SampleUtil_Print( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
-                EventType );
-    }
+	default:
+		SampleUtil_Print("Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
+			EventType);
+	}
 
-    /* Print a summary of the event received */
-    SampleUtil_PrintEvent( EventType, Event );
+	/* Print a summary of the event received */
+	SampleUtil_PrintEvent(EventType, Event);
 
-    return 0;
+	return 0;
 }
 
 /******************************************************************************
@@ -1807,8 +1799,7 @@ int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Co
  * Parameters:
  *
  *****************************************************************************/
-int
-TvDeviceStop()
+int TvDeviceStop(void)
 {
     UpnpUnRegisterRootDevice( device_handle );
     UpnpFinish();
@@ -1856,7 +1847,8 @@ TvDeviceStart( char *ip_address,
     SampleUtil_Print(
         "Initializing UPnP Sdk with\n"
         "\tipaddress = %s port = %u\n",
-        ip_address, port );
+        ip_address ? ip_address : "{NULL}",
+	port);
 
     ret = UpnpInit( ip_address, port );
     if( ret != UPNP_E_SUCCESS ) {
@@ -1870,8 +1862,9 @@ TvDeviceStart( char *ip_address,
 
     SampleUtil_Print(
         "UPnP Initialized\n"
-	"\tipaddress= %s port = %u\n",
-        ip_address, port );
+        "\tipaddress = %s port = %u\n",
+        ip_address ? ip_address : "{NULL}",
+	port);
 
     if( desc_doc_name == NULL ) {
         desc_doc_name = "tvcombodesc.xml";

upnp/sample/tvcombo/upnp_tv_device.h

@@ -239,7 +239,7 @@ int TvDeviceStateTableInit(char*);
  *   sr_event -- The subscription request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleSubscriptionRequest(const UpnpSubscriptionRequest *);
+int TvDeviceHandleSubscriptionRequest(struct Upnp_Subscription_Request *);
 
 /******************************************************************************
  * TvDeviceHandleGetVarRequest
@@ -253,7 +253,7 @@ int TvDeviceHandleSubscriptionRequest(const UpnpSubscriptionRequest *);
  *   cgv_event -- The control get variable request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleGetVarRequest(UpnpStateVarRequest *);
+int TvDeviceHandleGetVarRequest(struct Upnp_State_Var_Request *);
 
 /******************************************************************************
  * TvDeviceHandleActionRequest
@@ -267,7 +267,7 @@ int TvDeviceHandleGetVarRequest(UpnpStateVarRequest *);
  *   ca_event -- The control action request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleActionRequest(UpnpActionRequest *);
+int TvDeviceHandleActionRequest(struct Upnp_Action_Request *);
 
 /******************************************************************************
  * TvDeviceCallbackEventHandler
@@ -623,7 +623,7 @@ int TvDeviceDecreaseBrightness(IN IXML_Document *in, OUT IXML_Document **out, OU
 
 int TvDeviceStart(char * ip_address, unsigned short port,char * desc_doc_name,
 				  char *web_dir_path, print_string pfun);
-int TvDeviceStop();
+int TvDeviceStop(void);
 
 #ifdef __cplusplus
 }

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c

@@ -143,8 +143,7 @@ TvCtrlPointDeleteNode( struct TvDeviceNode *node )
  *   UDN -- The Unique Device Name for the device to remove
  *
  ********************************************************************************/
-int
-TvCtrlPointRemoveDevice(const char *UDN)
+int TvCtrlPointRemoveDevice(const char *UDN)
 {
     struct TvDeviceNode *curdevnode;
     struct TvDeviceNode *prevdevnode;
@@ -943,25 +942,23 @@ TvStateUpdate( char *UDN,
  *
  ********************************************************************************/
 void TvCtrlPointHandleEvent(
-	const UpnpString *sid,
+	const char *sid,
 	int evntkey,
 	IXML_Document *changes)
 {
 	struct TvDeviceNode *tmpdevnode;
 	int service;
-	const char *aux_sid = NULL;
 
 	ithread_mutex_lock(&DeviceListMutex);
 
 	tmpdevnode = GlobalDeviceList;
 	while (tmpdevnode) {
 		for (service = 0; service < TV_SERVICE_SERVCOUNT; ++service) {
-			aux_sid = UpnpString_get_String(sid);
-			if (strcmp(tmpdevnode->device.TvService[service].SID, aux_sid) ==  0) {
+			if (strcmp(tmpdevnode->device.TvService[service].SID, sid) ==  0) {
 				SampleUtil_Print("Received Tv %s Event: %d for SID %s",
 					TvServiceName[service],
 					evntkey,
-					aux_sid);
+					sid);
 				TvStateUpdate(
 					tmpdevnode->device.UDN,
 					service,
@@ -1021,10 +1018,10 @@ void TvCtrlPointHandleSubscribeUpdate(
     ithread_mutex_unlock( &DeviceListMutex );
 }
 
-void
-TvCtrlPointHandleGetVar( const char *controlURL,
-                         const char *varName,
-                         const DOMString varValue )
+void TvCtrlPointHandleGetVar(
+	const char *controlURL,
+	const char *varName,
+	const DOMString varValue)
 {
 
     struct TvDeviceNode *tmpdevnode;
@@ -1035,9 +1032,9 @@ TvCtrlPointHandleGetVar( const char *controlURL,
     tmpdevnode = GlobalDeviceList;
     while (tmpdevnode) {
         for (service = 0; service < TV_SERVICE_SERVCOUNT; service++) {
-            if (strcmp(tmpdevnode->device.TvService[service].ControlURL, controlURL ) == 0 ) {
+            if (strcmp(tmpdevnode->device.TvService[service].ControlURL, controlURL) == 0) {
                 SampleUtil_StateUpdate(
-                    varName, varValue, tmpdevnode->device.UDN, GET_VAR_COMPLETE );
+			varName, varValue, tmpdevnode->device.UDN, GET_VAR_COMPLETE);
                 break;
             }
         }
@@ -1063,150 +1060,127 @@ TvCtrlPointHandleGetVar( const char *controlURL,
  ********************************************************************************/
 int TvCtrlPointCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-	int errCode = 0;
+	/*int errCode = 0;*/
 
 	SampleUtil_PrintEvent(EventType, Event);
 	switch ( EventType ) {
 	/* SSDP Stuff */
 	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
 	case UPNP_DISCOVERY_SEARCH_RESULT: {
-		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 		IXML_Document *DescDoc = NULL;
-		const char *location = NULL;
-		int errCode = UpnpDiscovery_get_ErrCode(d_event);
-		if (errCode != UPNP_E_SUCCESS) {
-			SampleUtil_Print(
-				"Error in Discovery Callback -- %d", errCode);
-		}
+		int ret;
 
-		location = UpnpString_get_String(UpnpDiscovery_get_Location(d_event));
-		errCode = UpnpDownloadXmlDoc(location, &DescDoc);
-		if (errCode != UPNP_E_SUCCESS) {
+		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",
-				location, errCode);
+				d_event->Location, ret);
 		} else {
 			TvCtrlPointAddDevice(
-				DescDoc, location, UpnpDiscovery_get_Expires(d_event));
+				DescDoc, d_event->Location, d_event->Expires);
 		}
-
-		if( DescDoc ) {
+		if (DescDoc) {
 			ixmlDocument_free(DescDoc);
 		}
-
 		TvCtrlPointPrintList();
 		break;
 	}
-
 	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
 		/* Nothing to do here... */
 		break;
-
 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
-		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
-		int errCode = UpnpDiscovery_get_ErrCode(d_event);
-		const char *deviceId = UpnpString_get_String(
-		UpnpDiscovery_get_DeviceID(d_event));
+		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
 
-		if (errCode != UPNP_E_SUCCESS) {
+		if (d_event->ErrCode != UPNP_E_SUCCESS) {
 			SampleUtil_Print(
-				"Error in Discovery ByeBye Callback -- %d", errCode);
+				"Error in Discovery ByeBye Callback -- %d", d_event->ErrCode);
 		}
-
-		SampleUtil_Print("Received ByeBye for Device: %s", deviceId);
-		TvCtrlPointRemoveDevice(deviceId);
-
+		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: {
-		UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
-		int errCode = UpnpActionComplete_get_ErrCode(a_event);
-		if (errCode != UPNP_E_SUCCESS) {
-			SampleUtil_Print(
-				"Error in  Action Complete Callback -- %d",
-				errCode);
-		}
+		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: {
-		UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
-		int errCode = UpnpStateVarComplete_get_ErrCode(sv_event);
-		if (errCode != UPNP_E_SUCCESS) {
+		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",
-				errCode );
+				"Error in Get Var Complete Callback -- %d", sv_event->ErrCode);
 		} else {
 			TvCtrlPointHandleGetVar(
-				UpnpString_get_String(UpnpStateVarComplete_get_CtrlUrl(sv_event)),
-				UpnpString_get_String(UpnpStateVarComplete_get_StateVarName(sv_event)),
-				UpnpStateVarComplete_get_CurrentVal(sv_event) );
+				sv_event->CtrlUrl,
+				sv_event->StateVarName,
+				sv_event->CurrentVal);
 		}
 		break;
 	}
-
 	/* GENA Stuff */
 	case UPNP_EVENT_RECEIVED: {
-		UpnpEvent *e_event = (UpnpEvent *)Event;
+		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+
 		TvCtrlPointHandleEvent(
-			UpnpEvent_get_SID(e_event),
-			UpnpEvent_get_EventKey(e_event),
-			UpnpEvent_get_ChangedVariables(e_event));
+			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: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
-		errCode = UpnpEventSubscribe_get_ErrCode(es_event);
-		if (errCode != UPNP_E_SUCCESS) {
+		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",
-				errCode);
+				"Error in Event Subscribe Callback -- %d", es_event->ErrCode);
 		} else {
 			TvCtrlPointHandleSubscribeUpdate(
-				UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
-				UpnpString_get_String(UpnpEventSubscribe_get_SID(es_event)),
-				UpnpEventSubscribe_get_TimeOut(es_event));
+				es_event->PublisherUrl,
+				es_event->Sid,
+				es_event->TimeOut);
 		}
-
 		break;
 	}
-
 	case UPNP_EVENT_AUTORENEWAL_FAILED:
 	case UPNP_EVENT_SUBSCRIPTION_EXPIRED: {
-		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+		struct Upnp_Event_Subscribe *es_event = (struct Upnp_Event_Subscribe *)Event;
 		int TimeOut = default_timeout;
 		Upnp_SID newSID;
+		int ret;
 
-		errCode = UpnpSubscribe(
+		ret = UpnpSubscribe(
 			ctrlpt_handle,
-			UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
+			es_event->PublisherUrl,
 			&TimeOut,
 			newSID);
-
-		if (errCode == UPNP_E_SUCCESS) {
+		if (ret == UPNP_E_SUCCESS) {
 			SampleUtil_Print("Subscribed to EventURL with SID=%s", newSID);
 			TvCtrlPointHandleSubscribeUpdate(
-				UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(es_event)),
+				es_event->PublisherUrl,
 				newSID,
 				TimeOut);
 		} else {
-			SampleUtil_Print("Error Subscribing to EventURL -- %d", errCode);
+			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:
@@ -1341,7 +1315,8 @@ int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionP
 	SampleUtil_Print(
 		"Initializing UPnP Sdk with\n"
 		"\tipaddress = %s port = %u\n",
-		ip_address, port);
+		ip_address ? ip_address : "{NULL}",
+		port);
 
 	rc = UpnpInit(ip_address, port);
 	if (rc != UPNP_E_SUCCESS) {
@@ -1358,8 +1333,9 @@ int TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionP
 
 	SampleUtil_Print(
 		"UPnP Initialized\n"
-		"\tipaddress= %s port = %u\n",
-		ip_address, port);
+		"\tipaddress = %s port = %u\n",
+		ip_address ? ip_address : "{NULL}",
+		port);
 
 	SampleUtil_Print("Registering Control Point");
 	rc = UpnpRegisterClient(TvCtrlPointCallbackEventHandler,

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h

@@ -44,6 +44,7 @@ extern "C" {
 
 #include "ithread.h"
 #include "upnp.h"
+#include "UpnpString.h"
 #include "upnptools.h"
 
 
@@ -120,11 +121,11 @@ extern ithread_mutex_t DeviceListMutex;
 
 extern UpnpClient_Handle ctrlpt_handle;
 
-void	TvCtrlPointPrintHelp();
-int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
+void	TvCtrlPointPrintHelp(void);
+int		TvCtrlPointDeleteNode(struct TvDeviceNode *);
 int		TvCtrlPointRemoveDevice(const char *);
-int		TvCtrlPointRemoveAll();
-int		TvCtrlPointRefresh();
+int		TvCtrlPointRemoveAll(void);
+int		TvCtrlPointRefresh(void);
 
 
 int		TvCtrlPointSendAction(int, int, char *, char **, char **, int);
@@ -148,20 +149,20 @@ int		TvCtrlPointGetContrast(int);
 int		TvCtrlPointGetBrightness(int);
 
 int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
-int		TvCtrlPointPrintList( void );
+int		TvCtrlPointPrintList(void);
 int		TvCtrlPointPrintDevice(int);
 void	TvCtrlPointAddDevice(IXML_Document *, const char *, int); 
 void    TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
 void	TvStateUpdate(char*,int, IXML_Document * , char **);
-void	TvCtrlPointHandleEvent(const UpnpString *, int, IXML_Document *); 
+void	TvCtrlPointHandleEvent(const char *, int, IXML_Document *); 
 void	TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); 
 int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
 void	TvCtrlPointVerifyTimeouts(int);
-void	TvCtrlPointPrintCommands( void );
-void*	TvCtrlPointCommandLoop( void* );
-int		TvCtrlPointStart( print_string printFunctionPtr, state_update updateFunctionPtr );
-int		TvCtrlPointStop( void );
-int		TvCtrlPointProcessCommand( char *cmdline );
+void	TvCtrlPointPrintCommands(void);
+void*	TvCtrlPointCommandLoop(void *);
+int		TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionPtr);
+int		TvCtrlPointStop(void);
+int		TvCtrlPointProcessCommand(char *cmdline);
 
 #ifdef __cplusplus
 };

upnp/sample/tvdevice/upnp_tv_device.c

@@ -373,23 +373,21 @@ TvDeviceStateTableInit( IN char *DescDocURL )
  *   sr_event -- The subscription request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleSubscriptionRequest(IN const UpnpSubscriptionRequest *sr_event)
+int TvDeviceHandleSubscriptionRequest(IN struct Upnp_Subscription_Request *sr_event)
 {
 	unsigned int i = 0;
-	//unsigned int j = 0;
 	int cmp1 = 0;
 	int cmp2 = 0;
 	const char *l_serviceId = NULL;
 	const char *l_udn = NULL;
 	const char *l_sid = NULL;
-	// IXML_Document *PropSet = NULL;
 
 	// lock state mutex
-	ithread_mutex_lock( &TVDevMutex );
+	ithread_mutex_lock(&TVDevMutex);
 
-	l_serviceId = UpnpString_get_String(UpnpSubscriptionRequest_get_ServiceId(sr_event));
-	l_udn = UpnpString_get_String(UpnpSubscriptionRequest_get_UDN(sr_event));
-	l_sid = UpnpString_get_String(UpnpSubscriptionRequest_get_SID(sr_event));
+	l_serviceId = sr_event->ServiceId;
+	l_udn = sr_event->UDN;
+	l_sid = sr_event->Sid;
 	for (i = 0; i < TV_SERVICE_SERVCOUNT; ++i) {
 		cmp1 = strcmp(l_udn, tv_service_table[i].UDN);
 		cmp2 = strcmp(l_serviceId, tv_service_table[i].ServiceId);
@@ -429,7 +427,7 @@ int TvDeviceHandleSubscriptionRequest(IN const UpnpSubscriptionRequest *sr_event
 		}
 	}
 
-	ithread_mutex_unlock( &TVDevMutex );
+	ithread_mutex_unlock(&TVDevMutex);
 
 	return 1;
 }
@@ -447,53 +445,52 @@ int TvDeviceHandleSubscriptionRequest(IN const UpnpSubscriptionRequest *sr_event
  *   cgv_event -- The control get variable request event structure
  *
  *****************************************************************************/
-int
-TvDeviceHandleGetVarRequest( INOUT UpnpStateVarRequest *cgv_event )
+int TvDeviceHandleGetVarRequest(INOUT struct Upnp_State_Var_Request *cgv_event)
 {
-    unsigned int i = 0;
-    unsigned int j = 0;
-    int getvar_succeeded = 0;
+	unsigned int i = 0;
+	unsigned int j = 0;
+	int getvar_succeeded = 0;
 
-    UpnpStateVarRequest_set_CurrentVal(cgv_event, NULL);
+	cgv_event->CurrentVal = NULL;
 
-    ithread_mutex_lock( &TVDevMutex );
+	ithread_mutex_lock(&TVDevMutex);
 
-    for( i = 0; i < TV_SERVICE_SERVCOUNT; i++ ) {
-        // check udn and service id
-        const char *devUDN =
-            UpnpString_get_String(UpnpStateVarRequest_get_DevUDN(cgv_event));
-        const char *serviceID =
-            UpnpString_get_String(UpnpStateVarRequest_get_ServiceID(cgv_event));
-        if( ( strcmp( devUDN,    tv_service_table[i].UDN )       == 0 ) &&
-            ( strcmp( serviceID, tv_service_table[i].ServiceId ) == 0 ) ) {
-            // check variable name
-            for( j = 0; j < tv_service_table[i].VariableCount; j++ ) {
-                const char *stateVarName =
-                    UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(cgv_event));
-                if( strcmp( stateVarName, tv_service_table[i].VariableName[j] ) == 0 ) {
-                    getvar_succeeded = 1;
-                    UpnpStateVarRequest_set_CurrentVal(cgv_event,
-                        tv_service_table[i].VariableStrVal[j] );
-                    break;
-                }
-            }
-        }
-    }
+	for (i = 0; i < TV_SERVICE_SERVCOUNT; i++) {
+		// check udn and service id
+		const char *devUDN =
+			cgv_event->DevUDN;
+		const char *serviceID =
+			cgv_event->ServiceID;
+		if (strcmp(devUDN, tv_service_table[i].UDN) == 0 &&
+		    strcmp(serviceID, tv_service_table[i].ServiceId) == 0) {
+			// check variable name
+			for (j = 0; j < tv_service_table[i].VariableCount; j++) {
+				const char *stateVarName =
+					cgv_event->StateVarName;
+				if (strcmp(stateVarName,
+					   tv_service_table[i].VariableName[j]) == 0) {
+					getvar_succeeded = 1;
+					cgv_event->CurrentVal = ixmlCloneDOMString(
+						tv_service_table[i].VariableStrVal[j]);
+					break;
+				}
+			}
+		}
+	}
+	if (getvar_succeeded) {
+		cgv_event->ErrCode = UPNP_E_SUCCESS;
+	} else {
+		SampleUtil_Print(
+			"Error in UPNP_CONTROL_GET_VAR_REQUEST callback:\n"
+			"   Unknown variable name = %s\n",
+			cgv_event->StateVarName);
+		cgv_event->ErrCode = 404;
+		strcpy(cgv_event->ErrStr, "Invalid Variable");
+	}
 
-    if( getvar_succeeded ) {
-        UpnpStateVarRequest_set_ErrCode(cgv_event, UPNP_E_SUCCESS);
-    } else {
-        SampleUtil_Print(
-            "Error in UPNP_CONTROL_GET_VAR_REQUEST callback:\n" 
-            "   Unknown variable name = %s\n",
-            UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(cgv_event)) );
-        UpnpStateVarRequest_set_ErrCode(cgv_event, 404);
-        UpnpStateVarRequest_strcpy_ErrStr(cgv_event, "Invalid Variable" );
-    }
+	ithread_mutex_unlock(&TVDevMutex);
 
-    ithread_mutex_unlock( &TVDevMutex );
-
-    return UpnpStateVarRequest_get_ErrCode(cgv_event) == UPNP_E_SUCCESS;
+	return cgv_event->ErrCode == UPNP_E_SUCCESS;
 }
 
 /******************************************************************************
@@ -508,86 +505,79 @@ TvDeviceHandleGetVarRequest( INOUT UpnpStateVarRequest *cgv_event )
  *   ca_event -- The control action request event structure
  *
  *****************************************************************************/
-int
-TvDeviceHandleActionRequest( INOUT UpnpActionRequest *ca_event )
+int TvDeviceHandleActionRequest(INOUT struct Upnp_Action_Request *ca_event)
 {
-    /*
-       Defaults if action not found 
-     */
-    int action_found = 0;
-    int i = 0;
-    int service = -1;
-    int retCode = 0;
-    char *errorString = NULL;
-    const char *devUDN = NULL;
-    const char *serviceID = NULL;
-    const char *actionName = NULL;
-    IXML_Document *actionResult = NULL;
+	/* Defaults if action not found. */
+	int action_found = 0;
+	int i = 0;
+	int service = -1;
+	int retCode = 0;
+	char *errorString = NULL;
+	const char *devUDN = NULL;
+	const char *serviceID = NULL;
+	const char *actionName = NULL;
 
-    UpnpActionRequest_set_ErrCode(ca_event, 0);
-    UpnpActionRequest_set_ActionResult(ca_event, NULL);
+	ca_event->ErrCode = 0;
+	ca_event->ActionResult = NULL;
 
-    devUDN     = UpnpString_get_String(UpnpActionRequest_get_DevUDN(    ca_event));
-    serviceID  = UpnpString_get_String(UpnpActionRequest_get_ServiceID( ca_event));
-    actionName = UpnpString_get_String(UpnpActionRequest_get_ActionName(ca_event));
-    if( ( strcmp( devUDN,    tv_service_table[TV_SERVICE_CONTROL].UDN ) == 0 ) &&
-        ( strcmp( serviceID, tv_service_table[TV_SERVICE_CONTROL].ServiceId ) == 0 ) ) {
-        /* Request for action in the TvDevice Control Service */
-        service = TV_SERVICE_CONTROL;
-    } else if( ( strcmp( devUDN,    tv_service_table[TV_SERVICE_PICTURE].UDN ) == 0 ) &&
-               ( strcmp( serviceID, tv_service_table[TV_SERVICE_PICTURE].ServiceId ) == 0 ) ) {
-        /* Request for action in the TvDevice Picture Service */
-        service = TV_SERVICE_PICTURE;
-    }
-    /* Find and call appropriate procedure based on action name
-     * Each action name has an associated procedure stored in the
-     * service table. These are set at initialization. */
-    for( i = 0; i < TV_MAXACTIONS && tv_service_table[service].ActionNames[i] != NULL; i++ ) {
-        if( !strcmp( actionName, tv_service_table[service].ActionNames[i] ) ) {
-            if( ( !strcmp( tv_service_table[TV_SERVICE_CONTROL].VariableStrVal[TV_CONTROL_POWER], "1" ) ) ||
-                ( !strcmp( actionName, "PowerOn" ) ) ) {
-                retCode = tv_service_table[service].actions[i](
-                    UpnpActionRequest_get_ActionRequest(ca_event),
-                    &actionResult,
-                    &errorString );
-		UpnpActionRequest_set_ActionResult(ca_event, actionResult);
-            } else {
-                errorString = "Power is Off";
-                retCode = UPNP_E_INTERNAL_ERROR;
-            }
-            action_found = 1;
-            break;
-        }
-    }
+	devUDN     = ca_event->DevUDN;
+	serviceID  = ca_event->ServiceID;
+	actionName = ca_event->ActionName;
+	if (strcmp(devUDN,    tv_service_table[TV_SERVICE_CONTROL].UDN) == 0 &&
+	    strcmp(serviceID, tv_service_table[TV_SERVICE_CONTROL].ServiceId) == 0) {
+		/* Request for action in the TvDevice Control Service. */
+		service = TV_SERVICE_CONTROL;
+	} else if (strcmp(devUDN,    tv_service_table[TV_SERVICE_PICTURE].UDN) == 0 &&
+		   strcmp(serviceID, tv_service_table[TV_SERVICE_PICTURE].ServiceId) == 0) {
+		/* Request for action in the TvDevice Picture Service. */
+		service = TV_SERVICE_PICTURE;
+	}
+	/* Find and call appropriate procedure based on action name.
+	 * Each action name has an associated procedure stored in the
+	 * service table. These are set at initialization. */
+	for (i = 0;
+	     i < TV_MAXACTIONS && tv_service_table[service].ActionNames[i] != NULL;
+	     i++) {
+		if (!strcmp(actionName, tv_service_table[service].ActionNames[i])) {
+			if (!strcmp(tv_service_table[TV_SERVICE_CONTROL].
+					VariableStrVal[TV_CONTROL_POWER], "1") ||
+			    !strcmp(actionName, "PowerOn")) {
+				retCode = tv_service_table[service].actions[i](
+					ca_event->ActionRequest,
+					&ca_event->ActionResult,
+					&errorString);
+			} else {
+				errorString = "Power is Off";
+				retCode = UPNP_E_INTERNAL_ERROR;
+			}
+			action_found = 1;
+			break;
+		}
+	}
 
-    if( !action_found ) {
-        UpnpActionRequest_set_ActionResult(ca_event, NULL);
-        UpnpActionRequest_strcpy_ErrStr(ca_event, "Invalid Action" );
-        UpnpActionRequest_set_ErrCode(ca_event, 401);
-    } else {
-        if( retCode == UPNP_E_SUCCESS ) {
-        	UpnpActionRequest_set_ErrCode(ca_event, UPNP_E_SUCCESS);
-        } else {
-            // copy the error string
-            UpnpActionRequest_strcpy_ErrStr(ca_event, errorString );
-            switch ( retCode ) {
-                case UPNP_E_INVALID_PARAM:
-                    {
-                        UpnpActionRequest_set_ErrCode(ca_event, 402);
-                        break;
-                    }
-                case UPNP_E_INTERNAL_ERROR:
-                default:
-                    {
-                        UpnpActionRequest_set_ErrCode(ca_event, 501);
-                        break;
-                    }
+	if (!action_found) {
+		ca_event->ActionResult = NULL;
+		strcpy(ca_event->ErrStr, "Invalid Action");
+		ca_event->ErrCode = 401;
+	} else {
+		if (retCode == UPNP_E_SUCCESS) {
+			ca_event->ErrCode = UPNP_E_SUCCESS;
+		} else {
+			// copy the error string
+			strcpy(ca_event->ErrStr, errorString);
+			switch (retCode) {
+			case UPNP_E_INVALID_PARAM:
+				ca_event->ErrCode = 402;
+				break;
+			case UPNP_E_INTERNAL_ERROR:
+			default:
+				ca_event->ErrCode = 501;
+				break;
+			}
+		}
+	}
 
-            }
-        }
-    }
-
-    return UpnpActionRequest_get_ErrCode(ca_event);
+	return ca_event->ErrCode;
 }
 
 /******************************************************************************
@@ -1763,43 +1753,43 @@ TvDeviceDecreaseBrightness( IN IXML_Document *in, OUT IXML_Document **out, OUT c
  *****************************************************************************/
 int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Cookie)
 {
-    switch ( EventType ) {
-        case UPNP_EVENT_SUBSCRIPTION_REQUEST:
-            TvDeviceHandleSubscriptionRequest((UpnpSubscriptionRequest *)Event);
-            break;
+	switch (EventType) {
+	case UPNP_EVENT_SUBSCRIPTION_REQUEST:
+		TvDeviceHandleSubscriptionRequest((struct Upnp_Subscription_Request *)Event);
+		break;
 
-        case UPNP_CONTROL_GET_VAR_REQUEST:
-            TvDeviceHandleGetVarRequest( (UpnpStateVarRequest *)Event );
-            break;
+	case UPNP_CONTROL_GET_VAR_REQUEST:
+		TvDeviceHandleGetVarRequest((struct Upnp_State_Var_Request *)Event);
+		break;
 
-        case UPNP_CONTROL_ACTION_REQUEST:
-            TvDeviceHandleActionRequest( (UpnpActionRequest *)Event );
-            break;
+	case UPNP_CONTROL_ACTION_REQUEST:
+		TvDeviceHandleActionRequest((struct Upnp_Action_Request *)Event);
+		break;
 
-            /*
-               ignore these cases, since this is not a control point 
-             */
-        case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
-        case UPNP_DISCOVERY_SEARCH_RESULT:
-        case UPNP_DISCOVERY_SEARCH_TIMEOUT:
-        case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
-        case UPNP_CONTROL_ACTION_COMPLETE:
-        case UPNP_CONTROL_GET_VAR_COMPLETE:
-        case UPNP_EVENT_RECEIVED:
-        case UPNP_EVENT_RENEWAL_COMPLETE:
-        case UPNP_EVENT_SUBSCRIBE_COMPLETE:
-        case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
-            break;
+	/*
+	ignore these cases, since this is not a control point 
+	*/
+	case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
+	case UPNP_DISCOVERY_SEARCH_RESULT:
+	case UPNP_DISCOVERY_SEARCH_TIMEOUT:
+	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
+	case UPNP_CONTROL_ACTION_COMPLETE:
+	case UPNP_CONTROL_GET_VAR_COMPLETE:
+	case UPNP_EVENT_RECEIVED:
+	case UPNP_EVENT_RENEWAL_COMPLETE:
+	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
+	case UPNP_EVENT_UNSUBSCRIBE_COMPLETE:
+		break;
 
-        default:
-            SampleUtil_Print( "Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
-                EventType );
-    }
+	default:
+		SampleUtil_Print("Error in TvDeviceCallbackEventHandler: unknown event type %d\n",
+			EventType);
+	}
 
-    /* Print a summary of the event received */
-    SampleUtil_PrintEvent( EventType, Event );
+	/* Print a summary of the event received */
+	SampleUtil_PrintEvent(EventType, Event);
 
-    return 0;
+	return 0;
 }
 
 /******************************************************************************
@@ -1811,8 +1801,7 @@ int TvDeviceCallbackEventHandler(Upnp_EventType EventType, void *Event, void *Co
  * Parameters:
  *
  *****************************************************************************/
-int
-TvDeviceStop(void)
+int TvDeviceStop(void)
 {
     UpnpUnRegisterRootDevice( device_handle );
     UpnpFinish();
@@ -1860,7 +1849,8 @@ TvDeviceStart( char *ip_address,
     SampleUtil_Print(
         "Initializing UPnP Sdk with\n"
         "\tipaddress = %s port = %u\n",
-        ip_address, port );
+        ip_address ? ip_address : "{NULL}",
+	port);
 
     ret = UpnpInit( ip_address, port );
     if( ret != UPNP_E_SUCCESS ) {
@@ -1874,8 +1864,9 @@ TvDeviceStart( char *ip_address,
 
     SampleUtil_Print(
         "UPnP Initialized\n"
-	"\tipaddress= %s port = %u\n",
-        ip_address, port );
+        "\tipaddress = %s port = %u\n",
+        ip_address ? ip_address : "{NULL}",
+	port);
 
     if( desc_doc_name == NULL ) {
         desc_doc_name = "tvdevicedesc.xml";

upnp/sample/tvdevice/upnp_tv_device.h

@@ -239,7 +239,7 @@ int TvDeviceStateTableInit(char*);
  *   sr_event -- The subscription request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleSubscriptionRequest(const UpnpSubscriptionRequest *);
+int TvDeviceHandleSubscriptionRequest(struct Upnp_Subscription_Request *);
 
 /******************************************************************************
  * TvDeviceHandleGetVarRequest
@@ -253,7 +253,7 @@ int TvDeviceHandleSubscriptionRequest(const UpnpSubscriptionRequest *);
  *   cgv_event -- The control get variable request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleGetVarRequest(UpnpStateVarRequest *);
+int TvDeviceHandleGetVarRequest(struct Upnp_State_Var_Request *);
 
 /******************************************************************************
  * TvDeviceHandleActionRequest
@@ -267,7 +267,7 @@ int TvDeviceHandleGetVarRequest(UpnpStateVarRequest *);
  *   ca_event -- The control action request event structure
  *
  *****************************************************************************/
-int TvDeviceHandleActionRequest(UpnpActionRequest *);
+int TvDeviceHandleActionRequest(struct Upnp_Action_Request *);
 
 /******************************************************************************
  * TvDeviceCallbackEventHandler

upnp/src/api/ActionComplete.c

@@ -1,157 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpActionComplete object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "ActionComplete.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for strlen(), strdup() */
-
-
-/*!
- * \brief Internal implementation of the UpnpActionComplete object.
- */
-struct SUpnpActionComplete
-{
-	/*! The result of the operation */
-	int m_errCode;
-	/*! The control URL for service. */
-	UpnpString *m_ctrlUrl;
-	/*! The DOM document describing the action. */
-	IXML_Document *m_actionRequest;
-	/*! The DOM document describing the result of the action */
-	IXML_Document *m_actionResult;
-};
-
-
-UpnpActionComplete *UpnpActionComplete_new()
-{
-	struct SUpnpActionComplete *p = calloc(1, sizeof (struct SUpnpActionComplete));
-
-#if 0
-	p->m_errCode = 0;
-#endif
-	p->m_ctrlUrl = UpnpString_new();
-#if 0
-	p->m_actionRequest = NULL;
-	p->m_actionResult = NULL;
-#endif
-
-	return (UpnpActionComplete *)p;
-}
-
-
-void UpnpActionComplete_delete(UpnpActionComplete *p)
-{
-	struct SUpnpActionComplete *q = (struct SUpnpActionComplete *)p;
-
-	if (!q) return;
-
-	q->m_errCode = 0;
-
-	UpnpString_delete(q->m_ctrlUrl);
-	q->m_ctrlUrl = NULL;
-	
-	UpnpActionComplete_set_ActionRequest(p, NULL);
-
-	UpnpActionComplete_set_ActionResult(p, NULL);
-
-	free(p);
-}
-
-
-UpnpActionComplete *UpnpActionComplete_dup(const UpnpActionComplete *p)
-{
-	UpnpActionComplete *q = UpnpActionComplete_new();
-	
-	UpnpActionComplete_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpActionComplete_assign(UpnpActionComplete *p, const UpnpActionComplete *q)
-{
-	if (p != q) {
-		UpnpActionComplete_set_ErrCode(p, UpnpActionComplete_get_ErrCode(q));
-		UpnpActionComplete_set_CtrlUrl(p, UpnpActionComplete_get_CtrlUrl(q));
-		UpnpActionComplete_set_ActionRequest(p, UpnpActionComplete_get_ActionRequest(q));
-		UpnpActionComplete_set_ActionResult(p, UpnpActionComplete_get_ActionResult(q));
-	}
-}
-
-
-int UpnpActionComplete_get_ErrCode(const UpnpActionComplete *p)
-{
-	return ((struct SUpnpActionComplete *)p)->m_errCode;
-}
-
-
-void UpnpActionComplete_set_ErrCode(UpnpActionComplete *p, int n)
-{
-	((struct SUpnpActionComplete *)p)->m_errCode = n;
-}
-
-
-const UpnpString *UpnpActionComplete_get_CtrlUrl(const UpnpActionComplete *p)
-{
-	return ((struct SUpnpActionComplete *)p)->m_ctrlUrl;
-}
-
-const char *UpnpActionComplete_get_CtrlUrl_cstr(const UpnpActionComplete *p)
-{
-	return UpnpString_get_String(UpnpActionComplete_get_CtrlUrl(p));
-}
-
-
-void UpnpActionComplete_set_CtrlUrl(UpnpActionComplete *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpActionComplete *)p)->m_ctrlUrl);
-	((struct SUpnpActionComplete *)p)->m_ctrlUrl = UpnpString_dup(s);
-}
-
-
-void UpnpActionComplete_strcpy_CtrlUrl(UpnpActionComplete *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpActionComplete *)p)->m_ctrlUrl);
-	((struct SUpnpActionComplete *)p)->m_ctrlUrl = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpActionComplete *)p)->m_ctrlUrl, s);
-}
-
-
-IXML_Document *UpnpActionComplete_get_ActionRequest(const UpnpActionComplete *p)
-{
-	return ((struct SUpnpActionComplete *)p)->m_actionRequest;
-}
-
-
-void UpnpActionComplete_set_ActionRequest(UpnpActionComplete *p, IXML_Document *d)
-{
-	ixmlDocument_free(((struct SUpnpActionComplete *)p)->m_actionRequest);
-	((struct SUpnpActionComplete *)p)->m_actionRequest = d;
-}
-
-
-IXML_Document *UpnpActionComplete_get_ActionResult(const UpnpActionComplete *p)
-{
-	return ((struct SUpnpActionComplete *)p)->m_actionResult;
-}
-
-
-void UpnpActionComplete_set_ActionResult(UpnpActionComplete *p, IXML_Document *d)
-{
-	ixmlDocument_free(((struct SUpnpActionComplete *)p)->m_actionResult);
-	((struct SUpnpActionComplete *)p)->m_actionResult = d;
-}
-

upnp/src/api/ActionRequest.c

@@ -1,283 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpActionRequest object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "ActionRequest.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for memset(), strlen(), strdup() */
-
-
-struct SUpnpActionRequest
-{
-	int m_errCode;
-	int m_socket;
-	UpnpString *m_errStr;
-	UpnpString *m_actionName;
-	UpnpString *m_devUDN;
-	UpnpString *m_serviceID;
-	IXML_Document *m_actionRequest;
-	IXML_Document *m_actionResult;
-	IXML_Document *m_soapHeader;
-	/* Variables should be declared with struct sockaddr_storage,
-	 * but users must only see a struct sockaddr pointer */
-	struct sockaddr_storage m_ctrlPtIPAddr;
-};
-
-
-UpnpActionRequest *UpnpActionRequest_new()
-{
-	struct SUpnpActionRequest *p = calloc(1, sizeof (struct SUpnpActionRequest));
-
-#if 0
-	p->m_errCode = 0;
-	p->m_socket = 0;
-#endif
-	p->m_errStr = UpnpString_new();
-	p->m_actionName = UpnpString_new();
-	p->m_devUDN = UpnpString_new();
-	p->m_serviceID = UpnpString_new();
-#if 0
-	p->m_actionRequest = NULL;
-	p->m_actionResult = NULL;
-	p->m_soapHeader = NULL;
-	memset(&p->m_ctrlPtIPAddr, 0, sizeof (struct sockaddr_storage));
-#endif
-	return (UpnpActionRequest *)p;
-}
-
-
-void UpnpActionRequest_delete(UpnpActionRequest *p)
-{
-	struct SUpnpActionRequest *q = (struct SUpnpActionRequest *)p;
-
-	if (!q) return;
-
-	q->m_errCode = 0;
-
-	q->m_socket = 0;
-
-	UpnpString_delete(q->m_errStr);
-	q->m_errStr = NULL;
-
-	UpnpString_delete(q->m_actionName);
-	q->m_actionName = NULL;
-
-	UpnpString_delete(q->m_devUDN);
-	q->m_devUDN = NULL;
-
-	UpnpString_delete(q->m_serviceID);
-	q->m_serviceID = NULL;
-
-	UpnpActionRequest_set_ActionRequest(p, NULL);
-
-	UpnpActionRequest_set_ActionResult(p, NULL);
-
-	UpnpActionRequest_set_SoapHeader(p, NULL);
-
-	memset(&q->m_ctrlPtIPAddr, 0, sizeof (struct sockaddr_storage));
-
-	free(p);
-}
-
-
-UpnpActionRequest *UpnpActionRequest_dup(const UpnpActionRequest *p)
-{
-	UpnpActionRequest *q = UpnpActionRequest_new();
-	
-	UpnpActionRequest_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpActionRequest_assign(UpnpActionRequest *p, const UpnpActionRequest *q)
-{
-	if (p != q) {
-		UpnpActionRequest_set_ErrCode(p, UpnpActionRequest_get_ErrCode(q));
-		UpnpActionRequest_set_Socket(p, UpnpActionRequest_get_Socket(q));
-		UpnpActionRequest_set_ErrStr(p, UpnpActionRequest_get_ErrStr(q));
-		UpnpActionRequest_set_ActionName(p, UpnpActionRequest_get_ActionName(q));
-		UpnpActionRequest_set_DevUDN(p, UpnpActionRequest_get_DevUDN(q));
-		UpnpActionRequest_set_ServiceID(p, UpnpActionRequest_get_ServiceID(q));
-		UpnpActionRequest_set_ActionRequest(p, UpnpActionRequest_get_ActionRequest(q));
-		UpnpActionRequest_set_ActionResult(p, UpnpActionRequest_get_ActionResult(q));
-		UpnpActionRequest_set_CtrlPtIPAddr(p, UpnpActionRequest_get_CtrlPtIPAddr(q));
-		UpnpActionRequest_set_SoapHeader(p, UpnpActionRequest_get_SoapHeader(q));
-	}
-}
-
-
-int UpnpActionRequest_get_ErrCode(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_errCode;
-}
-
-
-void UpnpActionRequest_set_ErrCode(UpnpActionRequest *p, int n)
-{
-	((struct SUpnpActionRequest *)p)->m_errCode = n;
-}
-
-
-int UpnpActionRequest_get_Socket(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_socket;
-}
-
-
-void UpnpActionRequest_set_Socket(UpnpActionRequest *p, int n)
-{
-	((struct SUpnpActionRequest *)p)->m_socket = n;
-}
-
-
-const UpnpString *UpnpActionRequest_get_ErrStr(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_errStr;
-}
-
-const char *UpnpActionRequest_get_ErrStr_cstr(const UpnpActionRequest *p)
-{
-	return UpnpString_get_String(UpnpActionRequest_get_ErrStr(p));
-}
-
-
-void UpnpActionRequest_set_ErrStr(UpnpActionRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpActionRequest *)p)->m_errStr);
-	((struct SUpnpActionRequest *)p)->m_errStr = UpnpString_dup(s);
-}
-
-
-void UpnpActionRequest_strcpy_ErrStr(UpnpActionRequest *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpActionRequest *)p)->m_errStr);
-	((struct SUpnpActionRequest *)p)->m_errStr = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpActionRequest *)p)->m_errStr, s);
-}
-
-
-const UpnpString *UpnpActionRequest_get_ActionName(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_actionName;
-}
-
-const char *UpnpActionRequest_get_ActionName_cstr(const UpnpActionRequest *p)
-{
-	return UpnpString_get_String(UpnpActionRequest_get_ActionName(p));
-}
-
-
-void UpnpActionRequest_set_ActionName(UpnpActionRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpActionRequest *)p)->m_actionName);
-	((struct SUpnpActionRequest *)p)->m_actionName = UpnpString_dup(s);
-}
-
-
-void UpnpActionRequest_strcpy_ActionName(UpnpActionRequest *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpActionRequest *)p)->m_actionName);
-	((struct SUpnpActionRequest *)p)->m_actionName = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpActionRequest *)p)->m_actionName, s);
-}
-
-
-const UpnpString *UpnpActionRequest_get_DevUDN(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_devUDN;
-}
-
-const char *UpnpActionRequest_get_DevUDN_cstr(const UpnpActionRequest *p)
-{
-	return UpnpString_get_String(UpnpActionRequest_get_DevUDN(p));
-}
-
-
-void UpnpActionRequest_set_DevUDN(UpnpActionRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpActionRequest *)p)->m_devUDN);
-	((struct SUpnpActionRequest *)p)->m_devUDN = UpnpString_dup(s);
-}
-
-
-const UpnpString *UpnpActionRequest_get_ServiceID(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_serviceID;
-}
-
-const char *UpnpActionRequest_get_ServiceID_cstr(const UpnpActionRequest *p)
-{
-	return UpnpString_get_String(UpnpActionRequest_get_ServiceID(p));
-}
-
-
-void UpnpActionRequest_set_ServiceID(UpnpActionRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpActionRequest *)p)->m_serviceID);
-	((struct SUpnpActionRequest *)p)->m_serviceID = UpnpString_dup(s);
-}
-
-
-IXML_Document *UpnpActionRequest_get_ActionRequest(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_actionRequest;
-}
-
-
-void UpnpActionRequest_set_ActionRequest(UpnpActionRequest *p, IXML_Document *d)
-{
-	ixmlDocument_free(((struct SUpnpActionRequest *)p)->m_actionRequest);
-	((struct SUpnpActionRequest *)p)->m_actionRequest = d;
-}
-
-
-IXML_Document *UpnpActionRequest_get_ActionResult(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_actionResult;
-}
-
-
-void UpnpActionRequest_set_ActionResult(UpnpActionRequest *p, IXML_Document *d)
-{
-	ixmlDocument_free(((struct SUpnpActionRequest *)p)->m_actionResult);
-	((struct SUpnpActionRequest *)p)->m_actionResult = d;
-}
-
-
-const struct sockaddr *UpnpActionRequest_get_CtrlPtIPAddr(const UpnpActionRequest *p)
-{
-	return (struct sockaddr *)&((struct SUpnpActionRequest *)p)->m_ctrlPtIPAddr;
-}
-
-
-void UpnpActionRequest_set_CtrlPtIPAddr(UpnpActionRequest *p, const struct sockaddr *ia)
-{
-	((struct SUpnpActionRequest *)p)->m_ctrlPtIPAddr = *(struct sockaddr_storage *)ia;
-}
-
-
-IXML_Document *UpnpActionRequest_get_SoapHeader(const UpnpActionRequest *p)
-{
-	return ((struct SUpnpActionRequest *)p)->m_soapHeader;
-}
-
-
-void UpnpActionRequest_set_SoapHeader(UpnpActionRequest *p, IXML_Document *d)
-{
-	ixmlDocument_free(((struct SUpnpActionRequest *)p)->m_soapHeader);
-	((struct SUpnpActionRequest *)p)->m_soapHeader = d;
-}
-

upnp/src/api/Discovery.c

@@ -1,396 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpDiscovery object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "Discovery.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for memset() */
-
-
-struct SUpnpDiscovery
-{
-	int m_errCode;
-	int m_expires;
-	UpnpString *m_deviceID;
-	UpnpString *m_deviceType;
-	UpnpString *m_serviceType;
-	UpnpString *m_serviceVer;
-	UpnpString *m_location;
-	UpnpString *m_os;
-	UpnpString *m_date;
-	UpnpString *m_ext;
-	/* Variables should be declared with struct sockaddr_storage,
-	 * but users must only see a struct sockaddr pointer */
-	struct sockaddr_storage m_destAddr;
-};
-
-
-UpnpDiscovery *UpnpDiscovery_new()
-{
-	struct SUpnpDiscovery *p = calloc(1, sizeof (struct SUpnpDiscovery));
-
-#if 0
-	p->errCode = 0;
-	p->m_expires = 0;
-#endif
-	p->m_deviceID = UpnpString_new();
-	p->m_deviceType = UpnpString_new();
-	p->m_serviceType = UpnpString_new();
-	p->m_serviceVer = UpnpString_new();
-	p->m_location = UpnpString_new();
-	p->m_os = UpnpString_new();
-	p->m_date = UpnpString_new();
-	p->m_ext = UpnpString_new();
-	memset(&p->m_destAddr, 0, sizeof(struct sockaddr_storage));
-
-	return (UpnpDiscovery *)p;
-}
-
-
-void UpnpDiscovery_delete(UpnpDiscovery *p)
-{
-	struct SUpnpDiscovery *q = (struct SUpnpDiscovery *)p;
-
-	if (!q) return;
-
-	q->m_errCode = 0;
-
-	q->m_expires = 0;
-
-	UpnpString_delete(q->m_deviceID);
-	q->m_deviceID = NULL;
-
-	UpnpString_delete(q->m_deviceType);
-	q->m_deviceType = NULL;
-
-	UpnpString_delete(q->m_serviceType);
-	q->m_serviceType = NULL;
-
-	UpnpString_delete(q->m_serviceVer);
-	q->m_serviceVer = NULL;
-
-	UpnpString_delete(q->m_location);
-	q->m_location = NULL;
-
-	UpnpString_delete(q->m_os);
-	q->m_os = NULL;
-
-	UpnpString_delete(q->m_date);
-	q->m_date = NULL;
-
-	UpnpString_delete(q->m_ext);
-	q->m_ext = NULL;
-
-	memset(&q->m_destAddr, 0, sizeof(struct sockaddr_storage));
-
-	free(p);
-}
-
-
-UpnpDiscovery *UpnpDiscovery_dup(const UpnpDiscovery *p)
-{
-	UpnpDiscovery *q = UpnpDiscovery_new();
-	
-	UpnpDiscovery_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpDiscovery_assign(UpnpDiscovery *p, const UpnpDiscovery *q)
-{
-	if (p != q) {
-		UpnpDiscovery_set_ErrCode(p, UpnpDiscovery_get_ErrCode(q));
-		UpnpDiscovery_set_Expires(p, UpnpDiscovery_get_Expires(q));
-		UpnpDiscovery_set_DeviceID(p, UpnpDiscovery_get_DeviceID(q));
-		UpnpDiscovery_set_DeviceType(p, UpnpDiscovery_get_DeviceType(q));
-		UpnpDiscovery_set_ServiceType(p, UpnpDiscovery_get_ServiceType(q));
-		UpnpDiscovery_set_ServiceVer(p, UpnpDiscovery_get_ServiceVer(q));
-		UpnpDiscovery_set_Location(p, UpnpDiscovery_get_Location(q));
-		UpnpDiscovery_set_Os(p, UpnpDiscovery_get_Os(q));
-		UpnpDiscovery_set_Date(p, UpnpDiscovery_get_Date(q));
-		UpnpDiscovery_set_Ext(p, UpnpDiscovery_get_Ext(q));
-		UpnpDiscovery_set_DestAddr(p, UpnpDiscovery_get_DestAddr(q));
-	}
-}
-
-
-int UpnpDiscovery_get_ErrCode(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_errCode;
-}
-
-
-void UpnpDiscovery_set_ErrCode(UpnpDiscovery *p, int n)
-{
-	((struct SUpnpDiscovery *)p)->m_errCode = n;
-}
-
-
-int UpnpDiscovery_get_Expires(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_expires;
-}
-
-
-void UpnpDiscovery_set_Expires(UpnpDiscovery *p, int n)
-{
-	((struct SUpnpDiscovery *)p)->m_expires = n;
-}
-
-
-const UpnpString *UpnpDiscovery_get_DeviceID(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_deviceID;
-}
-
-const char *UpnpDiscovery_get_DeviceID_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_DeviceID(p));
-}
-
-
-void UpnpDiscovery_set_DeviceID(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_deviceID);
-	((struct SUpnpDiscovery *)p)->m_deviceID = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_DeviceID(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_deviceID);
-	((struct SUpnpDiscovery *)p)->m_deviceID = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_deviceID, s);
-}
-
-
-const UpnpString *UpnpDiscovery_get_DeviceType(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_deviceType;
-}
-
-const char *UpnpDiscovery_get_DeviceType_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_DeviceType(p));
-}
-
-
-void UpnpDiscovery_set_DeviceType(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_deviceType);
-	((struct SUpnpDiscovery *)p)->m_deviceType = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_DeviceType(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_deviceType);
-	((struct SUpnpDiscovery *)p)->m_deviceType = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_deviceType, s);
-}
-
-
-const UpnpString *UpnpDiscovery_get_ServiceType(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_serviceType;
-}
-
-const char *UpnpDiscovery_get_ServiceType_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_ServiceType(p));
-}
-
-
-void UpnpDiscovery_set_ServiceType(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_serviceType);
-	((struct SUpnpDiscovery *)p)->m_serviceType = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_ServiceType(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_serviceType);
-	((struct SUpnpDiscovery *)p)->m_serviceType = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_serviceType, s);
-}
-
-
-const UpnpString *UpnpDiscovery_get_ServiceVer(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_serviceVer;
-}
-
-const char *UpnpDiscovery_get_ServiceVer_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_ServiceVer(p));
-}
-
-
-void UpnpDiscovery_set_ServiceVer(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_serviceVer);
-	((struct SUpnpDiscovery *)p)->m_serviceVer = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_ServiceVer(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_serviceVer);
-	((struct SUpnpDiscovery *)p)->m_serviceVer = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_serviceVer, s);
-}
-
-
-const UpnpString *UpnpDiscovery_get_Location(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_location;
-}
-
-const char *UpnpDiscovery_get_Location_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_Location(p));
-}
-
-
-void UpnpDiscovery_set_Location(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_location);
-	((struct SUpnpDiscovery *)p)->m_location = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_Location(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_location);
-	((struct SUpnpDiscovery *)p)->m_location = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_location, s);
-}
-
-
-void UpnpDiscovery_strncpy_Location(UpnpDiscovery *p, const char *s, int n)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_location);
-	((struct SUpnpDiscovery *)p)->m_location = UpnpString_new();
-	UpnpString_set_StringN(((struct SUpnpDiscovery *)p)->m_location, s, n);
-}
-
-
-const UpnpString *UpnpDiscovery_get_Os(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_os;
-}
-
-const char *UpnpDiscovery_get_Os_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_Os(p));
-}
-
-
-void UpnpDiscovery_set_Os(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_os);
-	((struct SUpnpDiscovery *)p)->m_os = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_Os(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_os);
-	((struct SUpnpDiscovery *)p)->m_os = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_os, s);
-}
-
-
-void UpnpDiscovery_strncpy_Os(UpnpDiscovery *p, const char *s, int n)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_os);
-	((struct SUpnpDiscovery *)p)->m_os = UpnpString_new();
-	UpnpString_set_StringN(((struct SUpnpDiscovery *)p)->m_os, s, n);
-}
-
-
-const UpnpString *UpnpDiscovery_get_Date(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_date;
-}
-
-const char *UpnpDiscovery_get_Date_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_Date(p));
-}
-
-
-void UpnpDiscovery_set_Date(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_date);
-	((struct SUpnpDiscovery *)p)->m_date = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_Date(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_date);
-	((struct SUpnpDiscovery *)p)->m_date = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_date, s);
-}
-
-
-const UpnpString *UpnpDiscovery_get_Ext(const UpnpDiscovery *p)
-{
-	return ((struct SUpnpDiscovery *)p)->m_ext;
-}
-
-const char *UpnpDiscovery_get_Ext_cstr(const UpnpDiscovery *p)
-{
-	return UpnpString_get_String(UpnpDiscovery_get_Ext(p));
-}
-
-
-void UpnpDiscovery_set_Ext(UpnpDiscovery *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_ext);
-	((struct SUpnpDiscovery *)p)->m_ext = UpnpString_dup(s);
-}
-
-
-void UpnpDiscovery_strcpy_Ext(UpnpDiscovery *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_ext);
-	((struct SUpnpDiscovery *)p)->m_ext = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpDiscovery *)p)->m_ext, s);
-}
-
-
-void UpnpDiscovery_strncpy_Ext(UpnpDiscovery *p, const char *s, int n)
-{
-	UpnpString_delete(((struct SUpnpDiscovery *)p)->m_ext);
-	((struct SUpnpDiscovery *)p)->m_ext = UpnpString_new();
-	UpnpString_set_StringN(((struct SUpnpDiscovery *)p)->m_ext, s, n);
-}
-
-
-const struct sockaddr *UpnpDiscovery_get_DestAddr(const UpnpDiscovery *p)
-{
-	return (struct sockaddr *)&((struct SUpnpDiscovery *)p)->m_destAddr;
-}
-
-
-void UpnpDiscovery_set_DestAddr(UpnpDiscovery *p, const struct sockaddr *sa)
-{
-	((struct SUpnpDiscovery *)p)->m_destAddr = *(struct sockaddr_storage *)sa;
-}
-

upnp/src/api/Event.c

@@ -1,121 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpEvent object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "Event.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-
-
-struct SUpnpEvent
-{
-	int m_eventKey;
-	IXML_Document *m_changedVariables;
-	UpnpString *m_SID;
-};
-
-
-UpnpEvent *UpnpEvent_new()
-{
-	struct SUpnpEvent *p = calloc(1, sizeof (struct SUpnpEvent));
-
-#if 0
-	p->m_eventKey = 0;
-	p->m_changedVariables = NULL;
-#endif
-	p->m_SID = UpnpString_new();
-
-	return (UpnpEvent *)p;
-}
-
-
-void UpnpEvent_delete(UpnpEvent *p)
-{
-	struct SUpnpEvent *q = (struct SUpnpEvent *)p;
-
-	if (!q) return;
-
-	q->m_eventKey = 0;
-
-	q->m_changedVariables = NULL;
-
-	UpnpString_delete(q->m_SID);
-	q->m_SID = NULL;
-
-	free(p);
-}
-
-
-UpnpEvent *UpnpEvent_dup(const UpnpEvent *p)
-{
-	UpnpEvent *q = UpnpEvent_new();
-	
-	UpnpEvent_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpEvent_assign(UpnpEvent *p, const UpnpEvent *q)
-{
-	if (p != q) {
-		UpnpEvent_set_EventKey(p, UpnpEvent_get_EventKey(q));
-		UpnpEvent_set_ChangedVariables(p, UpnpEvent_get_ChangedVariables(q));
-		UpnpEvent_set_SID(p, UpnpEvent_get_SID(q));
-	}
-}
-
-
-int UpnpEvent_get_EventKey(const UpnpEvent *p)
-{
-	return ((struct SUpnpEvent *)p)->m_eventKey;
-}
-
-
-void UpnpEvent_set_EventKey(UpnpEvent *p, int n)
-{
-	((struct SUpnpEvent *)p)->m_eventKey = n;
-}
-
-
-IXML_Document *UpnpEvent_get_ChangedVariables(const UpnpEvent *p)
-{
-	return ((struct SUpnpEvent *)p)->m_changedVariables;
-}
-
-
-void UpnpEvent_set_ChangedVariables(UpnpEvent *p, IXML_Document *d)
-{
-	ixmlDocument_free(((struct SUpnpEvent *)p)->m_changedVariables);
-	((struct SUpnpEvent *)p)->m_changedVariables = d;
-}
-
-
-const UpnpString *UpnpEvent_get_SID(const UpnpEvent *p)
-{
-	return ((struct SUpnpEvent *)p)->m_SID;
-}
-
-const char *UpnpEvent_get_SID_cstr(const UpnpEvent *p)
-{
-	return UpnpString_get_String(UpnpEvent_get_SID(p));
-}
-
-
-void UpnpEvent_set_SID(UpnpEvent *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpEvent *)p)->m_SID);
-	((struct SUpnpEvent *)p)->m_SID = UpnpString_dup(s);
-}
-

upnp/src/api/EventSubscribe.c

@@ -1,159 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpEventSubscribe object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "EventSubscribe.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-
-
-struct SEventSubscribe
-{
-	int m_errCode;
-	int m_timeOut;
-	UpnpString *m_SID;
-	UpnpString *m_publisherUrl;
-};
-
-
-UpnpEventSubscribe *UpnpEventSubscribe_new()
-{
-	struct SEventSubscribe *p = calloc(1, sizeof (struct SEventSubscribe));
-#if 0
-	p->errCode = 0;
-	p->timeOut = 0;
-#endif
-	p->m_SID = UpnpString_new();
-	p->m_publisherUrl = UpnpString_new();
-
-	return (UpnpEventSubscribe *)p;
-}
-
-
-void UpnpEventSubscribe_delete(UpnpEventSubscribe *p)
-{
-	struct SEventSubscribe *q = (struct SEventSubscribe *)p;
-
-	if (!q) return;
-
-	q->m_errCode = 0;
-
-	q->m_timeOut = 0;
-
-	UpnpString_delete(q->m_publisherUrl);
-	q->m_publisherUrl = NULL;
-
-	UpnpString_delete(q->m_SID);
-	q->m_SID = NULL;
-
-	free(p);
-}
-
-
-UpnpEventSubscribe *UpnpEventSubscribe_dup(const UpnpEventSubscribe *p)
-{
-	UpnpEventSubscribe *q = UpnpEventSubscribe_new();
-	
-	UpnpEventSubscribe_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpEventSubscribe_assign(UpnpEventSubscribe *p, const UpnpEventSubscribe *q)
-{
-	if (p != q) {
-		UpnpEventSubscribe_set_ErrCode(p, UpnpEventSubscribe_get_ErrCode(q));
-		UpnpEventSubscribe_set_TimeOut(p, UpnpEventSubscribe_get_TimeOut(q));
-		UpnpEventSubscribe_set_SID(p, UpnpEventSubscribe_get_SID(q));
-		UpnpEventSubscribe_set_PublisherUrl(p, UpnpEventSubscribe_get_PublisherUrl(q));
-	}
-}
-
-
-int UpnpEventSubscribe_get_ErrCode(const UpnpEventSubscribe *p)
-{
-	return ((struct SEventSubscribe *)p)->m_errCode;
-}
-
-
-void UpnpEventSubscribe_set_ErrCode(UpnpEventSubscribe *p, int n)
-{
-	((struct SEventSubscribe *)p)->m_errCode = n;
-}
-
-
-int UpnpEventSubscribe_get_TimeOut(const UpnpEventSubscribe *p)
-{
-	return ((struct SEventSubscribe *)p)->m_timeOut;
-}
-
-
-void UpnpEventSubscribe_set_TimeOut(UpnpEventSubscribe *p, int n)
-{
-	((struct SEventSubscribe *)p)->m_timeOut = n;
-}
-
-
-const UpnpString *UpnpEventSubscribe_get_SID(const UpnpEventSubscribe *p)
-{
-	return ((struct SEventSubscribe *)p)->m_SID;
-}
-
-const char *UpnpEventSubscribe_get_SID_cstr(const UpnpEventSubscribe *p)
-{
-	return UpnpString_get_String(UpnpEventSubscribe_get_SID(p));
-}
-
-
-void UpnpEventSubscribe_set_SID(UpnpEventSubscribe *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SEventSubscribe *)p)->m_SID);
-	((struct SEventSubscribe *)p)->m_SID = UpnpString_dup(s);
-}
-
-
-void UpnpEventSubscribe_strcpy_SID(UpnpEventSubscribe *p, const char *s)
-{
-	UpnpString_delete(((struct SEventSubscribe *)p)->m_SID);
-	((struct SEventSubscribe *)p)->m_SID = UpnpString_new();
-	UpnpString_set_String(((struct SEventSubscribe *)p)->m_SID, s);
-}
-
-
-const UpnpString *UpnpEventSubscribe_get_PublisherUrl(const UpnpEventSubscribe *p)
-{
-	return ((struct SEventSubscribe *)p)->m_publisherUrl;
-}
-
-const char *UpnpEventSubscribe_get_PublisherUrl_cstr(const UpnpEventSubscribe *p)
-{
-	return UpnpString_get_String(UpnpEventSubscribe_get_PublisherUrl(p));
-}
-
-
-void UpnpEventSubscribe_set_PublisherUrl(UpnpEventSubscribe *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SEventSubscribe *)p)->m_publisherUrl);
-	((struct SEventSubscribe *)p)->m_publisherUrl = UpnpString_dup(s);
-}
-
-
-void UpnpEventSubscribe_strcpy_PublisherUrl(UpnpEventSubscribe *p, const char *s)
-{
-	UpnpString_delete(((struct SEventSubscribe *)p)->m_publisherUrl);
-	((struct SEventSubscribe *)p)->m_publisherUrl = UpnpString_new();
-	UpnpString_set_String(((struct SEventSubscribe *)p)->m_publisherUrl, s);
-}
-

upnp/src/api/FileInfo.c

@@ -1,179 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpFileInfo object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "FileInfo.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for strlen(), strdup() */
-
-
-struct SUpnpFileInfo
-{
-	off_t m_fileLength;
-	time_t m_lastModified;
-	int m_isDirectory;
-	int m_isReadable;
-	DOMString m_contentType;
-	DOMString m_extraHeaders;
-};
-
-
-UpnpFileInfo *UpnpFileInfo_new()
-{
-	struct SUpnpFileInfo *p = calloc(1, sizeof (struct SUpnpFileInfo));
-
-#if 0
-	p->m_fileLength = 0;
-	p->m_lastModified = 0;
-	p->m_isDirectory = 0;
-	p->m_isReadable = 0;
-	p->m_contentType = NULL;
-	p->m_extraHeaders = NULL;
-#endif
-
-	return (UpnpFileInfo *)p;
-}
-
-
-void UpnpFileInfo_delete(UpnpFileInfo *p)
-{
-	struct SUpnpFileInfo *q = (struct SUpnpFileInfo *)p;
-
-	if (!q) return;
-
-	q->m_fileLength = 0;
-
-	q->m_lastModified = 0;
-
-	q->m_isDirectory = 0;
-
-	q->m_isReadable = 0;
-
-	ixmlFreeDOMString(q->m_contentType);
-	q->m_contentType = NULL;
-	
-	ixmlFreeDOMString(q->m_extraHeaders);
-	q->m_extraHeaders = NULL;
-
-	free(p);
-}
-
-
-UpnpFileInfo *UpnpFileInfo_dup(const UpnpFileInfo *p)
-{
-	UpnpFileInfo *q = UpnpFileInfo_new();
-
-	UpnpFileInfo_assign(q, p);
-
-	return q;
-}
-
-
-void UpnpFileInfo_assign(UpnpFileInfo *p, const UpnpFileInfo *q)
-{
-	if (p != q) {
-		UpnpFileInfo_set_FileLength(p, UpnpFileInfo_get_FileLength(q));
-		UpnpFileInfo_set_LastModified(p, UpnpFileInfo_get_LastModified(q));
-		UpnpFileInfo_set_IsDirectory(p, UpnpFileInfo_get_IsDirectory(q));
-		UpnpFileInfo_set_IsReadable(p, UpnpFileInfo_get_IsReadable(q));
-		UpnpFileInfo_set_ContentType(p, UpnpFileInfo_get_ContentType(q));
-		UpnpFileInfo_set_ExtraHeaders(p, UpnpFileInfo_get_ExtraHeaders(q));
-	}
-}
-
-
-off_t UpnpFileInfo_get_FileLength(const UpnpFileInfo *p)
-{
-	return ((struct SUpnpFileInfo *)p)->m_fileLength;
-}
-
-
-void UpnpFileInfo_set_FileLength(UpnpFileInfo *p, off_t l)
-{
-	((struct SUpnpFileInfo *)p)->m_fileLength = l;
-}
-
-
-const time_t *UpnpFileInfo_get_LastModified(const UpnpFileInfo *p)
-{
-	return &((struct SUpnpFileInfo *)p)->m_lastModified;
-}
-
-
-void UpnpFileInfo_set_LastModified(UpnpFileInfo *p, const time_t *t)
-{
-	((struct SUpnpFileInfo *)p)->m_lastModified = *t;
-}
-
-
-int UpnpFileInfo_get_IsDirectory(const UpnpFileInfo *p)
-{
-	return ((struct SUpnpFileInfo *)p)->m_isDirectory;
-}
-
-
-void UpnpFileInfo_set_IsDirectory(UpnpFileInfo *p, int b)
-{
-	((struct SUpnpFileInfo *)p)->m_isDirectory = b;
-}
-
-
-int UpnpFileInfo_get_IsReadable(const UpnpFileInfo *p)
-{
-	return ((struct SUpnpFileInfo *)p)->m_isReadable;
-}
-
-
-void UpnpFileInfo_set_IsReadable(UpnpFileInfo *p, int b)
-{
-	((struct SUpnpFileInfo *)p)->m_isReadable = b;
-}
-
-
-const DOMString UpnpFileInfo_get_ContentType(const UpnpFileInfo *p)
-{
-	return ((struct SUpnpFileInfo *)p)->m_contentType;
-}
-
-const char *UpnpFileInfo_get_ContentType_cstr(const UpnpFileInfo *p)
-{
-	return (const char *)UpnpFileInfo_get_ContentType(p);
-}
-
-
-void UpnpFileInfo_set_ContentType(UpnpFileInfo *p, const DOMString s)
-{
-	ixmlFreeDOMString(((struct SUpnpFileInfo *)p)->m_contentType);
-	((struct SUpnpFileInfo *)p)->m_contentType = ixmlCloneDOMString(s);
-}
-
-
-const DOMString UpnpFileInfo_get_ExtraHeaders(const UpnpFileInfo *p)
-{
-	return ((struct SUpnpFileInfo *)p)->m_extraHeaders;
-}
-
-const char *UpnpFileInfo_get_ExtraHeaders_cstr(const UpnpFileInfo *p)
-{
-	return (const char *)UpnpFileInfo_get_ExtraHeaders(p);
-}
-
-
-void UpnpFileInfo_set_ExtraHeaders(UpnpFileInfo *p, const DOMString s)
-{
-	ixmlFreeDOMString(((struct SUpnpFileInfo *)p)->m_extraHeaders);
-	((struct SUpnpFileInfo *)p)->m_extraHeaders = ixmlCloneDOMString(s);
-}
-

upnp/src/api/StateVarComplete.c

@@ -1,170 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpStateVarComplete object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "StateVarComplete.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for strlen(), strdup() */
-
-
-struct SUpnpStateVarComplete
-{
-	int m_errCode;
-	UpnpString *m_ctrlUrl;
-	UpnpString *m_stateVarName;
-	DOMString m_currentVal;
-};
-
-
-UpnpStateVarComplete *UpnpStateVarComplete_new()
-{
-	struct SUpnpStateVarComplete *p = calloc(1, sizeof (struct SUpnpStateVarComplete));
-
-#if 0
-	p->m_errCode = 0;
-#endif
-	p->m_ctrlUrl = UpnpString_new();
-	p->m_stateVarName = UpnpString_new();
-#if 0
-	p->m_currentVal = NULL;
-#endif
-
-	return (UpnpStateVarComplete *)p;
-}
-
-
-void UpnpStateVarComplete_delete(UpnpStateVarComplete *p)
-{
-	struct SUpnpStateVarComplete *q = (struct SUpnpStateVarComplete *)p;
-
-	if (!q) return;
-
-	q->m_errCode = 0;
-
-	UpnpString_delete(q->m_ctrlUrl);
-	q->m_ctrlUrl = NULL;
-
-	UpnpString_delete(q->m_stateVarName);
-	q->m_stateVarName = NULL;
-
-	ixmlFreeDOMString(q->m_currentVal);
-	q->m_currentVal = NULL;
-
-	free(p);
-}
-
-
-UpnpStateVarComplete *UpnpStateVarComplete_dup(const UpnpStateVarComplete *p)
-{
-	UpnpStateVarComplete *q = UpnpStateVarComplete_new();
-	
-	UpnpStateVarComplete_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpStateVarComplete_assign(UpnpStateVarComplete *p, const UpnpStateVarComplete *q)
-{
-	if (p != q) {
-		UpnpStateVarComplete_set_ErrCode(p, UpnpStateVarComplete_get_ErrCode(q));
-		UpnpStateVarComplete_set_CtrlUrl(p, UpnpStateVarComplete_get_CtrlUrl(q));
-		UpnpStateVarComplete_set_StateVarName(p, UpnpStateVarComplete_get_StateVarName(q));
-		UpnpStateVarComplete_set_CurrentVal(p, UpnpStateVarComplete_get_CurrentVal(q));
-	}
-}
-
-
-int UpnpStateVarComplete_get_ErrCode(const UpnpStateVarComplete *p)
-{
-	return ((struct SUpnpStateVarComplete *)p)->m_errCode;
-}
-
-
-void UpnpStateVarComplete_set_ErrCode(UpnpStateVarComplete *p, int n)
-{
-	((struct SUpnpStateVarComplete *)p)->m_errCode = n;
-}
-
-
-const UpnpString *UpnpStateVarComplete_get_CtrlUrl(const UpnpStateVarComplete *p)
-{
-	return ((struct SUpnpStateVarComplete *)p)->m_ctrlUrl;
-}
-
-const char *UpnpStateVarComplete_get_CtrlUrl_cstr(const UpnpStateVarComplete *p)
-{
-	return UpnpString_get_String(UpnpStateVarComplete_get_CtrlUrl(p));
-}
-
-
-void UpnpStateVarComplete_set_CtrlUrl(UpnpStateVarComplete *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarComplete *)p)->m_ctrlUrl);
-	((struct SUpnpStateVarComplete *)p)->m_ctrlUrl = UpnpString_dup(s);
-}
-
-
-void UpnpStateVarComplete_strcpy_CtrlUrl(UpnpStateVarComplete *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarComplete *)p)->m_ctrlUrl);
-	((struct SUpnpStateVarComplete *)p)->m_ctrlUrl = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpStateVarComplete *)p)->m_ctrlUrl, s);
-}
-
-
-const UpnpString *UpnpStateVarComplete_get_StateVarName(const UpnpStateVarComplete *p)
-{
-	return ((struct SUpnpStateVarComplete *)p)->m_stateVarName;
-}
-
-const char *UpnpStateVarComplete_get_StateVarName_cstr(const UpnpStateVarComplete *p)
-{
-	return UpnpString_get_String(UpnpStateVarComplete_get_StateVarName(p));
-}
-
-
-void UpnpStateVarComplete_set_StateVarName(UpnpStateVarComplete *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarComplete *)p)->m_stateVarName);
-	((struct SUpnpStateVarComplete *)p)->m_stateVarName = UpnpString_dup(s);
-}
-
-
-void UpnpStateVarComplete_strcpy_StateVarName(UpnpStateVarComplete *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarComplete *)p)->m_ctrlUrl);
-	((struct SUpnpStateVarComplete *)p)->m_ctrlUrl = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpStateVarComplete *)p)->m_ctrlUrl, s);
-}
-
-
-const DOMString UpnpStateVarComplete_get_CurrentVal(const UpnpStateVarComplete *p)
-{
-	return ((struct SUpnpStateVarComplete *)p)->m_currentVal;
-}
-
-const char *UpnpStateVarComplete_get_CurrentVal_cstr(const UpnpStateVarComplete *p)
-{
-	return (const char *)UpnpStateVarComplete_get_CurrentVal(p);
-}
-
-
-void UpnpStateVarComplete_set_CurrentVal(UpnpStateVarComplete *p, const DOMString s)
-{
-	ixmlFreeDOMString(((struct SUpnpStateVarComplete *)p)->m_currentVal);
-	((struct SUpnpStateVarComplete *)p)->m_currentVal = ixmlCloneDOMString(s);
-}
-

upnp/src/api/StateVarRequest.c

@@ -1,254 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpStateVarRequest object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "StateVarRequest.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for memset(), strlen(), strdup() */
-
-
-struct SUpnpStateVarRequest
-{
-	int m_errCode;
-	int m_socket;
-	UpnpString *m_errStr;
-	UpnpString *m_devUDN;
-	UpnpString *m_serviceID;
-	UpnpString *m_stateVarName;
-	/* Variables should be declared with struct sockaddr_storage,
-	 * but users must only see a struct sockaddr pointer */
-	struct sockaddr_storage m_ctrlPtIPAddr;
-	DOMString m_currentVal;
-};
-
-
-UpnpStateVarRequest *UpnpStateVarRequest_new()
-{
-	struct SUpnpStateVarRequest *p = calloc(1, sizeof (struct SUpnpStateVarRequest));
-
-#if 0
-	p->m_errCode = 0;
-	p->m_socket = 0;
-#endif
-	p->m_errStr = UpnpString_new();
-	p->m_devUDN = UpnpString_new();
-	p->m_serviceID = UpnpString_new();
-	p->m_stateVarName = UpnpString_new();
-#if 0
-	memset(&q->m_ctrlPtIPAddr, 0, sizeof (struct sockaddr_storage));
-	p->m_currentVal = NULL;
-#endif
-
-	return (UpnpStateVarRequest *)p;
-}
-
-
-void UpnpStateVarRequest_delete(UpnpStateVarRequest *p)
-{
-	struct SUpnpStateVarRequest *q = (struct SUpnpStateVarRequest *)p;
-
-	if (!q) return;
-
-	q->m_errCode = 0;
-
-	q->m_socket = 0;
-
-	UpnpString_delete(q->m_errStr);
-	q->m_errStr = NULL;
-
-	UpnpString_delete(q->m_devUDN);
-	q->m_devUDN = NULL;
-
-	UpnpString_delete(q->m_serviceID);
-	q->m_serviceID = NULL;
-
-	UpnpString_delete(q->m_stateVarName);
-	q->m_stateVarName = NULL;
-
-	memset(&q->m_ctrlPtIPAddr, 0, sizeof (struct sockaddr_storage));
-
-	ixmlFreeDOMString(q->m_currentVal);
-	q->m_currentVal = NULL;
-
-	free(p);
-}
-
-
-UpnpStateVarRequest *UpnpStateVarRequest_dup(const UpnpStateVarRequest *p)
-{
-	UpnpStateVarRequest *q = UpnpStateVarRequest_new();
-	
-	UpnpStateVarRequest_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpStateVarRequest_assign(UpnpStateVarRequest *p, const UpnpStateVarRequest *q)
-{
-	if (p != q) {
-		UpnpStateVarRequest_set_ErrCode(p, UpnpStateVarRequest_get_ErrCode(q));
-		UpnpStateVarRequest_set_Socket(p, UpnpStateVarRequest_get_Socket(q));
-		UpnpStateVarRequest_set_ErrStr(p, UpnpStateVarRequest_get_ErrStr(q));
-		UpnpStateVarRequest_set_StateVarName(p, UpnpStateVarRequest_get_StateVarName(q));
-		UpnpStateVarRequest_set_DevUDN(p, UpnpStateVarRequest_get_DevUDN(q));
-		UpnpStateVarRequest_set_ServiceID(p, UpnpStateVarRequest_get_ServiceID(q));
-		UpnpStateVarRequest_set_CtrlPtIPAddr(p, UpnpStateVarRequest_get_CtrlPtIPAddr(q));
-		UpnpStateVarRequest_set_CurrentVal(p, UpnpStateVarRequest_get_CurrentVal(q));
-	}
-}
-
-
-int UpnpStateVarRequest_get_ErrCode(const UpnpStateVarRequest *p)
-{
-	return ((struct SUpnpStateVarRequest *)p)->m_errCode;
-}
-
-
-void UpnpStateVarRequest_set_ErrCode(UpnpStateVarRequest *p, int n)
-{
-	((struct SUpnpStateVarRequest *)p)->m_errCode = n;
-}
-
-
-int UpnpStateVarRequest_get_Socket(const UpnpStateVarRequest *p)
-{
-	return ((struct SUpnpStateVarRequest *)p)->m_socket;
-}
-
-
-void UpnpStateVarRequest_set_Socket(UpnpStateVarRequest *p, int n)
-{
-	((struct SUpnpStateVarRequest *)p)->m_socket = n;
-}
-
-
-const UpnpString *UpnpStateVarRequest_get_ErrStr(const UpnpStateVarRequest *p)
-{
-	return ((struct SUpnpStateVarRequest *)p)->m_errStr;
-}
-
-const char *UpnpStateVarRequest_get_ErrStr_cstr(const UpnpStateVarRequest *p)
-{
-	return UpnpString_get_String(UpnpStateVarRequest_get_ErrStr(p));
-}
-
-
-void UpnpStateVarRequest_set_ErrStr(UpnpStateVarRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarRequest *)p)->m_errStr);
-	((struct SUpnpStateVarRequest *)p)->m_errStr = UpnpString_dup(s);
-}
-
-
-void UpnpStateVarRequest_strcpy_ErrStr(UpnpStateVarRequest *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarRequest *)p)->m_errStr);
-	((struct SUpnpStateVarRequest *)p)->m_errStr = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpStateVarRequest *)p)->m_errStr, s);
-}
-
-
-const UpnpString *UpnpStateVarRequest_get_DevUDN(const UpnpStateVarRequest *p)
-{
-	return ((struct SUpnpStateVarRequest *)p)->m_devUDN;
-}
-
-const char *UpnpStateVarRequest_get_DevUDN_cstr(const UpnpStateVarRequest *p)
-{
-	return UpnpString_get_String(UpnpStateVarRequest_get_DevUDN(p));
-}
-
-
-void UpnpStateVarRequest_set_DevUDN(UpnpStateVarRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarRequest *)p)->m_devUDN);
-	((struct SUpnpStateVarRequest *)p)->m_devUDN = UpnpString_dup(s);
-}
-
-
-const UpnpString *UpnpStateVarRequest_get_ServiceID(const UpnpStateVarRequest *p)
-{
-	return ((struct SUpnpStateVarRequest *)p)->m_serviceID;
-}
-
-const char *UpnpStateVarRequest_get_ServiceID_cstr(const UpnpStateVarRequest *p)
-{
-	return UpnpString_get_String(UpnpStateVarRequest_get_ServiceID(p));
-}
-
-
-void UpnpStateVarRequest_set_ServiceID(UpnpStateVarRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarRequest *)p)->m_serviceID);
-	((struct SUpnpStateVarRequest *)p)->m_serviceID = UpnpString_dup(s);
-}
-
-
-const UpnpString *UpnpStateVarRequest_get_StateVarName(const UpnpStateVarRequest *p)
-{
-	return ((struct SUpnpStateVarRequest *)p)->m_stateVarName;
-}
-
-const char *UpnpStateVarRequest_get_StateVarName_cstr(const UpnpStateVarRequest *p)
-{
-	return UpnpString_get_String(UpnpStateVarRequest_get_StateVarName(p));
-}
-
-
-void UpnpStateVarRequest_set_StateVarName(UpnpStateVarRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarRequest *)p)->m_stateVarName);
-	((struct SUpnpStateVarRequest *)p)->m_stateVarName = UpnpString_dup(s);
-}
-
-
-void UpnpStateVarRequest_strcpy_StateVarName(UpnpStateVarRequest *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpStateVarRequest *)p)->m_errStr);
-	((struct SUpnpStateVarRequest *)p)->m_errStr = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpStateVarRequest *)p)->m_errStr, s);
-}
-
-
-const struct sockaddr *UpnpStateVarRequest_get_CtrlPtIPAddr(const UpnpStateVarRequest *p)
-{
-	return (struct sockaddr *)&((struct SUpnpStateVarRequest *)p)->m_ctrlPtIPAddr;
-}
-
-
-void UpnpStateVarRequest_set_CtrlPtIPAddr(UpnpStateVarRequest *p, const struct sockaddr *sa)
-{
-	((struct SUpnpStateVarRequest *)p)->m_ctrlPtIPAddr = *(struct sockaddr_storage *)sa;
-}
-
-
-const DOMString UpnpStateVarRequest_get_CurrentVal(const UpnpStateVarRequest *p)
-{
-	return ((struct SUpnpStateVarRequest *)p)->m_currentVal;
-}
-
-const char *UpnpStateVarRequest_get_CurrentVal_cstr(const UpnpStateVarRequest *p)
-{
-	return (const char *)UpnpStateVarRequest_get_CurrentVal(p);
-}
-
-
-void UpnpStateVarRequest_set_CurrentVal(UpnpStateVarRequest *p, const DOMString s)
-{
-	ixmlFreeDOMString(((struct SUpnpStateVarRequest *)p)->m_currentVal);
-	((struct SUpnpStateVarRequest *)p)->m_currentVal = ixmlCloneDOMString(s);
-}
-

upnp/src/api/SubscriptionRequest.c

@@ -1,157 +0,0 @@
-
-
-/*!
- * \file
- *
- * \brief UpnpSubscriptionRequest object implementation.
- *
- * \author Marcelo Roberto Jimenez
- */
-
-
-#include "config.h"
-
-
-#include "SubscriptionRequest.h"
-
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for memset(), strlen(), strdup() */
-
-
-struct SUpnpSubscriptionRequest
-{
-	UpnpString *m_serviceId; 
-	UpnpString *m_UDN;       
-	UpnpString *m_SID;
-};
-
-
-UpnpSubscriptionRequest *UpnpSubscriptionRequest_new()
-{
-	struct SUpnpSubscriptionRequest *p = calloc(1, sizeof (struct SUpnpSubscriptionRequest));
-
-	p->m_serviceId = UpnpString_new();
-	p->m_UDN = UpnpString_new();
-	p->m_SID = UpnpString_new();
-
-	return (UpnpSubscriptionRequest *)p;
-}
-
-
-void UpnpSubscriptionRequest_delete(UpnpSubscriptionRequest *p)
-{
-	struct SUpnpSubscriptionRequest *q = (struct SUpnpSubscriptionRequest *)p;
-
-	if (!q) return;
-
-	UpnpString_delete(q->m_serviceId);
-	q->m_serviceId = NULL;
-
-	UpnpString_delete(q->m_UDN);
-	q->m_UDN = NULL;
-
-	UpnpString_delete(q->m_SID);
-	q->m_SID = NULL;
-
-	free(p);
-}
-
-
-UpnpSubscriptionRequest *UpnpSubscriptionRequest_dup(const UpnpSubscriptionRequest *p)
-{
-	UpnpSubscriptionRequest *q = UpnpSubscriptionRequest_new();
-	
-	UpnpSubscriptionRequest_assign(q, p);
-	
-	return q;
-}
-
-
-void UpnpSubscriptionRequest_assign(UpnpSubscriptionRequest *p, const UpnpSubscriptionRequest *q)
-{
-	if (p != q) {
-		UpnpSubscriptionRequest_set_ServiceId(p, UpnpSubscriptionRequest_get_ServiceId(q));
-		UpnpSubscriptionRequest_set_UDN(p, UpnpSubscriptionRequest_get_UDN(q));
-		UpnpSubscriptionRequest_set_SID(p, UpnpSubscriptionRequest_get_SID(q));
-	}
-}
-
-
-const UpnpString *UpnpSubscriptionRequest_get_ServiceId(const UpnpSubscriptionRequest *p)
-{
-	return ((struct SUpnpSubscriptionRequest *)p)->m_serviceId;
-}
-
-const char *UpnpSubscriptionRequest_get_ServiceId_cstr(const UpnpSubscriptionRequest *p)
-{
-	return UpnpString_get_String(UpnpSubscriptionRequest_get_ServiceId(p));
-}
-
-
-void UpnpSubscriptionRequest_set_ServiceId(UpnpSubscriptionRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpSubscriptionRequest *)p)->m_serviceId);
-	((struct SUpnpSubscriptionRequest *)p)->m_serviceId = UpnpString_dup(s);
-}
-
-
-void UpnpSubscriptionRequest_strcpy_ServiceId(UpnpSubscriptionRequest *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpSubscriptionRequest *)p)->m_serviceId);
-	((struct SUpnpSubscriptionRequest *)p)->m_serviceId = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpSubscriptionRequest *)p)->m_serviceId, s);
-}
-
-
-const UpnpString *UpnpSubscriptionRequest_get_UDN(const UpnpSubscriptionRequest *p)
-{
-	return ((struct SUpnpSubscriptionRequest *)p)->m_UDN;
-}
-
-const char *UpnpSubscriptionRequest_get_UDN_cstr(const UpnpSubscriptionRequest *p)
-{
-	return UpnpString_get_String(UpnpSubscriptionRequest_get_UDN(p));
-}
-
-
-void UpnpSubscriptionRequest_set_UDN(UpnpSubscriptionRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpSubscriptionRequest *)p)->m_UDN);
-	((struct SUpnpSubscriptionRequest *)p)->m_UDN = UpnpString_dup(s);
-}
-
-
-void UpnpSubscriptionRequest_strcpy_UDN(UpnpSubscriptionRequest *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpSubscriptionRequest *)p)->m_UDN);
-	((struct SUpnpSubscriptionRequest *)p)->m_UDN = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpSubscriptionRequest *)p)->m_UDN, s);
-}
-
-
-const UpnpString *UpnpSubscriptionRequest_get_SID(const UpnpSubscriptionRequest *p)
-{
-	return ((struct SUpnpSubscriptionRequest *)p)->m_SID;
-}
-
-const char *UpnpSubscriptionRequest_get_SID_cstr(const UpnpSubscriptionRequest *p)
-{
-	return UpnpString_get_String(UpnpSubscriptionRequest_get_SID(p));
-}
-
-
-void UpnpSubscriptionRequest_set_SID(UpnpSubscriptionRequest *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SUpnpSubscriptionRequest *)p)->m_SID);
-	((struct SUpnpSubscriptionRequest *)p)->m_SID = UpnpString_dup(s);
-}
-
-
-void UpnpSubscriptionRequest_strcpy_SID(UpnpSubscriptionRequest *p, const char *s)
-{
-	UpnpString_delete(((struct SUpnpSubscriptionRequest *)p)->m_SID);
-	((struct SUpnpSubscriptionRequest *)p)->m_SID = UpnpString_new();
-	UpnpString_set_String(((struct SUpnpSubscriptionRequest *)p)->m_SID, s);
-}
-

upnp/src/api/UpnpString.c

@@ -28,6 +28,19 @@
 #include <string.h> /* for strlen(), strdup() */
 
 
+#ifdef WIN32
+	#define strcasecmp stricmp
+#else
+	/* Other systems have strncasecmp */
+#endif
+
+
+/* strndup() is a GNU extension. Other systems must fix it with elif's. */
+#ifdef __GNUC__
+extern char *strndup(__const char *__string, size_t __n);
+#endif
+
+
 /*!
  * \brief Internal implementation of the class UpnpString.
  *
@@ -115,42 +128,78 @@ void UpnpString_assign(UpnpString *p, const UpnpString *q)
 }
 
 
-int UpnpString_get_Length(const UpnpString *p)
+size_t UpnpString_get_Length(const UpnpString *p)
 {
 	return ((struct SUpnpString *)p)->m_length;
 }
 
 
+void UpnpString_set_Length(UpnpString *p, size_t n)
+{
+	if (((struct SUpnpString *)p)->m_length > n) {
+		((struct SUpnpString *)p)->m_length = n;
+		/* No need to realloc now, will do later when needed. */
+		((struct SUpnpString *)p)->m_string[n] = 0;
+	}
+}
+
+
 const char *UpnpString_get_String(const UpnpString *p)
 {
 	return ((struct SUpnpString *)p)->m_string;
 }
 
 
-void UpnpString_set_String(UpnpString *p, const char *s)
+int UpnpString_set_String(UpnpString *p, const char *s)
 {
+	char *q = strdup(s);
+	if (!q) goto error_handler1;
 	free(((struct SUpnpString *)p)->m_string);
-	((struct SUpnpString *)p)->m_length = strlen(s);
-	((struct SUpnpString *)p)->m_string = strdup(s);
+	((struct SUpnpString *)p)->m_length = strlen(q);
+	((struct SUpnpString *)p)->m_string = q;
+
+error_handler1:
+	return q != NULL;
 }
 
 
-void UpnpString_set_StringN(UpnpString *p, const char *s, int n)
+int UpnpString_set_StringN(UpnpString *p, const char *s, size_t n)
 {
+	char *q = strndup(s, n);
+	if (!q) goto error_handler1;
 	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;
+	((struct SUpnpString *)p)->m_length = strlen(q);
+	((struct SUpnpString *)p)->m_string = q;
+
+error_handler1:
+	return q != NULL;
 }
 
 
 void UpnpString_clear(UpnpString *p)
 {
 	((struct SUpnpString *)p)->m_length = 0;
-	// No need to realloc now, will do later when needed
+	/* No need to realloc now, will do later when needed. */
 	((struct SUpnpString *)p)->m_string[0] = 0;
 }
 
+
+int UpnpString_cmp(UpnpString *p, UpnpString *q)
+{
+	const char *cp = UpnpString_get_String(p);
+	const char *cq = UpnpString_get_String(q);
+
+	return strcmp(cp, cq);
+}
+
+
+int UpnpString_casecmp(UpnpString *p, UpnpString *q)
+{
+	const char *cp = UpnpString_get_String(p);
+	const char *cq = UpnpString_get_String(q);
+
+	return strcasecmp(cp, cq);
+}
+
 /* @} UpnpString */
 

upnp/src/api/upnpapi.c

@@ -282,6 +282,7 @@ static int UpnpInitThreadPools(void)
 	TPAttrInit(&attr);
 	TPAttrSetMaxThreads(&attr, MAX_THREADS);
 	TPAttrSetMinThreads(&attr, MIN_THREADS);
+	TPAttrSetStackSize(&attr, THREAD_STACK_SIZE);
 	TPAttrSetJobsPerThread(&attr, JOBS_PER_THREAD);
 	TPAttrSetIdleTime(&attr, THREAD_IDLE_TIME);
 	TPAttrSetMaxJobsTotal(&attr, MAX_JOBS_TOTAL);
@@ -488,7 +489,7 @@ exit_function:
 	return retVal;
 }
 
-
+#ifdef UPNP_ENABLE_IPV6
 int UpnpInit2(const char *IfName, unsigned short DestPort)
 {
 	int retVal;
@@ -533,8 +534,9 @@ int UpnpInit2(const char *IfName, unsigned short DestPort)
 exit_function:
 	ithread_mutex_unlock(&gSDKInitMutex);
 
-	return UPNP_E_SUCCESS;
+	return retVal;
 }
+#endif
 
 
 int UpnpFinish(void)
@@ -620,7 +622,7 @@ unsigned short UpnpGetServerPort(void)
 	return LOCAL_PORT_V4;
 }
 
-
+#ifdef UPNP_ENABLE_IPV6
 unsigned short UpnpGetServerPort6(void)
 {
 	if (UpnpSdkInit != 1) {
@@ -629,6 +631,7 @@ unsigned short UpnpGetServerPort6(void)
 
 	return LOCAL_PORT_V6;
 }
+#endif
 
 
 char *UpnpGetServerIpAddress(void)
@@ -777,8 +780,10 @@ int UpnpRegisterRootDevice(
 	HInfo->DeviceList = NULL;
 	HInfo->ServiceList = NULL;
 	HInfo->DescDocument = NULL;
-	CLIENTONLY( ListInit(&HInfo->SsdpSearchList, NULL, NULL); )
-	CLIENTONLY( HInfo->ClientSubList = NULL; )
+#ifdef INCLUDE_CLIENT_APIS
+	ListInit(&HInfo->SsdpSearchList, NULL, NULL);
+	HInfo->ClientSubList = NULL;
+#endif /* INCLUDE_CLIENT_APIS */
 	HInfo->MaxSubscriptions = UPNP_INFINITE;
 	HInfo->MaxSubscriptionTimeOut = UPNP_INFINITE;
 	HInfo->DeviceAf = AF_INET;
@@ -788,7 +793,9 @@ int UpnpRegisterRootDevice(
 		UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
 			"UpnpRegisterRootDevice: error downloading Document: %d\n",
 			retVal);
-		CLIENTONLY( ListDestroy(&HInfo->SsdpSearchList, 0); )
+#ifdef INCLUDE_CLIENT_APIS
+		ListDestroy(&HInfo->SsdpSearchList, 0);
+#endif /* INCLUDE_CLIENT_APIS */
 		FreeHandle(*Hnd);
 		goto exit_function;
 	}
@@ -800,7 +807,9 @@ int UpnpRegisterRootDevice(
 	HInfo->DeviceList =
 		ixmlDocument_getElementsByTagName(HInfo->DescDocument, "device");
 	if (!HInfo->DeviceList) {
-		CLIENTONLY( ListDestroy(&HInfo->SsdpSearchList, 0); )
+#ifdef INCLUDE_CLIENT_APIS
+		ListDestroy(&HInfo->SsdpSearchList, 0);
+#endif /* INCLUDE_CLIENT_APIS */
 		ixmlDocument_free(HInfo->DescDocument);
 		FreeHandle(*Hnd);
 		UpnpPrintf(UPNP_CRITICAL, API, __FILE__, __LINE__,
@@ -936,8 +945,10 @@ int UpnpRegisterRootDevice2(
 	HInfo->MaxAge = DEFAULT_MAXAGE;
 	HInfo->DeviceList = NULL;
 	HInfo->ServiceList = NULL;
-	CLIENTONLY( ListInit(&HInfo->SsdpSearchList, NULL, NULL); )
-	CLIENTONLY( HInfo->ClientSubList = NULL; )
+#ifdef INCLUDE_CLIENT_APIS
+	ListInit(&HInfo->SsdpSearchList, NULL, NULL);
+	HInfo->ClientSubList = NULL;
+#endif /* INCLUDE_CLIENT_APIS */
 	HInfo->MaxSubscriptions = UPNP_INFINITE;
 	HInfo->MaxSubscriptionTimeOut = UPNP_INFINITE;
 	HInfo->DeviceAf = AF_INET;
@@ -950,7 +961,9 @@ int UpnpRegisterRootDevice2(
 	HInfo->DeviceList =
 		ixmlDocument_getElementsByTagName( HInfo->DescDocument, "device" );
 	if (!HInfo->DeviceList) {
-		CLIENTONLY( ListDestroy(&HInfo->SsdpSearchList, 0); )
+#ifdef INCLUDE_CLIENT_APIS
+		ListDestroy(&HInfo->SsdpSearchList, 0);
+#endif /* INCLUDE_CLIENT_APIS */
 		ixmlDocument_free(HInfo->DescDocument);
 		FreeHandle(*Hnd);
 		UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
@@ -1010,17 +1023,16 @@ int UpnpRegisterRootDevice3(
 	struct Handle_Info *HInfo;
 	int retVal = 0;
 	int hasServiceTable = 0;
+	int handler_index = 0;
 
 	HandleLock();
 
 	UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
 		"Inside UpnpRegisterRootDevice3\n");
-
 	if (UpnpSdkInit != 1) {
 		retVal = UPNP_E_FINISH;
 		goto exit_function;
 	}
-
 	if (Hnd == NULL ||
 	    Fun == NULL ||
 	    DescUrl == NULL ||
@@ -1029,17 +1041,14 @@ int UpnpRegisterRootDevice3(
 		retVal = UPNP_E_INVALID_PARAM;
 		goto exit_function;
 	}
-
 	/* Test for already regsitered IPV4. */
 	if (AddressFamily == AF_INET && UpnpSdkDeviceRegisteredV4 == 1) {
 		retVal = UPNP_E_ALREADY_REGISTERED;
 		goto exit_function;
 	}
-
 	/* Test for already registered IPV6. IPV6 devices might register on multiple
 	 * IPv6 addresses (link local and GUA or ULA), so we must to check the
 	 * description URL in the HandleTable. */
-	int handler_index = 0;
 	while (handler_index < NUM_HANDLE && HandleTable[handler_index] != NULL) {
 		if (strcmp(((struct Handle_Info *)HandleTable[handler_index])->DescURL, DescUrl)) {
 			retVal = UPNP_E_ALREADY_REGISTERED;
@@ -1047,13 +1056,11 @@ int UpnpRegisterRootDevice3(
 		}
 		handler_index++;
 	}
-
 	*Hnd = GetFreeHandle();
 	if (*Hnd == UPNP_E_OUTOF_HANDLE) {
 		retVal = UPNP_E_OUTOF_MEMORY;
 		goto exit_function;
 	}
-
 	HInfo = (struct Handle_Info *)malloc(sizeof (struct Handle_Info));
 	if (HInfo == NULL) {
 		retVal = UPNP_E_OUTOF_MEMORY;
@@ -1062,7 +1069,6 @@ int UpnpRegisterRootDevice3(
 	HandleTable[*Hnd] = HInfo;
 	UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
 		"Root device URL is %s\n", DescUrl);
-
 	HInfo->aliasInstalled = 0;
 	HInfo->HType = HND_DEVICE;
 	strcpy(HInfo->DescURL, DescUrl);
@@ -1072,15 +1078,18 @@ int UpnpRegisterRootDevice3(
 	HInfo->DeviceList = NULL;
 	HInfo->ServiceList = NULL;
 	HInfo->DescDocument = NULL;
-	CLIENTONLY( ListInit(&HInfo->SsdpSearchList, NULL, NULL); )
-	CLIENTONLY( HInfo->ClientSubList = NULL; )
+#ifdef INCLUDE_CLIENT_APIS
+	ListInit(&HInfo->SsdpSearchList, NULL, NULL);
+	HInfo->ClientSubList = NULL;
+#endif /* INCLUDE_CLIENT_APIS */
 	HInfo->MaxSubscriptions = UPNP_INFINITE;
 	HInfo->MaxSubscriptionTimeOut = UPNP_INFINITE;
 	HInfo->DeviceAf = AddressFamily;
-
 	retVal = UpnpDownloadXmlDoc(HInfo->DescURL, &(HInfo->DescDocument));
 	if (retVal != UPNP_E_SUCCESS) {
-		CLIENTONLY( ListDestroy(&HInfo->SsdpSearchList, 0); )
+#ifdef INCLUDE_CLIENT_APIS
+		ListDestroy(&HInfo->SsdpSearchList, 0);
+#endif /* INCLUDE_CLIENT_APIS */
 		FreeHandle(*Hnd);
 		goto exit_function;
 	}
@@ -1092,7 +1101,9 @@ int UpnpRegisterRootDevice3(
 	HInfo->DeviceList = ixmlDocument_getElementsByTagName(
 		HInfo->DescDocument, "device");
 	if (!HInfo->DeviceList) {
-		CLIENTONLY( ListDestroy(&HInfo->SsdpSearchList, 0); )
+#ifdef INCLUDE_CLIENT_APIS
+		ListDestroy(&HInfo->SsdpSearchList, 0);
+#endif /* INCLUDE_CLIENT_APIS */
 		ixmlDocument_free(HInfo->DescDocument);
 		FreeHandle(*Hnd);
 		UpnpPrintf(UPNP_CRITICAL, API, __FILE__, __LINE__,
@@ -1184,7 +1195,9 @@ int UpnpUnRegisterRootDevice(UpnpDevice_Handle Hnd)
     ixmlNodeList_free( HInfo->ServiceList );
     ixmlDocument_free( HInfo->DescDocument );
 
-    CLIENTONLY( ListDestroy( &HInfo->SsdpSearchList, 0 ); )
+#ifdef INCLUDE_CLIENT_APIS
+    ListDestroy( &HInfo->SsdpSearchList, 0 );
+#endif /* INCLUDE_CLIENT_APIS */
 
 #ifdef INTERNAL_WEB_SERVER
     if( HInfo->aliasInstalled ) {
@@ -3303,7 +3316,7 @@ int UpnpGetIfInfo(const char *IfName)
 #ifdef INCLUDE_CLIENT_APIS
 void UpnpThreadDistribution(struct UpnpNonblockParam *Param)
 {
-	int errCode = 0;
+	/*int errCode = 0;*/
 
 	UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
 		"Inside UpnpThreadDistribution \n");
@@ -3311,84 +3324,84 @@ void UpnpThreadDistribution(struct UpnpNonblockParam *Param)
 	switch (Param->FunName) {
 #if EXCLUDE_GENA == 0
 	case SUBSCRIBE: {
-		UpnpEventSubscribe *evt = UpnpEventSubscribe_new();
+		struct Upnp_Event_Subscribe Evt;
 		/* Cast away constness */
-		UpnpString *Sid = (UpnpString *)UpnpEventSubscribe_get_SID(evt);
-
-		UpnpEventSubscribe_strcpy_PublisherUrl(evt, Param->Url);
-		errCode = genaSubscribe(
+		/*UpnpString *Sid = (UpnpString *)UpnpEventSubscribe_get_SID(evt);*/
+		UpnpString *Sid = UpnpString_new();
+		UpnpString *Url = UpnpString_new();
+		UpnpString_set_String(Url, Param->Url);
+		UpnpString_set_String(Sid, (char *)Evt.Sid);
+		Evt.ErrCode = genaSubscribe(
 			Param->Handle,
-			UpnpEventSubscribe_get_PublisherUrl(evt),
+			Url,
 			(int *)&Param->TimeOut,
 			Sid);
-		UpnpEventSubscribe_set_ErrCode(evt, errCode);
-		UpnpEventSubscribe_set_TimeOut(evt, Param->TimeOut);
-		Param->Fun(UPNP_EVENT_SUBSCRIBE_COMPLETE, evt, Param->Cookie);
-	    	UpnpEventSubscribe_delete(evt);
+		strcpy(Evt.PublisherUrl, Param->Url);
+		Evt.TimeOut = Param->TimeOut;
+		Param->Fun(UPNP_EVENT_SUBSCRIBE_COMPLETE, &Evt, Param->Cookie);
+		UpnpString_delete(Sid);
+		UpnpString_delete(Url);
 		free(Param);
 		break;
 	}
 	case UNSUBSCRIBE: {
-		UpnpEventSubscribe *evt = UpnpEventSubscribe_new();
-		UpnpEventSubscribe_strcpy_SID(evt, Param->SubsId);
-		errCode = genaUnSubscribe(
+		struct Upnp_Event_Subscribe Evt;
+		UpnpString *Sid = UpnpString_new();
+		UpnpString_set_String(Sid, Param->SubsId);
+		Evt.ErrCode = genaUnSubscribe(
 			Param->Handle,
-			UpnpEventSubscribe_get_SID(evt));
-		UpnpEventSubscribe_set_ErrCode(evt, errCode);
-		UpnpEventSubscribe_strcpy_PublisherUrl(evt, "");
-		UpnpEventSubscribe_set_TimeOut(evt, 0);
-		Param->Fun(UPNP_EVENT_UNSUBSCRIBE_COMPLETE, evt, Param->Cookie);
-		UpnpEventSubscribe_delete(evt);
+			Sid);
+		strcpy((char *)Evt.Sid, UpnpString_get_String(Sid));
+		strcpy(Evt.PublisherUrl, "");
+		Evt.TimeOut = 0;
+		Param->Fun(UPNP_EVENT_UNSUBSCRIBE_COMPLETE, &Evt, Param->Cookie);
+		UpnpString_delete(Sid);
 		free(Param);
 		break;
 	}
 	case RENEW: {
-		UpnpEventSubscribe *evt = UpnpEventSubscribe_new();
-		UpnpEventSubscribe_strcpy_SID(evt, Param->SubsId);
-		errCode = genaRenewSubscription(
+		struct Upnp_Event_Subscribe Evt;
+		UpnpString *Sid = UpnpString_new();
+		UpnpString_set_String(Sid, Param->SubsId);
+		Evt.ErrCode = genaRenewSubscription(
 			Param->Handle,
-			UpnpEventSubscribe_get_SID(evt),
+			Sid,
 			&Param->TimeOut);
-		UpnpEventSubscribe_set_ErrCode(evt, errCode);
-		UpnpEventSubscribe_set_TimeOut(evt, Param->TimeOut);
-		Param->Fun(UPNP_EVENT_RENEWAL_COMPLETE, evt, Param->Cookie);
-		UpnpEventSubscribe_delete(evt);
+		Evt.TimeOut = Param->TimeOut;
+		strcpy((char *)Evt.Sid, UpnpString_get_String(Sid));
+		Param->Fun(UPNP_EVENT_RENEWAL_COMPLETE, &Evt, Param->Cookie);
+		UpnpString_delete(Sid);
 		free(Param);
 		break;
 	}
 #endif /* EXCLUDE_GENA == 0 */
 #if EXCLUDE_SOAP == 0
 	case ACTION: {
-		UpnpActionComplete *Evt = UpnpActionComplete_new();
-		IXML_Document *actionResult = NULL;
-		int errCode = SoapSendAction(
+		struct Upnp_Action_Complete Evt;
+		Evt.ActionResult = NULL;
+		Evt.ErrCode = SoapSendAction(
 			Param->Url,
 			Param->ServiceType,
-			Param->Act,
-			&actionResult);
-		UpnpActionComplete_set_ErrCode(Evt, errCode);
-		UpnpActionComplete_set_ActionRequest(Evt, Param->Act);
-		UpnpActionComplete_set_ActionResult(Evt, actionResult);
-		UpnpActionComplete_strcpy_CtrlUrl(Evt, Param->Url);
-		Param->Fun(UPNP_CONTROL_ACTION_COMPLETE, Evt, Param->Cookie);
+			Param->Act, &Evt.ActionResult);
+		Evt.ActionRequest = Param->Act;
+		strcpy(Evt.CtrlUrl, Param->Url);
+		Param->Fun(UPNP_CONTROL_ACTION_COMPLETE, &Evt, Param->Cookie);
+		ixmlDocument_free(Evt.ActionRequest);
+		ixmlDocument_free(Evt.ActionResult);
 		free(Param);
-		UpnpActionComplete_delete(Evt);
 		break;
 	}
 	case STATUS: {
-		UpnpStateVarComplete *Evt = UpnpStateVarComplete_new();
-		DOMString currentVal = NULL;
-		int errCode = SoapGetServiceVarStatus(
+		struct Upnp_State_Var_Complete Evt;
+		Evt.ErrCode = SoapGetServiceVarStatus(
 			Param->Url,
 			Param->VarName,
-			&currentVal);
-		UpnpStateVarComplete_set_ErrCode(Evt, errCode);
-		UpnpStateVarComplete_strcpy_CtrlUrl(Evt, Param->Url);
-		UpnpStateVarComplete_strcpy_StateVarName(Evt, Param->VarName);
-		UpnpStateVarComplete_set_CurrentVal(Evt, currentVal);
-		Param->Fun(UPNP_CONTROL_GET_VAR_COMPLETE, Evt, Param->Cookie);
+			&Evt.CurrentVal);
+		strcpy(Evt.StateVarName, Param->VarName);
+		strcpy(Evt.CtrlUrl, Param->Url);
+		Param->Fun(UPNP_CONTROL_GET_VAR_COMPLETE, &Evt, Param->Cookie);
+		free(Evt.CurrentVal);
 		free(Param);
-		UpnpStateVarComplete_delete(Evt);
 		break;
 	}
 #endif /* EXCLUDE_SOAP == 0 */

upnp/src/gena/gena_ctrlpt.c

@@ -42,7 +42,6 @@
 #ifdef INCLUDE_CLIENT_APIS
 
 
-#include "EventSubscribe.h"
 #include "gena.h"
 #include "httpparser.h"
 #include "httpreadwrite.h"
@@ -65,7 +64,7 @@ static void GenaAutoRenewSubscription(
 	IN void *input)
 {
 	upnp_timeout *event = (upnp_timeout *) input;
-	UpnpEventSubscribe *sub_struct = (UpnpEventSubscribe *)event->Event;
+        struct Upnp_Event_Subscribe *sub_struct = (struct Upnp_Event_Subscribe *)event->Event;
 	void *cookie;
 	Upnp_FunPtr callback_fun;
 	struct Handle_Info *handle_info;
@@ -73,21 +72,23 @@ static void GenaAutoRenewSubscription(
 	int eventType = 0;
 	int timeout = 0;
 	int errCode = 0;
+	UpnpString *tmpSID = UpnpString_new();
 
 	if (AUTO_RENEW_TIME == 0) {
 		UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__, "GENA SUB EXPIRED");
-		UpnpEventSubscribe_set_ErrCode(sub_struct, UPNP_E_SUCCESS);
+		sub_struct->ErrCode = UPNP_E_SUCCESS;
 		send_callback = 1;
 		eventType = UPNP_EVENT_SUBSCRIPTION_EXPIRED;
 	} else {
 		UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, "GENA AUTO RENEW");
-		timeout = UpnpEventSubscribe_get_TimeOut(sub_struct);
+		timeout = sub_struct->TimeOut;
+		UpnpString_set_String(tmpSID, sub_struct->Sid);
 		errCode = genaRenewSubscription(
 			event->handle,
-			UpnpEventSubscribe_get_SID(sub_struct),
+			tmpSID,
 			&timeout);
-		UpnpEventSubscribe_set_ErrCode(sub_struct, errCode);
-		UpnpEventSubscribe_set_TimeOut(sub_struct, timeout);
+		sub_struct->ErrCode = errCode;
+		sub_struct->TimeOut = timeout;
 		if (errCode != UPNP_E_SUCCESS &&
 		    errCode != GENA_E_BAD_SID &&
 		    errCode != GENA_E_BAD_HANDLE) {
@@ -115,6 +116,7 @@ static void GenaAutoRenewSubscription(
 	free_upnp_timeout(event);
 
 end_function:
+	UpnpString_delete(tmpSID);
 	return;
 }
 
@@ -133,17 +135,19 @@ static int ScheduleGenaAutoRenew(
 	/*! [in] Subscription being renewed. */
 	IN ClientSubscription *sub)
 {
-	UpnpEventSubscribe *RenewEventStruct = NULL;
+	struct Upnp_Event_Subscribe *RenewEventStruct = NULL;
 	upnp_timeout *RenewEvent = NULL;
 	int return_code = GENA_SUCCESS;
 	ThreadPoolJob job;
+	const UpnpString *tmpSID = UpnpClientSubscription_get_SID(sub);
+	const UpnpString *tmpEventURL = UpnpClientSubscription_get_EventURL(sub);
 
 	if (TimeOut == UPNP_INFINITE) {
 		return_code = GENA_SUCCESS;
 		goto end_function;
 	}
 
-	RenewEventStruct = UpnpEventSubscribe_new();
+	RenewEventStruct = (struct Upnp_Event_Subscribe *)malloc(sizeof (struct Upnp_Event_Subscribe));
 	if (RenewEventStruct == NULL) {
 		return_code = UPNP_E_OUTOF_MEMORY;
 		goto end_function;
@@ -157,10 +161,11 @@ static int ScheduleGenaAutoRenew(
 	}
 
 	// schedule expire event
-	UpnpEventSubscribe_set_ErrCode(RenewEventStruct, UPNP_E_SUCCESS);
-	UpnpEventSubscribe_set_TimeOut(RenewEventStruct, TimeOut);
-	UpnpEventSubscribe_set_SID(RenewEventStruct, GenlibClientSubscription_get_SID(sub));
-	UpnpEventSubscribe_set_PublisherUrl(RenewEventStruct, GenlibClientSubscription_get_EventURL(sub));
+	RenewEventStruct->ErrCode = UPNP_E_SUCCESS;
+	RenewEventStruct->TimeOut = TimeOut;
+	strcpy(RenewEventStruct->Sid, UpnpString_get_String(tmpSID));
+	strncpy(RenewEventStruct->PublisherUrl,
+		UpnpString_get_String(tmpEventURL), NAME_SIZE - 1);
 
 	// RenewEvent->EventType=UPNP_EVENT_SUBSCRIPTION_EXPIRE;
 	RenewEvent->handle = client_handle;
@@ -183,12 +188,11 @@ static int ScheduleGenaAutoRenew(
 		goto end_function;
 	}
 
-	GenlibClientSubscription_set_RenewEventId(sub, RenewEvent->eventId);
+	UpnpClientSubscription_set_RenewEventId(sub, RenewEvent->eventId);
 
 	return_code = GENA_SUCCESS;
 
 end_function:
-
 	return return_code;
 }
 
@@ -316,18 +320,18 @@ static int gena_subscribe(
 			"TIMEOUT: Second-", timeout_str );
 	} else {
 		// subscribe
-		if( dest_url.hostport.IPaddress.ss_family == AF_INET6 ) {
+		if (dest_url.hostport.IPaddress.ss_family == AF_INET6) {
 			struct sockaddr_in6* DestAddr6 = (struct sockaddr_in6*)&dest_url.hostport.IPaddress;
 			return_code = http_MakeMessage(
 				&request, 1, 1,
 				"q" "sssdsc" "sc" "sscc",
 				HTTPMETHOD_SUBSCRIBE, &dest_url,
 				"CALLBACK: <http://[",
-				((IN6_IS_ADDR_LINKLOCAL(DestAddr6))||(strlen(gIF_IPV6_ULA_GUA) == 0 ))?
-						gIF_IPV6 : gIF_IPV6_ULA_GUA,
+				(IN6_IS_ADDR_LINKLOCAL(&DestAddr6->sin6_addr) || strlen(gIF_IPV6_ULA_GUA) == 0) ?
+					gIF_IPV6 : gIF_IPV6_ULA_GUA,
 				"]:", LOCAL_PORT_V6, "/>",
 				"NT: upnp:event",
-				"TIMEOUT: Second-", timeout_str );
+				"TIMEOUT: Second-", timeout_str);
 		} else {
 			return_code = http_MakeMessage(
 				&request, 1, 1,
@@ -398,7 +402,7 @@ static int gena_subscribe(
 
 int genaUnregisterClient(UpnpClient_Handle client_handle)
 {
-	ClientSubscription *sub_copy = GenlibClientSubscription_new();
+	ClientSubscription *sub_copy = UpnpClientSubscription_new();
 	int return_code = UPNP_E_SUCCESS;
 	struct Handle_Info *handle_info = NULL;
 	http_parser_t response;
@@ -415,16 +419,16 @@ int genaUnregisterClient(UpnpClient_Handle client_handle)
 			return_code = UPNP_E_SUCCESS;
 			break;
 		}
-		GenlibClientSubscription_assign(sub_copy, handle_info->ClientSubList);
+		UpnpClientSubscription_assign(sub_copy, handle_info->ClientSubList);
 		RemoveClientSubClientSID(
 			&handle_info->ClientSubList,
-			GenlibClientSubscription_get_SID(sub_copy));
+			UpnpClientSubscription_get_SID(sub_copy));
 
 		HandleUnlock();
 
 		return_code = gena_unsubscribe(
-			GenlibClientSubscription_get_EventURL(sub_copy),
-			GenlibClientSubscription_get_ActualSID(sub_copy),
+			UpnpClientSubscription_get_EventURL(sub_copy),
+			UpnpClientSubscription_get_ActualSID(sub_copy),
 			&response);
 		if (return_code == 0) {
 			httpmsg_destroy(&response.msg);
@@ -436,7 +440,7 @@ int genaUnregisterClient(UpnpClient_Handle client_handle)
 	HandleUnlock();
 
 exit_function:
-	GenlibClientSubscription_delete(sub_copy);
+	UpnpClientSubscription_delete(sub_copy);
 	return return_code;
 }
 
@@ -449,7 +453,7 @@ int genaUnSubscribe(
 	ClientSubscription *sub = NULL;
 	int return_code = GENA_SUCCESS;
 	struct Handle_Info *handle_info;
-	ClientSubscription *sub_copy = GenlibClientSubscription_new();
+	ClientSubscription *sub_copy = UpnpClientSubscription_new();
 	http_parser_t response;
 
 	// validate handle and sid
@@ -465,12 +469,12 @@ int genaUnSubscribe(
 		return_code = GENA_E_BAD_SID;
 		goto exit_function;
 	}
-	GenlibClientSubscription_assign(sub_copy, sub);
+	UpnpClientSubscription_assign(sub_copy, sub);
 	HandleUnlock();
 
 	return_code = gena_unsubscribe(
-		GenlibClientSubscription_get_EventURL(sub_copy),
-		GenlibClientSubscription_get_ActualSID(sub_copy),
+		UpnpClientSubscription_get_EventURL(sub_copy),
+		UpnpClientSubscription_get_ActualSID(sub_copy),
 		&response);
 	if (return_code == 0) {
 		httpmsg_destroy(&response.msg);
@@ -487,7 +491,7 @@ int genaUnSubscribe(
 	HandleUnlock();
 
 exit_function:
-	GenlibClientSubscription_delete(sub_copy);
+	UpnpClientSubscription_delete(sub_copy);
 	return return_code;
 }
 #endif /* INCLUDE_CLIENT_APIS */
@@ -501,7 +505,7 @@ int genaSubscribe(
 	UpnpString *out_sid)
 {
 	int return_code = GENA_SUCCESS;
-	ClientSubscription *newSubscription = GenlibClientSubscription_new();
+	ClientSubscription *newSubscription = UpnpClientSubscription_new();
 	uuid_upnp uid;
 	Upnp_SID temp_sid;
 	Upnp_SID temp_sid2;
@@ -552,11 +556,11 @@ int genaSubscribe(
 		return_code = UPNP_E_OUTOF_MEMORY;
 		goto error_handler;
 	}
-	GenlibClientSubscription_set_RenewEventId(newSubscription, -1);
-	GenlibClientSubscription_set_SID(newSubscription, out_sid);
-	GenlibClientSubscription_set_ActualSID(newSubscription, ActualSID);
-	GenlibClientSubscription_set_EventURL(newSubscription, EventURL);
-	GenlibClientSubscription_set_Next(newSubscription, handle_info->ClientSubList);
+	UpnpClientSubscription_set_RenewEventId(newSubscription, -1);
+	UpnpClientSubscription_set_SID(newSubscription, out_sid);
+	UpnpClientSubscription_set_ActualSID(newSubscription, ActualSID);
+	UpnpClientSubscription_set_EventURL(newSubscription, EventURL);
+	UpnpClientSubscription_set_Next(newSubscription, handle_info->ClientSubList);
 	handle_info->ClientSubList = newSubscription;
 
 	// schedule expiration event
@@ -566,7 +570,7 @@ error_handler:
 	if (return_code != UPNP_E_SUCCESS) {
 		UpnpString_delete(ActualSID);
 		UpnpString_delete(EventURL);
-		GenlibClientSubscription_delete(newSubscription);
+		UpnpClientSubscription_delete(newSubscription);
 	}
 	HandleUnlock();
 	SubscribeUnlock();
@@ -583,7 +587,7 @@ int genaRenewSubscription(
 {
 	int return_code = GENA_SUCCESS;
 	ClientSubscription *sub = NULL;
-	ClientSubscription *sub_copy = GenlibClientSubscription_new();
+	ClientSubscription *sub_copy = UpnpClientSubscription_new();
 	struct Handle_Info *handle_info;
 	UpnpString *ActualSID = UpnpString_new();
 	ThreadPoolJob tempJob;
@@ -609,22 +613,22 @@ int genaRenewSubscription(
 	// remove old events
 	if (TimerThreadRemove(
 		&gTimerThread,
-		GenlibClientSubscription_get_RenewEventId(sub),
+		UpnpClientSubscription_get_RenewEventId(sub),
 		&tempJob) == 0 ) {
 		free_upnp_timeout((upnp_timeout *)tempJob.arg);
 	}
 
 	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, "REMOVED AUTO RENEW  EVENT");
 
-	GenlibClientSubscription_set_RenewEventId(sub, -1);
-	GenlibClientSubscription_assign(sub_copy, sub);
+	UpnpClientSubscription_set_RenewEventId(sub, -1);
+	UpnpClientSubscription_assign(sub_copy, sub);
 
 	HandleUnlock();
 
 	return_code = gena_subscribe(
-		GenlibClientSubscription_get_EventURL(sub_copy),
+		UpnpClientSubscription_get_EventURL(sub_copy),
 		TimeOut,
-		GenlibClientSubscription_get_ActualSID(sub_copy),
+		UpnpClientSubscription_get_ActualSID(sub_copy),
 		ActualSID);
 
 	HandleLock();
@@ -655,21 +659,21 @@ int genaRenewSubscription(
 	}
 
 	// store actual sid
-	GenlibClientSubscription_set_ActualSID(sub, ActualSID);
+	UpnpClientSubscription_set_ActualSID(sub, ActualSID);
 
 	// start renew subscription timer
 	return_code = ScheduleGenaAutoRenew(client_handle, *TimeOut, sub);
 	if (return_code != GENA_SUCCESS) {
 		RemoveClientSubClientSID(
 			&handle_info->ClientSubList,
-			GenlibClientSubscription_get_SID(sub));
+			UpnpClientSubscription_get_SID(sub));
 	}
 	free_client_subscription(sub_copy);
 	HandleUnlock();
 
 exit_function:
 	UpnpString_delete(ActualSID);
-	GenlibClientSubscription_delete(sub_copy);
+	UpnpClientSubscription_delete(sub_copy);
 	return return_code;
 }
 
@@ -678,7 +682,7 @@ void gena_process_notification_event(
 	SOCKINFO *info,
 	http_message_t *event)
 {
-	UpnpEvent *event_struct = UpnpEvent_new();
+	struct Upnp_Event event_struct;
 	IXML_Document *ChangedVars = NULL;
 	int eventKey;
 	token sid;
@@ -687,6 +691,7 @@ void gena_process_notification_event(
 	void *cookie;
 	Upnp_FunPtr callback;
 	UpnpClient_Handle client_handle;
+	const UpnpString *tmpSID = NULL;
 
 	memptr sid_hdr;
 	memptr nt_hdr,
@@ -783,9 +788,10 @@ void gena_process_notification_event(
 	error_respond(info, HTTP_OK, event);
 
 	// fill event struct
-	UpnpEvent_set_EventKey(event_struct, eventKey);
-	UpnpEvent_set_ChangedVariables(event_struct, ChangedVars);
-	UpnpEvent_set_SID(event_struct, GenlibClientSubscription_get_SID(subscription));
+	tmpSID = UpnpClientSubscription_get_SID(subscription);
+	strcpy(event_struct.Sid, UpnpString_get_String(tmpSID));
+	event_struct.EventKey = eventKey;
+	event_struct.ChangedVariables = ChangedVars;
 
 	// copy callback
 	callback = handle_info->Callback;
@@ -797,11 +803,10 @@ void gena_process_notification_event(
 	// In future, should find a way of mainting
 	// that the handle is not unregistered in the middle of a
 	// callback
-	callback(UPNP_EVENT_RECEIVED, event_struct, cookie);
+	callback(UPNP_EVENT_RECEIVED, &event_struct, cookie);
 
 exit_function:
 	ixmlDocument_free(ChangedVars);
-	UpnpEvent_delete(event_struct);
 }
 
 

upnp/src/gena/gena_device.c

@@ -178,70 +178,76 @@ static UPNP_INLINE int notify_send_and_recv(
 	/*! [out] The response from the control point. */
 	http_parser_t *response)
 {
-    uri_type url;
-    int conn_fd;
-    membuffer start_msg;
-    int ret_code;
-    int err_code;
-    int timeout;
-    SOCKINFO info;
+	uri_type url;
+	int conn_fd;
+	membuffer start_msg;
+	int ret_code;
+	int err_code;
+	int timeout;
+	SOCKINFO info;
 
-    // connect
-    UpnpPrintf( UPNP_ALL, GENA, __FILE__, __LINE__,
-        "gena notify to: %.*s\n",
-        (int)destination_url->hostport.text.size,
-        destination_url->hostport.text.buff );
+	/* connect */
+	UpnpPrintf(UPNP_ALL, GENA, __FILE__, __LINE__,
+		"gena notify to: %.*s\n",
+		(int)destination_url->hostport.text.size,
+		destination_url->hostport.text.buff);
 
-    conn_fd = http_Connect( destination_url, &url );
-    if( conn_fd < 0 ) {
-        return conn_fd;         // return UPNP error
-    }
+	conn_fd = http_Connect(destination_url, &url);
+	if (conn_fd < 0) {
+		/* return UPNP error */
 
-    if( ( ret_code = sock_init( &info, conn_fd ) ) != 0 ) {
-        sock_destroy( &info, SD_BOTH );
-        return ret_code;
-    }
-    // make start line and HOST header
-    membuffer_init( &start_msg );
-    if (http_MakeMessage(
-        &start_msg, 1, 1,
-        "q" "s",
-        HTTPMETHOD_NOTIFY, &url,
-        mid_msg->buf ) != 0 ) {
-        membuffer_destroy( &start_msg );
-        sock_destroy( &info, SD_BOTH );
-        return UPNP_E_OUTOF_MEMORY;
-    }
+		return conn_fd;
+	}
 
-    timeout = HTTP_DEFAULT_TIMEOUT;
+	ret_code = sock_init(&info, conn_fd);
+	if (ret_code) {
+		sock_destroy(&info, SD_BOTH);
 
-    // send msg (note +1 for propertyset; null-terminator is also sent)
-    if( ( ret_code = http_SendMessage( &info, &timeout,
-                                       "bb",
-                                       start_msg.buf, start_msg.length,
-                                       propertySet,
-                                       strlen( propertySet ) + 1 ) ) !=
-        0 ) {
-        membuffer_destroy( &start_msg );
-        sock_destroy( &info, SD_BOTH );
-        return ret_code;
-    }
+		return ret_code;
+	}
+	/* make start line and HOST header */
+	membuffer_init(&start_msg);
+	if (http_MakeMessage(
+			&start_msg, 1, 1,
+			"q" "s",
+			HTTPMETHOD_NOTIFY, &url,
+			mid_msg->buf) != 0) {
+		membuffer_destroy(&start_msg);
+		sock_destroy(&info, SD_BOTH);
 
-    if( ( ret_code = http_RecvMessage( &info, response,
-                                       HTTPMETHOD_NOTIFY, &timeout,
-                                       &err_code ) ) != 0 ) {
-        membuffer_destroy( &start_msg );
-        sock_destroy( &info, SD_BOTH );
-        httpmsg_destroy( &response->msg );
-        return ret_code;
-    }
+		return UPNP_E_OUTOF_MEMORY;
+	}
 
-    sock_destroy( &info, SD_BOTH ); //should shutdown completely
-    //when closing socket
-    //  sock_destroy( &info,SD_RECEIVE);
-    membuffer_destroy( &start_msg );
+	timeout = HTTP_DEFAULT_TIMEOUT;
 
-    return UPNP_E_SUCCESS;
+	/* send msg (note: end of notification will contain "\r\n" twice) */
+	ret_code = http_SendMessage(&info, &timeout,
+		"bbb",
+		start_msg.buf, start_msg.length,
+		propertySet, strlen(propertySet),
+		"\r\n", 2);
+	if (ret_code) {
+		membuffer_destroy(&start_msg);
+		sock_destroy(&info, SD_BOTH);
+
+		return ret_code;
+	}
+
+	ret_code = http_RecvMessage(&info, response,
+		HTTPMETHOD_NOTIFY, &timeout, &err_code);
+	if (ret_code) {
+		membuffer_destroy(&start_msg);
+		sock_destroy(&info, SD_BOTH);
+		httpmsg_destroy(&response->msg);
+
+		return ret_code;
+	}
+
+	/* should shutdown completely when closing socket */
+	sock_destroy(&info, SD_BOTH);
+	membuffer_destroy(&start_msg);
+
+	return UPNP_E_SUCCESS;
 }
 
 
@@ -336,7 +342,12 @@ static void genaNotifyThread(
     struct Handle_Info *handle_info;
     ThreadPoolJob job;
 
-    HandleReadLock();
+    /* This should be a HandleLock and not a HandleReadLock otherwise if there
+     * is a lot of notifications, then multiple threads will acquire a read
+     * lock and the thread which sends the notification will be blocked forever
+     * on the HandleLock at the end of this function. */
+    //HandleReadLock();
+    HandleLock();
     //validate context
 
     if( GetHandleInfo( in->device_handle, &handle_info ) != HND_DEVICE ) {
@@ -354,18 +365,27 @@ static void genaNotifyThread(
         HandleUnlock();
         return;
     }
+
+#ifdef UPNP_ENABLE_NOTIFICATION_REORDERING
     //If the event is out of order push it back to the job queue
     if( in->eventKey != sub->ToSendEventKey ) {
 
         TPJobInit( &job, ( start_routine ) genaNotifyThread, input );
         TPJobSetFreeFunction( &job, ( free_function ) free_notify_struct );
         TPJobSetPriority( &job, MED_PRIORITY );
+
+        /* Sleep a little before creating another thread otherwise if there is
+         * a lot of notifications to send, the device will take 100% of the CPU
+         * to create threads and push them back to the job queue. */
+        imillisleep( 1 );
+
         ThreadPoolAdd( &gSendThreadPool, &job, NULL );
 
         freeSubscription( &sub_copy );
         HandleUnlock();
         return;
     }
+#endif
 
     HandleUnlock();
 
@@ -1190,7 +1210,7 @@ void gena_process_subscription_request(
 	SOCKINFO *info,
 	http_message_t *request)
 {
-	UpnpSubscriptionRequest *request_struct = UpnpSubscriptionRequest_new();
+	struct Upnp_Subscription_Request request_struct;
 	Upnp_SID temp_sid;
 	int return_code = 1;
 	int time_out = 1801;
@@ -1349,9 +1369,9 @@ void gena_process_subscription_request(
 	service->TotalSubscriptions++;
 
 	// finally generate callback for init table dump
-	UpnpSubscriptionRequest_strcpy_ServiceId(request_struct, service->serviceId);
-	UpnpSubscriptionRequest_strcpy_UDN(request_struct, service->UDN);
-	UpnpSubscriptionRequest_strcpy_SID(request_struct, sub->sid);
+	request_struct.ServiceId = service->serviceId;
+	request_struct.UDN = service->UDN;
+	strcpy((char *)request_struct.Sid, sub->sid);
 
 	// copy callback
 	callback_fun = handle_info->Callback;
@@ -1362,10 +1382,10 @@ void gena_process_subscription_request(
 	// make call back with request struct
 	// in the future should find a way of mainting that the handle
 	// is not unregistered in the middle of a callback
-	callback_fun(UPNP_EVENT_SUBSCRIPTION_REQUEST, request_struct, cookie);
+	callback_fun(UPNP_EVENT_SUBSCRIPTION_REQUEST, &request_struct, cookie);
 
 exit_function:
-	UpnpSubscriptionRequest_delete(request_struct);
+	return;
 }
 
 

upnp/src/genlib/client_table/ClientSubscription.c

@@ -1,200 +0,0 @@
-
-/************************************************************************
- * 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 "ClientSubscription.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;
-};
-
-
-ClientSubscription *GenlibClientSubscription_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;
-}
-
-
-void GenlibClientSubscription_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);
-}
-
-
-ClientSubscription *GenlibClientSubscription_dup(const ClientSubscription *p)
-{
-	ClientSubscription *q = GenlibClientSubscription_new();
-	
-	GenlibClientSubscription_assign(q, p);
-	
-	return q;
-}
-
-
-void GenlibClientSubscription_assign(ClientSubscription *q, const ClientSubscription *p)
-{
-	if (q != p) {
-		/*struct SClientSubscription *_p = (struct SClientSubscription *)p;*/
-		struct SClientSubscription *_q = (struct SClientSubscription *)q;
-		// Do not copy RenewEventId
-		_q->m_renewEventId = -1;
-		GenlibClientSubscription_set_SID(q, GenlibClientSubscription_get_SID(p));
-		GenlibClientSubscription_set_ActualSID(q, GenlibClientSubscription_get_ActualSID(p));
-		GenlibClientSubscription_set_EventURL(q, GenlibClientSubscription_get_EventURL(p));
-		// Do not copy m_next
-		_q->m_next = NULL;
-	}
-}
-
-
-int GenlibClientSubscription_get_RenewEventId(const ClientSubscription *p)
-{
-	return ((struct SClientSubscription *)p)->m_renewEventId;
-}
-
-
-void GenlibClientSubscription_set_RenewEventId(ClientSubscription *p, int n)
-{
-	((struct SClientSubscription *)p)->m_renewEventId = n;
-}
-
-
-const UpnpString *GenlibClientSubscription_get_SID(const ClientSubscription *p)
-{
-	return ((struct SClientSubscription *)p)->m_SID;
-}
-
-const char *GenlibClientSubscription_get_SID_cstr(const ClientSubscription *p)
-{
-	return UpnpString_get_String(GenlibClientSubscription_get_SID(p));
-}
-
-
-void GenlibClientSubscription_set_SID(ClientSubscription *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SClientSubscription *)p)->m_SID);
-	((struct SClientSubscription *)p)->m_SID = UpnpString_dup(s);
-}
-
-
-void GenlibClientSubscription_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 *GenlibClientSubscription_get_ActualSID(const ClientSubscription *p)
-{
-	return ((struct SClientSubscription *)p)->m_actualSID;
-}
-
-
-const char *GenlibClientSubscription_get_ActualSID_cstr(const ClientSubscription *p)
-{
-	return UpnpString_get_String(GenlibClientSubscription_get_ActualSID(p));
-}
-
-
-void GenlibClientSubscription_set_ActualSID(ClientSubscription *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SClientSubscription *)p)->m_actualSID);
-	((struct SClientSubscription *)p)->m_actualSID = UpnpString_dup(s);
-}
-
-
-void GenlibClientSubscription_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 *GenlibClientSubscription_get_EventURL(const ClientSubscription *p)
-{
-	return ((struct SClientSubscription *)p)->m_eventURL;
-}
-
-
-const char *GenlibClientSubscription_get_EventURL_cstr(const ClientSubscription *p)
-{
-	return UpnpString_get_String(GenlibClientSubscription_get_EventURL(p));
-}
-
-
-void GenlibClientSubscription_set_EventURL(ClientSubscription *p, const UpnpString *s)
-{
-	UpnpString_delete(((struct SClientSubscription *)p)->m_eventURL);
-	((struct SClientSubscription *)p)->m_eventURL = UpnpString_dup(s);
-}
-
-
-void GenlibClientSubscription_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 *GenlibClientSubscription_get_Next(const ClientSubscription *p)
-{
-	return (ClientSubscription *)(((struct SClientSubscription *)p)->m_next);
-}
-
-
-void GenlibClientSubscription_set_Next(ClientSubscription *p, ClientSubscription *q)
-{
-	((struct SClientSubscription *)p)->m_next = (struct SClientSubscription *)q;
-}
-
-
- #endif /* INCLUDE_CLIENT_APIS */
-

upnp/src/genlib/client_table/client_table.c

@@ -1,3 +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.
+ *
+ ******************************************************************************/
 
 /************************************************************************
  * Purpose: This file defines the functions for clients. It defines 
@@ -19,14 +49,194 @@
 #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 = GenlibClientSubscription_get_RenewEventId(sub);
-		GenlibClientSubscription_strcpy_ActualSID(sub, "");
-		GenlibClientSubscription_strcpy_EventURL(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
@@ -35,7 +245,7 @@ void free_client_subscription(ClientSubscription *sub)
 				free_upnp_timeout(event);
 			}
 		}
-		GenlibClientSubscription_set_RenewEventId(sub, -1);
+		UpnpClientSubscription_set_RenewEventId(sub, -1);
 	}
 }
 
@@ -45,8 +255,8 @@ void freeClientSubList(ClientSubscription *list)
 	ClientSubscription *next;
 	while (list) {
 		free_client_subscription(list);
-		next = GenlibClientSubscription_get_Next(list);
-		GenlibClientSubscription_delete(list);
+		next = UpnpClientSubscription_get_Next(list);
+		UpnpClientSubscription_delete(list);
 		list = next;
 	}
 }
@@ -60,20 +270,20 @@ void RemoveClientSubClientSID(ClientSubscription **head, const UpnpString *sid)
 	while (finger) {
 		found = !strcmp(
 			UpnpString_get_String(sid),
-			GenlibClientSubscription_get_SID_cstr(finger));
+			UpnpClientSubscription_get_SID_cstr(finger));
 		if (found) {
 			if (previous) {
-				GenlibClientSubscription_set_Next(previous,
-					GenlibClientSubscription_get_Next(finger));
+				UpnpClientSubscription_set_Next(previous,
+					UpnpClientSubscription_get_Next(finger));
 			} else {
-				*head = GenlibClientSubscription_get_Next(finger);
+				*head = UpnpClientSubscription_get_Next(finger);
 			}
-			GenlibClientSubscription_set_Next(finger, NULL);
+			UpnpClientSubscription_set_Next(finger, NULL);
 			freeClientSubList(finger);
 			finger = NULL;
 		} else {
 			previous = finger;
-			finger = GenlibClientSubscription_get_Next(finger);
+			finger = UpnpClientSubscription_get_Next(finger);
 		}
 	}
 }
@@ -85,12 +295,12 @@ ClientSubscription *GetClientSubClientSID(ClientSubscription *head, const UpnpSt
 	int found = 0;
 	while (next) {
 		found = !strcmp(
-			GenlibClientSubscription_get_SID_cstr(next),
+			UpnpClientSubscription_get_SID_cstr(next),
 			UpnpString_get_String(sid));
 		if(found) {
 			break;
 		} else {
-			next = GenlibClientSubscription_get_Next(next);
+			next = UpnpClientSubscription_get_Next(next);
 		}
 	}
 
@@ -103,11 +313,11 @@ ClientSubscription *GetClientSubActualSID(ClientSubscription *head, token *sid)
 	ClientSubscription *next = head;
 	while (next) {
 		if (!memcmp(
-			GenlibClientSubscription_get_ActualSID_cstr(next),
+			UpnpClientSubscription_get_ActualSID_cstr(next),
 			sid->buff, sid->size)) {
 			break;
 		} else {
-			next = GenlibClientSubscription_get_Next(next);
+			next = UpnpClientSubscription_get_Next(next);
 		}
 	}
 
@@ -115,5 +325,5 @@ ClientSubscription *GetClientSubActualSID(ClientSubscription *head, token *sid)
 }
 
 
-#endif /* INCLUDE_CLIENT_APIS */
+ #endif /* INCLUDE_CLIENT_APIS */
 

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

@@ -72,7 +72,6 @@ static str_int_entry Http_Method_Table[NUM_HTTP_METHODS] = {
     {"SUBSCRIBE", HTTPMETHOD_SUBSCRIBE},
     {"UNSUBSCRIBE", HTTPMETHOD_UNSUBSCRIBE},
     {"POST", SOAPMETHOD_POST},
-
 };
 
 #define NUM_HTTP_HEADER_NAMES 33
@@ -113,9 +112,7 @@ str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES] = {
 };
 
 /***********************************************************************/
-
 /*************                 scanner                     *************/
-
 /***********************************************************************/
 
 #define TOKCHAR_CR		0xD
@@ -134,13 +131,11 @@ str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES] = {
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE void
-scanner_init( OUT scanner_t *scanner,
-              IN membuffer *bufptr )
+static UPNP_INLINE void scanner_init(OUT scanner_t *scanner, IN membuffer *bufptr)
 {
-    scanner->cursor = 0;
-    scanner->msg = bufptr;
-    scanner->entire_msg_loaded = FALSE;
+	scanner->cursor = 0;
+	scanner->msg = bufptr;
+	scanner->entire_msg_loaded = FALSE;
 }
 
 /************************************************************************
@@ -155,10 +150,9 @@ scanner_init( OUT scanner_t *scanner,
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
-is_separator_char( IN char c )
+static UPNP_INLINE xboolean is_separator_char(IN char c)
 {
-    return strchr( " \t()<>@,;:\\\"/[]?={}", c ) != NULL;
+    return strchr(" \t()<>@,;:\\\"/[]?={}", c) != NULL;
 }
 
 /************************************************************************
@@ -173,10 +167,9 @@ is_separator_char( IN char c )
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
-is_identifier_char( IN char c )
+static UPNP_INLINE xboolean is_identifier_char(IN char c)
 {
-    return ( c >= 32 && c <= 126 ) && !is_separator_char( c );
+    return c >= 32 && c <= 126 && !is_separator_char(c);
 }
 
 /************************************************************************
@@ -191,10 +184,9 @@ is_identifier_char( IN char c )
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
-is_control_char( IN char c )
+static UPNP_INLINE xboolean is_control_char(IN char c)
 {
-    return ( ( c >= 0 && c <= 31 ) || ( c == 127 ) );
+    return (c >= 0 && c <= 31) || c == 127;
 }
 
 /************************************************************************
@@ -209,8 +201,7 @@ is_control_char( IN char c )
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
-is_qdtext_char( IN char cc )
+static UPNP_INLINE xboolean is_qdtext_char(IN char cc)
 {
     unsigned char c = ( unsigned char )cc;
 
@@ -244,10 +235,10 @@ is_qdtext_char( IN char cc )
 *
 * Note :
 ************************************************************************/
-static parse_status_t
-scanner_get_token( INOUT scanner_t * scanner,
-                   OUT memptr * token,
-                   OUT token_type_t * tok_type )
+static parse_status_t scanner_get_token(
+	INOUT scanner_t *scanner,
+	OUT memptr *token,
+	OUT token_type_t *tok_type)
 {
     char *cursor;
     char *null_terminator;      // point to null-terminator in buffer
@@ -388,57 +379,11 @@ scanner_get_token( INOUT scanner_t * scanner,
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE char *
-scanner_get_str( IN scanner_t * scanner )
+static UPNP_INLINE char *scanner_get_str(IN scanner_t * scanner)
 {
-    return scanner->msg->buf + scanner->cursor;
+	return scanner->msg->buf + scanner->cursor;
 }
 
-/************************************************************************
-* Function :	scanner_pushback
-*
-* Parameters :
-*	INOUT scanner_t* scanner ;	Scanner Object
-*	IN size_t pushback_bytes ;	Bytes to be moved back
-*
-* Description :	Move back by a certain number of bytes.				
-*	This is used to put back one or more tokens back into the input		
-*
-* Return : void ;
-*
-* 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.")
-#else
-	#warning The only use of the function 'scanner_pushback()' in the code is commented out.
-	#warning 'scanner_pushback()' is a candidate for removal.
-#endif
-static UPNP_INLINE void
-scanner_pushback( INOUT scanner_t * scanner,
-                  IN size_t pushback_bytes )
-{
-    scanner->cursor -= pushback_bytes;
-}
-
-/***********************************************************************/
-
-/*************                end of scanner              **************/
-
-/***********************************************************************/
-
-/***********************************************************************/
-
-/*************                    parser                  **************/
-
-/***********************************************************************/
-
-/***********************************************************************/
-
-/*************                 http_message_t             **************/
-
-/***********************************************************************/
 
 /************************************************************************
 * Function :	httpmsg_compare
@@ -453,15 +398,14 @@ scanner_pushback( INOUT scanner_t * scanner,
 *
 * Note :
 ************************************************************************/
-static int
-httpmsg_compare( void *param1,
-                 void *param2 )
+static int httpmsg_compare(void *param1, void *param2)
 {
     assert( param1 != NULL );
     assert( param2 != NULL );
 
-    return ( ( http_header_t * ) param1 )->name_id ==
-        ( ( http_header_t * ) param2 )->name_id;
+    return
+	    ((http_header_t *)param1)->name_id ==
+	    ((http_header_t *)param2)->name_id;
 }
 
 /************************************************************************
@@ -476,8 +420,7 @@ httpmsg_compare( void *param1,
 *
 * Note :
 ************************************************************************/
-static void
-httpheader_free( void *msg )
+static void httpheader_free(void *msg)
 {
     http_header_t *hdr = ( http_header_t * ) msg;
 
@@ -498,8 +441,7 @@ httpheader_free( void *msg )
 *
 * Note :
 ************************************************************************/
-void
-httpmsg_init( INOUT http_message_t * msg )
+void httpmsg_init(INOUT http_message_t *msg)
 {
     msg->initialized = 1;
     msg->entity.buf = NULL;
@@ -521,8 +463,7 @@ httpmsg_init( INOUT http_message_t * msg )
 *
 * Note :
 ************************************************************************/
-void
-httpmsg_destroy( INOUT http_message_t * msg )
+void httpmsg_destroy( INOUT http_message_t * msg )
 {
     assert( msg != NULL );
 
@@ -550,9 +491,9 @@ httpmsg_destroy( INOUT http_message_t * msg )
 *
 * Note :
 ************************************************************************/
-http_header_t *
-httpmsg_find_hdr_str( IN http_message_t * msg,
-                      IN const char *header_name )
+http_header_t *httpmsg_find_hdr_str(
+	IN http_message_t *msg,
+	IN const char *header_name)
 {
     http_header_t *header;
 
@@ -587,27 +528,21 @@ httpmsg_find_hdr_str( IN http_message_t * msg,
 *
 * Note :
 ************************************************************************/
-http_header_t *
-httpmsg_find_hdr( IN http_message_t * msg,
-                  IN int header_name_id,
-                  OUT memptr * value )
+http_header_t *httpmsg_find_hdr(
+	IN http_message_t *msg,
+	IN int header_name_id,
+	OUT memptr *value)
 {
     http_header_t header;       // temp header for searching
-
     ListNode *node;
-
     http_header_t *data;
 
     header.name_id = header_name_id;
-
     node = ListFind( &msg->headers, NULL, &header );
-
     if( node == NULL ) {
         return NULL;
     }
-
     data = ( http_header_t * ) node->item;
-
     if( value != NULL ) {
         value->buf = data->value.buf;
         value->length = data->value.length;
@@ -616,12 +551,6 @@ httpmsg_find_hdr( IN http_message_t * msg,
     return data;
 }
 
-/***********************************************************************/
-
-/*************              http_parser_t                 **************/
-
-/***********************************************************************/
-
 /************************************************************************
 * Function :	skip_blank_lines
 *
@@ -634,26 +563,23 @@ httpmsg_find_hdr( IN http_message_t * msg,
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE int
-skip_blank_lines( INOUT scanner_t * scanner )
+static UPNP_INLINE int skip_blank_lines(INOUT scanner_t *scanner)
 {
-    memptr token;
-    token_type_t tok_type;
-    parse_status_t status;
+	memptr token;
+	token_type_t tok_type;
+	parse_status_t status;
 
-    // skip ws, crlf
-    do {
-        status = scanner_get_token( scanner, &token, &tok_type );
-    } while( status == PARSE_OK &&
-             ( tok_type == TT_WHITESPACE || tok_type == TT_CRLF ) );
+	/* skip ws, crlf */
+	do {
+		status = scanner_get_token(scanner, &token, &tok_type);
+	} while (status == PARSE_OK &&
+		 (tok_type == TT_WHITESPACE || tok_type == TT_CRLF));
+	if (status == PARSE_OK) {
+		/* pushback a non-whitespace token */
+		scanner->cursor -= token.length;
+	}
 
-    if( status == PARSE_OK ) {
-        // pushback a non-whitespace token
-        scanner->cursor -= token.length;
-        //scanner_pushback( scanner, token.length );
-    }
-
-    return status;
+	return status;
 }
 
 /************************************************************************
@@ -671,8 +597,7 @@ skip_blank_lines( INOUT scanner_t * scanner )
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE int
-skip_lws( INOUT scanner_t * scanner )
+static UPNP_INLINE int skip_lws(INOUT scanner_t *scanner)
 {
     memptr token;
     token_type_t tok_type;
@@ -726,9 +651,9 @@ skip_lws( INOUT scanner_t * scanner )
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE parse_status_t
-match_non_ws_string( INOUT scanner_t * scanner,
-                     OUT memptr * str )
+static UPNP_INLINE parse_status_t match_non_ws_string(
+	INOUT scanner_t *scanner,
+	OUT memptr *str)
 {
     memptr token;
     token_type_t tok_type;
@@ -792,9 +717,9 @@ match_non_ws_string( INOUT scanner_t * scanner,
 *
 * Note :
 ************************************************************************/
-static UPNP_INLINE parse_status_t
-match_raw_value( INOUT scanner_t * scanner,
-                 OUT memptr * raw_value )
+static UPNP_INLINE parse_status_t match_raw_value(
+	INOUT scanner_t * scanner,
+	OUT memptr *raw_value)
 {
     memptr token;
     token_type_t tok_type;
@@ -883,10 +808,10 @@ match_raw_value( INOUT scanner_t * scanner,
 *   PARSE_FAILURE		-- bad input
 *   PARSE_INCOMPLETE
 ************************************************************************/
-static UPNP_INLINE int
-match_int( INOUT scanner_t * scanner,
-           IN int base,
-           OUT int *value )
+static UPNP_INLINE int match_int(
+	INOUT scanner_t *scanner,
+	IN int base,
+	OUT int *value)
 {
     memptr token;
     token_type_t   tok_type;
@@ -970,36 +895,6 @@ read_until_crlf( INOUT scanner_t * scanner,
     return status;
 }
 
-/************************************************************************
-* Function: skip_to_end_of_header
-*
-* Parameters:
-*	INOUT scanner_t* scanner ; Scanner Object
-*
-* Description: Skip to end of header
-*
-* Returns:
-*   PARSE_OK
-*   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.")
-#else
-	#warning There are currently no uses of the function 'skip_to_end_of_header()' in the code.
-	#warning 'skip_to_end_of_header()' is a candidate for removal.
-#endif
-static UPNP_INLINE int
-skip_to_end_of_header( INOUT scanner_t * scanner )
-{
-    memptr dummy_raw_value;
-    parse_status_t status;
-
-    status = match_raw_value( scanner, &dummy_raw_value );
-    return status;
-}
-
 /************************************************************************
 * Function: match_char
 *
@@ -1754,140 +1649,6 @@ parser_parse_headers( INOUT http_parser_t * parser )
 
 }
 
-////////////////////////////////////////////////////////////////////////
-#ifdef HIGHLY_UNLIKELY
-// **************
-static parse_status_t
-parser_parse_headers_old( INOUT http_parser_t * parser )
-{
-    parse_status_t status;
-    memptr token;
-    memptr hdr_value;
-    token_type_t tok_type;
-    scanner_t *scanner = &parser->scanner;
-    size_t save_pos;
-    http_header_t *header;
-    int header_id;
-    int ret = 0;
-    int index;
-    http_header_t *orig_header;
-    char save_char;
-    int ret2,
-      ret3;
-
-    assert( parser->position == POS_HEADERS ||
-            parser->ent_position == ENTREAD_CHUNKY_HEADERS );
-
-    while( TRUE ) {
-        save_pos = scanner->cursor;
-
-        //
-        // check end of headers
-        //
-        status = scanner_get_token( scanner, &token, &tok_type );
-        if( status != PARSE_OK ) {
-            return status;
-        }
-
-        if( tok_type == TT_CRLF ) {
-            // end of headers
-            parser->position = POS_ENTITY;  // read entity next
-            return PARSE_OK;
-        }
-        //
-        // not end; read header
-        //
-        if( tok_type != TT_IDENTIFIER ) {
-            return PARSE_FAILURE;   // didn't see header name
-        }
-
-        status = match( scanner, " : %R%c", &hdr_value );
-        if( status != PARSE_OK ) {
-            // pushback tokens; useful only on INCOMPLETE error
-            scanner->cursor = save_pos;
-            return status;
-        }
-
-        //
-        // add header
-        //
-
-        // find header
-        index = map_str_to_int( token.buf, token.length, Http_Header_Names,
-                                NUM_HTTP_HEADER_NAMES, FALSE );
-        if( index != -1 ) {
-            header_id = Http_Header_Names[index].id;
-
-            orig_header =
-                httpmsg_find_hdr( &parser->msg, header_id, NULL );
-        } else {
-            header_id = HDR_UNKNOWN;
-
-            save_char = token.buf[token.length];
-            token.buf[token.length] = '\0';
-
-            orig_header = httpmsg_find_hdr_str( &parser->msg, token.buf );
-
-            token.buf[token.length] = save_char;    // restore
-        }
-
-        if( orig_header == NULL ) {
-            //
-            // add new header
-            //
-
-            header = ( http_header_t * ) malloc( sizeof( http_header_t ) );
-            if( header == NULL ) {
-                parser->http_error_code = HTTP_INTERNAL_SERVER_ERROR;
-                return PARSE_FAILURE;
-            }
-            membuffer_init( &header->multi_hdr_buf );
-
-            header->name = token;
-            header->value = hdr_value;
-            header->name_id = header_id;
-
-            ret = dlist_append( &parser->msg.headers, header );
-            if( ret == UPNP_E_OUTOF_MEMORY ) {
-                parser->http_error_code = HTTP_INTERNAL_SERVER_ERROR;
-                return PARSE_FAILURE;
-            }
-        } else if( hdr_value.length > 0 ) {
-            //
-            // append value to existing header
-            //
-
-            if( orig_header->multi_hdr_buf.buf == NULL ) {
-                // store in buffer
-                ret = membuffer_append( &orig_header->multi_hdr_buf,
-                                        orig_header->value.buf,
-                                        orig_header->value.length );
-            }
-            // append space
-            ret2 =
-                membuffer_append( &orig_header->multi_hdr_buf, ", ", 2 );
-
-            // append continuation of header value
-            ret3 = membuffer_append( &orig_header->multi_hdr_buf,
-                                     hdr_value.buf, hdr_value.length );
-
-            if( ret == UPNP_E_OUTOF_MEMORY ||
-                ret2 == UPNP_E_OUTOF_MEMORY ||
-                ret3 == UPNP_E_OUTOF_MEMORY ) {
-                // not enuf mem
-                parser->http_error_code = HTTP_INTERNAL_SERVER_ERROR;
-                return PARSE_FAILURE;
-            }
-            // header value points to allocated buf
-            orig_header->value.buf = orig_header->multi_hdr_buf.buf;
-            orig_header->value.length = orig_header->multi_hdr_buf.length;
-        }
-    }                           // end while
-
-}
-#endif
-// ******************************
-
 /************************************************************************
 * Function: parser_parse_entity_using_clen
 *
@@ -1909,9 +1670,9 @@ parser_parse_entity_using_clen( INOUT http_parser_t * parser )
     assert( parser->ent_position == ENTREAD_USING_CLEN );
 
     // determine entity (i.e. body) length so far
-    //entity_length = parser->msg.msg.length - parser->entity_start_position;
     parser->msg.entity.length =
-        parser->msg.msg.length - parser->entity_start_position;
+        parser->msg.msg.length - parser->entity_start_position + 
+        parser->msg.entity_offset;
 
     if( parser->msg.entity.length < parser->content_length ) {
         // more data to be read
@@ -1919,7 +1680,8 @@ parser_parse_entity_using_clen( INOUT http_parser_t * parser )
     } else {
         if( parser->msg.entity.length > parser->content_length ) {
             // silently discard extra data
-            parser->msg.msg.buf[parser->entity_start_position +
+            parser->msg.msg.buf[parser->entity_start_position -
+                                parser->msg.entity_offset +
                                 parser->content_length] = '\0';
         }
         // save entity length
@@ -2304,6 +2066,7 @@ parser_response_init( OUT http_parser_t * parser,
     parser_init( parser );
     parser->msg.is_request = FALSE;
     parser->msg.request_method = request_method;
+    parser->msg.entity_offset = 0;
     parser->position = POS_RESPONSE_LINE;
 }
 
@@ -2399,10 +2162,6 @@ parser_append( INOUT http_parser_t * parser,
     return parser_parse( parser );
 }
 
-/************************************************************************
-**********                   end of parser                    ***********
-************************************************************************/
-
 /************************************************************************
 * Function: raw_to_int
 *
@@ -2415,9 +2174,7 @@ parser_append( INOUT http_parser_t * parser,
 * Returns:
 *	 int
 ************************************************************************/
-int
-raw_to_int( IN memptr * raw_value,
-            IN int base )
+int raw_to_int(IN memptr *raw_value, IN int base)
 {
     long  num;
     char *end_ptr;
@@ -2454,9 +2211,7 @@ raw_to_int( IN memptr * raw_value,
 * Returns:
 *	 int - index at which the substring is found.						
 ************************************************************************/
-int
-raw_find_str( IN memptr *raw_value,
-              IN const char *str )
+int raw_find_str(IN memptr *raw_value, IN const char *str)
 {
     char c;
     char *ptr;
@@ -2499,8 +2254,7 @@ raw_find_str( IN memptr *raw_value,
 * Returns:
 *	 const char* ptr - Ptr to the HTTP Method
 ************************************************************************/
-const char *
-method_to_str( IN http_method_t method )
+const char *method_to_str(IN http_method_t method)
 {
     int index;
 
@@ -2544,5 +2298,5 @@ void print_http_headers(http_message_t *hmsg)
         /* NNS: node = dlist_next( &hmsg->headers, node ); */
     }
 }
-#endif
+#endif /* DEBUG */
 

upnp/src/genlib/net/sock.c

@@ -29,304 +29,186 @@
  *
  **************************************************************************/
 
-
-/************************************************************************
- * Purpose: This file implements the sockets functionality 
- ************************************************************************/
-
+/*!
+ * \file
+ *
+ * \brief Implements the sockets functionality.
+ */
 
 #include "config.h"
 
-
 #include "sock.h"
 
-
-#include "unixutil.h" /* for socklen_t, EAFNOSUPPORT */
+#include "unixutil.h"		/* for socklen_t, EAFNOSUPPORT */
 #include "upnp.h"
 
-
 #include <assert.h>
 #include <errno.h>
 #include <time.h>
 #include <string.h>
 
-
 #ifndef MSG_NOSIGNAL
-	#define MSG_NOSIGNAL 0
+#define MSG_NOSIGNAL 0
 #endif
 
-/************************************************************************
-*	Function :	sock_init
-*
-*	Parameters :
-*		OUT SOCKINFO* info ;	Socket Information Object
-*		IN SOCKET sockfd ;	Socket Descriptor
-*
-*	Description :	Assign the passed in socket descriptor to socket 
-*		descriptor in the SOCKINFO structure.
-*
-*	Return : int;
-*		UPNP_E_SUCCESS	
-*		UPNP_E_OUTOF_MEMORY
-*		UPNP_E_SOCKET_ERROR
-*
-*	Note :
-************************************************************************/
-int
-sock_init( OUT SOCKINFO * info,
-           IN SOCKET sockfd )
+int sock_init(OUT SOCKINFO *info, IN SOCKET sockfd)
 {
-    assert( info );
+	assert(info);
 
-    memset( info, 0, sizeof( SOCKINFO ) );
+	memset(info, 0, sizeof(SOCKINFO));
+	info->socket = sockfd;
 
-    info->socket = sockfd;
-
-    return UPNP_E_SUCCESS;
+	return UPNP_E_SUCCESS;
 }
 
-/************************************************************************
-*	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.
-*
-*	Description :	Calls the sock_init function and assigns the passed in
-*		IP address and port to the IP address and port in the SOCKINFO
-*		structure.
-*
-*	Return : int;
-*		UPNP_E_SUCCESS	
-*		UPNP_E_OUTOF_MEMORY
-*		UPNP_E_SOCKET_ERROR
-*
-*	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 SOCKET sockfd,
+	IN struct sockaddr *foreign_sockaddr)
 {
-    int ret;
+	int ret;
 
-    ret = sock_init( info, sockfd );
-    if( ret != UPNP_E_SUCCESS ) {
-        return ret;
-    }
+	ret = sock_init(info, sockfd);
+	if (ret != UPNP_E_SUCCESS) {
+		return ret;
+	}
 
-    memcpy( &info->foreign_sockaddr, foreign_sockaddr, 
-        sizeof( info->foreign_sockaddr) );
+	memcpy(&info->foreign_sockaddr, foreign_sockaddr,
+	       sizeof(info->foreign_sockaddr));
 
-    return UPNP_E_SUCCESS;
+	return UPNP_E_SUCCESS;
 }
 
-/************************************************************************
-*	Function :	sock_destroy
-*
-*	Parameters :
-*		INOUT SOCKINFO* info ;	Socket Information Object
-*		int ShutdownMethod ;	How to shutdown the socket. Used by  
-*								sockets's shutdown() 
-*
-*	Description :	Shutsdown the socket using the ShutdownMethod to 
-*		indicate whether sends and receives on the socket will be 
-*		dis-allowed. After shutting down the socket, closesocket is called
-*		to release system resources used by the socket calls.
-*
-*	Return : int;
-*		UPNP_E_SOCKET_ERROR on failure
-*		UPNP_E_SUCCESS on success
-*
-*	Note :
-************************************************************************/
-int
-sock_destroy( INOUT SOCKINFO * info,
-              int ShutdownMethod )
+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;
-        }
-    }
+	int ret = UPNP_E_SUCCESS;
 
-    return UPNP_E_SUCCESS;
+	if (info->socket != -1) {
+		shutdown(info->socket, ShutdownMethod);
+		if (sock_close(info->socket) == -1) {
+			ret = UPNP_E_SOCKET_ERROR;
+		}
+		info->socket = -1;
+	}
+
+	return ret;
 }
 
-/************************************************************************
-*	Function :	sock_read_write
-*
-*	Parameters :
-*		IN SOCKINFO *info ;	Socket Information Object
-*		OUT char* buffer ;	Buffer to get data to or send data from 
-*		IN size_t bufsize ;	Size of the buffer
-*	    IN int *timeoutSecs ;	timeout value
-*		IN xboolean bRead ;	Boolean value specifying read or write option
-*
-*	Description :	Receives or sends data. Also returns the time taken
-*		to receive or send data.
-*
-*	Return :int ;
-*		numBytes - On Success, no of bytes received or sent		
-*		UPNP_E_TIMEDOUT - Timeout
-*		UPNP_E_SOCKET_ERROR - Error on socket calls
-*
-*	Note :
-************************************************************************/
-static int
-sock_read_write( IN SOCKINFO * info,
-                 OUT char *buffer,
-                 IN size_t bufsize,
-                 IN int *timeoutSecs,
-                 IN xboolean bRead )
+/*!
+ * \brief Receives or sends data. Also returns the time taken to receive or
+ * send data.
+ *
+ * \return
+ *	\li \c numBytes - On Success, no of bytes received or sent or
+ *	\li \c UPNP_E_TIMEDOUT - Timeout
+ *	\li \c UPNP_E_SOCKET_ERROR - Error on socket calls
+ */
+static int sock_read_write(
+	/*! Socket Information Object. */
+	IN SOCKINFO *info,
+	/*! Buffer to get data to or send data from. */
+	OUT char *buffer,
+	/*! Size of the buffer. */
+	IN size_t bufsize,
+	/*! timeout value. */
+	IN int *timeoutSecs,
+	/*! Boolean value specifying read or write option. */
+	IN xboolean bRead)
 {
-    int retCode;
-    fd_set readSet;
-    fd_set writeSet;
-    struct timeval timeout;
-    int numBytes;
-    time_t start_time = time( NULL );
-    SOCKET sockfd = info->socket;
-    long bytes_sent = 0,
-      byte_left = 0,
-      num_written;
-
-    if( *timeoutSecs < 0 ) {
-        return UPNP_E_TIMEDOUT;
-    }
-
-    FD_ZERO( &readSet );
-    FD_ZERO( &writeSet );
-    if( bRead ) {
-        FD_SET( sockfd, &readSet );
-    } else {
-        FD_SET( sockfd, &writeSet );
-    }
-
-    timeout.tv_sec = *timeoutSecs;
-    timeout.tv_usec = 0;
-
-    while( TRUE ) {
-        if( *timeoutSecs == 0 ) {
-            retCode =
-                select( sockfd + 1, &readSet, &writeSet, NULL, NULL );
-        } else {
-            retCode =
-                select( sockfd + 1, &readSet, &writeSet, NULL, &timeout );
-        }
-
-        if( retCode == 0 ) {
-            return UPNP_E_TIMEDOUT;
-        }
-        if( retCode == -1 ) {
-            if( errno == EINTR )
-                continue;
-            return UPNP_E_SOCKET_ERROR; // error
-        } else {
-            break;              // read or write
-        }
-    }
+	int retCode;
+	fd_set readSet;
+	fd_set writeSet;
+	struct timeval timeout;
+	int numBytes;
+	time_t start_time = time(NULL);
+	SOCKET sockfd = info->socket;
+	long bytes_sent = 0, byte_left = 0, num_written;
 
+	if (*timeoutSecs < 0) {
+		return UPNP_E_TIMEDOUT;
+	}
+	FD_ZERO(&readSet);
+	FD_ZERO(&writeSet);
+	if (bRead) {
+		FD_SET(sockfd, &readSet);
+	} else {
+		FD_SET(sockfd, &writeSet);
+	}
+	timeout.tv_sec = *timeoutSecs;
+	timeout.tv_usec = 0;
+	while (TRUE) {
+		if (*timeoutSecs == 0) {
+			retCode = select(sockfd + 1, &readSet, &writeSet,
+				NULL, NULL);
+		} else {
+			retCode = select(sockfd + 1, &readSet, &writeSet,
+				NULL, &timeout);
+		}
+		if (retCode == 0) {
+			return UPNP_E_TIMEDOUT;
+		}
+		if (retCode == -1) {
+			if (errno == EINTR)
+				continue;
+			return UPNP_E_SOCKET_ERROR;
+		} else {
+			/* read or write. */
+			break;
+		}
+	}
 #ifdef SO_NOSIGPIPE
-    {
-	int old;
-	int set = 1;
-	socklen_t olen = sizeof(old);
-	getsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, &olen);
-	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set));
+	{
+		int old;
+		int set = 1;
+		socklen_t olen = sizeof(old);
+		getsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, &olen);
+		setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set));
 #endif
-
-    if( bRead ) {
-        // read data
-        numBytes = recv( sockfd, buffer, bufsize,MSG_NOSIGNAL);
-    } else {
-        byte_left = bufsize;
-        bytes_sent = 0;
-        while( byte_left > 0 ) {
-            // write data
-            num_written =
-                send( sockfd, buffer + bytes_sent, byte_left,
-                      MSG_DONTROUTE|MSG_NOSIGNAL);
-            if( num_written == -1 ) {
+		if (bRead) {
+			/* read data. */
+			numBytes = recv(sockfd, buffer, bufsize, MSG_NOSIGNAL);
+		} else {
+			byte_left = bufsize;
+			bytes_sent = 0;
+			while (byte_left > 0) {
+				/* write data. */
+				num_written = send(sockfd,
+					buffer + bytes_sent, byte_left,
+					MSG_DONTROUTE | MSG_NOSIGNAL);
+				if (num_written == -1) {
 #ifdef SO_NOSIGPIPE
-	        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
+					setsockopt(sockfd, SOL_SOCKET,
+						SO_NOSIGPIPE, &old, olen);
 #endif
-                return num_written;
-            }
-
-            byte_left = byte_left - num_written;
-            bytes_sent += num_written;
-        }
-
-        numBytes = bytes_sent;
-    }
-
+					return num_written;
+				}
+				byte_left = byte_left - num_written;
+				bytes_sent += num_written;
+			}
+			numBytes = bytes_sent;
+		}
 #ifdef SO_NOSIGPIPE
-	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
-    }
+		setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
+	}
 #endif
+	if (numBytes < 0) {
+		return UPNP_E_SOCKET_ERROR;
+	}
+	/* subtract time used for reading/writing. */
+	if (*timeoutSecs != 0) {
+		*timeoutSecs -= time(NULL) - start_time;
+	}
 
-    if( numBytes < 0 ) {
-        return UPNP_E_SOCKET_ERROR;
-    }
-    // subtract time used for reading/writing
-    if( *timeoutSecs != 0 ) {
-        *timeoutSecs -= time( NULL ) - start_time;
-    }
-
-    return numBytes;
+	return numBytes;
 }
 
-/************************************************************************
-*	Function :	sock_read
-*
-*	Parameters :
-*		IN SOCKINFO *info ;	Socket Information Object
-*		OUT char* buffer ;	Buffer to get data to  
-*		IN size_t bufsize ;	Size of the buffer
-*	    IN int *timeoutSecs ;	timeout value
-*
-*	Description :	Calls sock_read_write() for reading data on the 
-*		socket
-*
-*	Return : int;
-*		Values returned by sock_read_write() 
-*
-*	Note :
-************************************************************************/
-int
-sock_read( IN SOCKINFO * info,
-           OUT char *buffer,
-           IN size_t bufsize,
-           INOUT int *timeoutSecs )
+int sock_read(IN SOCKINFO *info, OUT char *buffer, IN size_t bufsize,
+	      INOUT int *timeoutSecs)
 {
-    return sock_read_write( info, buffer, bufsize, timeoutSecs, TRUE );
+	return sock_read_write(info, buffer, bufsize, timeoutSecs, TRUE);
 }
 
-/************************************************************************
-*	Function :	sock_write
-*
-*	Parameters :
-*		IN SOCKINFO *info ;	Socket Information Object
-*		IN char* buffer ;	Buffer to send data from 
-*		IN size_t bufsize ;	Size of the buffer
-*	    IN int *timeoutSecs ;	timeout value
-*
-*	Description :	Calls sock_read_write() for writing data on the 
-*		socket
-*
-*	Return : int;
-*		sock_read_write()
-*
-*	Note :
-************************************************************************/
-int
-sock_write( IN SOCKINFO * info,
-            IN char *buffer,
-            IN size_t bufsize,
-            INOUT int *timeoutSecs )
+int sock_write(IN SOCKINFO *info, IN char *buffer, IN size_t bufsize,
+	       INOUT int *timeoutSecs)
 {
-    return sock_read_write( info, buffer, bufsize, timeoutSecs, FALSE );
+	return sock_read_write(info, buffer, bufsize, timeoutSecs, FALSE);
 }
+

upnp/src/genlib/service_table/service_table.c

@@ -871,8 +871,10 @@ getServiceList( IXML_Node * node,
         ( *end ) = current;
 
         return head;
-    } else
+    } else {
+        ( *end ) = NULL;
         return NULL;
+    }
 
 }
 
@@ -918,7 +920,8 @@ getAllServiceList( IXML_Node * node,
             if( head ) {
                 end->next =
                     getServiceList( currentDevice, &next_end, URLBase );
-                end = next_end;
+                if ( next_end )
+                    end = next_end;
             } else
                 head = getServiceList( currentDevice, &end, URLBase );
 

upnp/src/inc/ClientSubscription.h

@@ -1,199 +0,0 @@
-
-#ifndef CLIENTSUBSCRIPTION_H
-#define CLIENTSUBSCRIPTION_H
-
-
-/*!
- * \file
- */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include "UpnpString.h"
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-
-#ifdef INCLUDE_CLIENT_APIS
-
-
-typedef struct s_ClientSubscription ClientSubscription;
-
-
-/*!
- * \brief Constructor.
- */
-ClientSubscription *GenlibClientSubscription_new();
-
-
-/*!
- * \brief Destructor.
- */
-void GenlibClientSubscription_delete(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p);
-
-
-/*!
- * \brief Copy Constructor.
- */
-ClientSubscription *GenlibClientSubscription_dup(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief Assignment operator.
- */
-void GenlibClientSubscription_assign(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *q,
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-int GenlibClientSubscription_get_RenewEventId(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_set_RenewEventId(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	/*! [in] . */
-	int n);
-
-
-/*!
- * \brief 
- */
-const UpnpString *GenlibClientSubscription_get_SID(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-const char *GenlibClientSubscription_get_SID_cstr(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_set_SID(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	const UpnpString *s);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_strcpy_SID(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	const char *s);
-
-
-/*!
- * \brief 
- */
-const UpnpString *GenlibClientSubscription_get_ActualSID(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-const char *GenlibClientSubscription_get_ActualSID_cstr(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_set_ActualSID(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	const UpnpString *s);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_strcpy_ActualSID(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	const char *s);
-
-
-/*!
- * \brief 
- */
-const UpnpString *GenlibClientSubscription_get_EventURL(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_set_EventURL(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	const UpnpString *s);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_strcpy_EventURL(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	const char *s);
-
-
-/*!
- * \brief 
- */
-ClientSubscription *GenlibClientSubscription_get_Next(
-	/*! [in] The \b this pointer. */
-	const ClientSubscription *p);
-
-
-/*!
- * \brief 
- */
-void GenlibClientSubscription_set_Next(
-	/*! [in] The \b this pointer. */
-	ClientSubscription *p,
-	ClientSubscription *q);
-
-
-#endif /* INCLUDE_CLIENT_APIS */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* CLIENTSUBSCRIPTION_H */
-

upnp/src/inc/client_table.h

@@ -13,7 +13,6 @@ extern "C" {
 #endif
 
 
-#include "ClientSubscription.h"
 #include "service_table.h"
 #include "upnp.h"
 #include "UpnpString.h"
@@ -33,6 +32,154 @@ extern TimerThread gTimerThread;
 #ifdef INCLUDE_CLIENT_APIS
 
 
+typedef struct s_ClientSubscription ClientSubscription;
+
+
+/*!
+ * \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.
  *

upnp/src/inc/config.h

@@ -1,35 +1,34 @@
 /**************************************************************************
  *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+ * 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: 
+ * 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 
+ * - 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 
+ *
+ * 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 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  **************************************************************************/
 
-
 #ifndef INTERNAL_CONFIG_H
 #define INTERNAL_CONFIG_H 
 
@@ -112,6 +111,24 @@
 /* @} */
 
 
+/*!
+ * \name THREAD_STACK_SIZE
+ *
+ * The {\tt THREAD_STACK_SIZE} constant defines the minimum stack size (in
+ * bytes) allocated for the stack of each thread the thread pool inside the
+ * SDK will create.  These threads are used for both callbacks into
+ * applications built on top of the library and also for making connections
+ * to other control points and devices.  This value will not be used if it
+ * is lower than ITHREAD_STACK_MIN or greater than a system-imposed limit.
+ * This value can be used to lower memory overhead in embedded systems.
+ * The default value is 0 (so it is not used by default).
+ *
+ * @{
+ */
+#define THREAD_STACK_SIZE 0
+/* @} */
+
+
 /*! \name MAX_JOBS_TOTAL
  *
  *  The {\tt MAX_JOBS_TOTAL} constant determines the maximum number of jobs
@@ -175,6 +192,20 @@
 #define WEB_SERVER_BUF_SIZE  (1024*1024)
 /* @} */
 
+/*!
+ * \name WEB_SERVER_CONTENT_LANGUAGE
+ *
+ * This configuration parameter sets the value of the Content-Language
+ * header for the webserver. Thanks to this parameter, the use can advertize
+ * the language used by the device in the description (friendlyName) and
+ * presentation steps of UPnP. The default value is empty string so no
+ * Content-Language header is added.
+ *
+ * @{
+ */
+#define WEB_SERVER_CONTENT_LANGUAGE ""
+/* @} */
+
 /*!
  * \name AUTO_RENEW_TIME
  *
@@ -395,17 +426,9 @@
 #endif
 
 
-#ifdef INCLUDE_CLIENT_APIS
-#	define CLIENTONLY(x) x
-#else /* INCLUDE_CLIENT_APIS */
-#	define CLIENTONLY(x)
-#endif /* INCLUDE_CLIENT_APIS */
-
-
 /*
  * @}
  */
 
-
 #endif /* INTERNAL_CONFIG_H */
 

upnp/src/inc/httpparser.h

@@ -200,7 +200,8 @@ typedef struct // http_message_t
 
 	// private fields
 	membuffer msg;		// entire raw message
-	char *urlbuf;	// storage for url string
+        char *urlbuf;	// storage for url string
+        size_t entity_offset;
 } http_message_t;
 
 typedef struct // http_parser_t

upnp/src/inc/inet_pton.h

@@ -6,6 +6,9 @@
 
 #ifdef WIN32
 
+#ifdef IPV6_
+#define INET_IPV6
+#endif
 
 #include "unixutil.h"
 

upnp/src/inc/miniserver.h

@@ -1,38 +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: 
+ * Copyright (c) 2000-2003 Intel Corporation
+ * All rights reserved.
  *
- * * 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 
+ * 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 
+ *
+ * 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 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************************/
+ **************************************************************************/
 
 #ifndef MINISERVER_H
 #define MINISERVER_H
 
 
+/*!
+ * \file
+ */
+
+
 #include "sock.h"
 #include "httpparser.h"
 
@@ -41,30 +46,43 @@ extern SOCKET gMiniServerStopSock;
 
 
 typedef struct MServerSockArray {
-	/* socket for listening for miniserver requests */
+	/*! IPv4 socket for listening for miniserver requests. */
 	SOCKET miniServerSock4;
+	/*! IPv6 Socket for listening for miniserver requests. */
 	SOCKET miniServerSock6;
-	/* socket for stopping miniserver */
+	/*! Socket for stopping miniserver */
 	SOCKET miniServerStopSock;
-	/* socket for incoming advertisments and search requests */
+	/*! IPv4 SSDP Socket for incoming advertisments and search requests. */
 	SOCKET ssdpSock4;
+	/*! IPv6 SSDP Socket for incoming advertisments and search requests. */
 	SOCKET ssdpSock6;
+	/*! IPv6 SSDP Socket for incoming advertisments and search requests. */
 	SOCKET ssdpSock6UlaGua;
-
+	/* ! . */
 	SOCKET stopPort;
+	/* ! . */
 	SOCKET miniServerPort4;
+	/* ! . */
 	SOCKET miniServerPort6;
-
-	/* socket for sending search requests and receiving search replies */
-	CLIENTONLY(SOCKET ssdpReqSock4;)
-	CLIENTONLY(SOCKET ssdpReqSock6;)
+#ifdef INCLUDE_CLIENT_APIS
+	/*! IPv4 SSDP socket for sending search requests and receiving search
+	 * replies */
+	SOCKET ssdpReqSock4;
+	/*! IPv6 SSDP socket for sending search requests and receiving search
+	 * replies */
+	SOCKET ssdpReqSock6;
+#endif /* INCLUDE_CLIENT_APIS */
 } MiniServerSockArray;
 
 
+/*! . */
 typedef void (*MiniServerCallback)(
+	/* ! . */
 	IN http_parser_t *parser,
+	/* ! . */
 	IN http_message_t* request, 
-	IN SOCKINFO *info );
+	/* ! . */
+	IN SOCKINFO *info);
 
 
 #ifdef __cplusplus
@@ -116,9 +134,11 @@ void SetGenaCallback(
  *	\li On error: UPNP_E_XXX.
  */
 int StartMiniServer(
-	/*! [in,out] Port on which the server listens for incoming IPv4 connections. */
+	/*! [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. */
+	/*! [in,out] Port on which the server listens for incoming IPv6
+	 * connections. */
 	unsigned short *listen_port6);
 
 

upnp/src/inc/soaplib.h

@@ -1,133 +1,135 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// 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 SOAPLIB_H
 #define SOAPLIB_H 
 
 
-// SOAP module API to be called in Upnp-Dk API
+/* SOAP module API to be called in Upnp-Dk API */
+
+
 /****************************************************************************
-* Function :	soap_device_callback
-*
-* Parameters :
-*	IN http_parser_t *parser :	Parsed request received by the device
-*	IN http_message_t* request :	HTTP request 
-*	INOUT SOCKINFO *info :		socket info
-*
-* Description :	This is a callback called by minisever after receiving 
-*	the request from the control point. This function will start 
-*	processing the request. It calls handle_invoke_action to handle the
-*	SOAP action
-*
-* Return : void
-*
-* Note :
-****************************************************************************/
+ * Function: soap_device_callback
+ *
+ * Parameters:
+ *	IN http_parser_t *parser: Parsed request received by the device
+ *	IN http_message_t* request: HTTP request
+ *	INOUT SOCKINFO *info: socket info
+ *
+ * Description: This is a callback called by minisever after receiving
+ *	the request from the control point. This function will start
+ *	processing the request. It calls handle_invoke_action to handle the
+ *	SOAP action
+ *
+ * Return: void
+ *
+ * Note:
+ ****************************************************************************/
 void soap_device_callback(
-	IN http_parser_t *parser, 
-	IN http_message_t* request, 
-	INOUT SOCKINFO *info );
+	IN http_parser_t *parser,
+	IN http_message_t* request,
+	INOUT SOCKINFO *info);
 
 
 /****************************************************************************
-*	Function :	SoapSendAction
-*
-*	Parameters :
-*		IN char* action_url :	device contrl URL 
-*		IN char *service_type :	device service type
-*		IN IXML_Document *action_node : SOAP action node	
-*		OUT IXML_Document **response_node :	SOAP response node
-*
-*	Description :	This function is called by UPnP API to send the SOAP 
-*		action request and waits till it gets the response from the device
-*		pass the response to the API layer
-*
-*	Return :	int
-*		returns UPNP_E_SUCCESS if successful else returns appropriate error
-*	Note :
-****************************************************************************/
-int SoapSendAction( 
-		IN char* action_url, 
-		IN char *service_type,
-		IN IXML_Document *action_node,
-		OUT IXML_Document **response_node );
+ * Function: SoapSendAction
+ *
+ * Parameters:
+ *	IN char* action_url: device contrl URL
+ *	IN char *service_type: device service type
+ *	IN IXML_Document *action_node: SOAP action node
+ *	OUT IXML_Document **response_node: SOAP response node
+ *
+ * Description: This function is called by UPnP API to send the SOAP
+ *	action request and waits till it gets the response from the device
+ *	pass the response to the API layer
+ *
+ * Return: int
+ *	returns UPNP_E_SUCCESS if successful else returns appropriate error
+ * Note:
+ ****************************************************************************/
+int SoapSendAction(
+	IN char* action_url,
+	IN char *service_type,
+	IN IXML_Document *action_node,
+	OUT IXML_Document **response_node);
 
 /****************************************************************************
-*	Function :	SoapSendActionEx
-*
-*	Parameters :
-*		IN char* action_url :	device contrl URL 
-*		IN char *service_type :	device service type
-		IN IXML_Document *Header: Soap header
-*		IN IXML_Document *action_node : SOAP action node ( SOAP body)	
-*		OUT IXML_Document **response_node :	SOAP response node
-*
-*	Description :	This function is called by UPnP API to send the SOAP 
-*		action request and waits till it gets the response from the device
-*		pass the response to the API layer. This action is similar to the 
-*		the SoapSendAction with only difference that it allows users to 
-*		pass the SOAP header along the SOAP body ( soap action request)
-*
-*	Return :	int
-*		returns UPNP_E_SUCCESS if successful else returns appropriate error
-*	Note :
-****************************************************************************/
+ * Function: SoapSendActionEx
+ *
+ * Parameters:
+ *	IN char* action_url: device contrl URL
+ *	IN char *service_type: device service type
+ *	IN IXML_Document *Header: Soap header
+ *	IN IXML_Document *action_node: SOAP action node (SOAP body)
+ *	OUT IXML_Document **response_node: SOAP response node
+ *
+ * Description: This function is called by UPnP API to send the SOAP
+ *	action request and waits till it gets the response from the device
+ *	pass the response to the API layer. This action is similar to the
+ *	the SoapSendAction with only difference that it allows users to
+ *	pass the SOAP header along the SOAP body ( soap action request)
+ *
+ * Return: int
+ *	returns UPNP_E_SUCCESS if successful else returns appropriate error
+ * Note:
+ ****************************************************************************/
 int SoapSendActionEx(
-		IN char * ActionURL, 
-		IN char *ServiceType, 
-		IN IXML_Document *Header,
-		IN IXML_Document *ActNode , 
-		OUT IXML_Document **RespNode) ;
+	IN char * ActionURL,
+	IN char *ServiceType,
+	IN IXML_Document *Header,
+	IN IXML_Document *ActNode,
+	OUT IXML_Document **RespNode);
 
 /****************************************************************************
-*	Function :	SoapGetServiceVarStatus
-*
-*	Parameters :
-*			IN  char * action_url :	Address to send this variable 
-*									query message.
-*			IN  char *var_name : Name of the variable.
-*			OUT char **var_value :	Output value.
-*
-*	Description :	This function creates a status variable query message 
-*		send it to the specified URL. It also collect the response.
-*
-*	Return :	int
-*
-*	Note :
-****************************************************************************/
+ * Function: SoapGetServiceVarStatus
+ *
+ * Parameters:
+ *	IN  char * action_url: Address to send this variable query message.
+ *	IN  char *var_name: Name of the variable.
+ *	OUT char **var_value: Output value.
+ *
+ * Description: This function creates a status variable query message
+ *	send it to the specified URL. It also collect the response.
+ *
+ * Return: int
+ *
+ * Note:
+ ****************************************************************************/
 int SoapGetServiceVarStatus(
-				IN char * ActionURL, 
-				IN DOMString VarName, 
-				OUT DOMString *StVar) ;   
+	IN char * ActionURL,
+	IN DOMString VarName,
+	OUT DOMString *StVar);
 
 extern const char* ContentTypeHeader;
 
-#endif //SOAPLIB_H
+#endif /* SOAPLIB_H */
+

upnp/src/inc/sock.h

@@ -29,149 +29,143 @@
  *
  **************************************************************************/
 
-
 #ifndef GENLIB_NET_SOCK_H
 #define GENLIB_NET_SOCK_H
 
+/*!
+ * \file
+ */
 
 #include "util.h"
 
-
 #ifdef WIN32
 	/* Do not #include <netinet/in.h> */
 #else
 	#include <netinet/in.h>
 #endif
 
-
-/* Following variable is not defined under winsock.h */
+/* The following are not defined under winsock.h */
 #ifndef SD_RECEIVE
-#define SD_RECEIVE      0x00
-#define SD_SEND         0x01
-#define SD_BOTH         0x02
+	#define SD_RECEIVE      0x00
+	#define SD_SEND         0x01
+	#define SD_BOTH         0x02
 #endif
 
-
+/*! */
 typedef struct 
 {
-	/* handle/descriptor to a socket */
+	/*! Handle/descriptor to a socket. */
 	SOCKET socket;
-
-	/* the following two fields are filled only in incoming requests; */
+	/*! The following two fields are filled only in incoming requests. */
 	struct sockaddr_storage foreign_sockaddr;
 } SOCKINFO;
 
-
 #ifdef __cplusplus
 #extern "C" {
 #endif
 
+/*!
+ * \brief Assign the passed in socket descriptor to socket descriptor in the
+ * SOCKINFO structure.
+ *
+ * \return Integer:
+ * \li \c UPNP_E_SUCCESS	
+ * \li \c UPNP_E_OUTOF_MEMORY
+ * \li \c UPNP_E_SOCKET_ERROR
+ */
+int sock_init(
+	/*! Socket Information Object. */
+	OUT SOCKINFO *info,
+	/*! Socket Descriptor. */
+	IN SOCKET sockfd);
 
-/************************************************************************
-*	Function :	sock_init
-*
-*	Parameters :
-*		OUT SOCKINFO* info ;	Socket Information Object
-*		IN SOCKET sockfd ;	Socket Descriptor
-*
-*	Description :	Assign the passed in socket descriptor to socket 
-*		descriptor in the SOCKINFO structure.
-*
-*	Return : int;
-*		UPNP_E_SUCCESS	
-*		UPNP_E_OUTOF_MEMORY
-*		UPNP_E_SOCKET_ERROR
-*	Note :
-************************************************************************/
-int sock_init(OUT SOCKINFO* info, IN SOCKET 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
-*
-*	Description :	Calls the sock_init function and assigns the passed in
-*		IP address and port to the IP address and port in the SOCKINFO
-*		structure.
-*
-*	Return : int;
-*		UPNP_E_SUCCESS	
-*		UPNP_E_OUTOF_MEMORY
-*		UPNP_E_SOCKET_ERROR
-*
-*	Note :
-************************************************************************/
+/*!
+ * \brief Calls the sock_init function and assigns the passed in IP address
+ * and port to the IP address and port in the SOCKINFO structure.
+ *
+ * \return Integer:
+ * \li \c UPNP_E_SUCCESS	
+ * \li \c UPNP_E_OUTOF_MEMORY
+ * \li \c UPNP_E_SOCKET_ERROR
+ */
 int sock_init_with_ip(
+	/*! Socket Information Object. */
 	OUT SOCKINFO* info,
+	/*! Socket Descriptor. */
 	IN SOCKET sockfd, 
+	/*! Remote socket address. */
         IN struct sockaddr *foreign_sockaddr);
 
-/************************************************************************
-*	Function :	sock_read
-*
-*	Parameters :
-*		IN SOCKINFO *info ;	Socket Information Object
-*		OUT char* buffer ;	Buffer to get data to  
-*		IN size_t bufsize ;	Size of the buffer
-*	    IN int *timeoutSecs ;	timeout value
-*
-*	Description :	Reads data on socket in sockinfo
-*
-*	Return : int;
-*		numBytes - On Success, no of bytes received		
-*		UPNP_E_TIMEDOUT - Timeout
-*		UPNP_E_SOCKET_ERROR - Error on socket calls
-*
-*	Note :
-************************************************************************/
-int sock_read( IN SOCKINFO *info, OUT char* buffer, IN size_t bufsize,
-		    		 INOUT int *timeoutSecs );
+/*!
+ * \brief Reads data on socket in sockinfo.
+ *
+ * \return Integer:
+ * \li \c numBytes - On Success, no of bytes received.
+ * \li \c UPNP_E_TIMEDOUT - Timeout.
+ * \li \c UPNP_E_SOCKET_ERROR - Error on socket calls.
+ */
+int sock_read(
+	/*! Socket Information Object. */
+	IN SOCKINFO *info,
+	/*! Buffer to get data to. */
+	OUT char* buffer,
+	/*! Size of the buffer. */
+	IN size_t bufsize,
+	/*! timeout value. */
+	INOUT int *timeoutSecs);
 
-/************************************************************************
-*	Function :	sock_write
-*
-*	Parameters :
-*		IN SOCKINFO *info ;	Socket Information Object
-*		IN char* buffer ;	Buffer to send data from 
-*		IN size_t bufsize ;	Size of the buffer
-*	    IN int *timeoutSecs ;	timeout value
-*
-*	Description :	Writes data on the socket in sockinfo
-*
-*	Return : int;
-*		numBytes - On Success, no of bytes sent		
-*		UPNP_E_TIMEDOUT - Timeout
-*		UPNP_E_SOCKET_ERROR - Error on socket calls
-*
-*	Note :
-************************************************************************/
-int sock_write( IN SOCKINFO *info, IN char* buffer, IN size_t bufsize,
-		    		 INOUT int *timeoutSecs );
+/*!
+ * \brief Writes data on the socket in sockinfo.
+ *
+ * \return Integer:
+ * \li \c numBytes - On Success, no of bytes received.
+ * \li \c UPNP_E_TIMEDOUT - Timeout.
+ * \li \c UPNP_E_SOCKET_ERROR - Error on socket calls.
+ */
+int sock_write(
+	/*! Socket Information Object. */
+	IN SOCKINFO *info,
+	/*! Buffer to send data from. */
+	IN char* buffer,
+	/*! Size of the buffer. */
+	IN size_t bufsize,
+	/*! timeout value. */
+	INOUT int *timeoutSecs);
 
-/************************************************************************
-*	Function :	sock_destroy
-*
-*	Parameters :
-*		INOUT SOCKINFO* info ;	Socket Information Object
-*		int ShutdownMethod ;	How to shutdown the socket. Used by  
-*								sockets's shutdown() 
-*
-*	Description :	Shutsdown the socket using the ShutdownMethod to 
-*		indicate whether sends and receives on the socket will be 
-*		dis-allowed. After shutting down the socket, closesocket is called
-*		to release system resources used by the socket calls.
-*
-*	Return : int;
-*		UPNP_E_SOCKET_ERROR on failure
-*		UPNP_E_SUCCESS on success
-*
-*	Note :
-************************************************************************/
-int sock_destroy(INOUT SOCKINFO* info, int);
+/*!
+ * \brief Shutsdown the socket using the ShutdownMethod to indicate whether
+ * sends and receives on the socket will be dis-allowed.
+ *
+ * After shutting down the socket, closesocket is called to release system
+ * resources used by the socket calls.
+ *
+ * \return Integer:
+ * \li \c UPNP_E_SOCKET_ERROR on failure.
+ * \li \c UPNP_E_SUCCESS on success.
+ */
+int sock_destroy(
+	/*! Socket Information Object. */
+	INOUT SOCKINFO* info,
+	/*! How to shutdown the socket. Used by sockets's shutdown(). */
+	int ShutdownMethod);
 
+/*!
+ * \brief Closes the socket if it is different from -1.
+ *
+ * \return -1 if an error occurred or if the socket is -1.
+ */
+static inline int sock_close(
+	/*! Socket descriptor. */
+	int sock)
+{
+	int ret = -1;
+
+	if (sock != -1) {
+		ret = UpnpCloseSocket(sock);
+	}
+
+	return ret;
+}
 
 #ifdef __cplusplus
 }	/* #extern "C" */

upnp/src/inc/ssdplib.h

@@ -47,15 +47,17 @@
 
 
 #ifdef WIN32
-#else
+#else /* WIN32 */
 	#include <syslog.h>
 	#include <sys/socket.h>
-	#include <netinet/in_systm.h>
-	#include <netinet/ip.h>
-	#include <netinet/ip_icmp.h>
+	#ifndef __APPLE__
+		#include <netinet/in_systm.h>
+		#include <netinet/ip.h>
+		#include <netinet/ip_icmp.h>
+	#endif /* __APPLE__ */
 	#include <sys/time.h>
 	#include <arpa/inet.h>
-#endif
+#endif /* WIN32 */
 
 
 /* Enumeration to define all different types of ssdp searches */
@@ -138,6 +140,15 @@ typedef void (* SsdpFunPtr)(Event *);
 
 typedef Event SsdpEvent ;
 
+// Structure to contain Discovery response
+typedef struct resultData
+{
+   struct Upnp_Discovery param;
+   void *cookie;
+   Upnp_FunPtr ctrlpt_callback;
+}ResultData;
+
+
 typedef struct TData
 {
    int Mx;
@@ -174,9 +185,12 @@ typedef struct
 
 /* globals */
 
-CLIENTONLY(extern SOCKET gSsdpReqSocket4;);
-CLIENTONLY(extern SOCKET gSsdpReqSocket6;);
-
+#ifdef INCLUDE_CLIENT_APIS
+	extern SOCKET gSsdpReqSocket4;
+	#ifdef UPNP_ENABLE_IPV6
+		extern SOCKET gSsdpReqSocket6;
+	#endif /* UPNP_ENABLE_IPV6 */
+#endif /* INCLUDE_CLIENT_APIS */
 typedef int (*ParserFun)(char *, Event *);
 
 
@@ -210,12 +224,12 @@ 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 http_message_t *hmsg, 
+	IN struct sockaddr *dest_addr);
 #else
 static inline void ssdp_handle_device_request(
-	IN http_message_t* hmsg, 
-	IN struct sockaddr* dest_addr ) {}
+	IN http_message_t *hmsg, 
+	IN struct sockaddr* dest_addr) {}
 #endif
 
 /************************************************************************
@@ -239,10 +253,10 @@ static inline void ssdp_handle_device_request(
 *
 ***************************************************************************/
 void ssdp_handle_ctrlpt_msg(
-	IN http_message_t* hmsg, 
-	IN struct sockaddr* dest_addr,
+	IN http_message_t *hmsg, 
+	IN struct sockaddr *dest_addr,
 	IN xboolean timeout,
-	IN void* cookie );
+	IN void *cookie);
 
 /************************************************************************
 * Function : unique_service_name

upnp/src/inc/upnpclosesocket.h

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

upnp/src/inc/webserver.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 GENLIB_NET_HTTP_WEBSERVER_H
 #define GENLIB_NET_HTTP_WEBSERVER_H
@@ -48,99 +48,85 @@ struct SendInstruction
 	int IsRangeActive;
 	int IsTrailers;
 	char RangeHeader[200];
+	char AcceptLanguageHeader[200];
 	off_t RangeOffset;
-	off_t ReadSendSize; // Read from local source and send on the network.
-	long RecvWriteSize; // Recv from the network and write into local file.
-
-	//Later few more member could be added depending on the requirement.
+	/*! Read from local source and send on the network. */
+	off_t ReadSendSize;
+	/*! Recv from the network and write into local file. */
+	long RecvWriteSize;
+	/* Later few more member could be added depending
+	 * on the requirement.*/
 };
 
-/************************************************************************
- * 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();
 
-/************************************************************************
- * Function: web_server_destroy
+/*!
+ * \brief 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.
  *
- * Parameters:
- *	none
+ * \note alias_content is not freed here
  *
- * Description: Release memory allocated for the global web server root
- *	directory and the global XML document
- *	Resets the flag bWebServerState to WEB_SERVER_DISABLED
- *
- * Returns:
- *	void
- ************************************************************************/
-void web_server_destroy();
+ * \return
+ * \li \c 0 - OK
+ * \li \c UPNP_E_OUTOF_MEMORY
+ */
+int web_server_init(void);
 
-/************************************************************************
- * Function: web_server_set_alias
+
+/*!
+ * \brief Release memory allocated for the global web server root
+ * directory and the global XML document. Resets the flag bWebServerState
+ * to WEB_SERVER_DISABLED.
+ */
+void web_server_destroy(void);
+
+
+/*!
+ * \brief Replaces current alias with the given alias. To remove the current
+ * alias, set alias_name to NULL.
  *
- * Parameters:
- *	alias_name: webserver name of alias; created by caller and freed by
- *				caller (doesn't even have to be malloc()d .)
- *	alias_content:	the xml doc; this is allocated by the caller; and
- *					freed by the web server	
- *	alias_content_length: length of alias body in bytes
- *	last_modified:	time when the contents of alias were last
- *					changed (local time)
+ * \note alias_content is not freed here
  *
- * Description: Replaces current alias with the given alias. To remove
- *	the current alias, set alias_name to NULL.
- *
- * Returns:
- *	0 - OK
- *	UPNP_E_OUTOF_MEMORY: note: alias_content is not freed here
- ************************************************************************/
+ * \return
+ * \li \c 0 - OK
+ * \li \c UPNP_E_OUTOF_MEMORY
+ */
 int web_server_set_alias(
-	IN const char* alias_name,
-	IN const char* alias_content, IN size_t alias_content_length,
-	IN time_t last_modified);
+	/*! [in] Webserver name of alias; created by caller and freed by caller
+	 * (doesn't even have to be malloc()d. */
+	const char* alias_name,
+	/*! [in] The xml doc; this is allocated by the caller; and freed by
+	 * the web server. */
+	const char* alias_content,
+	/*! [in] Length of alias body in bytes. */
+	size_t alias_content_length,
+	/*! [in] Time when the contents of alias were last changed (local time). */
+	time_t last_modified);
 
-/************************************************************************
- * Function: web_server_set_root_dir
- *
- * Parameters:
- *	IN const char* root_dir ; String having the root directory for the
- *                                 document
- *
- * Description: Assign the path specfied by the IN const char* root_dir
- *	parameter to the global Document root directory. Also check for
- *	path names ending in '/'
- *
- * Returns:
- *	int
- ************************************************************************/
-int web_server_set_root_dir(IN const char* root_dir);
 
-/************************************************************************
- * Function: web_server_callback	
+/*!
+ * \brief Assign the path specfied by the input const char* root_dir parameter
+ * to the global Document root directory. Also check for path names ending
+ * in '/'.
  *
- * Parameters:
- *	IN http_parser_t *parser,
- *	INOUT http_message_t* req,
- *	IN SOCKINFO *info
- *
- * Description: main entry point into web server;
- *	handles HTTP GET and HEAD requests
- *
- * Returns:
- *	void
- ************************************************************************/
-void web_server_callback(IN http_parser_t *parser, IN http_message_t *req, INOUT SOCKINFO *info);
+ * \return Integer.
+ */
+int web_server_set_root_dir(
+	/*! [in] String having the root directory for the document. */
+	const char* root_dir);
+
+
+/*!
+ * \brief Main entry point into web server; Handles HTTP GET and HEAD
+ * requests.
+ */
+void web_server_callback(
+	/*! [in] . */
+	http_parser_t *parser,
+	/*! [in] . */
+	http_message_t *req,
+	/*! [in,out] . */
+	SOCKINFO *info);
 
 
 #ifdef __cplusplus

upnp/src/soap/soap_device.c

@@ -47,8 +47,6 @@
 
 #define QUERY_STATE_VAR_URN "urn:schemas-upnp-org:control-1-0"
 
-
-#include "ActionRequest.h"
 #include "httpparser.h"
 #include "httpreadwrite.h"
 #include "parsetools.h"
@@ -583,8 +581,8 @@ check_soap_action_header( IN http_message_t * request,
 *		IN http_message_t* request :	HTTP request
 *		IN int isQuery :	flag for a querry
 *		IN IXML_Document *actionDoc :	action request document
-*		OUT UpnpString *device_udn :	Device UDN string
-*		OUT UpnpString *service_id :	Service ID string
+*		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
 *		OUT void** cookie :	cookie stored by device application 
@@ -604,8 +602,8 @@ get_device_info( IN http_message_t *request,
                  IN int isQuery,
                  IN IXML_Document *actionDoc,
                  IN int AddressFamily,
-                 OUT UpnpString *device_udn,
-                 OUT UpnpString *service_id,
+                 OUT char device_udn[LINE_SIZE],
+                 OUT char service_id[LINE_SIZE],
                  OUT Upnp_FunPtr *callback,
                  OUT void **cookie )
 {
@@ -670,8 +668,8 @@ get_device_info( IN http_message_t *request,
         }
     }
 
-    UpnpString_set_String( device_udn, serv_info->UDN );
-    UpnpString_set_String( service_id, serv_info->serviceId );
+    namecopy( service_id, serv_info->serviceId );
+    namecopy( device_udn, serv_info->UDN );
     *callback = device_info->Callback;
     *cookie = device_info->Cookie;
 
@@ -861,10 +859,10 @@ static UPNP_INLINE void handle_query_variable(
 	IN http_message_t *request,
 	IN IXML_Document *xml_doc )
 {
-    UpnpStateVarRequest *variable = UpnpStateVarRequest_new();
     Upnp_FunPtr soap_event_callback;
     void *cookie;
     char var_name[LINE_SIZE];
+    struct Upnp_State_Var_Request variable;
     const char *err_str;
     int err_code;
 
@@ -876,50 +874,53 @@ static UPNP_INLINE void handle_query_variable(
     }
     // get info for event
     err_code = get_device_info(
-        request, 1, xml_doc,
-	info->foreign_sockaddr.ss_family,
-        (UpnpString *)UpnpStateVarRequest_get_DevUDN(variable),
-        (UpnpString *)UpnpStateVarRequest_get_ServiceID(variable),
-        &soap_event_callback,
-        &cookie);
+		request, 1, xml_doc,
+		info->foreign_sockaddr.ss_family,
+		variable.DevUDN,
+		variable.ServiceID,
+                &soap_event_callback,
+                &cookie);
     if( err_code != 0 ) {
         send_error_response( info, SOAP_INVALID_VAR,
                              Soap_Invalid_Var, request );
         return;
     }
 
-    UpnpStateVarRequest_set_ErrCode(variable, UPNP_E_SUCCESS);
-    UpnpStateVarRequest_strcpy_StateVarName(variable, var_name);
-    UpnpStateVarRequest_set_CtrlPtIPAddr(variable, (struct sockaddr *)&info->foreign_sockaddr);
+    linecopy( variable.ErrStr, "" );
+    variable.ErrCode = UPNP_E_SUCCESS;
+    namecopy( variable.StateVarName, var_name );
+    variable.CurrentVal = NULL;
+    variable.CtrlPtIPAddr = info->foreign_sockaddr;
 
     // send event
-    soap_event_callback( UPNP_CONTROL_GET_VAR_REQUEST, variable, cookie );
+    soap_event_callback( UPNP_CONTROL_GET_VAR_REQUEST, &variable, cookie );
 
     UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
         "Return from callback for var request\n" );
 
     // validate, and handle result
-    if( UpnpStateVarRequest_get_CurrentVal(variable) == NULL ) {
+    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 );
 
         return;
     }
-    if( UpnpStateVarRequest_get_ErrCode(variable) != UPNP_E_SUCCESS ) {
-        if( UpnpString_get_Length(UpnpStateVarRequest_get_ErrStr(variable)) > 0 ) {
+    if( variable.ErrCode != UPNP_E_SUCCESS ) {
+        if( strlen( variable.ErrStr ) > 0 ) {
             err_code = SOAP_INVALID_VAR;
             err_str = Soap_Invalid_Var;
         } else {
-            err_code = UpnpStateVarRequest_get_ErrCode(variable);
-            err_str = UpnpStateVarRequest_get_ErrStr_cstr(variable);
+            err_code = variable.ErrCode;
+            err_str = variable.ErrStr;
         }
         send_error_response( info, err_code, err_str, request );
         return;
     }
     // send response
-    send_var_query_response( info, UpnpStateVarRequest_get_CurrentVal(variable), request );
-    UpnpStateVarRequest_delete(variable);
+    send_var_query_response( info, variable.CurrentVal, request );
+    ixmlFreeDOMString( variable.CurrentVal );
+
 }
 
 /****************************************************************************
@@ -947,16 +948,15 @@ handle_invoke_action( IN SOCKINFO * info,
                       IN IXML_Document * xml_doc )
 {
     char save_char;
-    UpnpActionRequest *action = UpnpActionRequest_new();
-    UpnpString *devUDN = UpnpString_new();
-    UpnpString *serviceID = UpnpString_new();
-    IXML_Document *actionRequestDoc = NULL;
-    IXML_Document *actionResultDoc = NULL;
+    IXML_Document *resp_node = NULL;
+    struct Upnp_Action_Request action;
     Upnp_FunPtr soap_event_callback;
     void *cookie = NULL;
     int err_code;
     const char *err_str;
 
+    action.ActionResult = NULL;
+
     // null-terminate
     save_char = action_name.buf[action_name.length];
     action_name.buf[action_name.length] = '\0';
@@ -966,7 +966,7 @@ handle_invoke_action( IN SOCKINFO * info,
     err_str = Soap_Invalid_Action;
 
     // get action node
-    if( get_action_node( xml_doc, action_name.buf, &actionRequestDoc ) == -1 ) {
+    if( get_action_node( xml_doc, action_name.buf, &resp_node ) == -1 ) {
         goto error_handler;
     }
     // get device info for action event
@@ -975,58 +975,55 @@ handle_invoke_action( IN SOCKINFO * info,
 	0,
 	xml_doc,
 	info->foreign_sockaddr.ss_family,
-        devUDN,
-        serviceID,
-        &soap_event_callback,
+	action.DevUDN,
+	action.ServiceID,
+	&soap_event_callback,
         &cookie );
 
     if( err_code != UPNP_E_SUCCESS ) {
         goto error_handler;
     }
 
-    UpnpActionRequest_set_ErrCode(action, UPNP_E_SUCCESS);
-    UpnpActionRequest_strcpy_ErrStr(action, "");
-    UpnpActionRequest_strcpy_ActionName(action, action_name.buf);
-    UpnpActionRequest_set_DevUDN(action, devUDN);
-    UpnpActionRequest_set_ServiceID(action, serviceID);
-    UpnpActionRequest_set_ActionRequest(action, actionRequestDoc);
-    UpnpActionRequest_set_CtrlPtIPAddr(action, (struct sockaddr *)&info->foreign_sockaddr);
+    namecopy( action.ActionName, action_name.buf );
+    linecopy( action.ErrStr, "" );
+    action.ActionRequest = resp_node;
+    action.ActionResult = NULL;
+    action.ErrCode = UPNP_E_SUCCESS;
+    action.CtrlPtIPAddr = info->foreign_sockaddr;
 
     UpnpPrintf(UPNP_INFO, SOAP, __FILE__, __LINE__, "Calling Callback\n");
 
-    soap_event_callback(UPNP_CONTROL_ACTION_REQUEST, action, cookie);
+    soap_event_callback( UPNP_CONTROL_ACTION_REQUEST, &action, cookie );
 
-    err_code = UpnpActionRequest_get_ErrCode(action);
-    if (err_code != UPNP_E_SUCCESS) {
-        err_str = UpnpActionRequest_get_ErrStr_cstr(action);
-        if  (strlen(err_str) <= 0) {
+    if( action.ErrCode != UPNP_E_SUCCESS ) {
+        if( strlen( action.ErrStr ) <= 0 ) {
             err_code = SOAP_ACTION_FAILED;
             err_str = Soap_Action_Failed;
+        } else {
+            err_code = action.ErrCode;
+            err_str = action.ErrStr;
         }
         goto error_handler;
     }
     // validate, and handle action error
-    actionResultDoc = UpnpActionRequest_get_ActionResult(action);
-    if (actionResultDoc == NULL) {
+    if( action.ActionResult == NULL ) {
         err_code = SOAP_ACTION_FAILED;
         err_str = Soap_Action_Failed;
         goto error_handler;
     }
     // send response
-    send_action_response(info, actionResultDoc, request);
+    send_action_response( info, action.ActionResult, request );
 
     err_code = 0;
 
     // error handling and cleanup
 error_handler:
+    ixmlDocument_free( action.ActionResult );
+    ixmlDocument_free( resp_node );
     action_name.buf[action_name.length] = save_char;    // restore
     if( err_code != 0 ) {
         send_error_response( info, err_code, err_str, request );
     }
-
-    UpnpString_delete(serviceID);
-    UpnpString_delete(devUDN);
-    UpnpActionRequest_delete(action);
 }
 
 /****************************************************************************

upnp/src/soap/soaplib.h

@@ -1,135 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2000-2003 Intel Corporation 
-// All rights reserved. 
-//
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are met: 
-//
-// * Redistributions of source code must retain the above copyright notice, 
-// this list of conditions and the following disclaimer. 
-// * Redistributions in binary form must reproduce the above copyright notice, 
-// this list of conditions and the following disclaimer in the documentation 
-// and/or other materials provided with the distribution. 
-// * Neither name of Intel Corporation nor the names of its contributors 
-// may be used to endorse or promote products derived from this software 
-// without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef SOAPLIB_H
-#define SOAPLIB_H 
-
-
-//SOAP module API to be called in Upnp-Dk API
-/****************************************************************************
-*	Function :	soap_device_callback
-*
-*	Parameters :
-*		  IN http_parser_t *parser : Parsed request received by the device
-*		  IN http_message_t* request :	HTTP request 
-*		  INOUT SOCKINFO *info :	socket info
-*
-*	Description :	This is a callback called by minisever after receiving 
-*		the request from the control point. This function will start 
-*		processing the request. It calls handle_invoke_action to handle the
-*		SOAP action
-*
-*	Return :	void
-*
-*	Note :
-****************************************************************************/
-void soap_device_callback( 
-						  IN http_parser_t *parser, 
-						  IN http_message_t* request, 
-						  INOUT SOCKINFO *info );
-
-
-/****************************************************************************
-*	Function :	SoapSendAction
-*
-*	Parameters :
-*		IN char* action_url :	device contrl URL 
-*		IN char *service_type :	device service type
-*		IN IXML_Document *action_node : SOAP action node	
-*		OUT IXML_Document **response_node :	SOAP response node
-*
-*	Description :	This function is called by UPnP API to send the SOAP 
-*		action request and waits till it gets the response from the device
-*		pass the response to the API layer
-*
-*	Return :	int
-*		returns UPNP_E_SUCCESS if successful else returns appropriate error
-*	Note :
-****************************************************************************/
-int SoapSendAction( 
-		IN char* action_url, 
-		IN char *service_type,
-		IN IXML_Document *action_node,
-		OUT IXML_Document **response_node );
-
-/****************************************************************************
-*	Function :	SoapSendActionEx
-*
-*	Parameters :
-*		IN char* action_url :	device contrl URL 
-*		IN char *service_type :	device service type
-		IN IXML_Document *Header: Soap header
-*		IN IXML_Document *action_node : SOAP action node ( SOAP body)	
-*		OUT IXML_Document **response_node :	SOAP response node
-*
-*	Description :	This function is called by UPnP API to send the SOAP 
-*		action request and waits till it gets the response from the device
-*		pass the response to the API layer. This action is similar to the 
-*		the SoapSendAction with only difference that it allows users to 
-*		pass the SOAP header along the SOAP body ( soap action request)
-*
-*	Return :	int
-*		returns UPNP_E_SUCCESS if successful else returns appropriate error
-*	Note :
-****************************************************************************/
-int SoapSendActionEx(
-		IN char * ActionURL, 
-		IN char *ServiceType, 
-		IN IXML_Document *Header,
-		IN IXML_Document *ActNode , 
-		OUT IXML_Document **RespNode) ;
-
-/****************************************************************************
-*	Function :	SoapGetServiceVarStatus
-*
-*	Parameters :
-*			IN  char * action_url :	Address to send this variable 
-*									query message.
-*			IN  char *var_name : Name of the variable.
-*			OUT char **var_value :	Output value.
-*
-*	Description :	This function creates a status variable query message 
-*		send it to the specified URL. It also collect the response.
-*
-*	Return :	int
-*
-*	Note :
-****************************************************************************/
-int SoapGetServiceVarStatus(
-				IN char * ActionURL, 
-				IN DOMString VarName, 
-				OUT DOMString *StVar) ;   
-
-
-// extern form the HTTP parser.
-extern const char* ContentTypeHeader;
-
-#endif //SOAPLIB_H

upnp/src/ssdp/ssdp_ResultData.c

@@ -1,115 +0,0 @@
-
-
-#include "config.h"
-
-
-#include "ssdp_ResultData.h"
-
-
-#include <stdlib.h> // for calloc(), free()
-
-
-struct SSSDPResultData
-{
-	UpnpDiscovery *m_param;
-	void *m_cookie;
-	Upnp_FunPtr m_ctrlpt_callback;
-};
-
-
-SSDPResultData *SSDPResultData_new()
-{
-	struct SSSDPResultData *p = calloc(1, sizeof (struct SSSDPResultData));
-
-	p->m_param = UpnpDiscovery_new();
-#if 0
-	p->m_cookie = NULL;
-	p->m_ctrlpt_callback = NULL;
-#endif
-
-	return (SSDPResultData *)p;
-}
-
-
-void SSDPResultData_delete(SSDPResultData *p)
-{
-	struct SSSDPResultData *q = (struct SSSDPResultData *)p;
-
-	if (!q) return;
-
-	UpnpDiscovery_delete(q->m_param);
-	q->m_param = NULL;
-	
-	q->m_cookie = NULL;
-
-	q->m_ctrlpt_callback = NULL;
-
-	free(p);
-}
-
-
-SSDPResultData *SSDPResultData_dup(const SSDPResultData *p)
-{
-	SSDPResultData *q = SSDPResultData_new();
-	
-	SSDPResultData_assign(q, p);
-	
-	return q;
-}
-
-
-void SSDPResultData_assign(SSDPResultData *q, const SSDPResultData *p)
-{
-	if (q != p) {
-		SSDPResultData_set_Param(q, SSDPResultData_get_Param(p));
-		SSDPResultData_set_Cookie(q, SSDPResultData_get_Cookie(p));
-		SSDPResultData_set_CtrlptCallback(q, SSDPResultData_get_CtrlptCallback(p));
-	}
-}
-
-
-UpnpDiscovery *SSDPResultData_get_Param(const SSDPResultData *p)
-{
-	return ((struct SSSDPResultData *)p)->m_param;
-}
-
-
-void SSDPResultData_set_Param(SSDPResultData *p, const UpnpDiscovery *d)
-{
-	UpnpDiscovery_assign(((struct SSSDPResultData *)p)->m_param, d);
-}
-
-
-void *SSDPResultData_get_Cookie(const SSDPResultData *p)
-{
-	return ((struct SSSDPResultData *)p)->m_cookie;
-}
-
-
-void SSDPResultData_set_Cookie(SSDPResultData *p, void *c)
-{
-	((struct SSSDPResultData *)p)->m_cookie = c;
-}
-
-
-Upnp_FunPtr SSDPResultData_get_CtrlptCallback(const SSDPResultData *p)
-{
-	return ((struct SSSDPResultData *)p)->m_ctrlpt_callback;
-}
-
-
-void SSDPResultData_set_CtrlptCallback(SSDPResultData *p, Upnp_FunPtr f)
-{
-	((struct SSSDPResultData *)p)->m_ctrlpt_callback = f;
-}
-
-
-void SSDPResultData_Callback(const SSDPResultData *p)
-{
-	struct SSSDPResultData *q = (struct SSSDPResultData *)p;
-	q->m_ctrlpt_callback(
-		UPNP_DISCOVERY_SEARCH_RESULT,
-		q->m_param,
-		q->m_cookie);
-}
-

upnp/src/ssdp/ssdp_ResultData.h

@@ -1,43 +0,0 @@
-
-
-#ifndef SSDP_RESULTDATA_H
-#define SSDP_RESULTDATA_H
-
-
-/** Structure to contain Discovery response */
-typedef struct s_SSDPResultData SSDPResultData;
-
-
-#include "Discovery.h" /* for UpnpDiscovery */
-#include "upnp.h"      /* for Upnp_FunPtr */
-
-
-/** Constructor */
-SSDPResultData *SSDPResultData_new();
-
-/** Destructor */
-void SSDPResultData_delete(SSDPResultData *p);
-
-/** Copy Constructor */
-SSDPResultData *SSDPResultData_dup(const SSDPResultData *p);
-
-/** Assignment operator */
-void SSDPResultData_assign(SSDPResultData *q, const SSDPResultData *p);
-
-/**  */
-UpnpDiscovery *SSDPResultData_get_Param(const SSDPResultData *p);
-void SSDPResultData_set_Param(SSDPResultData *p, const UpnpDiscovery *d);
-
-/**  */
-void *SSDPResultData_get_Cookie(const SSDPResultData *p);
-void SSDPResultData_set_Cookie(SSDPResultData *p, void *c);
-
-/**  */
-Upnp_FunPtr SSDPResultData_get_CtrlptCallback(const SSDPResultData *p);
-void SSDPResultData_set_CtrlptCallback(SSDPResultData *p, Upnp_FunPtr f);
-
-/** */
-void SSDPResultData_Callback(const SSDPResultData *p);
-
-#endif /* SSDP_RESULTDATA_H */
-

upnp/src/ssdp/ssdp_ctrlpt.c

@@ -42,7 +42,7 @@
 
 #include "httpparser.h"
 #include "httpreadwrite.h"
-#include "ssdp_ResultData.h"
+/*#include "ssdp_ResultData.h"*/
 #include "ssdplib.h"
 #include "statcodes.h"
 #include "unixutil.h"
@@ -74,10 +74,10 @@
  ***************************************************************************/
 void send_search_result(IN void *data)
 {
-	SSDPResultData *temp = (SSDPResultData *)data;
+	ResultData *temp = ( ResultData * ) data;
 
-	SSDPResultData_Callback(temp);
-	SSDPResultData_delete(temp);
+	temp->ctrlpt_callback(UPNP_DISCOVERY_SEARCH_RESULT, &temp->param, temp->cookie);
+	free(temp);
 }
 
 /************************************************************************
@@ -114,9 +114,7 @@ void ssdp_handle_ctrlpt_msg(
     struct Handle_Info *ctrlpt_info = NULL;
     memptr hdr_value;
     xboolean is_byebye;         // byebye or alive
-    UpnpDiscovery *param = UpnpDiscovery_new();
-    int expires;
-    int ret;
+    struct Upnp_Discovery param;
     SsdpEvent event;
     xboolean nt_found;
     xboolean usn_found;
@@ -128,7 +126,7 @@ void ssdp_handle_ctrlpt_msg(
     ListNode *node = NULL;
     SsdpSearchArg *searchArg = NULL;
     int matched = 0;
-    SSDPResultData *threadData = NULL;
+    ResultData *threadData = NULL;
     ThreadPoolJob job;
 
     // we are assuming that there can be only one client supported at a time
@@ -137,7 +135,7 @@ void ssdp_handle_ctrlpt_msg(
 
     if ( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
         HandleUnlock();
-	goto end_ssdp_handle_ctrlpt_msg;
+	return;
     }
     // copy
     ctrlpt_callback = ctrlpt_info->Callback;
@@ -147,45 +145,52 @@ void ssdp_handle_ctrlpt_msg(
     // search timeout
     if ( timeout ) {
         ctrlpt_callback( UPNP_DISCOVERY_SEARCH_TIMEOUT, NULL, cookie );
-	goto end_ssdp_handle_ctrlpt_msg;
+	return;
     }
 
-    UpnpDiscovery_set_ErrCode(param, UPNP_E_SUCCESS);
+    param.ErrCode = UPNP_E_SUCCESS;
 
     // MAX-AGE
     // assume error
-    expires = -1;
-    UpnpDiscovery_set_Expires(param, expires);
+    param.Expires = -1;
     if ( httpmsg_find_hdr( hmsg, HDR_CACHE_CONTROL, &hdr_value ) != NULL ) {
-        ret = matchstr( hdr_value.buf, hdr_value.length, "%imax-age = %d%0", &expires );
-        UpnpDiscovery_set_Expires(param, expires);
-        if( ret != PARSE_OK ) {
-            goto end_ssdp_handle_ctrlpt_msg;
-	}
+        if( matchstr( hdr_value.buf, hdr_value.length,
+                      "%imax-age = %d%0", &param.Expires ) != PARSE_OK )
+            return;
     }
 
     // DATE
+    param.Date[0] = '\0';
     if ( httpmsg_find_hdr( hmsg, HDR_DATE, &hdr_value ) != NULL ) {
-        UpnpDiscovery_strcpy_Date(param, hdr_value.buf);
+        linecopylen( param.Date, hdr_value.buf, hdr_value.length );
     }
 
     // dest addr
-    UpnpDiscovery_set_DestAddr(param, dest_addr);
+    memcpy(&param.DestAddr, dest_addr, sizeof(struct sockaddr_in) );
 
     // EXT
+    param.Ext[0] = '\0';
     if ( httpmsg_find_hdr( hmsg, HDR_EXT, &hdr_value ) != NULL ) {
-    	UpnpDiscovery_strncpy_Ext(param, hdr_value.buf, hdr_value.length);
+        linecopylen( param.Ext, hdr_value.buf, hdr_value.length );
     }
     // LOCATION
+    param.Location[0] = '\0';
     if ( httpmsg_find_hdr( hmsg, HDR_LOCATION, &hdr_value ) != NULL ) {
-        UpnpDiscovery_strncpy_Location(param, hdr_value.buf, hdr_value.length);
+        linecopylen( param.Location, hdr_value.buf, hdr_value.length );
     }
     // SERVER / USER-AGENT
+    param.Os[0] = '\0';
     if ( httpmsg_find_hdr( hmsg, HDR_SERVER, &hdr_value ) != NULL ||
         httpmsg_find_hdr( hmsg, HDR_USER_AGENT, &hdr_value ) != NULL ) {
-        UpnpDiscovery_strncpy_Os(param, hdr_value.buf, hdr_value.length);
+        linecopylen( param.Os, hdr_value.buf, hdr_value.length );
     }
     // clear everything
+    param.DeviceId[0] = '\0';
+    param.DeviceType[0] = '\0';
+    param.ServiceType[0] = '\0';
+
+    param.ServiceVer[0] = '\0'; // not used; version is in ServiceType
+
     event.UDN[0] = '\0';
     event.DeviceType[0] = '\0';
     event.ServiceType[0] = '\0';
@@ -208,32 +213,29 @@ void ssdp_handle_ctrlpt_msg(
     }
 
     if ( nt_found || usn_found ) {
-        UpnpDiscovery_strcpy_DeviceID(   param, event.UDN);
-        UpnpDiscovery_strcpy_DeviceType( param, event.DeviceType);
-        UpnpDiscovery_strcpy_ServiceType(param, event.ServiceType);
+        strcpy( param.DeviceId, event.UDN );
+        strcpy( param.DeviceType, event.DeviceType );
+        strcpy( param.ServiceType, event.ServiceType );
     }
 
     // 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 ) {
-            // error; NTS header not found
-            goto end_ssdp_handle_ctrlpt_msg;
+            return;             // error; NTS header not found
         }
         if ( memptr_cmp( &hdr_value, "ssdp:alive" ) == 0 ) {
             is_byebye = FALSE;
         } else if( memptr_cmp( &hdr_value, "ssdp:byebye" ) == 0 ) {
             is_byebye = TRUE;
         } else {
-            // bad value
-            goto end_ssdp_handle_ctrlpt_msg;
+            return;             // bad value
         }
 
         if ( is_byebye ) {
             // check device byebye
             if( !nt_found || !usn_found ) {
-                // bad byebye
-                goto end_ssdp_handle_ctrlpt_msg;
+                return;         // bad byebye
             }
             event_type = UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE;
         } else {
@@ -242,19 +244,17 @@ void ssdp_handle_ctrlpt_msg(
             //  only. Expires should be greater than 1800 (30 mins)
             if( !nt_found ||
                 !usn_found ||
-                UpnpString_get_Length(UpnpDiscovery_get_Location(param)) == 0 ||
-		UpnpDiscovery_get_Expires(param) <= 0 ) {
-                // bad advertisement
-                goto end_ssdp_handle_ctrlpt_msg;
+                strlen( param.Location ) == 0 || param.Expires <= 0 ) {
+                return;         // bad advertisement
             }
             event_type = UPNP_DISCOVERY_ADVERTISEMENT_ALIVE;
         }
 
         // call callback
-        ctrlpt_callback( event_type, param, ctrlpt_cookie );
-    } else {
-        // reply (to a SEARCH)
-	//
+        ctrlpt_callback( event_type, &param, ctrlpt_cookie );
+
+    } else                      // reply (to a SEARCH)
+    {
         // only checking to see if there is a valid ST header
         st_found = FALSE;
         if( httpmsg_find_hdr( hmsg, HDR_ST, &hdr_value ) != NULL ) {
@@ -264,18 +264,15 @@ void ssdp_handle_ctrlpt_msg(
             hdr_value.buf[hdr_value.length] = save_char;
         }
         if( hmsg->status_code != HTTP_OK ||
-            UpnpDiscovery_get_Expires(param) <= 0 ||
-            UpnpString_get_Length(UpnpDiscovery_get_Location(param)) == 0 ||
-	    !usn_found ||
-	    !st_found ) {
-            // bad reply
-            goto end_ssdp_handle_ctrlpt_msg;
+            param.Expires <= 0 ||
+            strlen( param.Location ) == 0 || !usn_found || !st_found ) {
+            return;             // bad reply
         }
         // check each current search
         HandleLock();
         if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
             HandleUnlock();
-            goto end_ssdp_handle_ctrlpt_msg;
+            return;
         }
         node = ListHead( &ctrlpt_info->SsdpSearchList );
 
@@ -321,14 +318,16 @@ void ssdp_handle_ctrlpt_msg(
 
             if (matched) {
                 // schedule call back
-		threadData = SSDPResultData_new();
+                threadData =
+                    ( ResultData * ) malloc( sizeof( ResultData ) );
                 if (threadData != NULL) {
-                    SSDPResultData_set_Param(threadData, param);
-                    SSDPResultData_set_Cookie(threadData, searchArg->cookie);
-                    SSDPResultData_set_CtrlptCallback(threadData, ctrlpt_callback);
-                    TPJobInit(&job, (start_routine)send_search_result, threadData);
+                    threadData->param = param;
+                    threadData->cookie = searchArg->cookie;
+                    threadData->ctrlpt_callback = ctrlpt_callback;
+                    TPJobInit( &job, ( start_routine ) send_search_result,
+                               threadData );
                     TPJobSetPriority(&job, MED_PRIORITY);
-                    TPJobSetFreeFunction(&job, (free_routine)SSDPResultData_delete);
+                    TPJobSetFreeFunction(&job, (free_routine)free);
                     ThreadPoolAdd(&gRecvThreadPool, &job, NULL);
                 }
             }
@@ -336,10 +335,8 @@ void ssdp_handle_ctrlpt_msg(
         }
 
         HandleUnlock();
-        //ctrlpt_callback( UPNP_DISCOVERY_SEARCH_RESULT, param, cookie );
+        //ctrlpt_callback( UPNP_DISCOVERY_SEARCH_RESULT, &param, cookie );
     }
-end_ssdp_handle_ctrlpt_msg:
-    UpnpDiscovery_delete(param);
 }
 
 
@@ -513,7 +510,6 @@ int SearchByTarget(
 	IN void *Cookie)
 {
 	char errorBuffer[ERROR_BUFFER_LEN];
-	int socklen = sizeof( struct sockaddr_storage );
 	int *id = NULL;
 	int ret = 0;
 	char ReqBufv4[BUFSIZE];
@@ -598,12 +594,14 @@ int SearchByTarget(
 		FD_SET(gSsdpReqSocket4, &wrSet);
 		max_fd = max(max_fd, gSsdpReqSocket4);
 	}
+#ifdef UPNP_ENABLE_IPV6
 	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);
 	}
+#endif
 
 	ret = select(max_fd + 1, NULL, &wrSet, NULL, NULL);
 	if (ret == -1) {
@@ -613,11 +611,13 @@ int SearchByTarget(
 			errorBuffer);
 		shutdown(gSsdpReqSocket4, SD_BOTH);
 		UpnpCloseSocket(gSsdpReqSocket4);
+#ifdef UPNP_ENABLE_IPV6
 		shutdown(gSsdpReqSocket6, SD_BOTH);
 		UpnpCloseSocket(gSsdpReqSocket6);
-
+#endif
 		return UPNP_E_INTERNAL_ERROR;
 	}
+#ifdef UPNP_ENABLE_IPV6
 	if (gSsdpReqSocket6 != INVALID_SOCKET && 
 	    FD_ISSET(gSsdpReqSocket6, &wrSet)) {
 		int NumCopy = 0;
@@ -625,28 +625,38 @@ int SearchByTarget(
 		while (NumCopy < NUM_SSDP_COPY) {
 			sendto(gSsdpReqSocket6,
 				ReqBufv6UlaGua, strlen(ReqBufv6UlaGua), 0,
-				(struct sockaddr *)&__ss_v6, socklen);
+				(struct sockaddr *)&__ss_v6,
+                               sizeof(struct sockaddr_in));
 			NumCopy++;
 			imillisleep(SSDP_PAUSE);
 		}
 		NumCopy = 0;
 		inet_pton(AF_INET6, SSDP_IPV6_LINKLOCAL, &destAddr6->sin6_addr);
 		while (NumCopy < NUM_SSDP_COPY) {
+                    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                                ">>> SSDP SEND M-SEARCH >>>\n%s\n",
+                                ReqBufv6);
 			sendto(gSsdpReqSocket6,
-				ReqBufv6, strlen(ReqBufv6), 0,
-				(struct sockaddr *)&__ss_v6, socklen);
+                               ReqBufv6, strlen(ReqBufv6), 0,
+                               (struct sockaddr *)&__ss_v6, 
+                               sizeof(struct sockaddr_in6));
 			NumCopy++;
 			imillisleep(SSDP_PAUSE);
 		}
 	}
+#endif  //IPv6
+
 	if (gSsdpReqSocket4 != INVALID_SOCKET && 
 	    FD_ISSET(gSsdpReqSocket4, &wrSet)) {
 		int NumCopy = 0;
-
 		while (NumCopy < NUM_SSDP_COPY) {
+                    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                                ">>> SSDP SEND M-SEARCH >>>\n%s\n",
+                                ReqBufv4);
 			sendto(gSsdpReqSocket4,
 				ReqBufv4, strlen(ReqBufv4), 0,
-				(struct sockaddr *)&__ss_v4, socklen);
+				(struct sockaddr *)&__ss_v4, 
+                                sizeof(struct sockaddr_in));
 			NumCopy++;
 			imillisleep(SSDP_PAUSE);
 		}

upnp/src/ssdp/ssdp_device.c

@@ -1,30 +1,30 @@
 /**************************************************************************
  *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+ * 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: 
+ * 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 
+ * - 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 
+ *
+ * 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 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  **************************************************************************/
@@ -102,9 +102,9 @@ advertiseAndReplyThread( IN void *data )
 *	1 if successful else appropriate error
 ***************************************************************************/
 #ifdef INCLUDE_DEVICE_APIS
-void
-ssdp_handle_device_request( IN http_message_t *hmsg,
-                            IN struct sockaddr *dest_addr )
+void ssdp_handle_device_request(
+	IN http_message_t *hmsg,
+	IN struct sockaddr *dest_addr)
 {
 #define MX_FUDGE_FACTOR 10
 
@@ -229,6 +229,7 @@ NewRequestHandler( IN struct sockaddr *DestAddr,
     int ttl = 4; // a/c to UPNP Spec
     int hops = 1;
     char buf_ntop[64];
+    int ret = UPNP_E_SUCCESS;
 
     ReplySock = socket( DestAddr->sa_family, SOCK_DGRAM, 0 );
     if ( ReplySock == -1 ) {
@@ -247,6 +248,7 @@ NewRequestHandler( IN struct sockaddr *DestAddr,
             (char *)&replyAddr, sizeof (replyAddr) );
         setsockopt( ReplySock, IPPROTO_IP, IP_MULTICAST_TTL,
             (char *)&ttl, sizeof (int) );
+        socklen = sizeof(struct sockaddr_in);
     } else if( DestAddr->sa_family == AF_INET6 ) {
         inet_ntop(AF_INET6, &((struct sockaddr_in6*)DestAddr)->sin6_addr, 
             buf_ntop, sizeof(buf_ntop));
@@ -257,6 +259,8 @@ NewRequestHandler( IN struct sockaddr *DestAddr,
     } else {
         UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
             "Invalid destination address specified." );
+        ret = UPNP_E_NETWORK_ERROR;
+        goto end_NewRequestHandler;
     }
 
     for( Index = 0; Index < NumPacket; Index++ ) {
@@ -280,15 +284,27 @@ NewRequestHandler( IN struct sockaddr *DestAddr,
             rc = sendto( ReplySock, *( RqPacket + Index ),
                          strlen( *( RqPacket + Index ) ),
                          0, DestAddr, socklen );
+
+            if (rc == -1) {
+                strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
+                UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                            "SSDP_LIB: New Request Handler:"
+                            "Error in socket(): %s\n", errorBuffer );
+                ret = UPNP_E_SOCKET_WRITE;
+                goto end_NewRequestHandler;
+            }
+            
             imillisleep( SSDP_PAUSE );
+
             ++NumCopy;
         }
     }
 
+end_NewRequestHandler:
     shutdown( ReplySock, SD_BOTH );
     UpnpCloseSocket( ReplySock );
 
-    return UPNP_E_SUCCESS;
+    return ret;
 }
 
 /**
@@ -405,6 +421,7 @@ void CreateServicePacket(
 		}
 	} else if (msg_type == MSGTYPE_ADVERTISEMENT ||
 		   msg_type == MSGTYPE_SHUTDOWN) {
+		char *host = NULL;
 		if (msg_type == MSGTYPE_ADVERTISEMENT) {
 			nts = "ssdp:alive";
 		} else {
@@ -413,7 +430,6 @@ void CreateServicePacket(
 		}
 		/* 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 {

upnp/src/ssdp/ssdp_server.c

@@ -50,26 +50,36 @@
 
 #define MAX_TIME_TOREAD  45
 
-CLIENTONLY( SOCKET gSsdpReqSocket4 = INVALID_SOCKET; )
-CLIENTONLY( SOCKET gSsdpReqSocket6 = INVALID_SOCKET; )
+#ifdef INCLUDE_CLIENT_APIS
+	SOCKET gSsdpReqSocket4 = INVALID_SOCKET;
+	#ifdef UPNP_ENABLE_IPV6
+		SOCKET gSsdpReqSocket6 = INVALID_SOCKET;
+	#endif /* UPNP_ENABLE_IPV6 */
+#endif /* INCLUDE_CLIENT_APIS */
 
 void RequestHandler();
 int create_ssdp_sock_v4( SOCKET* ssdpSock );
+#ifdef UPNP_ENABLE_IPV6
 int create_ssdp_sock_v6( SOCKET* ssdpSock );
 int create_ssdp_sock_v6_ula_gua( SOCKET* ssdpSock );
+#endif
 #if INCLUDE_CLIENT_APIS
 int create_ssdp_sock_reqv4( SOCKET* ssdpReqSock );
+#ifdef UPNP_ENABLE_IPV6
 int create_ssdp_sock_reqv6( SOCKET* ssdpReqSock );
 #endif
+#endif
 Event ErrotEvt;
 
 enum Listener { Idle, Stopping, Running };
 
 struct SSDPSockArray {
-	// socket for incoming advertisments and search requests
+	/* socket for incoming advertisments and search requests */
 	SOCKET ssdpSock;
-	// socket for sending search requests and receiving search replies
-	CLIENTONLY( int ssdpReqSock; )
+#ifdef INCLUDE_CLIENT_APIS
+	/* socket for sending search requests and receiving search replies */
+	int ssdpReqSock;
+#endif /* INCLUDE_CLIENT_APIS */
 };
 
 #ifdef INCLUDE_DEVICE_APIS
@@ -258,7 +268,7 @@ int AdvertiseAndReply(
 				}
 			}
 			case SSDP_DEVICETYPE: {
-				if (!strncasecmp(DeviceType, devType, strlen(DeviceType))) {
+				if (!strncasecmp(DeviceType, devType, strlen(DeviceType)-2)) {
 					if (atoi(&DeviceType[strlen(DeviceType)-1]) <= atoi(&devType[strlen(devType)-1])) {
 						/* the requested version is lower than the device version
 						 * must reply with the lower version number */
@@ -301,6 +311,7 @@ int AdvertiseAndReply(
 		}
 		ixmlNodeList_free(nodeList);
 		if (!tmpNode) {
+			nodeList = NULL;
 			continue;
 		}
 		nodeList = ixmlElement_getElementsByTagName(
@@ -732,26 +743,26 @@ start_event_handler( void *Data )
  * Returns: void
  *
  ***************************************************************************/
-static void
-ssdp_event_handler_thread( void *the_data )
+static void ssdp_event_handler_thread(void *the_data)
 {
-    ssdp_thread_data *data = ( ssdp_thread_data * ) the_data;
-    http_message_t *hmsg = &data->parser.msg;
+	ssdp_thread_data *data = (ssdp_thread_data *)the_data;
+	http_message_t *hmsg = &data->parser.msg;
 
-    if( start_event_handler( the_data ) != 0 ) {
-        return;
-    }
-    // send msg to device or ctrlpt
-    if( ( hmsg->method == HTTPMETHOD_NOTIFY ) ||
-        ( hmsg->request_method == HTTPMETHOD_MSEARCH ) ) {
-        CLIENTONLY( ssdp_handle_ctrlpt_msg( hmsg, 
-            (struct sockaddr*)&data->dest_addr, FALSE, NULL );)
-    } else {
-        ssdp_handle_device_request( hmsg, (struct sockaddr*)&data->dest_addr );
-    }
+	if (start_event_handler(the_data) != 0) {
+		return;
+	}
+	/* send msg to device or ctrlpt */
+	if (hmsg->method == HTTPMETHOD_NOTIFY ||
+	    hmsg->request_method == HTTPMETHOD_MSEARCH) {
+#ifdef INCLUDE_CLIENT_APIS
+		ssdp_handle_ctrlpt_msg(hmsg, (struct sockaddr *)&data->dest_addr, FALSE, NULL);
+#endif /* INCLUDE_CLIENT_APIS */
+	} else {
+		ssdp_handle_device_request(hmsg, (struct sockaddr *)&data->dest_addr);
+	}
 
-    // free data
-    free_ssdp_event_handler_data( data );
+	/* free data */
+	free_ssdp_event_handler_data(data);
 }
 
 /************************************************************************
@@ -791,11 +802,20 @@ readFromSSDPSocket( SOCKET socket )
         //initialize parser
 
 #ifdef INCLUDE_CLIENT_APIS
+#ifdef UPNP_ENABLE_IPV6
         if( socket == gSsdpReqSocket4 || socket == gSsdpReqSocket6 ) {
             parser_response_init( &data->parser, HTTPMETHOD_MSEARCH );
         } else {
             parser_request_init( &data->parser );
         }
+#else
+        if( socket == gSsdpReqSocket4 ) {
+            parser_response_init( &data->parser, HTTPMETHOD_MSEARCH );
+        } else {
+            parser_request_init( &data->parser );
+        }
+
+#endif
 #else
         parser_request_init( &data->parser );
 #endif
@@ -820,8 +840,10 @@ readFromSSDPSocket( SOCKET socket )
 
         if( __ss.ss_family == AF_INET )
             inet_ntop( AF_INET, &((struct sockaddr_in*)&__ss)->sin_addr, ntop_buf, sizeof(ntop_buf) );
+#ifdef UPNP_ENABLE_IPV6
         else if( __ss.ss_family == AF_INET6 )
             inet_ntop( AF_INET6, &((struct sockaddr_in6*)&__ss)->sin6_addr, ntop_buf, sizeof(ntop_buf) );
+#endif
         else
             strncpy( ntop_buf, "<Invalid address family>", sizeof(ntop_buf) );
 
@@ -876,6 +898,9 @@ int get_ssdp_sockets(MiniServerSockArray *out)
 {
 	int retVal;
 
+        out->ssdpReqSock4 = INVALID_SOCKET;
+        out->ssdpReqSock6 = INVALID_SOCKET;
+
 #if INCLUDE_CLIENT_APIS
 	/* Create the IPv4 socket for SSDP REQUESTS */
 	if(strlen(gIF_IPV4) > 0) {
@@ -890,6 +915,7 @@ int get_ssdp_sockets(MiniServerSockArray *out)
 	}
 
 	/* Create the IPv6 socket for SSDP REQUESTS */
+#ifdef UPNP_ENABLE_IPV6
 	if (strlen(gIF_IPV6) > 0) {
 		retVal = create_ssdp_sock_reqv6(&out->ssdpReqSock6);
 		if (retVal != UPNP_E_SUCCESS) {
@@ -902,6 +928,9 @@ int get_ssdp_sockets(MiniServerSockArray *out)
 	} else {
 		out->ssdpReqSock6 = INVALID_SOCKET;
 	}
+#endif  //IPv6
+
+
 #endif /* INCLUDE_CLIENT_APIS */
 
 	/* Create the IPv4 socket for SSDP */
@@ -921,6 +950,7 @@ int get_ssdp_sockets(MiniServerSockArray *out)
 	}
 
 	/* Create the IPv6 socket for SSDP */
+#ifdef UPNP_ENABLE_IPV6
 	if (strlen(gIF_IPV6) > 0) {
 		retVal = create_ssdp_sock_v6(&out->ssdpSock6);
 		if (retVal != UPNP_E_SUCCESS) {
@@ -956,6 +986,8 @@ int get_ssdp_sockets(MiniServerSockArray *out)
 	} else {
 		out->ssdpSock6UlaGua = INVALID_SOCKET;
 	}
+#endif //IPv6
+
 
 	return UPNP_E_SUCCESS;
 }
@@ -1011,6 +1043,7 @@ int create_ssdp_sock_reqv4( SOCKET* ssdpReqSock )
  * Returns: void
  *
  ***************************************************************************/
+#ifdef UPNP_ENABLE_IPV6
 int create_ssdp_sock_reqv6( SOCKET* ssdpReqSock )
 {
     char errorBuffer[ERROR_BUFFER_LEN];
@@ -1035,6 +1068,8 @@ int create_ssdp_sock_reqv6( SOCKET* ssdpReqSock )
 
     return UPNP_E_SUCCESS;
 }
+#endif // IPv6
+
 #endif /* INCLUDE_CLIENT_APIS */
 
 
@@ -1178,6 +1213,7 @@ int create_ssdp_sock_v4( SOCKET* ssdpSock )
  * Returns: void
  *
  ***************************************************************************/
+#ifdef UPNP_ENABLE_IPV6
 int create_ssdp_sock_v6( SOCKET* ssdpSock )
 {
     char errorBuffer[ERROR_BUFFER_LEN];
@@ -1274,7 +1310,7 @@ int create_ssdp_sock_v6( SOCKET* ssdpSock )
     return UPNP_E_SUCCESS;
 }
 
-
+#endif // IPv6
 
 /************************************************************************
  * Function : create_ssdp_sock_v6_ula_gua
@@ -1288,6 +1324,7 @@ int create_ssdp_sock_v6( SOCKET* ssdpSock )
  * Returns: void
  *
  ***************************************************************************/
+#ifdef UPNP_ENABLE_IPV6
 int create_ssdp_sock_v6_ula_gua(SOCKET *ssdpSock)
 {
 	char errorBuffer[ERROR_BUFFER_LEN];
@@ -1385,7 +1422,7 @@ int create_ssdp_sock_v6_ula_gua(SOCKET *ssdpSock)
 
 	return UPNP_E_SUCCESS;
 }
-
+#endif   //IPv6
 
 #endif /* EXCLUDE_SSDP */