workaround for Linux-applications that do not catch SIGPIPE backported

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

ChangeLog

@@ -1,427 +1,8 @@
-*******************************************************************************
-Version 1.6.1
-*******************************************************************************
-
-2007-11-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1825278 ] AdvertiseAndReply sleeps with handle lock out
-	Applied patch from Alex (afaucher) to change some write locks to read
-	locks.
-
-2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Adjusting libtool library numbers to reflect the last changes.
-
-2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1825278 ] AdvertiseAndReply sleeps with handle lock out
-	GlobalHndMutex, which was a mutex is now GlobalHndRWLock, which is a
-	rwlock. HandleLock() is mapped to HandleWriteLock() while all other
-	instances have not been checked. One instance in AdvertiseAndReply()
-	has been changed to HandleReadLock(). Thanks to Alex (afaucher) for the 
-	bug report and suggestions.
-
-2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added support for rwlocks.
-
-2007-11-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1825929 ] woker thread still alive after UpnpFinish()
-	Submitted By: Luke Kim - nereusuj
-	Worker thread still alive after calling UpnpFinish() because
-	ThreadPoolShutdown() is in the #ifdef DEBUG block.
-	421
-	422 #ifdef DEBUG
-	423 ThreadPoolShutdown( &gSendThreadPool );
-	424 ThreadPoolShutdown( &gRecvThreadPool );
-
-2007-08-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Changed the calls to virtualDirCallback.open(filename, UPNP_WRITE)
-	to (virtualDirCallback.open)(filename, UPNP_WRITE) (notice the
-	parenthesis) due to a change in glibc that produces compilation
-	errors.
-
-2007-08-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Initialization of the "randomness" struct so that valgrind does not
-	complain.
-
-2007-08-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Merge of patch submitted By Keith Brindley - brindlk
-	SF Bug Tracker [ 1762758 ] Seek not working for large files
-	Problem:
-	Requests from the uPnP client to seek to a position beyond 2GB in a large
-	file are handled as a request to see from the 2GB point.
-
-	Impact:
-	Varies depending on client. The Xbox 360 kills the connection when it
-	realises.
-
-	Solution:
-	GetNextRange function (webserver.c) is updated to handle large file sizes.
-	Fix should also recognise when built on a 32bit platform rather than 64 and
-	handle accordingly.
-
-2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Merge of Mac OS X patch from St<53>phane Corth<74>sy (davelopper),
-	SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
-	Some of the proposed changes were already done by Rene Hexel's patch.
-
-*******************************************************************************
-Version 1.6.0
-*******************************************************************************
-
-2007-06-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* More fixes to Mac OS X and NetBSD from Rene Hexel:
-	[pupnp-devel] NetBSD & Mac OS X packages and patches
-
-	  Okay, I found a couple more things.  I have attached a patch file
-	against the trunk (version 206) that make the repository code compile
-	and run on both Mac OS X and NetBSD.
-
-	This fixes the following issues:
-
-	   upnp/src/api/upnpapi.c: SIOCGIFCONF didn't work properly, use
-	getifaddrs() instead (on BSD systems).
-
-	  threadutil/src/ThreadPool.c: priorities only work if
-	_POSIX_PRIORITY_SCHEDULING is defined (and greater than 0).
-
-	  threadutil/src/LinkedList.c and threadutil/src/iasnprintf.c: use
-	stdlib.h instead of malloc.h on all BSD systems (not just FreeBSD).
-	This is important, because malloc.h does not exist on Darwin/Mac OS X.
-
-	  Cheers
-	      ,
-	   Rene
-
-2007-06-09 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* [pupnp-devel] NetBSD & Mac OS X packages and patches.
-	Rene Hexel's <rh@netbsd.org> patch to compile in NetBSD and Mac OS X.
-
-2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Updated the macro files acx_pthread.m4, ax_cflags_gcc_option.m4,
-	ax_cflags_warn_all.m4, m4/ax_cflags_warn_all_ansi.m4,
-	m4/type_socklen_t.m4.
-
-2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fixed an issue with the instalation of the file upnpdebug.h. Since
-	the last modifications that removed the macro DEBUV_ONLY, this file
-	must be installed even on a non-debug build.
-
-2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1711325 ] Bad DestAddr in Upnp_Discovery structure
-	Submitted By: Bob Ciora
-	The field DestAddr of the structure Upnp_Discovery is now a full
-	SOCKADDRIN instead of a pointer to SOCKADDRIN. Commented code sugests
-	that in a previous moment, the function ssdp_handle_ctrlpt_msg() did
-	not use a postponed thread to call ctrlpt_callback(). Now the code
-	uses a thread, and most probably the original data would get lost and
-	the pointer would point to an invalid memory region. This fix caused
-	an interface change in the library and the minor library version was
-	bumped. Also, the libtool library numbers were changed accordingly.
-
-2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added support for the Basic Device
-	(http://www.upnp.org/standardizeddcps/basic.asp) as suggested by
-	Titus Winters.
-
-2007-05-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fixed the file libupnp.pc.in to generate a correct path for the
-	include files.
-
-2007-05-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Removing the Dbg_Level, InitLog, SetLogFileNames and CloseLog
-	defines. These were just aliases, no reason to keep them.
-
-2007-05-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Changed the comments of the include files that expose the UPnP API
-	to use only C89 comments and no C99 comments.
-
-2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
-	* Added tvcombo sample that demonstrates coexistence of a device and a
-	control point in the same application.
-
-2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
-	* SF Tracker FR [ 1570020 ].
-	* Enable both device and control point in the same application. Resolve
-	deadlock in the SSDP processing threads.
-	* Fix Threadpool expansion condition.
-	Thanks to Siva Chandran P. for the original patch.
-
-2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
-	* Modified tvdevice (control and picture) service descriptions to make
-	compatible with WinXP/IE control point. 'in' arguments must appear before
-	'out' arguments in argument list.
-	Thanks to Martin Tremblay for pointing out the solution originally provided
-	by MORIOKA Yasuhiro.
-
-2007-05-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* More MSVC fixes, using XINLINE instead of inline, MSVC has troubles
-	with inline. Thanks to David Maass for reporting.
-	* Changed XINLINE to UPNP_INLINE.
-
-2007-05-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added the file build/inc/msvc/inttypes.h. This file is for use with
-	MSVC only, because it does not provide C99 compatibility.
-
-2007-05-18 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Removed all uses of the DEVICEONLY(x) macro.
-
-2007-05-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Removed all uses of the DBGONLY(x) macro. A static inline empty
-	function now is used and the compiler takes care of optimizing it out.
-
-2007-05-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fixed a bug in UpnpPrintf, function could call va_start() and return
-	befor calling va_end().
-
-2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* EXPORT_SPEC missing on some declarations in ixml/inc/ixml.h.
-	Thanks to David Maass.
-
-2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* sizeof is unsigned, so %zu is more adequate than %zd.
-
-2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Using an invented printf directive PRIzu that on MSVC
-	expands to "lu", and on normal C99 compilers expands to "zu".
-
-2007-05-15 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Rewrote raw_find_str. Now it no longer uses strcasestr(), but it
-	transforms the first input buffer into lowercase.
-
-2007-05-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fix for debug printf format strings. size_t are not expected
-	in a string format like "%.*s".
-
-2007-05-08 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added inttypes.h as a header requirement in configure.ac.
-
-2007-05-11 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Moved upnp_tv_ctrlpt and upnp_tv_device executables from folder
-	upnp to folder upnp/sample. Moved folder upnp/sample/tvdevice/web
-	to folder upnp/sample/web. This way, if someone compiles the
-	tarball and executes upnp_tv_device from its creation directory,
-	there will be no error -108 for not finding directory web.
-
-*******************************************************************************
-Version 1.4.6
-*******************************************************************************
-
-2007-04-19 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fix for freebsd host_os in configure.ac.
-
-*******************************************************************************
-Version 1.4.5
-*******************************************************************************
-
-2007-04-19 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Case insensitive comparison in raw_find_str() (httpparser.c) as
-	suggested by Craig Nelson in SF Tracker [ 1689382 ] DLINK DIR-625
-	patch.
-
-2007-04-07 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
-	* Fix for a bug in makeAction where va_arg was beeing called one
-	extra time.
-
-2007-04-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Tracker [ 1703533 ] Patch to make it compile under FreeBSD
-	Submitted By: Timothy Redaelli - drittz
-	I made some patches to make it compile under FreeBSD using
-	gethostbyaddr_r when supported.
-
-2007-04-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* [pupnp-devel] Type mixup on x86_64 causes UPNP_E_OUTOF_MEMORY
-	Submitted By: Glen Masgai
-	after an UpnpSendActionAsync() for example, i get UPNP_E_OUTOF_MEMORY
-	in the callback using 1.4.4 on a x86_64 system. This happens in
-	http_MakeMessage(), which in some cases get called with wrong types
-	(int instead of size_t) in combination with format "b" and "Q".
-	The attached patch should fix this.
-
-*******************************************************************************
-Version 1.4.4
-*******************************************************************************
-
-2007-04-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Tracker [ 1695399 ] Typo in util.h
-	Submitted By: Luke Kim - nereusuj
-	Unix sleep is in seconds but WIN32 Sleep is in milliseconds.
-
-2007-04-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Tracker [ 1652827 ] UpnpRegisterRootDevice returned -104
-	Submitted By: Michael Andersen - miwer
-	
-	Issue was found to be related to sizeof (size_t) != sizeof (int)
-	on AMD64 systems. Emil Ljungdahl's AMD64 patch has been applied along
-	with some other fixes. Original user report follows:
-
-	When I run upnpd I get the above mentioned error (UPNP_E_OUTOF_MEMORY).
-	I've tried with 1.4.1 and 1.4.2-RC3, it's the same. I don't understand why,
-	because I have plenty of RAM, and I even tried closing some applications,
-	but it didn't help.
-
-	$ upnpd eth1 br0
-
-	The following is logged in the /var/log/messages:
-	Feb 6 01:33:47 server upnpd[6933]: Error registering the root device with
-	descDocUrl: http://192.168.0.1:49152/gatedesc.xml
-	Feb 6 01:33:47 server upnpd[6933]: UpnpRegisterRootDevice returned -104
-
-
-	I tried enabling debugging and it looks like it cannot allocate memory
-	through the membuffer_append function. It's wierd because it's only a few
-	bytes.
-
-	Please note, that I enabled some extra debugging lines that were commented,
-	in order to get more information. See attached files.
-
-*******************************************************************************
-Version 1.4.3
-*******************************************************************************
-
-2007-03-13 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Tracker [ 1663004 ] Compile on Cygwin
-	Submitted By: Jon Foster - jongfoster
-	This patch gives basic support for building under Cygwin - it compiles,
-	links, and a simple UPnP device application can initialise. I'm not sure
-	if it actually works yet, but this is definitely a step in the right
-	direction.
-	
-	Patch is against the 1.4.1 release. Changes are:
-	
-	* threadutil/inc/ithread.h: Fix the ithread mutex support to use
-	documented, portable APIs (if present) rather than the Non-Portable (_NP)
-	ones it uses now. This is required because Cygwin implements only the
-	portable API.
-	
-	* threadutil/src/ThreadPool.c: Fake SetPolicyType() to do nothing on Cygwin
-	because otherwise it fails. Should probably investigate why it fails and
-	add a proper implementation later.
-	
-	* upnp/src/api/upnpapi.c: On Cygwin, zero out the GlobalHndMutex structure
-	before initialising it. Without this, the initialisation fails. This
-	appears to be a bug in Cygwin.
-	
-	* upnp/src/genlib/net/uri/uri.c: Use gethostbyname() on Cygwin.
-	
-2007-03-05 Oxy <oxygenic(at)users.sourceforge.net>
-	* Code adapted and typedefs added to compile cleanly under Windows
-	with Borland C++ Builder and MS Visual C++
-
-2007-03-03 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	
-	* Fixed nasty segmentation fault bug on membuffer.c.
-	
-*******************************************************************************
-Version 1.4.2
-*******************************************************************************
-
-2007-02-09 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-
-	* 32/64 bits portability issues on *printf.
-	Use %zd for size_t, and cast to (long long) for off_t.
-
-2007-02-02 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-
-	* Bumped the program version to 1.4.2 in config.ac.
-
-	* Now requires autoconf 2.60.
-
-	* Fixed docdir use.
-
-	* Does not install the documentation by default.
-
-	* Use dist-bzip2 to create a .bz2 distribution file.
-
-2007-01-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-
-	* SF Tracker [ 1634922 ] Support for large files (>= 2 GiB), part 2
-	Submitted By: Jonathan - no_dice
-	Summary: This patch hopefully fixes the remaining types and related
-	code to enable files >= 2 GiB to be streamed. Jonathan claims to have
-	tested this with a patched version of ushare-0.9.8 and a D-Link DSM-520.
-
-2007-01-09 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-
-	* SF Tracker [ 1628629 ] Multicast interface patch
-	Submitted By: Fredrik Svensson - svefredrik
-	This patch fixes two problems:
-	1) Specify the IP address for the interface when we do
-	setsockopt IP_ADD_MEMBERSHIP. This makes it possible to run
-	when no default router has been configured.
-	2) Explicitly set the multicast interface through setsockopt
-	IP_MULTICAST_IF. Avoids socket error -207 in some cases.
-	
-	* SF Tracker [ 1628590 ] XML parsing segfault patch
-	Submitted By: Fredrik Svensson - svefredrik
-	This patch fixes a segmentation fault problem that occurrs
-	when parsing XML code than some routers produce.
-
-2007-01-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-
-	* SF Tracker [ 1628552 ] XML white space patch
-	Submitted By: Fredrik Svensson - svefredrik
-	
-	* SF Tracker [ 1628562 ] Maximum total jobs patch
-	Submitted By: Fredrik Svensson - svefredrik
-	Also, I incremented the libray versions and included some
-	comments in the file configure.ac so that we do not bump
-	the library version excessively, only the necessary numbers
-	on the next release.
-	
-	* SF Tracker [ 1628575 ] Linksys WRT54G patch
-	Submitted By: Fredrik Svensson - svefredrik
-	
-	* SF Tracker [ 1628636 ] SSDP packet copy patch
-	Submitted By: Fredrik Svensson - svefredrik
-	Changed NUM_COPY to 1 since, according to section 9.2 of the
-	HTTPU/MU spec, we should never send more than one copy of a
-	reply to an SSDP request. Ref. section 9.2 of
-	http://www.upnp.org/download/draft-goland-http-udp-04.txt
-
-2006-12-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-
-	* Thorough revision of every call of http_MakeMessage() due to a
-	bug introduced in rev.79 "largefile patch added".
-	http_MakeMessage() has a worst than brain damaged "printf" like
-	interface. In rev.79, the "N" format parameter must be an off_t.
-	Every call of this function with an "N" format parameter and an
-	int passed on the stack would fail terribly.
-	
-	* SF Bug tracker [ 1590469 ]
-	Typo in ixmlparser.c
-	Submitted By: Erik Johansson - erijo
-	
-	* SF Bug Tracker [ 1590466 ] Invalid xml output
-	Submitted By: Erik Johansson - erijo
-	
-	* SF Patch tracker [ 1581161 ] VStudio2005 patch
-	Submitted By: David Maass - darkservant
-	
-	* SF Patch tracker [ 1587272 ] const-ified ixml
-	Submitted By: Erik Johansson
-	
-	* Finished const-ifications as suggested by Erik Johansson in
-	SF Patch tracker [ 1587272 ].
-
-2006-07-05 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
-	* [bug-id] 1580440
-	[submitted-by] Erik Johansson - erijo
-	[patched-by] Erik Johansson - erijo
-	The SOAP HTTP message that's generated on upnp errors
-	is missing a \r\n\ between header and body.
-
-2006-07-07 Oxy <virtual_worlds(at)gmx.de>
-
-	* support for large files (>2 GBytes) added
-
-
-*******************************************************************************
-Version 1.4.1
-*******************************************************************************
-
 2006-07-07 Oxy <virtual_worlds(at)gmx.de>
 
 	* full support for Windows added, static library and DLL are fully
-	working, code compiles with Borland Builder C++ and MS Visual
+        working, code compiles with Borland Builder C++ and MS Visual
-	C/C++
+        C/C++
 
 2006-07-05 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
 
@@ -446,9 +27,9 @@ Version 1.4.1
 	* Patch to fix memory leaks and reasons for crashes added (thanks
 	to loigu)
 
-*******************************************************************************
+*************************************************************************
-Version 1.4.0
+Release of version 1.4.0
-*******************************************************************************
+*************************************************************************
 
 2006-05-26 Oxy <virtual_worlds(at)gmx.de>
 
@@ -465,18 +46,15 @@ Version 1.4.0
 2006-05-18 Oxy <virtual_worlds(at)gmx.de>
 
 	* DSM-320 patch added (fetched from project MediaTomb)
-	
 	* httpGet additons atch added, Added proxy support by introducing
 	  UpnpOpenHttpGetProxy. UpnpOpenHttpGet now just calls
 	  UpnpOpenHttpGetProxy with the proxy url set to NULL.
-	  
 	* Bugfix for typo ("\0" / "0") in ixmlparser.c
-	
 	* Bugfix for M-Search packet
 
-*******************************************************************************
+*************************************************************************
 FORK FROM DEAD libupnp
-*******************************************************************************
+*************************************************************************
 
 2006-04-29  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 

Makefile.am

@@ -1,48 +1,44 @@
+# $Id: Makefile.am,v 1.5 2006/04/29 20:12:50 r3mi Exp $
 #
 # Top-level "Makefile.am" for libupnp
 #
 # Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS 	= -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-debug --enable-samples
 
-SUBDIRS = \
+SUBDIRS 		= ixml threadutil upnp docs/dist
-	ixml \
-	threadutil \
-	upnp \
-	docs/dist
 
 
-EXTRA_DIST = \
+EXTRA_DIST		= libupnp.pc.in LICENSE THANKS libupnp.spec \
-	libupnp.pc.in \
+			build/libupnp.bpf \
-	LICENSE \
+			build/libupnp.bpr \
-	THANKS \
+			build/libupnp.dsp \
-	libupnp.spec \
+			build/libupnp.dsw \
-	build/libupnp.bpf \
+			build/inc/autoconfig.h \
-	build/libupnp.bpr \
+			build/inc/config.h \
-	build/libupnp.dsp \
+			build/inc/upnpconfig.h
-	build/libupnp.dsw \
-	build/inc/autoconfig.h \
-	build/inc/config.h \
-	build/inc/upnpconfig.h \
-	build/msvc/inttypes.h
 
 
 # This variable must have 'exec' in its name, in order to be installed 
 # by 'install-exec' target (instead of default 'install-data')
-pkgconfigexecdir = $(libdir)/pkgconfig
+pkgconfigexecdir 	= $(libdir)/pkgconfig
-pkgconfigexec_DATA = libupnp.pc
+pkgconfigexec_DATA 	= libupnp.pc
-
 
 $(pkgconfigexec_DATA): config.status
 
 
-if WITH_DOCUMENTATION
+if WITH_DOCDIR
-	doc_DATA = LICENSE README NEWS TODO THANKS
+    docdir		= @DOCDIR@
+    doc_DATA 		= LICENSE README NEWS TODO THANKS
 endif
 
 
-CLEANFILES = IUpnpErrFile.txt IUpnpInfoFile.txt
+CLEANFILES		= IUpnpErrFile.txt IUpnpInfoFile.txt
+
+
+
+
 

THANKS

@@ -6,34 +6,18 @@ suggesting various improvements or submitting actual code.
 Here is a list of these people. Help us keep it complete and
 exempt of errors.
 
-- Alex (afaucher)
-- Arno Willig
-- Bob Ciora
-- Chaos
-- Craig Nelson
-- David Maass
-- Emil Ljungdahl
-- Erik Johansson
-- Eric Tanguy
 - Erwan Velu
-- Fredrik Svensson
+- Paul Vixie
-- Glen Masgai
+- Arno Willig
-- Jiri Zouhar
+- Eric Tanguy
+- Oskar Liljeblad
+- Chaos
 - John Dennis
-- Jonathan (no_dice)
+- Jiri Zouhar
-- Keith Brindley
-- Leuk_He
 - Loigu
-- Luke Kim
+- Marcelo Jimenez
-- Marcelo Roberto Jimenez (mroberto)
 - Markus Strobl
 - Nektarios K. Papadopoulos
-- Oskar Liljeblad
+- Oxy
-- Michael (Oxy)
-- Paul Vixie
-- Rene Hexel
 - Siva Chandran
-- Stéphane Corthésy
-- Timothy Redaelli
-- Titus Winters
 

bootstrap

@@ -13,3 +13,7 @@ autoreconf --force --install -Wall -Wno-obsolete $* || exit 1
 echo "Now run ./configure and then make."
 exit 0
 
+
+
+
+

build/inc/autoconfig.h

@@ -1,4 +1,4 @@
-/* autoconfig.h.  Generated from autoconfig.h.in by configure.  */
+/* autoconfig.h.  Generated by configure.  */
 /* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 to compile debug code */
@@ -19,18 +19,15 @@
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
 
-/* Define to 1 if you have the `ftime' function. */
-#define HAVE_FTIME 1
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Define to 1 if you have the `compat' library (-lcompat). */
-/* #undef HAVE_LIBCOMPAT */
-
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
@@ -95,19 +92,19 @@
 #define PACKAGE "libupnp"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "mroberto@users.sourceforge.net"
+#define PACKAGE_BUGREPORT "virtual_worlds@gmx.de"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libupnp"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libupnp 1.4.7"
+#define PACKAGE_STRING "libupnp 1.4.0"
 
 /* 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.4.7"
+#define PACKAGE_VERSION "1.4.0"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -138,30 +135,27 @@
 #define UPNP_VERSION_MINOR 4
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_PATCH 7
+#define UPNP_VERSION_PATCH 0
 
 /* see upnpconfig.h */
-#define UPNP_VERSION_STRING "1.4.7"
+#define UPNP_VERSION_STRING "1.4.0"
 
 /* Version number of package */
-#define VERSION "1.4.7"
+#define VERSION "1.4.0"
 
-/* File Offset size */
+/* Number of bits in a file offset, on hosts where this is settable. */
 #define _FILE_OFFSET_BITS 64
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 /* #undef _LARGEFILE_SOURCE */
 
-/* Large files support */
+/* Define for large files, on AIX-style hosts. */
-#define _LARGE_FILE_SOURCE 
+/* #undef _LARGE_FILES */
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
-/* Define to `long int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
 /* Substitute for socklen_t */

build/inc/config.h

@@ -95,17 +95,6 @@
 #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 
@@ -261,7 +250,7 @@
 
 /** @name Other debugging features
           The UPnP SDK contains other features to aid in debugging:
-	  see <upnp/inc/upnpdebug.h>
+	  see <upnp/upnpdebug.h>
  */
 
 #define DEBUG_ALL		1   
@@ -304,40 +293,68 @@
 
 
 
+/** @name DBGONLY
+          The {\bf DBGONLY} macro allows code to be marked so that it
+          is only included in the DEBUG build and not the release.  To
+          use this macro, put the code inside of the parentheses:
+
+          {\tt DBGONLY(int i;)}
+
+          This will cause a declaration of the integer {\tt i} only
+          in the debug build.
+  */
+
+//@{
+#ifdef DEBUG
+ #define DBGONLY(x) x
+#else
+ #define DBGONLY(x)
+#endif
+//@}
+
+
+
 #undef  EXCLUDE_WEB_SERVER
 #undef  EXCLUDE_MINISERVER
 #ifdef  INTERNAL_WEB_SERVER
-#	define EXCLUDE_WEB_SERVER 0
+ #define EXCLUDE_WEB_SERVER 0
-#	define EXCLUDE_MINISERVER 0
+ #define EXCLUDE_MINISERVER 0
 #else
-#	define EXCLUDE_WEB_SERVER 1
+ #define EXCLUDE_WEB_SERVER 1
-#	define EXCLUDE_MINISERVER 1
+ #define EXCLUDE_MINISERVER 1
 #endif
 
 #if EXCLUDE_GENA == 1 && EXCLUDE_SOAP == 1 && EXCLUDE_WEB_SERVER == 1
-#	undef  EXCLUDE_MINISERVER 
+ #undef  EXCLUDE_MINISERVER
-#	define EXCLUDE_MINISERVER 1
+ #define EXCLUDE_MINISERVER 1
-#	if INTERNAL_WEB_SERVER
+ #if INTERNAL_WEB_SERVER
-#		error "conflicting settings: use configure --disable-webserver"
+  #	error "conflicting settings: use configure --disable-webserver"
-#	endif
+ #endif
 #endif
 
 #if EXCLUDE_GENA == 0 || EXCLUDE_SOAP == 0 || EXCLUDE_WEB_SERVER == 0
-#	undef  EXCLUDE_MINISERVER 
+ #undef  EXCLUDE_MINISERVER
-#	define EXCLUDE_MINISERVER 0
+ #define EXCLUDE_MINISERVER 0
-#	if EXCLUDE_WEB_SERVER == 0 && !defined INTERNAL_WEB_SERVER
+ #if EXCLUDE_WEB_SERVER == 0 && !defined INTERNAL_WEB_SERVER
-#		error "conflicting settings : use configure --enable-webserver"
+  #error "conflicting settings : use configure --enable-webserver"
-#	endif
+ #endif
 #endif
 
 
 
 #ifdef INCLUDE_CLIENT_APIS
-#	define CLIENTONLY(x) x
+ #define CLIENTONLY(x) x
 #else
-#	define CLIENTONLY(x)
+ #define CLIENTONLY(x)
+#endif
+
+#ifdef INCLUDE_DEVICE_APIS
+ #define DEVICEONLY(x) x
+#else
+ #define DEVICEONLY(x)
 #endif
 
 //@}
 #endif
 
+

build/inc/upnpconfig.h

@@ -1,4 +1,4 @@
-/* upnp/inc/upnpconfig.h.  Generated from upnpconfig.h.in by configure.  */
+/* upnp/inc/upnpconfig.h.  Generated by configure.  */
 // -*- C -*-
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -40,7 +40,7 @@
  ***************************************************************************/
 
 /** The library version (string) e.g. "1.3.0" */
-#define UPNP_VERSION_STRING "1.4.7"
+#define UPNP_VERSION_STRING "1.4.0"
 
 /** Major version of the library */
 #define UPNP_VERSION_MAJOR 1
@@ -49,7 +49,7 @@
 #define UPNP_VERSION_MINOR 4
 
 /** Patch version of the library */
-#define UPNP_VERSION_PATCH 7
+#define UPNP_VERSION_PATCH 0
 
 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
@@ -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 */
-/* #undef UPNP_HAVE_DEBUG */
+#undef UPNP_HAVE_DEBUG
 
 
 /** Defined to 1 if the library has been compiled with client API enabled

build/libupnp.bpr

@@ -34,7 +34,7 @@
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="D:\pthreads-w32-1-10-0-release\pthreadBC1.lib"/>
+    <LIBFILES value="..\..\..\pthreads-w32-1-10-0-release\pthreadBC1.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value=""/>
@@ -45,11 +45,11 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="tlink32"/>
-    <USERDEFINES value="WIN32;LIBUPNP_EXPORTS;UPNP_USE_BCBPP"/>
+    <USERDEFINES value="WIN32;LIBUPNP_EXPORTS"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
     <MAINSOURCE value="libupnp.bpf"/>
-    <INCLUDEPATH value="..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc;..\..\pthreads-w32-1-10-0-release"/>
+    <INCLUDEPATH value="..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc"/>
-    <LIBPATH value="..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib;..\..\pthreads-w32-1-10-0-release"/>
+    <LIBPATH value="..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
   </MACROS>
   <OPTIONS>
@@ -94,27 +94,22 @@ ProductVersion=1.0.0.0
 Comments=
 
 [HistoryLists\hlIncludePath]
-Count=3
+Count=1
-Item0=..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc;..\..\pthreads-w32-1-10-0-release
+Item0=..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc
-Item1=..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc;D:\DEVELOP\pthreads-w32-1-10-0-release
-Item2=..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc
 
 [HistoryLists\hlLibraryPath]
-Count=3
+Count=1
-Item0=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib;..\..\pthreads-w32-1-10-0-release
+Item0=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib;D:\DEVELOP\pthreads-w32-1-10-0-release
-Item2=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=4
+Count=3
-Item0=WIN32;LIBUPNP_EXPORTS;UPNP_USE_BCBPP
+Item0=WIN32;LIBUPNP_EXPORTS
-Item1=WIN32;LIBUPNP_EXPORTS
+Item1=WIN32;EXPORT_SPEC
-Item2=WIN32;EXPORT_SPEC
+Item2=WIN32
-Item3=WIN32
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl

build/libupnp.dsp

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I ".\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /D "PTW32_STATIC_LIB" /D "UPNP_STATIC_LIB" /D "UPNP_USE_MSVCPP" /FR /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I ".\inc" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -53,8 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /machine:I386
-# SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "libupnp - Win32 Debug"
 
@@ -70,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I "..\build\inc" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /D "UPNP_USE_MSVCPP" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\pthreads\include" /I "..\ixml\src\inc" /I "..\ixml\inc" /I "..\threadutil\inc" /I "..\upnp\inc" /I "..\upnp\src\inc" /I "..\build\inc" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBUPNP_EXPORTS" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -80,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\pthreads\lib\pthreadvc2.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -275,146 +274,6 @@ SOURCE=..\upnp\src\win_dll.c
 # Begin Group "Header-Dateien"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\client_table.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\gena.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\gena_ctrlpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\gena_device.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\global.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\gmtdate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\http_client.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\httpparser.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\httpreadwrite.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\inet_pton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\membuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\miniserver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\netall.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\parsetools.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\server.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\service_table.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\soaplib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\sock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\ssdplib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\statcodes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\statuscodes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\strintmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\sysdep.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\unixutil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\upnp_timeout.h
-# End Source File
-# Begin Source File
-
-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
-
-SOURCE=..\upnp\src\inc\urlconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\util.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\utilall.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\uuid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\upnp\src\inc\webserver.h
-# End Source File
 # End Group
 # Begin Group "Ressourcendateien"
 

build/msvc/inttypes.h

@@ -1,301 +0,0 @@
-// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. The name of the author may be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_INTTYPES_H_ // [
-#define _MSC_INTTYPES_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <stdint.h>
-
-// 7.8 Format conversion of integer types
-
-typedef struct {
-   intmax_t quot;
-   intmax_t rem;
-} imaxdiv_t;
-
-// 7.8.1 Macros for format specifiers
-
-// The fprintf macros for signed integers are:
-#define PRId8       "d"
-#define PRIi8       "i"
-#define PRIdLEAST8  "d"
-#define PRIiLEAST8  "i"
-#define PRIdFAST8   "d"
-#define PRIiFAST8   "i"
-
-#define PRId16       "hd"
-#define PRIi16       "hi"
-#define PRIdLEAST16  "hd"
-#define PRIiLEAST16  "hi"
-#define PRIdFAST16   "hd"
-#define PRIiFAST16   "hi"
-
-#define PRId32       "I32d"
-#define PRIi32       "I32i"
-#define PRIdLEAST32  "I32d"
-#define PRIiLEAST32  "I32i"
-#define PRIdFAST32   "I32d"
-#define PRIiFAST32   "I32i"
-
-#define PRId64       "I64d"
-#define PRIi64       "I64i"
-#define PRIdLEAST64  "I64d"
-#define PRIiLEAST64  "I64i"
-#define PRIdFAST64   "I64d"
-#define PRIiFAST64   "I64i"
-
-#define PRIdMAX     "I64d"
-#define PRIiMAX     "I64i"
-
-#define PRIdPTR     "Id"
-#define PRIiPTR     "Ii"
-
-// The fprintf macros for unsigned integers are:
-#define PRIo8       "o"
-#define PRIu8       "u"
-#define PRIx8       "x"
-#define PRIX8       "X"
-#define PRIoLEAST8  "o"
-#define PRIuLEAST8  "u"
-#define PRIxLEAST8  "x"
-#define PRIXLEAST8  "X"
-#define PRIoFAST8   "o"
-#define PRIuFAST8   "u"
-#define PRIxFAST8   "x"
-#define PRIXFAST8   "X"
-
-#define PRIo16       "ho"
-#define PRIu16       "hu"
-#define PRIx16       "hx"
-#define PRIX16       "hX"
-#define PRIoLEAST16  "ho"
-#define PRIuLEAST16  "hu"
-#define PRIxLEAST16  "hx"
-#define PRIXLEAST16  "hX"
-#define PRIoFAST16   "ho"
-#define PRIuFAST16   "hu"
-#define PRIxFAST16   "hx"
-#define PRIXFAST16   "hX"
-
-#define PRIo32       "I32o"
-#define PRIu32       "I32u"
-#define PRIx32       "I32x"
-#define PRIX32       "I32X"
-#define PRIoLEAST32  "I32o"
-#define PRIuLEAST32  "I32u"
-#define PRIxLEAST32  "I32x"
-#define PRIXLEAST32  "I32X"
-#define PRIoFAST32   "I32o"
-#define PRIuFAST32   "I32u"
-#define PRIxFAST32   "I32x"
-#define PRIXFAST32   "I32X"
-
-#define PRIo64       "I64o"
-#define PRIu64       "I64u"
-#define PRIx64       "I64x"
-#define PRIX64       "I64X"
-#define PRIoLEAST64  "I64o"
-#define PRIuLEAST64  "I64u"
-#define PRIxLEAST64  "I64x"
-#define PRIXLEAST64  "I64X"
-#define PRIoFAST64   "I64o"
-#define PRIuFAST64   "I64u"
-#define PRIxFAST64   "I64x"
-#define PRIXFAST64   "I64X"
-
-#define PRIoMAX     "I64o"
-#define PRIuMAX     "I64u"
-#define PRIxMAX     "I64x"
-#define PRIXMAX     "I64X"
-
-#define PRIoPTR     "Io"
-#define PRIuPTR     "Iu"
-#define PRIxPTR     "Ix"
-#define PRIXPTR     "IX"
-
-// The fscanf macros for signed integers are:
-#define SCNd8       "d"
-#define SCNi8       "i"
-#define SCNdLEAST8  "d"
-#define SCNiLEAST8  "i"
-#define SCNdFAST8   "d"
-#define SCNiFAST8   "i"
-
-#define SCNd16       "hd"
-#define SCNi16       "hi"
-#define SCNdLEAST16  "hd"
-#define SCNiLEAST16  "hi"
-#define SCNdFAST16   "hd"
-#define SCNiFAST16   "hi"
-
-#define SCNd32       "ld"
-#define SCNi32       "li"
-#define SCNdLEAST32  "ld"
-#define SCNiLEAST32  "li"
-#define SCNdFAST32   "ld"
-#define SCNiFAST32   "li"
-
-#define SCNd64       "I64d"
-#define SCNi64       "I64i"
-#define SCNdLEAST64  "I64d"
-#define SCNiLEAST64  "I64i"
-#define SCNdFAST64   "I64d"
-#define SCNiFAST64   "I64i"
-
-#define SCNdMAX     "I64d"
-#define SCNiMAX     "I64i"
-
-#ifdef _WIN64 // [
-#  define SCNdPTR     "I64d"
-#  define SCNiPTR     "I64i"
-#else  // _WIN64 ][
-#  define SCNdPTR     "ld"
-#  define SCNiPTR     "li"
-#endif  // _WIN64 ]
-
-// The fscanf macros for unsigned integers are:
-#define SCNo8       "o"
-#define SCNu8       "u"
-#define SCNx8       "x"
-#define SCNX8       "X"
-#define SCNoLEAST8  "o"
-#define SCNuLEAST8  "u"
-#define SCNxLEAST8  "x"
-#define SCNXLEAST8  "X"
-#define SCNoFAST8   "o"
-#define SCNuFAST8   "u"
-#define SCNxFAST8   "x"
-#define SCNXFAST8   "X"
-
-#define SCNo16       "ho"
-#define SCNu16       "hu"
-#define SCNx16       "hx"
-#define SCNX16       "hX"
-#define SCNoLEAST16  "ho"
-#define SCNuLEAST16  "hu"
-#define SCNxLEAST16  "hx"
-#define SCNXLEAST16  "hX"
-#define SCNoFAST16   "ho"
-#define SCNuFAST16   "hu"
-#define SCNxFAST16   "hx"
-#define SCNXFAST16   "hX"
-
-#define SCNo32       "lo"
-#define SCNu32       "lu"
-#define SCNx32       "lx"
-#define SCNX32       "lX"
-#define SCNoLEAST32  "lo"
-#define SCNuLEAST32  "lu"
-#define SCNxLEAST32  "lx"
-#define SCNXLEAST32  "lX"
-#define SCNoFAST32   "lo"
-#define SCNuFAST32   "lu"
-#define SCNxFAST32   "lx"
-#define SCNXFAST32   "lX"
-
-#define SCNo64       "I64o"
-#define SCNu64       "I64u"
-#define SCNx64       "I64x"
-#define SCNX64       "I64X"
-#define SCNoLEAST64  "I64o"
-#define SCNuLEAST64  "I64u"
-#define SCNxLEAST64  "I64x"
-#define SCNXLEAST64  "I64X"
-#define SCNoFAST64   "I64o"
-#define SCNuFAST64   "I64u"
-#define SCNxFAST64   "I64x"
-#define SCNXFAST64   "I64X"
-
-#define SCNoMAX     "I64o"
-#define SCNuMAX     "I64u"
-#define SCNxMAX     "I64x"
-#define SCNXMAX     "I64X"
-
-#ifdef _WIN64 // [
-#  define SCNoPTR     "I64o"
-#  define SCNuPTR     "I64u"
-#  define SCNxPTR     "I64x"
-#  define SCNXPTR     "I64X"
-#else  // _WIN64 ][
-#  define SCNoPTR     "lo"
-#  define SCNuPTR     "lu"
-#  define SCNxPTR     "lx"
-#  define SCNXPTR     "lX"
-#endif  // _WIN64 ]
-
-// 7.8.2 Functions for greatest-width integer types
-
-// 7.8.2.1 The imaxabs function
-#define imaxabs _abs64
-
-// 7.8.2.2 The imaxdiv function
-
-// This is modified version of div() function from Microsoft's div.c found
-// in %MSVC.NET%\crt\src\div.c
-#ifdef STATIC_IMAXDIV // [
-static
-#else // STATIC_IMAXDIV ][
-_inline
-#endif // STATIC_IMAXDIV ]
-imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
-{
-   imaxdiv_t result;
-
-   result.quot = numer / denom;
-   result.rem = numer % denom;
-
-   if (numer < 0 && result.rem > 0) {
-      // did division wrong; must fix up
-      ++result.quot;
-      result.rem -= denom;
-   }
-
-   return result;
-}
-
-// 7.8.2.3 The strtoimax and strtoumax functions
-#define strtoimax _strtoi64
-#define strtoumax _strtoui64
-
-// 7.8.2.4 The wcstoimax and wcstoumax functions
-#define wcstoimax _wcstoi64
-#define wcstoumax _wcstoui64
-
-
-#endif // _MSC_INTTYPES_H_ ]

configure.ac

@@ -1,114 +1,34 @@
 # -*- Autoconf -*-
+# $Id: configure.ac,v 1.11 2006/04/09 13:59:44 r3mi Exp $
 #
 # Top-level configure.ac file for libupnp
 #
 # Process this file with autoconf to produce a configure script.
 #
-# (C) Copyright 2005-2007 R<>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005-2006 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
-AC_PREREQ(2.60)
+AC_PREREQ(2.59)
 
-AC_INIT([libupnp], [1.6.1], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.4.1], [virtual_worlds@gmx.de])
-###############################################################################
 # *Independently* of the above libupnp package version, the libtool version
-# of the 3 libraries need to be updated whenever there is a change released:
+# of the 3 libraries need to be updated whenever there is a change released :
 # "current:revision:age" (this is NOT the same as the package version), where:
 # 	- library code modified:		revision++
 # 	- interfaces changed/added/removed:	current++ and revision=0
 # 	- interfaces added: 			age++
 # 	- interfaces removed:			age=0
 # *please update only once, before a formal release, not for each change*
-#
+AC_SUBST([LT_VERSION_IXML],       [2:2:0])
-###############################################################################
+AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0])
-# Release 1.4.1:
+AC_SUBST([LT_VERSION_UPNP],       [2:2:0])
-#AC_SUBST([LT_VERSION_IXML],       [2:2:0])
-#AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0])
-#AC_SUBST([LT_VERSION_UPNP],       [2:2:0])
-#
-###############################################################################
-# Release 1.4.6:
-# "current:revision:age"
-#
-# - Code has changed in ixml
-#	revision: 2 -> 3
-# - Code has changed in threadutil
-#	revision: 2 -> 3
-# - Interface added in threadutil
-#	current: 2 -> 3
-#	revisiion: 3 -> 0
-#	age: 0 -> 1
-# - Code has changed in upnp
-#	revision: 2 -> 3
-#
-#AC_SUBST([LT_VERSION_IXML],       [2:3:0])
-#AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
-#AC_SUBST([LT_VERSION_UPNP],       [2:3:0])
-#
-###############################################################################
-# Release 1.6.0:
-# "current:revision:age"
-#
-# - Code has changed in ixml
-#	revision: 3 -> 4
-# - Code has changed in threadutil
-#	revision: 0 -> 1
-# - Code has changed in upnp
-#	revision: 3 -> 4
-# - Interface changed in upnp
-#	current: 2 -> 3
-#	revision: 4 -> 0
-# - Interface removed in upnp
-#	age: 0 -> 0
-#
-#AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-#AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1])
-#AC_SUBST([LT_VERSION_UPNP],       [3:0:0])
-#
-###############################################################################
-# Release 1.6.1:
-# "current:revision:age"
-#
-# - Code has changed in threadutil
-#	revision: 1 -> 2
-# - Interface added in threadutil
-#	current: 3 -> 4
-#	revision: 2 -> 0
-# - Interface added in threadutil
-#	age: 1 -> 2
-# - Code has changed in upnp
-#	revision: 0 -> 1
-#
-#AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-#AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
-#AC_SUBST([LT_VERSION_UPNP],       [3:1:0])
-#
-###############################################################################
-AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
-AC_SUBST([LT_VERSION_UPNP],       [3:1:0])
-###############################################################################
-# Repeating the algorithm so that it is closer to the modificatin place:
-# 	- library code modified:		revision++
-# 	- interfaces changed/added/removed:	current++ and revision=0
-# 	- interfaces added: 			age++
-# 	- interfaces removed:			age=0
-# *please update only once, before a formal release, not for each change*
-###############################################################################
 
 
 AC_CONFIG_AUX_DIR(config.aux)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_SRCDIR(upnp/inc/upnp.h)
 
-
+AM_INIT_AUTOMAKE([1.8 -Wall foreign subdir-objects])
-AM_INIT_AUTOMAKE([1.8 -Wall foreign subdir-objects dist-bzip2])
-
-
-#
-# Get canonical host names in host and host_os
-#
-AC_CANONICAL_HOST
 
 #
 # There are 3 configuration files :
@@ -122,7 +42,6 @@ AC_CANONICAL_HOST
 #    installed libraries.
 #
 AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h])
-#AC_SYS_LARGEFILE_SENSITIVE
 
 AC_REVISION([$Revision: 1.11 $])
 
@@ -187,31 +106,19 @@ RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
 
 
 # doc installation
-# autoconf >= 2.60 already defines ${docdir}, but we will not use its 
+AC_MSG_CHECKING([documentation installation])
-# default value, which is ${datarootdir}/doc/${PACKAGE_TARNAME}.
+AC_ARG_WITH([docdir], 
-# That would give us ${datarootdir}/doc/libupnp, and we want the package
+AC_HELP_STRING([--with-docdir=DIR],
-# version on that.
+       	       [where documentation is installed 
-docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+	        @<:@[DATADIR/doc/]AC_PACKAGE_NAME[-]AC_PACKAGE_VERSION@:>@])
-AC_MSG_CHECKING([for documentation directory])
+AC_HELP_STRING([--without-docdir],
-AC_ARG_WITH(
+       	       [do not install the documentation]),
-	[documentation], 
+	[DOCDIR="$with_docdir"],
-	AS_HELP_STRING(
+	[DOCDIR="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
-		[--with-documentation=directory_name],
-		[where documentation is installed 
-		 @<:@[DATADIR/doc/]AC_PACKAGE_NAME[-]AC_PACKAGE_VERSION@:>@])
-AS_HELP_STRING(
-		[--without-documentation],
-		[do not install the documentation]),
-	[],
-	[with_documentation=no])
 
-# If something has been entered after an equal sign, assume it is the directory
+AM_CONDITIONAL(WITH_DOCDIR, test x"$with_docdir" != xno)
-if test x"$with_documentation" != xyes -a x"$with_documentation" != xno; then
+AC_SUBST(DOCDIR)
-	docdir="$with_documentation"
+AC_MSG_RESULT($DOCDIR)
-fi
-AM_CONDITIONAL(WITH_DOCUMENTATION, test x"$with_documentation" != xno)
-AC_SUBST(docdir)
-AC_MSG_RESULT($docdir)
 
 
 #
@@ -224,40 +131,22 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_EGREP
 
+
 #
 # Default compilation flags
 #
-echo "--------------------- Default compilation flags -------------------------------"
+if test x"$enable_debug" = xyes; then
-echo host is $host
+	# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
-echo host_os is $host_os
+	:
-case $host_os in
+else
-freebsd*)
+	# add optimise for size
-	echo "Using FreeBSD specific compiler settings"
+	AX_CFLAGS_GCC_OPTION([-Os])
-	# Put FreeBSD specific compiler flags here
+fi
-	;;
-*)
-	echo "Using non-specific system compiler settings"
-	if test x"$enable_debug" = xyes; then
-		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
-		:
-	else
-		# add optimise for size
-		AX_CFLAGS_GCC_OPTION([-Os])
-	fi
-	;;
-esac
-
 AX_CFLAGS_WARN_ALL
-echo "-------------------------------------------------------------------------------"
 
-
+# Arrange for large-file support (can be disabled with --disable-largefile).
-#
+# Define _FILE_OFFSET_BITS and _LARGE_FILES if necessary
-# Lot's of stuff to ensure large file support
+AC_SYS_LARGEFILE
-#
-AC_TYPE_SIZE_T
-AC_TYPE_OFF_T
-AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
-AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
 
 
 #
@@ -266,25 +155,7 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
 AC_HEADER_STDC
 # libupnp code doesn't use autoconf variables yet,
 # so just abort if a header file is not found.
-AC_CHECK_HEADERS(
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h],[],[AC_MSG_ERROR([required header file missing])])
-	[ \
-	arpa/inet.h \
-	fcntl.h \
-	inttypes.h \
-	limits.h \
-	netdb.h \
-	netinet/in.h \
-	stdlib.h \
-	string.h \
-	sys/ioctl.h \
-	sys/socket.h \
-	sys/time.h \
-	sys/timeb.h \
-	syslog.h \
-	unistd.h \
-	],
-	[],
-	[AC_MSG_ERROR([required header file missing])])
 
 
 #
@@ -300,29 +171,25 @@ TYPE_SOCKLEN_T
 #
 AC_FUNC_VPRINTF
 AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])
 
 
 #
 # Checks for POSIX Threads
 #
-ACX_PTHREAD(
+ACX_PTHREAD([],[AC_MSG_ERROR([POSIX threads are required to build this program])])
-	[],
-	[AC_MSG_ERROR([POSIX threads are required to build this program])])
 
 
-AC_CONFIG_FILES([
-	Makefile
-	ixml/Makefile
-	ixml/doc/Makefile
-	threadutil/Makefile
-	upnp/Makefile
-	upnp/doc/Makefile
-	upnp/sample/Makefile
-	docs/dist/Makefile
-	libupnp.pc
-	])
 
 
+AC_CONFIG_FILES([Makefile
+		 ixml/Makefile
+		 ixml/doc/Makefile
+                 threadutil/Makefile
+		 upnp/Makefile
+		 upnp/doc/Makefile
+		 docs/dist/Makefile
+		 libupnp.pc
+                 ])
+
 AC_OUTPUT
 

docs/dist/Makefile.am

@@ -1,7 +1,4 @@
-
+EXTRA_DIST = ./UPnP_Programming_Guide.pdf \
-
-EXTRA_DIST = \
-    ./UPnP_Programming_Guide.pdf \
     ./IXML_Programming_Guide.pdf \
     ./html/upnp/icon1.gif \
     ./html/upnp/icon2.gif \
@@ -254,10 +251,9 @@ EXTRA_DIST = \
     ./html/ixml/ixmlCloneDOMString.html \
     ./html/ixml/ixmlFreeDOMString.html
     
-if WITH_DOCUMENTATION
+if WITH_DOCDIR
-    docsdir = @docdir@
+    docsdir        = @DOCDIR@
-    nobase_docs_DATA = \
+    nobase_docs_DATA = ./UPnP_Programming_Guide.pdf \
-        ./UPnP_Programming_Guide.pdf \
         ./IXML_Programming_Guide.pdf \
         ./html/upnp/icon1.gif \
         ./html/upnp/icon2.gif \
@@ -510,4 +506,3 @@ if WITH_DOCUMENTATION
         ./html/ixml/ixmlCloneDOMString.html \
         ./html/ixml/ixmlFreeDOMString.html
 endif
-

ixml/inc/ixml.h

@@ -1,61 +1,59 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef _IXML_H_
 #define _IXML_H_
 
-
 #include <stdio.h>
 #include <string.h>
+//#include <malloc.h>
 #include <assert.h>
 
-
 #ifdef WIN32
-	#ifndef UPNP_STATIC_LIB
+ #ifndef UPNP_STATIC_LIB
-		#ifdef LIBUPNP_EXPORTS
+  #ifdef LIBUPNP_EXPORTS
-			/* set up declspec for dll export to make functions visible to library users */
+  // set up declspec for dll export to make functions visible to library users
-			#define EXPORT_SPEC __declspec(dllexport)
+   #define EXPORT_SPEC __declspec(dllexport)
-		#else
+  #else
-			#define EXPORT_SPEC __declspec(dllimport)
+   #define EXPORT_SPEC __declspec(dllimport)
-		#endif
+  #endif
-	#else
+ #else
-		#define EXPORT_SPEC
+  #define EXPORT_SPEC
-	#endif
+ #endif
 #else
-	#define EXPORT_SPEC
+ #define EXPORT_SPEC
 #endif
 
 typedef int BOOL;
 
-
 #define DOMString   char *
 
 
@@ -90,7 +88,7 @@ typedef int BOOL;
  * etc., refer to section 1.1 of the DOM2-Core recommendation.
  */
 
-/*! @{ */
+//@{
 
 /*================================================================
 *
@@ -123,7 +121,7 @@ typedef enum
 *
 *=================================================================*/
 typedef enum 
-{   /* see DOM spec */
+{   // see DOM spec
     IXML_INDEX_SIZE_ERR                 = 1,
     IXML_DOMSTRING_SIZE_ERR             = 2,
     IXML_HIERARCHY_REQUEST_ERR          = 3,
@@ -242,7 +240,7 @@ extern "C" {
  * its functionality.  For more information, refer to DOM2-Core page 34.
  */
 
-/*! @{ */
+//@{
 
   /** Returns the name of the {\bf Node}, depending on what type of 
    *  {\bf Node} it is, in a read-only string. Refer to the table in the 
@@ -262,7 +260,7 @@ ixmlNode_getNodeName(IXML_Node *nodeptr
    *  @return [DOMString] A {\bf DOMString} of the {\bf Node} value.
    */
 
-EXPORT_SPEC const DOMString               
+EXPORT_SPEC DOMString               
 ixmlNode_getNodeValue(IXML_Node *nodeptr  
 		        /** Pointer to the {\bf Node} to retrieve the value. */
                      );
@@ -284,7 +282,7 @@ ixmlNode_getNodeValue(IXML_Node *nodeptr
 EXPORT_SPEC int                     
 ixmlNode_setNodeValue(IXML_Node *nodeptr, 
 		        /** The {\bf Node} to which to assign a new value. */
-                      const char *newNodeValue  
+                      char *newNodeValue  
 		        /** The new value of the {\bf Node}. */
                   );
 
@@ -441,7 +439,7 @@ ixmlNode_getNamespaceURI(IXML_Node *nodeptr
    *                      or {\tt NULL}.
    */
 
-EXPORT_SPEC const DOMString               
+EXPORT_SPEC DOMString               
 ixmlNode_getPrefix(IXML_Node *nodeptr  
 		     /** The {\bf Node} from which to retrieve the prefix. */
                );
@@ -622,7 +620,7 @@ ixmlNode_cloneNode(IXML_Node *nodeptr,
    */
 
 EXPORT_SPEC BOOL    
-ixmlNode_hasAttributes(IXML_Node *nodeptr
+ixmlNode_hasAttributes(IXML_Node *node  
 		         /** The {\bf Node} to query for attributes. */
                       );
 
@@ -632,11 +630,11 @@ ixmlNode_hasAttributes(IXML_Node *nodeptr
    */
 
 EXPORT_SPEC void    
-ixmlNode_free(IXML_Node *nodeptr
+ixmlNode_free(IXML_Node *IXML_Node  
 		/** The {\bf Node} to free. */
              );
 
-/*! @} */
+//@}
 
 /*================================================================
 *
@@ -651,7 +649,7 @@ ixmlNode_free(IXML_Node *nodeptr
  * allowable attributes and values for a particular element.  For more 
  * information, refer to the {\it Interface Attr} section in the DOM2-Core.
  */
-/*! @{ */
+//@{
 
 
   /** Frees an {\bf Attr} node.
@@ -664,7 +662,7 @@ ixmlAttr_free(IXML_Attr *attrNode
 		/** The {\bf Attr} node to free.  */
              );
 
-/*! @} */
+//@}
 
 
 /*================================================================
@@ -682,7 +680,7 @@ ixmlAttr_free(IXML_Attr *attrNode
  * information, refer to the {\it Interface CDATASection} section in the
  * DOM2-Core.
  */
-/*! @{ */
+//@{
 
 
   /** Initializes a {\bf CDATASection} node.
@@ -706,7 +704,7 @@ ixmlCDATASection_free(IXML_CDATASection *nodeptr
 		        /** The {\bf CDATASection} node to free. */
                      );
 
-/*! @} */
+//@}
 
 /*================================================================
 *
@@ -721,7 +719,7 @@ ixmlCDATASection_free(IXML_CDATASection *nodeptr
  * primary interface to the elements of the document.  For more information,
  * refer to the {\it Interface Document} section in the DOM2Core.
  */
-/*! @{ */
+//@{
 
   /** Initializes a {\bf Document} node.
    *
@@ -869,7 +867,7 @@ EXPORT_SPEC int
 ixmlDocument_createCDATASectionEx(IXML_Document *doc,  
 		                    /** The owner {\bf Document} of the new 
 				        node. */
-                                  const DOMString data,      
+                                  DOMString data,      
 				    /** The data to associate with the new 
 				        {\bf CDATASection} node. */
                                   IXML_CDATASection** cdNode   
@@ -888,7 +886,7 @@ EXPORT_SPEC IXML_CDATASection*
 ixmlDocument_createCDATASection(IXML_Document *doc,  
 				  /** The owner {\bf Document} of the new 
 				      node. */
-                                const DOMString data  
+                                DOMString data  
 				  /** The data to associate with the new {\bf 
 				      CDATASection} node. */
                                );
@@ -901,7 +899,7 @@ ixmlDocument_createCDATASection(IXML_Document *doc,
 EXPORT_SPEC IXML_Attr*
 ixmlDocument_createAttribute(IXML_Document *doc,  
 		               /** The owner {\bf Document} of the new node. */
-                             const char *name      
+                             char *name      
 			       /** The name of the new attribute. */
                             );
 
@@ -926,7 +924,7 @@ EXPORT_SPEC int
 ixmlDocument_createAttributeEx(IXML_Document *doc,  
 		                 /** The owner {\bf Document} of the new 
 				     node. */
-                               const char *name,      
+                               char *name,      
 			         /** The name of the new attribute. */
                                IXML_Attr** attrNode
 			         /** A pointer to a {\bf Attr} where the new 
@@ -945,11 +943,11 @@ ixmlDocument_createAttributeEx(IXML_Document *doc,
 EXPORT_SPEC IXML_NodeList*
 ixmlDocument_getElementsByTagName(IXML_Document *doc,     
 		                    /** The {\bf Document} to search. */
-                                  const DOMString tagName  
+                                  DOMString tagName  
 				    /** The tag name to find. */
                                  );
 
-/* introduced in DOM level 2 */
+// introduced in DOM level 2
 
   /** Creates a new {\bf Element} node in the given qualified name and
    *  namespace URI.
@@ -972,10 +970,10 @@ EXPORT_SPEC int
 ixmlDocument_createElementNSEx(IXML_Document *doc,           
 		                 /** The owner {\bf Document} of the new 
 				     node. */
-                               const DOMString namespaceURI,  
+                               DOMString namespaceURI,  
 			         /** The namespace URI for the new {\bf 
 				     Element}. */
-                               const DOMString qualifiedName,  
+                               DOMString qualifiedName,  
 			         /** The qualified name of the new {\bf 
 				     Element}. */
                                IXML_Element** rtElement
@@ -994,10 +992,10 @@ ixmlDocument_createElementNSEx(IXML_Document *doc,
 EXPORT_SPEC IXML_Element*
 ixmlDocument_createElementNS(IXML_Document *doc,           
 		               /** The owner {\bf Document} of the new node. */
-                             const DOMString namespaceURI,  
+                             DOMString namespaceURI,  
 			       /** The namespace URI for the new {\bf 
 				   Element}. */
-                             const DOMString qualifiedName  
+                             DOMString qualifiedName  
 			       /** The qualified name of the new {\bf 
 				   Element}. */
                              );
@@ -1023,9 +1021,9 @@ EXPORT_SPEC int
 ixmlDocument_createAttributeNSEx(IXML_Document *doc,
 		                   /** The owner {\bf Document} of the new 
 				       {\bf Attr}. */
-                                 const DOMString namespaceURI, 
+                                 DOMString namespaceURI, 
 				   /** The namespace URI for the attribute. */
-                                 const DOMString qualifiedName, 
+                                 DOMString qualifiedName, 
 				   /** The qualified name of the attribute. */
                                  IXML_Attr** attrNode
 				   /** A pointer to an {\bf Attr} where the 
@@ -1042,9 +1040,9 @@ EXPORT_SPEC IXML_Attr*
 ixmlDocument_createAttributeNS(IXML_Document *doc, 
 		                 /** The owner {\bf Document} of the new 
 				     {\bf Attr}. */
-                               const DOMString namespaceURI, 
+                               DOMString namespaceURI, 
 			         /** The namespace URI for the attribute. */
-                               const DOMString qualifiedName 
+                               DOMString qualifiedName 
 			         /** The qualified name of the attribute. */
                               );   
 
@@ -1061,11 +1059,11 @@ ixmlDocument_createAttributeNS(IXML_Document *doc,
 EXPORT_SPEC IXML_NodeList*   
 ixmlDocument_getElementsByTagNameNS(IXML_Document* doc,          
 		                      /** The {\bf Document} to search. */
-                                    const DOMString namespaceURI, 
+                                    DOMString namespaceURI, 
 				      /** The namespace of the elements to 
                                           find or {\tt "*"} to match any 
                                           namespace. */
-                                    const DOMString localName     
+                                    DOMString localName     
 				      /** The local name of the elements to 
                                           find or {\tt "*"} to match any local 
                                           name.  */
@@ -1081,7 +1079,7 @@ EXPORT_SPEC IXML_Element*
 ixmlDocument_getElementById(IXML_Document* doc,         
 		              /** The owner {\bf Document} of the {\bf 
 			          Element}. */
-                            const DOMString tagName  
+                            DOMString tagName  
 			      /** The name of the {\bf Element}.*/
                             );
 
@@ -1130,7 +1128,7 @@ ixmlDocument_importNode(IXML_Document* doc,
 			  /** A pointer to a new {\bf Node} owned by {\bf 
 			      doc}. */
                        );
-/*! @} */
+//@}
 
 /*================================================================
 *
@@ -1146,7 +1144,7 @@ ixmlDocument_importNode(IXML_Document* doc,
  * extends the {\bf Node} interface and adds more operations to manipulate
  * attributes.
  */
-/*! @{ */
+//@{
 
   /** Initializes a {\bf IXML_Element} node.
    *
@@ -1176,11 +1174,11 @@ ixmlElement_getTagName(IXML_Element* element
    *                      attribute.
    */
 
-EXPORT_SPEC const DOMString   
+EXPORT_SPEC DOMString   
 ixmlElement_getAttribute(IXML_Element* element,  
 		           /** The {\bf Element} from which to retrieve the 
 			       attribute. */
-                         const DOMString name     
+                         DOMString name     
 			   /** The name of the attribute to retrieve. */
                         );
 
@@ -1204,9 +1202,9 @@ EXPORT_SPEC int
 ixmlElement_setAttribute(IXML_Element* element,  
 		           /** The {\bf Element} on which to set the 
 			       attribute. */
-                         const DOMString name,    
+                         DOMString name,    
 			   /** The name of the attribute. */
-                         const DOMString value
+                         DOMString value    
 			   /** The value of the attribute.  Note that this is 
 			       a non-parsed string and any markup must be 
 			       escaped. */
@@ -1226,7 +1224,7 @@ EXPORT_SPEC int
 ixmlElement_removeAttribute(IXML_Element* element,  
 		              /** The {\bf Element} from which to remove the 
 			          attribute. */
-                            const DOMString name     
+                            DOMString name     
 			      /** The name of the attribute to remove.  */
                            );              
 
@@ -1242,7 +1240,7 @@ EXPORT_SPEC IXML_Attr*
 ixmlElement_getAttributeNode(IXML_Element* element,  
 		               /** The {\bf Element} from which to get the 
 				   attribute node.  */
-                             const DOMString name     
+                             DOMString name     
 			       /** The name of the attribute node to find. */
                             );
 
@@ -1311,12 +1309,12 @@ EXPORT_SPEC IXML_NodeList*
 ixmlElement_getElementsByTagName(IXML_Element* element,  
 		                   /** The {\bf Element} from which to start 
 				       the search. */
-                                 const DOMString tagName
+                                 DOMString tagName  
 				   /** The name of the tag for which to 
 				       search. */
                                 );
 
-/* introduced in DOM 2 */
+// introduced in DOM 2
 
   /** Retrieves an attribute value using the local name and namespace URI.
    *
@@ -1324,13 +1322,13 @@ ixmlElement_getElementsByTagName(IXML_Element* element,
    *                      matching attribute.
    */
 
-EXPORT_SPEC const DOMString
+EXPORT_SPEC DOMString   
 ixmlElement_getAttributeNS(IXML_Element* element,       
 		             /** The {\bf Element} from which to get the 
 			         attribute value. */
-                           const DOMString namespaceURI, 
+                           DOMString namespaceURI, 
 			     /** The namespace URI of the attribute. */
-                           const DOMString localname     
+                           DOMString localname     
 			     /** The local name of the attribute. */
                           );
 
@@ -1360,11 +1358,11 @@ EXPORT_SPEC int
 ixmlElement_setAttributeNS(IXML_Element* element,         
 		             /** The {\bf Element} on which to set the 
 			         attribute. */
-                           const DOMString namespaceURI,   
+                           DOMString namespaceURI,   
 		             /** The namespace URI of the new attribute. */
-                           const DOMString qualifiedName,  
+                           DOMString qualifiedName,  
 			     /** The qualified name of the attribute. */
-                           const DOMString value 
+                           DOMString value 
 			     /** The new value for the attribute. */
                           );
 
@@ -1382,9 +1380,9 @@ EXPORT_SPEC int
 ixmlElement_removeAttributeNS(IXML_Element* element,        
 		                /** The {\bf Element} from which to remove the 
 				    the attribute. */
-                              const DOMString namespaceURI,  
+                              DOMString namespaceURI,  
 			        /** The namespace URI of the attribute. */
-                              const DOMString localName      
+                              DOMString localName      
 			        /** The local name of the attribute.*/
                              );
 
@@ -1397,9 +1395,9 @@ EXPORT_SPEC IXML_Attr*
 ixmlElement_getAttributeNodeNS(IXML_Element* element,        
 		                 /** The {\bf Element} from which to get the 
 				     attribute. */
-                               const DOMString namespaceURI,  
+                               DOMString namespaceURI,  
 			         /** The namespace URI of the attribute. */
-                               const DOMString localName      
+                               DOMString localName      
 			         /** The local name of the attribute. */
                               );
 
@@ -1443,10 +1441,10 @@ EXPORT_SPEC IXML_NodeList*
 ixmlElement_getElementsByTagNameNS(IXML_Element* element,        
 		                     /** The {\bf Element} from which to start 
 				         the search. */
-                                   const DOMString namespaceURI,
+                                   DOMString namespaceURI,  
 				     /** The namespace URI of the {\bf 
 				         Element}s to find. */
-                                   const DOMString localName      
+                                   DOMString localName      
 				     /** The local name of the {\bf Element}s 
 				         to find. */
                                   );
@@ -1463,7 +1461,7 @@ EXPORT_SPEC BOOL
 ixmlElement_hasAttribute(IXML_Element* element, 
 		           /** The {\bf Element} on which to check for an 
 			       attribute. */
-                         const DOMString name    
+                         DOMString name    
 			   /** The name of the attribute for which to check. */
                         );
 
@@ -1479,9 +1477,9 @@ EXPORT_SPEC BOOL
 ixmlElement_hasAttributeNS(IXML_Element* element,       
 		             /** The {\bf Element} on which to check for the 
 			         attribute. */
-                           const DOMString namespaceURI, 
+                           DOMString namespaceURI, 
 			     /** The namespace URI of the attribute. */
-                           const DOMString localName     
+                           DOMString localName     
 			     /** The local name of the attribute. */
                           );
 
@@ -1495,7 +1493,7 @@ ixmlElement_free(IXML_Element* element
 		   /** The {\bf Element} to free. */
                 );
 
-/*! @} */
+//@}
 
 /*================================================================
 *
@@ -1510,7 +1508,7 @@ ixmlElement_free(IXML_Element* element
  * no particular order.  The {\bf Node} interface uses a {\bf NamedNodeMap}
  * to maintain the attributes of a node.
  */
-/*! @{ */
+//@{
 
   /** Returns the number of items contained in this {\bf NamedNodeMap}.
    *
@@ -1531,7 +1529,7 @@ ixmlNamedNodeMap_getLength(IXML_NamedNodeMap *nnMap
 EXPORT_SPEC IXML_Node*   
 ixmlNamedNodeMap_getNamedItem(IXML_NamedNodeMap *nnMap, 
 		                /** The {\bf NamedNodeMap} to search. */
-                              const DOMString name       
+                              DOMString name       
 			        /** The name of the {\bf Node} to find. */
                              );
 
@@ -1562,7 +1560,7 @@ EXPORT_SPEC IXML_Node*
 ixmlNamedNodeMap_removeNamedItem(IXML_NamedNodeMap *nnMap,  
 		                   /** The {\bf NamedNodeMap} from which to 
 				       remove the item. */
-                                 const DOMString name        
+                                 DOMString name        
 				   /** The name of the item to remove. */
                                 );
 
@@ -1581,7 +1579,7 @@ ixmlNamedNodeMap_item(IXML_NamedNodeMap *nnMap,
 		        /** The index into the map to remove. */
                      );
 
-/* introduced in DOM level 2 */
+// introduced in DOM level 2
 
   /** Retrieves a {\bf Node} from a {\bf NamedNodeMap} specified by
    *  namespace URI and local name.
@@ -1594,10 +1592,10 @@ EXPORT_SPEC IXML_Node*
 ixmlNamedNodeMap_getNamedItemNS(IXML_NamedNodeMap *nnMap,    
 		                  /** The {\bf NamedNodeMap} from which to 
 				      remove the {\bf Node}. */
-                                const DOMString *namespaceURI,
+                                DOMString *namespaceURI,
 				  /** The namespace URI of the {\bf Node} to 
                                       remove. */
-                                const DOMString localName     
+                                DOMString localName     
 				  /** The local name of the {\bf Node} to 
 				      remove. */
                                );
@@ -1629,10 +1627,10 @@ EXPORT_SPEC IXML_Node*
 ixmlNamedNodeMap_removeNamedItemNS(IXML_NamedNodeMap *nnMap,    
 		                     /** The {\bf NamedNodeMap} from which to 
 				         remove the {\bf Node}. */
-                                   const DOMString namespaceURI, 
+                                   DOMString namespaceURI, 
 				     /** The namespace URI of the {\bf Node} 
 				         to remove. */
-                                   const DOMString localName     
+                                   DOMString localName     
 				     /** The local name of the {\bf Node} to 
 				         remove. */
                                   );
@@ -1648,7 +1646,7 @@ ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap
 		        /** The {\bf NamedNodeMap to free}. */
                      );
 
-/*! @} */
+//@}
 
 /*================================================================
 *
@@ -1663,7 +1661,7 @@ ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap
  * the nodes contained in a {\bf NodeList}.  The DOM2-Core refers to
  * this as being {\it live}.
  */
-/*! @{ */
+//@{
 
   /** Retrieves a {\bf Node} from a {\bf NodeList} specified by a 
    *  numerical index.
@@ -1703,8 +1701,8 @@ ixmlNodeList_free(IXML_NodeList *nList
 		    /** The {\bf NodeList} to free.  */
                  );
 
-/*! @} */ /* Interface NodeList */
+//@} Interface NodeList
-/*! @} */ /* DOM Interfaces */
+//@} DOM Interfaces
 
 /**@name IXML API
  * The IXML API contains utility functions that are not part of the standard
@@ -1712,7 +1710,7 @@ ixmlNodeList_free(IXML_NodeList *nList
  * file or buffer, create an XML file from a DOM structure, and manipulate 
  * DOMString objects.
  */
-/*! @{ */
+//@{
 
 /*================================================================
 * 
@@ -1740,7 +1738,7 @@ ixmlNodeList_free(IXML_NodeList *nList
    *                      of the DOM tree or {\tt NULL} on an error.
    */
 
-EXPORT_SPEC DOMString
+DOMString
 ixmlPrintDocument(IXML_Document *doc);
 
   /** Renders a {\bf Node} and all sub-elements into an XML text
@@ -1758,7 +1756,7 @@ ixmlPrintDocument(IXML_Document *doc);
    *                      of the DOM tree or {\tt NULL} on an error.
    */
 
-EXPORT_SPEC DOMString   
+DOMString   
 ixmlPrintNode(IXML_Node *doc  
                 /** The root of the {\bf Node} tree to render to XML text. */
              );
@@ -1779,7 +1777,7 @@ ixmlPrintNode(IXML_Node *doc
    *                      of the DOM tree or {\tt NULL} on an error.
    */
 
-EXPORT_SPEC DOMString
+DOMString
 ixmlDocumenttoString(IXML_Document *doc);
 
   /** Renders a {\bf Node} and all sub-elements into an XML text
@@ -1811,7 +1809,7 @@ ixmlNodetoString(IXML_Node *doc
    * characters are replaced by the {\bf errorChar}, and invalid "&" entities 
    * are left untranslated. The parsing is then allowed to continue.
    */
-EXPORT_SPEC void
+void
 ixmlRelaxParser(char errorChar);
 
 
@@ -1821,7 +1819,7 @@ ixmlRelaxParser(char errorChar);
    *                      {\tt NULL} on an error. 
    */
 EXPORT_SPEC IXML_Document*
-ixmlParseBuffer(const char *buffer 
+ixmlParseBuffer(char *buffer 
 		  /** The buffer that contains the XML text to convert to a 
 		      {\bf Document}. */
                );
@@ -1844,7 +1842,7 @@ ixmlParseBuffer(const char *buffer
    */
 
 EXPORT_SPEC int
-ixmlParseBufferEx(const char *buffer, 
+ixmlParseBufferEx(char *buffer, 
 		    /** The buffer that contains the XML text to convert to a 
 		        {\bf Document}. */
                   IXML_Document** doc 
@@ -1859,7 +1857,7 @@ ixmlParseBufferEx(const char *buffer,
    */
 
 EXPORT_SPEC IXML_Document*
-ixmlLoadDocument(const char* xmlFile      
+ixmlLoadDocument(char* xmlFile      
 		   /** The filename of the XML text to convert to a {\bf 
 		       Document}. */
                 );
@@ -1881,7 +1879,7 @@ ixmlLoadDocument(const char* xmlFile
    */
 
 EXPORT_SPEC int 
-ixmlLoadDocumentEx(const char* xmlFile,      
+ixmlLoadDocumentEx(char* xmlFile,      
 		     /** The filename of the XML text to convert to a {\bf 
 		         Document}. */
                    IXML_Document** doc   
@@ -1915,7 +1913,6 @@ ixmlFreeDOMString(DOMString buf
 }
 #endif
 
-/*! @} */ /* IXML API */
+//@} IXML API
-
-#endif  /* _IXML_H_ */
 
+#endif  // _IXML_H_

ixml/src/document.c

@@ -373,7 +373,7 @@ ixmlDocument_createTextNode( IN IXML_Document * doc,
 ================================================================*/
 int
 ixmlDocument_createAttributeEx( IN IXML_Document * doc,
-                                IN const char *name,
+                                IN char *name,
                                 OUT IXML_Attr ** rtAttr )
 {
     IXML_Attr *attrNode = NULL;
@@ -427,7 +427,7 @@ ixmlDocument_createAttributeEx( IN IXML_Document * doc,
 ================================================================*/
 IXML_Attr *
 ixmlDocument_createAttribute( IN IXML_Document * doc,
-                              IN const char *name )
+                              IN char *name )
 {
     IXML_Attr *attrNode = NULL;
 
@@ -451,8 +451,8 @@ ixmlDocument_createAttribute( IN IXML_Document * doc,
 *=================================================================*/
 int
 ixmlDocument_createAttributeNSEx( IN IXML_Document * doc,
-                                  IN const DOMString namespaceURI,
+                                  IN DOMString namespaceURI,
-                                  IN const DOMString qualifiedName,
+                                  IN DOMString qualifiedName,
                                   OUT IXML_Attr ** rtAttr )
 {
     IXML_Attr *attrNode = NULL;
@@ -507,8 +507,8 @@ ixmlDocument_createAttributeNSEx( IN IXML_Document * doc,
 *=================================================================*/
 IXML_Attr *
 ixmlDocument_createAttributeNS( IN IXML_Document * doc,
-                                IN const DOMString namespaceURI,
+                                IN DOMString namespaceURI,
-                                IN const DOMString qualifiedName )
+                                IN DOMString qualifiedName )
 {
     IXML_Attr *attrNode = NULL;
 
@@ -531,7 +531,7 @@ ixmlDocument_createAttributeNS( IN IXML_Document * doc,
 *=================================================================*/
 int
 ixmlDocument_createCDATASectionEx( IN IXML_Document * doc,
-                                   IN const DOMString data,
+                                   IN DOMString data,
                                    OUT IXML_CDATASection ** rtCD )
 {
     int errCode = IXML_SUCCESS;
@@ -588,7 +588,7 @@ ixmlDocument_createCDATASectionEx( IN IXML_Document * doc,
 *=================================================================*/
 IXML_CDATASection *
 ixmlDocument_createCDATASection( IN IXML_Document * doc,
-                                 IN const DOMString data )
+                                 IN DOMString data )
 {
 
     IXML_CDATASection *cDSectionNode = NULL;
@@ -613,8 +613,8 @@ ixmlDocument_createCDATASection( IN IXML_Document * doc,
 *=================================================================*/
 int
 ixmlDocument_createElementNSEx( IN IXML_Document * doc,
-                                IN const DOMString namespaceURI,
+                                IN DOMString namespaceURI,
-                                IN const DOMString qualifiedName,
+                                IN DOMString qualifiedName,
                                 OUT IXML_Element ** rtElement )
 {
 
@@ -673,8 +673,8 @@ ixmlDocument_createElementNSEx( IN IXML_Document * doc,
 *=================================================================*/
 IXML_Element *
 ixmlDocument_createElementNS( IN IXML_Document * doc,
-                              IN const DOMString namespaceURI,
+                              IN DOMString namespaceURI,
-                              IN const DOMString qualifiedName )
+                              IN DOMString qualifiedName )
 {
     IXML_Element *newElement = NULL;
 
@@ -698,7 +698,7 @@ ixmlDocument_createElementNS( IN IXML_Document * doc,
 *=================================================================*/
 IXML_NodeList *
 ixmlDocument_getElementsByTagName( IN IXML_Document * doc,
-                                   IN const char *tagName )
+                                   IN char *tagName )
 {
     IXML_NodeList *returnNodeList = NULL;
 
@@ -728,8 +728,8 @@ ixmlDocument_getElementsByTagName( IN IXML_Document * doc,
 *=================================================================*/
 IXML_NodeList *
 ixmlDocument_getElementsByTagNameNS( IN IXML_Document * doc,
-                                     IN const DOMString namespaceURI,
+                                     IN DOMString namespaceURI,
-                                     IN const DOMString localName )
+                                     IN DOMString localName )
 {
     IXML_NodeList *returnNodeList = NULL;
 
@@ -756,7 +756,7 @@ ixmlDocument_getElementsByTagNameNS( IN IXML_Document * doc,
 *=================================================================*/
 IXML_Element *
 ixmlDocument_getElementById( IN IXML_Document * doc,
-                             IN const DOMString tagName )
+                             IN DOMString tagName )
 {
     IXML_Element *rtElement = NULL;
     IXML_Node *nodeptr = ( IXML_Node * ) doc;

ixml/src/element.c

@@ -71,7 +71,7 @@ ixmlElement_getTagName( IN IXML_Element * element )
 *=================================================================*/
 int
 ixmlElement_setTagName( IN IXML_Element * element,
-                        IN const char *tagName )
+                        IN char *tagName )
 {
     int rc = IXML_SUCCESS;
 
@@ -104,9 +104,9 @@ ixmlElement_setTagName( IN IXML_Element * element,
 *       does not have a specified value.
 *
 *=================================================================*/
-const DOMString
+DOMString
 ixmlElement_getAttribute( IN IXML_Element * element,
-                          IN const DOMString name )
+                          IN DOMString name )
 {
     IXML_Node *attrNode;
 
@@ -142,8 +142,8 @@ ixmlElement_getAttribute( IN IXML_Element * element,
 *=================================================================*/
 int
 ixmlElement_setAttribute( IN IXML_Element * element,
-                          IN const char *name,
+                          IN char *name,
-                          IN const char *value )
+                          IN char *value )
 {
     IXML_Node *attrNode;
     IXML_Attr *newAttrNode;
@@ -221,7 +221,7 @@ ixmlElement_setAttribute( IN IXML_Element * element,
 *=================================================================*/
 int
 ixmlElement_removeAttribute( IN IXML_Element * element,
-                             IN const char *name )
+                             IN char *name )
 {
 
     IXML_Node *attrNode;
@@ -262,7 +262,7 @@ ixmlElement_removeAttribute( IN IXML_Element * element,
 *=================================================================*/
 IXML_Attr *
 ixmlElement_getAttributeNode( IN IXML_Element * element,
-                              IN const char *name )
+                              IN char *name )
 {
 
     IXML_Node *attrNode;
@@ -483,7 +483,7 @@ ixmlElement_removeAttributeNode( IN IXML_Element * element,
 *=================================================================*/
 IXML_NodeList *
 ixmlElement_getElementsByTagName( IN IXML_Element * element,
-                                  IN const char *tagName )
+                                  IN char *tagName )
 {
     IXML_NodeList *returnNodeList = NULL;
 
@@ -508,10 +508,10 @@ ixmlElement_getElementsByTagName( IN IXML_Element * element,
 *       not have the specified value.
 *
 *=================================================================*/
-const DOMString
+DOMString
 ixmlElement_getAttributeNS( IN IXML_Element * element,
-                            IN const DOMString namespaceURI,
+                            IN DOMString namespaceURI,
-                            IN const DOMString localName )
+                            IN DOMString localName )
 {
     IXML_Node *attrNode;
 
@@ -553,9 +553,9 @@ ixmlElement_getAttributeNS( IN IXML_Element * element,
 *=================================================================*/
 int
 ixmlElement_setAttributeNS( IN IXML_Element * element,
-                            IN const DOMString namespaceURI,
+                            IN DOMString namespaceURI,
-                            IN const DOMString qualifiedName,
+                            IN DOMString qualifiedName,
-                            IN const DOMString value )
+                            IN DOMString value )
 {
     IXML_Node *attrNode = NULL;
     IXML_Node newAttrNode;
@@ -672,8 +672,8 @@ ixmlElement_setAttributeNS( IN IXML_Element * element,
 *=================================================================*/
 int
 ixmlElement_removeAttributeNS( IN IXML_Element * element,
-                               IN const DOMString namespaceURI,
+                               IN DOMString namespaceURI,
-                               IN const DOMString localName )
+                               IN DOMString localName )
 {
     IXML_Node *attrNode;
 
@@ -719,8 +719,8 @@ ixmlElement_removeAttributeNS( IN IXML_Element * element,
 *=================================================================*/
 IXML_Attr *
 ixmlElement_getAttributeNodeNS( IN IXML_Element * element,
-                                IN const DOMString namespaceURI,
+                                IN DOMString namespaceURI,
-                                IN const DOMString localName )
+                                IN DOMString localName )
 {
 
     IXML_Node *attrNode;
@@ -861,8 +861,8 @@ ixmlElement_setAttributeNodeNS( IN IXML_Element * element,
 *=================================================================*/
 IXML_NodeList *
 ixmlElement_getElementsByTagNameNS( IN IXML_Element * element,
-                                    IN const DOMString namespaceURI,
+                                    IN DOMString namespaceURI,
-                                    IN const DOMString localName )
+                                    IN DOMString localName )
 {
     IXML_Node *node = ( IXML_Node * ) element;
     IXML_NodeList *nodeList = NULL;
@@ -892,7 +892,7 @@ ixmlElement_getElementsByTagNameNS( IN IXML_Element * element,
 *=================================================================*/
 BOOL
 ixmlElement_hasAttribute( IN IXML_Element * element,
-                          IN const DOMString name )
+                          IN DOMString name )
 {
 
     IXML_Node *attrNode;
@@ -930,8 +930,8 @@ ixmlElement_hasAttribute( IN IXML_Element * element,
 *=================================================================*/
 BOOL
 ixmlElement_hasAttributeNS( IN IXML_Element * element,
-                            IN const DOMString namespaceURI,
+                            IN DOMString namespaceURI,
-                            IN const DOMString localName )
+                            IN DOMString localName )
 {
 
     IXML_Node *attrNode;

ixml/src/inc/ixmlmembuf.h

@@ -39,7 +39,7 @@
 #define MAXVAL( a, b ) ( (a) > (b) ? (a) : (b) )
 
 #ifndef WIN32
- #define	UPNP_INLINE inline
+ #define	XINLINE inline
 #endif
 
 #define MEMBUF_DEF_SIZE_INC		20

ixml/src/inc/ixmlparser.h

@@ -88,8 +88,8 @@ typedef struct _Parser
 
 
 
-int     Parser_LoadDocument( IXML_Document **retDoc, const char * xmlFile, BOOL file);
+int     Parser_LoadDocument( IXML_Document **retDoc, char * xmlFile, BOOL file);
-BOOL    Parser_isValidXmlName( const DOMString name);
+BOOL    Parser_isValidXmlName( DOMString name);
 int     Parser_setNodePrefixAndLocalName(IXML_Node *newIXML_NodeIXML_Attr);
 void    Parser_freeNodeContent( IXML_Node *IXML_Nodeptr);
 
@@ -98,7 +98,7 @@ void    Parser_setErrorChar( char c );
 void    ixmlAttr_free(IXML_Attr *attrNode);
 void    ixmlAttr_init(IXML_Attr *attrNode);
 
-int     ixmlElement_setTagName(IXML_Element *element, const char *tagName);
+int     ixmlElement_setTagName(IXML_Element *element, char *tagName);
 
 void    ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap);
 int     ixmlNamedNodeMap_addToNamedNodeMap(IXML_NamedNodeMap **nnMap, IXML_Node *add);
@@ -106,12 +106,12 @@ int     ixmlNamedNodeMap_addToNamedNodeMap(IXML_NamedNodeMap **nnMap, IXML_Node
 void    ixmlNode_init(IXML_Node *IXML_Nodeptr);
 BOOL    ixmlNode_compare(IXML_Node *srcIXML_Node, IXML_Node *destIXML_Node);
 
-void    ixmlNode_getElementsByTagName( IXML_Node *n, const char *tagname, IXML_NodeList **list);
+void    ixmlNode_getElementsByTagName( IXML_Node *n, char *tagname, IXML_NodeList **list);
-void    ixmlNode_getElementsByTagNameNS( IXML_Node *IXML_Node, const char *namespaceURI,
+void    ixmlNode_getElementsByTagNameNS( IXML_Node *IXML_Node, char *namespaceURI,
-                const char *localName, IXML_NodeList **list);
+                char *localName, IXML_NodeList **list);
 
 int     ixmlNode_setNodeProperties(IXML_Node* node, IXML_Node *src);
-int     ixmlNode_setNodeName( IXML_Node* node, const DOMString qualifiedName);
+int     ixmlNode_setNodeName( IXML_Node* node, DOMString qualifiedName);
 
 void    ixmlNodeList_init(IXML_NodeList *nList);
 int     ixmlNodeList_addToNodeList(IXML_NodeList **nList, IXML_Node *add);

ixml/src/ixml.c

@@ -39,7 +39,7 @@
 *=================================================================*/
 static void
 copy_with_escape( INOUT ixml_membuf * buf,
-                  IN const char *p )
+                  IN char *p )
 {
     int i;
     int plen;
@@ -87,13 +87,13 @@ void
 ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
                            IN ixml_membuf * buf )
 {
-    const char *nodeName = NULL;
+    char *nodeName = NULL;
-    const char *nodeValue = NULL;
+    char *nodeValue = NULL;
     IXML_Node *child = NULL,
      *sibling = NULL;
 
     if( nodeptr != NULL ) {
-        nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+        nodeName = ( char * )ixmlNode_getNodeName( nodeptr );
         nodeValue = ixmlNode_getNodeValue( nodeptr );
 
         switch ( ixmlNode_getNodeType( nodeptr ) ) {
@@ -103,16 +103,14 @@ ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
                 break;
 
             case eCDATA_SECTION_NODE:
-                ixml_membuf_append_str( buf, "<![CDATA[" );
                 ixml_membuf_append_str( buf, nodeValue );
-                ixml_membuf_append_str( buf, "]]>" );
                 break;
 
             case ePROCESSING_INSTRUCTION_NODE:
                 ixml_membuf_append_str( buf, "<?" );
                 ixml_membuf_append_str( buf, nodeName );
                 ixml_membuf_append_str( buf, " " );
-                copy_with_escape( buf, nodeValue );
+                ixml_membuf_append_str( buf, nodeValue );
                 ixml_membuf_append_str( buf, "?>\n" );
                 break;
 
@@ -124,9 +122,10 @@ ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
             case eATTRIBUTE_NODE:
                 ixml_membuf_append_str( buf, nodeName );
                 ixml_membuf_append_str( buf, "=\"" );
-                copy_with_escape( buf, nodeValue );
+                if( nodeValue != NULL ) {
+                    ixml_membuf_append_str( buf, nodeValue );
+                }
                 ixml_membuf_append_str( buf, "\"" );
-
                 if( nodeptr->nextSibling != NULL ) {
                     ixml_membuf_append_str( buf, " " );
                     ixmlPrintDomTreeRecursive( nodeptr->nextSibling, buf );
@@ -146,7 +145,7 @@ ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
                 if( ( child != NULL )
                     && ( ixmlNode_getNodeType( child ) ==
                          eELEMENT_NODE ) ) {
-                    ixml_membuf_append_str( buf, ">\r\n" );
+                    ixml_membuf_append_str( buf, ">\n" );
                 } else {
                     ixml_membuf_append_str( buf, ">" );
                 }
@@ -164,7 +163,7 @@ ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
                     && ixmlNode_getNodeType( sibling ) == eTEXT_NODE ) {
                     ixml_membuf_append_str( buf, ">" );
                 } else {
-                    ixml_membuf_append_str( buf, ">\r\n" );
+                    ixml_membuf_append_str( buf, ">\n" );
                 }
                 ixmlPrintDomTreeRecursive( ixmlNode_getNextSibling
                                            ( nodeptr ), buf );
@@ -188,15 +187,15 @@ void
 ixmlPrintDomTree( IN IXML_Node * nodeptr,
                   IN ixml_membuf * buf )
 {
-    const char *nodeName = NULL;
+    char *nodeName = NULL;
-    const char *nodeValue = NULL;
+    char *nodeValue = NULL;
     IXML_Node *child = NULL;
 
     if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
         return;
     }
 
-    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+    nodeName = ( char * )ixmlNode_getNodeName( nodeptr );
     nodeValue = ixmlNode_getNodeValue( nodeptr );
 
     switch ( ixmlNode_getNodeType( nodeptr ) ) {
@@ -211,7 +210,7 @@ ixmlPrintDomTree( IN IXML_Node * nodeptr,
         case eATTRIBUTE_NODE:
             ixml_membuf_append_str( buf, nodeName );
             ixml_membuf_append_str( buf, "=\"" );
-            copy_with_escape( buf, nodeValue );
+            ixml_membuf_append_str( buf, nodeValue );
             ixml_membuf_append_str( buf, "\"" );
             break;
 
@@ -227,7 +226,7 @@ ixmlPrintDomTree( IN IXML_Node * nodeptr,
             child = ixmlNode_getFirstChild( nodeptr );
             if( ( child != NULL )
                 && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
-                ixml_membuf_append_str( buf, ">\r\n" );
+                ixml_membuf_append_str( buf, ">\n" );
             } else {
                 ixml_membuf_append_str( buf, ">" );
             }
@@ -239,7 +238,7 @@ ixmlPrintDomTree( IN IXML_Node * nodeptr,
             // Done with children.  Output the end tag.
             ixml_membuf_append_str( buf, "</" );
             ixml_membuf_append_str( buf, nodeName );
-            ixml_membuf_append_str( buf, ">\r\n" );
+            ixml_membuf_append_str( buf, ">\n" );
             break;
 
         default:
@@ -259,15 +258,15 @@ void
 ixmlDomTreetoString( IN IXML_Node * nodeptr,
                      IN ixml_membuf * buf )
 {
-    const char *nodeName = NULL;
+    char *nodeName = NULL;
-    const char *nodeValue = NULL;
+    char *nodeValue = NULL;
     IXML_Node *child = NULL;
 
     if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
         return;
     }
 
-    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+    nodeName = ( char * )ixmlNode_getNodeName( nodeptr );
     nodeValue = ixmlNode_getNodeValue( nodeptr );
 
     switch ( ixmlNode_getNodeType( nodeptr ) ) {
@@ -282,7 +281,7 @@ ixmlDomTreetoString( IN IXML_Node * nodeptr,
         case eATTRIBUTE_NODE:
             ixml_membuf_append_str( buf, nodeName );
             ixml_membuf_append_str( buf, "=\"" );
-            copy_with_escape( buf, nodeValue );
+            ixml_membuf_append_str( buf, nodeValue );
             ixml_membuf_append_str( buf, "\"" );
             break;
 
@@ -325,7 +324,7 @@ ixmlDomTreetoString( IN IXML_Node * nodeptr,
 *
 *=================================================================*/
 int
-ixmlLoadDocumentEx( IN const char *xmlFile,
+ixmlLoadDocumentEx( IN char *xmlFile,
                     IXML_Document ** doc )
 {
 
@@ -343,7 +342,7 @@ ixmlLoadDocumentEx( IN const char *xmlFile,
 *
 *=================================================================*/
 IXML_Document *
-ixmlLoadDocument( IN const char *xmlFile )
+ixmlLoadDocument( IN char *xmlFile )
 {
 
     IXML_Document *doc = NULL;
@@ -372,7 +371,7 @@ ixmlPrintDocument(IXML_Document *doc)
     }
 
     ixml_membuf_init( buf );
-    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
+    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\n" );
     ixmlPrintDomTree( rootNode, buf );
     return buf->buf;
 
@@ -421,7 +420,7 @@ ixmlDocumenttoString(IXML_Document *doc)
     }
 
     ixml_membuf_init( buf );
-    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
+    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\n" );
     ixmlDomTreetoString( rootNode, buf );
     return buf->buf;
 
@@ -470,7 +469,7 @@ ixmlRelaxParser(char errorChar)
 *
 *=================================================================*/
 int
-ixmlParseBufferEx( IN const char *buffer,
+ixmlParseBufferEx( IN char *buffer,
                    IXML_Document ** retDoc )
 {
 
@@ -478,7 +477,7 @@ ixmlParseBufferEx( IN const char *buffer,
         return IXML_INVALID_PARAMETER;
     }
 
-    if( buffer[0] == '\0' ) {
+    if( strlen( buffer ) == 0 ) {
         return IXML_INVALID_PARAMETER;
     }
 
@@ -492,7 +491,7 @@ ixmlParseBufferEx( IN const char *buffer,
 *
 *=================================================================*/
 IXML_Document *
-ixmlParseBuffer( IN const char *buffer )
+ixmlParseBuffer( IN char *buffer )
 {
     IXML_Document *doc = NULL;
 

ixml/src/ixmlparser.c

@@ -232,30 +232,15 @@ static BOOL Parser_ElementPrefixDefined( Parser * myParser,
                                          IXML_Node * newNode,
                                          char **nsURI );
 static int Parser_setElementNamespace( IXML_Element * newElement,
-                                       const char *nsURI );
+                                       char *nsURI );
 static int Parser_parseDocument( IXML_Document ** retDoc,
                                  Parser * domParser );
 static BOOL Parser_hasDefaultNamespace( Parser * xmlParser,
                                         IXML_Node * newNode,
                                         char **nsURI );
-static int Parser_getChar( IN const char *src,
+static int Parser_getChar( IN char *src,
                            INOUT int *cLen );
 
-/*==============================================================================*
-*   safe_strdup
-*       strdup that handles NULL input.
-*   
-*===============================================================================*/
-static char *
-safe_strdup(const char *s) 
-{
-    assert(s != NULL);
-    if (s == NULL) {
-        return strdup("");
-    }
-    return strdup(s);
-}
-
 /*==============================================================================*
 *   Parser_isCharInTable
 *       will determine whether character c is in the table of tbl
@@ -327,9 +312,9 @@ Parser_isNameChar( IN int c,
 *
 *===============================================================================*/
 BOOL
-Parser_isValidXmlName( IN const DOMString name )
+Parser_isValidXmlName( IN DOMString name )
 {
-    const char *pstr = NULL;
+    char *pstr = NULL;
     int i = 0,
       nameLen = 0;
 
@@ -340,7 +325,7 @@ Parser_isValidXmlName( IN const DOMString name )
     pstr = name;
     if( Parser_isNameChar( *pstr, FALSE ) == TRUE ) {
         for( i = 1; i < nameLen; i++ ) {
-            if( Parser_isNameChar( *( pstr + i ), TRUE ) == FALSE ) {   //illegal char
+            if( Parser_isNameChar( *( pstr + 1 ), TRUE ) == FALSE ) {   //illegal char
                 return FALSE;
             }
         }
@@ -434,11 +419,11 @@ Parser_intToUTF8( IN int c,
 *          
 *===============================================================================*/
 static int
-Parser_UTF8ToInt( IN const char *ss,
+Parser_UTF8ToInt( IN char *ss,
                   OUT int *len )
 {
 
-    const unsigned char *s = ( const unsigned char * )ss;
+    unsigned char *s = ( unsigned char * )ss;
     int c = *s;
 
     if( c <= 127 ) {            // if c<=127, c is just the character.
@@ -540,14 +525,14 @@ Parser_pushElement( IN Parser * xmlParser,
         memset( pNewStackElement, 0, sizeof( IXML_ElementStack ) );
         // the element member includes both prefix and name 
 
-        pNewStackElement->element = safe_strdup( newElement->nodeName );
+        pNewStackElement->element = strdup( newElement->nodeName );
         if( pNewStackElement->element == NULL ) {
             free( pNewStackElement );
             return IXML_INSUFFICIENT_MEMORY;
         }
 
         if( newElement->prefix != 0 ) {
-            pNewStackElement->prefix = safe_strdup( newElement->prefix );
+            pNewStackElement->prefix = strdup( newElement->prefix );
             if( pNewStackElement->prefix == NULL ) {
                 Parser_freeElementStackItem( pNewStackElement );
                 free( pNewStackElement );
@@ -557,7 +542,7 @@ Parser_pushElement( IN Parser * xmlParser,
 
         if( newElement->namespaceURI != 0 ) {
             pNewStackElement->namespaceUri =
-                safe_strdup( newElement->namespaceURI );
+                strdup( newElement->namespaceURI );
             if( pNewStackElement->namespaceUri == NULL ) {
                 Parser_freeElementStackItem( pNewStackElement );
                 free( pNewStackElement );
@@ -617,7 +602,7 @@ Parser_popElement( IN Parser * xmlParser )
 *=================================================================*/
 static int
 Parser_readFileOrBuffer( IN Parser * xmlParser,
-                         IN const char *xmlFileName,
+                         IN char *xmlFileName,
                          IN BOOL file )
 {
     int fileSize = 0;
@@ -649,7 +634,7 @@ Parser_readFileOrBuffer( IN Parser * xmlParser,
             fclose( xmlFilePtr );
         }
     } else {
-        xmlParser->dataBuffer = safe_strdup( xmlFileName );
+        xmlParser->dataBuffer = strdup( xmlFileName );
         if( xmlParser->dataBuffer == NULL ) {
             return IXML_INSUFFICIENT_MEMORY;
         }
@@ -666,7 +651,7 @@ Parser_readFileOrBuffer( IN Parser * xmlParser,
 *=================================================================*/
 int
 Parser_LoadDocument( OUT IXML_Document ** retDoc,
-                     IN const char *xmlFileName,
+                     IN char *xmlFileName,
                      IN BOOL file )
 {
     int rc = IXML_SUCCESS;
@@ -1132,10 +1117,10 @@ Parser_skipWhiteSpaces( IN Parser * xmlParser )
 *
 *===============================================================================*/
 static int
-Parser_getChar( IN const char *src,
+Parser_getChar( IN char *src,
                 INOUT int *cLen )
 {
-    const char *pnum;
+    char *pnum;
     int sum;
     char c;
     int i;
@@ -1228,13 +1213,13 @@ fail_entity:
 *===============================================================================*/
 static int
 Parser_copyToken( IN Parser * xmlParser,
-                  IN const char *src,
+                  IN char *src,
                   IN int len )
 {
     int i,
       c,
       cl;
-    const char *psrc,
+    char *psrc,
      *pend;
     utf8char uch;
 
@@ -1578,7 +1563,7 @@ Parser_getNextToken( IN Parser * xmlParser )
 *===============================================================================*/
 static char *
 Parser_getNameSpace( IN Parser * xmlParser,
-                     IN const char *prefix )
+                     IN char *prefix )
 {
     IXML_ElementStack *pCur;
     IXML_NamespaceURI *pNsUri;
@@ -1612,7 +1597,7 @@ Parser_addNamespace( IN Parser * xmlParser )
 {
     IXML_Node *pNode;
     IXML_ElementStack *pCur;
-    const char *namespaceUri;
+    char *namespaceUri;
 
     pNode = xmlParser->pNeedPrefixNode;
     pCur = xmlParser->pCurElement;
@@ -1625,7 +1610,7 @@ Parser_addNamespace( IN Parser * xmlParser )
             // it would be wrong that pNode->namespace != NULL.
             assert( pNode->namespaceURI == NULL );
 
-            pNode->namespaceURI = safe_strdup( pCur->namespaceUri );
+            pNode->namespaceURI = strdup( pCur->namespaceUri );
             if( pNode->namespaceURI == NULL ) {
                 return IXML_INSUFFICIENT_MEMORY;
             }
@@ -1641,7 +1626,7 @@ Parser_addNamespace( IN Parser * xmlParser )
 
         namespaceUri = Parser_getNameSpace( xmlParser, pCur->prefix );
         if( namespaceUri != NULL ) {
-            pNode->namespaceURI = safe_strdup( namespaceUri );
+            pNode->namespaceURI = strdup( namespaceUri );
             if( pNode->namespaceURI == NULL ) {
                 return IXML_INSUFFICIENT_MEMORY;
             }
@@ -1676,7 +1661,7 @@ Parser_setNodePrefixAndLocalName( IN IXML_Node * node )
     pStrPrefix = strchr( node->nodeName, ':' );
     if( pStrPrefix == NULL ) {
         node->prefix = NULL;
-        node->localName = safe_strdup( node->nodeName );
+        node->localName = strdup( node->nodeName );
         if( node->localName == NULL ) {
             return IXML_INSUFFICIENT_MEMORY;
         }
@@ -1693,7 +1678,7 @@ Parser_setNodePrefixAndLocalName( IN IXML_Node * node )
         memset( node->prefix, 0, nPrefix + 1 );
         strncpy( node->prefix, node->nodeName, nPrefix );
 
-        node->localName = safe_strdup( pLocalName );
+        node->localName = strdup( pLocalName );
         if( node->localName == NULL ) {
             free( node->prefix );
             node->prefix = NULL;    //no need to free really, main loop will frees it
@@ -1733,7 +1718,7 @@ Parser_xmlNamespace( IN Parser * xmlParser,
         }
 ///here it goes to segfault on "" when not copying
 	if(newNode->nodeValue){
-         pCur->namespaceUri = safe_strdup( newNode->nodeValue );
+         pCur->namespaceUri = strdup( newNode->nodeValue );
          if( pCur->namespaceUri == NULL ) {
              return IXML_INSUFFICIENT_MEMORY;
          }
@@ -1753,7 +1738,7 @@ Parser_xmlNamespace( IN Parser * xmlParser,
 
         if( ( pCur->prefix != NULL )
             && ( strcmp( pCur->prefix, newNode->localName ) == 0 ) ) {
-            pCur->namespaceUri = safe_strdup( newNode->nodeValue );
+            pCur->namespaceUri = strdup( newNode->nodeValue );
             if( pCur->namespaceUri == NULL ) {
                 return IXML_INSUFFICIENT_MEMORY;
             }
@@ -1780,13 +1765,13 @@ Parser_xmlNamespace( IN Parser * xmlParser,
                 }
                 memset( pNewNs, 0, sizeof( IXML_NamespaceURI ) );
 
-                pNewNs->prefix = safe_strdup( newNode->localName );
+                pNewNs->prefix = strdup( newNode->localName );
                 if( pNewNs->prefix == NULL ) {
                     free( pNewNs );
                     return IXML_INSUFFICIENT_MEMORY;
                 }
 
-                pNewNs->nsURI = safe_strdup( newNode->nodeValue );
+                pNewNs->nsURI = strdup( newNode->nodeValue );
                 if( pNewNs->nsURI == NULL ) {
                     Parser_freeNsURI( pNewNs );
                     free( pNewNs );
@@ -1804,7 +1789,7 @@ Parser_xmlNamespace( IN Parser * xmlParser,
                     free( pNs->nsURI );
                 }
 
-                pNs->nsURI = safe_strdup( newNode->nodeValue );
+                pNs->nsURI = strdup( newNode->nodeValue );
                 if( pNs->nsURI == NULL ) {
                     return IXML_INSUFFICIENT_MEMORY;
                 }
@@ -1841,7 +1826,7 @@ Parser_processSTag( IN Parser * xmlParser,
 
     pCurToken = ( xmlParser->tokenBuf ).buf;
     if( pCurToken != NULL ) {
-        node->nodeName = safe_strdup( pCurToken );
+        node->nodeName = strdup( pCurToken );
         if( node->nodeName == NULL ) {
             return IXML_INSUFFICIENT_MEMORY;
         }
@@ -1992,7 +1977,7 @@ Parser_processCDSect( IN char **pSrc,
         strncpy( node->nodeValue, pCDataStart, tokenLength );
         node->nodeValue[tokenLength] = '\0';
 
-        node->nodeName = safe_strdup( CDATANODENAME );
+        node->nodeName = strdup( CDATANODENAME );
         if( node->nodeName == NULL ) {
             // no need to free node->nodeValue at all, bacause node contents
             // will be freed by the main loop.
@@ -2017,13 +2002,13 @@ Parser_processCDSect( IN char **pSrc,
 *===============================================================================*/
 static int
 Parser_setElementNamespace( IN IXML_Element * newElement,
-                            IN const char *nsURI )
+                            IN char *nsURI )
 {
     if( newElement != NULL ) {
         if( newElement->n.namespaceURI != NULL ) {
             return IXML_SYNTAX_ERR;
         } else {
-            ( newElement->n ).namespaceURI = safe_strdup( nsURI );
+            ( newElement->n ).namespaceURI = strdup( nsURI );
             if( ( newElement->n ).namespaceURI == NULL ) {
                 return IXML_INSUFFICIENT_MEMORY;
             }
@@ -2122,7 +2107,7 @@ Parser_processContent( IN Parser * xmlParser,
 
         pCurToken = ( xmlParser->tokenBuf ).buf;
         if( pCurToken != NULL ) {
-            node->nodeValue = safe_strdup( pCurToken );
+            node->nodeValue = strdup( pCurToken );
             if( node->nodeValue == NULL ) {
                 return IXML_INSUFFICIENT_MEMORY;
             }
@@ -2130,7 +2115,7 @@ Parser_processContent( IN Parser * xmlParser,
             return IXML_SYNTAX_ERR;
         }
 
-        node->nodeName = safe_strdup( TEXTNODENAME );
+        node->nodeName = strdup( TEXTNODENAME );
         if( node->nodeName == NULL ) {
             return IXML_SYNTAX_ERR;
         }
@@ -2167,7 +2152,7 @@ Parser_processETag( IN Parser * xmlParser,
     if( pCurToken == NULL ) {
         return IXML_SYNTAX_ERR;
     }
-    node->nodeName = safe_strdup( pCurToken );
+    node->nodeName = strdup( pCurToken );
     if( node->nodeName == NULL ) {
         return IXML_INSUFFICIENT_MEMORY;
     }
@@ -2335,7 +2320,7 @@ Parser_processAttribute( IN Parser * xmlParser,
         return IXML_SYNTAX_ERR;
     }
     // copy in the attribute name
-    node->nodeName = safe_strdup( pCurToken );
+    node->nodeName = strdup( pCurToken );
     if( node->nodeName == NULL ) {
         return IXML_INSUFFICIENT_MEMORY;
     }
@@ -2388,7 +2373,7 @@ Parser_processAttribute( IN Parser * xmlParser,
 
     pCurToken = ( xmlParser->tokenBuf ).buf;
     if( pCurToken != NULL ) {   // attribute has value, like a="c"
-        node->nodeValue = safe_strdup( pCurToken );
+        node->nodeValue = strdup( pCurToken );
         if( node->nodeValue == NULL ) {
             return IXML_INSUFFICIENT_MEMORY;
         }
@@ -2471,7 +2456,7 @@ Parser_getNextNode( IN Parser * xmlParser,
                 goto ErrorHandler;
             }
 
-            node->nodeName = safe_strdup( lastElement );
+            node->nodeName = strdup( lastElement );
             if( node->nodeName == NULL ) {
                 return IXML_INSUFFICIENT_MEMORY;
             }

ixml/src/namedNodeMap.c

@@ -41,7 +41,7 @@
 *=================================================================*/
 unsigned long
 ixmlNamedNodeMap_getItemNumber( IN IXML_NamedNodeMap * nnMap,
-                                IN const char *name )
+                                IN char *name )
 {
     IXML_Node *tempNode;
     unsigned long returnItemNo = 0;
@@ -92,7 +92,7 @@ ixmlNamedNodeMap_init( IN IXML_NamedNodeMap * nnMap )
 *=================================================================*/
 IXML_Node *
 ixmlNamedNodeMap_getNamedItem( IN IXML_NamedNodeMap * nnMap,
-                               IN const char *name )
+                               IN char *name )
 {
     long index;
 

ixml/src/node.c

@@ -175,7 +175,7 @@ ixmlNode_getLocalName( IN IXML_Node * nodeptr )
 *=================================================================*/
 int
 ixmlNode_setNamespaceURI( IN IXML_Node * nodeptr,
-                          IN const char *namespaceURI )
+                          IN char *namespaceURI )
 {
 
     if( nodeptr == NULL ) {
@@ -207,7 +207,7 @@ ixmlNode_setNamespaceURI( IN IXML_Node * nodeptr,
 *=================================================================*/
 int
 ixmlNode_setPrefix( IN IXML_Node * nodeptr,
-                    IN const char *prefix )
+                    IN char *prefix )
 {
 
     if( nodeptr == NULL ) {
@@ -240,7 +240,7 @@ ixmlNode_setPrefix( IN IXML_Node * nodeptr,
 *=================================================================*/
 int
 ixmlNode_setLocalName( IN IXML_Node * nodeptr,
-                       IN const char *localName )
+                       IN char *localName )
 {
 
     assert( nodeptr != NULL );
@@ -288,10 +288,10 @@ ixmlNode_getNamespaceURI( IN IXML_Node * nodeptr )
 *       the prefix of the node.
 *
 *=================================================================*/
-const DOMString
+DOMString
 ixmlNode_getPrefix( IN IXML_Node * nodeptr )
 {
-    const DOMString prefix = NULL;
+    DOMString prefix = NULL;
 
     if( nodeptr != NULL ) {
         prefix = nodeptr->prefix;
@@ -309,7 +309,7 @@ ixmlNode_getPrefix( IN IXML_Node * nodeptr )
 *       the nodeValue of the node.
 *
 *=================================================================*/
-const DOMString
+DOMString
 ixmlNode_getNodeValue( IN IXML_Node * nodeptr )
 {
 
@@ -330,7 +330,7 @@ ixmlNode_getNodeValue( IN IXML_Node * nodeptr )
 *=================================================================*/
 int
 ixmlNode_setNodeValue( IN IXML_Node * nodeptr,
-                       IN const char *newNodeValue )
+                       IN char *newNodeValue )
 {
     int rc = IXML_SUCCESS;
 
@@ -1425,7 +1425,7 @@ ixmlNode_hasAttributes( IXML_Node * nodeptr )
 *=================================================================*/
 void
 ixmlNode_getElementsByTagNameRecursive( IN IXML_Node * n,
-                                        IN const char *tagname,
+                                        IN char *tagname,
                                         OUT IXML_NodeList ** list )
 {
     const char *name;
@@ -1457,7 +1457,7 @@ ixmlNode_getElementsByTagNameRecursive( IN IXML_Node * n,
 *=================================================================*/
 void
 ixmlNode_getElementsByTagName( IN IXML_Node * n,
-                               IN const char *tagname,
+                               IN char *tagname,
                                OUT IXML_NodeList ** list )
 {
     const char *name;
@@ -1484,8 +1484,8 @@ ixmlNode_getElementsByTagName( IN IXML_Node * n,
 *=================================================================*/
 void
 ixmlNode_getElementsByTagNameNSRecursive( IN IXML_Node * n,
-                                          IN const char *namespaceURI,
+                                          IN char *namespaceURI,
-                                          IN const char *localName,
+                                          IN char *localName,
                                           OUT IXML_NodeList ** list )
 {
     const DOMString nsURI;
@@ -1525,8 +1525,8 @@ ixmlNode_getElementsByTagNameNSRecursive( IN IXML_Node * n,
 *=================================================================*/
 void
 ixmlNode_getElementsByTagNameNS( IN IXML_Node * n,
-                                 IN const char *namespaceURI,
+                                 IN char *namespaceURI,
-                                 IN const char *localName,
+                                 IN char *localName,
                                  OUT IXML_NodeList ** list )
 {
     const DOMString nsURI;
@@ -1560,7 +1560,7 @@ ixmlNode_getElementsByTagNameNS( IN IXML_Node * n,
 *=================================================================*/
 int
 ixmlNode_setNodeName( IN IXML_Node * node,
-                      IN const DOMString qualifiedName )
+                      IN DOMString qualifiedName )
 {
     int rc = IXML_SUCCESS;
 

libupnp.pc.in

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

libupnp.spec

@@ -1,14 +1,15 @@
-Version: 1.4.2
+Version: 1.4.1
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.libupnp.org/
-Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.bz2
+Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define docdeveldir %{_docdir}/%{name}-devel-%{version}
+%define docdir %{_docdir}/%{name}-%{version}-%{release}
+%define docdeveldir %{_docdir}/%{name}-devel-%{version}-%{release}
 
 %description
 The Universal Plug and Play (UPnP) SDK for Linux provides 
@@ -28,7 +29,7 @@ the UPnP SDK libraries.
 %setup -q
 
 %build
-%configure --with-documentation
+%configure --with-docdir=%{docdir}/ 
 make %{?_smp_mflags}
 
 %install
@@ -77,9 +78,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf %{buildroot}
 
 %changelog
-* Fri Feb 02 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.2-1
-- Update to version 1.4.2
-
 * Wed Jul 05 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.1-1
 - Update to version 1.4.1
 
@@ -119,4 +117,3 @@ rm -rf %{buildroot}
 * Thu Dec 22 2005 Eric Tanguy 1.2.1a-1
 - Modify spec file from 
 http://rpm.pbone.net/index.php3/stat/4/idpl/2378737/com/libupnp-1.2.1a_DSM320-3.i386.rpm.html
-

m4/acx_pthread.m4

@@ -1,88 +1,50 @@
-##### http://autoconf-archive.cryp.to/acx_pthread.html
+dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
+dnl
-# SYNOPSIS
+dnl @summary figure out how to build C programs using POSIX threads
-#
+dnl
-#   ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl This macro figures out how to build C programs using POSIX threads.
-#
+dnl It sets the PTHREAD_LIBS output variable to the threads library and
-# DESCRIPTION
+dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
-#
+dnl C compiler flags that are needed. (The user can also force certain
-#   This macro figures out how to build C programs using POSIX threads.
+dnl compiler flags/libs to be tested by setting these environment
-#   It sets the PTHREAD_LIBS output variable to the threads library and
+dnl variables.)
-#   linker flags, and the PTHREAD_CFLAGS output variable to any special
+dnl
-#   C compiler flags that are needed. (The user can also force certain
+dnl Also sets PTHREAD_CC to any special C compiler that is needed for
-#   compiler flags/libs to be tested by setting these environment
+dnl multi-threaded programs (defaults to the value of CC otherwise).
-#   variables.)
+dnl (This is necessary on AIX to use the special cc_r compiler alias.)
-#
+dnl
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
+dnl NOTE: You are assumed to not only compile your program with these
-#   multi-threaded programs (defaults to the value of CC otherwise).
+dnl flags, but also link it with them as well. e.g. you should link
-#   (This is necessary on AIX to use the special cc_r compiler alias.)
+dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
-#
+dnl $LIBS
-#   NOTE: You are assumed to not only compile your program with these
+dnl
-#   flags, but also link it with them as well. e.g. you should link
+dnl If you are only building threads programs, you may wish to use
-#   with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+dnl these variables in your default LIBS, CFLAGS, and CC:
-#   $LIBS
+dnl
-#
+dnl        LIBS="$PTHREAD_LIBS $LIBS"
-#   If you are only building threads programs, you may wish to use
+dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#   these variables in your default LIBS, CFLAGS, and CC:
+dnl        CC="$PTHREAD_CC"
-#
+dnl
-#          LIBS="$PTHREAD_LIBS $LIBS"
+dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-#          CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-#          CC="$PTHREAD_CC"
+dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
+dnl
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
-#   constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
-#
+dnl default action will define HAVE_PTHREAD.
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads
+dnl
-#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+dnl Please let the authors know if this macro fails on any platform, or
-#   run it if it is not found. If ACTION-IF-FOUND is not specified, the
+dnl if you have any other suggestions or comments. This macro was based
-#   default action will define HAVE_PTHREAD.
+dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
-#
+dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
-#   Please let the authors know if this macro fails on any platform, or
+dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
-#   if you have any other suggestions or comments. This macro was based
+dnl We are also grateful for the helpful feedback of numerous users.
-#   on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/)
+dnl
-#   (with help from M. Frigo), as well as ac_pthread and hb_pthread
+dnl @category InstalledPackages
-#   macros posted by Alejandro Forero Cuervo to the autoconf macro
+dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
-#   repository. We are also grateful for the helpful feedback of
+dnl @version 2005-06-15
-#   numerous users.
+dnl @license GPLWithACException
-#
-# LAST MODIFICATION
-#
-#   2006-05-29
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Steven G. Johnson <stevenj@alum.mit.edu>
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
 
 AC_DEFUN([ACX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
@@ -254,12 +216,8 @@ if test "x$acx_pthread_ok" = xyes; then
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-        # More AIX lossage: must compile with xlc_r or cc_r
+        # More AIX lossage: must compile with cc_r
-	if test x"$GCC" != xyes; then
+        AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-        else
-          PTHREAD_CC=$CC
-	fi
 else
         PTHREAD_CC="$CC"
 fi

m4/ax_cflags_gcc_option.m4

@@ -1,87 +1,48 @@
-##### http://autoconf-archive.cryp.to/ax_cflags_gcc_option.html
+dnl @synopsis AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
-#
+dnl
-# SYNOPSIS
+dnl AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
-#
+dnl "checking CFLAGS for gcc -fvomit-frame ... yes" and adds the
-#   AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
+dnl optionflag to CFLAGS if it is understood. You can override the
-#
+dnl shellvar-default of CFLAGS of course. The order of arguments stems
-# DESCRIPTION
+dnl from the explicit macros like AX_CFLAGS_WARN_ALL.
-#
+dnl
-#   AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
+dnl The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add
-#   "checking CFLAGS for gcc -fvomit-frame ... yes" and adds the
+dnl to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
-#   optionflag to CFLAGS if it is understood. You can override the
+dnl (since it is possible to use different compilers for C and C++).
-#   shellvar-default of CFLAGS of course. The order of arguments stems
+dnl
-#   from the explicit macros like AX_CFLAGS_WARN_ALL.
+dnl The macro is a lot simpler than any special AX_CFLAGS_* macro (or
-#
+dnl ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
-#   The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add
+dnl However, if you use this macro in a few places, it would be great
-#   to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
+dnl if you would make up a new function-macro and submit it to the
-#   (since it is possible to use different compilers for C and C++).
+dnl ac-archive.
-#
+dnl
-#   The macro is a lot simpler than any special AX_CFLAGS_* macro (or
+dnl   - $1 option-to-check-for : required ("-option" as non-value)
-#   ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
+dnl   - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
-#   However, if you use this macro in a few places, it would be great
+dnl   - $3 action-if-found : add value to shellvariable
-#   if you would make up a new function-macro and submit it to the
+dnl   - $4 action-if-not-found : nothing
-#   ac-archive.
+dnl
-#
+dnl note: in earlier versions, $1-$2 were swapped. We try to detect the
-#     - $1 option-to-check-for : required ("-option" as non-value)
+dnl situation and accept a $2=~/-/ as being the old
-#     - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
+dnl option-to-check-for.
-#     - $3 action-if-found : add value to shellvariable
+dnl
-#     - $4 action-if-not-found : nothing
+dnl also: there are other variants that emerged from the original macro
-#
+dnl variant which did just test an option to be possibly added.
-#   note: in earlier versions, $1-$2 were swapped. We try to detect the
+dnl However, some compilers accept an option silently, or possibly for
-#   situation and accept a $2=~/-/ as being the old
+dnl just another option that was not intended. Therefore, we have to do
-#   option-to-check-for.
+dnl a generic test for a compiler family. For gcc we check "-pedantic"
-#
+dnl being accepted which is also understood by compilers who just want
-#   also: there are other variants that emerged from the original macro
+dnl to be compatible with gcc even when not being made from gcc
-#   variant which did just test an option to be possibly added.
+dnl sources.
-#   However, some compilers accept an option silently, or possibly for
+dnl
-#   just another option that was not intended. Therefore, we have to do
+dnl see also:
-#   a generic test for a compiler family. For gcc we check "-pedantic"
+dnl
-#   being accepted which is also understood by compilers who just want
+dnl       AX_CFLAGS_SUN_OPTION               AX_CFLAGS_HPUX_OPTION
-#   to be compatible with gcc even when not being made from gcc
+dnl       AX_CFLAGS_AIX_OPTION               AX_CFLAGS_IRIX_OPTION
-#   sources.
+dnl
-#
+dnl @category C
-#   see also:
+dnl @author Guido Draheim <guidod@gmx.de>
-#
+dnl @version 2003-11-04
-#         AX_CFLAGS_SUN_OPTION               AX_CFLAGS_HPUX_OPTION
+dnl @license GPLWithACException
-#         AX_CFLAGS_AIX_OPTION               AX_CFLAGS_IRIX_OPTION
-#
-# LAST MODIFICATION
-#
-#   2006-12-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
 
 AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
@@ -92,8 +53,7 @@ VAR,[VAR="no, unknown"
  AC_LANG_C
  ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
+in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
    #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
    AC_TRY_COMPILE([],[return 0;],
@@ -125,11 +85,10 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
 VAR,[VAR="no, unknown"
  AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_CXX
  ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($2,$2,-option)"  dnl   GCC
+in "-pedantic  % m4_ifval($2,$2,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($2,$2,-option) %% no, obsolete"  dnl new GCC
    #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
    AC_TRY_COMPILE([],[return 0;],
@@ -163,8 +122,7 @@ VAR,[VAR="no, unknown"
  AC_LANG_C
  ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
+in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
    #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
    AC_TRY_COMPILE([],[return 0;],
@@ -196,11 +154,10 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
 AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
 VAR,[VAR="no, unknown"
  AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_CXX
  ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
-in "-pedantic -Werror % m4_ifval($1,$1,-option)"  dnl   GCC
+in "-pedantic  % m4_ifval($1,$1,-option)"  dnl   GCC
-   "-pedantic % m4_ifval($1,$1,-option) %% no, obsolete"  dnl new GCC
    #
 do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
    AC_TRY_COMPILE([],[return 0;],

m4/ax_cflags_warn_all.m4

@@ -1,66 +1,27 @@
-##### http://autoconf-archive.cryp.to/ax_cflags_warn_all.html
+dnl @synopsis AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
-#
+dnl
-# SYNOPSIS
+dnl Try to find a compiler option that enables most reasonable
-#
+dnl warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
-#   AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
+dnl which is split up into two AX_CFLAGS_WARN_ALL and
-#
+dnl AX_CFLAGS_WARN_ALL_ANSI
-# DESCRIPTION
+dnl
-#
+dnl For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
-#   Try to find a compiler option that enables most reasonable
+dnl result is added to the shellvar being CFLAGS by default.
-#   warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
+dnl
-#   which is split up into two AX_CFLAGS_WARN_ALL and
+dnl Currently this macro knows about GCC, Solaris C compiler, Digital
-#   AX_CFLAGS_WARN_ALL_ANSI
+dnl Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
-#
+dnl compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
-#   For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
+dnl 10.0.0.8) C compiler.
-#   result is added to the shellvar being CFLAGS by default.
+dnl
-#
+dnl  - $1 shell-variable-to-add-to : CFLAGS
-#   Currently this macro knows about GCC, Solaris C compiler, Digital
+dnl  - $2 add-value-if-not-found : nothing
-#   Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
+dnl  - $3 action-if-found : add value to shellvariable
-#   compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
+dnl  - $4 action-if-not-found : nothing
-#   10.0.0.8) C compiler.
+dnl
-#
+dnl @category C
-#    - $1 shell-variable-to-add-to : CFLAGS
+dnl @author Guido Draheim <guidod@gmx.de>
-#    - $2 add-value-if-not-found : nothing
+dnl @version 2003-01-06
-#    - $3 action-if-found : add value to shellvariable
+dnl @license GPLWithACException
-#    - $4 action-if-not-found : nothing
-#
-# LAST MODIFICATION
-#
-#   2006-12-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
 
 AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl
 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
@@ -111,7 +72,7 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings],
 VAR,[VAR="no, unknown"
  AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_CXX
  ac_save_[]FLAGS="$[]FLAGS"
 for ac_arg dnl
 in "-pedantic  % -Wall"       dnl   GCC
@@ -154,5 +115,4 @@ dnl   compilers will fail about it. That was needed since a lot of
 dnl   compilers will give false positives for some option-syntax
 dnl   like -Woption or -Xoption as they think of it is a pass-through
 dnl   to later compile stages or something. The "%" is used as a
-dnl   delimimiter. A non-option comment can be given after "%%" marks
+dnl   delimimiter. A non-option comment can be given after "%%" marks.
-dnl   which will be shown but not added to the respective C/CXXFLAGS.

m4/ax_cflags_warn_all_ansi.m4

@@ -1,66 +1,27 @@
-##### http://autoconf-archive.cryp.to/ax_cflags_warn_all_ansi.html
+dnl @synopsis AX_CFLAGS_WARN_ALL_ANSI [(shellvar [,default, [A/NA]])]
-#
+dnl
-# SYNOPSIS
+dnl Try to find a compiler option that enables most reasonable
-#
+dnl warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
-#   AX_CFLAGS_WARN_ALL_ANSI [(shellvar [,default, [A/NA]])]
+dnl which is split up into two AX_CFLAGS_WARN_ALL and
-#
+dnl AX_CFLAGS_WARN_ALL_ANSI
-# DESCRIPTION
+dnl
-#
+dnl For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
-#   Try to find a compiler option that enables most reasonable
+dnl result is added to the shellvar being CFLAGS by default.
-#   warnings. This macro is directly derived from VL_PROG_CC_WARNINGS
+dnl
-#   which is split up into two AX_CFLAGS_WARN_ALL and
+dnl Currently this macro knows about GCC, Solaris C compiler, Digital
-#   AX_CFLAGS_WARN_ALL_ANSI
+dnl Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
-#
+dnl compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
-#   For the GNU CC compiler it will be -Wall (and -ansi -pedantic) The
+dnl 10.0.0.8) C compiler.
-#   result is added to the shellvar being CFLAGS by default.
+dnl
-#
+dnl  - $1 shell-variable-to-add-to : CFLAGS
-#   Currently this macro knows about GCC, Solaris C compiler, Digital
+dnl  - $2 add-value-if-not-found : nothing
-#   Unix C compiler, C for AIX Compiler, HP-UX C compiler, IRIX C
+dnl  - $3 action-if-found : add value to shellvariable
-#   compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos
+dnl  - $4 action-if-not-found : nothing
-#   10.0.0.8) C compiler.
+dnl
-#
+dnl @category C
-#    - $1 shell-variable-to-add-to : CFLAGS
+dnl @author Guido Draheim <guidod@gmx.de>
-#    - $2 add-value-if-not-found : nothing
+dnl @version 2003-01-06
-#    - $3 action-if-found : add value to shellvariable
+dnl @license GPLWithACException
-#    - $4 action-if-not-found : nothing
-#
-# LAST MODIFICATION
-#
-#   2006-12-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
 
 AC_DEFUN([AX_CFLAGS_WARN_ALL_ANSI],[dnl
 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
@@ -116,7 +77,7 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_warn_all_ansi])dnl
 AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum ansi warnings],
 VAR,[VAR="no, unknown"
  AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_CXX
  ac_save_[]FLAGS="$[]FLAGS"
 # IRIX C compiler:
 #      -use_readonly_const is the default for IRIX C,

m4/type_socklen_t.m4

@@ -1,52 +1,13 @@
-##### http://autoconf-archive.cryp.to/type_socklen_t.html
+dnl @synopsis TYPE_SOCKLEN_T
-#
+dnl
-# SYNOPSIS
+dnl Check whether sys/socket.h defines type socklen_t. Please note that
-#
+dnl some systems require sys/types.h to be included before sys/socket.h
-#   TYPE_SOCKLEN_T
+dnl can be compiled.
-#
+dnl
-# DESCRIPTION
+dnl @category Misc
-#
+dnl @author Lars Brinkhoff <lars@nocrew.org>
-#   Check whether sys/socket.h defines type socklen_t. Please note that
+dnl @version 2005-01-11
-#   some systems require sys/types.h to be included before sys/socket.h
+dnl @license GPLWithACException
-#   can be compiled.
-#
-# LAST MODIFICATION
-#
-#   2005-01-11
-#
-# COPYLEFT
-#
-#   Copyright (c) 2005 Lars Brinkhoff <lars@nocrew.org>
-#
-#   This program is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
 
 AC_DEFUN([TYPE_SOCKLEN_T],
 [AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,

svnignore

@@ -1,14 +0,0 @@
-.deps
-.dirstamp
-.libs
-.*.swp
-*~
-Makefile
-Makefile.in
-aclocal.m4
-autoconfig.h*
-autom4te.cache
-config*
-libtool
-libupnp.pc
-stamp-h*

threadutil/inc/FreeList.h

@@ -1,33 +1,33 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef FREE_LIST_H
 #define FREE_LIST_H
@@ -36,6 +36,9 @@
 extern "C" {
 #endif
 
+//#include <malloc.h>
+
+
 #include "ithread.h"
 #include <errno.h>
 
@@ -49,7 +52,7 @@ extern "C" {
  *****************************************************************************/
 typedef struct FREELISTNODE
 {
-	struct FREELISTNODE *next;
+	struct FREELISTNODE*next; //pointer to next free node
 } FreeListNode;
 
 
@@ -62,10 +65,12 @@ typedef struct FREELISTNODE
  *****************************************************************************/
 typedef struct FREELIST
 {
-	FreeListNode *head;
+	FreeListNode *head; //head of free list
-	size_t element_size;
+	size_t element_size;	//size of elements in free 
- 	int maxFreeListLength;
+ 							//list
-	int freeListLength;
+ 	int maxFreeListLength; //max size of free structures 
+						 //to keep
+	int freeListLength; //current size of free list
         
 }FreeList;
 
@@ -136,5 +141,4 @@ int FreeListDestroy (FreeList *free_list);
 }
 #endif
 
-#endif /* FREE_LIST_H */
+#endif // FREE_LIST_H
-

threadutil/inc/LinkedList.h

@@ -1,33 +1,33 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef LINKED_LIST_H
 #define LINKED_LIST_H
@@ -70,9 +70,9 @@ typedef int (*cmp_routine)(void *itemA,void *itemB);
  *****************************************************************************/
 typedef struct LISTNODE
 {
-  struct LISTNODE *prev;
+  struct LISTNODE *prev; //previous node
-  struct LISTNODE *next;
+  struct LISTNODE *next; //next node
-  void *item;
+  void *item; //item
 } ListNode;
 
 /****************************************************************************
@@ -96,12 +96,12 @@ typedef struct LISTNODE
  *****************************************************************************/
 typedef struct LINKEDLIST
 {
-  ListNode head; /* head, first item is stored at: head->next */
+  ListNode head; //head, first item is stored at: head->next
-  ListNode tail; /* tail, last item is stored at: tail->prev  */
+  ListNode tail; //tail, last item is stored at: tail->prev
-  long size;     /* size of list */
+  long size;      //size of list
-  FreeList freeNodeList;   /* free list to use */
+  FreeList freeNodeList; //free list to use
-  free_function free_func; /* free function to use */
+  free_function free_func; //free function to use
-  cmp_routine cmp_func;    /* compare function to use */
+  cmp_routine cmp_func; //compare function to use
 } LinkedList;
 
 /****************************************************************************
@@ -327,5 +327,4 @@ int ListSize(LinkedList* list);
 }
 #endif
 
-#endif /* LINKED_LIST_H */
+#endif //LINKED_LIST_H
-

threadutil/inc/ThreadPool.h

@@ -1,33 +1,33 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef THREADPOOL_H
 #define THREADPOOL_H
@@ -36,17 +36,17 @@
 extern "C" {
 #endif
 
-/* Size of job free list */
+//Size of job free list
 #define JOBFREELISTSIZE 100
 
 #define INFINITE_THREADS -1
 
 #define EMAXTHREADS (-8 & 1<<29)
 
-/* Invalid Policy */
+//Invalid Policy
 #define INVALID_POLICY (-9 & 1<<29)
 
-/* Invalid JOB Id */
+//Invalid JOB Id
 #define INVALID_JOB_ID (-2 & 1<<29)
 
 typedef enum duration {SHORT_TERM,PERSISTENT} Duration;
@@ -55,31 +55,39 @@ typedef enum priority {LOW_PRIORITY,
 		       MED_PRIORITY,
 		       HIGH_PRIORITY} ThreadPriority;
 
-#define DEFAULT_PRIORITY MED_PRIORITY /* default priority used by TPJobInit */
+#define DEFAULT_PRIORITY MED_PRIORITY //default priority used by TPJobInit
-#define DEFAULT_MIN_THREADS 1	      /* default minimum used by TPAttrInit */
+#define DEFAULT_MIN_THREADS 1	      //default minimum used by TPAttrInit
-#define DEFAULT_MAX_THREADS 10	      /* default max used by TPAttrInit	*/
+#define DEFAULT_MAX_THREADS 10	      //default max used by TPAttrInit	
-#define DEFAULT_JOBS_PER_THREAD 10    /* default jobs per thread used by TPAttrInit */
+#define DEFAULT_JOBS_PER_THREAD 10    //default jobs per thread used by TPAttrInit
-#define DEFAULT_STARVATION_TIME	500   /* default starvation time used by TPAttrInit */
+#define DEFAULT_STARVATION_TIME	500   //default starvation time used by TPAttrInit
-#define DEFAULT_IDLE_TIME 10 * 1000   /* default idle time used by TPAttrInit */
+#define DEFAULT_IDLE_TIME 10 * 1000   //default idle time used by TPAttrInit
-#define DEFAULT_FREE_ROUTINE NULL     /* default free routine used TPJobInit */
+#define DEFAULT_FREE_ROUTINE NULL     //default free routine used TPJobInit 
-#define DEFAULT_MAX_JOBS_TOTAL 100    /* default max jobs used TPAttrInit */
 
-#define STATS 1 /* always include stats because code change is minimal */
+#define STATS 1 //always include stats because code change is minimal
 
 
-/* Statistics */
+//Statistics 
-#ifdef WIN32 /* TODO: check why STATSONLY fails during compilation */
+#ifdef WIN32 // todo: check why STATSONLY fails during compilation
-	#undef STATS
+ #undef STATS
 #endif
 
 #ifdef STATS
-	#define STATSONLY(x) x
+#define STATSONLY(x) x
 #else
-	#define STATSONLY(x)
+#define STATSONLY(x)
 #endif
 
 #ifdef _DEBUG
-	#define DEBUG 1
+#define DEBUG 1
+#endif
+
+//DEBUGGING
+#ifndef WIN32
+ #ifdef DEBUG
+ #define DBGONLY(x) x
+ #else
+ #define DBGONLY(x)
+ #endif
 #endif
 
 #include "LinkedList.h"
@@ -92,7 +100,7 @@ typedef enum priority {LOW_PRIORITY,
 #define EXPORT 
 typedef int PolicyType;
 #define DEFAULT_POLICY SCHED_OTHER
-#define DEFAULT_SCHED_PARAM 0 /* default priority */
+#define DEFAULT_SCHED_PARAM 0 //default priority
 
 /****************************************************************************
  * Name: free_routine
@@ -111,25 +119,23 @@ typedef void (*free_routine)(void *arg);
  *****************************************************************************/
 typedef struct THREADPOOLATTR
 {
-  int minThreads;     /* minThreads, ThreadPool will always maintain at least
+  int minThreads; //minThreads, ThreadPool will always maintain at least
-                         this many threads */
+                  //this many threads
   
-  int maxThreads;     /* maxThreads, ThreadPool will never have more than this
+  int maxThreads; //maxThreads, ThreadPool will never have more than this
-                         number of threads */
+                  //number of threads
   
-  int maxIdleTime;    /* maxIdleTime (in milliseconds)
+  int maxIdleTime;   //maxIdleTime (in milliseconds) 
-                         this is the maximum time a thread will remain idle
+                     // this is the maximum time a thread will remain idle
-                         before dying */
+                     // before dying
 
-  int jobsPerThread;  /* jobs per thread to maintain */
+  int jobsPerThread; //jobs per thread to maintain
 					  
-  int maxJobsTotal;   /* maximum number of jobs that can be queued totally. */
+  int starvationTime;   //the time a low priority or med priority
+	                    //job waits before getting bumped
+                        //up a priority (in milliseconds)
   
-  int starvationTime; /* the time a low priority or med priority
+  PolicyType schedPolicy; //scheduling policy to use
-	                 job waits before getting bumped
-                         up a priority (in milliseconds) */
-
-  PolicyType schedPolicy; /* scheduling policy to use */
 
 } ThreadPoolAttr;
 
@@ -141,12 +147,12 @@ typedef struct THREADPOOLATTR
  *****************************************************************************/
 typedef struct THREADPOOLJOB
 {
-  start_routine func;
+  start_routine func; //function
-  void *arg;
+  void *arg;          //arg
-  free_routine free_func;
+  free_routine free_func; //free function
-  struct timeb requestTime;
+  struct timeb requestTime; //time of request
-  int priority;
+  int priority;       //priority of request
-  int jobId;
+  int jobId;         //id 
 } ThreadPoolJob;
 
 /****************************************************************************
@@ -156,32 +162,32 @@ typedef struct THREADPOOLJOB
  *     Structure to hold statistics
  *****************************************************************************/
 
-#ifdef STATS
+STATSONLY(
 
 typedef struct TPOOLSTATS
 {
-  double totalTimeHQ;
+  double totalTimeHQ; //total time spent by all jobs in high priority Q
-  int totalJobsHQ;
+  int totalJobsHQ;    //total jobs in HQ run so far
-  double avgWaitHQ;
+  double avgWaitHQ;   //average wait in HQ 
-  double totalTimeMQ;
+  double totalTimeMQ; //total time spent by all jobs in med priority Q
-  int totalJobsMQ;
+  int totalJobsMQ;    //total jobs in MQ run so far
-  double avgWaitMQ;
+  double avgWaitMQ;   //average wait in MQ
-  double totalTimeLQ;
+  double totalTimeLQ; //total time spent by all jobs in low priority Q
-  int totalJobsLQ;
+  int totalJobsLQ;    //total jobs in LQ run so far
-  double avgWaitLQ;
+  double avgWaitLQ;	//average wait in LQ	
-  double totalWorkTime;
+  double totalWorkTime; //total time spent working for all threads
-  double totalIdleTime;
+  double totalIdleTime; //total time spent idle for all threads
-  int workerThreads;
+  int workerThreads; //number of current workerThreads
-  int idleThreads;
+  int idleThreads;   //number of current idle threads
-  int persistentThreads;
+  int persistentThreads; //number of persistent threads
-  int totalThreads;
+  int totalThreads; //total number of current threads
-  int maxThreads;
+  int maxThreads; //max threads so far	
-  int currentJobsHQ;
+  int currentJobsHQ; // current jobs in Q
-  int currentJobsLQ;
+  int currentJobsLQ; //current jobs in Q
-  int currentJobsMQ;
+  int currentJobsMQ; //current jobs in Q
 }ThreadPoolStats;
 
-#endif
+)
 
 
 /****************************************************************************
@@ -206,26 +212,24 @@ typedef struct TPOOLSTATS
 
 typedef struct THREADPOOL
 {
-  ithread_mutex_t mutex; /* mutex to protect job qs */
+  ithread_mutex_t mutex; //mutex to protect job qs
-  ithread_cond_t condition; /* condition variable to signal Q */
+  ithread_cond_t condition; //condition variable to signal Q
-  ithread_cond_t start_and_shutdown; /* condition variable for start 
+  ithread_cond_t start_and_shutdown; //condition variable for start 
-                                        and stop */
+                                     //and stop     
-  int lastJobId; /* ids for jobs */
+  int lastJobId; //ids for jobs 
-  int shutdown;  /* whether or not we are shutting down */
+  int shutdown;   //whether or not we are shutting down
-  int totalThreads;      /* total number of threads */
+  int totalThreads;       //total number of threads	
-  int persistentThreads; /* number of persistent threads */
+  int persistentThreads; //number of persistent threads
-  FreeList jobFreeList;  /* free list of jobs */
+  FreeList jobFreeList; //free list of jobs
-  LinkedList lowJobQ;    /* low priority job Q */
+  LinkedList lowJobQ;    //low priority job Q
-  LinkedList medJobQ;    /* med priority job Q */
+  LinkedList medJobQ;    //med priority job Q
-  LinkedList highJobQ;   /* high priority job Q */
+  LinkedList highJobQ;   //high priority job Q
-  ThreadPoolJob *persistentJob; /* persistent job */
+  ThreadPoolJob *persistentJob; //persistent job
  
-  ThreadPoolAttr attr; /* thread pool attributes */
+  ThreadPoolAttr attr; //thread pool attributes
   
-#ifdef STATS
+  //statistics 
-  /* statistics */
+  STATSONLY(ThreadPoolStats stats;)
-  ThreadPoolStats stats;
-#endif
  
 } ThreadPool;
 
@@ -517,19 +521,6 @@ int TPAttrSetStarvationTime(ThreadPoolAttr *attr, int starvationTime);
 int TPAttrSetSchedPolicy(ThreadPoolAttr *attr, PolicyType schedPolicy);
 
 
-/****************************************************************************
- * Function: TPAttrSetMaxJobsTotal
- *
- *  Description:
- *      Sets the maximum number jobs that can be qeued totally.
- *  Parameters:
- *      attr - must be valid thread pool attributes.
- *      maxJobsTotal - maximum number of jobs
- *  Returns:
- *      Always returns 0.
- *****************************************************************************/
-int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
-
 /****************************************************************************
  * Function: ThreadPoolGetStats
  *
@@ -543,19 +534,12 @@ int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
  *  Returns:
  *      Always returns 0.
  *****************************************************************************/
-#ifdef STATS
+STATSONLY( EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats););
-	EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
 
-	EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats);
+STATSONLY(EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats););
-#else
-	static UPNP_INLINE int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats) {}
-
-	static UPNP_INLINE void ThreadPoolPrintStats(ThreadPoolStats *stats) {}
-#endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ThreadPool */
+#endif //ThreadPool
-

threadutil/inc/TimerThread.h

@@ -1,33 +1,33 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef TIMERTHREAD_H
 #define TIMERTHREAD_H
@@ -43,9 +43,9 @@ extern "C" {
 
 #define INVALID_EVENT_ID (-10 & 1<<29)
 
-/* Timeout Types */
+//Timeout Types
-/* absolute means in seconds from Jan 1, 1970 */
+//absolute means in seconds from Jan 1, 1970
-/* relative means in seconds from current time */
+//relative means in seconds from current time
 typedef enum timeoutType {ABS_SEC,REL_SEC} TimeoutType;
 
 
@@ -63,13 +63,13 @@ typedef enum timeoutType {ABS_SEC,REL_SEC} TimeoutType;
  *****************************************************************************/
 typedef struct TIMERTHREAD
 {
-  ithread_mutex_t mutex;
+  ithread_mutex_t mutex; //mutex to protect eventQ
-  ithread_cond_t condition;
+  ithread_cond_t condition; //condition variable
-  int lastEventId;
+  int lastEventId;	//last event id
-  LinkedList eventQ;
+  LinkedList eventQ; //event q
-  int shutdown;
+  int shutdown;      //whether or not we are shutdown  
-  FreeList freeEvents;
+  FreeList freeEvents; //FreeList for events
-  ThreadPool *tp;
+  ThreadPool *tp;	 //ThreadPool to use
 } TimerThread;
 
 
@@ -85,9 +85,9 @@ typedef struct TIMERTHREAD
 typedef struct TIMEREVENT
 {
   ThreadPoolJob job;
-  time_t eventTime; /* absolute time for event in seconds since Jan 1, 1970 */
+  time_t eventTime; //absolute time for event in seconds since Jan 1, 1970
-  Duration persistent;  /* long term or short term job */
+  Duration persistent;          //long term or short term job
-  int id;
+  int id;                //id of job
 } TimerEvent;
 
 
@@ -188,5 +188,4 @@ int TimerThreadShutdown(TimerThread *timer);
 }
 #endif
 
-#endif /* TIMER_THREAD_H */
+#endif //TIMER_THREAD_H
-

threadutil/inc/iasnprintf.h

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

threadutil/inc/ithread.h

@@ -1,33 +1,33 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef ITHREADH
 #define ITHREADH
@@ -36,164 +36,129 @@ extern "C" {
 #endif
 
 
+#ifdef DEBUG
+#define DEBUG_ONLY(x) x
+#else
+#define DEBUG_ONLY(x)
+#endif
+
 #include <pthread.h>
 #ifndef WIN32
-	#include <unistd.h>
+ #include <unistd.h>
 #endif
 
-#ifdef __FreeBSD__
+#define ITHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_FAST_NP
-	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#define ITHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE_NP
-#endif
+#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK_NP
-
-#ifdef PTHREAD_MUTEX_RECURSIVE
-	/* This system has SuS2-compliant mutex attributes.
-	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
-	 */
-	#define ITHREAD_MUTEX_FAST_NP       PTHREAD_MUTEX_NORMAL
-	#define ITHREAD_MUTEX_RECURSIVE_NP  PTHREAD_MUTEX_RECURSIVE
-	#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK
-#else /* PTHREAD_MUTEX_RECURSIVE */
-	#define ITHREAD_MUTEX_FAST_NP       PTHREAD_MUTEX_FAST_NP
-	#define ITHREAD_MUTEX_RECURSIVE_NP  PTHREAD_MUTEX_RECURSIVE_NP
-	#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK_NP
-#endif /* PTHREAD_MUTEX_RECURSIVE */
-
-
-#define ITHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE
-#define ITHREAD_PROCESS_SHARED  PTHREAD_PROCESS_SHARED
-
-
 #define ITHREAD_CANCELED PTHREAD_CANCELED
   
   
-/***************************************************************************
+  /***************************************************************************
- * Name: ithread_t
+   * Name: ithread_t
- *
+   *
- *  Description:
+   *  Description:
- *      Thread handle.
+   *      Thread handle.
- *      typedef to pthread_t.
+   *      typedef to pthread_t.
- *      Internal Use Only.
+   *      Internal Use Only.
- ***************************************************************************/
+   ***************************************************************************/
-typedef pthread_t ithread_t; 
+  typedef pthread_t ithread_t; 
   
-/****************************************************************************
+  /****************************************************************************
- * Name: ithread_attr_t
+   * Name: ithread_attr_t
- *
+   *
- *  Description:
+   *  Description:
- *      Thread attribute.
+   *      Thread attribute.
- *      typedef to pthread_attr_t
+   *      typedef to pthread_attr_t
- *      Internal Use Only
+   *      Internal Use Only
- ***************************************************************************/
+   ***************************************************************************/
-typedef pthread_attr_t ithread_attr_t;	
+  typedef pthread_attr_t ithread_attr_t;	
 
 
-/****************************************************************************
+  /****************************************************************************
- * Name: start_routine
+   * Name: start_routine
- *
+   *
- *  Description:
+   *  Description:
- *      Thread start routine 
+   *      Thread start routine 
- *      Internal Use Only.
+   *      Internal Use Only.
- ***************************************************************************/
+   ***************************************************************************/
-typedef void * (*start_routine) (void *arg);
+  typedef void * (*start_routine) (void *arg);
 
   
-/****************************************************************************
+  /****************************************************************************
- * Name: ithread_cond_t
+   * Name: ithread_cond_t
- *
+   *
- *  Description:
+   *  Description:
- *      condition variable.
+   *      condition variable.
- *      typedef to pthread_cond_t
+   *      typedef to pthread_cond_t
- *      Internal Use Only.
+   *      Internal Use Only.
- ***************************************************************************/
+   ***************************************************************************/
-typedef pthread_cond_t ithread_cond_t;
+  typedef pthread_cond_t ithread_cond_t;
 
 
-/****************************************************************************
+  /****************************************************************************
- * Name: ithread_mutexattr_t
+   * Name: ithread_mutexattr_t
- *
+   *
- *  Description:
+   *  Description:
- *      Mutex attribute.
+   *      Mutex attribute.
- *      typedef to pthread_mutexattr_t
+   *      typedef to pthread_mutexattr_t
- *      Internal Use Only
+   *      Internal Use Only
- ***************************************************************************/
+   ***************************************************************************/
-typedef pthread_mutexattr_t ithread_mutexattr_t;	
+  typedef pthread_mutexattr_t ithread_mutexattr_t;	
 
 
-/****************************************************************************
+  /****************************************************************************
- * Name: ithread_mutex_t
+   * Name: ithread_mutex_t
- *
+   *
- *  Description:
+   *  Description:
- *      Mutex.
+   *      Mutex.
- *      typedef to pthread_mutex_t
+   *      typedef to pthread_mutex_t
- *      Internal Use Only.
+   *      Internal Use Only.
- ***************************************************************************/
+   ***************************************************************************/
-typedef pthread_mutex_t ithread_mutex_t;
+  typedef pthread_mutex_t ithread_mutex_t;
 
 
-/****************************************************************************
+  /****************************************************************************
- * Name: ithread_condattr_t
+   * Name: ithread_condattr_t
- *
+   *
- *  Description:
+   *  Description:
- *      Condition attribute.
+   *      Condition attribute.
- *      typedef to pthread_condattr_t
+   *      typedef to pthread_condattr_t
- *      NOT USED
+   *      NOT USED
- *      Internal Use Only
+   *      Internal Use Only
- ***************************************************************************/
+   ***************************************************************************/
-typedef pthread_condattr_t ithread_condattr_t;	
+  typedef pthread_condattr_t ithread_condattr_t;	
 
+  /****************************************************************************
+   * Function: ithread_mutexattr_init
+   *
+   *  Description:
+   *      Initializes a mutex attribute variable.
+   *      Used to set the type of the mutex.
+   *  Parameters:
+   *      ithread_mutexattr_init * attr (must be valid non NULL pointer to 
+   *                                     pthread_mutexattr_t)
+   *  Returns:
+   *      0 on success, Nonzero on failure.
+   *      Always returns 0.
+   *      See man page for pthread_mutexattr_init
+   ***************************************************************************/
   
-/****************************************************************************
- * Name: ithread_rwlockattr_t
- *
- *  Description:
- *      Mutex attribute.
- *      typedef to pthread_rwlockattr_t
- *      Internal Use Only
- ***************************************************************************/
-typedef pthread_rwlockattr_t ithread_rwlockattr_t;	
-
-
-/****************************************************************************
- * Name: ithread_rwlock_t
- *
- *  Description:
- *      Condition attribute.
- *      typedef to pthread_rwlock_t
- *      Internal Use Only
- ***************************************************************************/
-typedef pthread_rwlock_t ithread_rwlock_t;	
-
-/****************************************************************************
- * Function: ithread_mutexattr_init
- *
- *  Description:
- *      Initializes a mutex attribute variable.
- *      Used to set the type of the mutex.
- *  Parameters:
- *      ithread_mutexattr_init * attr (must be valid non NULL pointer to 
- *                                     pthread_mutexattr_t)
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_mutexattr_init
- ***************************************************************************/
 #define ithread_mutexattr_init pthread_mutexattr_init
   
-
+  /****************************************************************************
-/****************************************************************************
+   * Function: ithread_mutexattr_destroy
- * Function: ithread_mutexattr_destroy
+   *
- *
+   *  Description:
- *  Description:
+   *      Releases any resources held by the mutex attribute.
- *      Releases any resources held by the mutex attribute.
+   *      Currently there are no resources associated with the attribute
- *      Currently there are no resources associated with the attribute
+   *  Parameters:
- *  Parameters:
+   *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
- *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
+   *                                  pthread_mutexattr_t)
- *                                  pthread_mutexattr_t)
+   *  Returns:
- *  Returns:
+   *      0 on success, Nonzero on failure.
- *      0 on success, Nonzero on failure.
+   *      Always returns 0.
- *      Always returns 0.
+   *      See man page for pthread_mutexattr_destroy
- *      See man page for pthread_mutexattr_destroy
+   ***************************************************************************/
- ***************************************************************************/
 #define ithread_mutexattr_destroy pthread_mutexattr_destroy
   
   
@@ -207,7 +172,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *                       ITHREAD_MUTEX_ERRORCHECK_NP
  *
  *  Parameters:
- *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
+ *      ithread_mutexattr_t * mutex (must be valid non NULL pointer to 
  *                                   ithread_mutexattr_t)
  *      int kind (one of ITHREAD_MUTEX_FAST_NP or ITHREAD_MUTEX_RECURSIVE_NP
  *                or ITHREAD_MUTEX_ERRORCHECK_NP)
@@ -216,11 +181,8 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Returns EINVAL if the kind is not supported.
  *      See man page for pthread_mutexattr_setkind_np
  *****************************************************************************/
-#ifdef PTHREAD_MUTEX_RECURSIVE
+#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
+
-#else
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
-#endif
 
 /****************************************************************************
  * Function: ithread_mutexattr_getkind_np
@@ -232,7 +194,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *                       ITHREAD_MUTEX_ERRORCHECK_NP
  *
  *  Parameters:
- *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
+ *      ithread_mutexattr_t * mutex (must be valid non NULL pointer to 
  *                                   pthread_mutexattr_t)
  *      int *kind (one of ITHREAD_MUTEX_FAST_NP or ITHREAD_MUTEX_RECURSIVE_NP
  *                or ITHREAD_MUTEX_ERRORCHECK_NP)
@@ -241,11 +203,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      Always returns 0.
  *      See man page for pthread_mutexattr_getkind_np
  *****************************************************************************/
-#ifdef PTHREAD_MUTEX_RECURSIVE
+#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
-#else
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
-#endif
 
   
 /****************************************************************************
@@ -265,7 +223,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *****************************************************************************/
 #define ithread_mutex_init pthread_mutex_init
   
-
 /****************************************************************************
  * Function: ithread_mutex_lock
  *
@@ -320,169 +277,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
 #define ithread_mutex_destroy pthread_mutex_destroy
 
   
-/****************************************************************************
- * Function: ithread_rwlockattr_init
- *
- *  Description:
- *      Initializes a rwlock attribute variable to default values.
- *  Parameters:
- *      const ithread_rwlockattr_init *attr (must be valid non NULL pointer to 
- *                                           pthread_rwlockattr_t)
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlockattr_init
- ***************************************************************************/
-#define ithread_rwlockattr_init pthread_rwlockattr_init
-
-
-/****************************************************************************
- * Function: ithread_rwlockattr_destroy
- *
- *  Description:
- *      Releases any resources held by the rwlock attribute.
- *  Parameters:
- *      ithread_rwlockattr_t *attr (must be valid non NULL pointer to 
- *                                  pthread_rwlockattr_t)
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlockattr_destroy
- ***************************************************************************/
-#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
-  
-  
-/****************************************************************************
- * Function: ithread_rwlockatttr_setpshared
- *
- *  Description:
- *      Sets the rwlock type in the attribute.
- *      Valid types are: ITHREAD_PROCESS_PRIVATE 
- *                       ITHREAD_PROCESS_SHARED
- *
- *  Parameters:
- *      ithread_rwlockattr_t * attr (must be valid non NULL pointer to 
- *                                   ithread_rwlockattr_t)
- *      int kind (one of ITHREAD_PROCESS_PRIVATE or ITHREAD_PROCESS_SHARED)
- *
- *  Returns:
- *      0 on success. Nonzero on failure.
- *      Returns EINVAL if the kind is not supported.
- *      See man page for pthread_rwlockattr_setkind_np
- *****************************************************************************/
-#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared
-
-
-/****************************************************************************
- * Function: ithread_rwlockatttr_getpshared
- *
- *  Description:
- *      Gets the rwlock type in the attribute.
- *      Valid types are: ITHREAD_PROCESS_PRIVATE 
- *                       ITHREAD_PROCESS_SHARED 
- *
- *  Parameters:
- *      ithread_rwlockattr_t * attr (must be valid non NULL pointer to 
- *                                   pthread_rwlockattr_t)
- *      int *kind (one of ITHREAD_PROCESS_PRIVATE or ITHREAD_PROCESS_SHARED)
- *
- *  Returns:
- *      0 on success. Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlockatttr_getpshared
- *****************************************************************************/
-#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared
-
-  
-/****************************************************************************
- * Function: ithread_rwlock_init
- *
- *  Description:
- *      Initializes rwlock.
- *      Must be called before use.
- *      
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      const ithread_rwlockattr_t * rwlock_attr 
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_init
- *****************************************************************************/
-#define ithread_rwlock_init pthread_rwlock_init
-
-
-/****************************************************************************
- * Function: ithread_rwlock_rdlock
- *
- *  Description:
- *      Locks rwlock for reading.
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *      
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_rdlock
- *****************************************************************************/
-#define ithread_rwlock_rdlock pthread_rwlock_rdlock
-
-
-/****************************************************************************
- * Function: ithread_rwlock_wrlock
- *
- *  Description:
- *      Locks rwlock for writting.
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *      
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_wrlock
- *****************************************************************************/
-#define ithread_rwlock_wrlock pthread_rwlock_wrlock
-
-
-/****************************************************************************
- * Function: ithread_rwlock_unlock
- *
- *  Description:
- *      Unlocks rwlock.
- *
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *      
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_unlock
- *****************************************************************************/
-#define ithread_rwlock_unlock pthread_rwlock_unlock
-
-
-/****************************************************************************
- * Function: ithread_rwlock_destroy
- *
- *  Description:
- *      Releases any resources held by the rwlock. 
- *		rwlock can no longer be used after this call.
- *		rwlock is only destroyed when there are no longer any threads waiting on it. 
- *		rwlock cannot be destroyed if it is locked.
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *  Returns:
- *      0 on success. Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_destroy
- *****************************************************************************/
-#define ithread_rwlock_destroy pthread_rwlock_destroy
-
-
 /****************************************************************************
  * Function: ithread_cond_init
  *
@@ -733,29 +527,26 @@ typedef pthread_rwlock_t ithread_rwlock_t;
 #define imillisleep(x) usleep(1000*x)
 
 #ifdef WIN32
-	#ifndef UPNP_STATIC_LIB
+ #ifndef UPNP_STATIC_LIB
-		#ifdef LIBUPNP_EXPORTS
+  #ifdef LIBUPNP_EXPORTS
-			/* set up declspec for dll export to make functions visible to library users */
+   // set up declspec for dll export to make functions visible to library users
-			#define EXPORT_SPEC __declspec(dllexport)
+   #define EXPORT_SPEC __declspec(dllexport)
-		#else
+  #else
-			#define EXPORT_SPEC __declspec(dllimport)
+   #define EXPORT_SPEC __declspec(dllimport)
-		#endif
+  #endif
-	#else
+ #else
-		#define EXPORT_SPEC
+  #define EXPORT_SPEC
-	#endif
+ #endif
 #else
-	#define EXPORT_SPEC
+ #define EXPORT_SPEC
 #endif
 
 
-#ifndef PTHREAD_MUTEX_RECURSIVE
+//NK: Added for satisfying the gcc compiler  
-/* NK: Added for satisfying the gcc compiler */
 EXPORT_SPEC int pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind);
-#endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ITHREADH */
+#endif //ITHREADH
-

threadutil/src/LinkedList.c

@@ -30,8 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include "LinkedList.h"
-#include <sys/param.h>
+#ifdef __FreeBSD__
-#if (defined(BSD) && BSD >= 199306) || defined(__OSX__)
 #include <stdlib.h>
 #else
 #include <malloc.h>

threadutil/src/ThreadPool.c

@@ -34,7 +34,9 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#ifdef STATS
 #include <stdio.h>
+#endif
 
 /****************************************************************************
  * Function: CmpThreadPoolJob
@@ -90,23 +92,15 @@ FreeThreadPoolJob( ThreadPool * tp,
 static int
 SetPolicyType( PolicyType in )
 {
-#ifdef __CYGWIN__
+    #ifdef WIN32
-    /* TODO not currently working... */
-    return 0;
-#elif defined(__OSX__)
-    setpriority(PRIO_PROCESS, 0, 0);
-    return 0;
-#elif defined(WIN32)
      return sched_setscheduler( 0, in);
-#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
+    #else
      struct sched_param current;
 
      sched_getparam( 0, &current );
      current.sched_priority = DEFAULT_SCHED_PARAM;
      return sched_setscheduler( 0, in, &current );
-#else
+    #endif
-     return 0;
-#endif
 }
 
 /****************************************************************************
@@ -126,7 +120,7 @@ SetPolicyType( PolicyType in )
 static int
 SetPriority( ThreadPriority priority )
 {
-#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
+
     int currentPolicy;
     int minPriority = 0;
     int maxPriority = 0;
@@ -134,7 +128,7 @@ SetPriority( ThreadPriority priority )
     int midPriority = 0;
     struct sched_param newPriority;
 
-    pthread_getschedparam( ithread_self(), &currentPolicy,
+    pthread_getschedparam( ithread_self(  ), &currentPolicy,
                            &newPriority );
     minPriority = sched_get_priority_min( currentPolicy );
     maxPriority = sched_get_priority_max( currentPolicy );
@@ -156,11 +150,9 @@ SetPriority( ThreadPriority priority )
 
     newPriority.sched_priority = actPriority;
 
-    return pthread_setschedparam( ithread_self(), currentPolicy,
+    return pthread_setschedparam( ithread_self(  ), currentPolicy,
                                   &newPriority );
-#else
+
-    return 0;
-#endif
 }
 
 /****************************************************************************
@@ -225,8 +217,10 @@ BumpPriority( ThreadPool * tp )
                 //starvation time
                 //bump priority (add to higher priority Q)
 
-                STATSONLY( tp->stats.totalJobsMQ++; )
+                STATSONLY( tp->stats.totalJobsMQ++;
-                STATSONLY( tp->stats.totalTimeMQ += diffTime; )
+                     );
+                STATSONLY( tp->stats.totalTimeMQ += diffTime;
+                     );
 
                 ListDelNode( &tp->medJobQ, tp->medJobQ.head.next, 0 );
                 ListAddTail( &tp->highJobQ, tempJob );
@@ -244,8 +238,10 @@ BumpPriority( ThreadPool * tp )
                 //starvation time
                 //bump priority (add to higher priority Q)
 
-                STATSONLY( tp->stats.totalJobsLQ++; )
+                STATSONLY( tp->stats.totalJobsLQ++;
-                STATSONLY( tp->stats.totalTimeLQ += diffTime; )
+                     );
+                STATSONLY( tp->stats.totalTimeLQ += diffTime;
+                     );
 
                 ListDelNode( &tp->lowJobQ, tp->lowJobQ.head.next, 0 );
                 ListAddTail( &tp->medJobQ, tempJob );
@@ -294,26 +290,14 @@ SetRelTimeout( struct timespec *time,
  *      ThreadPoolStats *stats must be valid non null stats structure
  *****************************************************************************/
 #ifdef STATS
-static void StatsInit( ThreadPoolStats * stats )
+static void StatsInit( ThreadPoolStats * stats ) {
-{
+           assert( stats != NULL ); stats->totalIdleTime = 0; stats->totalJobsHQ = 0; stats->totalJobsLQ = 0; stats->totalJobsMQ = 0; stats->totalTimeHQ = 0; stats->totalTimeMQ = 0; stats->totalTimeLQ = 0; stats->totalWorkTime = 0; stats->totalIdleTime = 0; stats->avgWaitHQ = 0; //average wait in HQ
-           assert( stats != NULL );
+           stats->avgWaitMQ = 0;    //average wait in MQ
-	   stats->totalIdleTime = 0;
-	   stats->totalJobsHQ = 0;
-	   stats->totalJobsLQ = 0;
-	   stats->totalJobsMQ = 0;
-	   stats->totalTimeHQ = 0;
-	   stats->totalTimeMQ = 0;
-	   stats->totalTimeLQ = 0;
-	   stats->totalWorkTime = 0;
-	   stats->totalIdleTime = 0;
-	   stats->avgWaitHQ = 0;
-           stats->avgWaitMQ = 0;
            stats->avgWaitLQ = 0;
            stats->workerThreads = 0;
            stats->idleThreads = 0;
            stats->persistentThreads = 0;
-           stats->maxThreads = 0; stats->totalThreads = 0;
+           stats->maxThreads = 0; stats->totalThreads = 0;}
-}
 #endif
 
 /****************************************************************************
@@ -359,25 +343,18 @@ tp->stats.totalJobsLQ++; tp->stats.totalTimeLQ += diff; break; default:
  *  Parameters:
  *      
  *****************************************************************************/
-static void SetSeed() {
+    static void SetSeed(  ) {
-	struct timeb t;
+    struct timeb t;
 
-	ftime( &t );
+    ftime( &t );
 #if defined(WIN32)
-	srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id().p );
+    srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id(  ).p );
-#elif defined(__FreeBSD__) || defined(__OSX__)
+#elif defined(__FreeBSD__)
-	srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id() );
+    srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id(  ) );
-#elif defined(__linux__)
-	srand( ( unsigned int )t.millitm + ithread_get_current_thread_id() );
 #else
-	{
+    srand( ( unsigned int )t.millitm + ithread_get_current_thread_id(  ) );
-		volatile union { volatile pthread_t tid; volatile unsigned i; } idu;
-
-		idu.tid = ithread_get_current_thread_id();
-		srand( ( unsigned int )t.millitm + idu.i );
-	}
 #endif
-}
+    }
 
 /****************************************************************************
  * Function: WorkerThread
@@ -395,7 +372,8 @@ static void SetSeed() {
  *****************************************************************************/
     static void *WorkerThread( void *arg ) {
 
-        STATSONLY( time_t start = 0; )
+        STATSONLY( time_t start = 0;
+             )
 
         ThreadPoolJob *job = NULL;
         ListNode *head = NULL;
@@ -419,9 +397,10 @@ static void SetSeed() {
         ithread_cond_broadcast( &tp->start_and_shutdown );
         ithread_mutex_unlock( &tp->mutex );
 
-        SetSeed();
+        SetSeed(  );
 
-        STATSONLY( time( &start ); )
+        STATSONLY( time( &start );
+             );
 
         while( 1 ) {
 
@@ -436,9 +415,12 @@ static void SetSeed() {
 
             retCode = 0;
 
-            STATSONLY( tp->stats.idleThreads++; )
+            STATSONLY( tp->stats.idleThreads++;
-            STATSONLY( tp->stats.totalWorkTime += ( time( NULL ) - start ); ) //work time
+                 );
-            STATSONLY( time( &start ); )  // idle time
+            STATSONLY( tp->stats.totalWorkTime += ( time( NULL ) - start );
+                 );             //work time
+            STATSONLY( time( &start );
+                 );             //idle time
 
             if( persistent == 1 ) {
                 //Persistent thread
@@ -446,7 +428,8 @@ static void SetSeed() {
                 tp->persistentThreads--;
             }
 
-            STATSONLY( if( persistent == 0 ) tp->stats.workerThreads--; )
+            STATSONLY( if( persistent == 0 )
+                       tp->stats.workerThreads--; );
 
             //Check for a job or shutdown
             while( ( tp->lowJobQ.size == 0 )
@@ -467,7 +450,7 @@ static void SetSeed() {
                          && ( ( tp->totalThreads ) >
                               tp->attr.maxThreads ) ) ) {
 
-                    STATSONLY( tp->stats.idleThreads--; )
+                    STATSONLY( tp->stats.idleThreads-- );
 
                     tp->totalThreads--;
                     ithread_cond_broadcast( &tp->start_and_shutdown );
@@ -489,9 +472,12 @@ static void SetSeed() {
 
             }
 
-            STATSONLY( tp->stats.idleThreads--; )
+            STATSONLY( tp->stats.idleThreads--;
-            STATSONLY( tp->stats.totalIdleTime += ( time( NULL ) - start ); )  // idle time
+                 );
-            STATSONLY( time( &start ); ) // work time
+            STATSONLY( tp->stats.totalIdleTime += ( time( NULL ) - start );
+                 );             //idle time
+            STATSONLY( time( &start );
+                 );             //work time
 
             //bump priority of starved jobs
             BumpPriority( tp );
@@ -523,33 +509,34 @@ static void SetSeed() {
                     ithread_cond_broadcast( &tp->start_and_shutdown );
 
                 } else {
-                    STATSONLY( tp->stats.workerThreads++; )
+                    STATSONLY( tp->stats.workerThreads++ );
                     persistent = 0;
 
                     //Pick the highest priority job
                     if( tp->highJobQ.size > 0 ) {
                         head = ListHead( &tp->highJobQ );
                         job = ( ThreadPoolJob * ) head->item;
-                        STATSONLY( CalcWaitTime( tp, HIGH_PRIORITY, job ); )
+                        STATSONLY( CalcWaitTime
+                                   ( tp, HIGH_PRIORITY, job ) );
                         ListDelNode( &tp->highJobQ, head, 0 );
 
                     } else if( tp->medJobQ.size > 0 ) {
                         head = ListHead( &tp->medJobQ );
                         job = ( ThreadPoolJob * ) head->item;
-                        STATSONLY( CalcWaitTime( tp, MED_PRIORITY, job ); )
+                        STATSONLY( CalcWaitTime( tp, MED_PRIORITY, job ) );
                         ListDelNode( &tp->medJobQ, head, 0 );
 
                     } else if( tp->lowJobQ.size > 0 ) {
                         head = ListHead( &tp->lowJobQ );
                         job = ( ThreadPoolJob * ) head->item;
-                        STATSONLY( CalcWaitTime( tp, LOW_PRIORITY, job ); )
+                        STATSONLY( CalcWaitTime( tp, LOW_PRIORITY, job ) );
                         ListDelNode( &tp->lowJobQ, head, 0 );
 
                     } else {
 
                         // Should never get here
                         assert( 0 );
-                        STATSONLY( tp->stats.workerThreads--; )
+                        STATSONLY( tp->stats.workerThreads-- );
                         tp->totalThreads--;
                         ithread_cond_broadcast( &tp->start_and_shutdown );
                         ithread_mutex_unlock( &tp->mutex );
@@ -654,11 +641,9 @@ static void SetSeed() {
 
         }
 
-#ifdef STATS
+        STATSONLY( if( tp->stats.maxThreads < tp->totalThreads ) {
-        if( tp->stats.maxThreads < tp->totalThreads ) {
+                   tp->stats.maxThreads = tp->totalThreads;}
-                   tp->stats.maxThreads = tp->totalThreads;
+         )
-        }
-#endif
 
             return rc;
     }
@@ -686,7 +671,7 @@ static void SetSeed() {
         threads = tp->totalThreads - tp->persistentThreads;
 
         while( ( threads == 0 )
-               || ( ( jobs / threads ) >= tp->attr.jobsPerThread ) ) {
+               || ( ( jobs / threads ) > tp->attr.jobsPerThread ) ) {
 
             if( CreateWorker( tp ) != 0 )
                 return;
@@ -778,7 +763,7 @@ static void SetSeed() {
                                  JOBFREELISTSIZE );
         assert( retCode == 0 );
 
-        STATSONLY( StatsInit( &tp->stats ); )
+        STATSONLY( StatsInit( &tp->stats ) );
 
         retCode += ListInit( &tp->highJobQ, CmpThreadPoolJob, NULL );
         assert( retCode == 0 );
@@ -921,7 +906,6 @@ static void SetSeed() {
         int rc = EOUTOFMEM;
 
         int tempId = -1;
-        int totalJobs;
 
         ThreadPoolJob *temp = NULL;
 
@@ -938,13 +922,6 @@ static void SetSeed() {
                 || ( job->priority == MED_PRIORITY )
                 || ( job->priority == HIGH_PRIORITY ) );
 
-        totalJobs = tp->highJobQ.size + tp->lowJobQ.size + tp->medJobQ.size;
-        if (totalJobs >= tp->attr.maxJobsTotal) {
-            fprintf(stderr, "total jobs = %d, too many jobs", totalJobs);
-            ithread_mutex_unlock( &tp->mutex );
-            return rc;
-        }
-
         if( jobId == NULL )
             jobId = &tempId;
 
@@ -1290,7 +1267,6 @@ static void SetSeed() {
         attr->minThreads = DEFAULT_MIN_THREADS;
         attr->schedPolicy = DEFAULT_POLICY;
         attr->starvationTime = DEFAULT_STARVATION_TIME;
-        attr->maxJobsTotal = DEFAULT_MAX_JOBS_TOTAL;
         return 0;
     }
 
@@ -1511,58 +1487,36 @@ static void SetSeed() {
     }
 
 #ifdef STATS
-void ThreadPoolPrintStats(ThreadPoolStats * stats)
+    void ThreadPoolPrintStats( ThreadPoolStats * stats ) {
-{
+               assert( stats != NULL ); if( stats == NULL ) {
-	assert( stats != NULL );
+               return;}
-	if (stats == NULL) {
-		return;
-	}
 
-#ifdef __FreeBSD__
+	       #ifdef __FreeBSD__
-	printf("ThreadPoolStats at Time: %d\n", time(NULL));
+               printf( "ThreadPoolStats at Time: %d\n", time( NULL ) );
-#else /* __FreeBSD__ */
+	       #else
-	printf("ThreadPoolStats at Time: %ld\n", time(NULL));
+               printf( "ThreadPoolStats at Time: %ld\n", time( NULL ) );
-#endif /* __FreeBSD__ */
+	       #endif
-	printf("High Jobs pending: %d\n", stats->currentJobsHQ);
+               printf
-	printf("Med Jobs Pending: %d\n", stats->currentJobsMQ);
+               ( "Average Wait in High Priority Q in milliseconds: %f\n",
-	printf("Low Jobs Pending: %d\n", stats->currentJobsLQ);
+                 stats->avgWaitHQ );
-	printf("Average Wait in High Priority Q in milliseconds: %f\n", stats->avgWaitHQ);
+               printf
-	printf("Average Wait in Med Priority Q in milliseconds: %f\n", stats->avgWaitMQ);
+               ( "Average Wait in Med Priority Q in milliseconds: %f\n",
-	printf("Averate Wait in Low Priority Q in milliseconds: %f\n", stats->avgWaitLQ);
+                 stats->avgWaitMQ );
-	printf("Max Threads Active: %d\n", stats->maxThreads);
+               printf
-	printf("Current Worker Threads: %d\n", stats->workerThreads);
+               ( "Averate Wait in Low Priority Q in milliseconds: %f\n",
-	printf("Current Persistent Threads: %d\n", stats->persistentThreads);
+                 stats->avgWaitLQ );
-	printf("Current Idle Threads: %d\n", stats->idleThreads);
+               printf( "Max Threads Active: %d\n", stats->maxThreads );
-	printf("Total Threads : %d\n", stats->totalThreads);
+               printf( "Current Worker Threads: %d\n",
-	printf("Total Time spent Working in seconds: %f\n", stats->totalWorkTime);
+                       stats->workerThreads );
-	printf("Total Time spent Idle in seconds : %f\n", stats->totalIdleTime);
+               printf( "Current Persistent Threads: %d\n",
-}
+                       stats->persistentThreads );
-#endif /* STATS */
+               printf( "Current Idle Threads: %d\n", stats->idleThreads );
-
+               printf( "Total Threads : %d\n", stats->totalThreads );
- /****************************************************************************
+               printf( "Total Time spent Working in seconds: %f\n",
- * Function: TPAttrSetMaxJobsTotal
+                       stats->totalWorkTime );
- *
+               printf( "Total Time spent Idle in seconds : %f\n",
- *  Description:
+                       stats->totalIdleTime );}
- *      Sets the maximum number jobs that can be qeued totally.
+#endif
- *  Parameters:
- *      attr - must be valid thread pool attributes.
- *      maxJobsTotal - maximum number of jobs
- *  Returns:
- *      Always returns 0.
- *****************************************************************************/
-int TPAttrSetMaxJobsTotal(
-	ThreadPoolAttr * attr,
-	int  maxJobsTotal )
-{
-	assert( attr != NULL );
-
-	if( attr == NULL ) {
-		return EINVAL;
-	}
-
-	attr->maxJobsTotal = maxJobsTotal;
-	return 0;
-}
 
 /****************************************************************************
  * Function: ThreadPoolGetStats
@@ -1579,54 +1533,40 @@ int TPAttrSetMaxJobsTotal(
  *****************************************************************************/
 #ifdef STATS
 int
-ThreadPoolGetStats(
+                   ThreadPoolGetStats( ThreadPool * tp,
-    ThreadPool *tp,
+                                       ThreadPoolStats * stats ) {
-    ThreadPoolStats *stats)
-{
-	assert(tp != NULL);
-	assert(stats != NULL);
 
-	if (tp == NULL || stats == NULL) {
+                   assert( tp != NULL );
-		return EINVAL;
+                   assert( stats != NULL );
-	}
+                   if( ( tp == NULL ) || ( stats == NULL ) ) {
+                   return EINVAL;}
 
-	//if not shutdown then acquire mutex
+                   //if not shutdown then acquire mutex
-	if (!tp->shutdown) {
+                   if( !tp->shutdown ) {
-		ithread_mutex_lock(&tp->mutex);
+                   ithread_mutex_lock( &tp->mutex );}
-	}
 
-	*stats = tp->stats;
+                   ( *stats ) = tp->stats; if( stats->totalJobsHQ > 0 )
-	if (stats->totalJobsHQ > 0) {
+                   stats->avgWaitHQ =
-		stats->avgWaitHQ = stats->totalTimeHQ / stats->totalJobsHQ;
+                   stats->totalTimeHQ / stats->totalJobsHQ;
-	} else {
+                   else
-		stats->avgWaitHQ = 0;
+                   stats->avgWaitHQ = 0; if( stats->totalJobsMQ > 0 )
-	}
+                   stats->avgWaitMQ =
+                   stats->totalTimeMQ / stats->totalJobsMQ;
+                   else
+                   stats->avgWaitMQ = 0; if( stats->totalJobsLQ > 0 )
+                   stats->avgWaitLQ =
+                   stats->totalTimeLQ / stats->totalJobsLQ;
+                   else
+                   stats->avgWaitLQ = 0;
+                   stats->totalThreads = tp->totalThreads;
+                   stats->persistentThreads = tp->persistentThreads;
+                   stats->currentJobsHQ = ListSize( &tp->highJobQ );
+                   stats->currentJobsLQ = ListSize( &tp->lowJobQ );
+                   stats->currentJobsMQ = ListSize( &tp->medJobQ );
+                   //if not shutdown then release mutex
+                   if( !tp->shutdown ) {
+                   ithread_mutex_unlock( &tp->mutex );}
 
-	if( stats->totalJobsMQ > 0 ) {
+                   return 0;}
-		stats->avgWaitMQ = stats->totalTimeMQ / stats->totalJobsMQ;
-	} else {
-		stats->avgWaitMQ = 0;
-	}
-	
-	if( stats->totalJobsLQ > 0 ) {
-		stats->avgWaitLQ = stats->totalTimeLQ / stats->totalJobsLQ;
-	} else {
-		stats->avgWaitLQ = 0;
-	}
-
-	stats->totalThreads = tp->totalThreads;
-	stats->persistentThreads = tp->persistentThreads;
-	stats->currentJobsHQ = ListSize( &tp->highJobQ );
-	stats->currentJobsLQ = ListSize( &tp->lowJobQ );
-	stats->currentJobsMQ = ListSize( &tp->medJobQ );
-
-	//if not shutdown then release mutex
-	if( !tp->shutdown ) {
-		ithread_mutex_unlock( &tp->mutex );
-	}
-
-	return 0;
-}
-
-#endif /* STATS */
 
+#endif

threadutil/src/iasnprintf.c

@@ -31,8 +31,7 @@
 
 #include <stdarg.h>
 #include <assert.h>
-#include <sys/param.h>
+#ifdef __FreeBSD__
-#if (defined(BSD) && BSD >= 199306) || defined(__OSX__)
 #include <stdlib.h>
 #else
 #include <malloc.h>

upnp/Makefile.am

@@ -1,153 +1,164 @@
+# $Id: Makefile.am,v 1.10 2006/04/08 15:22:22 r3mi Exp $
 #
 # "Makefile.am" for "libupnp/upnp"
 #
 # Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
-SUBDIRS = doc . sample
+SUBDIRS 		= doc
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS		= -I$(srcdir)/inc \
-	-I$(srcdir)/inc \
+			  -I$(top_srcdir)/threadutil/inc \
-	-I$(top_srcdir)/threadutil/inc \
+			  -I$(top_srcdir)/ixml/inc
-	-I$(top_srcdir)/ixml/inc
 
-AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CFLAGS		= $(PTHREAD_CFLAGS)
 
-AM_LDFLAGS = $(PTHREAD_LIBS)
+AM_LDFLAGS		= $(PTHREAD_LIBS)
 
-LDADD = \
+LDADD			= libupnp.la \
-	libupnp.la \
+			  $(top_builddir)/threadutil/libthreadutil.la \
-	$(top_builddir)/threadutil/libthreadutil.la \
+			  $(top_builddir)/ixml/libixml.la
-	$(top_builddir)/ixml/libixml.la
 
 
-upnpincludedir = $(includedir)/upnp
+upnpincludedir          = $(includedir)/upnp
-upnpinclude_HEADERS = \
+upnpinclude_HEADERS     = inc/upnp.h 
-	inc/upnp.h \
-	inc/upnpdebug.h
-
 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
-upnpinclude_HEADERS += inc/upnptools.h 
+upnpinclude_HEADERS	+= inc/upnptools.h 
-endif
-
-
-lib_LTLIBRARIES = libupnp.la
-
-libupnp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
-
-libupnp_la_LDFLAGS = \
-	-version-info $(LT_VERSION_UPNP) \
-	-export-symbols-regex '^Upnp.*' \
-	$(top_builddir)/threadutil/libthreadutil.la \
-	$(top_builddir)/ixml/libixml.la
-
-libupnp_la_SOURCES = \
-	src/inc/config.h \
-	src/inc/client_table.h \
-	src/inc/gena.h \
-	src/inc/gena_ctrlpt.h \
-	src/inc/gena_device.h \
-	src/inc/global.h \
-	src/inc/gmtdate.h \
-	src/inc/http_client.h \
-	src/inc/httpparser.h \
-	src/inc/httpreadwrite.h \
-	src/inc/md5.h \
-	src/inc/membuffer.h \
-	src/inc/miniserver.h \
-	src/inc/netall.h \
-	src/inc/parsetools.h \
-	src/inc/server.h \
-	src/inc/service_table.h \
-	src/inc/soaplib.h \
-	src/inc/sock.h \
-	src/inc/statcodes.h \
-	src/inc/statuscodes.h \
-	src/inc/strintmap.h \
-	src/inc/ssdplib.h \
-	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 \
-	src/inc/util.h \
-	src/inc/utilall.h \
-	src/inc/uuid.h \
-	src/inc/webserver.h
-
-# ssdp
-libupnp_la_SOURCES += \
-	src/ssdp/ssdp_device.c \
-	src/ssdp/ssdp_ctrlpt.c \
-	src/ssdp/ssdp_server.c
-
-# soap
-libupnp_la_SOURCES += \
-	src/soap/soap_device.c \
-	src/soap/soap_ctrlpt.c \
-	src/soap/soap_common.c
-
-# genlib
-libupnp_la_SOURCES += \
-	src/genlib/miniserver/miniserver.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 \
-	src/genlib/net/http/statcodes.c \
-	src/genlib/net/http/webserver.c \
-	src/genlib/net/http/parsetools.c \
-	src/genlib/net/uri/uri.c
-
-# gena
-libupnp_la_SOURCES += \
-	src/gena/gena_device.c \
-	src/gena/gena_ctrlpt.c \
-	src/gena/gena_callback2.c
-
-# api
-libupnp_la_SOURCES += src/api/upnpapi.c
-if ENABLE_TOOLS
-libupnp_la_SOURCES += src/api/upnptools.c
 endif
 if ENABLE_DEBUG
-libupnp_la_SOURCES += src/api/upnpdebug.c 
+upnpinclude_HEADERS	+= inc/upnpdebug.h
 endif
 
+lib_LTLIBRARIES		= libupnp.la
+
+libupnp_la_CPPFLAGS	= $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
+libupnp_la_LDFLAGS	= -version-info $(LT_VERSION_UPNP) \
+			  -export-symbols-regex '^Upnp.*' \
+			  $(top_builddir)/threadutil/libthreadutil.la \
+			  $(top_builddir)/ixml/libixml.la
+
+libupnp_la_SOURCES	= \
+			src/inc/config.h \
+			src/inc/client_table.h src/inc/global.h \
+			src/inc/md5.h src/inc/ssdplib.h \
+			src/inc/unixutil.h src/inc/urlconfig.h \
+			src/inc/gmtdate.h src/inc/membuffer.h \
+			src/inc/server.h src/inc/statcodes.h \
+			src/inc/upnpapi.h src/inc/utilall.h \
+			src/inc/gena_ctrlpt.h src/inc/http_client.h \
+			src/inc/miniserver.h src/inc/service_table.h \
+			src/inc/statuscodes.h src/inc/upnpclosesocket.h \
+			src/inc/util.h src/inc/gena_device.h \
+			src/inc/httpparser.h src/inc/netall.h \
+			src/inc/soaplib.h src/inc/strintmap.h \
+			src/inc/upnp_timeout.h src/inc/uuid.h \
+			src/inc/gena.h src/inc/httpreadwrite.h \
+			src/inc/parsetools.h src/inc/sock.h \
+			src/inc/sysdep.h src/inc/uri.h \
+			src/inc/webserver.h
+
+# ssdp
+libupnp_la_SOURCES	+= src/ssdp/ssdp_device.c src/ssdp/ssdp_ctrlpt.c \
+			src/ssdp/ssdp_server.c
+
+# soap
+libupnp_la_SOURCES	+= src/soap/soap_device.c src/soap/soap_ctrlpt.c \
+			src/soap/soap_common.c
+
+# genlib
+libupnp_la_SOURCES	+= \
+			src/genlib/miniserver/miniserver.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 \
+			src/genlib/net/http/statcodes.c \
+			src/genlib/net/http/webserver.c \
+			src/genlib/net/http/parsetools.c \
+			src/genlib/net/uri/uri.c
+
+# gena
+libupnp_la_SOURCES	+= src/gena/gena_device.c src/gena/gena_ctrlpt.c \
+			src/gena/gena_callback2.c
+
+# api
+libupnp_la_SOURCES	+= src/api/upnpapi.c
+if ENABLE_TOOLS
+    libupnp_la_SOURCES	+= src/api/upnptools.c
+endif
+if ENABLE_DEBUG
+    libupnp_la_SOURCES	+= src/api/upnpdebug.c 
+endif
 
 # uuid
-libupnp_la_SOURCES += \
+libupnp_la_SOURCES	+= src/uuid/md5.c src/uuid/sysdep.c src/uuid/uuid.c
-	src/uuid/md5.c \
-	src/uuid/sysdep.c \
-	src/uuid/uuid.c
-
 
 # urlconfig
-libupnp_la_SOURCES += src/urlconfig/urlconfig.c
+libupnp_la_SOURCES	+= src/urlconfig/urlconfig.c
+
+
+# samples
+noinst_PROGRAMS		=
+if ENABLE_SAMPLES
+if ENABLE_CLIENT
+    noinst_PROGRAMS	+= upnp_tv_ctrlpt
+    upnp_tv_ctrlpt_CPPFLAGS = $(AM_CPPFLAGS) \
+			-I$(srcdir)/sample/common/ \
+			-I$(srcdir)/sample/tvctrlpt
+endif
+if ENABLE_DEVICE
+    noinst_PROGRAMS	+= upnp_tv_device 
+    upnp_tv_device_CPPFLAGS = $(AM_CPPFLAGS) \
+			-I$(srcdir)/sample/common/ \
+			-I$(srcdir)/sample/tvdevice
+endif
+endif
+upnp_tv_device_SOURCES = \
+			sample/common/sample_util.c \
+			sample/common/sample_util.h \
+			sample/tvdevice/upnp_tv_device.c \
+			sample/tvdevice/upnp_tv_device.h \
+			sample/tvdevice/linux/upnp_tv_device_main.c
+upnp_tv_ctrlpt_SOURCES = \
+			sample/common/sample_util.c \
+			sample/common/sample_util.h \
+			sample/tvctrlpt/upnp_tv_ctrlpt.c \
+			sample/tvctrlpt/upnp_tv_ctrlpt.h \
+			sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
+
+if WITH_DOCDIR
+    docdir		= @DOCDIR@
+    examplesdir 	= $(docdir)/examples
+    examples_DATA 	= $(upnp_tv_ctrlpt_SOURCES) $(upnp_tv_device_SOURCES)
+endif
 
 
 # check / distcheck tests
-check_PROGRAMS = test_init
+check_PROGRAMS		= test_init
-TESTS = test_init
+TESTS			= test_init
-test_init_SOURCES = test/test_init.c
+
+test_init_SOURCES	= test/test_init.c
 
 
-EXTRA_DIST = \
+EXTRA_DIST 		= LICENSE \
-	LICENSE \
+			sample/tvdevice/web/tvcontrolSCPD.xml \
-	src/inc/inet_pton.h \
+			sample/tvdevice/web/tvdevicedesc.xml \
-	src/inet_pton.c \
+			sample/tvdevice/web/tvdevicepres.html \
-	src/win_dll.c
+			sample/tvdevice/web/tvpictureSCPD.xml \
+			src/inc/inet_pton.h \
+			src/inet_pton.c \
+			src/win_dll.c
+
+
+
+CLEANFILES		= IUpnpErrFile.txt IUpnpInfoFile.txt
+
 
 
-CLEANFILES = \
-	IUpnpErrFile.txt \
-	IUpnpInfoFile.txt
 

upnp/inc/upnp.h

@@ -1,125 +1,84 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef UPNP_H
 #define UPNP_H
 
 /** @name The API */
 
-/*! @{ */
+//@{
-
-
-#if defined MYLIB_LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 != 64
-	#if defined __GNUC__
-		#warning libupnp requires largefile mode - use AC_SYS_LARGEFILE
-	#else
-		#error  libupnp requires largefile mode - use AC_SYS_LARGEFILE
-	#endif
-#endif 
-
 
 #include <stdio.h>
-#include <sys/param.h>
+#ifdef __FreeBSD__
-#if (defined(BSD) && BSD >= 199306)
+#include <time.h>
-	#include <time.h>
 #endif
 #include "ixml.h"
 #include "upnpconfig.h"
-
+#if UPNP_HAVE_DEBUG
+#	include "upnpdebug.h"
+#endif
 
 #ifdef WIN32
-	#ifndef UPNP_STATIC_LIB
+ #ifndef UPNP_STATIC_LIB
-		#ifdef LIBUPNP_EXPORTS
+  #ifdef LIBUPNP_EXPORTS
-			/* set up declspec for dll export to make functions visible to library users */
+   // set up declspec for dll export to make functions visible to library users
-			#define EXPORT_SPEC __declspec(dllexport)
+   #define EXPORT_SPEC __declspec(dllexport)
-		#else
+  #else
-			#define EXPORT_SPEC __declspec(dllimport)
+   #define EXPORT_SPEC __declspec(dllimport)
-		#endif
+  #endif
-	#else
+ #else
-		#define EXPORT_SPEC
+  #define EXPORT_SPEC
-	#endif
+ #endif
-	#ifdef UPNP_USE_MSVCPP
-		/* define some things the M$ VC++ doesn't know */
-		#define UPNP_INLINE
-		typedef __int64 int64_t;
-		#define PRId64 "I64d"
-		#define PRIzu "lu"
-	#endif
-	#ifdef UPNP_USE_BCBPP
-		/* define some things Borland Builder doesn't know */
-		#define UPNP_INLINE inline
-		typedef __int64 int64_t;
-#warning The Borland C compiler is probably broken on PRId64, please someone provide a proper fix here
-		#define PRId64 "I64d"
-		#define PRIzu "zu"
-	#endif
 #else
-	#define EXPORT_SPEC
+ #define EXPORT_SPEC
-	#define UPNP_INLINE inline
-	/* Invented this macro so that we can live a little longer with MSVC lack of C99. */
-	#define PRIzu "zu"
 #endif
 
-/*
- * Defining this macro here gives some interesting information about unused
- * functions in the code. Of course, this should never go uncommented on a
- * release.
- */
-/*#define inline*/
-
-
 #ifndef WIN32
-	#define UpnpCloseSocket close
+ #define UpnpCloseSocket         close
 #else
-	#define UpnpCloseSocket closesocket
+ #define UpnpCloseSocket         closesocket
-	#define fseeko fseek
 #endif
-#define UPNP_SOCKETERROR -1
+#define UPNP_SOCKETERROR        -1
-#define UPNP_INVALID_SOCKET -1
+#define UPNP_INVALID_SOCKET     -1
 #ifndef WIN32
-	#define SOCKET int
+ #define SOCKET                  int
 #endif
 
-
 #ifndef WIN32
-	#include <netinet/in.h>
+ #include <netinet/in.h>
 #else
-	#include <winsock2.h>
+ #include <winsock2.h>
-	#include <time.h>
+ #include <time.h>
 #endif
 
-
-#include <sys/types.h>
-
-
 #define NUM_HANDLE 200
 #define LINE_SIZE  180
 #define NAME_SIZE  256
@@ -128,6 +87,7 @@
 #define SERL_NUMR_SIZE  64
 #define MODL_DESC_SIZE  64
 #define UPNP_INFINITE -1
+
 #define UPNP_USING_CHUNKED			-3
 #define UPNP_UNTIL_CLOSE			-4
 
@@ -139,7 +99,7 @@
  *  code means.  Refer to the documentation for each function for a 
  *  description of what an error code means in that context.
  */
-/*! @{ */
+//@{
 
 /** @name UPNP_E_SUCCESS [0]
  *  {\tt UPNP_E_SUCCESS} signifies that the operation completed successfully.
@@ -147,35 +107,35 @@
  *  the operation was successfully transmitted on the network.  The result of 
  *  the entire operation comes as part of the callback for that operation.
  */
-/*! @{ */
+//@{
 #define UPNP_E_SUCCESS          0
-/*! @} */
+//@}
 
 /** @name UPNP_E_INVALID_HANDLE [-100]
  *  {\tt UPNP_E_INVALID_HANDLE} signifies that the handle passed to a 
  *  function is not a recognized as a valid handle.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INVALID_HANDLE   -100
-/*! @} */
+//@}
 
 /** @name UPNP_E_INVALID_PARAM [-101]
  *  {\tt UPNP_E_INVALID_PARAM} signifies that one or more of the parameters 
  *  passed to the function is not valid.  Refer to the documentation for each 
  *  function for more information on the valid ranges of the parameters.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INVALID_PARAM    -101
-/*! @} */
+//@}
 
 /** @name UPNP_E_OUTOF_HANDLE [-102]
  *  {\tt UPNP_E_OUTOF_HANDLE} signifies that the SDK does not have any
  *  more space for additional handles.  The SDK allocates space for only 
  *  a few handles in order to conserve memory.
  */
-/*! @{ */
+//@{
 #define UPNP_E_OUTOF_HANDLE     -102
-/*! @} */
+//@}
 
 #define UPNP_E_OUTOF_CONTEXT    -103
 
@@ -184,9 +144,9 @@
  *  currently available to complete the operation.  Most operations require 
  *  some free memory in order to complete their work.
  */
-/*! @{ */
+//@{
 #define UPNP_E_OUTOF_MEMORY     -104
-/*! @} */
+//@}
 
 /** @name UPNP_E_INIT [-105]
  *  {\tt UPNP_E_INIT} signifies that the SDK has already been 
@@ -194,9 +154,9 @@
  *  Any additional initialization attempts simply return this error with
  *  no other ill effects.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INIT             -105
-/*! @} */
+//@}
 
 #define UPNP_E_BUFFER_TOO_SMALL -106
 
@@ -205,9 +165,9 @@
  *  to {\bf UpnpRegisterRootDevice} or {\bf UpnpRegisterRootDevice2} is an 
  *  invalid description document.  
  */
-/*! @{ */
+//@{
 #define UPNP_E_INVALID_DESC     -107
-/*! @} */
+//@}
 
 /** @name UPNP_E_INVALID_URL [-108]
  *  {\tt UPNP_E_INVALID_URL} signifies that a URL passed into the function
@@ -215,9 +175,9 @@
  *  URL itself might be malformed (e.g. have invalid characters in it) or
  *  the host might be unreachable.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INVALID_URL      -108
-/*! @} */
+//@}
 
 #define UPNP_E_INVALID_SID      -109
 #define UPNP_E_INVALID_DEVICE   -110
@@ -228,18 +188,18 @@
  *  {\bf UpnpAcceptSubscriptionExt} to signify that the device ID/service
  *  ID pair does not refer to a valid service.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INVALID_SERVICE  -111
-/*! @} */
+//@}
 
 /** @name UPNP_E_BAD_RESPONSE [-113]
  *  {\tt UPNP_E_BAD_RESPONSE} signifies that the response received from the 
  *  remote side of a connection is not correct for the protocol.  This applies
  *  to the GENA, SOAP, and HTTP protocols.
  */
-/*! @{ */
+//@{
 #define UPNP_E_BAD_RESPONSE     -113
-/*! @} */
+//@}
 
 #define UPNP_E_BAD_REQUEST      -114
 
@@ -248,26 +208,26 @@
  *  invalid.  This can be because the DOM document passed to the function was
  *  malformed or the action message is not correct for the given action.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INVALID_ACTION   -115
-/*! @} */
+//@}
 
 /** @name UPNP_E_FINISH [-116]
  *  {\tt UPNP_E_FINISH} signifies that {\bf UpnpInit} has not been called, or
  *  that {\bf UpnpFinish} has already been called.  None of the API functions 
  *  operate until {\bf UpnpInit} successfully completes.
  */
-/*! @{ */
+//@{
 #define UPNP_E_FINISH           -116
-/*! @} */
+//@}
 
 /** @name UPNP_E_INIT_FAILED [-117]
  *  {\tt UPNP_E_INIT_FAILED} signifies that {\bf UpnpInit} cannot complete.  
  *  The typical reason is failure to allocate sufficient resources.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INIT_FAILED      -117
-/*! @} */
+//@}
 
 /** @name UPNP_E_URL_TOO_BIG [-118]
  *  {\tt UPNP_E_URL_TOO_BIG} signifies that the URL passed into a function 
@@ -283,18 +243,18 @@
  *  message (e.g. {\bf UpnpSubscribe}), GENA event notifications (e.g. {\bf
  *  UpnpNotify}), and HTTP transfers (e.g. {\bf UpnpDownloadXmlDoc}).
  */
-/*! @{ */
+//@{
 #define UPNP_E_BAD_HTTPMSG      -119
-/*! @} */
+//@}
 
 /** @name UPNP_E_ALREADY_REGISTERED [-120]
  *  {\tt UPNP_E_ALREADY_REGISTERED} signifies that a client or a device is
  *  already registered.  The SDK currently has a limit of one registered 
  *  client and one registered device per process.
  */
-/*! @{ */
+//@{
 #define UPNP_E_ALREADY_REGISTERED -120
-/*! @} */
+//@}
 
 /** @name UPNP_E_NETWORK_ERROR [-200]
  *  {\tt UPNP_E_NETWORK_ERROR} signifies that a network error occurred.  It 
@@ -303,9 +263,9 @@
  *  failed to read the local IP address or had problems configuring one of
  *  the sockets.
  */
-/*! @{ */
+//@{
 #define UPNP_E_NETWORK_ERROR    -200
-/*! @} */
+//@}
 
 /** @name UPNP_E_SOCKET_WRITE [-201]
  *  {\tt UPNP_E_SOCKET_WRITE} signifies an error writing to a socket.  This
@@ -314,9 +274,9 @@
  *  control (e.g. {\bf UpnpSendAction}), eventing (e.g. {\bf UpnpNotify}), 
  *  and HTTP functions (e.g. {\bf UpnpDownloadXmlDoc}).
  */
-/*! @{ */
+//@{
 #define UPNP_E_SOCKET_WRITE     -201
-/*! @} */
+//@}
 
 /** @name UPNP_E_SOCKET_READ [-202]
  *  {\tt UPNP_E_SOCKET_READ} signifies an error reading from a socket.  This
@@ -325,9 +285,9 @@
  *  control (e.g. {\bf UpnpSendAction}), eventing (e.g. {\bf UpnpNotify}), 
  *  and HTTP functions (e.g. {\bf UpnpDownloadXmlDoc}).
  */
-/*! @{ */
+//@{
 #define UPNP_E_SOCKET_READ      -202
-/*! @} */
+//@}
 
 /** @name UPNP_E_SOCKET_BIND [-203]
  *  {\tt UPNP_E_SOCKET_BIND} signifies that the SDK had a problem binding
@@ -337,9 +297,9 @@
  *  (e.g. {\bf UpnpNotify}), and HTTP functions (e.g. 
  *  {\bf UpnpDownloadXmlDoc}).
  */
-/*! @{ */
+//@{
 #define UPNP_E_SOCKET_BIND      -203
-/*! @} */
+//@}
 
 /** @name UPNP_E_SOCKET_CONNECT [-204]
  *  {\tt UPNP_E_SOCKET_CONNECT} signifies that the SDK had a problem
@@ -349,9 +309,9 @@
  *  (e.g. {\bf UpnpNotify}), and HTTP functions (e.g. 
  *  {\bf UpnpDownloadXmlDoc}).
  */
-/*! @{ */
+//@{
 #define UPNP_E_SOCKET_CONNECT   -204
-/*! @} */
+//@}
 
 /** @name UPNP_E_OUTOF_SOCKET [-205]
  *  {\tt UPNP_E_OUTOF_SOCKET} signifies that the SDK cannot create any
@@ -361,36 +321,36 @@
  *  (e.g. {\bf UpnpNotify}), and HTTP functions (e.g. 
  *  {\bf UpnpDownloadXmlDoc}).
  */
-/*! @{ */
+//@{
 #define UPNP_E_OUTOF_SOCKET     -205
-/*! @} */
+//@}
 
 /** @name UPNP_E_LISTEN [-206]
  *  {\tt UPNP_E_LISTEN} signifies that the SDK had a problem setting the
  *  socket to listen for incoming connections.  This error only happens during
  *  initialization (i.e. {\bf UpnpInit}).
  */
-/*! @{ */
+//@{
 #define UPNP_E_LISTEN           -206
-/*! @} */
+//@}
 
 /** @name UPNP_E_TIMEDOUT [-207]
  *  {\tt UPNP_E_TIMEDOUT} signifies that too much time elapsed before the
  *  required number of bytes were sent or received over a socket.  This error
  *  can be returned by any function that performs network operations.
  */
-/*! @{ */
+//@{
 #define UPNP_E_TIMEDOUT         -207
-/*! @} */
+//@}
 
 /** @name UPNP_E_SOCKET_ERROR [-208]
  *  {\tt UPNP_E_SOCKET_ERROR} is the generic socket error code for
  *  conditions not covered by other error codes.  This error can be returned
  *  by any function that performs network operations.
  */
-/*! @{ */
+//@{
 #define UPNP_E_SOCKET_ERROR	    -208
-/*! @} */
+//@}
 
 #define UPNP_E_FILE_WRITE_ERROR -209
 
@@ -399,9 +359,9 @@
  *  error can be returned by any function that allows for external
  *  cancelation.
  */
-/*! @{ */
+//@{
 #define UPNP_E_CANCELED         -210
-/*! @} */
+//@}
 
 #define UPNP_E_EVENT_PROTOCOL         -300
 
@@ -409,58 +369,58 @@
  *  {\tt UPNP_E_SUBSCRIBE_UNACCEPTED} signifies that a subscription
  *  request was rejected from the remote side.  
  */
-/*! @{ */
+//@{
 #define UPNP_E_SUBSCRIBE_UNACCEPTED   -301
-/*! @} */
+//@}
 
 /** @name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302]
  *  {\tt UPNP_E_UNSUBSCRIBE_UNACCEPTED} signifies that an unsubscribe
  *  request was rejected from the remote side.
  */
-/*! @{ */
+//@{
 #define UPNP_E_UNSUBSCRIBE_UNACCEPTED -302
-/*! @} */
+//@}
 
 /** @name UPNP_E_NOTIFY_UNACCEPTED [-303]
  *  {\tt UPNP_E_NOTIFY_UNACCEPTED} signifies that the remote host did not
  *  accept the notify sent from the local device.
  */
-/*! @{ */
+//@{
 #define UPNP_E_NOTIFY_UNACCEPTED      -303
-/*! @} */
+//@}
 
 /** @name UPNP_E_INVALID_ARGUMENT [-501]
  *  {\tt UPNP_E_INVALID_ARGUMENT} signifies that one or more of the parameters
  *  passed to a function is invalid.  Refer to the individual function
  *  descriptions for the acceptable ranges for parameters.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INVALID_ARGUMENT       -501
-/*! @} */
+//@}
 
 /** @name UPNP_E_FILE_NOT_FOUND [-502]
  *  {\tt UPNP_E_FILE_NOT_FOUND} signifies that the filename passed
  *  to one of the device registration functions was not found or was not
  *  accessible.
  */
-/*! @{ */
+//@{
 #define UPNP_E_FILE_NOT_FOUND         -502
-/*! @} */
+//@}
 
 /** @name UPNP_E_FILE_READ_ERROR [-503]
  *  {\tt UPNP_E_FILE_READ_ERROR} signifies an error when reading a file.
  */
-/*! @{ */
+//@{
 #define UPNP_E_FILE_READ_ERROR        -503
-/*! @} */
+//@}
 
 /** @name UPNP_E_EXT_NOT_XML [-504]
  *  {\tt UPNP_E_EXT_NOT_XML} signifies that the file name of the description
  *  document passed to {\bf UpnpRegisterRootDevice2} does not end in ".xml".
  */
-/*! @{ */
+//@{
 #define UPNP_E_EXT_NOT_XML            -504
-/*! @} */
+//@}
 
 #define UPNP_E_NO_WEB_SERVER          -505
 #define UPNP_E_OUTOF_BOUNDS	      -506
@@ -469,26 +429,26 @@
  *  {\tt UPNP_E_NOT_FOUND} signifies that the response to a SOAP request
  *  did not contain the required XML constructs.  
  */
-/*! @{ */
+//@{
 #define UPNP_E_NOT_FOUND	      -507
-/*! @} */
+//@}
 
 /** @name UPNP_E_INTERNAL_ERROR [-911]
  *  {\tt UPNP_E_INTERNAL_ERROR} is the generic error code for internal
  *  conditions not covered by other error codes.
  */
-/*! @{ */
+//@{
 #define UPNP_E_INTERNAL_ERROR         -911
-/*! @} */
+//@}
 
-/* SOAP-related error codes */
+// SOAP-related error codes
 #define UPNP_SOAP_E_INVALID_ACTION    401
 #define UPNP_SOAP_E_INVALID_ARGS      402
 #define UPNP_SOAP_E_OUT_OF_SYNC       403
 #define UPNP_SOAP_E_INVALID_VAR       404
 #define UPNP_SOAP_E_ACTION_FAILED     501
 
-/*! @} */
+//@}
 
 #ifndef OUT
 #define OUT
@@ -502,12 +462,10 @@
 #define INOUT
 #endif
 
-#include "upnpdebug.h"
-
 enum UpnpOpenFileMode{UPNP_READ, UPNP_WRITE};
 
-/*! @name Constants, Structures, and Types */
+/// @name Constants, Structures, and Types
-/*! @{ */
+//@{
 
 /** Returned when a control point application registers with {\bf
  *  UpnpRegisterClient}.  Client handles can only be used with 
@@ -530,9 +488,9 @@ typedef int  UpnpDevice_Handle;
 
 enum Upnp_EventType_e {
 
-  /*
+  //
-   * Control callbacks
+  // Control callbacks
-   */
+  //
 
   /** Received by a device when a control point issues a control
    *  request.  The {\bf Event} parameter contains a pointer to a {\bf
@@ -560,9 +518,9 @@ enum Upnp_EventType_e {
 
   UPNP_CONTROL_GET_VAR_COMPLETE,
 
-  /*
+  //
-   * Discovery callbacks
+  // Discovery callbacks
-   */
+  //
 
   /** Received by a control point when a new device or service is available.  
    *  The {\bf Event} parameter contains a pointer to a {\bf
@@ -591,9 +549,9 @@ enum Upnp_EventType_e {
 
   UPNP_DISCOVERY_SEARCH_TIMEOUT,
 
-  /*
+  //
-   * Eventing callbacks
+  // Eventing callbacks
-   */
+  //
 
   /** Received by a device when a subscription arrives.
    *  The {\bf Event} parameter contains a pointer to a {\bf
@@ -824,47 +782,51 @@ struct Upnp_Event
 
 };
 
-/*
+//
- * This typedef is required by Doc++ to parse the last entry of the 
+// This typedef is required by Doc++ to parse the last entry of the 
- * Upnp_Discovery structure correctly.
+// Upnp_Discovery structure correctly.
- */
+//
 
+typedef struct sockaddr_in SOCKADDRIN;
 
 /** 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. */
+  /** The result code of the {\bf UpnpSearchAsync} call. */
-	int  Expires;                  
+  int  ErrCode;                  
 				     
-	/** The unique device identifier. */
+  /** The expiration time of the advertisement. */
-	char DeviceId[LINE_SIZE];      
+  int  Expires;                  
                                      
-	/** The device type. */
+  /** The unique device identifier. */
-	char DeviceType[LINE_SIZE];    
+  char DeviceId[LINE_SIZE];      
 
-	/** The service type. */
+  /** The device type. */
-	char ServiceType[LINE_SIZE];
+  char DeviceType[LINE_SIZE];    
 
-	/** The service version. */
+  /** The service type. */
-	char ServiceVer[LINE_SIZE];    
+  char ServiceType[LINE_SIZE];
 
-	/** The URL to the UPnP description document for the device. */
+  /** The service version. */
-	char Location[LINE_SIZE];      
+  char ServiceVer[LINE_SIZE];    
 
-	/** The operating system the device is running. */
+  /** The URL to the UPnP description document for the device. */
-	char Os[LINE_SIZE];            
+  char Location[LINE_SIZE];      
 
-	/** Date when the response was generated. */
+  /** The operating system the device is running. */
-	char Date[LINE_SIZE];            
+  char Os[LINE_SIZE];            
 				     
-	/** Confirmation that the MAN header was understood by the device. */
+  /** Date when the response was generated. */
-	char Ext[LINE_SIZE];           
+  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. */
+  SOCKADDRIN * DestAddr; 
 
-	/** 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
@@ -913,7 +875,7 @@ 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;
+  int file_length;
 
   /** The time at which the contents of the file was modified;
    *  The time system is always local (not GMT). */
@@ -1007,7 +969,7 @@ struct UpnpVirtualDirCallbacks
    int (*seek) (
      IN UpnpWebFileHandle fileHnd,  /** The handle of the file to move the 
                                         file pointer. */
-     IN off_t offset,                /** The number of bytes to move in the 
+     IN long offset,                /** The number of bytes to move in the 
                                         file.  Positive values move foward and 
                                         negative values move backward.  Note 
                                         that this must be positive if the 
@@ -1068,14 +1030,14 @@ typedef int  (*Upnp_FunPtr) (
     IN void *Cookie
     );
 
-/*! @} */ /* Constants, Structures, and Types */
+//@} // Constants, Structures, and Types
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif // __cplusplus
 
-/*! @name Initialization and Registration */
+///@name Initialization and Registration
-/*! @{ */
+//@{
 /** Initializes the Linux SDK for UPnP Devices. This function must be called
  *  before any other API function can be called.  It should be called
  *  only once.  Subsequent calls to this API return a {\tt UPNP_E_INIT}
@@ -1386,18 +1348,18 @@ EXPORT_SPEC int UpnpSetMaxContentLength(
 			           for incoming SOAP actions, in bytes. */
     );
 
-/*! @} */ /* Initialization and Registration */
+//@} // Initialization and Registration
 
-/******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- *                                                                            *
+//                                                                    //
- *                        D I S C O V E R Y                                   *
+//                        D I S C O V E R Y                           //
- *                                                                            *
+//                                                                    //
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
+////////////////////////////////////////////////////////////////////////
 
-/*! @name Discovery */
+///@name Discovery
-/*! @{ */
+//@{
 
 /** {\bf UpnpSearchAsync} searches for devices matching the given
  *  search target.  The function returns immediately and the SDK 
@@ -1456,18 +1418,18 @@ EXPORT_SPEC int UpnpSendAdvertisement(
                                   the announcements. */
     );
 
-/*! @} */ /* Discovery */
+//@} // Discovery
 
-/******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- *                                                                            *
+//                                                                    //
- *                            C O N T R O L                                   *
+//                            C O N T R O L                           //
- *                                                                            *
+//                                                                    //
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
+////////////////////////////////////////////////////////////////////////
 
-/*! @name Control */
+///@name Control
-/*! @{ */
+//@{
 
 /** {\bf UpnpGetServiceVarStatus} queries the state of a state 
  *  variable of a service on another device.  This is a synchronous call.
@@ -1690,18 +1652,18 @@ EXPORT_SPEC int UpnpSendActionExAsync(
                                     passed to the callback when invoked. */
     );
 
-/*! @} */ /* Control */
+//@} // Control
 
-/******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- *                                                                            *
+//                                                                    //
- *                        E V E N T I N G                                     *
+//                        E V E N T I N G                             //
- *                                                                            *
+//                                                                    //
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
+////////////////////////////////////////////////////////////////////////
 
-/*! @name Eventing */
+///@name Eventing
-/*! @{ */
+//@{
 
 /** {\bf UpnpAcceptSubscription} accepts a subscription request and sends
  *  out the current state of the eventable variables for a service.  
@@ -2204,19 +2166,19 @@ EXPORT_SPEC int UpnpUnSubscribeAsync(
                                   callback function when invoked. */
     );
 
-/*! @} */ /* Eventing */
+//@} // Eventing
 
 
-/******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- *                                                                            *
+//                                                                    //
- *                        C L I E N T - A P I                                 *
+//                        C L I E N T - A P I                         //
- *                                                                            *
+//                                                                    //
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
+////////////////////////////////////////////////////////////////////////
 
-/*! @name Control Point HTTP API */
+///@name Control Point HTTP API
-/*! @{ */
+//@{
 
 /** {\bf UpnpDownloadUrlItem} downloads a file specified in a URL.
  *  The SDK allocates the memory for {\bf outBuf} and the 
@@ -2609,18 +2571,18 @@ EXPORT_SPEC int UpnpDownloadXmlDoc(
 				     XML document. */
     );
 
-/*! @} */ /* Control Point HTTP API */
+//@} // Control Point HTTP API
 
-/******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- *                                                                            *
+//                                                                    //
- *                    W E B  S E R V E R  A P I                               *
+//                    W E B  S E R V E R  A P I                       //
- *                                                                            *
+//                                                                    //
- ******************************************************************************
+////////////////////////////////////////////////////////////////////////
- ******************************************************************************/
+////////////////////////////////////////////////////////////////////////
 
-/*! @name Web Server API */
+///@name Web Server API
-/*! @{ */
+//@{
 
 /** {\bf UpnpSetWebServerRootDir} sets the document root directory for
  *  the internal web server. This directory is considered the
@@ -2736,13 +2698,13 @@ EXPORT_SPEC void UpnpFree(
     IN void *item /* The item to free. */
     );
 
-/*! @} */ /* Web Server API */
+//@} // Web Server API
 
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif // __cplusplus
 
-/*! @} */ /* The API */
+//@} The API
 
 #endif
 

upnp/inc/upnpconfig.h.in

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

upnp/inc/upnpdebug.h

@@ -1,41 +1,43 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+// Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef UPNP_DEBUG_H
 #define UPNP_DEBUG_H 
 
-#include "upnp.h"
 #include "upnpconfig.h"
 
+// Function declarations only if debug compiled into the library
+#if UPNP_HAVE_DEBUG
+
 #include <stdio.h>
 
 #ifdef __cplusplus
@@ -47,7 +49,7 @@ extern "C" {
           The UPnP SDK contains other features to aid in debugging.
  */
 
-/*! @{ */
+//@{
 
 /** @name Upnp_LogLevel
  *  The user has the option to select 4 different types of debugging levels,
@@ -68,25 +70,18 @@ extern "C" {
  *  \end{itemize}
  */
 
-typedef enum Upnp_Module {
+typedef enum Upnp_Module {SSDP,SOAP,GENA,TPOOL,MSERV,DOM,API, HTTP} Dbg_Module;
-	SSDP,
+//@{
-	SOAP,
-	GENA,
-	TPOOL,
-	MSERV,
-	DOM,
-	API,
-	HTTP
-} Dbg_Module;
-
-/*! @{ */
 typedef enum Upnp_LogLevel_e {
 	UPNP_CRITICAL,
 	UPNP_PACKET,
 	UPNP_INFO,
 	UPNP_ALL
 } Upnp_LogLevel;
-/*! @} */
+//@}
+
+// for backward compatibility
+#define Dbg_Level	Upnp_LogLevel
 
 
 /**
@@ -103,32 +98,26 @@ typedef enum Upnp_LogLevel_e {
  *									
  * Description:								
  *	This functions initializes the log files
- *
  * Returns: int
  *	-1 : If fails
  *	UPNP_E_SUCCESS : if success
  ***************************************************************************/
-#ifdef DEBUG
 int UpnpInitLog();
-#else
+
-static UPNP_INLINE int UpnpInitLog() { return UPNP_E_SUCCESS; }
+// for backward compatibility
-#endif
+#define InitLog		UpnpInitLog
 
 
 /***************************************************************************
  * Function : UpnpSetLogLevel
  *				
- * Parameters: Upnp_LogLevel log_level
+ * Parameters:	void
  *
  * Description:							
  *	This functions set the log level (see {\tt Upnp_LogLevel}
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
+void UpnpSetLogLevel (Upnp_LogLevel);
-void UpnpSetLogLevel(Upnp_LogLevel log_level);
-#else
-static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
-#endif
 
 
 /***************************************************************************
@@ -140,11 +129,10 @@ static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
  *	This functions closes the log files
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
 void UpnpCloseLog();
-#else
+
-static UPNP_INLINE void UpnpCloseLog() {}
+// for backward compatibility
-#endif
+#define CloseLog	UpnpCloseLog
 
 
 /***************************************************************************
@@ -161,22 +149,17 @@ static UPNP_INLINE void UpnpCloseLog() {}
  *	per the requested banner	
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
+void UpnpSetLogFileNames (const char* ErrFileName, const char* InfoFileName);
-void UpnpSetLogFileNames(
+
-	const char *ErrFileName,
+// for backward compatibility
-	const char *InfoFileName);
+#define SetLogFileNames		UpnpSetLogFileNames
-#else
-static UPNP_INLINE void UpnpSetLogFileNames(
-	const char *ErrFileName,
-	const char *InfoFileName) {}
-#endif
 
 
 /***************************************************************************
  * Function : UpnpGetDebugFile		
  *						
  * Parameters:					
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
  *		whether debug statement will go to standard output, 
  *		or any of the log files.
  *	IN Dbg_Module Module: debug will go in the name of this module
@@ -188,47 +171,17 @@ static UPNP_INLINE void UpnpSetLogFileNames(
  *	NULL : if the module is turn off for debug 
  *	else returns the right file descriptor
  ***************************************************************************/
-#ifdef DEBUG
+FILE* UpnpGetDebugFile (Upnp_LogLevel level, Dbg_Module module);
-FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module);
-#else
-static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module)
-{
-	return NULL;
-}
-#endif
 
-
+// for backward compatibility
-/***************************************************************************
+#define GetDebugFile	UpnpGetDebugFile
- * Function : DebugAtThisLevel					
- *									
- * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *					
- * Description:					
- *	This functions returns true if debug output should be done in this
- *	module.
- *
- * Returns: int
- ***************************************************************************/
-#ifdef DEBUG
-int DebugAtThisLevel(
-	IN Upnp_LogLevel DLevel,
-	IN Dbg_Module Module);
-#else
-static UPNP_INLINE int DebugAtThisLevel(
-	IN Upnp_LogLevel DLevel,
-	IN Dbg_Module Module) { return 0; }
-#endif
 
 
 /***************************************************************************
  * Function : UpnpPrintf				
  *									
  * Parameters:								
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
  *		whether debug statement will go to standard output, 
  *		or any of the log files.
  *	IN Dbg_Module Module: debug will go in the name of this module
@@ -245,28 +198,14 @@ static UPNP_INLINE int DebugAtThisLevel(
  *	debug statement is coming
  * Returns: void
  ***************************************************************************/ 
-#ifdef DEBUG
+void UpnpPrintf (Upnp_LogLevel DLevel, Dbg_Module Module,
-void UpnpPrintf(
+		 const char* DbgFileName, int DbgLineNo,
-	Upnp_LogLevel DLevel,
+		 const char* FmtStr,
-	Dbg_Module Module,
+		 ...)
-	const char* DbgFileName,
-	int DbgLineNo,
-	const char* FmtStr,
-	...)
 #if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
 	__attribute__((format (__printf__, 5, 6)))
 #endif
 ;
-#else /* DEBUG */
-static UPNP_INLINE void UpnpPrintf(
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	const char* DbgFileName,
-	int DbgLineNo,
-	const char* FmtStr,
-	...) {}
-#endif /* DEBUG */
 
 
 /***************************************************************************
@@ -283,19 +222,8 @@ static UPNP_INLINE void UpnpPrintf(
  *	per the requested banner			
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
+void UpnpDisplayBanner (FILE *fd,
-void UpnpDisplayBanner(
+			const char** lines, size_t size, int starlength);
-	FILE *fd,
-	const char **lines,
-	size_t size,
-	int starlength);
-#else
-static UPNP_INLINE void UpnpDisplayBanner(
-	FILE *fd,
-	const char **lines,
-	size_t size,
-	int starlength) {}
-#endif
 
 
 /***************************************************************************
@@ -312,23 +240,19 @@ static UPNP_INLINE void UpnpDisplayBanner(
  *		debug statement is coming to the log file
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
+void UpnpDisplayFileAndLine (FILE *fd, const char *DbgFileName, int DbgLineNo);
-void UpnpDisplayFileAndLine(
+
-	FILE *fd,
+
-	const char *DbgFileName,
+//@}
-	int DbgLineNo);
-#else
-static UPNP_INLINE void UpnpDisplayFileAndLine(
-	FILE *fd,
-	const char *DbgFileName,
-	int DbgLineNo) {}
-#endif
 
-/*! @} */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* UPNP_DEBUG_H */
+#endif // UPNP_HAVE_DEBUG
+
+#endif // UPNP_DEBUG_H
+
+
 

upnp/inc/upnptools.h

@@ -1,33 +1,33 @@
-/*******************************************************************************
+///////////////////////////////////////////////////////////////////////////
- *
+//
- * Copyright (c) 2000-2003 Intel Corporation 
+// Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
+// All rights reserved. 
- *
+//
- * Redistribution and use in source and binary forms, with or without 
+// Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
+// modification, are permitted provided that the following conditions are met: 
- *
+//
- * * Redistributions of source code must retain the above copyright notice, 
+// * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
+// this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
+// * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
+// this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
+// and/or other materials provided with the distribution. 
- * * Neither name of Intel Corporation nor the names of its contributors 
+// * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
+// may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
+// without specific prior written permission.
- * 
+// 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// 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.
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+//
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
 
 /** @name Optional Tool APIs
  *  The Linux SDK for UPnP Devices contains some additional, optional 
@@ -36,14 +36,14 @@
  *  size in the SDK. Refer to the README for details.
  */
 
-/*! @{ */
+//@{
 
 #ifndef UPNP_TOOLS_H
 #define UPNP_TOOLS_H
 
 #include "upnp.h"
 
-/* Function declarations only if tools compiled into the library */
+// Function declarations only if tools compiled into the library
 #if UPNP_HAVE_TOOLS
 
 #ifdef __cplusplus
@@ -217,13 +217,14 @@ EXPORT_SPEC const char * UpnpGetErrorMessage(
         int errorcode  /** The SDK error code to convert. */
         );
 
-/*! @} */
+//@}
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* UPNP_HAVE_TOOLS */
+#endif // UPNP_HAVE_TOOLS
+
+#endif // UPNP_TOOLS_H
 
-#endif /* UPNP_TOOLS_H */
 

upnp/sample/Makefile.am

@@ -1,87 +0,0 @@
-#
-# "Makefile.am" for "libupnp/upnp/sample"
-#
-# Copyright (C) 2007 Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
-#
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/upnp/inc \
-	-I$(top_srcdir)/threadutil/inc \
-	-I$(top_srcdir)/ixml/inc
-
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-
-AM_LDFLAGS = $(PTHREAD_LIBS)
-
-LDADD = \
-	$(top_builddir)/upnp/libupnp.la \
-	$(top_builddir)/threadutil/libthreadutil.la \
-	$(top_builddir)/ixml/libixml.la
-
-
-# samples
-noinst_PROGRAMS =
-if ENABLE_SAMPLES
-if ENABLE_CLIENT
-noinst_PROGRAMS += upnp_tv_ctrlpt
-upnp_tv_ctrlpt_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(srcdir)/common/ \
-	-I$(srcdir)/tvctrlpt
-if ENABLE_DEVICE
-noinst_PROGRAMS += upnp_tv_combo
-upnp_tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
-	-I$(srcdir)/common/ \
-	-I$(srcdir)/tvcombo
-endif
-endif
-if ENABLE_DEVICE
-noinst_PROGRAMS += upnp_tv_device
-upnp_tv_device_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-I$(srcdir)/common/ \
-	-I$(srcdir)/tvdevice
-endif
-endif
-
-
-upnp_tv_device_SOURCES = \
-	common/sample_util.c \
-	common/sample_util.h \
-	tvdevice/upnp_tv_device.c \
-	tvdevice/upnp_tv_device.h \
-	tvdevice/linux/upnp_tv_device_main.c
-
-
-upnp_tv_ctrlpt_SOURCES = \
-	common/sample_util.c \
-	common/sample_util.h \
-	tvctrlpt/upnp_tv_ctrlpt.c \
-	tvctrlpt/upnp_tv_ctrlpt.h \
-	tvctrlpt/linux/upnp_tv_ctrlpt_main.c
-
-upnp_tv_combo_SOURCES = \
-	common/sample_util.c \
-	common/sample_util.h \
-	tvcombo/upnp_tv_ctrlpt.c \
-	tvcombo/upnp_tv_ctrlpt.h \
-	tvcombo/upnp_tv_device.c \
-	tvcombo/upnp_tv_device.h \
-	tvcombo/linux/upnp_tv_combo_main.c
-
-
-if WITH_DOCUMENTATION
-examplesdir = $(docdir)/examples
-examples_DATA = \
-		$(upnp_tv_ctrlpt_SOURCES) \
-		$(upnp_tv_device_SOURCES)
-endif
-
-
-EXTRA_DIST = \
-	web/tvcombodesc.xml \
-	web/tvcontrolSCPD.xml \
-	web/tvdevicedesc.xml \
-	web/tvdevicepres.html \
-	web/tvpictureSCPD.xml
-

upnp/sample/tvcombo/linux/upnp_tv_combo_main.c

@@ -1,489 +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.
-//
-///////////////////////////////////////////////////////////////////////////
-
-
-#include "sample_util.h"
-#include "upnp_tv_ctrlpt.h"
-#include "upnp_tv_device.h"
-
-
-#include <stdio.h>
-#include <string.h>
-
-/*
-   Tags for valid commands issued at the command prompt 
- */
-enum cmdloop_tvcmds {
-    PRTHELP = 0, PRTFULLHELP, POWON, POWOFF,
-    SETCHAN, SETVOL, SETCOL, SETTINT, SETCONT, SETBRT,
-    CTRLACTION, PICTACTION, CTRLGETVAR, PICTGETVAR,
-    PRTDEV, LSTDEV, REFRESH, EXITCMD
-};
-
-/*
-   Data structure for parsing commands from the command line 
- */
-struct cmdloop_commands {
-    char *str;                  // the string 
-    int cmdnum;                 // the command
-    int numargs;                // the number of arguments
-    char *args;                 // the args
-} cmdloop_commands;
-
-/*
-   Mappings between command text names, command tag,
-   and required command arguments for command line
-   commands 
- */
-static struct cmdloop_commands cmdloop_cmdlist[] = {
-    {"Help", PRTHELP, 1, ""},
-    {"HelpFull", PRTFULLHELP, 1, ""},
-    {"ListDev", LSTDEV, 1, ""},
-    {"Refresh", REFRESH, 1, ""},
-    {"PrintDev", PRTDEV, 2, "<devnum>"},
-    {"PowerOn", POWON, 2, "<devnum>"},
-    {"PowerOff", POWOFF, 2, "<devnum>"},
-    {"SetChannel", SETCHAN, 3, "<devnum> <channel (int)>"},
-    {"SetVolume", SETVOL, 3, "<devnum> <volume (int)>"},
-    {"SetColor", SETCOL, 3, "<devnum> <color (int)>"},
-    {"SetTint", SETTINT, 3, "<devnum> <tint (int)>"},
-    {"SetContrast", SETCONT, 3, "<devnum> <contrast (int)>"},
-    {"SetBrightness", SETBRT, 3, "<devnum> <brightness (int)>"},
-    {"CtrlAction", CTRLACTION, 2, "<devnum> <action (string)>"},
-    {"PictAction", PICTACTION, 2, "<devnum> <action (string)>"},
-    {"CtrlGetVar", CTRLGETVAR, 2, "<devnum> <varname (string)>"},
-    {"PictGetVar", PICTGETVAR, 2, "<devnum> <varname (string)>"},
-    {"Exit", EXITCMD, 1, ""}
-};
-
-void
-linux_print( const char *string )
-{
-    puts( string );
-}
-
-/********************************************************************************
- * TvCtrlPointPrintHelp
- *
- * Description: 
- *       Print help info for this application.
- ********************************************************************************/
-void
-TvCtrlPointPrintShortHelp( void )
-{
-    SampleUtil_Print( "Commands:" );
-    SampleUtil_Print( "  Help" );
-    SampleUtil_Print( "  HelpFull" );
-    SampleUtil_Print( "  ListDev" );
-    SampleUtil_Print( "  Refresh" );
-    SampleUtil_Print( "  PrintDev      <devnum>" );
-    SampleUtil_Print( "  PowerOn       <devnum>" );
-    SampleUtil_Print( "  PowerOff      <devnum>" );
-    SampleUtil_Print( "  SetChannel    <devnum> <channel>" );
-    SampleUtil_Print( "  SetVolume     <devnum> <volume>" );
-    SampleUtil_Print( "  SetColor      <devnum> <color>" );
-    SampleUtil_Print( "  SetTint       <devnum> <tint>" );
-    SampleUtil_Print( "  SetContrast   <devnum> <contrast>" );
-    SampleUtil_Print( "  SetBrightness <devnum> <brightness>" );
-    SampleUtil_Print( "  CtrlAction    <devnum> <action>" );
-    SampleUtil_Print( "  PictAction    <devnum> <action>" );
-    SampleUtil_Print( "  CtrlGetVar    <devnum> <varname>" );
-    SampleUtil_Print( "  PictGetVar    <devnum> <action>" );
-    SampleUtil_Print( "  Exit" );
-}
-
-void
-TvCtrlPointPrintLongHelp( void )
-{
-    SampleUtil_Print( "" );
-    SampleUtil_Print( "******************************" );
-    SampleUtil_Print( "* TV Control Point Help Info *" );
-    SampleUtil_Print( "******************************" );
-    SampleUtil_Print( "" );
-    SampleUtil_Print( "This sample control point application automatically searches" );
-    SampleUtil_Print( "for and subscribes to the services of television device emulator" );
-    SampleUtil_Print( "devices. While registers a tv device itself." );
-    SampleUtil_Print( "" );
-    SampleUtil_Print( "Commands:" );
-    SampleUtil_Print( "  Help" );
-    SampleUtil_Print( "       Print this help info." );
-    SampleUtil_Print( "  ListDev" );
-    SampleUtil_Print( "       Print the current list of TV Device Emulators that this" );
-    SampleUtil_Print( "         control point is aware of.  Each device is preceded by a" );
-    SampleUtil_Print( "         device number which corresponds to the devnum argument of" );
-    SampleUtil_Print( "         commands listed below." );
-    SampleUtil_Print( "  Refresh" );
-    SampleUtil_Print( "       Delete all of the devices from the device list and issue new" );
-    SampleUtil_Print( "         search request to rebuild the list from scratch." );
-    SampleUtil_Print( "  PrintDev       <devnum>" );
-    SampleUtil_Print( "       Print the state table for the device <devnum>." );
-    SampleUtil_Print( "         e.g., 'PrintDev 1' prints the state table for the first" );
-    SampleUtil_Print( "         device in the device list." );
-    SampleUtil_Print( "  PowerOn        <devnum>" );
-    SampleUtil_Print( "       Sends the PowerOn action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>." );
-    SampleUtil_Print( "  PowerOff       <devnum>" );
-    SampleUtil_Print( "       Sends the PowerOff action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>." );
-    SampleUtil_Print( "  SetChannel     <devnum> <channel>" );
-    SampleUtil_Print( "       Sends the SetChannel action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>, requesting the channel to be changed" );
-    SampleUtil_Print( "         to <channel>." );
-    SampleUtil_Print( "  SetVolume      <devnum> <volume>" );
-    SampleUtil_Print( "       Sends the SetVolume action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>, requesting the volume to be changed" );
-    SampleUtil_Print( "         to <volume>." );
-    SampleUtil_Print( "  SetColor       <devnum> <color>" );
-    SampleUtil_Print( "       Sends the SetColor action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>, requesting the color to be changed" );
-    SampleUtil_Print( "         to <color>." );
-    SampleUtil_Print( "  SetTint        <devnum> <tint>" );
-    SampleUtil_Print( "       Sends the SetTint action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>, requesting the tint to be changed" );
-    SampleUtil_Print( "         to <tint>." );
-    SampleUtil_Print( "  SetContrast    <devnum> <contrast>" );
-    SampleUtil_Print( "       Sends the SetContrast action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>, requesting the contrast to be changed" );
-    SampleUtil_Print( "         to <contrast>." );
-    SampleUtil_Print( "  SetBrightness  <devnum> <brightness>" );
-    SampleUtil_Print( "       Sends the SetBrightness action to the Control Service of" );
-    SampleUtil_Print( "         device <devnum>, requesting the brightness to be changed" );
-    SampleUtil_Print( "         to <brightness>." );
-    SampleUtil_Print( "  CtrlAction     <devnum> <action>" );
-    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
-    SampleUtil_Print( "         to the Control Service of device <devnum>.  This command" );
-    SampleUtil_Print( "         only works for actions that have no arguments." );
-    SampleUtil_Print( "         (e.g., \"CtrlAction 1 IncreaseChannel\")" );
-    SampleUtil_Print( "  PictAction     <devnum> <action>" );
-    SampleUtil_Print( "       Sends an action request specified by the string <action>" );
-    SampleUtil_Print( "         to the Picture Service of device <devnum>.  This command" );
-    SampleUtil_Print( "         only works for actions that have no arguments." );
-    SampleUtil_Print( "         (e.g., \"PictAction 1 DecreaseContrast\")" );
-    SampleUtil_Print( "  CtrlGetVar     <devnum> <varname>" );
-    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
-    SampleUtil_Print( "         from the Control Service of device <devnum>." );
-    SampleUtil_Print( "         (e.g., \"CtrlGetVar 1 Volume\")" );
-    SampleUtil_Print( "  PictGetVar     <devnum> <action>" );
-    SampleUtil_Print( "       Requests the value of a variable specified by the string <varname>" );
-    SampleUtil_Print( "         from the Picture Service of device <devnum>." );
-    SampleUtil_Print( "         (e.g., \"PictGetVar 1 Tint\")" );
-    SampleUtil_Print( "  Exit" );
-    SampleUtil_Print( "       Exits the control point application." );
-}
-
-/********************************************************************************
- * TvCtrlPointPrintCommands
- *
- * Description: 
- *       Print the list of valid command line commands to the user
- *
- * Parameters:
- *   None
- *
- ********************************************************************************/
-void
-TvCtrlPointPrintCommands()
-{
-    int i;
-    int numofcmds = sizeof( cmdloop_cmdlist ) / sizeof( cmdloop_commands );
-
-    SampleUtil_Print( "Valid Commands:" );
-    for( i = 0; i < numofcmds; i++ ) {
-        SampleUtil_Print( "  %-14s %s", cmdloop_cmdlist[i].str,
-                          cmdloop_cmdlist[i].args );
-    }
-    SampleUtil_Print( "" );
-}
-
-/********************************************************************************
- * TvCtrlPointCommandLoop
- *
- * Description: 
- *       Function that receives commands from the user at the command prompt
- *       during the lifetime of the control point, and calls the appropriate
- *       functions for those commands.
- *
- * Parameters:
- *    None
- *
- ********************************************************************************/
-void *
-TvCtrlPointCommandLoop( void *args )
-{
-    char cmdline[100];
-
-    while( 1 ) {
-        SampleUtil_Print( "\n>> " );
-        fgets( cmdline, 100, stdin );
-        TvCtrlPointProcessCommand( cmdline );
-    }
-
-    return NULL;
-}
-
-int
-TvCtrlPointProcessCommand( char *cmdline )
-{
-    char cmd[100];
-    char strarg[100];
-    int arg_val_err = -99999;
-    int arg1 = arg_val_err;
-    int arg2 = arg_val_err;
-    int cmdnum = -1;
-    int numofcmds = sizeof( cmdloop_cmdlist ) / sizeof( cmdloop_commands );
-    int cmdfound = 0;
-    int i,
-      rc;
-    int invalidargs = 0;
-    int validargs;
-
-    validargs = sscanf( cmdline, "%s %d %d", cmd, &arg1, &arg2 );
-
-    for( i = 0; i < numofcmds; i++ ) {
-        if( strcasecmp( cmd, cmdloop_cmdlist[i].str ) == 0 ) {
-            cmdnum = cmdloop_cmdlist[i].cmdnum;
-            cmdfound++;
-            if( validargs != cmdloop_cmdlist[i].numargs )
-                invalidargs++;
-            break;
-        }
-    }
-
-    if( !cmdfound ) {
-        SampleUtil_Print( "Command not found; try 'Help'" );
-        return TV_SUCCESS;
-    }
-
-    if( invalidargs ) {
-        SampleUtil_Print( "Invalid arguments; try 'Help'" );
-        return TV_SUCCESS;
-    }
-
-    switch ( cmdnum ) {
-        case PRTHELP:
-            TvCtrlPointPrintShortHelp();
-            break;
-
-        case PRTFULLHELP:
-            TvCtrlPointPrintLongHelp();
-            break;
-
-        case POWON:
-            TvCtrlPointSendPowerOn( arg1 );
-            break;
-
-        case POWOFF:
-            TvCtrlPointSendPowerOff( arg1 );
-            break;
-
-        case SETCHAN:
-            TvCtrlPointSendSetChannel( arg1, arg2 );
-            break;
-
-        case SETVOL:
-            TvCtrlPointSendSetVolume( arg1, arg2 );
-            break;
-
-        case SETCOL:
-            TvCtrlPointSendSetColor( arg1, arg2 );
-            break;
-
-        case SETTINT:
-            TvCtrlPointSendSetTint( arg1, arg2 );
-            break;
-
-        case SETCONT:
-            TvCtrlPointSendSetContrast( arg1, arg2 );
-            break;
-
-        case SETBRT:
-            TvCtrlPointSendSetBrightness( arg1, arg2 );
-            break;
-
-        case CTRLACTION:
-            /*
-               re-parse commandline since second arg is string 
-             */
-            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
-            if( 3 == validargs )
-                TvCtrlPointSendAction( TV_SERVICE_CONTROL, arg1, strarg,
-                                       NULL, NULL, 0 );
-            else
-                invalidargs++;
-            break;
-
-        case PICTACTION:
-            /*
-               re-parse commandline since second arg is string 
-             */
-            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
-            if( 3 == validargs )
-                TvCtrlPointSendAction( TV_SERVICE_PICTURE, arg1, strarg,
-                                       NULL, NULL, 0 );
-            else
-                invalidargs++;
-            break;
-
-        case CTRLGETVAR:
-            /*
-               re-parse commandline since second arg is string 
-             */
-            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
-            if( 3 == validargs )
-                TvCtrlPointGetVar( TV_SERVICE_CONTROL, arg1, strarg );
-            else
-                invalidargs++;
-            break;
-
-        case PICTGETVAR:
-            /*
-               re-parse commandline since second arg is string 
-             */
-            validargs = sscanf( cmdline, "%s %d %s", cmd, &arg1, strarg );
-            if( 3 == validargs )
-                TvCtrlPointGetVar( TV_SERVICE_PICTURE, arg1, strarg );
-            else
-                invalidargs++;
-            break;
-
-        case PRTDEV:
-            TvCtrlPointPrintDevice( arg1 );
-            break;
-
-        case LSTDEV:
-            TvCtrlPointPrintList();
-            break;
-
-        case REFRESH:
-            TvCtrlPointRefresh();
-            break;
-
-        case EXITCMD:
-            rc = TvCtrlPointStop();
-            exit( rc );
-            break;
-
-        default:
-            SampleUtil_Print( "Command not implemented; see 'Help'" );
-            break;
-    }
-
-    if( invalidargs )
-        SampleUtil_Print( "Invalid args in command; see 'Help'" );
-
-    return TV_SUCCESS;
-}
-
-int
-device_main( int argc, char **argv )
-{
-
-    unsigned int portTemp = 0;
-    char *ip_address = NULL,
-     *desc_doc_name = NULL,
-     *web_dir_path = NULL;
-    unsigned int port = 0;
-
-    int i = 0;
-
-    SampleUtil_Initialize( linux_print );
-
-    // Parse options
-    for( i = 1; i < argc; i++ ) {
-        if( strcmp( argv[i], "-ip" ) == 0 ) {
-            ip_address = argv[++i];
-        } else if( strcmp( argv[i], "-port" ) == 0 ) {
-            sscanf( argv[++i], "%u", &portTemp );
-        } else if( strcmp( argv[i], "-desc" ) == 0 ) {
-            desc_doc_name = argv[++i];
-        } else if( strcmp( argv[i], "-webdir" ) == 0 ) {
-            web_dir_path = argv[++i];
-        } else if( strcmp( argv[i], "-help" ) == 0 ) {
-            SampleUtil_Print( "Usage: %s -ip ipaddress -port port"
-                              " -desc desc_doc_name -webdir web_dir_path"
-                              " -help (this message)\n", argv[0] );
-            SampleUtil_Print( "\tipaddress:     IP address of the device"
-                              " (must match desc. doc)\n" );
-            SampleUtil_Print( "\t\te.g.: 192.168.0.4\n" );
-            SampleUtil_Print( "\tport:          Port number to use for "
-                              "receiving UPnP messages (must match desc. doc)\n" );
-            SampleUtil_Print( "\t\te.g.: 5431\n" );
-            SampleUtil_Print
-                ( "\tdesc_doc_name: name of device description document\n" );
-            SampleUtil_Print( "\t\te.g.: tvcombodesc.xml\n" );
-            SampleUtil_Print
-                ( "\tweb_dir_path: Filesystem path where web files "
-                  "related to the device are stored\n" );
-            SampleUtil_Print( "\t\te.g.: /upnp/sample/web\n" );
-            return 1;
-        }
-    }
-
-    port = ( unsigned short )portTemp;
-
-    return TvDeviceStart(
-        ip_address, port, desc_doc_name, web_dir_path, linux_print );
-}
-
-int
-main( int argc, char **argv )
-{
-    int rc;
-    ithread_t cmdloop_thread;
-    int sig;
-    sigset_t sigs_to_catch;
-    int code;
-
-    device_main(argc, argv);
-    rc = TvCtrlPointStart( linux_print, NULL );
-    if( rc != TV_SUCCESS ) {
-        SampleUtil_Print( "Error starting UPnP TV Control Point" );
-        return rc;
-    }
-    // start a command loop thread
-    code =
-        ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop,
-                        NULL );
-
-    /*
-       Catch Ctrl-C and properly shutdown 
-     */
-    sigemptyset( &sigs_to_catch );
-    sigaddset( &sigs_to_catch, SIGINT );
-    sigwait( &sigs_to_catch, &sig );
-
-    SampleUtil_Print( "Shutting down on signal %d...", sig );
-    TvDeviceStop();
-    rc = TvCtrlPointStop();
-    
-    return rc;
-}
-

upnp/sample/tvcombo/upnp_tv_ctrlpt.h

@@ -1,158 +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 UPNP_TV_CTRLPT_H
-#define UPNP_TV_CTRLPT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-
-#include "ithread.h"
-#include <unistd.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-
-#include "upnp.h"
-#include "upnptools.h"
-#include "sample_util.h"
-
-#define TV_SERVICE_SERVCOUNT	2
-#define TV_SERVICE_CONTROL		0
-#define TV_SERVICE_PICTURE		1
-
-#define TV_CONTROL_VARCOUNT		3
-#define TV_CONTROL_POWER		0
-#define TV_CONTROL_CHANNEL		1
-#define TV_CONTROL_VOLUME		2
-
-#define TV_PICTURE_VARCOUNT		4
-#define TV_PICTURE_COLOR		0
-#define TV_PICTURE_TINT			1
-#define TV_PICTURE_CONTRAST		2
-#define TV_PICTURE_BRIGHTNESS	3
-
-#define TV_MAX_VAL_LEN			5
-
-#define TV_SUCCESS				0
-#define TV_ERROR				(-1)
-#define TV_WARNING				1
-
-/* This should be the maximum VARCOUNT from above */
-#define TV_MAXVARS				TV_PICTURE_VARCOUNT
-
-extern char TvDeviceType[];
-extern char *TvServiceType[];
-extern char *TvServiceName[];
-extern char *TvVarName[TV_SERVICE_SERVCOUNT][TV_MAXVARS];
-extern char TvVarCount[];
-
-struct tv_service {
-    char ServiceId[NAME_SIZE];
-    char ServiceType[NAME_SIZE];
-    char *VariableStrVal[TV_MAXVARS];
-    char EventURL[NAME_SIZE];
-    char ControlURL[NAME_SIZE];
-    char SID[NAME_SIZE];
-};
-
-extern struct TvDeviceNode *GlobalDeviceList;
-
-struct TvDevice {
-    char UDN[250];
-    char DescDocURL[250];
-    char FriendlyName[250];
-    char PresURL[250];
-    int  AdvrTimeOut;
-    struct tv_service TvService[TV_SERVICE_SERVCOUNT];
-};
-
-struct TvDeviceNode {
-    struct TvDevice device;
-    struct TvDeviceNode *next;
-};
-
-extern ithread_mutex_t DeviceListMutex;
-
-extern UpnpClient_Handle ctrlpt_handle;
-
-void	TvCtrlPointPrintHelp( void );
-int		TvCtrlPointDeleteNode(struct TvDeviceNode*);
-int		TvCtrlPointRemoveDevice(char*);
-int		TvCtrlPointRemoveAll( void );
-int		TvCtrlPointRefresh( void );
-
-
-int		TvCtrlPointSendAction(int, int, char *, char **, char **, int);
-int		TvCtrlPointSendActionNumericArg(int devnum, int service, char *actionName, char *paramName, int paramValue);
-int		TvCtrlPointSendPowerOn(int devnum);
-int		TvCtrlPointSendPowerOff(int devnum);
-int		TvCtrlPointSendSetChannel(int, int);
-int		TvCtrlPointSendSetVolume(int, int);
-int		TvCtrlPointSendSetColor(int, int);
-int		TvCtrlPointSendSetTint(int, int);
-int		TvCtrlPointSendSetContrast(int, int);
-int		TvCtrlPointSendSetBrightness(int, int);
-
-int		TvCtrlPointGetVar(int, int, char*);
-int		TvCtrlPointGetPower(int devnum);
-int		TvCtrlPointGetChannel(int);
-int		TvCtrlPointGetVolume(int);
-int		TvCtrlPointGetColor(int);
-int		TvCtrlPointGetTint(int);
-int		TvCtrlPointGetContrast(int);
-int		TvCtrlPointGetBrightness(int);
-
-int		TvCtrlPointGetDevice(int, struct TvDeviceNode **);
-int		TvCtrlPointPrintList( void );
-int		TvCtrlPointPrintDevice(int);
-void	TvCtrlPointAddDevice (IXML_Document *, char *, int); 
-void    TvCtrlPointHandleGetVar(char *,char *,DOMString);
-void	TvStateUpdate(char*,int, IXML_Document * , char **);
-void	TvCtrlPointHandleEvent(Upnp_SID, int, IXML_Document *); 
-void	TvCtrlPointHandleSubscribeUpdate(char *, Upnp_SID, int); 
-int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
-void	TvCtrlPointVerifyTimeouts(int);
-void	TvCtrlPointPrintCommands( void );
-void*	TvCtrlPointCommandLoop( void* );
-int		TvCtrlPointStart( print_string printFunctionPtr, state_update updateFunctionPtr );
-int		TvCtrlPointStop( void );
-int		TvCtrlPointProcessCommand( char *cmdline );
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif //UPNP_TV_CTRLPT_H

upnp/sample/tvcombo/upnp_tv_device.h

@@ -1,638 +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 UPNP_TV_DEVICE_H
-#define UPNP_TV_DEVICE_H
-
-#include <stdio.h>
-#include <signal.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ithread.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include "upnp.h"
-#include "sample_util.h"
-
-//Color constants
-#define MAX_COLOR 10
-#define MIN_COLOR 1
-
-//Brightness constants
-#define MAX_BRIGHTNESS 10
-#define MIN_BRIGHTNESS 1
-
-//Power constants
-#define POWER_ON 1
-#define POWER_OFF 0
-
-//Tint constants
-#define MAX_TINT 10
-#define MIN_TINT 1
-
-//Volume constants
-#define MAX_VOLUME 10
-#define MIN_VOLUME 1
-
-//Contrast constants
-#define MAX_CONTRAST 10
-#define MIN_CONTRAST 1
-
-//Channel constants
-#define MAX_CHANNEL 100
-#define MIN_CHANNEL 1
-
-//Number of services.
-#define TV_SERVICE_SERVCOUNT  2
-
-//Index of control service
-#define TV_SERVICE_CONTROL    0
-
-//Index of picture service
-#define TV_SERVICE_PICTURE    1
-
-//Number of control variables
-#define TV_CONTROL_VARCOUNT   3
-
-//Index of power variable
-#define TV_CONTROL_POWER      0
-
-//Index of channel variable
-#define TV_CONTROL_CHANNEL    1
-
-//Index of volume variable
-#define TV_CONTROL_VOLUME     2
-
-//Number of picture variables
-#define TV_PICTURE_VARCOUNT   4
-
-//Index of color variable
-#define TV_PICTURE_COLOR      0
-
-//Index of tint variable
-#define TV_PICTURE_TINT       1
-
-//Index of contrast variable
-#define TV_PICTURE_CONTRAST   2
-
-//Index of brightness variable
-#define TV_PICTURE_BRIGHTNESS 3
-
-//Max value length
-#define TV_MAX_VAL_LEN 5
-
-//Max actions
-#define TV_MAXACTIONS 12
-
-/* This should be the maximum VARCOUNT from above */
-#define TV_MAXVARS TV_PICTURE_VARCOUNT
-
-
-extern char TvDeviceType[];
-
-extern char *TvServiceType[];
-
-
-
-/******************************************************************************
- * upnp_action
- *
- * Description: 
- *       Prototype for all actions. For each action that a service 
- *       implements, there is a corresponding function with this prototype.
- *       Pointers to these functions, along with action names, are stored
- *       in the service table. When an action request comes in the action
- *       name is matched, and the appropriate function is called.
- *       Each function returns UPNP_E_SUCCESS, on success, and a nonzero 
- *       error code on failure.
- *
- * Parameters:
- *
- *    IXML_Document * request - document of action request
- *    IXML_Document **out - action result
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-
-typedef int (*upnp_action) (IXML_Document *request, IXML_Document **out, 
-			    char **errorString);
-
-/* Structure for storing Tv Service
-   identifiers and state table */
-struct TvService {
-  
-  char UDN[NAME_SIZE]; /* Universally Unique Device Name */
-  char ServiceId[NAME_SIZE];
-  char ServiceType[NAME_SIZE];
-  char *VariableName[TV_MAXVARS]; 
-  char *VariableStrVal[TV_MAXVARS];
-  char *ActionNames[TV_MAXACTIONS];
-  upnp_action actions[TV_MAXACTIONS];
-  unsigned int  VariableCount;
-};
-
-//Array of service structures
-extern struct TvService tv_service_table[];
-
-//Device handle returned from sdk
-extern UpnpDevice_Handle device_handle;
-
-
-/* Mutex for protecting the global state table data
-   in a multi-threaded, asynchronous environment.
-   All functions should lock this mutex before reading
-   or writing the state table data. */
-extern ithread_mutex_t TVDevMutex;
-
-
-
-/******************************************************************************
- * SetActionTable
- *
- * Description: 
- *       Initializes the action table for the specified service.
- *       Note that 
- *       knowledge of the service description is
- *       assumed.  Action names are hardcoded.
- * Parameters:
- *   int serviceType - one of TV_SERVICE_CONTROL or, TV_SERVICE_PICTURE
- *   struct TvService *out - service containing action table to set.
- *
- *****************************************************************************/
-int SetActionTable(int serviceType, struct TvService * out);
-
-/******************************************************************************
- * TvDeviceStateTableInit
- *
- * Description: 
- *       Initialize the device state table for 
- * 	 this TvDevice, pulling identifier info
- *       from the description Document.  Note that 
- *       knowledge of the service description is
- *       assumed.  State table variables and default
- *       values are currently hardcoded in this file
- *       rather than being read from service description
- *       documents.
- *
- * Parameters:
- *   DescDocURL -- The description document URL
- *
- *****************************************************************************/
-int TvDeviceStateTableInit(char*);
-
-
-/******************************************************************************
- * TvDeviceHandleSubscriptionRequest
- *
- * Description: 
- *       Called during a subscription request callback.  If the
- *       subscription request is for this device and either its
- *       control service or picture service, then accept it.
- *
- * Parameters:
- *   sr_event -- The subscription request event structure
- *
- *****************************************************************************/
-int TvDeviceHandleSubscriptionRequest(struct Upnp_Subscription_Request *);
-
-/******************************************************************************
- * TvDeviceHandleGetVarRequest
- *
- * Description: 
- *       Called during a get variable request callback.  If the
- *       request is for this device and either its control service
- *       or picture service, then respond with the variable value.
- *
- * Parameters:
- *   cgv_event -- The control get variable request event structure
- *
- *****************************************************************************/
-int TvDeviceHandleGetVarRequest(struct Upnp_State_Var_Request *);
-
-/******************************************************************************
- * TvDeviceHandleActionRequest
- *
- * Description: 
- *       Called during an action request callback.  If the
- *       request is for this device and either its control service
- *       or picture service, then perform the action and respond.
- *
- * Parameters:
- *   ca_event -- The control action request event structure
- *
- *****************************************************************************/
-int TvDeviceHandleActionRequest(struct Upnp_Action_Request *);
-
-/******************************************************************************
- * TvDeviceCallbackEventHandler
- *
- * Description: 
- *       The callback handler registered with the SDK while registering
- *       root device.  Dispatches the request to the appropriate procedure
- *       based on the value of EventType. The four requests handled by the 
- *       device are: 
- *                   1) Event Subscription requests.  
- *                   2) Get Variable requests. 
- *                   3) Action requests.
- *
- * Parameters:
- *
- *   EventType -- The type of callback event
- *   Event -- Data structure containing event data
- *   Cookie -- Optional data specified during callback registration
- *
- *****************************************************************************/
-int TvDeviceCallbackEventHandler(Upnp_EventType, void*, void*);
-
-/******************************************************************************
- * TvDeviceSetServiceTableVar
- *
- * Description: 
- *       Update the TvDevice service state table, and notify all subscribed 
- *       control points of the updated state.  Note that since this function
- *       blocks on the mutex TVDevMutex, to avoid a hang this function should 
- *       not be called within any other function that currently has this mutex 
- *       locked.
- *
- * Parameters:
- *   service -- The service number (TV_SERVICE_CONTROL or TV_SERVICE_PICTURE)
- *   variable -- The variable number (TV_CONTROL_POWER, TV_CONTROL_CHANNEL,
- *                   TV_CONTROL_VOLUME, TV_PICTURE_COLOR, TV_PICTURE_TINT,
- *                   TV_PICTURE_CONTRAST, or TV_PICTURE_BRIGHTNESS)
- *   value -- The string representation of the new value
- *
- *****************************************************************************/
-int TvDeviceSetServiceTableVar(unsigned int, unsigned int, char*);
-
-//Control Service Actions
-
-/******************************************************************************
- * TvDevicePowerOn
- *
- * Description: 
- *       Turn the power on.
- *
- * Parameters:
- *
- *    IXML_Document * in - document of action request
- *    IXML_Document **out - action result
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDevicePowerOn(IN IXML_Document * in, OUT IXML_Document **out, 
-		    OUT char **errorString);
-
-/******************************************************************************
- * TvDevicePowerOff
- *
- * Description: 
- *       Turn the power off.
- *
- * Parameters:
- *    
- *    IXML_Document * in - document of action request
- *    IXML_Document **out - action result
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDevicePowerOff(IN IXML_Document *in, OUT IXML_Document **out, 
-		     OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceSetChannel
- *
- * Description: 
- *       Change the channel, update the TvDevice control service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- *
- * Parameters:
- *    
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceSetChannel(IN IXML_Document *in, OUT IXML_Document **out, 
-		       OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceIncreaseChannel
- *
- * Description: 
- *       Increase the channel.  
- *
- * Parameters:
- *   
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceIncreaseChannel(IN IXML_Document *in, OUT IXML_Document **out, 
-			    OUT char **errorString);
-/******************************************************************************
- * TvDeviceDecreaseChannel
- *
- * Description: 
- *       Decrease the channel.  
- *
- * Parameters:
- *   
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceDecreaseChannel(IN IXML_Document *in, OUT IXML_Document **out, 
-			    OUT char **errorString);
-/******************************************************************************
- * TvDeviceSetVolume
- *
- * Description: 
- *       Change the volume, update the TvDevice control service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- *
- * Parameters:
- *  
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceSetVolume(IN IXML_Document *in, OUT IXML_Document **out, 
-		      OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceIncreaseVolume
- *
- * Description: 
- *       Increase the volume. 
- *
- * Parameters:
- *   
- *
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *****************************************************************************/
-int TvDeviceIncreaseVolume(IN IXML_Document *in, OUT IXML_Document**out, 
-			   OUT char **errorString);
-
-
-/******************************************************************************
- * TvDeviceDecreaseVolume
- *
- * Description: 
- *       Decrease the volume.
- *
- * Parameters:
- *   
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceDecreaseVolume(IN IXML_Document *in, OUT IXML_Document**out, 
-			   OUT char **errorString);
-
-
-//Picture Service Actions
-
-/******************************************************************************
- * TvDeviceSetColor
- *
- * Description: 
- *       Change the color, update the TvDevice picture service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- *
- * Parameters:
- *   
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceSetColor(IN IXML_Document *in, OUT IXML_Document **out, 
-		     OUT char **errorString);
-
-
-/******************************************************************************
- * TvDeviceIncreaseColor
- *
- * Description: 
- *       Increase the color.
- *
- * Parameters:
- *
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *****************************************************************************/
-int TvDeviceIncreaseColor(IN IXML_Document * in, OUT IXML_Document **out, 
-			  OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceDecreaseColor
- *
- * Description: 
- *       Decrease the color.  
- *
- * Parameters:
- *   
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *****************************************************************************/
-int TvDeviceDecreaseColor(IN IXML_Document * in, OUT IXML_Document **out, 
-			  OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceSetTint
- *
- * Description: 
- *       Change the tint, update the TvDevice picture service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- *
- * Parameters:
- *
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceSetTint(IN IXML_Document *in, OUT IXML_Document **out, 
-		    OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceIncreaseTint
- *
- * Description: 
- *       Increase tint.
- *
- * Parameters:
- *   
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceIncreaseTint(IN IXML_Document *in, OUT IXML_Document **out, 
-			 OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceDecreaseTint
- *
- * Description: 
- *       Decrease tint.
- *
- * Parameters:
- *  
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceDecreaseTint(IN IXML_Document *in, OUT IXML_Document **out, 
-			 OUT char **errorString);
-
-/*****************************************************************************
- * TvDeviceSetContrast
- *
- * Description: 
- *       Change the contrast, update the TvDevice picture service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- *
- * Parameters:
- *   
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- ****************************************************************************/
-int TvDeviceSetContrast(IN IXML_Document *in, OUT IXML_Document **out, 
-			OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceIncreaseContrast
- *
- * Description: 
- *
- *      Increase the contrast.
- *
- * Parameters:
- *       
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceIncreaseContrast(IN IXML_Document *in, OUT IXML_Document **out, 
-			     OUT char **errorString);
-/******************************************************************************
- * TvDeviceDecreaseContrast
- *
- * Description: 
- *      Decrease the contrast.
- *
- * Parameters:
- *          
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceDecreaseContrast(IN IXML_Document *in, OUT IXML_Document **out, 
-			     OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceSetBrightness
- *
- * Description: 
- *       Change the brightness, update the TvDevice picture service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- *
- * Parameters:
- *   brightness -- The brightness value to change to.
- *
- *****************************************************************************/
-int TvDeviceSetBrightness(IN IXML_Document *in, OUT IXML_Document **out, 
-			  OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceIncreaseBrightness
- *
- * Description: 
- *       Increase brightness.
- *
- * Parameters:
- *
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceIncreaseBrightness(IN IXML_Document *in, OUT IXML_Document **out, 
-			       OUT char **errorString);
-
-/******************************************************************************
- * TvDeviceDecreaseBrightness
- *
- * Description: 
- *       Decrease brightnesss.
- *
- * Parameters:
- *    IXML_Document * in -  action request document
- *    IXML_Document **out - action result document
- *    char **errorString - errorString (in case action was unsuccessful)
- *
- *****************************************************************************/
-int TvDeviceDecreaseBrightness(IN IXML_Document *in, OUT IXML_Document **out, 
-			       OUT char **errorString);
-
-int TvDeviceStart(char * ip_address, unsigned short port,char * desc_doc_name,
-				  char *web_dir_path, print_string pfun);
-int TvDeviceStop();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c

@@ -1362,7 +1362,7 @@ TvCtrlPointStart( print_string printFunctionPtr,
 
     ithread_mutex_init( &DeviceListMutex, 0 );
 
-    SampleUtil_Print( "Initializing UPnP with ipaddress=%s port=%d",
+    SampleUtil_Print( "Intializing UPnP with ipaddress=%s port=%d",
                       ip_address, port );
     rc = UpnpInit( ip_address, port );
     if( UPNP_E_SUCCESS != rc ) {

upnp/sample/tvdevice/upnp_tv_device.c

@@ -1974,7 +1974,9 @@ TvDeviceStart( char *ip_address,
         ip_address = UpnpGetServerIpAddress(  );
     }
 
+    if( port == 0 ) {
         port = UpnpGetServerPort(  );
+    }
 
     SampleUtil_Print( "UPnP Initialized\n \t ipaddress= %s port = %d\n",
                       ip_address, port );

upnp/sample/tvdevice/web/tvcontrolSCPD.xml

@@ -7,6 +7,7 @@
   </specVersion>
 
 
+
   <actionList>
 
     <action>
@@ -37,12 +38,6 @@
       <name>SetChannel</name>
       <argumentList>
 
-        <argument>
-        <name>Channel</name>
-          <relatedStateVariable>Channel</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
-
         <argument>
          <name>NewChannel</name>
          <retval />
@@ -50,6 +45,11 @@
          <direction>out</direction>
         </argument>
 
+        <argument>
+        <name>Channel</name>
+          <relatedStateVariable>Channel</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
       </argumentList>
     </action>
 
@@ -80,11 +80,6 @@
     <action>
       <name>SetVolume</name>
       <argumentList>
-        <argument>
-        <name>Volume</name>
-          <relatedStateVariable>Volume</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
 
         <argument>
          <name>NewVolume</name>
@@ -92,6 +87,11 @@
          <relatedStateVariable>Volume</relatedStateVariable>
          <direction>out</direction>
          </argument>
+        <argument>
+        <name>Volume</name>
+          <relatedStateVariable>Volume</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
       </argumentList>
     </action>
 
@@ -124,6 +124,9 @@
 
   </actionList>
 
+
+
+
   <serviceStateTable>
 
     <stateVariable sendEvents="yes">

upnp/sample/tvdevice/web/tvpictureSCPD.xml

@@ -12,12 +12,6 @@
     <action>
       <name>SetColor</name>
       <argumentList>
-        <argument>
-        <name>Color</name>
-          <relatedStateVariable>Color</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
-
         <argument>
         <name>NewColor</name>
           <retval />
@@ -25,6 +19,11 @@
           <direction>out</direction>
         </argument>
 
+        <argument>
+        <name>Color</name>
+          <relatedStateVariable>Color</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
       </argumentList>
     </action>
 
@@ -55,19 +54,19 @@
     <action>
       <name>SetTint</name>
       <argumentList>
-        <argument>
+         <argument>
-        <name>Tint</name>
-          <relatedStateVariable>Tint</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
-        <argument>
         <name>NewTint</name>
           <retval />
           <relatedStateVariable>Tint</relatedStateVariable>
           <direction>out</direction>
         </argument>
 
-    </argumentList>
+        <argument>
+        <name>Tint</name>
+          <relatedStateVariable>Tint</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+      </argumentList>
     </action>
 
     <action>
@@ -97,18 +96,18 @@
     <action>
       <name>SetContrast</name>
       <argumentList>
-    	<argument>
+        <argument>
-        	<name>Contrast</name>
-	          <relatedStateVariable>Contrast</relatedStateVariable>
-    	      <direction>in</direction>
-       	</argument>
-	    <argument>
         <name>NewContrast</name>
           <retval />
           <relatedStateVariable>Contrast</relatedStateVariable>
           <direction>out</direction>
         </argument>  
-    </argumentList>
+        <argument>
+        <name>Contrast</name>
+          <relatedStateVariable>Contrast</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
+      </argumentList>
     </action>
 
     <action>
@@ -138,17 +137,19 @@
     <action>
       <name>SetBrightness</name>
       <argumentList>
-		<argument>
+
-        <name>Brightness</name>
-          <relatedStateVariable>Brightness</relatedStateVariable>
-          <direction>in</direction>
-        </argument>
          <argument>
         <name>NewBrightness</name>
           <retval />
           <relatedStateVariable>Brightness</relatedStateVariable>
           <direction>out</direction>
         </argument>
+
+        <argument>
+        <name>Brightness</name>
+          <relatedStateVariable>Brightness</relatedStateVariable>
+          <direction>in</direction>
+        </argument>
       </argumentList>
     </action>
 
@@ -181,6 +182,7 @@
   </actionList>
 
 
+
   <serviceStateTable>
 
     <stateVariable sendEvents="yes">

upnp/sample/web/tvcombodesc.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<root xmlns="urn:schemas-upnp-org:device-1-0">
-  <specVersion>
-    <major>1</major>
-    <minor>0</minor>
-  </specVersion>
-  <device>
-    <deviceType>urn:schemas-upnp-org:device:tvdevice:1</deviceType>
-    <friendlyName>UPnP Television Emulator</friendlyName>
-    <manufacturer>TV Manufacturer Name</manufacturer>
-    <manufacturerURL>http://www.manufacturer.com</manufacturerURL>
-    <modelDescription>UPnP Television Device Emulator 1.0</modelDescription>
-    <modelName>TVEmulator</modelName>
-    <modelNumber>1.0</modelNumber>
-    <modelURL>http://www.manufacturer.com/TVEmulator/</modelURL>
-    <serialNumber>123456789001</serialNumber>
-    <UDN>uuid:Upnp-TVEmulator-1_0-1234567890002</UDN>
-    <UPC>123456789</UPC>
-    <serviceList>
-      <service>
-        <serviceType>urn:schemas-upnp-org:service:tvcontrol:1</serviceType>
-        <serviceId>urn:upnp-org:serviceId:tvcontrol1</serviceId>
-        <controlURL>/upnp/control/tvcontrol1</controlURL>
-        <eventSubURL>/upnp/event/tvcontrol1</eventSubURL>
-        <SCPDURL>/tvcontrolSCPD.xml</SCPDURL>
-      </service>
-      <service>
-        <serviceType>urn:schemas-upnp-org:service:tvpicture:1</serviceType>
-        <serviceId>urn:upnp-org:serviceId:tvpicture1</serviceId>
-        <controlURL>/upnp/control/tvpicture1</controlURL>
-        <eventSubURL>/upnp/event/tvpicture1</eventSubURL>
-        <SCPDURL>/tvpictureSCPD.xml</SCPDURL>
-      </service>
-    </serviceList>
-   <presentationURL>/tvdevicepres.html</presentationURL>
-</device>
-</root>

upnp/src/api/upnpdebug.c

@@ -94,13 +94,12 @@ UpnpSetLogFileNames ( IN const char *ErrFileName,
  *						
  * Description:							
  *	This functions initializes the log files
- *
  * Returns: int
  *	-1 : If fails
  *	UPNP_E_SUCCESS : if success
  ***************************************************************************/
 int
-UpnpInitLog()
+UpnpInitLog(  )
 {
     ithread_mutex_init( &GlobalDebugMutex, NULL );
 
@@ -117,7 +116,7 @@ UpnpInitLog()
 /***************************************************************************
  * Function : UpnpSetLogLevel
  *				
- * Parameters:	Upnp_LogLevel log_level
+ * Parameters:	void
  *
  * Description:							
  *	This functions set the log level (see {\tt Upnp_LogLevel}
@@ -140,7 +139,7 @@ UpnpSetLogLevel (Upnp_LogLevel log_level)
  * Returns: void
  ***************************************************************************/
 void
-UpnpCloseLog()
+UpnpCloseLog(  )
 {
     if( DEBUG_TARGET == 1 ) {
         fflush( ErrFileHnd );
@@ -153,47 +152,11 @@ UpnpCloseLog()
 }
 
 
-/***************************************************************************
- * Function : DebugAtThisLevel					
- *									
- * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
- *		whether debug statement will go to standard output, 
- *		or any of the log files.
- *	IN Dbg_Module Module: debug will go in the name of this module
- *					
- * Description:					
- *	This functions returns true if debug output should be done in this
- *	module.
- *
- * Returns: int
- ***************************************************************************/
-#ifdef DEBUG
-int DebugAtThisLevel(
-	IN Upnp_LogLevel DLevel,
-	IN Dbg_Module Module)
-{
-	int ret = DLevel <= g_log_level;
-	ret &=
-		DEBUG_ALL ||
-		(Module == SSDP  && DEBUG_SSDP ) ||
-		(Module == SOAP  && DEBUG_SOAP ) ||
-		(Module == GENA  && DEBUG_GENA ) ||
-		(Module == TPOOL && DEBUG_TPOOL) ||
-		(Module == MSERV && DEBUG_MSERV) ||
-		(Module == DOM   && DEBUG_DOM  ) ||
-		(Module == HTTP  && DEBUG_HTTP );
-	
-	return ret;
-}
-#endif
-
-
 /***************************************************************************
  * Function : UpnpPrintf					
  *									
  * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
  *		whether debug statement will go to standard output, 
  *		or any of the log files.
  *	IN Dbg_Module Module: debug will go in the name of this module
@@ -210,53 +173,71 @@ int DebugAtThisLevel(
  *	statement is coming
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
+DBGONLY( void UpnpPrintf( IN Upnp_LogLevel DLevel,
-void UpnpPrintf(
+                          IN Dbg_Module Module,
-	IN Upnp_LogLevel DLevel,
+                          IN const char *DbgFileName,
-	IN Dbg_Module Module,
+                          IN int DbgLineNo,
-	IN const char *DbgFileName,
+                          IN const char *FmtStr,
-	IN int DbgLineNo,
+                          ... ) {
-	IN const char *FmtStr,
-	... )
-{
-	va_list ArgList;
 
-	if (!DebugAtThisLevel(DLevel, Module)) {
+         va_list ArgList;
-		return;
+         va_start( ArgList, FmtStr );
-	}
+         if( g_log_level < DLevel ) return; if( DEBUG_ALL == 0 ) {
+         switch ( Module ) {
+case SSDP:
+         if( DEBUG_SSDP == 1 ) break;
+         else
+return; case SOAP:
+         if( DEBUG_SOAP == 1 ) break;
+         else
+return; case GENA:
+         if( DEBUG_GENA == 1 ) break;
+         else
+return; case TPOOL:
+         if( DEBUG_TPOOL == 1 ) break;
+         else
+return; case MSERV:
+         if( DEBUG_MSERV == 1 ) break;
+         else
+return; case DOM:
+         if( DEBUG_DOM == 1 ) break;
+         else
+return; case HTTP:
+         if( DEBUG_HTTP == 1 ) break;
+         else
+return; case API:
+         if( DEBUG_API == 1 ) break;
+         else
+return; default:
+         return;}
+         }
 
-	ithread_mutex_lock(&GlobalDebugMutex);
+         ithread_mutex_lock( &GlobalDebugMutex ); if( DEBUG_TARGET == 0 ) {
-	va_start(ArgList, FmtStr);
+         if( DbgFileName ) {
-	if (!DEBUG_TARGET) {
+         UpnpDisplayFileAndLine( stdout, DbgFileName, DbgLineNo );}
-		if( DbgFileName ) {
+         vfprintf( stdout, FmtStr, ArgList ); fflush( stdout );}
-			UpnpDisplayFileAndLine(stdout, DbgFileName, DbgLineNo);
+         else
-		}
+         {
-		vfprintf(stdout, FmtStr, ArgList);
+         if( DLevel == 0 ) {
-		fflush(stdout);
+         if( DbgFileName ) {
-	} else if (DLevel == 0) {
+         UpnpDisplayFileAndLine( ErrFileHnd, DbgFileName, DbgLineNo );}
-		if (DbgFileName) {
+         vfprintf( ErrFileHnd, FmtStr, ArgList ); fflush( ErrFileHnd );}
-			UpnpDisplayFileAndLine(ErrFileHnd, DbgFileName, DbgLineNo);
+         else
-		}
+         {
-		vfprintf(ErrFileHnd, FmtStr, ArgList);
+         if( DbgFileName ) {
-		fflush(ErrFileHnd);
+         UpnpDisplayFileAndLine( InfoFileHnd, DbgFileName, DbgLineNo );}
-	} else {
+         vfprintf( InfoFileHnd, FmtStr, ArgList ); fflush( InfoFileHnd );}
-		if (DbgFileName) {
+         }
-			UpnpDisplayFileAndLine(InfoFileHnd, DbgFileName, DbgLineNo);
+         va_end( ArgList ); ithread_mutex_unlock( &GlobalDebugMutex );}
-		}
+
-		vfprintf(InfoFileHnd, FmtStr, ArgList);
+ )
-		fflush(InfoFileHnd);
-	}
-	va_end(ArgList);
-	ithread_mutex_unlock(&GlobalDebugMutex);
-}
-#endif
 
 
 /***************************************************************************
  * Function : UpnpGetDebugFile					
  *				
  * Parameters:			
- *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *	IN Dbg_Level DLevel: The level of the debug logging. It will decide 
  *		whether debug statement will go to standard output, 
  *		or any of the log files.
  *	IN Dbg_Module Module: debug will go in the name of this module
@@ -268,26 +249,46 @@ void UpnpPrintf(
  *	NULL : if the module is turn off for debug 
  *	else returns the right file descriptor
  ***************************************************************************/
-#ifdef DEBUG
+    DBGONLY( FILE * GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module ) {
-FILE *GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module )
+             if( g_log_level < DLevel ) return NULL; if( DEBUG_ALL == 0 ) {
-{
+             switch ( Module ) {
-	FILE *ret;
+case SSDP:
+             if( DEBUG_SSDP == 1 ) break;
+             else
+return NULL; case SOAP:
+             if( DEBUG_SOAP == 1 ) break;
+             else
+return NULL; case GENA:
+             if( DEBUG_GENA == 1 ) break;
+             else
+return NULL; case TPOOL:
+             if( DEBUG_TPOOL == 1 ) break;
+             else
+return NULL; case MSERV:
+             if( DEBUG_MSERV == 1 ) break;
+             else
+return NULL; case DOM:
+             if( DEBUG_DOM == 1 ) break;
+             else
+return NULL; case API:
+             if( DEBUG_API == 1 ) break;
+             else
+return NULL; default:
+             return NULL;}
+             }
 
-	if (!DebugAtThisLevel(DLevel, Module)) {
+             if( DEBUG_TARGET == 0 ) {
-		ret = NULL;
+             return stdout;}
-	}
+             else
-	
+             {
-	if (!DEBUG_TARGET) {
+             if( DLevel == 0 ) {
-		ret = stdout;
+             return ErrFileHnd;}
-	} else if (DLevel == 0) {
+             else
-		ret = ErrFileHnd;
+             {
-	} else {
+             return InfoFileHnd;}
-		ret = InfoFileHnd;
+             }
-	}
+             }
-
+ )
-	return ret;
-}
-#endif
 
 
 /***************************************************************************
@@ -304,26 +305,17 @@ FILE *GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module )
  *		debug statement is coming to the log file
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
+    DBGONLY( void UpnpDisplayFileAndLine( IN FILE * fd,
-void UpnpDisplayFileAndLine(
+                                          IN const char *DbgFileName,
-	IN FILE * fd,
+                                          IN int DbgLineNo ) {
-	IN const char *DbgFileName,
+             int starlength = 66;
-	IN int DbgLineNo)
+             const char *lines[2];
-{
+             char FileAndLine[500]; lines[0] = "DEBUG"; if( DbgFileName ) {
-	int starlength = 66;
+             sprintf( FileAndLine, "FILE: %s, LINE: %d", DbgFileName,
-	const char *lines[2];
+                      DbgLineNo ); lines[1] = FileAndLine;}
-	char FileAndLine[500];
+
-	lines[0] = "DEBUG";
+             UpnpDisplayBanner( fd, lines, 2, starlength ); fflush( fd );}
-	if (DbgFileName) {
+ )
-		sprintf(FileAndLine,
-			"FILE: %s, LINE: %d",
-			DbgFileName, DbgLineNo);
-		lines[1] = FileAndLine;
-	}
-	UpnpDisplayBanner(fd, lines, 2, starlength);
-	fflush(fd);
-}
-#endif
 
 
 /***************************************************************************
@@ -340,58 +332,47 @@ void UpnpDisplayFileAndLine(
  *	per the requested banner
  * Returns: void
  ***************************************************************************/
-#ifdef DEBUG
+    DBGONLY( void UpnpDisplayBanner( IN FILE * fd,
-void UpnpDisplayBanner(
+                                     IN const char **lines,
-	IN FILE * fd,
+                                     IN size_t size,
-	IN const char **lines,
+                                     IN int starLength ) {
-	IN size_t size,
+             char *stars = ( char * )malloc( starLength + 1 );
-	IN int starLength)
+             const char *line = NULL;
-{
+             int leftMarginLength = starLength / 2 + 1;
-	int leftMarginLength = starLength / 2 + 1;
+             int rightMarginLength = starLength / 2 + 1;
-	int rightMarginLength = starLength / 2 + 1;
+             char *leftMargin = ( char * )malloc( leftMarginLength );
-	int i = 0;
+             char *rightMargin = ( char * )malloc( rightMarginLength );
-	int LineSize = 0;
+             int i = 0;
-	int starLengthMinus2 = starLength - 2;
+             int LineSize = 0;
+             char *currentLine = ( char * )malloc( starLength + 1 );
+             memset( stars, '*', starLength );
+             stars[starLength] = 0;
+             memset( leftMargin, 0, leftMarginLength );
+             memset( rightMargin, 0, rightMarginLength );
+             fprintf( fd, "\n%s\n", stars ); for( i = 0; i < size; i++ ) {
+             LineSize = strlen( lines[i] );
+             line = lines[i]; while( LineSize > ( starLength - 2 ) ) {
+             memcpy( currentLine, line, ( starLength - 2 ) );
+             currentLine[( starLength - 2 )] = 0;
+             fprintf( fd, "*%s*\n", currentLine );
+             LineSize -= ( starLength - 2 ); line += ( starLength - 2 );}
 
-	char *leftMargin = ( char * )malloc( leftMarginLength );
+             if( LineSize % 2 == 0 ) {
-	char *rightMargin = ( char * )malloc( rightMarginLength );
+             leftMarginLength = rightMarginLength =
-	char *stars = ( char * )malloc( starLength + 1 );
+             ( ( starLength - 2 ) - LineSize ) / 2;}
-	char *currentLine = ( char * )malloc( starLength + 1 );
+             else
-	const char *line = NULL;
+             {
+             leftMarginLength = ( ( starLength - 2 ) - LineSize ) / 2;
+             rightMarginLength =
+             ( ( starLength - 2 ) - LineSize ) / 2 + 1;}
 
-	memset( stars, '*', starLength );
+             memset( leftMargin, ' ', leftMarginLength );
-	stars[starLength] = 0;
+             memset( rightMargin, ' ', rightMarginLength );
-	memset( leftMargin, 0, leftMarginLength );
+             leftMargin[leftMarginLength] = 0;
-	memset( rightMargin, 0, rightMarginLength );
+             rightMargin[rightMarginLength] = 0;
-	fprintf( fd, "\n%s\n", stars );
+             fprintf( fd, "*%s%s%s*\n", leftMargin, line, rightMargin );}
-	for( i = 0; i < size; i++ ) {
-		LineSize = strlen( lines[i] );
-		line = lines[i];
-		while( LineSize > starLengthMinus2 ) {
-			memcpy( currentLine, line, starLengthMinus2 );
-			currentLine[starLengthMinus2] = 0;
-			fprintf( fd, "*%s*\n", currentLine );
-			LineSize -= starLengthMinus2;
-			line += starLengthMinus2;
-		}
-		leftMarginLength = (starLengthMinus2 - LineSize)/2;
-		if( LineSize % 2 == 0 ) {
-			rightMarginLength = leftMarginLength;
-		} else {
-			rightMarginLength = leftMarginLength + 1;
-		}
-		memset( leftMargin, ' ', leftMarginLength );
-		memset( rightMargin, ' ', rightMarginLength );
-		leftMargin[leftMarginLength] = 0;
-		rightMargin[rightMarginLength] = 0;
-		fprintf( fd, "*%s%s%s*\n", leftMargin, line, rightMargin );
-	}
-	fprintf( fd, "%s\n\n", stars );
-
-	free( currentLine );
-	free( stars );
-	free( rightMargin );
-	free( leftMargin );
-}
-#endif
 
+             fprintf( fd, "%s\n\n", stars );
+             free( leftMargin );
+             free( rightMargin ); free( stars ); free( currentLine );}
+ )

upnp/src/api/upnptools.c

@@ -36,7 +36,7 @@
 #include "uri.h"
 #define HEADER_LENGTH 2000
 
-// Structure to maintain a error code and string associated with the 
+//Structure to maintain a error code and string associated with the 
 // error code
 struct ErrorString {
     int rc;                     /* error code */
@@ -44,7 +44,7 @@ struct ErrorString {
 
 };
 
-// Initializing the array of error structures. 
+//Intializing the array of error structures. 
 struct ErrorString ErrorMessages[] = { {UPNP_E_SUCCESS, "UPNP_E_SUCCESS"},
 {UPNP_E_INVALID_HANDLE, "UPNP_E_INVALID_HANDLE"},
 {UPNP_E_INVALID_PARAM, "UPNP_E_INVALID_PARAM"},
@@ -155,7 +155,7 @@ UpnpResolveURL( IN const char *BaseURL,
 *																	
 * Parameters:														
 *	IN int response: flag to tell if the ActionDoc is for response 
-*		or request
+*					or request
 *	INOUT IXML_Document **ActionDoc: request or response document
 *	IN char *ActionName: Name of the action request or response
 *	IN char *ServType: Service type
@@ -196,12 +196,11 @@ addToAction( IN int response,
 
         if( response ) {
             sprintf( ActBuff,
-                "<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
+                     "<u:%sResponse xmlns:u=\"%s\"></u:%sResponse>",
-                ActionName, ServType, ActionName );
+                     ActionName, ServType, ActionName );
         } else {
-            sprintf( ActBuff,
+            sprintf( ActBuff, "<u:%s xmlns:u=\"%s\"></u:%s>",
-                "<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
+                     ActionName, ServType, ActionName );
-                ActionName, ServType, ActionName );
         }
 
         rc = ixmlParseBufferEx( ActBuff, ActionDoc );
@@ -234,7 +233,7 @@ addToAction( IN int response,
 *																	
 * Parameters:														
 *	IN int response: flag to tell if the ActionDoc is for response 
-*		or request
+*					or request
 *	IN char * ActionName: Name of the action request or response
 *	IN char * ServType: Service type
 *	IN int NumArg :Number of arguments in the action request or response
@@ -256,8 +255,8 @@ makeAction( IN int response,
             IN const char *Arg,
             IN va_list ArgList )
 {
-    const char *ArgName;
+    const char *ArgName,
-    const char *ArgValue;
+     *ArgValue;
     char *ActBuff;
     int Idx = 0;
     IXML_Document *ActionDoc;
@@ -275,13 +274,11 @@ makeAction( IN int response,
     }
 
     if( response ) {
-        sprintf( ActBuff,
+        sprintf( ActBuff, "<u:%sResponse xmlns:u=\"%s\"></u:%sResponse>",
-            "<u:%sResponse xmlns:u=\"%s\">\r\n</u:%sResponse>",
+                 ActionName, ServType, ActionName );
-            ActionName, ServType, ActionName );
     } else {
-        sprintf( ActBuff,
+        sprintf( ActBuff, "<u:%s xmlns:u=\"%s\"></u:%s>",
-            "<u:%s xmlns:u=\"%s\">\r\n</u:%s>",
+                 ActionName, ServType, ActionName );
-            ActionName, ServType, ActionName );
     }
 
     if( ixmlParseBufferEx( ActBuff, &ActionDoc ) != IXML_SUCCESS ) {
@@ -298,7 +295,7 @@ makeAction( IN int response,
     if( NumArg > 0 ) {
         //va_start(ArgList, Arg);
         ArgName = Arg;
-        for ( ; ; ) {
+        while( Idx++ != NumArg ) {
             ArgValue = va_arg( ArgList, const char * );
 
             if( ArgName != NULL ) {
@@ -313,11 +310,7 @@ makeAction( IN int response,
                 ixmlNode_appendChild( node, ( IXML_Node * ) Ele );
             }
 
-            if (++Idx < NumArg) {
+            ArgName = va_arg( ArgList, const char * );
-                ArgName = va_arg( ArgList, const char * );
-            } else {
-                break;
-            }
         }
         //va_end(ArgList);
     }
@@ -581,5 +574,4 @@ UpnpCreatePropertySet( IN int NumArg,
     return PropSet;
 }
 
-#endif // EXCLUDE_DOM == 0
+#endif
-

upnp/src/gena/gena_callback2.c

@@ -93,35 +93,37 @@ genaCallback( IN http_parser_t * parser,
     xboolean found_function = FALSE;
 
     if( request->method == HTTPMETHOD_SUBSCRIBE ) {
-#ifdef INCLUDE_DEVICE_APIS
+        DEVICEONLY( found_function = TRUE;
-        found_function = TRUE;
+                    if( httpmsg_find_hdr( request, HDR_NT, NULL ) == NULL )
-        if( httpmsg_find_hdr( request, HDR_NT, NULL ) == NULL ) {
+                    {
-            // renew subscription
+                    // renew subscription
-            gena_process_subscription_renewal_request
+                    gena_process_subscription_renewal_request
-            ( info, request );
+                    ( info, request );}
-	} else {
+                    else
-            // subscribe
+                    {
-            gena_process_subscription_request( info, request );
+                    // subscribe
-	}
+                    gena_process_subscription_request( info, request );}
-        UpnpPrintf( UPNP_ALL, GENA, __FILE__, __LINE__,
-            "got subscription request\n" );
-    } else if( request->method == HTTPMETHOD_UNSUBSCRIBE ) {
-        found_function = TRUE;
-        // unsubscribe
-        gena_process_unsubscribe_request( info, request );
-#endif
-    } else if( request->method == HTTPMETHOD_NOTIFY ) {
-#ifdef INCLUDE_CLIENT_APIS
-        found_function = TRUE;
-        // notify
-        gena_process_notification_event( info, request );
-#endif
-    }
 
-    if( !found_function ) {
+                    DBGONLY( UpnpPrintf
+                             ( UPNP_ALL, GENA, __FILE__, __LINE__,
+                               "got subscription request\n" ); )
+             )
+            }
+            else
+        if( request->method == HTTPMETHOD_UNSUBSCRIBE ) {
+            DEVICEONLY( found_function = TRUE;
+                        // unsubscribe
+                        gena_process_unsubscribe_request( info,
+                                                          request ); )
+        } else if( request->method == HTTPMETHOD_NOTIFY ) {
+            CLIENTONLY( found_function = TRUE;
+                        // notify
+                        gena_process_notification_event( info, request ); )
+        }
+
+        if( !found_function ) {
             // handle missing functions of device or ctrl pt
             error_respond( info, HTTP_NOT_IMPLEMENTED, request );
+        }
     }
-}
 #endif // EXCLUDE_GENA
-

upnp/src/gena/gena_ctrlpt.c

@@ -72,14 +72,14 @@ GenaAutoRenewSubscription( IN void *input )
     int eventType = 0;
 
     if( AUTO_RENEW_TIME == 0 ) {
-        UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-            "GENA SUB EXPIRED" );
+                             "GENA SUB EXPIRED" ) );
         sub_struct->ErrCode = UPNP_E_SUCCESS;
         send_callback = 1;
         eventType = UPNP_EVENT_SUBSCRIPTION_EXPIRED;
     } else {
-        UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-            "GENA AUTO RENEW" );
+                             "GENA AUTO RENEW" ) );
         if( ( ( sub_struct->ErrCode = genaRenewSubscription( event->handle,
                                                              sub_struct->
                                                              Sid,
@@ -93,17 +93,17 @@ GenaAutoRenewSubscription( IN void *input )
         }
     }
     if( send_callback ) {
-        HandleReadLock();
+        HandleLock(  );
         if( GetHandleInfo( event->handle, &handle_info ) != HND_CLIENT ) {
-            HandleUnlock();
+            HandleUnlock(  );
             free_upnp_timeout( event );
             return;
         }
-        UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-            "HANDLE IS VALID" );
+                             "HANDLE IS VALID" ) );
         callback_fun = handle_info->Callback;
         cookie = handle_info->Cookie;
-        HandleUnlock();
+        HandleUnlock(  );
         //make callback
 
         callback_fun( eventType, event->Event, cookie );
@@ -219,11 +219,10 @@ gena_unsubscribe( IN char *url,
     // make request msg
     membuffer_init( &request );
     request.size_inc = 30;
-    return_code = http_MakeMessage(
+    return_code = http_MakeMessage( &request, 1, 1,
-        &request, 1, 1,
+                                    "q" "ssc" "U" "c",
-        "q" "ssc" "Uc",
+                                    HTTPMETHOD_UNSUBSCRIBE, &dest_url,
-        HTTPMETHOD_UNSUBSCRIBE, &dest_url,
+                                    "SID: ", sid );
-        "SID: ", sid );
 
     //Not able to make the message so destroy the existing buffer
     if( return_code != 0 ) {
@@ -306,21 +305,20 @@ gena_subscribe( IN char *url,
     request.size_inc = 30;
     if( renewal_sid ) {
         // renew subscription
-        return_code = http_MakeMessage(
+        return_code = http_MakeMessage( &request, 1, 1,
-            &request, 1, 1,
+                                        "q" "ssc" "ssc" "c",
-            "q" "ssc" "sscc",
+                                        HTTPMETHOD_SUBSCRIBE, &dest_url,
-            HTTPMETHOD_SUBSCRIBE, &dest_url,
+                                        "SID: ", renewal_sid,
-            "SID: ", renewal_sid,
+                                        "TIMEOUT: Second-", timeout_str );
-            "TIMEOUT: Second-", timeout_str );
     } else {
         // subscribe
-        return_code = http_MakeMessage(
+        return_code = http_MakeMessage( &request, 1, 1,
-            &request, 1, 1,
+                                        "q" "sssdsscc",
-            "q" "sssdsc" "sc" "sscc",
+                                        HTTPMETHOD_SUBSCRIBE, &dest_url,
-            HTTPMETHOD_SUBSCRIBE, &dest_url,
+                                        "CALLBACK: <http://", LOCAL_HOST,
-            "CALLBACK: <http://", LOCAL_HOST, ":", LOCAL_PORT, "/>",
+                                        ":", LOCAL_PORT,
-            "NT: upnp:event",
+                                        "/>\r\n" "NT: upnp:event\r\n"
-	    "TIMEOUT: Second-", timeout_str );
+                                        "TIMEOUT: Second-", timeout_str );
     }
     if( return_code != 0 ) {
         return return_code;
@@ -397,9 +395,9 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
     http_parser_t response;
 
     while( TRUE ) {
-        HandleLock();
+        HandleLock(  );
         if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-            HandleUnlock();
+            HandleUnlock(  );
             return GENA_E_BAD_HANDLE;
         }
 
@@ -417,7 +415,7 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
         RemoveClientSubClientSID( &handle_info->ClientSubList,
                                   sub_copy.sid );
 
-        HandleUnlock();
+        HandleUnlock(  );
 
         return_code = gena_unsubscribe( sub_copy.EventURL,
                                         sub_copy.ActualSID, &response );
@@ -429,7 +427,7 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
     }
 
     freeClientSubList( handle_info->ClientSubList );
-    HandleUnlock();
+    HandleUnlock(  );
     return return_code;
 }
 
@@ -449,7 +447,6 @@ genaUnregisterClient( IN UpnpClient_Handle client_handle )
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_CLIENT_APIS
 int
 genaUnSubscribe( IN UpnpClient_Handle client_handle,
                  IN const Upnp_SID in_sid )
@@ -460,25 +457,25 @@ genaUnSubscribe( IN UpnpClient_Handle client_handle,
     client_subscription sub_copy;
     http_parser_t response;
 
-    HandleLock();
+    HandleLock(  );
 
     // validate handle and sid
 
     if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_HANDLE;
     }
 
     if( ( sub =
           GetClientSubClientSID( handle_info->ClientSubList, in_sid ) )
         == NULL ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_SID;
     }
 
     return_code = copy_client_subscription( sub, &sub_copy );
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     return_code = gena_unsubscribe( sub_copy.EventURL, sub_copy.ActualSID,
                                     &response );
@@ -489,20 +486,19 @@ genaUnSubscribe( IN UpnpClient_Handle client_handle,
 
     free_client_subscription( &sub_copy );
 
-    HandleLock();
+    HandleLock(  );
 
     if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_HANDLE;
     }
 
     RemoveClientSubClientSID( &handle_info->ClientSubList, in_sid );
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     return return_code;
 }
-#endif
 
 /************************************************************************
 * Function : genaSubscribe
@@ -526,7 +522,6 @@ genaUnSubscribe( IN UpnpClient_Handle client_handle,
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_CLIENT_APIS
 int
 genaSubscribe( IN UpnpClient_Handle client_handle,
                IN char *PublisherURL,
@@ -541,28 +536,28 @@ genaSubscribe( IN UpnpClient_Handle client_handle,
     struct Handle_Info *handle_info;
     char *EventURL = NULL;
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "GENA SUBSCRIBE BEGIN" );
+                         "GENA SUBSCRIBE BEGIN" ) );
+    HandleLock(  );
 
     memset( out_sid, 0, sizeof( Upnp_SID ) );
 
-    HandleReadLock();
     // validate handle
     if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_HANDLE;
     }
-    HandleUnlock();
+    HandleUnlock(  );
 
     // subscribe
-    SubscribeLock();
+    SubscribeLock(  );
     return_code =
         gena_subscribe( PublisherURL, TimeOut, NULL, &ActualSID );
-    HandleLock();
+    HandleLock(  );
     if( return_code != UPNP_E_SUCCESS ) {
-        UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
-            "SUBSCRIBE FAILED in transfer error code: %d returned\n",
+                             "SUBSCRIBE FAILED in transfer error code: %d returned\n",
-            return_code );
+                             return_code ) );
         goto error_handler;
     }
 
@@ -608,11 +603,10 @@ genaSubscribe( IN UpnpClient_Handle client_handle,
         free( EventURL );
         free( newSubscription );
     }
-    HandleUnlock();
+    HandleUnlock(  );
-    SubscribeUnlock();
+    SubscribeUnlock(  );
     return return_code;
 }
-#endif
 
 /************************************************************************
 * Function : genaRenewSubscription
@@ -647,17 +641,17 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
     char *ActualSID;
     ThreadPoolJob tempJob;
 
-    HandleLock();
+    HandleLock(  );
 
     // validate handle and sid
     if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_HANDLE;
     }
 
     if( ( sub = GetClientSubClientSID( handle_info->ClientSubList,
                                        in_sid ) ) == NULL ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_SID;
     }
     // remove old events
@@ -667,13 +661,13 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
         free_upnp_timeout( ( upnp_timeout * ) tempJob.arg );
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "REMOVED AUTO RENEW  EVENT" );
+                         "REMOVED AUTO RENEW  EVENT" ) );
 
     sub->RenewEventId = -1;
     return_code = copy_client_subscription( sub, &sub_copy );
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     if( return_code != HTTP_SUCCESS ) {
         return return_code;
@@ -681,10 +675,10 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
 
     return_code = gena_subscribe( sub_copy.EventURL, TimeOut,
                                   sub_copy.ActualSID, &ActualSID );
-    HandleLock();
+    HandleLock(  );
 
     if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
-        HandleUnlock();
+        HandleUnlock(  );
         if( return_code == UPNP_E_SUCCESS ) {
             free( ActualSID );
         }
@@ -697,7 +691,7 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
         // network failure (remove client sub)
         RemoveClientSubClientSID( &handle_info->ClientSubList, in_sid );
         free_client_subscription( &sub_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return return_code;
     }
     // get subscription
@@ -705,7 +699,7 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
                                        in_sid ) ) == NULL ) {
         free( ActualSID );
         free_client_subscription( &sub_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_SID;
     }
     // store actual sid
@@ -718,7 +712,7 @@ genaRenewSubscription( IN UpnpClient_Handle client_handle,
         RemoveClientSubClientSID( &handle_info->ClientSubList, sub->sid );
     }
     free_client_subscription( &sub_copy );
-    HandleUnlock();
+    HandleUnlock(  );
     return return_code;
 }
 
@@ -799,12 +793,12 @@ gena_process_notification_event( IN SOCKINFO * info,
         return;
     }
 
-    HandleLock();
+    HandleLock(  );
 
     // get client info
     if( GetClientHandleInfo( &client_handle, &handle_info ) != HND_CLIENT ) {
         error_respond( info, HTTP_PRECONDITION_FAILED, event );
-        HandleUnlock();
+        HandleUnlock(  );
         ixmlDocument_free( ChangedVars );
 
         return;
@@ -817,20 +811,20 @@ gena_process_notification_event( IN SOCKINFO * info,
             //   (if we are in the middle)
             // this is to avoid mistakenly rejecting the first event if we 
             //   receive it before the subscription response
-            HandleUnlock();
+            HandleUnlock(  );
 
             // try and get Subscription Lock 
             //   (in case we are in the process of subscribing)
-            SubscribeLock();
+            SubscribeLock(  );
 
             // get HandleLock again
-            HandleLock();
+            HandleLock(  );
 
             if( GetClientHandleInfo( &client_handle, &handle_info )
                 != HND_CLIENT ) {
                 error_respond( info, HTTP_PRECONDITION_FAILED, event );
-                SubscribeUnlock();
+                SubscribeUnlock(  );
-                HandleUnlock();
+                HandleUnlock(  );
                 ixmlDocument_free( ChangedVars );
 
                 return;
@@ -840,17 +834,17 @@ gena_process_notification_event( IN SOCKINFO * info,
                   GetClientSubActualSID( handle_info->ClientSubList,
                                          &sid ) ) == NULL ) {
                 error_respond( info, HTTP_PRECONDITION_FAILED, event );
-                SubscribeUnlock();
+                SubscribeUnlock(  );
-                HandleUnlock();
+                HandleUnlock(  );
                 ixmlDocument_free( ChangedVars );
 
                 return;
             }
 
-            SubscribeUnlock();
+            SubscribeUnlock(  );
         } else {
             error_respond( info, HTTP_PRECONDITION_FAILED, event );
-            HandleUnlock();
+            HandleUnlock(  );
             ixmlDocument_free( ChangedVars );
 
             return;
@@ -868,7 +862,7 @@ gena_process_notification_event( IN SOCKINFO * info,
     callback = handle_info->Callback;
     cookie = handle_info->Cookie;
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     // make callback with event struct
     // In future, should find a way of mainting
@@ -881,4 +875,3 @@ gena_process_notification_event( IN SOCKINFO * info,
 
 #endif // INCLUDE_CLIENT_APIS
 #endif // EXCLUDE_GENA
-

upnp/src/gena/gena_device.c

@@ -62,19 +62,19 @@ genaUnregisterDevice( IN UpnpDevice_Handle device_handle )
 {
     struct Handle_Info *handle_info;
 
-    HandleLock();
+    HandleLock(  );
     if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {
 
-        UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_CRITICAL, GENA, __FILE__, __LINE__,
-            "genaUnregisterDevice : BAD Handle : %d\n",
+                             "genaUnregisterDevice : BAD Handle : %d\n",
-            device_handle );
+                             device_handle ) );
 
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_HANDLE;
     }
 
     freeServiceTable( &handle_info->ServiceTable );
-    HandleUnlock();
+    HandleUnlock(  );
 
     return UPNP_E_SUCCESS;
 }
@@ -188,7 +188,7 @@ free_notify_struct( IN notify_thread_struct * input )
 *
 *	Note : called by genaNotify
 ****************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 notify_send_and_recv( IN uri_type * destination_url,
                       IN membuffer * mid_msg,
                       IN char *propertySet,
@@ -203,12 +203,12 @@ notify_send_and_recv( IN uri_type * destination_url,
     SOCKINFO info;
 
     // connect
-    UpnpPrintf( UPNP_ALL, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_ALL, GENA, __FILE__, __LINE__,
-        "gena notify to: %.*s\n",
+                         "gena notify to: %.*s\n",
-        (int)destination_url->hostport.text.size,
+                         destination_url->hostport.text.size,
-        destination_url->hostport.text.buff );
+                         destination_url->hostport.text.buff ); )
 
-    conn_fd = http_Connect( destination_url, &url );
+        conn_fd = http_Connect( destination_url, &url );
     if( conn_fd < 0 ) {
         return conn_fd;         // return UPNP error
     }
@@ -219,11 +219,9 @@ notify_send_and_recv( IN uri_type * destination_url,
     }
     // make start line and HOST header
     membuffer_init( &start_msg );
-    if (http_MakeMessage(
+    if( http_MakeMessage( &start_msg, 1, 1,
-        &start_msg, 1, 1,
+                          "q" "s",
-        "q" "s",
+                          HTTPMETHOD_NOTIFY, &url, mid_msg->buf ) != 0 ) {
-        HTTPMETHOD_NOTIFY, &url,
-        mid_msg->buf ) != 0 ) {
         membuffer_destroy( &start_msg );
         sock_destroy( &info, SD_BOTH );
         return UPNP_E_OUTOF_MEMORY;
@@ -298,12 +296,11 @@ genaNotify( IN char *headers,
 
     // make 'end' msg (the part that won't vary with the destination)
     endmsg.size_inc = 30;
-    if( http_MakeMessage(
+    if( http_MakeMessage( &mid_msg, 1, 1,
-        &mid_msg, 1, 1,
+                          "s" "ssc" "sdcc",
-        "s" "ssc" "sdcc",
+                          headers,
-        headers,
+                          "SID: ", sub->sid,
-        "SID: ", sub->sid,
+                          "SEQ: ", sub->ToSendEventKey ) != 0 ) {
-        "SEQ: ", sub->ToSendEventKey ) != 0 ) {
         membuffer_destroy( &mid_msg );
         return UPNP_E_OUTOF_MEMORY;
     }
@@ -365,12 +362,12 @@ genaNotifyThread( IN void *input )
     struct Handle_Info *handle_info;
     ThreadPoolJob job;
 
-    HandleReadLock();
+    HandleLock(  );
     //validate context
 
     if( GetHandleInfo( in->device_handle, &handle_info ) != HND_DEVICE ) {
         free_notify_struct( in );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
 
@@ -380,7 +377,7 @@ genaNotifyThread( IN void *input )
         || ( ( sub = GetSubscriptionSID( in->sid, service ) ) == NULL )
         || ( ( copy_subscription( sub, &sub_copy ) != HTTP_SUCCESS ) ) ) {
         free_notify_struct( in );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     //If the event is out of order push it back to the job queue
@@ -392,22 +389,22 @@ genaNotifyThread( IN void *input )
         ThreadPoolAdd( &gSendThreadPool, &job, NULL );
 
         freeSubscription( &sub_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     //send the notify
     return_code = genaNotify( in->headers, in->propertySet, &sub_copy );
 
     freeSubscription( &sub_copy );
 
-    HandleLock();
+    HandleLock(  );
 
     if( GetHandleInfo( in->device_handle, &handle_info ) != HND_DEVICE ) {
         free_notify_struct( in );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     //validate context
@@ -416,7 +413,7 @@ genaNotifyThread( IN void *input )
         || ( !service->active )
         || ( ( sub = GetSubscriptionSID( in->sid, service ) ) == NULL ) ) {
         free_notify_struct( in );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
 
@@ -430,7 +427,7 @@ genaNotifyThread( IN void *input )
     }
 
     free_notify_struct( in );
-    HandleUnlock();
+    HandleUnlock(  );
 }
 
 /****************************************************************************
@@ -477,8 +474,8 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
 
     notify_thread_struct *thread_struct = NULL;
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "GENA BEGIN INITIAL NOTIFY " );
+                         "GENA BEGIN INITIAL NOTIFY " ) );
 
     reference_count = ( int * )malloc( sizeof( int ) );
 
@@ -504,13 +501,13 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
     strcpy( UDN_copy, UDN );
     strcpy( servId_copy, servId );
 
-    HandleLock();
+    HandleLock(  );
 
     if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_HANDLE;
     }
 
@@ -519,25 +516,26 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_SERVICE;
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "FOUND SERVICE IN INIT NOTFY: UDN %s, ServID: %s ",
+                         "FOUND SERVICE IN INIT NOTFY: UDN %s, ServID: %s ",
-        UDN, servId );
+                         UDN, servId ) );
 
     if( ( ( sub = GetSubscriptionSID( sid, service ) ) == NULL ) ||
         ( sub->active ) ) {
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_SID;
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "FOUND SUBSCRIPTION IN INIT NOTIFY: SID %s ", sid );
+                         "FOUND SUBSCRIPTION IN INIT NOTIFY: SID %s ",
+                         sid ) );
 
     sub->active = 1;
 
@@ -548,13 +546,13 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return return_code;
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "GENERATED PROPERY SET IN INIT NOTIFY: \n'%s'\n",
+                         "GENERATED PROPERY SET IN INIT NOTIFY: \n'%s'\n",
-        propertySet );
+                         propertySet ) );
 
     headers_size = strlen( "CONTENT-TYPE text/xml\r\n" ) +
         strlen( "CONTENT-LENGTH: \r\n" ) + MAX_CONTENT_LENGTH +
@@ -568,12 +566,12 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
         free( UDN_copy );
         free( servId_copy );
         free( reference_count );
-        HandleUnlock();
+        HandleUnlock(  );
         return UPNP_E_OUTOF_MEMORY;
     }
 
     sprintf( headers, "CONTENT-TYPE: text/xml\r\nCONTENT-LENGTH: "
-             "%"PRIzu"\r\nNT: upnp:event\r\nNTS: upnp:propchange\r\n",
+             "%d\r\nNT: upnp:event\r\nNTS: upnp:propchange\r\n",
              strlen( propertySet ) + 1 );
 
     //schedule thread for initial notification
@@ -620,7 +618,7 @@ genaInitNotify( IN UpnpDevice_Handle device_handle,
         free( headers );
     }
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     return return_code;
 }
@@ -667,8 +665,8 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
 
     notify_thread_struct *thread_struct = NULL;
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "GENA BEGIN INITIAL NOTIFY EXT" );
+                         "GENA BEGIN INITIAL NOTIFY EXT" ) );
     reference_count = ( int * )malloc( sizeof( int ) );
 
     if( reference_count == NULL ) {
@@ -693,13 +691,13 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
     strcpy( UDN_copy, UDN );
     strcpy( servId_copy, servId );
 
-    HandleLock();
+    HandleLock(  );
 
     if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_HANDLE;
     }
 
@@ -708,23 +706,24 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_SERVICE;
     }
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "FOUND SERVICE IN INIT NOTFY EXT: UDN %s, ServID: %s\n",
+                         "FOUND SERVICE IN INIT NOTFY EXT: UDN %s, ServID: %s\n",
-        UDN, servId );
+                         UDN, servId ) );
 
     if( ( ( sub = GetSubscriptionSID( sid, service ) ) == NULL ) ||
         ( sub->active ) ) {
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return GENA_E_BAD_SID;
     }
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "FOUND SUBSCRIPTION IN INIT NOTIFY EXT: SID %s", sid );
+                         "FOUND SUBSCRIPTION IN INIT NOTIFY EXT: SID %s",
+                         sid ) );
 
     sub->active = 1;
 
@@ -733,13 +732,13 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
         free( UDN_copy );
         free( reference_count );
         free( servId_copy );
-        HandleUnlock();
+        HandleUnlock(  );
         return UPNP_E_INVALID_PARAM;
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "GENERATED PROPERY SET IN INIT EXT NOTIFY: %s",
+                         "GENERATED PROPERY SET IN INIT EXT NOTIFY: %s",
-        propertySet );
+                         propertySet ) );
 
     headers_size = strlen( "CONTENT-TYPE text/xml\r\n" ) +
         strlen( "CONTENT-LENGTH: \r\n" ) + MAX_CONTENT_LENGTH +
@@ -752,7 +751,7 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
         free( servId_copy );
         free( reference_count );
         ixmlFreeDOMString( propertySet );
-        HandleUnlock();
+        HandleUnlock(  );
         return UPNP_E_OUTOF_MEMORY;
     }
 
@@ -802,7 +801,7 @@ genaInitNotifyExt( IN UpnpDevice_Handle device_handle,
         free( thread_struct );
         free( headers );
     }
-    HandleUnlock();
+    HandleUnlock(  );
 
     return return_code;
 }
@@ -897,7 +896,7 @@ genaNotifyAllExt( IN UpnpDevice_Handle device_handle,
              "%ld\r\nNT: upnp:event\r\nNTS: upnp:propchange\r\n",
              (long) strlen( propertySet ) + 1 );
 
-    HandleLock();
+    HandleLock(  );
 
     if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE )
         return_code = GENA_E_BAD_HANDLE;
@@ -957,7 +956,7 @@ genaNotifyAllExt( IN UpnpDevice_Handle device_handle,
         free( servId_copy );
     }
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     return return_code;
 }
@@ -1059,7 +1058,7 @@ genaNotifyAll( IN UpnpDevice_Handle device_handle,
              " upnp:event\r\nNTS: upnp:propchange\r\n",
              (long) strlen( propertySet ) + 1 );
 
-    HandleLock();
+    HandleLock(  );
 
     if( GetHandleInfo( device_handle, &handle_info ) != HND_DEVICE ) {
         return_code = GENA_E_BAD_HANDLE;
@@ -1121,7 +1120,7 @@ genaNotifyAll( IN UpnpDevice_Handle device_handle,
         free( UDN_copy );
         free( servId_copy );
     }
-    HandleUnlock();
+    HandleUnlock(  );
 
     return return_code;
 }
@@ -1166,14 +1165,10 @@ respond_ok( IN SOCKINFO * info,
 
     membuffer_init( &response );
     response.size_inc = 30;
-    if( http_MakeMessage(
+    if( http_MakeMessage( &response, major, minor,
-        &response, major, minor,
+                          "R" "D" "S" "N" "Xc" "ssc" "sc" "c",
-        "R" "D" "S" "N" "Xc" "ssc" "scc",
+                          HTTP_OK, 0, X_USER_AGENT,
-        HTTP_OK,
+                          "SID: ", sub->sid, timeout_str ) != 0 ) {
-        (off_t)0,
-        X_USER_AGENT,
-        "SID: ", sub->sid,
-        timeout_str ) != 0 ) {
         membuffer_destroy( &response );
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
         return UPNP_E_OUTOF_MEMORY;
@@ -1315,8 +1310,8 @@ gena_process_subscription_request( IN SOCKINFO * info,
     memptr callback_hdr;
     memptr timeout_hdr;
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "Subscription Request Received:\n" );
+                         "Subscription Request Received:\n" ) );
 
     if( httpmsg_find_hdr( request, HDR_NT, &nt_hdr ) == NULL ) {
         error_respond( info, HTTP_BAD_REQUEST, request );
@@ -1345,17 +1340,18 @@ gena_process_subscription_request( IN SOCKINFO * info,
         return;
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "SubscriptionRequest for event URL path: %s\n",
+                         "SubscriptionRequest for event URL path: %s\n",
-        event_url_path );
+                         event_url_path );
+         )
 
-    HandleLock();
+        HandleLock(  );
 
     // CURRENTLY, ONLY ONE DEVICE
     if( GetDeviceHandleInfo( &device_handle, &handle_info ) != HND_DEVICE ) {
         free( event_url_path );
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     service = FindServiceEventURLPath( &handle_info->ServiceTable,
@@ -1364,28 +1360,28 @@ gena_process_subscription_request( IN SOCKINFO * info,
 
     if( service == NULL || !service->active ) {
         error_respond( info, HTTP_NOT_FOUND, request );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "Subscription Request: Number of Subscriptions already %d\n "
+                         "Subscription Request: Number of Subscriptions already %d\n "
-        "Max Subscriptions allowed: %d\n",
+                         "Max Subscriptions allowed: %d\n",
-        service->TotalSubscriptions,
+                         service->TotalSubscriptions,
-        handle_info->MaxSubscriptions );
+                         handle_info->MaxSubscriptions ) );
 
     // too many subscriptions
     if( handle_info->MaxSubscriptions != -1 &&
         service->TotalSubscriptions >= handle_info->MaxSubscriptions ) {
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     // generate new subscription
     sub = ( subscription * ) malloc( sizeof( subscription ) );
     if( sub == NULL ) {
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     sub->eventKey = 0;
@@ -1402,13 +1398,13 @@ gena_process_subscription_request( IN SOCKINFO * info,
                                          &sub->DeliveryURLs ) ) == 0 ) {
         error_respond( info, HTTP_PRECONDITION_FAILED, request );
         freeSubscriptionList( sub );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     if( return_code == UPNP_E_OUTOF_MEMORY ) {
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
         freeSubscriptionList( sub );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     // set the timeout
@@ -1444,7 +1440,7 @@ gena_process_subscription_request( IN SOCKINFO * info,
     // respond OK
     if( respond_ok( info, time_out, sub, request ) != UPNP_E_SUCCESS ) {
         freeSubscriptionList( sub );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     //add to subscription list
@@ -1461,7 +1457,7 @@ gena_process_subscription_request( IN SOCKINFO * info,
     callback_fun = handle_info->Callback;
     cookie = handle_info->Cookie;
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     //make call back with request struct
     //in the future should find a way of mainting
@@ -1524,7 +1520,7 @@ gena_process_subscription_renewal_request( IN SOCKINFO * info,
         return;
     }
 
-    HandleLock();
+    HandleLock(  );
 
     // CURRENTLY, ONLY SUPPORT ONE DEVICE
     if( GetDeviceHandleInfo( &device_handle, &handle_info ) != HND_DEVICE ) {
@@ -1541,21 +1537,22 @@ gena_process_subscription_renewal_request( IN SOCKINFO * info,
         !service->active ||
         ( ( sub = GetSubscriptionSID( sid, service ) ) == NULL ) ) {
         error_respond( info, HTTP_PRECONDITION_FAILED, request );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
 
-    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
-        "Renew request: Number of subscriptions already: %d\n "
+                         "Renew request: Number of subscriptions already: %d\n "
-        "Max Subscriptions allowed:%d\n",
+                         "Max Subscriptions allowed:%d\n",
-        service->TotalSubscriptions,
+                         service->TotalSubscriptions,
-        handle_info->MaxSubscriptions );
+                         handle_info->MaxSubscriptions );
-    // too many subscriptions
+         )
-    if( handle_info->MaxSubscriptions != -1 &&
+        // too many subscriptions
+        if( handle_info->MaxSubscriptions != -1 &&
             service->TotalSubscriptions > handle_info->MaxSubscriptions ) {
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
         RemoveSubscriptionSID( sub->sid, service );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     // set the timeout
@@ -1594,7 +1591,7 @@ gena_process_subscription_renewal_request( IN SOCKINFO * info,
         RemoveSubscriptionSID( sub->sid, service );
     }
 
-    HandleUnlock();
+    HandleUnlock(  );
 }
 
 /****************************************************************************
@@ -1647,13 +1644,13 @@ gena_process_unsubscribe_request( IN SOCKINFO * info,
         return;
     }
 
-    HandleLock();
+    HandleLock(  );
 
     // CURRENTLY, ONLY SUPPORT ONE DEVICE
     if( GetDeviceHandleInfo( &device_handle, &handle_info ) != HND_DEVICE ) {
         error_respond( info, HTTP_PRECONDITION_FAILED, request );
         membuffer_destroy( &event_url_path );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     service = FindServiceEventURLPath( &handle_info->ServiceTable,
@@ -1666,14 +1663,14 @@ gena_process_unsubscribe_request( IN SOCKINFO * info,
         //CheckSubscriptionSID(sid, service) == NULL )
     {
         error_respond( info, HTTP_PRECONDITION_FAILED, request );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
 
     RemoveSubscriptionSID( sid, service );
     error_respond( info, HTTP_OK, request );    // success
 
-    HandleUnlock();
+    HandleUnlock(  );
 }
 
 #endif // INCLUDE_DEVICE_APIS

upnp/src/genlib/miniserver/miniserver.c

@@ -45,7 +45,7 @@
 #else
  #include <winsock2.h>
 
- typedef int socklen_t;
+ #define socklen_t int
  #define EAFNOSUPPORT 97
 #endif
 #include "unixutil.h"
@@ -106,16 +106,16 @@ SetHTTPGetCallback( MiniServerCallback callback )
 }
 
 /************************************************************************
-* Function :	SetSoapCallback
+*	Function :	SetSoapCallback
 *
-* Parameters :
+*	Parameters :
-*	MiniServerCallback callback ; - SOAP Callback to be invoked 
+*		MiniServerCallback callback ; - SOAP Callback to be invoked 
 *
-* Description :	Set SOAP Callback
+*	Description :	Set SOAP Callback
 *
-* Return :	void
+*	Return :	void
 *
-* Note :
+*	Note :
 ************************************************************************/
 void
 SetSoapCallback( MiniServerCallback callback )
@@ -174,9 +174,11 @@ dispatch_request( IN SOCKINFO * info,
         case HTTPMETHOD_NOTIFY:
         case HTTPMETHOD_SUBSCRIBE:
         case HTTPMETHOD_UNSUBSCRIBE:
-            UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf
-                "miniserver %d: got GENA msg\n", info->socket );
+                     ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-            callback = gGenaCallback;
+                       "miniserver %d: got GENA msg\n", info->socket );
+                 )
+                callback = gGenaCallback;
             break;
 
             //HTTP server call
@@ -215,7 +217,7 @@ dispatch_request( IN SOCKINFO * info,
 *
 *	Note :
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 handle_error( IN SOCKINFO * info,
               int http_error_code,
               int major,
@@ -273,10 +275,12 @@ handle_request( void *args )
     struct mserv_request_t *request = ( struct mserv_request_t * )args;
     int connfd = request->connfd;
 
-    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf
-        "miniserver %d: READING\n", connfd );
+             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-    //parser_request_init( &parser ); ////LEAK_FIX_MK
+               "miniserver %d: READING\n", connfd );
-    hmsg = &parser.msg;
+         )
+        //parser_request_init( &parser ); ////LEAK_FIX_MK
+        hmsg = &parser.msg;
 
     if( sock_init_with_ip( &info, connfd, request->foreign_ip_addr,
                            request->foreign_ip_port ) != UPNP_E_SUCCESS ) {
@@ -291,10 +295,12 @@ handle_request( void *args )
         goto error_handler;
     }
 
-    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf
-        "miniserver %d: PROCESSING...\n", connfd );
+             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-    // dispatch
+               "miniserver %d: PROCESSING...\n", connfd );
-    http_error_code = dispatch_request( &info, &parser );
+         )
+        // dispatch
+        http_error_code = dispatch_request( &info, &parser );
     if( http_error_code != 0 ) {
         goto error_handler;
     }
@@ -310,9 +316,11 @@ handle_request( void *args )
         handle_error( &info, http_error_code, major, minor );
     }
 
-    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf
-        "miniserver %d: COMPLETE\n", connfd );
+             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-    sock_destroy( &info, SD_BOTH ); //should shutdown completely
+               "miniserver %d: COMPLETE\n", connfd );
+         )
+        sock_destroy( &info, SD_BOTH ); //should shutdown completely
 
     httpmsg_destroy( hmsg );
     free( request );
@@ -333,7 +341,7 @@ handle_request( void *args )
 *
 *	Note :
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 schedule_request_job( IN int connfd,
                       IN struct sockaddr_in *clientAddr )
 {
@@ -344,9 +352,11 @@ schedule_request_job( IN int connfd,
         ( struct mserv_request_t * )
         malloc( sizeof( struct mserv_request_t ) );
     if( request == NULL ) {
-        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf
-            "mserv %d: out of memory\n", connfd );
+                 ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-        shutdown( request->connfd, SD_BOTH );
+                   "mserv %d: out of memory\n", connfd );
+             )
+            shutdown( request->connfd, SD_BOTH );
         UpnpCloseSocket( connfd );
         return;
     }
@@ -359,9 +369,11 @@ schedule_request_job( IN int connfd,
     TPJobSetFreeFunction( &job, free_handle_request_arg );
     TPJobSetPriority( &job, MED_PRIORITY );
 
-    if( ThreadPoolAdd( &gMiniServerThreadPool, &job, NULL ) != 0 ) {
+    if( ThreadPoolAdd( &gRecvThreadPool, &job, NULL ) != 0 ) {
-        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf
-            "mserv %d: cannot schedule request\n", connfd );
+                 ( UPNP_INFO, MSERV, __FILE__, __LINE__,
+                   "mserv %d: cannot schedule request\n", connfd );
+             )
             free( request );
         shutdown( connfd, SD_BOTH );
         UpnpCloseSocket( connfd );
@@ -434,9 +446,11 @@ RunMiniServer( MiniServerSockArray * miniSock )
 
         if( select( maxMiniSock, &rdSet, NULL, &expSet, NULL ) ==
             UPNP_SOCKETERROR ) {
-            UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf
-                "Error in select call !!!\n" );
+                     ( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-            continue;
+                       "Error in select call !!!\n" );
+                 )
+                continue;
         } else {
 
             if( FD_ISSET( miniServSock, &rdSet ) ) {
@@ -445,10 +459,12 @@ RunMiniServer( MiniServerSockArray * miniSock )
                                      ( struct sockaddr * )&clientAddr,
                                      &clientLen );
                 if( connectHnd == UPNP_INVALID_SOCKET ) {
-                    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+                    DBGONLY( UpnpPrintf
-                        "miniserver: Error"
+                             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                        " in accepting connection\n" );
+                               "miniserver: Error"
-                    continue;
+                               " in accepting connection\n" );
+                         )
+                        continue;
                 }
                 schedule_request_job( connectHnd, &clientAddr );
             }
@@ -473,19 +489,24 @@ RunMiniServer( MiniServerSockArray * miniSock )
                               &clientLen );
                 if( byteReceived > 0 ) {
                     requestBuf[byteReceived] = '\0';
-                    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+                    DBGONLY( UpnpPrintf
-                        "Received response !!!  %s From host %s \n",
+                             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                        requestBuf, inet_ntoa( clientAddr.sin_addr ) );
+                               "Received response !!!  %s From host %s \n",
-                    UpnpPrintf( UPNP_PACKET, MSERV, __FILE__, __LINE__,
+                               requestBuf,
-                        "Received multicast packet: \n %s\n",
+                               inet_ntoa( clientAddr.sin_addr ) );
-                        requestBuf );
+                         )
+                        DBGONLY( UpnpPrintf
+                                 ( UPNP_PACKET, MSERV, __FILE__, __LINE__,
+                                   "Received multicast packet: \n %s\n",
+                                   requestBuf );
+                         )
 
-                    if( NULL != strstr( requestBuf, "ShutDown" ) ) {
+                        if( NULL != strstr( requestBuf, "ShutDown" ) )
                         break;
-		    }
                 }
             }
         }
+
     }
 
     shutdown( miniServSock, SD_BOTH );
@@ -534,10 +555,12 @@ get_port( int sockfd )
     }
 
     port = ntohs( sockinfo.sin_port );
-    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf
-        "sockfd = %d, .... port = %d\n", sockfd, port );
+             ( UPNP_INFO, MSERV, __FILE__, __LINE__,
+               "sockfd = %d, .... port = %d\n", sockfd, port );
+         )
 
-    return port;
+        return port;
 }
 
 /************************************************************************
@@ -600,10 +623,16 @@ get_miniserver_sockets( MiniServerSockArray * out,
         //THIS MAY CAUSE TCP TO BECOME LESS RELIABLE
         //HOWEVER IT HAS BEEN SUGESTED FOR TCP SERVERS
 
-        UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
-            "mserv start: resuseaddr set\n" );
+                             "mserv start: resuseaddr set\n" );
-        sockError = setsockopt( listenfd, SOL_SOCKET, SO_REUSEADDR,
+             )
-            ( const char * )&reuseaddr_on, sizeof( int ));
+
+            sockError = setsockopt( listenfd,
+                                    SOL_SOCKET,
+                                    SO_REUSEADDR,
+                                    ( const char * )&reuseaddr_on,
+                                    sizeof( int )
+             );
         if( sockError == UPNP_SOCKETERROR ) {
             shutdown( listenfd, SD_BOTH );
             UpnpCloseSocket( listenfd );
@@ -622,11 +651,6 @@ get_miniserver_sockets( MiniServerSockArray * out,
                               sizeof( struct sockaddr_in )
                  );
             if( sockError == UPNP_SOCKETERROR ) {
-#ifdef WIN32
-                errCode = WSAGetLastError();
-#else
-                errCode = errno; 
-#endif
                 if( errno == EADDRINUSE )
                     errCode = 1;
             } else
@@ -636,16 +660,18 @@ get_miniserver_sockets( MiniServerSockArray * out,
     }
 
     if( sockError == UPNP_SOCKETERROR ) {
-        perror( "mserv start: bind failed" );
+        DBGONLY( perror( "mserv start: bind failed" );
-        shutdown( listenfd, SD_BOTH );
+             )
+            shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
         return UPNP_E_SOCKET_BIND;  // bind failed
     }
 
-    UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
-        "mserv start: bind success\n" );
+                         "mserv start: bind success\n" );
+         )
 
-    success = listen( listenfd, SOMAXCONN );
+        success = listen( listenfd, SOMAXCONN );
     if( success == UPNP_SOCKETERROR ) {
         shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
@@ -663,10 +689,11 @@ get_miniserver_sockets( MiniServerSockArray * out,
 
     if( ( miniServerStopSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) ==
         UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
+        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-            MSERV, __FILE__, __LINE__,
+                             MSERV, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
+                             "Error in socket operation !!!\n" );
-        shutdown( listenfd, SD_BOTH );
+             )
+            shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
         return UPNP_E_OUTOF_SOCKET;
     }
@@ -679,10 +706,11 @@ get_miniserver_sockets( MiniServerSockArray * out,
     if( bind( miniServerStopSock, ( struct sockaddr * )&serverAddr,
               sizeof( serverAddr ) ) == UPNP_SOCKETERROR ) {
 
-        UpnpPrintf( UPNP_CRITICAL,
+        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-            MSERV, __FILE__, __LINE__,
+                             MSERV, __FILE__, __LINE__,
-            "Error in binding localhost!!!\n" );
+                             "Error in binding localhost!!!\n" );
-        shutdown( listenfd, SD_BOTH );
+             )
+            shutdown( listenfd, SD_BOTH );
         UpnpCloseSocket( listenfd );
         shutdown( miniServerStopSock, SD_BOTH );
         UpnpCloseSocket( miniServerStopSock );
@@ -772,7 +800,7 @@ StartMiniServer( unsigned short listen_port )
 
     TPJobSetFreeFunction( &job, ( free_routine ) free );
 
-    success = ThreadPoolAddPersistent( &gMiniServerThreadPool, &job, NULL );
+    success = ThreadPoolAddPersistent( &gRecvThreadPool, &job, NULL );
 
     if( success < 0 ) {
         shutdown( miniSocket->miniServerSock, SD_BOTH );
@@ -844,9 +872,11 @@ StopMiniServer( void )
 
     sock = socket( AF_INET, SOCK_DGRAM, 0 );
     if( sock == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf
-            "SSDP_SERVER:StopSSDPServer: Error in socket operation !!!\n" );
+                 ( UPNP_INFO, SSDP, __FILE__, __LINE__,
-        return 0;
+                   "SSDP_SERVER:StopSSDPServer: Error in socket operation !!!\n" );
+             )
+            return 0;
     }
 
     while( gMServState != MSERV_IDLE ) {

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

@@ -34,7 +34,6 @@
 * messages.
 ************************************************************************/
 
-#define _GNU_SOURCE	// For strcasestr() in string.h
 #include "config.h"
 #include <assert.h>
 #include <string.h>
@@ -101,7 +100,7 @@ str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES] = {
 
 /***********************************************************************/
 
-/*************                 scanner                     *************/
+/*************				 scanner					  **************/
 
 /***********************************************************************/
 
@@ -109,19 +108,19 @@ str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES] = {
 #define TOKCHAR_LF		0xA
 
 /************************************************************************
-* Function :	scanner_init
+*	Function :	scanner_init
 *
-* Parameters :
+*	Parameters :
-*	OUT scanner_t* scanner ; Scanner Object to be initialized
+*		OUT scanner_t* scanner ; Scanner Object to be initialized
-*	IN membuffer* bufptr ;	 Buffer to be copied
+*		IN membuffer* bufptr ;	 Buffer to be copied
 *
-* Description :	Intialize scanner
+*	Description :	Intialize scanner
 *
-* Return : void ;
+*	Return : void ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 scanner_init( OUT scanner_t * scanner,
               IN membuffer * bufptr )
 {
@@ -131,72 +130,72 @@ scanner_init( OUT scanner_t * scanner,
 }
 
 /************************************************************************
-* Function :	is_separator_char
+*	Function :	is_separator_char
 *
-* Parameters :
+*	Parameters :
-*	IN char c ;	character to be tested against used separator values
+*		IN char c ;	character to be tested against used separator values
 *
-* Description :	Finds the separator character.
+*	Description :	Finds the separator character.
 *
-* Return : xboolean ;
+*	Return : xboolean ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
+static XINLINE xboolean
 is_separator_char( IN char c )
 {
     return strchr( " \t()<>@,;:\\\"/[]?={}", c ) != NULL;
 }
 
 /************************************************************************
-* Function :	is_identifier_char
+*	Function :	is_identifier_char
 *
-* Parameters :
+*	Parameters :
-*	IN char c ;	character to be tested for separator values
+*		IN char c ;	character to be tested for separator values
 *
-* Description :	Calls the function to indentify separator character 
+*	Description :	Calls the function to indentify separator character 
 *
-* Return : xboolean ;
+*	Return : xboolean ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
+static XINLINE xboolean
 is_identifier_char( IN char c )
 {
     return ( c >= 32 && c <= 126 ) && !is_separator_char( c );
 }
 
 /************************************************************************
-* Function :	is_control_char
+*	Function :	is_control_char
 *
-* Parameters :
+*	Parameters :
-*	IN char c ;	character to be tested for a control character
+*		IN char c ;	character to be tested for a control character
 *
-* Description :	Determines if the passed value is a control character
+*	Description :	Determines if the passed value is a control character
 *
-* Return : xboolean ;
+*	Return : xboolean ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
+static XINLINE xboolean
 is_control_char( IN char c )
 {
     return ( ( c >= 0 && c <= 31 ) || ( c == 127 ) );
 }
 
 /************************************************************************
-* Function :	is_qdtext_char
+*	Function :	is_qdtext_char
 *
-* Parameters :
+*	Parameters :
-*	IN char cc ; character to be tested for CR/LF
+*		IN char cc ; character to be tested for CR/LF
 *
-* Description :	Checks to see if the passed in value is CR/LF
+*	Description :	Checks to see if the passed in value is CR/LF
 *
-* Return : xboolean ;
+*	Return : xboolean ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE xboolean
+static XINLINE xboolean
 is_qdtext_char( IN char cc )
 {
     unsigned char c = ( unsigned char )cc;
@@ -214,22 +213,22 @@ is_qdtext_char( IN char cc )
 }
 
 /************************************************************************
-* Function :	scanner_get_token
+*	Function :	scanner_get_token
 *
-* Parameters :
+*	Parameters :
-*	INOUT scanner_t* scanner ;	Scanner Object
+*		INOUT scanner_t* scanner ;	Scanner Object
-*	OUT memptr* token ;			Token 
+*		OUT memptr* token ;			Token 
-*	OUT token_type_t* tok_type ; Type of token
+*		OUT token_type_t* tok_type ; Type of token
 *
-* Description :	reads next token from the input stream				
+*	Description :	reads next token from the input stream				
-*	note: 0 and is used as a marker, and will not be valid in a quote
+*		note: 0 and is used as a marker, and will not be valid in a quote
 *
-* Return : parse_status_t ;
+*	Return : parse_status_t ;
-*	PARSE_OK
+*		PARSE_OK															
-*	PARSE_INCOMPLETE		-- not enuf chars to get a token			
+*		PARSE_INCOMPLETE		-- not enuf chars to get a token			
-*	PARSE_FAILURE			-- bad msg format							
+*		PARSE_FAILURE			-- bad msg format							
 *
-* Note :
+*	Note :
 ************************************************************************/
 static parse_status_t
 scanner_get_token( INOUT scanner_t * scanner,
@@ -364,40 +363,38 @@ scanner_get_token( INOUT scanner_t * scanner,
 }
 
 /************************************************************************
-* Function :	scanner_get_str
+*	Function :	scanner_get_str
 *
-* Parameters :
+*	Parameters :
-*	IN scanner_t* scanner ;	Scanner Object
+*		IN scanner_t* scanner ;	Scanner Object
 *
-* Description :	returns ptr to next char in string
+*	Description :	returns ptr to next char in string
 *
-* Return : char* ;
+*	Return : char* ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE char *
+static XINLINE char *
 scanner_get_str( IN scanner_t * scanner )
 {
     return scanner->msg->buf + scanner->cursor;
 }
 
 /************************************************************************
-* Function :	scanner_pushback
+*	Function :	scanner_pushback
 *
-* Parameters :
+*	Parameters :
-*	INOUT scanner_t* scanner ;	Scanner Object
+*		INOUT scanner_t* scanner ;	Scanner Object
-*	IN size_t pushback_bytes ;	Bytes to be moved back
+*		IN size_t pushback_bytes ;	Bytes to be moved back
 *
-* Description :	Move back by a certain number of bytes.				
+*	Description :	Move back by a certain number of bytes.				
-*	This is used to put back one or more tokens back into the input		
+*		This is used to put back one or more tokens back into the input		
 *
-* Return : void ;
+*	Return : void ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-#warning The only use of the function 'scanner_pushback()' in the code is commented out.
+static XINLINE void
-#warning 'scanner_pushback()' is a candidate for removal.
-static UPNP_INLINE void
 scanner_pushback( INOUT scanner_t * scanner,
                   IN size_t pushback_bytes )
 {
@@ -406,34 +403,34 @@ scanner_pushback( INOUT scanner_t * scanner,
 
 /***********************************************************************/
 
-/*************                end of scanner              **************/
+/*************				end of scanner				  **************/
 
 /***********************************************************************/
 
 /***********************************************************************/
 
-/*************                    parser                  **************/
+/*************					parser					  **************/
 
 /***********************************************************************/
 
 /***********************************************************************/
 
-/*************                 http_message_t             **************/
+/*************				  http_message_t			  **************/
 
 /***********************************************************************/
 
 /************************************************************************
-* Function :	httpmsg_compare
+*	Function :	httpmsg_compare
 *
-* Parameters :
+*	Parameters :
-*	void* param1 ;	
+*		void* param1 ;	
-*	void* param2 ;	
+*		void* param2 ;	
 *
-* Description :	Compares name id in the http headers.
+*	Description :	Compares name id in the http headers.
 *
-* Return : int ;
+*	Return : int ;
 *
-* Note :
+*	Note :
 ************************************************************************/
 static int
 httpmsg_compare( void *param1,
@@ -447,16 +444,16 @@ httpmsg_compare( void *param1,
 }
 
 /************************************************************************
-* Function :	httpheader_free
+*	Function :	httpheader_free
 *
-* Parameters :
+*	Parameters :
-*	void *msg ;	
+*		void *msg ;	
 *
-* Description :	Free memory allocated for the http header
+*	Description :	Free memory allocated for the http header
 *
-* Return : void ;
+*	Return : void ;
 *
-* Note :
+*	Note :
 ************************************************************************/
 static void
 httpheader_free( void *msg )
@@ -469,16 +466,16 @@ httpheader_free( void *msg )
 }
 
 /************************************************************************
-* Function :	httpmsg_init
+*	Function :	httpmsg_init
 *
-* Parameters :
+*	Parameters :
-*	INOUT http_message_t* msg ;	HTTP Message Object
+*		INOUT http_message_t* msg ;	HTTP Message Object
 *
-* Description :	Initialize and allocate memory for http message
+*	Description :	Initialize and allocate memory for http message
 *
-* Return : void ;
+*	Return : void ;
 *
-* Note :
+*	Note :
 ************************************************************************/
 void
 httpmsg_init( INOUT http_message_t * msg )
@@ -492,16 +489,16 @@ httpmsg_init( INOUT http_message_t * msg )
 }
 
 /************************************************************************
-* Function :	httpmsg_destroy
+*	Function :	httpmsg_destroy
 *
-* Parameters :
+*	Parameters :
-*	INOUT http_message_t* msg ;	HTTP Message Object
+*		INOUT http_message_t* msg ;	HTTP Message Object
 *
-* Description :	Free memory allocated for the http message
+*	Description :	Free memory allocated for the http message
 *
-* Return : void ;
+*	Return : void ;
 *
-* Note :
+*	Note :
 ************************************************************************/
 void
 httpmsg_destroy( INOUT http_message_t * msg )
@@ -518,19 +515,19 @@ httpmsg_destroy( INOUT http_message_t * msg )
 }
 
 /************************************************************************
-* Function :	httpmsg_find_hdr_str
+*	Function :	httpmsg_find_hdr_str
 *
-* Parameters :
+*	Parameters :
-*	IN http_message_t* msg ;	HTTP Message Object
+*		IN http_message_t* msg ;	HTTP Message Object
-*	IN const char* header_name ; Header name to be compared with
+*		IN const char* header_name ; Header name to be compared with	
 *
-* Description :	Compares the header name with the header names stored
+*	Description :	Compares the header name with the header names stored 
-*	in	the linked list of messages
+*		in	the linked list of messages
 *
-* Return : http_header_t* - Pointer to a header on success;
+*	Return : http_header_t* - Pointer to a header on success;
-*		 NULL on failure
+*			 NULL on failure														
 *
-* Note :
+*	Note :
 ************************************************************************/
 http_header_t *
 httpmsg_find_hdr_str( IN http_message_t * msg,
@@ -555,19 +552,19 @@ httpmsg_find_hdr_str( IN http_message_t * msg,
 }
 
 /************************************************************************
-* Function :	httpmsg_find_hdr
+*	Function :	httpmsg_find_hdr
 *
-* Parameters :
+*	Parameters :
-*	IN http_message_t* msg ; HTTP Message Object
+*		IN http_message_t* msg ; HTTP Message Object
-*	IN int header_name_id ;	 Header Name ID to be compared with
+*		IN int header_name_id ;	 Header Name ID to be compared with
-*	OUT memptr* value ;		 Buffer to get the ouput to.
+*		OUT memptr* value ;		 Buffer to get the ouput to.
 *
-* Description :	Finds header from a list, with the given 'name_id'.
+*	Description :	Finds header from a list, with the given 'name_id'.
 *
-* Return : http_header_t*  - Pointer to a header on success;
+*	Return : http_header_t*  - Pointer to a header on success;										*
-*				NULL on failure
+*			 NULL on failure														
 *
-* Note :
+*	Note :
 ************************************************************************/
 http_header_t *
 httpmsg_find_hdr( IN http_message_t * msg,
@@ -600,23 +597,23 @@ httpmsg_find_hdr( IN http_message_t * msg,
 
 /***********************************************************************/
 
-/*************              http_parser_t                 **************/
+/*************				  http_parser_t				  **************/
 
 /***********************************************************************/
 
 /************************************************************************
-* Function :	skip_blank_lines
+*	Function :	skip_blank_lines
 *
-* Parameters :
+*	Parameters :
-*	INOUT scanner_t* scanner ;	Scanner Object
+*		INOUT scanner_t* scanner ;	Scanner Object
 *
-* Description :	skips blank lines at the start of a msg.
+*	Description :	skips blank lines at the start of a msg.
 *
-* Return : int ;
+*	Return : int ;
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 skip_blank_lines( INOUT scanner_t * scanner )
 {
     memptr token;
@@ -639,21 +636,21 @@ skip_blank_lines( INOUT scanner_t * scanner )
 }
 
 /************************************************************************
-* Function :	skip_lws
+*	Function :	skip_lws
 *
-* Parameters :
+*	Parameters :
-*	INOUT scanner_t* scanner ;	Scanner Object
+*		INOUT scanner_t* scanner ;	Scanner Object
 *
-* Description :	skip linear whitespace.
+*	Description :	skip linear whitespace.
 *
-* Return : int ;
+*	Return : int ;
-*	PARSE_OK: (LWS)* removed from input
+*		PARSE_OK: (LWS)* removed from input								
-*	PARSE_FAILURE: bad input
+*		PARSE_FAILURE: bad input											
-*	PARSE_INCOMPLETE: incomplete input
+*		PARSE_INCOMPLETE: incomplete input									
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 skip_lws( INOUT scanner_t * scanner )
 {
     memptr token;
@@ -692,23 +689,23 @@ skip_lws( INOUT scanner_t * scanner )
 }
 
 /************************************************************************
-* Function :	match_non_ws_string
+*	Function :	match_non_ws_string
 *
-* Parameters :
+*	Parameters :
-*	INOUT scanner_t* scanner ;	Scanner Object
+*		INOUT scanner_t* scanner ;	Scanner Object
-*	OUT memptr* str ;	Buffer to get the scanner buffer contents.
+*		OUT memptr* str ;	Buffer to get the scanner buffer contents.
 *
-* Description :	Match a string without whitespace or CRLF (%S)
+*	Description :	Match a string without whitespace or CRLF (%S)
 *
-* Return : UPNP_INLINE parse_status_t ;
+*	Return : XINLINE parse_status_t ;
-*	PARSE_OK
+*		PARSE_OK															
-*	PARSE_NO_MATCH
+*		PARSE_NO_MATCH														
-*	PARSE_FAILURE
+*		PARSE_FAILURE														
-*	PARSE_INCOMPLETE
+*		PARSE_INCOMPLETE													
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 match_non_ws_string( INOUT scanner_t * scanner,
                      OUT memptr * str )
 {
@@ -756,25 +753,25 @@ match_non_ws_string( INOUT scanner_t * scanner,
 }
 
 /************************************************************************
-* Function :	match_raw_value
+*	Function :	match_raw_value
 *
-* Parameters :
+*	Parameters :
-*	INOUT scanner_t* scanner ;	Scanner Object
+*		INOUT scanner_t* scanner ;	Scanner Object
-*	OUT memptr* raw_value ;		Buffer to get the scanner buffer 
+*		OUT memptr* raw_value ;	    Buffer to get the scanner buffer 
-*					contents
+*									contents
 *
-* Description :	Matches a raw value in a the input; value's length 
+*	Description :	Matches a raw value in a the input; value's length 
-*	can	be 0 or more. Whitespace after value is trimmed. On success,
+*		can	be 0 or more. Whitespace after value is trimmed. On success,
-*	scanner points the CRLF that ended the value
+*		scanner points the CRLF that ended the value						
 *
-* Return : parse_status_t ;
+*	Return : parse_status_t ;
-*	PARSE_OK
+*		PARSE_OK													
-*	PARSE_INCOMPLETE
+*		PARSE_INCOMPLETE													
-*	PARSE_FAILURE
+*		PARSE_FAILURE														
 *
-* Note :
+*	Note :
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 match_raw_value( INOUT scanner_t * scanner,
                  OUT memptr * raw_value )
 {
@@ -851,9 +848,9 @@ match_raw_value( INOUT scanner_t * scanner,
 *																		
 * Parameters:															
 *	INOUT scanner_t* scanner ;  Scanner Object											
-*	IN int base :		Base of number in the string;
+*	IN int base :				Base of number in the string; 
-*				valid values: 10 or 16
+*								valid values: 10 or 16	
-*	OUT int* value ;	Number stored here
+*	OUT int* value ;			Number stored here									
 *																		
 * Description: Matches an unsigned integer value in the input. The		
 *	integer is returned in 'value'. Except for PARSE_OK result, the		
@@ -865,7 +862,7 @@ match_raw_value( INOUT scanner_t * scanner,
 *   PARSE_FAILURE		-- bad input									
 *   PARSE_INCOMPLETE													
 ************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 match_int( INOUT scanner_t * scanner,
            IN int base,
            OUT int *value )
@@ -912,8 +909,8 @@ match_int( INOUT scanner_t * scanner,
 * Function: read_until_crlf												
 *																		
 * Parameters:															
-*	INOUT scanner_t* scanner ;Scanner Object
+*	INOUT scanner_t* scanner ;	Scanner Object											
-*	OUT memptr* str ;	Buffer to copy scanner buffer contents to
+*	OUT memptr* str ;			Buffer to copy scanner buffer contents to
 *																		
 * Description: Reads data until end of line; the crlf at the end of		
 *	line is not consumed. On error, scanner is not restored. On			
@@ -924,7 +921,7 @@ match_int( INOUT scanner_t * scanner,
 *   PARSE_FAILURE														
 *   PARSE_INCOMPLETE													
 ************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 read_until_crlf( INOUT scanner_t * scanner,
                  OUT memptr * str )
 {
@@ -965,9 +962,7 @@ read_until_crlf( INOUT scanner_t * scanner,
 *   PARSE_FAILURE														
 *   PARSE_INCOMPLETE													
 ************************************************************************/
-#warning There are currently no uses of the function 'skip_to_end_of_header()' in the code.
+static XINLINE int
-#warning 'skip_to_end_of_header()' is a candidate for removal.
-static UPNP_INLINE int
 skip_to_end_of_header( INOUT scanner_t * scanner )
 {
     memptr dummy_raw_value;
@@ -981,10 +976,10 @@ skip_to_end_of_header( INOUT scanner_t * scanner )
 * Function: match_char
 *
 * Parameters:
-*	INOUT scanner_t* scanner ;	Scanner Object
+*	INOUT scanner_t* scanner ;  Scanner Object
-*	IN char c ;			Character to be compared with
+*	IN char c ;					Character to be compared with
-*	IN xboolean case_sensitive;	Flag indicating whether
+*	IN xboolean case_sensitive; Flag indicating whether comparison should
-*					comparison should be case sensitive
+*								be case sensitive
 *
 * Description: Compares a character to the next char in the scanner;
 *	on error, scanner chars are not restored
@@ -994,7 +989,7 @@ skip_to_end_of_header( INOUT scanner_t * scanner )
 *   PARSE_NO_MATCH
 *   PARSE_INCOMPLETE
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 match_char( INOUT scanner_t * scanner,
             IN char c,
             IN xboolean case_sensitive )
@@ -1049,24 +1044,24 @@ match_char( INOUT scanner_t * scanner,
 //   PARSE_NO_MATCH     -- input does not match pattern
 
 /************************************************************************
-* Function : vfmatch
+*	Function :	vfmatch
 *
-* Parameters :
+*	Parameters :
-* 	INOUT scanner_t* scanner ;	Scanner Object	
+*		INOUT scanner_t* scanner ;  Scanner Object	
-* 	IN const char* fmt ;		Pattern Format 
+*		IN const char* fmt ;		Pattern Format 
-* 	va_list argp ;			List of variable arguments
+*		va_list argp ;				List of variable arguments
 *
-* Description : Extracts variable parameters depending on the passed 
+*	Description :	Extracts variable parameters depending on the passed 
-* 	in format parameter. Parses data also based on the passed in 
+*		in format parameter. Parses data also based on the passed in 
-* 	format parameter.
+*		format parameter.
 *
-* Return : int ;
+*	Return : int ;
-* 	PARSE_OK
+*		PARSE_OK
-* 	PARSE_INCOMPLETE
+*		PARSE_INCOMPLETE
-* 	PARSE_FAILURE		- bad input
+*		PARSE_FAILURE		- bad input
-* 	PARSE_NO_MATCH		- input does not match pattern
+*		PARSE_NO_MATCH		- input does not match pattern
 *
-* Note :
+*	Note :
 ************************************************************************/
 static int
 vfmatch( INOUT scanner_t * scanner,
@@ -1249,8 +1244,8 @@ vfmatch( INOUT scanner_t * scanner,
 * Function: match														
 *																		
 * Parameters:															
-*	INOUT scanner_t* scanner ;	Scanner Object
+*	INOUT scanner_t* scanner ; Scanner Object											
-*	IN const char* fmt;		Pattern format
+*	IN const char* fmt;			Pattern format													
 *	...																	
 *																		
 * Description: matches a variable parameter list and takes necessary	
@@ -1280,9 +1275,9 @@ match( INOUT scanner_t * scanner,
 * Function: matchstr													
 *																		
 * Parameters:															
-*	IN char *str ;		String to be matched
+*	IN char *str ;		 String to be matched														
-*	IN size_t slen ;	Length of the string
+*	IN size_t slen ;     Length of the string														
-*	IN const char* fmt ;	Pattern format
+*	IN const char* fmt ; Pattern format												
 *	...																	
 *																		
 * Description: Matches a variable parameter list with a string			
@@ -1341,7 +1336,7 @@ matchstr( IN char *str,
 * Returns:																
 *	void																
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 parser_init( OUT http_parser_t * parser )
 {
     memset( parser, 0, sizeof( http_parser_t ) );
@@ -1876,7 +1871,7 @@ parser_parse_headers_old( INOUT http_parser_t * parser )
 *	 PARSE_FAILURE -- entity length > content-length value				
 *	 PARSE_SUCCESS														
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 parser_parse_entity_using_clen( INOUT http_parser_t * parser )
 {
     //int entity_length;
@@ -1923,7 +1918,7 @@ parser_parse_entity_using_clen( INOUT http_parser_t * parser )
 *	 PARSE_FAILURE -- entity length > content-length value				
 *	 PARSE_SUCCESS														
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 parser_parse_chunky_body( INOUT http_parser_t * parser )
 {
     parse_status_t status;
@@ -1968,7 +1963,7 @@ parser_parse_chunky_body( INOUT http_parser_t * parser )
 *	 PARSE_FAILURE -- entity length > content-length value				
 *	 PARSE_SUCCESS														
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 parser_parse_chunky_headers( INOUT http_parser_t * parser )
 {
     parse_status_t status;
@@ -2008,7 +2003,7 @@ parser_parse_chunky_headers( INOUT http_parser_t * parser )
 *	 PARSE_SUCCESS														
 *	 PARSE_CONTINUE_1													
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 parser_parse_chunky_entity( INOUT http_parser_t * parser )
 {
     scanner_t *scanner = &parser->scanner;
@@ -2024,9 +2019,10 @@ parser_parse_chunky_entity( INOUT http_parser_t * parser )
     status = match( scanner, "%x%L%c", &parser->chunk_size, &dummy );
     if( status != PARSE_OK ) {
         scanner->cursor = save_pos;
-        UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf
-            "CHUNK COULD NOT BE PARSED\n" );
+                 ( UPNP_INFO, HTTP, __FILE__, __LINE__,
-        return status;
+                   "CHUNK COULD NOT BE PARSED\n" ); )
+            return status;
     }
     // remove chunk info just matched; just retain data
     membuffer_delete( &parser->msg.msg, save_pos,
@@ -2059,7 +2055,7 @@ parser_parse_chunky_entity( INOUT http_parser_t * parser )
 * Returns:																
 *	 PARSE_INCOMPLETE_ENTITY											
 ************************************************************************/
-static UPNP_INLINE parse_status_t
+static XINLINE parse_status_t
 parser_parse_entity_until_close( INOUT http_parser_t * parser )
 {
     size_t cursor;
@@ -2094,7 +2090,7 @@ parser_parse_entity_until_close( INOUT http_parser_t * parser )
 * 	 PARSE_FAILURE														
 *	 PARSE_COMPLETE	-- no more reading to do							
 ************************************************************************/
-UPNP_INLINE parse_status_t
+XINLINE parse_status_t
 parser_get_entity_read_method( INOUT http_parser_t * parser )
 {
     http_message_t *hmsg = &parser->msg;
@@ -2152,10 +2148,11 @@ parser_get_entity_read_method( INOUT http_parser_t * parser )
         if( raw_find_str( &hdr_value, "chunked" ) >= 0 ) {
             // read method to use chunked transfer encoding
             parser->ent_position = ENTREAD_USING_CHUNKED;
-            UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf
-                "Found Chunked Encoding ....\n" );
+                     ( UPNP_INFO, HTTP, __FILE__, __LINE__,
+                       "Found Chunked Encoding ....\n" ); )
 
-            return PARSE_CONTINUE_1;
+                return PARSE_CONTINUE_1;
         }
     }
     // * use content length
@@ -2199,7 +2196,7 @@ parser_get_entity_read_method( INOUT http_parser_t * parser )
 * 	 PARSE_FAILURE														
 *	 PARSE_COMPLETE	-- no more reading to do							
 ************************************************************************/
-UPNP_INLINE parse_status_t
+XINLINE parse_status_t
 parser_parse_entity( INOUT http_parser_t * parser )
 {
     parse_status_t status = PARSE_OK;
@@ -2264,7 +2261,7 @@ parser_request_init( OUT http_parser_t * parser )
 * Function: parser_response_init										
 *																		
 * Parameters:															
-*	OUT http_parser_t* parser	; HTTP Parser object
+*	OUT http_parser_t* parser	;	  HTTP Parser object
 *	IN http_method_t request_method	; Request method 					
 *																		
 * Description: Initializes parser object for a response					
@@ -2343,9 +2340,9 @@ parser_parse( INOUT http_parser_t * parser )
 *																		
 * Parameters:															
 *	INOUT http_parser_t* parser ;	HTTP Parser Object					
-*	IN const char* buf	;	buffer to be appended to the parser
+*	IN const char* buf	;			buffer to be appended to the parser 
-*					buffer
+*									buffer							
-*	IN size_t buf_length ;		Size of the buffer
+*	IN size_t buf_length ;			Size of the buffer												
 *																		
 * Description: The parser function. Depending on the position of the 	
 *	parser object the actual parsing function is invoked				
@@ -2375,7 +2372,7 @@ parser_append( INOUT http_parser_t * parser,
 }
 
 /************************************************************************
-**********                   end of parser                    ***********
+**********					end of parser					  ***********
 ************************************************************************/
 
 /************************************************************************
@@ -2383,7 +2380,7 @@ parser_append( INOUT http_parser_t * parser,
 *																		
 * Parameters:															
 *	IN memptr* raw_value ;	Buffer to be converted 					
-*	IN int base ;		Base  to use for conversion
+*	IN int base ;			Base  to use for conversion
 *																		
 * Description: Converts raw character data to long-integer value					
 *																		
@@ -2424,42 +2421,28 @@ raw_to_int( IN memptr * raw_value,
 *																		
 * Description: Find a substring from raw character string buffer					
 *																		
-* Side effects: raw_value is transformed to lowercase.
-*
 * Returns:																
 *	 int - index at which the substring is found.						
 ************************************************************************/
 int
-raw_find_str( IN memptr *raw_value,
+raw_find_str( IN memptr * raw_value,
               IN const char *str )
 {
     char c;
     char *ptr;
-    int i = 0;
 
-    // save
+    c = raw_value->buf[raw_value->length];  // save
-    c = raw_value->buf[raw_value->length];
+    raw_value->buf[raw_value->length] = 0;  // null-terminate
 
-    // Make it lowercase
-    for (i = 0; raw_value->buf[i]; ++i) {
-        raw_value->buf[i] = tolower(raw_value->buf[i]);
-    }
-
-    // null-terminate
-    raw_value->buf[raw_value->length] = 0;
-
-    // Find the substring position
     ptr = strstr( raw_value->buf, str );
 
-    // restore the "length" byte
+    raw_value->buf[raw_value->length] = c;  // restore
-    raw_value->buf[raw_value->length] = c;
 
     if( ptr == 0 ) {
         return -1;
     }
 
-    // return index
+    return ptr - raw_value->buf;    // return index
-    return ptr - raw_value->buf;
 }
 
 /************************************************************************
@@ -2472,7 +2455,7 @@ raw_find_str( IN memptr *raw_value,
 *	nameConverts a http_method id stored in the HTTP Method				
 *																		
 * Returns:																
-*	 const char* ptr - Ptr to the HTTP Method
+*	 const char* ptr - Ptr to the HTTP Method																							*
 ************************************************************************/
 const char *
 method_to_str( IN http_method_t method )
@@ -2497,38 +2480,40 @@ method_to_str( IN http_method_t method )
 * Returns:																
 *	 void																
 ************************************************************************/
-#ifdef DEBUG
 void
 print_http_headers( http_message_t * hmsg )
 {
+
     ListNode *node;
-    // NNS:  dlist_node *node;
+
+    //NNS:  dlist_node *node;
     http_header_t *header;
 
     // print start line
     if( hmsg->is_request ) {
-        printf( "method = %d, version = %d.%d, url = %.*s\n", 
+        //printf( "method = %d, version = %d.%d, url = %.*s\n", 
-            hmsg->method, hmsg->major_version, hmsg->minor_version,
+        //  hmsg->method, hmsg->major_version, hmsg->minor_version,
-            (int)hmsg->uri.pathquery.size, hmsg->uri.pathquery.buff);
+        //  hmsg->uri.pathquery.size, hmsg->uri.pathquery.buff);
     } else {
-        printf( "resp status = %d, version = %d.%d, status msg = %.*s\n",
+        //  printf( "resp status = %d, version = %d.%d, status msg = %.*s\n",
-            hmsg->status_code, hmsg->major_version, hmsg->minor_version,
+        //  hmsg->status_code, hmsg->major_version, hmsg->minor_version,
-            (int)hmsg->status_msg.length, hmsg->status_msg.buf);
+        //  (int)hmsg->status_msg.length, hmsg->status_msg.buf);
     }
 
     // print headers
+
     node = ListHead( &hmsg->headers );
-    // NNS: node = dlist_first_node( &hmsg->headers );
+    //NNS: node = dlist_first_node( &hmsg->headers );
     while( node != NULL ) {
+
         header = ( http_header_t * ) node->item;
-        // NNS: header = (http_header_t *)node->data;
+        //NNS: header = (http_header_t *)node->data;
-        printf( "hdr name: %.*s, value: %.*s\n", 
+        //printf( "hdr name: %.*s, value: %.*s\n", 
-            (int)header->name.length, header->name.buf,
+        //  (int)header->name.length, header->name.buf,
-            (int)header->value.length, header->value.buf );
+        //  (int)header->value.length, header->value.buf );
 
         node = ListNext( &hmsg->headers, node );
-        // NNS: node = dlist_next( &hmsg->headers, node );
+
+        //NNS: node = dlist_next( &hmsg->headers, node );
     }
 }
-#endif
-

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

@@ -118,7 +118,7 @@ static xboolean gInitialized = FALSE;
 * Returns:																
 *	 void																
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 init_table( IN const char *encoded_str,
             OUT const char *table[],
             IN int tbl_size )
@@ -144,7 +144,7 @@ init_table( IN const char *encoded_str,
 * Returns:																
 *	 void																
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 init_tables( void )
 {
     init_table( Http1xxStr, Http1xxCodes, NUM_1XX_CODES );

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

@@ -37,12 +37,6 @@
 #include "config.h"
 #include <assert.h>
 #include <fcntl.h>
-#ifndef UPNP_USE_BCBPP
-#ifndef UPNP_USE_MSVCPP
-    #include <inttypes.h>
-    #include <stdint.h>
-#endif
-#endif
 #include "util.h"
 #include "strintmap.h"
 #include "membuffer.h"
@@ -55,7 +49,7 @@
 #include "ssdplib.h"
 
 #ifndef WIN32
-    #include <unistd.h>
+ #include <unistd.h>
 #endif
 #include <sys/stat.h>
 #include "ithread.h"
@@ -205,7 +199,7 @@ extern str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES];
 * Returns:																
 *	 void																
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 media_list_init( void )
 {
     int i;
@@ -243,7 +237,7 @@ media_list_init( void )
 *	 0 on success;														
 *	-1 on error															
 ************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 search_extension( IN const char *extension,
                   OUT const char **con_type,
                   OUT const char **con_subtype )
@@ -290,7 +284,7 @@ search_extension( IN const char *extension,
 *	 0 - On Sucess														
 *	 UPNP_E_OUTOF_MEMORY - on memory allocation failures				
 ************************************************************************/
-UPNP_INLINE int
+XINLINE int
 get_content_type( IN const char *filename,
                   OUT DOMString * content_type )
 {
@@ -348,7 +342,7 @@ get_content_type( IN const char *filename,
 * Returns:																
 *	 void																
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 glob_alias_init( void )
 {
     struct xml_alias_t *alias = &gAliasDoc;
@@ -370,7 +364,7 @@ glob_alias_init( void )
 * Returns:																
 *	 BOOLEAN															
 ************************************************************************/
-static UPNP_INLINE xboolean
+static XINLINE xboolean
 is_valid_alias( IN const struct xml_alias_t *alias )
 {
     return alias->doc.buf != NULL;
@@ -637,13 +631,13 @@ get_file_info( IN const char *filename,
 
     rc = get_content_type( filename, &info->content_type );
 
-    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-        "file info: %s, length: %lld, last_mod=%s readable=%d\n",
+                         "file info: %s, length: %d, last_mod=%s readable=%d\n",
-        filename, (long long)info->file_length,
+                         filename, info->file_length,
-        asctime( gmtime( &info->last_modified ) ),
+                         asctime( gmtime( &info->last_modified ) ),
-        info->is_readable );
+                         info->is_readable ); )
 
-    return rc;
+        return rc;
 }
 
 /************************************************************************
@@ -700,7 +694,7 @@ web_server_set_root_dir( IN const char *root_dir )
 *	TRUE - On Success													
 *	FALSE if request is not an alias									
 ************************************************************************/
-static UPNP_INLINE xboolean
+static XINLINE xboolean
 get_alias( IN const char *request_file,
            OUT struct xml_alias_t *alias,
            OUT struct File_Info *info )
@@ -877,27 +871,25 @@ StrTok( char **Src,
 ************************************************************************/
 int
 GetNextRange( char **SrcRangeStr,
-              off_t *FirstByte,
+              int *FirstByte,
-              off_t *LastByte )
+              int *LastByte )
 {
-    char *Ptr;
+    char *Ptr,
-    char *Tok;
+     *Tok;
-    int i;
+    int i,
-    int64_t F = -1;
+      F = -1,
-    int64_t L = -1;
+      L = -1;
     int Is_Suffix_byte_Range = 1;
 
-    if( *SrcRangeStr == NULL ) {
+    if( *SrcRangeStr == NULL )
         return -1;
-    }
 
     Tok = StrTok( SrcRangeStr, "," );
 
-    if( ( Ptr = strstr( Tok, "-" ) ) == NULL ) {
+    if( ( Ptr = strstr( Tok, "-" ) ) == NULL )
         return -1;
-    }
     *Ptr = ' ';
-    sscanf( Tok, "%"SCNd64"%"SCNd64, &F, &L );
+    sscanf( Tok, "%d%d", &F, &L );
 
     if( F == -1 || L == -1 ) {
         *Ptr = '-';
@@ -912,15 +904,16 @@ GetNextRange( char **SrcRangeStr,
         }
 
         if( Is_Suffix_byte_Range ) {
-            *FirstByte = (off_t)L;
+            *FirstByte = L;
-            *LastByte = (off_t)F;
+            *LastByte = F;
             return 1;
         }
     }
-    *FirstByte = (off_t)F;
-    *LastByte = (off_t)L;
 
+    *FirstByte = F;
+    *LastByte = L;
     return 1;
+
 }
 
 /************************************************************************
@@ -943,11 +936,11 @@ GetNextRange( char **SrcRangeStr,
 ************************************************************************/
 int
 CreateHTTPRangeResponseHeader( char *ByteRangeSpecifier,
-                               off_t FileLength,
+                               long FileLength,
                                OUT struct SendInstruction *Instr )
 {
 
-    off_t FirstByte,
+    int FirstByte,
       LastByte;
     char *RangeInput,
      *Ptr;
@@ -991,36 +984,28 @@ CreateHTTPRangeResponseHeader( char *ByteRangeSpecifier,
 
             Instr->RangeOffset = FirstByte;
             Instr->ReadSendSize = LastByte - FirstByte + 1;
-            sprintf( Instr->RangeHeader,
+            sprintf( Instr->RangeHeader, "CONTENT-RANGE: bytes %d-%d/%ld\r\n", FirstByte, LastByte, FileLength );   //Data between two range.
-                "CONTENT-RANGE: bytes %"PRId64"-%"PRId64"/%"PRId64"\r\n",
-                (int64_t)FirstByte,
-                (int64_t)LastByte,
-                (int64_t)FileLength );   //Data between two range.
         } else if( FirstByte >= 0 && LastByte == -1
                    && FirstByte < FileLength ) {
             Instr->RangeOffset = FirstByte;
             Instr->ReadSendSize = FileLength - FirstByte;
             sprintf( Instr->RangeHeader,
-                     "CONTENT-RANGE: bytes %"PRId64"-%"PRId64"/%"PRId64"\r\n",
+                     "CONTENT-RANGE: bytes %d-%ld/%ld\r\n", FirstByte,
-                     (int64_t)FirstByte,
+                     FileLength - 1, FileLength );
-                     (int64_t)(FileLength - 1),
-                     (int64_t)FileLength );
         } else if( FirstByte == -1 && LastByte > 0 ) {
             if( LastByte >= FileLength ) {
                 Instr->RangeOffset = 0;
                 Instr->ReadSendSize = FileLength;
                 sprintf( Instr->RangeHeader,
-                         "CONTENT-RANGE: bytes 0-%"PRId64"/%"PRId64"\r\n",
+                         "CONTENT-RANGE: bytes 0-%ld/%ld\r\n",
-                         (int64_t)(FileLength - 1),
+                         FileLength - 1, FileLength );
-                         (int64_t)FileLength );
             } else {
                 Instr->RangeOffset = FileLength - LastByte;
                 Instr->ReadSendSize = LastByte;
                 sprintf( Instr->RangeHeader,
-                         "CONTENT-RANGE: bytes %"PRId64"-%"PRId64"/%"PRId64"\r\n",
+                         "CONTENT-RANGE: bytes %ld-%ld/%ld\r\n",
-                         (int64_t)(FileLength - LastByte + 1),
+                         FileLength - LastByte + 1, FileLength,
-                         (int64_t)FileLength,
+                         FileLength );
-                         (int64_t)FileLength );
             }
         } else {
             free( RangeInput );
@@ -1057,7 +1042,7 @@ CreateHTTPRangeResponseHeader( char *ByteRangeSpecifier,
 int
 CheckOtherHTTPHeaders( IN http_message_t * Req,
                        OUT struct SendInstruction *RespInstr,
-                       off_t FileSize )
+                       int FileSize )
 {
     http_header_t *header;
     ListNode *node;
@@ -1199,6 +1184,7 @@ process_request( IN http_message_t * req,
     int code;
     int err_code;
 
+    //membuffer content_type;
     char *request_doc;
     struct File_Info finfo;
     xboolean using_alias;
@@ -1208,7 +1194,7 @@ process_request( IN http_message_t * req,
     int resp_major,
       resp_minor;
     xboolean alias_grabbed;
-    size_t dummy;
+    int dummy;
     struct UpnpVirtualDirCallbacks *pVirtualDirCallback;
 
     print_http_headers( req );
@@ -1222,6 +1208,7 @@ process_request( IN http_message_t * req,
     // init
     request_doc = NULL;
     finfo.content_type = NULL;
+    //membuffer_init( &content_type );
     alias_grabbed = FALSE;
     err_code = HTTP_INTERNAL_SERVER_ERROR;  // default error
     using_virtual_dir = FALSE;
@@ -1375,7 +1362,7 @@ process_request( IN http_message_t * req,
 
     RespInstr->ReadSendSize = finfo.file_length;
 
-    // Check other header field.
+    //Check other header field.
     if( ( err_code =
           CheckOtherHTTPHeaders( req, RespInstr,
                                  finfo.file_length ) ) != HTTP_OK ) {
@@ -1389,80 +1376,85 @@ process_request( IN http_message_t * req,
     }
 
     if( RespInstr->IsRangeActive && RespInstr->IsChunkActive ) {
-        // Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
+
-        // Transfer-Encoding: chunked
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
-        if (http_MakeMessage(
+ * added X-User-Agent header
-            headers, resp_major, resp_minor,
+ */
-            "R" "T" "GKD" "s" "tcS" "XcCc",
+        
-            HTTP_PARTIAL_CONTENT, // status code
+        //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
-            finfo.content_type,   // content type
+        //Transfer-Encoding: chunked
-            RespInstr,            // range info
+        // K means add chunky header ang G means range header.
-            "LAST-MODIFIED: ",
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code
-	    &finfo.last_modified,
+                              // RespInstr->ReadSendSize,// content length
-            X_USER_AGENT) != 0 ) {
+                              finfo.content_type,
+                              //     content_type.buf,            // content type
+                              RespInstr,    // Range
+                              "LAST-MODIFIED: ",
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
     } else if( RespInstr->IsRangeActive && !RespInstr->IsChunkActive ) {
 
-        // Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
+        //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
-        // Transfer-Encoding: chunked
+        //Transfer-Encoding: chunked
-        if (http_MakeMessage(
+        // K means add chunky header ang G means range header.
-            headers, resp_major, resp_minor,
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code
-            "R" "N" "T" "GD" "s" "tcS" "XcCc",
+                              RespInstr->ReadSendSize,  // content length
-            HTTP_PARTIAL_CONTENT,     // status code
+                              finfo.content_type,
-            RespInstr->ReadSendSize,  // content length
+                              //content_type.buf,            // content type
-            finfo.content_type,       // content type
+                              RespInstr,    //Range Info
-            RespInstr,                // range info
+                              "LAST-MODIFIED: ",
-            "LAST-MODIFIED: ",
+                              &finfo.last_modified,
-	    &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
-            X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
     } else if( !RespInstr->IsRangeActive && RespInstr->IsChunkActive ) {
-        // Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
+
-        // Transfer-Encoding: chunked
+        //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
-        if (http_MakeMessage(
+        //Transfer-Encoding: chunked
-            headers, resp_major, resp_minor,
+        // K means add chunky header ang G means range header.
-            "RK" "TD" "s" "tcS" "XcCc",
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSXcCc", HTTP_OK,   // status code
-            HTTP_OK,            // status code
+                              //RespInstr->ReadSendSize,// content length
-            finfo.content_type, // content type
+                              finfo.content_type,
-            "LAST-MODIFIED: ",
+                              // content_type.buf,            // content type
-	    &finfo.last_modified,
+                              "LAST-MODIFIED: ",
-            X_USER_AGENT) != 0 ) {
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
-    } else { // !RespInstr->IsRangeActive && !RespInstr->IsChunkActive
+    } else {
-        if (RespInstr->ReadSendSize >= 0) {
+        if( RespInstr->ReadSendSize >= 0 ) {
-            // Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
+            //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
-            // Transfer-Encoding: chunked
+            //Transfer-Encoding: chunked
-            if (http_MakeMessage(
+            // K means add chunky header ang G means range header.
-                headers, resp_major, resp_minor,
+            if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSXcCc", HTTP_OK,   // status code
-                "R" "N" "TD" "s" "tcS" "XcCc",
+                                  RespInstr->ReadSendSize,  // content length
-                HTTP_OK,                 // status code
+                                  finfo.content_type,
-                RespInstr->ReadSendSize, // content length
+                                  //content_type.buf,          // content type
-                finfo.content_type,      // content type
+                                  "LAST-MODIFIED: ",
-                "LAST-MODIFIED: ",
+                                  &finfo.last_modified,
-		&finfo.last_modified,
+                                  X_USER_AGENT) != 0 ) {
-                X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         } else {
-            // Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
+            //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
-            // Transfer-Encoding: chunked
+            //Transfer-Encoding: chunked
-            if (http_MakeMessage(
+            // K means add chunky header ang G means range header.
-                headers, resp_major, resp_minor,
+            if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSXcCc", HTTP_OK,    // status code
-                "R" "TD" "s" "tcS" "XcCc",
+                                  //RespInstr->ReadSendSize,// content length
-                HTTP_OK,            // status code
+                                  finfo.content_type,
-                finfo.content_type, // content type
+                                  //content_type.buf,          // content type
-                "LAST-MODIFIED: ",
+                                  "LAST-MODIFIED: ",
-		&finfo.last_modified,
+                                  &finfo.last_modified,
-                X_USER_AGENT) != 0 ) {
+                                  X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         }
     }
+/* -- PATCH END -- */
 
     if( req->method == HTTPMETHOD_HEAD ) {
         *rtype = RESP_HEADERS;
@@ -1476,8 +1468,8 @@ process_request( IN http_message_t * req,
         *rtype = RESP_FILEDOC;
     }
 
-    // simple get http 0.9 as specified in http 1.0
+    //simple get http 0.9 as specified in http 1.0
-    // don't send headers
+    //don't send headers
     if( req->method == HTTPMETHOD_SIMPLEGET ) {
         membuffer_destroy( headers );
     }
@@ -1487,6 +1479,7 @@ process_request( IN http_message_t * req,
   error_handler:
     free( request_doc );
     ixmlFreeDOMString( finfo.content_type );
+    //  membuffer_destroy( &content_type );
     if( err_code != UPNP_E_SUCCESS && alias_grabbed ) {
         alias_release( alias );
     }
@@ -1532,7 +1525,7 @@ http_RecvPostMessage( http_parser_t * parser,
 
     if( Instr && Instr->IsVirtualFile ) {
 
-        Fp = (virtualDirCallback.open)( filename, UPNP_WRITE );
+        Fp = virtualDirCallback.open( filename, UPNP_WRITE );
         if( Fp == NULL ) {
             return HTTP_INTERNAL_SERVER_ERROR;
         }
@@ -1587,11 +1580,14 @@ http_RecvPostMessage( http_parser_t * parser,
                 }
             } else if( num_read == 0 ) {
                 if( ok_on_close ) {
-                    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+                    DBGONLY( UpnpPrintf
-                        "<<< (RECVD) <<<\n%s\n-----------------\n",
+                             ( UPNP_INFO, HTTP, __FILE__, __LINE__,
-                        parser->msg.msg.buf );
+                               "<<< (RECVD) <<<\n%s\n-----------------\n",
-                    print_http_headers( &parser->msg );
+                               parser->msg.msg.buf );
-                    parser->position = POS_COMPLETE;
+                             //print_http_headers( &parser->msg );
+                         )
+
+                        parser->position = POS_COMPLETE;
                 } else {
                     // partial msg
                     parser->http_error_code = HTTP_BAD_REQUEST; // or response
@@ -1742,12 +1738,12 @@ web_server_callback( IN http_parser_t * parser,
                                           &RespInstr );
                 //Send response.
 
-                http_MakeMessage(
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
-                    &headers, 1, 1,
+ * added X-User-Agent header
-                    "RTDSXcCc",
+ */
-                    ret,
+                http_MakeMessage( &headers, 1, 1, "RTDSXcCc", ret,
-                    "text/html",
+                                  "text/html", X_USER_AGENT );
-                    X_USER_AGENT );
+/* - PATCH END --- */
 
                 http_SendMessage( info, &timeout, "b", headers.buf,
                                   headers.length );
@@ -1758,9 +1754,10 @@ web_server_callback( IN http_parser_t * parser,
         }
     }
 
-    UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, HTTP, __FILE__, __LINE__,
-        "webserver: request processed...\n" );
+                         "webserver: request processed...\n" );
+         )
 
-    membuffer_destroy( &headers );
+        membuffer_destroy( &headers );
     membuffer_destroy( &filename );
 }

upnp/src/genlib/net/sock.c

@@ -231,15 +231,6 @@ sock_read_write( IN SOCKINFO * info,
         }
     }
 
-#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));
-#endif
-
     if( bRead ) {
         // read data
         numBytes = recv( sockfd, buffer, bufsize,MSG_NOSIGNAL);
@@ -252,9 +243,6 @@ sock_read_write( IN SOCKINFO * info,
                 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);
-#endif
                 return num_written;
             }
 
@@ -265,11 +253,6 @@ sock_read_write( IN SOCKINFO * info,
         numBytes = bytes_sent;
     }
 
-#ifdef SO_NOSIGPIPE
-	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
-    }
-#endif
-
     if( numBytes < 0 ) {
         return UPNP_E_SOCKET_ERROR;
     }

upnp/src/genlib/net/uri/uri.c

@@ -34,11 +34,8 @@
 ************************************************************************/
 
 #ifdef __FreeBSD__
-#include <osreldate.h>
-#if __FreeBSD_version < 601103
 #include <lwres/netdb.h>
 #endif
-#endif
 #include "config.h"
 #include "uri.h"
 
@@ -128,7 +125,7 @@ is_unreserved( char in )
 *	Note :
 ************************************************************************/
 int
-is_escaped( const char *in )
+is_escaped( char *in )
 {
 
     if( ( in[0] == '%' ) && ( isxdigit( in[1] ) ) && isxdigit( in[2] ) ) {
@@ -160,7 +157,7 @@ is_escaped( const char *in )
 int
 replace_escaped( char *in,
                  int index,
-                 size_t *max )
+                 int *max )
 {
     int tempInt = 0;
     char tempChar = 0;
@@ -207,7 +204,7 @@ replace_escaped( char *in,
 *	Note :
 ************************************************************************/
 int
-parse_uric( const char *in,
+parse_uric( char *in,
             int max,
             token * out )
 {
@@ -367,20 +364,16 @@ free_URL_list( URL_list * list )
 *		uri_type *in ;	URI object
 *
 *	Description : Function useful in debugging for printing a parsed uri.
+*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+DBGONLY( void print_uri( uri_type * in ) {
-void print_uri( uri_type *in )
+         print_token( &in->scheme );
-{
+         print_token( &in->hostport.text );
-    print_token( &in->scheme );
+         print_token( &in->pathquery ); print_token( &in->fragment );} )
-    print_token( &in->hostport.text );
-    print_token( &in->pathquery );
-    print_token( &in->fragment );
-}
-#endif
 
 /************************************************************************
 *	Function :	print_token
@@ -389,23 +382,20 @@ void print_uri( uri_type *in )
 *		token * in ;	token
 *
 *	Description : Function useful in debugging for printing a token.
+*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+DBGONLY( void print_token( token * in ) {
-void print_token(token * in)
+         int i = 0;
-{
+         printf( "Token Size : %d\n\'", in->size );
-    int i = 0;
+         for( i = 0; i < in->size; i++ ) {
-    printf( "Token Size : %"PRIzu"\n\'", in->size );
+         putchar( in->buff[i] );}
-    for( i = 0; i < in->size; i++ ) {
+         putchar( '\'' ); putchar( '\n' );}
-        putchar( in->buff[i] );
+
-    }
+ )
-    putchar( '\'' );
-    putchar( '\n' );
-}
-#endif
 
 /************************************************************************
 *	Function :	token_string_casecmp
@@ -424,10 +414,8 @@ void print_token(token * in)
 *
 *	Note :
 ************************************************************************/
-int token_string_casecmp(
+    int token_string_casecmp( token * in1,
-    token * in1,
+                              char *in2 ) {
-    char *in2 )
-{
     int in2_length = strlen( in2 );
 
     if( in1->size != in2_length )
@@ -508,12 +496,12 @@ token_cmp( token * in1,
 ************************************************************************/
 int
 parse_port( int max,
-            const char *port,
+            char *port,
             unsigned short *out )
 {
 
-    const char *finger = port;
+    char *finger = port;
-    const char *max_ptr = finger + max;
+    char *max_ptr = finger + max;
     unsigned short temp = 0;
 
     while( ( finger < max_ptr ) && ( isdigit( *finger ) ) ) {
@@ -545,7 +533,7 @@ parse_port( int max,
 *	Note :
 ************************************************************************/
 int
-parse_hostport( const char *in,
+parse_hostport( char *in,
                 int max,
                 hostport_type * out )
 {
@@ -555,7 +543,7 @@ parse_hostport( const char *in,
     int begin_port;
     int hostport_size = 0;
     int host_size = 0;
-#if !defined(WIN32) && !defined(__OSX__)
+#ifndef WIN32
     char temp_hostbyname_buff[BUFFER_SIZE];
     struct hostent h_buf;
 #endif
@@ -623,64 +611,28 @@ parse_hostport( const char *in,
         int errCode = 0;
 
         //call gethostbyname_r (reentrant form of gethostbyname)
-        // TODO: Use autoconf to discover this rather than the
+#if defined(WIN32)
-        // platform-specific stuff below
+        h=gethostbyname(temp_host_name);
-#if defined(WIN32) || defined(__CYGWIN__)
-        h = gethostbyname(temp_host_name);
 #elif defined(SPARC_SOLARIS)
-        errCode = gethostbyname_r(
+        errCode = gethostbyname_r( temp_host_name,
-                temp_host_name,
+                                   &h,
-                &h,
+                                   temp_hostbyname_buff,
-                temp_hostbyname_buff,
+                                   BUFFER_SIZE, &errcode );
-                BUFFER_SIZE, &errcode );
+#elif defined(__FreeBSD__)
-#elif defined(__FreeBSD__) && __FreeBSD_version < 601103
+        h = lwres_gethostbyname_r( temp_host_name,
-        h = lwres_gethostbyname_r(
+                                   &h_buf,
-                temp_host_name,
+                                   temp_hostbyname_buff,
-                &h_buf,
+                                   BUFFER_SIZE, &errcode );
-                temp_hostbyname_buff,
-                BUFFER_SIZE, &errcode );
         if ( h == NULL ) {
-                errCode = 1;
+            errCode = 1;
         }
-#elif defined(__OSX__)
-        h = gethostbyname(temp_host_name);
-        if ( h == NULL ) {
-                errCode = 1;
-        }
-#elif defined(__linux__)
-        errCode = gethostbyname_r(
-                temp_host_name,
-                &h_buf,
-                temp_hostbyname_buff,
-                BUFFER_SIZE, &h, &errcode );
 #else
-        {
+        errCode = gethostbyname_r( temp_host_name,
-        struct addrinfo hints, *res, *res0;
+                                   &h_buf,
-
+                                   temp_hostbyname_buff,
-        h = NULL;
+                                   BUFFER_SIZE, &h, &errcode );
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = PF_INET;
-        hints.ai_socktype = SOCK_STREAM;
-        errCode = getaddrinfo(temp_host_name, "http", &hints, &res0);
-
-        if (!errCode) {
-            for (res = res0; res; res = res->ai_next) {
-                if (res->ai_family == PF_INET &&
-                    res->ai_addr->sa_family == AF_INET)
-                {
-                    h = &h_buf;
-                    h->h_addrtype = res->ai_addr->sa_family;
-                    h->h_length = 4;
-                    h->h_addr = (void *) temp_hostbyname_buff;
-                    *(struct in_addr *)h->h_addr =
-                        ((struct sockaddr_in *)res->ai_addr)->sin_addr;
-                        break;
-                }
-            }
-            freeaddrinfo(res0);
-        }
-        }
 #endif 
+
         if( errCode == 0 ) {
             if( h ) {
                 if( ( h->h_addrtype == AF_INET ) && ( h->h_length == 4 ) ) {
@@ -729,7 +681,7 @@ parse_hostport( const char *in,
 *	Note :
 ************************************************************************/
 int
-parse_scheme( const char *in,
+parse_scheme( char *in,
               int max,
               token * out )
 {
@@ -779,7 +731,7 @@ parse_scheme( const char *in,
 ************************************************************************/
 int
 remove_escaped_chars( INOUT char *in,
-                      INOUT size_t *size )
+                      INOUT int *size )
 {
     int i = 0;
 
@@ -833,8 +785,9 @@ remove_dots( char *in,
         return UPNP_E_OUTOF_MEMORY;
 
     Segments[0] = NULL;
-    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf
-        "REMOVE_DOTS: before: %s\n", in );
+             ( UPNP_ALL, API, __FILE__, __LINE__,
+               "REMOVE_DOTS: before: %s\n", in ) );
     while( ( copyFrom < max ) && ( *copyFrom != '?' )
            && ( *copyFrom != '#' ) ) {
 
@@ -879,8 +832,9 @@ remove_dots( char *in,
     }
     ( *copyTo ) = 0;
     free( Segments );
-    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf
-        "REMOVE_DOTS: after: %s\n", in );
+             ( UPNP_ALL, API, __FILE__, __LINE__,
+               "REMOVE_DOTS: after: %s\n", in ) );
     return UPNP_E_SUCCESS;
 }
 
@@ -1040,7 +994,7 @@ resolve_rel_url( char *base_url,
 *	Note :
 ************************************************************************/
 int
-parse_uri( const char *in,
+parse_uri( char *in,
            int max,
            uri_type * out )
 {
@@ -1113,15 +1067,15 @@ parse_uri( const char *in,
 int
 parse_uri_and_unescape( char *in,
                         int max,
-                        uri_type *out )
+                        uri_type * out )
 {
     int ret;
 
     if( ( ret = parse_uri( in, max, out ) ) != HTTP_SUCCESS )
         return ret;
     if( out->pathquery.size > 0 )
-        remove_escaped_chars( (char *)out->pathquery.buff, &out->pathquery.size );
+        remove_escaped_chars( out->pathquery.buff, &out->pathquery.size );
     if( out->fragment.size > 0 )
-        remove_escaped_chars( (char *)out->fragment.buff, &out->fragment.size );
+        remove_escaped_chars( out->fragment.buff, &out->fragment.size );
     return HTTP_SUCCESS;
 }

upnp/src/genlib/service_table/service_table.c

@@ -398,7 +398,7 @@ FindServiceEventURLPath( service_table * table,
 ************************************************************************/
 service_info *
 FindServiceControlURLPath( service_table * table,
-                           const char *controlURLPath )
+                           char *controlURLPath )
 {
     service_info *finger = NULL;
     uri_type parsed_url;
@@ -433,7 +433,7 @@ FindServiceControlURLPath( service_table * table,
 *
 *	Parameters :
 *		service_info *service ;Service whose information is to be printed
-*		Upnp_LogLevel level ; Debug level specified to the print function
+*		Dbg_Level level ; Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information from the 
@@ -443,54 +443,38 @@ FindServiceControlURLPath( service_table * table,
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+DBGONLY( void printService( service_info * service, Dbg_Level level,
-void printService(
+                            Dbg_Module module ) {
-    service_info *service,
+         if( service ) {
-    Upnp_LogLevel level,
+         if( service->serviceType )
-    Dbg_Module module )
+         UpnpPrintf( level, module, __FILE__, __LINE__,
-{
+                     "serviceType: %s\n", service->serviceType );
-    if( service ) {
+         if( service->serviceId )
-        if( service->serviceType ) {
+         UpnpPrintf( level, module, __FILE__, __LINE__, "serviceId: %s\n",
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+                     service->serviceId ); if( service->SCPDURL )
-                "serviceType: %s\n", service->serviceType );
+         UpnpPrintf( level, module, __FILE__, __LINE__, "SCPDURL: %s\n",
-        }
+                     service->SCPDURL ); if( service->controlURL )
-        if( service->serviceId ) {
+         UpnpPrintf( level, module, __FILE__, __LINE__, "controlURL: %s\n",
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+                     service->controlURL ); if( service->eventURL )
-                "serviceId: %s\n", service->serviceId );
+         UpnpPrintf( level, module, __FILE__, __LINE__, "eventURL: %s\n",
-        }
+                     service->eventURL ); if( service->UDN )
-	if( service->SCPDURL ) {
+         UpnpPrintf( level, module, __FILE__, __LINE__, "UDN: %s\n\n",
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+                     service->UDN ); if( service->active )
-                "SCPDURL: %s\n", service->SCPDURL );
+         UpnpPrintf( level, module, __FILE__, __LINE__,
-        }
+                     "Service is active\n" );
-	if( service->controlURL ) {
+         else
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+         UpnpPrintf( level, module, __FILE__, __LINE__,
-                "controlURL: %s\n", service->controlURL );
+                     "Service is inactive\n" );}
-        }
+         }
-	if( service->eventURL ) {
+
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+ )
-                "eventURL: %s\n", service->eventURL );
-        }
-	if( service->UDN ) {
-            UpnpPrintf( level, module, __FILE__, __LINE__,
-                "UDN: %s\n\n", service->UDN );
-        }
-	if( service->active ) {
-            UpnpPrintf( level, module, __FILE__, __LINE__,
-            "Service is active\n" );
-        } else {
-            UpnpPrintf( level, module, __FILE__, __LINE__,
-            "Service is inactive\n" );
-        }
-    }
-}
-#endif
 
 /************************************************************************
 *	Function :	printServiceList
 *
 *	Parameters :
 *		service_info *service ;	Service whose information is to be printed
-*		Upnp_LogLevel level ;	Debug level specified to the print function
+*		Dbg_Level level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information of each 
@@ -500,55 +484,43 @@ void printService(
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+    DBGONLY( void printServiceList( service_info * service,
-void printServiceList(
+                                    Dbg_Level level,
-    service_info * service,
+                                    Dbg_Module module ) {
-    Upnp_LogLevel level,
+             while( service ) {
-    Dbg_Module module )
+             if( service->serviceType )
-{
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-    while( service ) {
+                         "serviceType: %s\n", service->serviceType );
-        if( service->serviceType ) {
+             if( service->serviceId )
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-                "serviceType: %s\n", service->serviceType );
+                         "serviceId: %s\n", service->serviceId );
-        }
+             if( service->SCPDURL )
-        if( service->serviceId ) {
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+                         "SCPDURL: %s\n", service->SCPDURL );
-                "serviceId: %s\n", service->serviceId );
+             if( service->controlURL )
-        }
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-        if( service->SCPDURL ) {
+                         "controlURL: %s\n", service->controlURL );
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+             if( service->eventURL )
-                "SCPDURL: %s\n", service->SCPDURL );
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-        }
+                         "eventURL: %s\n", service->eventURL );
-        if( service->controlURL ) {
+             if( service->UDN )
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+             UpnpPrintf( level, module, __FILE__, __LINE__, "UDN: %s\n\n",
-                "controlURL: %s\n", service->controlURL );
+                         service->UDN ); if( service->active )
-        }
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-        if( service->eventURL ) {
+                         "Service is active\n" );
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+             else
-                "eventURL: %s\n", service->eventURL );
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-        }
+                         "Service is inactive\n" );
-        if( service->UDN ) {
+             service = service->next;}
-            UpnpPrintf( level, module, __FILE__, __LINE__,
+             }
-                "UDN: %s\n\n", service->UDN );
+ )
-        }
-        if( service->active ) {
-            UpnpPrintf( level, module, __FILE__, __LINE__,
-                "Service is active\n" );
-        } else {
-            UpnpPrintf( level, module, __FILE__, __LINE__,
-                "Service is inactive\n" );
-        }
-        service = service->next;
-    }
-}
-#endif
 
 /************************************************************************
 *	Function :	printServiceTable
 *
 *	Parameters :
 *		service_table * table ;	Service table to be printed
-*		Upnp_LogLevel level ;	Debug level specified to the print function
+*		Dbg_Level level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints the URL base of the table
@@ -559,18 +531,15 @@ void printServiceList(
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+    DBGONLY( void printServiceTable( service_table * table,
-void printServiceTable(
+                                     Dbg_Level level,
-    service_table * table,
+                                     Dbg_Module module ) {
-    Upnp_LogLevel level,
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-    Dbg_Module module )
+                         "URL_BASE: %s\n", table->URLBase );
-{
+             UpnpPrintf( level, module, __FILE__, __LINE__,
-    UpnpPrintf( level, module, __FILE__, __LINE__,
+                         "Services: \n" );
-        "URL_BASE: %s\n", table->URLBase );
+             printServiceList( table->serviceList, level, module );}
-    UpnpPrintf( level, module, __FILE__, __LINE__,
+ )
-        "Services: \n" );
-    printServiceList( table->serviceList, level, module );}
-#endif
 
 /************************************************************************
 *	Function :	freeService
@@ -585,7 +554,7 @@ void printServiceTable(
 *
 *	Note :
 ************************************************************************/
-void freeService( service_info * in )
+     void freeService( service_info * in )
 {
     if( in ) {
         if( in->serviceType )
@@ -695,7 +664,7 @@ DOMString
 getElementValue( IXML_Node * node )
 {
     IXML_Node *child = ( IXML_Node * ) ixmlNode_getFirstChild( node );
-    const DOMString temp = NULL;
+    DOMString temp = NULL;
 
     if( ( child != 0 ) && ( ixmlNode_getNodeType( child ) == eTEXT_NODE ) ) {
         temp = ixmlNode_getNodeValue( child );
@@ -880,10 +849,12 @@ getServiceList( IXML_Node * node,
                     ( !
                       ( current->controlURL =
                         resolve_rel_url( URLBase, tempDOMString ) ) ) ) {
-                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                    DBGONLY( UpnpPrintf
-                        "BAD OR MISSING CONTROL URL" );
+                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
-                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                               "BAD OR MISSING CONTROL URL" ) );
-                        "CONTROL URL SET TO NULL IN SERVICE INFO" );
+                    DBGONLY( UpnpPrintf
+                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
+                               "CONTROL URL SET TO NULL IN SERVICE INFO" ) );
                     current->controlURL = NULL;
                     fail = 0;
                 }
@@ -899,10 +870,12 @@ getServiceList( IXML_Node * node,
                     ( !
                       ( current->eventURL =
                         resolve_rel_url( URLBase, tempDOMString ) ) ) ) {
-                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                    DBGONLY( UpnpPrintf
-                        "BAD OR MISSING EVENT URL" );
+                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
-                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                               "BAD OR MISSING EVENT URL" ) );
-                        "EVENT URL SET TO NULL IN SERVICE INFO" );
+                    DBGONLY( UpnpPrintf
+                             ( UPNP_INFO, GENA, __FILE__, __LINE__,
+                               "EVENT URL SET TO NULL IN SERVICE INFO" ) );
                     current->eventURL = NULL;
                     fail = 0;
                 }
@@ -935,20 +908,20 @@ getServiceList( IXML_Node * node,
 }
 
 /************************************************************************
-* Function : getAllServiceList
+*	Function :	getAllServiceList
 *
-* Parameters :
+*	Parameters :
-*	IXML_Node *node ;	XML node information
+*		IXML_Node *node ;	XML node information
-*	char * URLBase ;	provides Base URL to resolve relative URL 
+*		char * URLBase ;	provides Base URL to resolve relative URL 
-*	service_info **out_end ; service added is returned to the output
+*		service_info **out_end ; service added is returned to the output
-*				parameter
+*							parameter
 *
-* Description :	Returns pointer to service info after getting the 
+*	Description :	Returns pointer to service info after getting the 
 *		sub-elements of the service info. 
 *
-* Return : service_info * ;
+*	Return : service_info * ;
 *
-* Note :
+*	Note :
 ************************************************************************/
 service_info *
 getAllServiceList( IXML_Node * node,
@@ -1119,20 +1092,20 @@ addServiceTable( IXML_Node * node,
 }
 
 /************************************************************************
- * Function : getServiceTable
+*	Function :	getServiceTable
- *
+*
- * Parameters :
+*	Parameters :
- * 	IXML_Node *node ;	XML node information
+*		IXML_Node *node ;	XML node information
- *	service_table *out ;	output parameter which will contain the
+*		service_table *out ;	output parameter which will contain the 
- *				service list and URL
+*							service list and URL 
- *	const char *DefaultURLBase ; Default base URL on which the URL
+*		const char *DefaultURLBase ; Default base URL on which the URL 
- *				will be returned.
+*							will be returned.
- *
+*
- * Description : Retrieve service from the table
+*	Description :	Retrieve service from the table
- *
+*
- * Return : int ;
+*	Return : int ;
- *
+*
- * Note :
+*	Note :
 ************************************************************************/
 int
 getServiceTable( IXML_Node * node,
@@ -1153,8 +1126,9 @@ getServiceTable( IXML_Node * node,
             }
         }
 
-        if( ( out->serviceList = getAllServiceList(
+        if( ( out->serviceList = getAllServiceList( root, out->URLBase,
-            root, out->URLBase, &out->endServiceList ) ) ) {
+                                                    &out->
+                                                    endServiceList ) ) ) {
             return 1;
         }
 

upnp/src/genlib/util/membuffer.c

@@ -171,7 +171,7 @@ memptr_cmp_nocase( IN memptr * m,
 *
 *	Note :
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 membuffer_initialize( INOUT membuffer * m )
 {
     m->buf = NULL;
@@ -331,10 +331,9 @@ membuffer_assign( INOUT membuffer * m,
         return return_code;
     }
     // copy
-    if( buf_len ) {
+    memcpy( m->buf, buf, buf_len );
-        memcpy( m->buf, buf, buf_len );
+    m->buf[buf_len] = 0;        // null-terminate
-        m->buf[buf_len] = 0;        // null-terminate
+
-    }
     m->length = buf_len;
 
     return 0;

upnp/src/inc/config.h

@@ -95,17 +95,6 @@
 #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 
@@ -261,7 +250,7 @@
 
 /** @name Other debugging features
           The UPnP SDK contains other features to aid in debugging:
-	  see <upnp/inc/upnpdebug.h>
+	  see <upnp/upnpdebug.h>
  */
 
 #define DEBUG_ALL		1   
@@ -304,6 +293,27 @@
 
 
 
+/** @name DBGONLY
+          The {\bf DBGONLY} macro allows code to be marked so that it 
+          is only included in the DEBUG build and not the release.  To
+          use this macro, put the code inside of the parentheses:
+
+          {\tt DBGONLY(int i;)}
+
+          This will cause a declaration of the integer {\tt i} only
+          in the debug build.
+  */
+
+//@{
+#ifdef DEBUG
+#	define DBGONLY(x) x
+#else
+#	define DBGONLY(x)  
+#endif
+//@}
+
+
+
 #undef  EXCLUDE_WEB_SERVER 
 #undef  EXCLUDE_MINISERVER 
 #ifdef  INTERNAL_WEB_SERVER
@@ -338,6 +348,13 @@
 #	define CLIENTONLY(x)
 #endif
 
+#ifdef INCLUDE_DEVICE_APIS
+#	define DEVICEONLY(x) x
+#else 
+#	define DEVICEONLY(x) 
+#endif
+
 //@}
 #endif
 
+

upnp/src/inc/gena.h

@@ -89,26 +89,25 @@
 #define DEFAULT_TIMEOUT 1801
 
 
+
 extern ithread_mutex_t GlobalClientSubscribeMutex;
 
-// Lock the subscription
+//Lock the subscription
 #define SubscribeLock() \
-	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__, \
-		"Trying Subscribe Lock");  \
+	"Trying Subscribe Lock"));  \
 	ithread_mutex_lock(&GlobalClientSubscribeMutex); \
-	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__,"Subscribe Lock");)
-		"Subscribe Lock");
 
-// Unlock the subscription
+//Unlock the subscription
 #define SubscribeUnlock() \
-	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__, \
-		"Trying Subscribe UnLock"); \
+		"Trying Subscribe UnLock")); \
 	ithread_mutex_unlock(&GlobalClientSubscribeMutex); \
-	UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, \
+	DBGONLY(UpnpPrintf(UPNP_INFO,GENA,__FILE__,__LINE__,"Subscribe UnLock");)
-		"Subscribe UnLock");
 
 
-// Structure to send NOTIFY message to all subscribed control points
+//Structure to send NOTIFY message to all subscribed control points
 typedef struct NOTIFY_THREAD_STRUCT {
   char * headers;
   DOMString propertySet;
@@ -162,13 +161,11 @@ EXTERN_C void genaCallback (IN http_parser_t *parser,
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_CLIENT_APIS
+CLIENTONLY(
-EXTERN_C int genaSubscribe(
+	EXTERN_C int genaSubscribe(UpnpClient_Handle client_handle,
-	UpnpClient_Handle client_handle,
+				char * PublisherURL,
-	char * PublisherURL,
+				int * TimeOut, 
-	int * TimeOut, 
+				Upnp_SID  out_sid );)
-	Upnp_SID  out_sid );
-#endif
 
 
 /************************************************************************
@@ -187,11 +184,8 @@ EXTERN_C int genaSubscribe(
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_CLIENT_APIS
+CLIENTONLY(EXTERN_C int genaUnSubscribe(UpnpClient_Handle client_handle,
-EXTERN_C int genaUnSubscribe(
+		   const Upnp_SID in_sid);)
-	UpnpClient_Handle client_handle,
-	const Upnp_SID in_sid);
-#endif
 
 /************************************************************************
 * Function : genaUnregisterClient									
@@ -208,9 +202,8 @@ EXTERN_C int genaUnSubscribe(
 * Returns: int
 *	return UPNP_E_SUCCESS if successful else returns appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_CLIENT_APIS
+CLIENTONLY(EXTERN_C int genaUnregisterClient(
-EXTERN_C int genaUnregisterClient(UpnpClient_Handle client_handle);
+			UpnpClient_Handle client_handle);)
-#endif
 
 //server
 /************************************************************************
@@ -225,9 +218,8 @@ EXTERN_C int genaUnregisterClient(UpnpClient_Handle client_handle);
 * Returns: int
 *	returns UPNP_E_SUCCESS if successful else returns GENA_E_BAD_HANDLE
 ****************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
+DEVICEONLY(EXTERN_C int genaUnregisterDevice(
-EXTERN_C int genaUnregisterDevice(UpnpDevice_Handle device_handle);
+				UpnpDevice_Handle device_handle);)
-#endif
 
 
 /************************************************************************
@@ -250,12 +242,10 @@ EXTERN_C int genaUnregisterDevice(UpnpDevice_Handle device_handle);
 *	return UPNP_E_SUCCESS if service response is OK else 
 *	returns appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_CLIENT_APIS
+CLIENTONLY(EXTERN_C int genaRenewSubscription(
-EXTERN_C int genaRenewSubscription(
+							IN UpnpClient_Handle client_handle,
-	IN UpnpClient_Handle client_handle,
+							IN const Upnp_SID in_sid,
-	IN const Upnp_SID in_sid,
+							OUT int * TimeOut);)
-	OUT int * TimeOut);
-#endif
 /****************************************************************************
 *	Function :	genaNotifyAll
 *
@@ -275,40 +265,33 @@ EXTERN_C int genaRenewSubscription(
 *	Note : This function is similar to the genaNotifyAllExt. The only difference
 *			is it takes event variable array instead of xml document.
 ****************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
+DEVICEONLY(EXTERN_C int genaNotifyAll(UpnpDevice_Handle device_handle,
-EXTERN_C int genaNotifyAll(
+			   char *UDN,
-	UpnpDevice_Handle device_handle,
+			   char *servId,
-	char *UDN,
+			   char **VarNames,
-	char *servId,
+			   char **VarValues,
-	char **VarNames,
+		    int var_count
-	char **VarValues,
+				      );)
-	int var_count);
-#endif
 
 /****************************************************************************
-* Function :	genaNotifyAllExt
+*	Function :	genaNotifyAllExt
 *
-* Parameters :
+*	Parameters :
-*	IN UpnpDevice_Handle device_handle : Device handle
+*			IN UpnpDevice_Handle device_handle : Device handle
-*	IN char *UDN :			Device udn
+*			IN char *UDN :	Device udn
-*	IN char *servId :		Service ID
+*			IN char *servId :	Service ID
-*	IN IXML_Document *PropSet :	XML document Event varible property set
+*           IN IXML_Document *PropSet :	XML document Event varible property set
 *
-* Description : This function sends a notification to all the subscribed
+*	Description : 	This function sends a notification to all the subscribed
 *	control points
 *
-* Return : int
+*	Return :	int
 *
-* Note : This function is similar to the genaNotifyAll. the only difference
+*	Note : This function is similar to the genaNotifyAll. the only difference
-*	is it takes the document instead of event variable array
+*			is it takes the document instead of event variable array
 ****************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
+DEVICEONLY(EXTERN_C int genaNotifyAllExt(UpnpDevice_Handle device_handle, 
-EXTERN_C int genaNotifyAllExt(
+		   char *UDN, char *servId,IN IXML_Document *PropSet);)
-	UpnpDevice_Handle device_handle, 
-	char *UDN,
-	char *servId,
-	IN IXML_Document *PropSet);
-#endif
 
 /****************************************************************************
 *	Function :	genaInitNotify
@@ -331,15 +314,13 @@ EXTERN_C int genaNotifyAllExt(
 *	Note : No other event will be sent to this control point before the 
 *			intial state table dump.
 ****************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
+DEVICEONLY(EXTERN_C int genaInitNotify(IN UpnpDevice_Handle device_handle,
-EXTERN_C int genaInitNotify(IN UpnpDevice_Handle device_handle,
+			    IN char *UDN,
-	IN char *UDN,
+			    IN char *servId,
-	IN char *servId,
+			    IN char **VarNames,
-	IN char **VarNames,
+			    IN char **VarValues,
-	IN char **VarValues,
+				IN int var_count,
-	IN int var_count,
+				IN Upnp_SID sid);)
-	IN Upnp_SID sid);
-#endif
 
 /****************************************************************************
 *	Function :	genaInitNotifyExt
@@ -361,14 +342,12 @@ EXTERN_C int genaInitNotify(IN UpnpDevice_Handle device_handle,
 *	Note : No other event will be sent to this control point before the 
 *			intial state table dump.
 ****************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
+DEVICEONLY(EXTERN_C  int genaInitNotifyExt(
-EXTERN_C  int genaInitNotifyExt(
+		   IN UpnpDevice_Handle device_handle, 
-	IN UpnpDevice_Handle device_handle, 
+		   IN char *UDN, 
-	IN char *UDN, 
+		   IN char *servId,
-	IN char *servId,
+		   IN IXML_Document *PropSet, 
-	IN IXML_Document *PropSet, 
+		   IN Upnp_SID sid);)
-	IN Upnp_SID sid);
-#endif
 
 
 /************************************************************************

upnp/src/inc/http_client.h

@@ -96,7 +96,7 @@ typedef struct SOCKET_BUFFER{
 //holds a pointer into a larger array
 typedef struct TOKEN {
    char * buff;
-  size_t size;
+  int size;
 } token;
 
 
@@ -214,101 +214,37 @@ EXTERN_C ssize_t readLine(int fd, char *out, int max, int *timeout);
 EXTERN_C int remove_dots(char * in, int size);
 
 
-#ifdef DEBUG
+DBGONLY(EXTERN_C void print_http_request(http_message
-EXTERN_C void print_http_request(
+					 *message,Dbg_Level DLevel,
-	http_message *message,
+					 Dbg_Module Module,char *DbgFileName,
-	Upnp_LogLevel DLevel,
+					 int DbgLineNo););
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_http_request(
-	http_message *message,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
 
-#ifdef DEBUG
+DBGONLY(EXTERN_C void print_http_response(http_message *message,
-EXTERN_C void print_http_response(
+					  Dbg_Level DLevel,
-	http_message *message,
+					  Dbg_Module Module,char *DbgFileName,
-	Upnp_LogLevel DLevel,
+					  int DbgLineNo););
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_http_response(
-	http_message *message,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
 
-#ifdef DEBUG
+DBGONLY(EXTERN_C void print_token(  token * in,
-EXTERN_C void print_token(
+				    Dbg_Level DLevel,
-	token *in,
+				    Dbg_Module Module,
-	Upnp_LogLevel DLevel,
+				    char *DbgFileName,
-	Dbg_Module Module,
+				    int DbgLineNo););
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_token(
-	token *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
 
-#ifdef DEBUG
+DBGONLY(EXTERN_C void print_status_line(http_status *in,
-EXTERN_C void print_status_line(
+					Dbg_Level DLevel,
-	http_status *in,
+					Dbg_Module Module,
-	Upnp_LogLevel DLevel,
+					char *DbgFileName,
-	Dbg_Module Module,
+					int DbgLineNo););
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_status_line(
-	http_status *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
 
-#ifdef DEBUG
+DBGONLY(EXTERN_C void print_request_line(http_request *in,
-EXTERN_C void print_request_line(
+					 Dbg_Level DLevel,
-	http_request *in,
+					 Dbg_Module Module,
-	Upnp_LogLevel DLevel,
+					 char *DbgFileName,int DbgLineNo));
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_request_line(
-	http_request *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
 
-#ifdef DEBUG
+DBGONLY(EXTERN_C void print_uri( uri_type *in,
-EXTERN_C void print_uri(
+				 Dbg_Level DLevel,
-	uri_type *in,
+				 Dbg_Module Module,
-	Upnp_LogLevel DLevel,
+				 char *DbgFileName,
-	Dbg_Module Module,
+				 int DbgLineNo););
-	char *DbgFileName,
-	int DbgLineNo);
-#else
-static inline void print_uri(
-	uri_type *in,
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	char *DbgFileName,
-	int DbgLineNo) {}
-#endif
 
 #endif
-

upnp/src/inc/httpparser.h

@@ -456,8 +456,6 @@ int raw_to_int( IN memptr* raw_value, int base );
 *																		
 * Description: Find a substring from raw character string buffer					
 *																		
-* Side effects: raw_value is transformed to lowercase.
-*
 * Returns:																
 *	 int - index at which the substring is found.						
 ************************************************************************/
@@ -488,11 +486,7 @@ const char* method_to_str( IN http_method_t method );
 * Returns:																
 *	 void																
 ************************************************************************/
-#ifdef DEBUG
+void print_http_headers( IN http_message_t* hmsg );
-void print_http_headers( IN http_message_t *hmsg );
-#else
-static UPNP_INLINE void print_http_headers( IN http_message_t *hmsg ) {}
-#endif
 
 #ifdef __cplusplus
 }		// extern "C"
@@ -500,4 +494,3 @@ static UPNP_INLINE void print_http_headers( IN http_message_t *hmsg ) {}
 
 
 #endif // GENLIB_NET_HTTP_HTTPPARSER_H
-

upnp/src/inc/httpreadwrite.h

@@ -475,7 +475,6 @@ int http_SendStatusResponse( IN SOCKINFO *info, IN int http_status_code,
 *				memory ptr
 *		'c':	(no args) appends CRLF "\r\n"
 *		'd':	arg = int number		// appends decimal number
-*		'h':	arg = off_t number		// appends off_t number
 *		't':	arg = time_t * gmt_time	// appends time in RFC 1123 fmt
 *		'D':	(no args) appends HTTP DATE: header
 *		'S':	(no args) appends HTTP SERVER: header

upnp/src/inc/inet_pton.h

@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-typedef int socklen_t;
+#define socklen_t int
 #define EAFNOSUPPORT 97
 
 /*

upnp/src/inc/membuffer.h

@@ -51,7 +51,8 @@ typedef struct // memptr
 // note: Total length/capacity should not exceed MAX_INT
 typedef struct // membuffer
 {
-	char	*buf;			// mem buffer; must not write beyond buf[length-1] (read/write)
+	char	*buf;			// mem buffer; must not write 
+							//   beyond buf[length-1] (read/write)
 	size_t	length;			// length of buffer (read-only)
 	size_t	capacity;		// total allocated memory (read-only)
 	size_t	size_inc;		// used to increase size; MUST be > 0; (read/write)
@@ -147,7 +148,8 @@ int memptr_cmp_nocase( IN memptr* m, IN const char* s );
 *
 *	Note :
 ************************************************************************/
-int membuffer_set_size( INOUT membuffer* m, IN size_t new_length );
+int membuffer_set_size( INOUT membuffer* m, 
+			IN size_t new_length );
 
 /************************************************************************
 *	Function :	membuffer_init
@@ -198,7 +200,8 @@ void membuffer_destroy( INOUT membuffer* m );
 *
 *	Note :
 ************************************************************************/
-int membuffer_assign( INOUT membuffer* m, IN const void* buf, IN size_t buf_len );
+int membuffer_assign( INOUT membuffer* m, IN const void* buf, 
+					 IN size_t buf_len );
 
 /************************************************************************
 *	Function :	membuffer_assign_str
@@ -234,7 +237,8 @@ int membuffer_assign_str( INOUT membuffer* m, IN const char* c_str );
 *
 *	Note :
 ************************************************************************/
-int membuffer_append( INOUT membuffer* m, IN const void* buf, IN size_t buf_len );
+int membuffer_append( INOUT membuffer* m, IN const void* buf,
+					 IN size_t buf_len );
 
 /************************************************************************
 *	Function :	membuffer_append_str
@@ -272,7 +276,8 @@ int membuffer_append_str( INOUT membuffer* m, IN const char* c_str );
 *
 *	Note :
 ************************************************************************/
-int membuffer_insert( INOUT membuffer* m, IN const void* buf, IN size_t buf_len, int index );
+int membuffer_insert( INOUT membuffer* m, IN const void* buf, 
+					 IN size_t buf_len, int index );
 
 
 /************************************************************************
@@ -293,7 +298,8 @@ int membuffer_insert( INOUT membuffer* m, IN const void* buf, IN size_t buf_len,
 *
 *	Note :
 ************************************************************************/
-void membuffer_delete( INOUT membuffer* m, IN int index, IN size_t num_bytes );
+void membuffer_delete( INOUT membuffer* m, IN int index, 
+					 IN size_t num_bytes );
 
 
 /************************************************************************
@@ -330,7 +336,8 @@ char* membuffer_detach( INOUT membuffer* m );
 *	Note : 'new_buf' must be allocted using malloc or realloc so
 *		that it can be freed using free()
 ************************************************************************/
-void membuffer_attach( INOUT membuffer* m, IN char* new_buf, IN size_t buf_len );
+void membuffer_attach( INOUT membuffer* m, IN char* new_buf,
+					   IN size_t buf_len );
 #ifdef __cplusplus
 }		// extern "C"
 #endif	// __cplusplus

upnp/src/inc/miniserver.h

@@ -88,11 +88,7 @@ void SetHTTPGetCallback( MiniServerCallback callback );
 *
 *	Note :
 ************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
 void SetSoapCallback( MiniServerCallback callback );
-#else 
-static inline void SetSoapCallback( MiniServerCallback callback ) {}
-#endif
 
 /************************************************************************
 *	Function :	SetGenaCallback

upnp/src/inc/service_table.h

@@ -47,7 +47,7 @@ extern "C" {
 
 #define SID_SIZE  41
 
-#ifdef INCLUDE_DEVICE_APIS
+DEVICEONLY(
 
 typedef struct SUBSCRIPTION {
   Upnp_SID sid;
@@ -61,19 +61,18 @@ typedef struct SUBSCRIPTION {
 
 
 typedef struct SERVICE_INFO {
-  DOMString	serviceType;
+  DOMString serviceType;
-  DOMString	serviceId;
+  DOMString serviceId;
   char		*SCPDURL ;
   char		*controlURL;
   char		*eventURL;
-  DOMString	UDN;
+  DOMString UDN;
   int		active;
   int		TotalSubscriptions;
-  subscription	*subscriptionList;
+  subscription			*subscriptionList;
   struct SERVICE_INFO	 *next;
 } service_info;
 
-
 typedef struct SERVICE_TABLE {
   DOMString URLBase;
   service_info *serviceList;
@@ -81,7 +80,7 @@ typedef struct SERVICE_TABLE {
 } service_table;
 
 
-/* Functions for Subscriptions */
+/*			Functions for Subscriptions				*/
 
 /************************************************************************
 *	Function :	copy_subscription
@@ -247,14 +246,14 @@ service_info * FindServiceEventURLPath( service_table *table,
 *	Note :
 ************************************************************************/
 service_info * FindServiceControlURLPath( service_table *table,
-					  const char * controlURLPath);
+					  char * controlURLPath);
 
 /************************************************************************
 *	Function :	printService
 *
 *	Parameters :
 *		service_info *service ;Service whose information is to be printed
-*		Upnp_LogLevel level ; Debug level specified to the print function
+*		Dbg_Level level ; Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information from the 
@@ -264,24 +263,16 @@ service_info * FindServiceControlURLPath( service_table *table,
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+DBGONLY(void printService(service_info *service,Dbg_Level
-void printService(
+				   level,
-	service_info *service,
+				   Dbg_Module module));
-	Upnp_LogLevel level,
-	Dbg_Module module);
-#else
-static UPNP_INLINE void printService(
-	service_info *service,
-	Upnp_LogLevel level,
-	Dbg_Module module) {}
-#endif
 
 /************************************************************************
 *	Function :	printServiceList
 *
 *	Parameters :
 *		service_info *service ;	Service whose information is to be printed
-*		Upnp_LogLevel level ;	Debug level specified to the print function
+*		Dbg_Level level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints information of each 
@@ -291,24 +282,15 @@ static UPNP_INLINE void printService(
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+DBGONLY(void printServiceList(service_info *service,
-void printServiceList(
+				       Dbg_Level level, Dbg_Module module));
-	service_info *service,
-	Upnp_LogLevel level,
-	Dbg_Module module);
-#else
-static UPNP_INLINE void printServiceList(
-	service_info *service,
-	Upnp_LogLevel level,
-	Dbg_Module module) {}
-#endif
 
 /************************************************************************
 *	Function :	printServiceTable
 *
 *	Parameters :
 *		service_table * table ;	Service table to be printed
-*		Upnp_LogLevel level ;	Debug level specified to the print function
+*		Dbg_Level level ;	Debug level specified to the print function
 *		Dbg_Module module ;	Debug module specified to the print function
 *
 *	Description :	For debugging purposes prints the URL base of the table
@@ -319,17 +301,9 @@ static UPNP_INLINE void printServiceList(
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+DBGONLY(void printServiceTable(service_table *
-void printServiceTable(
+					table,Dbg_Level
-	service_table *table,
+					level,Dbg_Module module));
-	Upnp_LogLevel level,
-	Dbg_Module module);
-#else
-static UPNP_INLINE void printServiceTable(
-	service_table *table,
-	Upnp_LogLevel level,
-	Dbg_Module module) {}
-#endif
 
 /************************************************************************
 *	Function :	freeService
@@ -477,11 +451,10 @@ int getSubElement(const char *element_name, IXML_Node *node,
 		  IXML_Node **out);
 
 
-#endif /* INCLUDE_DEVICE_APIS */
+)	/* DEVICEONLY */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* _SERVICE_TABLE */
-

upnp/src/inc/soaplib.h

@@ -33,28 +33,28 @@
 #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
+*	Function :	soap_device_callback
 *
-* Parameters :
+*	Parameters :
-*	IN http_parser_t *parser :	Parsed request received by the device
+*		  IN http_parser_t *parser : Parsed request received by the device
-*	IN http_message_t* request :	HTTP request 
+*		  IN http_message_t* request :	HTTP request 
-*	INOUT SOCKINFO *info :		socket info
+*		  INOUT SOCKINFO *info :	socket info
 *
-* Description :	This is a callback called by minisever after receiving 
+*	Description :	This is a callback called by minisever after receiving 
-*	the request from the control point. This function will start 
+*		the request from the control point. This function will start 
-*	processing the request. It calls handle_invoke_action to handle the
+*		processing the request. It calls handle_invoke_action to handle the
-*	SOAP action
+*		SOAP action
 *
-* Return : void
+*	Return :	void
 *
-* Note :
+*	Note :
 ****************************************************************************/
 void soap_device_callback( 
-	IN http_parser_t *parser, 
+						  IN http_parser_t *parser, 
-	IN http_message_t* request, 
+						  IN http_message_t* request, 
-	INOUT SOCKINFO *info );
+						  INOUT SOCKINFO *info );
 
 
 /****************************************************************************

upnp/src/inc/ssdplib.h

@@ -80,7 +80,7 @@ typedef enum SsdpCmdType{SSDP_ERROR=-1,
 #define  SSDP_IP   "239.255.255.250"
 #define  SSDP_PORT 1900
 #define  NUM_TRY 3
-#define  NUM_COPY 1
+#define  NUM_COPY 2
 #define  THREAD_LIMIT 50
 #define  COMMAND_LEN  300
 
@@ -211,15 +211,8 @@ int Make_Socket_NoBlocking (int sock);
 * Returns: void *
 *	1 if successful else appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
+void ssdp_handle_device_request( IN http_message_t* hmsg, 
-void ssdp_handle_device_request(
+							 IN struct sockaddr_in* dest_addr );
-	IN http_message_t* hmsg, 
-	IN struct sockaddr_in* dest_addr );
-#else
-static inline void ssdp_handle_device_request(
-	IN http_message_t* hmsg, 
-	IN struct sockaddr_in* dest_addr ) {}
-#endif
 
 /************************************************************************
 * Function : ssdp_handle_ctrlpt_msg											
@@ -228,10 +221,10 @@ static inline void ssdp_handle_device_request(
 *	IN http_message_t* hmsg: SSDP message from the device
 *	IN struct sockaddr_in* dest_addr: Address of the device
 *	IN xboolean timeout: timeout kept by the control point while sending 
-*		search message
+*						search message
 *	IN void* cookie: Cookie stored by the control point application. 
-*		This cookie will be returned to the control point
+*					This cookie will be returned to the control point
-*		in the callback
+*					in the callback 
 *																	
 * Description:														
 *	This function handles the ssdp messages from the devices. These 
@@ -241,11 +234,10 @@ static inline void ssdp_handle_device_request(
 * Returns: void
 *
 ***************************************************************************/
-void ssdp_handle_ctrlpt_msg(
+void ssdp_handle_ctrlpt_msg( IN http_message_t* hmsg, 
-	IN http_message_t* hmsg, 
+							 IN struct sockaddr_in* dest_addr,
-	IN struct sockaddr_in* dest_addr,
+							 IN xboolean timeout,
-	IN xboolean timeout,
+							 IN void* cookie );
-	IN void* cookie );
 
 /************************************************************************
 * Function : unique_service_name								
@@ -253,7 +245,7 @@ void ssdp_handle_ctrlpt_msg(
 * Parameters:														
 *	IN char *cmd: Service Name string 
 *	OUT SsdpEvent *Evt: The SSDP event structure partially filled 
-*		by all the function.
+*						by all the function.
 *
 * Description:														
 *	This function fills the fields of the event structure like DeviceType,
@@ -334,10 +326,12 @@ int ssdp_request_type(IN char * cmd, OUT SsdpEvent * Evt);
 * Function : SearchByTarget											
 *																	
 * Parameters:														
-*	IN int Mx:Number of seconds to wait, to collect all the	responses.
+*		IN int Mx:Number of seconds to wait, to collect all the 
-*	char *St: Search target.
+*					responses.
-*	void *Cookie: cookie provided by control point application. This
+*		char *St: Search target.
-*		cokie will be returned to application in the callback.
+*		void *Cookie: cookie provided by control point application. This
+*						cokie will be returned to application in the 
+*						callback.
 *
 * Description:														
 *	This function creates and send the search request for a specific URL.
@@ -351,11 +345,12 @@ int SearchByTarget(IN int Mx, IN char *St, IN void *Cookie);
 * Function : DeviceAdvertisement									
 *																	
 * Parameters:														
-*	IN char *DevType : type of the device
+*	IN char * DevType : type of the device
-*	IN int RootDev   : flag to indicate if the device is root device
+*	IN int RootDev: flag to indicate if the device is root device
-*	IN char *Udn     :
+*	IN char * nt : value of NT
-*	IN char *Location: Location URL.
+*	IN char * usn :
-*	IN int Duration  : Service duration in sec.
+*	IN char * location :Location URL.
+*	IN int  duration :Service duration in sec.
 *
 * Description:														
 *	This function creates the device advertisement request based on 
@@ -364,12 +359,8 @@ int SearchByTarget(IN int Mx, IN char *St, IN void *Cookie);
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int DeviceAdvertisement(
+int DeviceAdvertisement(IN char * DevType, int RootDev,char * Udn, 
-	IN char *DevType,
+						IN char * Location, IN int  Duration);
-	IN int RootDev,
-	IN char *Udn, 
-	IN char *Location,
-	IN int Duration);
 
 
 /************************************************************************
@@ -378,10 +369,10 @@ int DeviceAdvertisement(
 * Parameters:	
 *	IN char *DevType: Device Type.
 *	IN int RootDev:1 means root device.
-*	IN char *Udn: Device UDN
+*	IN char * Udn: Device UDN
 *	IN char *_Server:
-*	IN char *Location: Location URL
+*	IN char * Location: Location URL
-*	IN int Duration :Device duration in sec.
+*	IN int  Duration :Device duration in sec.
 *
 * Description:														
 *	This function creates a HTTP device shutdown request packet 
@@ -390,13 +381,12 @@ int DeviceAdvertisement(
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int DeviceShutdown(
+int DeviceShutdown( IN char * DevType, 
-	IN char *DevType, 
+				    IN int RootDev,
-	IN int RootDev,
+					IN char * Udn, 
-	IN char *Udn, 
+					IN char * _Server, 
-	IN char *_Server, 
+					IN char * Location, 
-	IN char *Location, 
+					IN int  Duration );
-	IN int Duration);
 
 /************************************************************************
 * Function : DeviceReply									
@@ -405,10 +395,10 @@ int DeviceShutdown(
 *	IN struct sockaddr_in * DestAddr:destination IP address.
 *	IN char *DevType: Device type
 *	IN int RootDev: 1 means root device 0 means embedded device.
-*	IN char *Udn: Device UDN
+*	IN char * Udn: Device UDN
-*	IN char *Location: Location of Device description document.
+*	IN char * Location: Location of Device description document.
-*	IN int Duration :Life time of this device.
+*	IN int  Duration :Life time of this device.
-*
+
 * Description:														
 *	This function creates the reply packet based on the input parameter, 
 *	and send it to the client address given in its input parameter DestAddr.
@@ -416,12 +406,11 @@ int DeviceShutdown(
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int DeviceReply(
+int DeviceReply(IN struct sockaddr_in * DestAddr, 
-	IN struct sockaddr_in * DestAddr, 
+				IN char *DevType, 
-	IN char *DevType, 
+				IN int RootDev, 
-	IN int RootDev, 
+				IN char * Udn, 
-	IN char *Udn, 
+				IN char * Location, IN int  Duration);
-	IN char *Location, IN int  Duration);
 
 /************************************************************************
 * Function : SendReply									
@@ -432,8 +421,8 @@ int DeviceReply(
 *	IN int RootDev: 1 means root device 0 means embedded device.
 *	IN char * Udn: Device UDN
 *	IN char *_Server:
-*	IN char *Location: Location of Device description document.
+*	IN char * Location: Location of Device description document.
-*	IN int Duration :Life time of this device.
+*	IN int  Duration :Life time of this device.
 *	IN int ByType:
 *
 * Description:														
@@ -443,14 +432,13 @@ int DeviceReply(
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int SendReply(
+int SendReply(IN struct sockaddr_in * DestAddr, 
-	IN struct sockaddr_in * DestAddr, 
+			  IN char *DevType, 
-	IN char *DevType, 
+			  IN int RootDev, 
-	IN int RootDev, 
+			  IN char * Udn, 
-	IN char *Udn, 
+			  IN char * Location, 
-	IN char *Location, 
+			  IN int  Duration, 
-	IN int Duration, 
+			  IN int ByType );
-	IN int ByType );
 
 /************************************************************************
 * Function : ServiceAdvertisement									
@@ -459,55 +447,55 @@ int SendReply(
 *	IN char * Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
-*	IN int Duration :Life time of this device.
+*	IN int  Duration :Life time of this device.
-*
+
 * Description:														
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
+
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int ServiceAdvertisement(
+int ServiceAdvertisement( IN char * Udn, 
-	IN char *Udn, 
+						 IN char * ServType,
-	IN char *ServType,
+						 IN char * Location,
-	IN char *Location,
+						 IN int  Duration);
-	IN int Duration);
 
 /************************************************************************
 * Function : ServiceReply									
 *																	
 * Parameters:	
 *	IN struct sockaddr_in *DestAddr:
-*	IN char *Udn: Device UDN
+*	IN char * Udn: Device UDN
 *	IN char *ServType: Service Type.
 *	IN char *Server: Not used
-*	IN char *Location: Location of Device description document.
+*	IN char * Location: Location of Device description document.
-*	IN int Duration :Life time of this device.
+*	IN int  Duration :Life time of this device.
-*
+
 * Description:														
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
+
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int ServiceReply(
+int ServiceReply(IN struct sockaddr_in *DestAddr,  
-	IN struct sockaddr_in *DestAddr,  
+				 IN char * ServType, 
-	IN char *ServType, 
+				 IN char * Udn, 
-	IN char *Udn, 
+				 IN char * Location,
-	IN char *Location,
+				 IN int  Duration);
-	IN int Duration);
 
 /************************************************************************
 * Function : ServiceShutdown									
 *																	
 * Parameters:	
-*	IN char *Udn: Device UDN
+*	IN char * Udn: Device UDN
 *	IN char *ServType: Service Type.
-*	IN char *Location: Location of Device description document.
+*	IN char * Location: Location of Device description document.
-*	IN int Duration :Service duration in sec.
+*	IN int  Duration :Service duration in sec.
-*
+
 * Description:														
 *	This function creates a HTTP service shutdown request packet 
 *	and sent it to the multicast channel through RequestHandler.
@@ -515,18 +503,16 @@ int ServiceReply(
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int ServiceShutdown(
+int ServiceShutdown( IN char * Udn, IN char * ServType,
-	IN char *Udn,
+					IN char * Location,
-	IN char *ServType,
+					IN int  Duration);
-	IN char *Location,
-	IN int Duration);
 
 
 /************************************************************************
 * Function : advertiseAndReplyThread									
 *																	
 * Parameters:														
-*	IN void *data: Structure containing the search request
+*		IN void *data: Structure containing the search request
 *
 * Description:														
 *	This function is a wrapper function to reply the search request 
@@ -535,21 +521,20 @@ int ServiceShutdown(
 * Returns: void *
 *	always return NULL
 ***************************************************************************/
-void *advertiseAndReplyThread(IN void * data);
+void * advertiseAndReplyThread(IN void * data);
 
 /************************************************************************
 * Function : AdvertiseAndReply									
 *																	
 * Parameters:														
-*	IN int AdFlag: -1 = Send shutdown,
+*	IN int AdFlag: -1 = Send shutdown, 0 = send reply, 
-*			0 = send reply, 
+*					1 = Send Advertisement
-*			1 = Send Advertisement
 *	IN UpnpDevice_Handle Hnd: Device handle
 *	IN enum SsdpSearchType SearchType:Search type for sending replies
 *	IN struct sockaddr_in *DestAddr:Destination address
-*	IN char *DeviceType:Device type
+*   IN char *DeviceType:Device type
 *	IN char *DeviceUDN:Device UDN
-*	IN char *ServiceType:Service type
+*   IN char *ServiceType:Service type
 *	IN int Exp:Advertisement age
 *
 * Description:														
@@ -558,14 +543,13 @@ void *advertiseAndReplyThread(IN void * data);
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int AdvertiseAndReply(
+int AdvertiseAndReply(IN int AdFlag, 
-	IN int AdFlag, 
+					IN UpnpDevice_Handle Hnd, 
-	IN UpnpDevice_Handle Hnd, 
+					IN enum SsdpSearchType SearchType, 
-	IN enum SsdpSearchType SearchType, 
+					IN struct sockaddr_in *DestAddr,
-	IN struct sockaddr_in *DestAddr,
+                    IN char *DeviceType, 
-	IN char *DeviceType, 
+					IN char *DeviceUDN, 
-	IN char *DeviceUDN, 
+                    IN char *ServiceType, int Exp);
-	IN char *ServiceType, int Exp);
 
 #endif
 

upnp/src/inc/unixutil.h

@@ -36,11 +36,12 @@
 
 #include <sys/types.h>
 #ifndef WIN32
-	#include <sys/socket.h>
+ #include <sys/socket.h>
 #else
-	typedef int socklen_t;
+ #define XINLINE
-	#define EAFNOSUPPORT 97
+
+ #define socklen_t int
+ #define EAFNOSUPPORT 97
 #endif
 
 #endif // GENLIB_NET_UNIXUTIL_H
-

upnp/src/inc/upnpapi.h

@@ -71,53 +71,33 @@ struct Handle_Info
     Upnp_FunPtr  Callback; // Callback function pointer.
     char * Cookie;
 
-    // Device Only
+    DEVICEONLY(char  DescURL[LINE_SIZE];)   // URL for the use of SSDP
-#ifdef INCLUDE_DEVICE_APIS
+    DEVICEONLY(char  DescXML[LINE_SIZE];)   // XML file path for device 
-    char  DescURL[LINE_SIZE];   // URL for the use of SSDP
+                                            //description
-    char  DescXML[LINE_SIZE];   // XML file path for device 
-                                //description
 
-    int MaxAge;                 // Advertisement timeout
+    DEVICEONLY(int MaxAge;)                 // Advertisement timeout
-    IXML_Document *DescDocument;// Description parsed in 
+    DEVICEONLY(IXML_Document *DescDocument;)     // Description parsed in 
-                                //terms of DOM document 
+                                            //terms of DOM document 
-    IXML_NodeList *DeviceList;  // List of devices in the 
+    DEVICEONLY(IXML_NodeList *DeviceList;)       // List of devices in the 
-                                //description document
+                                            //description document
-    IXML_NodeList *ServiceList; // List of services in the 
+    DEVICEONLY(IXML_NodeList *ServiceList;)      // List of services in the 
-                                // description document
+                                            // description document
-    service_table ServiceTable; //table holding subscriptions and 
+    DEVICEONLY(service_table ServiceTable;) //table holding subscriptions and 
                                 //URL information
-    int MaxSubscriptions;
+    DEVICEONLY(int MaxSubscriptions;)
-    int MaxSubscriptionTimeOut;
+    DEVICEONLY(int MaxSubscriptionTimeOut;)
-#endif
      
-    // Client only
+       //Client only
-#ifdef INCLUDE_CLIENT_APIS
+    CLIENTONLY(client_subscription * ClientSubList;) //client subscription list
-    client_subscription *ClientSubList; //client subscription list
+    CLIENTONLY(LinkedList SsdpSearchList;) // active ssdp searches   
-    LinkedList SsdpSearchList; // active ssdp searches   
-#endif
     int   aliasInstalled;       // 0 = not installed; otherwise installed
-};
+} ;
 
-extern ithread_rwlock_t GlobalHndRWLock;
+extern ithread_mutex_t GlobalHndMutex;
 Upnp_Handle_Type GetHandleInfo(int Hnd, struct Handle_Info **HndInfo); 
 
-#define HandleLock() HandleWriteLock()
+#define HandleLock()  DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"Trying Lock")); ithread_mutex_lock(&GlobalHndMutex); DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"LOCK"));
-
+#define HandleUnlock() DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"Trying Unlock")); ithread_mutex_unlock(&GlobalHndMutex); DBGONLY(UpnpPrintf(UPNP_INFO,API,__FILE__,__LINE__,"Unlock"));
-#define HandleWriteLock()  \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying a write lock"); \
-	ithread_rwlock_wrlock(&GlobalHndRWLock); \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Write lock acquired");
-
-#define HandleReadLock()  \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying a read lock"); \
-	ithread_rwlock_rdlock(&GlobalHndRWLock); \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Read lock acquired");
-
-#define HandleUnlock() \
-	UpnpPrintf(UPNP_INFO, API,__FILE__, __LINE__, "Trying Unlock"); \
-	ithread_rwlock_unlock(&GlobalHndRWLock); \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Unlocked rwlock");
-
 Upnp_Handle_Type GetClientHandleInfo(int *client_handle_out, 
                                      struct Handle_Info **HndInfo);
 Upnp_Handle_Type GetDeviceHandleInfo(int *device_handle_out, 
@@ -131,7 +111,7 @@ extern unsigned short LOCAL_PORT;
 extern TimerThread gTimerThread;
 extern ThreadPool gRecvThreadPool;
 extern ThreadPool gSendThreadPool;
-extern ThreadPool gMiniServerThreadPool;
+
 
 typedef enum {
     SUBSCRIBE,
@@ -183,6 +163,7 @@ void UpnpThreadDistribution(struct UpnpNonblockParam * Param);
 void AutoAdvertise(void *input); 
 int getlocalhostname(char *out);
 
+virtualDirList *pVirtualDirList;
 extern WebServerState bWebServerState;
 
 #endif

upnp/src/inc/uri.h

@@ -86,8 +86,8 @@ enum uriType  { absolute, relative };
 /*	Buffer used in parsinghttp messages, urls, etc. generally this simply
 *	holds a pointer into a larger array									*/
 typedef struct TOKEN {
-  const char *buff;
+   char * buff;
-  size_t size;
+  int size;
 } token;
 
 
@@ -124,7 +124,7 @@ typedef struct URL_LIST {
 *	Parameters :
 *		char * in ;	string of characters
 *		int index ;	index at which to start checking the characters
-*		size_t *max ;	
+*		int *max ;	
 *
 *	Description : Replaces an escaped sequence with its unescaped version 
 *		as in http://www.ietf.org/rfc/rfc2396.txt  (RFC explaining URIs)
@@ -137,7 +137,7 @@ typedef struct URL_LIST {
 *		string are shifted over, and NULL characters are placed at the 
 *		end of the string.
 ************************************************************************/
-int replace_escaped(char * in, int index, size_t *max);
+int replace_escaped(char * in, int index, int *max);
 
 /************************************************************************
 *	Function :	copy_URL_list
@@ -182,16 +182,13 @@ void free_URL_list(URL_list * list);
 *		uri_type *in ;	URI object
 *
 *	Description : Function useful in debugging for printing a parsed uri.
+*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+DBGONLY(void print_uri( uri_type *in);)
-void print_uri(uri_type *in);
-#else
-static UPNP_INLINE void print_uri(uri_type *in) {}
-#endif
 
 /************************************************************************
 *	Function :	print_token
@@ -200,16 +197,13 @@ static UPNP_INLINE void print_uri(uri_type *in) {}
 *		token * in ;	
 *
 *	Description : Function useful in debugging for printing a token.
+*		Compiled out with DBGONLY macro. 
 *
 *	Return : void ;
 *
 *	Note :
 ************************************************************************/
-#ifdef DEBUG
+void print_token(  token * in);
-void print_token(token *in);
-#else
-static UPNP_INLINE void print_token(token * in) {}
-#endif
 
 /************************************************************************
 *	Function :	token_string_casecmp
@@ -282,7 +276,7 @@ int token_cmp( token *in1,  token *in2);
 *
 *	Note :
 ************************************************************************/
-int parse_port(int max, const char *port, unsigned short int *out);
+int parse_port(int max,   char * port, unsigned short int * out);
 
 /************************************************************************
 *	Function :	parse_hostport
@@ -302,14 +296,14 @@ int parse_port(int max, const char *port, unsigned short int *out);
 *
 *	Note :
 ************************************************************************/
-int parse_hostport(const char *in, int max, hostport_type *out );
+int parse_hostport(  char* in, int max, hostport_type *out );
 
 /************************************************************************
 *	Function :	remove_escaped_chars
 *
 *	Parameters :
 *		INOUT char *in ;	string of characters to be modified
-*		INOUT size_t *size ;	size limit for the number of characters
+*		INOUT int *size ;	size limit for the number of characters
 *
 *	Description : removes http escaped characters such as: "%20" and 
 *		replaces them with their character representation. i.e. 
@@ -321,7 +315,7 @@ int parse_hostport(const char *in, int max, hostport_type *out );
 *
 *	Note :
 ************************************************************************/
-int remove_escaped_chars(char *in, size_t *size);
+int remove_escaped_chars(char *in,int *size);
 
 /************************************************************************
 *	Function :	remove_dots
@@ -397,7 +391,7 @@ char * resolve_rel_url( char * base_url,  char * rel_url);
 *
 *	Note :
 ************************************************************************/
-int parse_uri(const char * in, int max, uri_type * out);
+int parse_uri(  char * in, int max, uri_type * out);
 
 /************************************************************************
 *	Function :	parse_uri_and_unescape

upnp/src/inc/util.h

@@ -47,6 +47,12 @@
 #endif
 
 
+#ifdef NO_DEBUG
+#define DBG(x)
+#else
+#define DBG(x) x
+#endif
+
 #define GEMD_OUT_OF_MEMORY -1
 #define EVENT_TIMEDOUT -2
 #define EVENT_TERMINATE	-3
@@ -136,28 +142,31 @@ void linecopylen( OUT char dest[LINE_SIZE], IN const char* src, IN size_t srclen
 #endif
 
 //////////////////////////////////
+
 // C specific
 #ifndef __cplusplus
 
-#ifdef WIN32
+#ifndef WIN32
-	#ifndef S_ISREG
+ #define		XINLINE inline
-		#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#else
-	#endif
 
-	#ifndef S_ISDIR
+ #ifndef S_ISREG
-		#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+ #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-	#endif
+ #endif
  
-	#define EADDRINUSE WSAEADDRINUSE
+ #ifndef S_ISDIR
+ #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+ #endif
 
-	#define strcasecmp stricmp
+ #define EADDRINUSE WSAEADDRINUSE
-	#define strncasecmp strnicmp
 
-	#define sleep(a) Sleep((a)*1000)
+ #define strcasecmp stricmp
-	#define usleep(a) Sleep((a)/1000)
+ #define strncasecmp strnicmp
+
+ #define sleep Sleep
+ #define usleep(a) Sleep((a)/1000)
 #endif
 
 #endif // __cplusplus
 
 #endif /* GENLIB_UTIL_UTIL_H */
-

upnp/src/inc/webserver.h

@@ -48,8 +48,8 @@ struct SendInstruction
    int  IsRangeActive;
    int  IsTrailers;
    char RangeHeader[200];
-   off_t RangeOffset;
+   long RangeOffset;
-   off_t ReadSendSize;  // Read from local source and send on the network.
+   long 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.

upnp/src/inet_pton.c

@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-typedef int socklen_t;
+#define socklen_t int
 #define EAFNOSUPPORT 97
 /*
  * WARNING: Don't even consider trying to compile this on a system where

upnp/src/soap/soap_ctrlpt.c

@@ -212,11 +212,11 @@ dom_find_deep_node( IN char *names[],
 *
 *	Note :The given node must have a text node as its first child
 ****************************************************************************/
-static const DOMString
+static DOMString
 get_node_value( IN IXML_Node * node )
 {
     IXML_Node *text_node = NULL;
-    const DOMString text_value = NULL;
+    DOMString text_value = NULL;
 
     text_node = ixmlNode_getFirstChild( node );
     if( text_node == NULL ) {
@@ -244,21 +244,20 @@ get_node_value( IN IXML_Node * node )
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 get_host_and_path( IN char *ctrl_url,
-                   OUT const memptr *host,
+                   OUT memptr * host,
-                   OUT const memptr *path,
+                   OUT memptr * path,
                    OUT uri_type * url )
 {
     if( parse_uri( ctrl_url, strlen( ctrl_url ), url ) != HTTP_SUCCESS ) {
         return -1;
     }
-    // This is done to ensure that the buffer is kept const
+    host->buf = url->hostport.text.buff;
-    ((memptr *)host)->buf = (char *)url->hostport.text.buff;
+    host->length = url->hostport.text.size;
-    ((memptr *)host)->length = url->hostport.text.size;
 
-    ((memptr *)path)->buf = (char *)url->pathquery.buff;
+    path->buf = url->pathquery.buff;
-    ((memptr *)path)->length = url->pathquery.size;
+    path->length = url->pathquery.size;
 
     return 0;
 }
@@ -277,7 +276,7 @@ get_host_and_path( IN char *ctrl_url,
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 get_action_name( IN char *action,
                  OUT memptr * name )
 {
@@ -303,7 +302,7 @@ get_action_name( IN char *action,
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 add_man_header( INOUT membuffer * headers )
 {
     char *soap_action_hdr;
@@ -415,12 +414,12 @@ get_response_value( IN http_message_t * hmsg,
     IXML_Node *error_node = NULL;
     IXML_Document *doc = NULL;
     char *node_str = NULL;
-    const char *temp_str = NULL;
+    char *temp_str = NULL;
     DOMString error_node_str = NULL;
     int err_code;
     xboolean done = FALSE;
     char *names[5];
-    const DOMString nodeValue;
+    DOMString nodeValue;
 
     err_code = UPNP_E_BAD_RESPONSE; // default error
 
@@ -602,27 +601,25 @@ SoapSendAction( IN char *action_url,
     char *upnp_error_str;
     xboolean got_response = FALSE;
 
-    off_t content_length;
     char *xml_start =
-        "<s:Envelope "
+//        "<?xml version=\"1.0\"?>\n" required??
-        "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
+		"<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
-        "s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n"
+        "s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\n"
         "<s:Body>";
-    char *xml_end =
+    char *xml_end = "</s:Body>\n" "</s:Envelope>\n";
-        "</s:Body>\r\n"
+    int xml_start_len;
-        "</s:Envelope>\r\n\r\n";
+    int xml_end_len;
-    size_t xml_start_len;
+    int action_str_len;
-    size_t xml_end_len;
-    size_t action_str_len;
 
     *response_node = NULL;      // init
 
     err_code = UPNP_E_OUTOF_MEMORY; // default error
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-        "Inside SoapSendAction():" );
+                         "Inside SoapSendAction():" );
-    // init
+         )
-    membuffer_init( &request );
+        // init
+        membuffer_init( &request );
     membuffer_init( &responsename );
 
     // print action
@@ -641,30 +638,24 @@ SoapSendAction( IN char *action_url,
         goto error_handler;
     }
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-        "path=%.*s, hostport=%.*s\n",
+                         "path=%.*s, hostport=%.*s\n",
-        (int)url.pathquery.size,
+                         url.pathquery.size, url.pathquery.buff,
-        url.pathquery.buff,
+                         url.hostport.text.size,
-        (int)url.hostport.text.size,
+                         url.hostport.text.buff ); )
-        url.hostport.text.buff );
 
-    xml_start_len = strlen( xml_start );
+        xml_start_len = strlen( xml_start );
     xml_end_len = strlen( xml_end );
     action_str_len = strlen( action_str );
 
     // make request msg
     request.size_inc = 50;
-    content_length = xml_start_len + action_str_len + xml_end_len;
+    if( http_MakeMessage( &request, 1, 1, "q" "N" "s" "sssbs" "U" "c" "bbb", SOAPMETHOD_POST, &url, xml_start_len + action_str_len + xml_end_len,   // content-length
-    if (http_MakeMessage(
+                          ContentTypeHeader,
-       	&request, 1, 1,
+                          "SOAPACTION: \"", service_type, "#", name.buf,
-        "q" "N" "s" "sssbsc" "Uc" "b" "b" "b",
+                          name.length, "\"\r\n", xml_start, xml_start_len,
-        SOAPMETHOD_POST, &url, 
+                          action_str, action_str_len, xml_end,
-        content_length,
+                          xml_end_len ) != 0 ) {
-        ContentTypeHeader,
-        "SOAPACTION: \"", service_type, "#", name.buf, name.length, "\"",
-        xml_start, xml_start_len,
-        action_str, action_str_len,
-        xml_end, xml_end_len ) != 0 ) {
         goto error_handler;
     }
 
@@ -693,7 +684,7 @@ SoapSendAction( IN char *action_url,
         err_code = ret_code;
     }
 
-error_handler:
+  error_handler:
     ixmlFreeDOMString( action_str );
     membuffer_destroy( &request );
     membuffer_destroy( &responsename );
@@ -745,35 +736,30 @@ SoapSendActionEx( IN char *action_url,
     xboolean got_response = FALSE;
 
     char *xml_start =
-        "<s:Envelope "
+//		"<?xml version=\"1.0\"?>\n" required??
-        "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
+        "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
-        "s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n";
+        "s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\n";
-    char *xml_header_start =
+    char *xml_body_start = "<s:Body>";
-        "<s:Header>\r\n";
+    char *xml_end = "</s:Body>\n" "</s:Envelope>\n";
-    char *xml_header_end =
+    int xml_start_len;
-        "</s:Header>\r\n";
+    int xml_end_len;
-    char *xml_body_start =
+    char *xml_header_start = "<s:Header>\n";
-        "<s:Body>";
+    char *xml_header_end = "</s:Header>\n";
-    char *xml_end =
+    int xml_header_start_len;
-        "</s:Body>\r\n"
+    int xml_header_end_len;
-        "</s:Envelope>\r\n";
+    int xml_header_str_len;
-    size_t xml_start_len;
+    int action_str_len;
-    size_t xml_header_start_len;
+    int xml_body_start_len;
-    size_t xml_header_str_len;
-    size_t xml_header_end_len;
-    size_t xml_body_start_len;
-    size_t action_str_len;
-    size_t xml_end_len;
-    off_t content_length;
 
     *response_node = NULL;      // init
 
     err_code = UPNP_E_OUTOF_MEMORY; // default error
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-        "Inside SoapSendActionEx():" );
+                         "Inside SoapSendActionEx():" );
-    // init
+         )
-    membuffer_init( &request );
+        // init
+        membuffer_init( &request );
     membuffer_init( &responsename );
 
     // header string
@@ -797,14 +783,13 @@ SoapSendActionEx( IN char *action_url,
         goto error_handler;
     }
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-        "path=%.*s, hostport=%.*s\n",
+                         "path=%.*s, hostport=%.*s\n",
-        (int)url.pathquery.size,
+                         url.pathquery.size, url.pathquery.buff,
-        url.pathquery.buff,
+                         url.hostport.text.size,
-        (int)url.hostport.text.size,
+                         url.hostport.text.buff ); )
-        url.hostport.text.buff );
 
-    xml_start_len = strlen( xml_start );
+        xml_start_len = strlen( xml_start );
     xml_body_start_len = strlen( xml_body_start );
     xml_end_len = strlen( xml_end );
     action_str_len = strlen( action_str );
@@ -815,24 +800,17 @@ SoapSendActionEx( IN char *action_url,
 
     // make request msg
     request.size_inc = 50;
-    content_length =
+    if( http_MakeMessage( &request, 1, 1, "q" "N" "s" "sssbs" "U" "c" "bbbbbbb", SOAPMETHOD_POST, &url, xml_start_len + xml_header_start_len + xml_header_str_len + xml_header_end_len + xml_body_start_len + action_str_len + xml_end_len, // content-length
-        xml_start_len +
+                          ContentTypeHeader,
-        xml_header_start_len + xml_header_str_len + xml_header_end_len +
+                          "SOAPACTION: \"", service_type, "#", name.buf,
-        xml_body_start_len + action_str_len + xml_end_len;
+                          name.length, "\"\r\n",
-    if (http_MakeMessage(
+                          xml_start, xml_start_len,
-        &request, 1, 1,
+                          xml_header_start, xml_header_start_len,
-        "q" "N" "s" "sssbsc" "Uc" "b" "b" "b" "b" "b" "b" "b",
+                          xml_header_str, xml_header_str_len,
-        SOAPMETHOD_POST, &url,
+                          xml_header_end, xml_header_end_len,
-        content_length,
+                          xml_body_start, xml_body_start_len,
-        ContentTypeHeader,
+                          action_str, action_str_len,
-        "SOAPACTION: \"", service_type, "#", name.buf, name.length, "\"",
+                          xml_end, xml_end_len ) != 0 ) {
-        xml_start, xml_start_len,
-        xml_header_start, xml_header_start_len,
-        xml_header_str, xml_header_str_len,
-        xml_header_end, xml_header_end_len,
-        xml_body_start, xml_body_start_len,
-        action_str, action_str_len,
-        xml_end, xml_end_len ) != 0 ) {
         goto error_handler;
     }
 
@@ -895,28 +873,24 @@ SoapGetServiceVarStatus( IN char *action_url,
                          IN char *var_name,
                          OUT char **var_value )
 {
-    const memptr host;                // value for HOST header
+    memptr host;                // value for HOST header
-    const memptr path;                // ctrl path in first line in msg
+    memptr path;                // ctrl path in first line in msg
     uri_type url;
     membuffer request;
     int ret_code;
     http_parser_t response;
     int upnp_error_code;
 
-    off_t content_length;
     char *xml_start =
-        "<s:Envelope "
+//		"<?xml version=\"1.0\"?>\n" required??
-        "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
+        "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
-        "s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\r\n"
+        "s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\n"
-        "<s:Body>\r\n"
+        "<s:Body>\n"
-        "<u:QueryStateVariable xmlns:u=\"urn:schemas-upnp-org:control-1-0\">\r\n"
+        "<u:QueryStateVariable xmlns:u=\"urn:schemas-upnp-org:control-1-0\">\n"
         "<u:varName>";
 
-    char *xml_end =
+    char *xml_end = "</u:varName>\n"
-        "</u:varName>\r\n"
+        "</u:QueryStateVariable>\n" "</s:Body>\n" "</s:Envelope>\n";
-        "</u:QueryStateVariable>\r\n"
-        "</s:Body>\r\n"
-        "</s:Envelope>\r\n";
 
     *var_value = NULL;          // return NULL in case of an error
 
@@ -928,16 +902,11 @@ SoapGetServiceVarStatus( IN char *action_url,
     }
     // make headers
     request.size_inc = 50;
-    content_length = strlen( xml_start ) + strlen( var_name ) + strlen( xml_end );
+    if( http_MakeMessage( &request, 1, 1, "Q" "sbc" "N" "s" "s" "U" "c" "sss", SOAPMETHOD_POST, path.buf, path.length, "HOST: ", host.buf, host.length, strlen( xml_start ) + strlen( var_name ) + strlen( xml_end ),   // content-length
-    if (http_MakeMessage(
+                          ContentTypeHeader,
-	&request, 1, 1,
+                          "SOAPACTION: \"urn:schemas"
-	"Q" "sbc" "N" "s" "s" "Ucc" "sss",
+                          "-upnp-org:control-1-0#QueryStateVariable\"\r\n",
-	SOAPMETHOD_POST, path.buf, path.length,
+                          xml_start, var_name, xml_end ) != 0 ) {
-	"HOST: ", host.buf, host.length,
-	content_length,
-	ContentTypeHeader,
-	"SOAPACTION: \"urn:schemas-upnp-org:control-1-0#QueryStateVariable\"",
-	xml_start, var_name, xml_end ) != 0 ) {
         return UPNP_E_OUTOF_MEMORY;
     }
     // send msg and get reply

upnp/src/soap/soap_device.c

@@ -85,7 +85,7 @@ const char *ContentTypeHeader =
 *		0 if successful else returns appropriate error.
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 get_request_type( IN http_message_t * request,
                   OUT memptr * action_name )
 {
@@ -189,7 +189,7 @@ send_error_response( IN SOCKINFO * info,
                      IN const char *err_msg,
                      IN http_message_t * hmsg )
 {
-    off_t content_length;
+    int content_length;
     int timeout_secs = SOAP_TIMEOUT;
     int major,
       minor;
@@ -228,19 +228,20 @@ send_error_response( IN SOCKINFO * info,
 
     // make headers
     membuffer_init( &headers );
-    if (http_MakeMessage(
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */    
-        &headers, major, minor,
+    if( http_MakeMessage( &headers, major, minor,
-        "RNsDsSXcc" "sssss",
+                          "RNsDsSXc" "sssss",
-        500,
+                          500,
-        content_length,
+                          content_length,
-        ContentTypeHeader,
+                          ContentTypeHeader,
-        "EXT:\r\n",
+                          "EXT:\r\n",
-        X_USER_AGENT,
+                          X_USER_AGENT,
-        start_body, err_code_str, mid_body, err_msg,
+                          start_body, err_code_str, mid_body, err_msg,
-        end_body ) != 0 ) {
+                          end_body ) != 0 ) {
         membuffer_destroy( &headers );
         return;                 // out of mem
     }
+/*-- PATCH END - */
     // send err msg
     http_SendMessage( info, &timeout_secs, "b",
                       headers.buf, headers.length );
@@ -262,16 +263,17 @@ send_error_response( IN SOCKINFO * info,
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 send_var_query_response( IN SOCKINFO * info,
                          IN const char *var_value,
                          IN http_message_t * hmsg )
 {
-    off_t content_length;
+    int content_length;
     int timeout_secs = SOAP_TIMEOUT;
-    int major;
+    int major,
-    int minor;
+      minor;
     const char *start_body =
+//		"<?xml version=\"1.0\"?>\n" required??
         "<s:Envelope "
         "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
         "s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">\n"
@@ -295,18 +297,19 @@ send_var_query_response( IN SOCKINFO * info,
     // make headers
     membuffer_init( &response );
     
-    if (http_MakeMessage(
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
-        &response, major, minor,
+    if( http_MakeMessage( &response, major, minor,
-        "RNsDsSXcc" "sss",
+                          "RNsDsSXcc" "sss",
-        HTTP_OK,
+                          HTTP_OK,
-        content_length,
+                          content_length,
-        ContentTypeHeader,
+                          ContentTypeHeader,
-        "EXT:\r\n",
+                          "EXT:\r\n",
-        X_USER_AGENT,
+                          X_USER_AGENT,
-        start_body, var_value, end_body ) != 0 ) {
+                          start_body, var_value, end_body ) != 0 ) {
         membuffer_destroy( &response );
         return;                 // out of mem
     }
+/* -- PATCH END - */
     
     // send msg
     http_SendMessage( info, &timeout_secs, "b",
@@ -326,12 +329,12 @@ send_var_query_response( IN SOCKINFO * info,
 *	Description :	This function separates the action node from 
 *	the root DOM node.
 *
-*	Return :	static UPNP_INLINE int
+*	Return :	static XINLINE int
 *		0 if successful, or -1 if fails.
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 get_action_node( IN IXML_Document * TempDoc,
                  IN char *NodeName,
                  OUT IXML_Document ** RespNode )
@@ -344,10 +347,11 @@ get_action_node( IN IXML_Document * TempDoc,
     int ret_code = -1;          // error, by default
     IXML_NodeList *nl = NULL;
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-        "get_action_node(): node name =%s\n ", NodeName );
+                         "get_action_node(): node name =%s\n ", NodeName );
+         )
 
-    *RespNode = NULL;
+        * RespNode = NULL;
 
     // Got the Envelope node here
     EnvpNode = ixmlNode_getFirstChild( ( IXML_Node * ) TempDoc );
@@ -599,13 +603,13 @@ get_device_info( IN http_message_t * request,
     service_info *serv_info;
     char save_char;
     int ret_code = -1;          // error by default
-    const char *control_url;
+    char *control_url;
     char *actionName = NULL;
 
     // null-terminate pathquery of url
     control_url = request->uri.pathquery.buff;
     save_char = control_url[request->uri.pathquery.size];
-    ((char *)control_url)[request->uri.pathquery.size] = '\0';
+    control_url[request->uri.pathquery.size] = '\0';
 
     HandleLock(  );
 
@@ -662,7 +666,7 @@ get_device_info( IN http_message_t * request,
     ret_code = 0;
 
   error_handler:
-    ((char *)control_url)[request->uri.pathquery.size] = save_char;   // restore
+    control_url[request->uri.pathquery.size] = save_char;   // restore
     HandleUnlock(  );
     return ret_code;
 }
@@ -681,7 +685,7 @@ get_device_info( IN http_message_t * request,
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 send_action_response( IN SOCKINFO * info,
                       IN IXML_Document * action_resp,
                       IN http_message_t * request )
@@ -691,7 +695,7 @@ send_action_response( IN SOCKINFO * info,
     int major,
       minor;
     int err_code;
-    off_t content_length;
+    int content_length;
     int ret_code;
     int timeout_secs = SOAP_TIMEOUT;
     static char *start_body =
@@ -713,22 +717,17 @@ send_action_response( IN SOCKINFO * info,
         goto error_handler;
     }
 
-    content_length =
+    content_length = strlen( start_body ) + strlen( xml_response ) +
-        strlen( start_body ) +
-        strlen( xml_response ) +
         strlen( end_body );
 
     // make headers
-    if (http_MakeMessage(
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */    
-        &headers, major, minor,
+    if( http_MakeMessage( &headers, major, minor, "RNsDsSXcc", HTTP_OK,   // status code
-        "RNsDsSXcc",
+                          content_length, ContentTypeHeader, "EXT:\r\n", X_USER_AGENT // EXT header
-        HTTP_OK,   // status code
+         ) != 0 ) {
-        content_length,
-        ContentTypeHeader,
-        "EXT:\r\n",
-        X_USER_AGENT) != 0 ) {
         goto error_handler;
     }
+/* -- PATCH END - */
 
     // send whole msg
     ret_code = http_SendMessage( info, &timeout_secs, "bbbb",
@@ -737,15 +736,15 @@ send_action_response( IN SOCKINFO * info,
                                  xml_response, strlen( xml_response ),
                                  end_body, strlen( end_body ) );
 
-    if( ret_code != 0 ) {
+    DBGONLY( if( ret_code != 0 ) {
-        UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+             UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-            "Failed to send response: err code = %d\n",
+                         "Failed to send response: err code = %d\n",
-            ret_code );
+                         ret_code );}
-    }
+     )
 
-    err_code = 0;
+        err_code = 0;
 
-error_handler:
+  error_handler:
     ixmlFreeDOMString( xml_response );
     membuffer_destroy( &headers );
     if( err_code != 0 ) {
@@ -769,7 +768,7 @@ error_handler:
 *		returns 0 if successful else returns -1.
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 get_var_name( IN IXML_Document * TempDoc,
               OUT char *VarName )
 {
@@ -779,7 +778,7 @@ get_var_name( IN IXML_Document * TempDoc,
     IXML_Node *VarNameNode = NULL;
     IXML_Node *VarNode = NULL;
     const DOMString StNodeName = NULL;
-    const DOMString Temp = NULL;
+    DOMString Temp = NULL;
     int ret_val = -1;
 
     // Got the Envelop node here
@@ -813,13 +812,14 @@ get_var_name( IN IXML_Document * TempDoc,
     Temp = ixmlNode_getNodeValue( VarNode );
     linecopy( VarName, Temp );
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-        "Received query for variable  name %s\n",
+                         "Received query for variable  name %s\n",
-        VarName );
+                         VarName );
+         )
 
-    ret_val = 0;            // success
+        ret_val = 0;            // success
 
-error_handler:
+  error_handler:
     return ret_val;
 }
 
@@ -840,7 +840,7 @@ error_handler:
 *
 *	Note :
 ****************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 handle_query_variable( IN SOCKINFO * info,
                        IN http_message_t * request,
                        IN IXML_Document * xml_doc )
@@ -876,8 +876,8 @@ handle_query_variable( IN SOCKINFO * info,
     // send event
     soap_event_callback( UPNP_CONTROL_GET_VAR_REQUEST, &variable, cookie );
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-        "Return from callback for var request\n" );
+                         "Return from callback for var request\n" ) );
 
     // validate, and handle result
     if( variable.CurrentVal == NULL ) {
@@ -966,8 +966,8 @@ handle_invoke_action( IN SOCKINFO * info,
     action.ErrCode = UPNP_E_SUCCESS;
     action.CtrlPtIPAddr = info->foreign_ip_addr;
 
-    UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SOAP, __FILE__, __LINE__,
-                         "Calling Callback\n" );
+                         "Calling Callback\n" ) );
 
     soap_event_callback( UPNP_CONTROL_ACTION_REQUEST, &action, cookie );
 

upnp/src/ssdp/ssdp_ctrlpt.c

@@ -125,16 +125,16 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
 
     // we are assuming that there can be only one client supported at a time
 
-    HandleReadLock();
+    HandleLock(  );
 
     if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
     // copy
     ctrlpt_callback = ctrlpt_info->Callback;
     ctrlpt_cookie = ctrlpt_info->Cookie;
-    HandleUnlock();
+    HandleUnlock(  );
 
     // search timeout
     if( timeout ) {
@@ -159,7 +159,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
     }
 
     // dest addr
-    memcpy(&param.DestAddr, dest_addr, sizeof(struct sockaddr_in) );
+    param.DestAddr = dest_addr;
 
     // EXT
     param.Ext[0] = '\0';
@@ -267,22 +267,22 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
             strlen( param.Location ) == 0 || !usn_found || !st_found ) {
             return;             // bad reply
         }
-        // check each current search
+        //check each current search
-        HandleLock();
+        HandleLock(  );
         if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
-            HandleUnlock();
+            HandleUnlock(  );
             return;
         }
         node = ListHead( &ctrlpt_info->SsdpSearchList );
 
-        // temporary add null termination
+        //temporary add null termination
         //save_char = hdr_value.buf[ hdr_value.length ];
         //hdr_value.buf[ hdr_value.length ] = '\0';
 
         while( node != NULL ) {
             searchArg = node->item;
             matched = 0;
-            // check for match of ST header and search target
+            //check for match of ST header and search target
             switch ( searchArg->requestType ) {
                 case SSDP_ALL:
                     {
@@ -327,7 +327,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
             }
 
             if( matched ) {
-                // schedule call back
+                //schedule call back
                 threadData =
                     ( ResultData * ) malloc( sizeof( ResultData ) );
                 if( threadData != NULL ) {
@@ -344,7 +344,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
             node = ListNext( &ctrlpt_info->SsdpSearchList, node );
         }
 
-        HandleUnlock();
+        HandleUnlock(  );
         //ctrlpt_callback( UPNP_DISCOVERY_SEARCH_RESULT, &param, cookie );
     }
 }
@@ -353,11 +353,11 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
 * Function : process_reply											
 *																	
 * Parameters:														
-*	IN char* request_buf: the response came from the device
+*		IN char* request_buf: the response came from the device
-*	IN int buf_len: The length of the response buffer
+*		IN int buf_len: The length of the response buffer
-*	IN struct sockaddr_in* dest_addr: The address of the device
+*	    IN struct sockaddr_in* dest_addr: The address of the device
-*	IN void *cookie : cookie passed by the control point application
+*		IN void *cookie : cookie passed by the control point application
-*		at the time of sending search message
+*							at the time of sending search message
 *
 * Description:														
 *	This function processes reply recevied from a search
@@ -365,9 +365,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
 * Returns: void
 *
 ***************************************************************************/
-#warning There are currently no uses of the function 'process_reply()' in the code.
+static XINLINE void
-#warning 'process_reply()' is a candidate for removal.
-static UPNP_INLINE void
 process_reply( IN char *request_buf,
                IN int buf_len,
                IN struct sockaddr_in *dest_addr,
@@ -393,14 +391,14 @@ process_reply( IN char *request_buf,
 * Function : CreateClientRequestPacket											
 *																	
 * Parameters:														
-*	IN char * RqstBuf:Output string in HTTP format.
+*		IN char * RqstBuf:Output string in HTTP format.
-*	IN char *SearchTarget:Search Target
+*		IN char *SearchTarget:Search Target
-*	IN int Mx dest_addr: Number of seconds to wait to 
+*	    IN int Mx dest_addr: Number of seconds to wait to 
-*		collect all the responses
+*							collect all the responses
 *
 * Description:														
 *	This function creates a HTTP search request packet 
-* 	depending on the input parameter.
+* depending on the input parameter.
 *
 * Returns: void
 *
@@ -458,13 +456,13 @@ searchExpired( void *arg )
     void *cookie = NULL;
     int found = 0;
 
-    HandleLock();
+    HandleLock(  );
 
     //remove search target from search list
 
     if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
         free( id );
-        HandleUnlock();
+        HandleUnlock(  );
         return;
     }
 
@@ -485,7 +483,7 @@ searchExpired( void *arg )
         }
         node = ListNext( &ctrlpt_info->SsdpSearchList, node );
     }
-    HandleUnlock();
+    HandleUnlock(  );
 
     if( found ) {
         ctrlpt_callback( UPNP_DISCOVERY_SEARCH_TIMEOUT, NULL, cookie );
@@ -538,9 +536,11 @@ SearchByTarget( IN int Mx,
     if( ReqBuf == NULL )
         return UPNP_E_OUTOF_MEMORY;
 
-    UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__, ">>> SSDP SEND >>>\n");
+    DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                         ">>> SSDP SEND >>>\n%s\n", ReqBuf );
+         )
 
-    timeTillRead = Mx;
+        timeTillRead = Mx;
 
     if( timeTillRead < MIN_SEARCH_TIME ) {
         timeTillRead = MIN_SEARCH_TIME;
@@ -559,9 +559,9 @@ SearchByTarget( IN int Mx,
     FD_SET( gSsdpReqSocket, &wrSet );
 
     //add search criteria to list
-    HandleLock();
+    HandleLock(  );
     if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
-        HandleUnlock();
+        HandleUnlock(  );
         free( ReqBuf );
         return UPNP_E_INTERNAL_ERROR;
     }
@@ -582,30 +582,33 @@ SearchByTarget( IN int Mx,
     newArg->timeoutEventId = ( *id );
 
     ListAddTail( &ctrlpt_info->SsdpSearchList, newArg );
-    HandleUnlock();
+    HandleUnlock(  );
 
     setsockopt( gSsdpReqSocket, IPPROTO_IP, IP_MULTICAST_IF,
                 ( char * )&addr, sizeof( addr ) );
 
     if( select( gSsdpReqSocket + 1, NULL, &wrSet, NULL, NULL )
         == UPNP_SOCKETERROR ) {
-        if( errno == EBADF ) {
+        DBGONLY( if( errno == EBADF ) {
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                "SSDP_LIB :RequestHandler:An invalid file descriptor"
+                             "SSDP_LIB :RequestHandler:An invalid file descriptor"
-                " was givenin one of the sets. \n" );
+                             " was givenin one of the sets. \n" );}
-        } else if( errno == EINTR ) {
+                 else
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                 if( errno == EINTR ) {
-                "SSDP_LIB :RequestHandler:  A non blocked "
+                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                "signal was caught.    \n" );
+                             "SSDP_LIB :RequestHandler:  A non blocked "
-        } else if( errno == EINVAL ) {
+                             "signal was caught.    \n" );}
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                 else
-                "SSDP_LIB :RequestHandler: n is negative.  \n" );
+                 if( errno == EINVAL ) {
-        } else if( errno == ENOMEM ) {
+                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+                             "SSDP_LIB :RequestHandler: n is negative.  \n" );}
-                "SSDP_LIB : RequestHandler:select was unable to "
+                 else
-                "allocate memory for internal tables.\n" );
+                 if( errno == ENOMEM ) {
-        }
+                 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-	shutdown( gSsdpReqSocket, SD_BOTH );
+                             "SSDP_LIB : RequestHandler:select was unable to "
+                             "allocate memory for internal tables.\n" );}
+ )
+shutdown( gSsdpReqSocket, SD_BOTH );
         UpnpCloseSocket( gSsdpReqSocket );
         free( ReqBuf );
         return UPNP_E_INTERNAL_ERROR;

upnp/src/ssdp/ssdp_device.c

@@ -43,19 +43,19 @@
 #include "unixutil.h"
 
 #ifdef WIN32
-	#include <ws2tcpip.h>
+ #include <ws2tcpip.h>
-	#include <winsock2.h>
+ #include <winsock2.h>
 #endif
 
-#define MSGTYPE_SHUTDOWN	0
+#define MSGTYPE_SHUTDOWN		0
 #define MSGTYPE_ADVERTISEMENT	1
-#define MSGTYPE_REPLY		2
+#define MSGTYPE_REPLY			2
 
 /************************************************************************
 * Function : advertiseAndReplyThread									
 *																	
 * Parameters:														
-*	IN void *data: Structure containing the search request
+*		IN void *data: Structure containing the search request
 *
 * Description:														
 *	This function is a wrapper function to reply the search request 
@@ -84,8 +84,8 @@ advertiseAndReplyThread( IN void *data )
 * Function : ssdp_handle_device_request									
 *																	
 * Parameters:														
-*	IN http_message_t* hmsg: SSDP search request from the control point
+*		IN http_message_t* hmsg: SSDP search request from the control point
-*	IN struct sockaddr_in* dest_addr: The address info of control point
+*		IN struct sockaddr_in* dest_addr: The address info of control point
 *
 * Description:														
 *	This function handles the search request. It do the sanity checks of
@@ -95,7 +95,6 @@ advertiseAndReplyThread( IN void *data )
 * Returns: void *
 *	1 if successful else appropriate error
 ***************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
 void
 ssdp_handle_device_request( IN http_message_t * hmsg,
                             IN struct sockaddr_in *dest_addr )
@@ -136,30 +135,30 @@ ssdp_handle_device_request( IN http_message_t * hmsg,
         return;                 // bad ST header
     }
 
-    HandleLock();
+    HandleLock(  );
     // device info
     if( GetDeviceHandleInfo( &handle, &dev_info ) != HND_DEVICE ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return;                 // no info found
     }
     maxAge = dev_info->MaxAge;
-    HandleUnlock();
+    HandleUnlock(  );
 
-    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-        "ssdp_handle_device_request with Cmd %d SEARCH\n",
+                         "ssdp_handle_device_request with Cmd %d SEARCH\n",
-        event.Cmd );
+                         event.Cmd );
-    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-        "MAX-AGE     =  %d\n", maxAge );
+                         "MAX-AGE     =  %d\n", maxAge );
-    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-        "MX     =  %d\n", event.Mx );
+                         "MX     =  %d\n", event.Mx );
-    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-        "DeviceType   =  %s\n", event.DeviceType );
+                         "DeviceType   =  %s\n", event.DeviceType );
-    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-        "DeviceUuid   =  %s\n", event.UDN );
+                         "DeviceUuid   =  %s\n", event.UDN );
-    UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
+             UpnpPrintf( UPNP_PACKET, API, __FILE__, __LINE__,
-        "ServiceType =  %s\n", event.ServiceType );
+                         "ServiceType =  %s\n", event.ServiceType ); )
 
-    threadArg =
+        threadArg =
         ( SsdpSearchReply * ) malloc( sizeof( SsdpSearchReply ) );
 
     if( threadArg == NULL ) {
@@ -186,12 +185,11 @@ ssdp_handle_device_request( IN http_message_t * hmsg,
         mx = 1;
     }
 
-    replyTime = rand() % mx;
+    replyTime = rand(  ) % mx;
 
     TimerThreadSchedule( &gTimerThread, replyTime, REL_SEC, &job,
                          SHORT_TERM, NULL );
 }
-#endif
 
 /************************************************************************
 * Function : NewRequestHandler									
@@ -222,9 +220,9 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
 
     ReplySock = socket( AF_INET, SOCK_DGRAM, 0 );
     if( ReplySock == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-            "SSDP_LIB: New Request Handler:"
+                             "SSDP_LIB: New Request Handler:"
-            "Error in socket operation !!!\n" );
+                             "Error in socket operation !!!\n" ) );
 
         return UPNP_E_OUTOF_SOCKET;
     }
@@ -236,25 +234,16 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
 
     for( Index = 0; Index < NumPacket; Index++ ) {
         int rc;
-        // The reason to keep this loop is purely historical/documentation,
+
-        // according to section 9.2 of HTTPU spec:
-        // 
-        // "If a multicast resource would send a response(s) to any copy of the 
-        //  request, it SHOULD send its response(s) to each copy of the request 
-        //  it receives. It MUST NOT repeat its response(s) per copy of the 
-        //  request."
-        //  
-        // http://www.upnp.org/download/draft-goland-http-udp-04.txt
-        //
-        // So, NUM_COPY has been changed from 2 to 1.
         NumCopy = 0;
         while( NumCopy < NUM_COPY ) {
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                ">>> SSDP SEND >>>\n%s\n",
+                                 ">>> SSDP SEND >>>\n%s\n",
-                *( RqPacket + Index ) );
+                                 *( RqPacket + Index ) );
-            rc = sendto( ReplySock, *( RqPacket + Index ),
+                 )
-                         strlen( *( RqPacket + Index ) ),
+                rc = sendto( ReplySock, *( RqPacket + Index ),
-                         0, ( struct sockaddr * )DestAddr, socklen );
+                             strlen( *( RqPacket + Index ) ),
+                             0, ( struct sockaddr * )DestAddr, socklen );
             imillisleep( SSDP_PAUSE );
             ++NumCopy;
         }
@@ -270,7 +259,7 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
 *																	
 * Parameters:														
 *	IN int msg_type : type of the message ( Search Reply, Advertisement 
-*		or Shutdown )
+*												or Shutdown )
 *	IN char * nt : ssdp type
 *	IN char * usn : unique service name ( go in the HTTP Header)
 *	IN char * location :Location URL.
@@ -280,7 +269,7 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
 * Description:														
 *	This function creates a HTTP request packet.  Depending 
 *	on the input parameter it either creates a service advertisement
-*	request or service shutdown request etc.
+*   request or service shutdown request etc.
 *
 * Returns: void
 *	
@@ -306,16 +295,16 @@ CreateServicePacket( IN int msg_type,
     *packet = NULL;
 
     if( msg_type == MSGTYPE_REPLY ) {
-        ret_code = http_MakeMessage(
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
-            &buf, 1, 1,
+        ret_code = http_MakeMessage( &buf, 1, 1,
-            "R" "sdc" "D" "sc" "ssc" "S" "Xc" "ssc" "sscc",
+                                     "R" "sdc" "D" "s" "ssc" "S" "Xc" "ssc"
-            HTTP_OK,
+                                     "ssc" "c", HTTP_OK,
-            "CACHE-CONTROL: max-age=", duration,
+                                     "CACHE-CONTROL: max-age=", duration,
-	    "EXT:",
+                                     "EXT:\r\n", "LOCATION: ", location,
-            "LOCATION: ", location,
+                                     X_USER_AGENT,
-            X_USER_AGENT,
+                                     "ST: ", nt, "USN: ", usn );
-            "ST: ", nt,
+/* -- PATCH END - */
-            "USN: ", usn);
+        
         if( ret_code != 0 ) {
             return;
         }
@@ -331,17 +320,15 @@ CreateServicePacket( IN int msg_type,
         // NOTE: The CACHE-CONTROL and LOCATION headers are not present in
         //  a shutdown msg, but are present here for MS WinMe interop.
         
-        ret_code = http_MakeMessage(
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
-            &buf, 1, 1,
+        ret_code = http_MakeMessage( &buf, 1, 1,
-            "Q" "sssdc" "sdc" "ssc" "ssc" "ssc" "S" "Xc" "sscc",
+                                     "Q" "sssdc" "sdc" "ssc" "ssc" "ssc"
-            HTTPMETHOD_NOTIFY, "*",
+                                     "S" "Xc" "ssc" "c", HTTPMETHOD_NOTIFY, "*",
-            1, "HOST: ", SSDP_IP, ":", SSDP_PORT,
+                                     1, "HOST: ", SSDP_IP, ":", SSDP_PORT,
-            "CACHE-CONTROL: max-age=", duration,
+                                     "CACHE-CONTROL: max-age=", duration,
-            "LOCATION: ", location,
+                                     "LOCATION: ", location, "NT: ", nt,
-            "NT: ", nt,
+                                     "NTS: ", nts, X_USER_AGENT, "USN: ", usn );
-            "NTS: ", nts,
+/* -- PATCH END - */        
-            X_USER_AGENT,
-            "USN: ", usn );
         if( ret_code != 0 ) {
             return;
         }
@@ -389,10 +376,11 @@ DeviceAdvertisement( IN char *DevType,
     char *msgs[3];
     int ret_code;
 
-    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-        "In function SendDeviceAdvertisemenrt\n" );
+                         "In function SendDeviceAdvertisemenrt\n" );
+         )
 
-    DestAddr.sin_family = AF_INET;
+        DestAddr.sin_family = AF_INET;
     DestAddr.sin_addr.s_addr = inet_addr( SSDP_IP );
     DestAddr.sin_port = htons( SSDP_PORT );
 
@@ -530,6 +518,7 @@ SendReply( IN struct sockaddr_in *DestAddr,
 *	IN char * Udn: Device UDN
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Life time of this device.
+
 * Description:														
 *	This function creates the reply packet based on the input parameter, 
 *	and send it to the client address given in its input parameter DestAddr.
@@ -606,9 +595,11 @@ DeviceReply( IN struct sockaddr_in *DestAddr,
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Life time of this device.
+
 * Description:														
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
+
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
@@ -653,9 +644,11 @@ ServiceAdvertisement( IN char *Udn,
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Life time of this device.
+
 * Description:														
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
+
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
@@ -695,6 +688,7 @@ ServiceReply( IN struct sockaddr_in *DestAddr,
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Service duration in sec.
+
 * Description:														
 *	This function creates a HTTP service shutdown request packet 
 *	and sent it to the multicast channel through RequestHandler.
@@ -777,11 +771,11 @@ DeviceShutdown( IN char *DevType,
                              Mil_Usn, Location, Duration, &msgs[0] );
     }
 
-    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-        "In function DeviceShutdown\n" );
+                         "In function DeviceShutdown\n" ); )
-    // both root and sub-devices need to send these two messages
+        // both root and sub-devices need to send these two messages
-    CreateServicePacket( MSGTYPE_SHUTDOWN, Udn, Udn,
+        CreateServicePacket( MSGTYPE_SHUTDOWN, Udn, Udn,
-                         Location, Duration, &msgs[1] );
+                             Location, Duration, &msgs[1] );
 
     sprintf( Mil_Usn, "%s::%s", Udn, DevType );
     CreateServicePacket( MSGTYPE_SHUTDOWN, DevType, Mil_Usn,
@@ -815,4 +809,3 @@ DeviceShutdown( IN char *DevType,
 
 #endif // EXCLUDE_SSDP
 #endif // INCLUDE_DEVICE_APIS
-

upnp/src/ssdp/ssdp_server.c

@@ -75,10 +75,8 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
 * Function : AdvertiseAndReply									
 *																	
 * Parameters:														
-*	IN int AdFlag:
+*	IN int AdFlag: -1 = Send shutdown, 0 = send reply, 
-*		-1 = Send shutdown,
+*					1 = Send Advertisement
-*		 0 = send reply, 
-*		 1 = Send Advertisement
 *	IN UpnpDevice_Handle Hnd: Device handle
 *	IN enum SsdpSearchType SearchType:Search type for sending replies
 *	IN struct sockaddr_in *DestAddr:Destination address
@@ -93,14 +91,14 @@ CLIENTONLY( SOCKET gSsdpReqSocket = 0;
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
 ***************************************************************************/
-int AdvertiseAndReply( IN int AdFlag,
+     int AdvertiseAndReply( IN int AdFlag,
-                       IN UpnpDevice_Handle Hnd,
+                            IN UpnpDevice_Handle Hnd,
-                       IN enum SsdpSearchType SearchType,
+                            IN enum SsdpSearchType SearchType,
-                       IN struct sockaddr_in *DestAddr,
+                            IN struct sockaddr_in *DestAddr,
-                       IN char *DeviceType,
+                            IN char *DeviceType,
-                       IN char *DeviceUDN,
+                            IN char *DeviceUDN,
-                       IN char *ServiceType,
+                            IN char *ServiceType,
-                       int Exp )
+                            int Exp )
 {
     int i,
       j;
@@ -114,21 +112,24 @@ int AdvertiseAndReply( IN int AdFlag,
     IXML_Node *tmpNode = NULL;
     IXML_Node *tmpNode2 = NULL;
     IXML_Node *textNode = NULL;
-    const DOMString tmpStr;
+    DOMString tmpStr;
     char SERVER[200];
 
-    const DOMString dbgStr;
+    DBGONLY( const DOMString dbgStr;
-    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+             UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-        "Inside AdvertiseAndReply with AdFlag = %d\n",
+                         "Inside AdvertiseAndReply with AdFlag = %d\n",
-        AdFlag );
+                         AdFlag ); )
 
-    // Use a read lock
+        HandleLock(  );
-    HandleReadLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_DEVICE ) {
-        HandleUnlock();
+        HandleUnlock(  );
         return UPNP_E_INVALID_HANDLE;
     }
     defaultExp = SInfo->MaxAge;
+
+    //Modifed to prevent more than one thread from accessing the 
+    //UpnpDocument stored with the handle at the same time
+    // HandleUnlock();
     nodeList = NULL;
 
     //get server info
@@ -138,35 +139,43 @@ int AdvertiseAndReply( IN int AdFlag,
     // parse the device list and send advertisements/replies 
     for( i = 0;; i++ ) {
 
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "Entering new device list with i = %d\n\n", i );
+                             "Entering new device list with i = %d\n\n",
+                             i );
+             )
 
-        tmpNode = ixmlNodeList_item( SInfo->DeviceList, i );
+            tmpNode = ixmlNodeList_item( SInfo->DeviceList, i );
         if( tmpNode == NULL ) {
-            UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                "Exiting new device list with i = %d\n\n", i );
+                                 "Exiting new device list with i = %d\n\n",
-            break;
+                                 i );
+                 )
+                break;
         }
 
-        dbgStr = ixmlNode_getNodeName( tmpNode );
+        DBGONLY( dbgStr = ixmlNode_getNodeName( tmpNode );
-        UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                 UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-            "Extracting device type once for %s\n", dbgStr );
+                             "Extracting device type once for %s\n",
-        // extract device type 
+                             dbgStr ); )
-        ixmlNodeList_free( nodeList );
+            // extract device type 
+            ixmlNodeList_free( nodeList );
         nodeList = NULL;
-        nodeList = ixmlElement_getElementsByTagName(
+        nodeList =
-            ( IXML_Element * ) tmpNode, "deviceType" );
+            ixmlElement_getElementsByTagName( ( IXML_Element * ) tmpNode,
+                                              "deviceType" );
         if( nodeList == NULL ) {
             continue;
         }
 
-        dbgStr = ixmlNode_getNodeName( tmpNode );
+        DBGONLY( dbgStr = ixmlNode_getNodeName( tmpNode );
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "Extracting UDN for %s\n", dbgStr );
+                             "Extracting UDN for %s\n", dbgStr ); )
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "Extracting device type\n" );
 
-        tmpNode2 = ixmlNodeList_item( nodeList, 0 );
+            DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                                 "Extracting device type\n" );
+             )
+
+            tmpNode2 = ixmlNodeList_item( nodeList, 0 );
         if( tmpNode2 == NULL ) {
             continue;
         }
@@ -175,10 +184,11 @@ int AdvertiseAndReply( IN int AdFlag,
             continue;
         }
 
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "Extracting device type \n" );
+                             "Extracting device type \n" );
+             )
 
-        tmpStr = ixmlNode_getNodeValue( textNode );
+            tmpStr = ixmlNode_getNodeValue( textNode );
         if( tmpStr == NULL ) {
             continue;
         }
@@ -188,41 +198,47 @@ int AdvertiseAndReply( IN int AdFlag,
             continue;
         }
 
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "Extracting device type = %s\n", devType );
+                             "Extracting device type = %s\n", devType );
-        if( tmpNode == NULL ) {
+                 if( tmpNode == NULL ) {
-            UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                "TempNode is NULL\n" );
+                             "TempNode is NULL\n" );}
-	}
+                 dbgStr = ixmlNode_getNodeName( tmpNode );
-        dbgStr = ixmlNode_getNodeName( tmpNode );
+                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                             "Extracting UDN for %s\n", dbgStr ); )
-            "Extracting UDN for %s\n", dbgStr );
+            // extract UDN 
-        // extract UDN 
+            ixmlNodeList_free( nodeList );
-        ixmlNodeList_free( nodeList );
         nodeList = NULL;
         nodeList = ixmlElement_getElementsByTagName( ( IXML_Element * )
                                                      tmpNode, "UDN" );
         if( nodeList == NULL ) {
-            UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
+
-                __LINE__, "UDN not found!!!\n" );
+            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
+                                 __LINE__, "UDN not found!!!\n" );
+                 )
                 continue;
         }
         tmpNode2 = ixmlNodeList_item( nodeList, 0 );
         if( tmpNode2 == NULL ) {
-            UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
+
-                __LINE__, "UDN not found!!!\n" );
+            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
-            continue;
+                                 __LINE__, "UDN not found!!!\n" );
+                 )
+                continue;
         }
         textNode = ixmlNode_getFirstChild( tmpNode2 );
         if( textNode == NULL ) {
-            UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
+
-                __LINE__, "UDN not found!!!\n" );
+            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__,
-            continue;
+                                 __LINE__, "UDN not found!!!\n" );
+                 )
+                continue;
         }
         tmpStr = ixmlNode_getNodeValue( textNode );
         if( tmpStr == NULL ) {
-            UpnpPrintf( UPNP_CRITICAL, API, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf( UPNP_CRITICAL, API, __FILE__, __LINE__,
-                "UDN not found!!!!\n" );
+                                 "UDN not found!!!!\n" );
+                 )
                 continue;
         }
         strcpy( UDNstr, tmpStr );
@@ -230,14 +246,16 @@ int AdvertiseAndReply( IN int AdFlag,
             continue;
         }
 
-        UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-            "Sending UDNStr = %s \n", UDNstr );
+                             "Sending UDNStr = %s \n", UDNstr );
-        if( AdFlag ) {
+             )
+            if( AdFlag ) {
             // send the device advertisement 
             if( AdFlag == 1 ) {
                 DeviceAdvertisement( devType, i == 0,
                                      UDNstr, SInfo->DescURL, Exp );
-            } else {             // AdFlag == -1
+            } else              // AdFlag == -1
+            {
                 DeviceShutdown( devType, i == 0, UDNstr,
                                 SERVER, SInfo->DescURL, Exp );
             }
@@ -260,16 +278,22 @@ int AdvertiseAndReply( IN int AdFlag,
                     {
                         if( DeviceUDN != NULL && strlen( DeviceUDN ) != 0 ) {
                             if( strcasecmp( DeviceUDN, UDNstr ) ) {
-                                UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                                DBGONLY( UpnpPrintf
-                                    "DeviceUDN=%s and search "
+                                         ( UPNP_INFO, API, __FILE__,
-                                    "UDN=%s did not match\n",
+                                           __LINE__,
-                                    UDNstr, DeviceUDN );
+                                           "DeviceUDN=%s and search "
+                                           "UDN=%s did not match\n",
+                                           UDNstr, DeviceUDN );
+                                     )
                                     break;
                             } else {
-                                UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                                DBGONLY( UpnpPrintf
-                                    "DeviceUDN=%s and search "
+                                         ( UPNP_INFO, API, __FILE__,
-                                    "UDN=%s MATCH\n", UDNstr,
+                                           __LINE__,
-                                    DeviceUDN );
+                                           "DeviceUDN=%s and search "
+                                           "UDN=%s MATCH\n", UDNstr,
+                                           DeviceUDN );
+                                     )
                                     SendReply( DestAddr, devType, 0,
                                                UDNstr, SInfo->DescURL,
                                                defaultExp, 0 );
@@ -282,18 +306,25 @@ int AdvertiseAndReply( IN int AdFlag,
                         if( !strncasecmp
                             ( DeviceType, devType,
                               strlen( DeviceType ) ) ) {
-                            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                            DBGONLY( UpnpPrintf
-                                "DeviceType=%s and search devType=%s MATCH\n",
+                                     ( UPNP_INFO, API, __FILE__, __LINE__,
-                                devType, DeviceType );
+                                       "DeviceType=%s and search devType=%s MATCH\n",
-                            SendReply( DestAddr, devType, 0, UDNstr,
+                                       devType, DeviceType );
-                                       SInfo->DescURL, defaultExp, 1 );
+                                 )
-                        } else {
+                                SendReply( DestAddr, devType, 0, UDNstr,
-                            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                                           SInfo->DescURL, defaultExp, 1 );
-                                "DeviceType=%s and search devType=%s"
+                        }
-                                " DID NOT MATCH\n",
+
-                                devType, DeviceType );
+                        DBGONLY(
-			}
+                                    else
-                        break;
+                                    UpnpPrintf( UPNP_INFO, API, __FILE__,
+                                                __LINE__,
+                                                "DeviceType=%s and search devType=%s"
+                                                " DID NOT MATCH\n",
+                                                devType, DeviceType );
+                             )
+
+                            break;
                     }
                 default:
                     break;
@@ -301,10 +332,11 @@ int AdvertiseAndReply( IN int AdFlag,
         }
         // send service advertisements for services corresponding 
         // to the same device 
-        UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-            "Sending service Advertisement\n" );
+                             "Sending service Advertisement\n" );
+             )
 
-        tmpNode = ixmlNodeList_item( SInfo->ServiceList, i );
+            tmpNode = ixmlNodeList_item( SInfo->ServiceList, i );
         if( tmpNode == NULL ) {
             continue;
         }
@@ -313,24 +345,28 @@ int AdvertiseAndReply( IN int AdFlag,
         nodeList = ixmlElement_getElementsByTagName( ( IXML_Element * )
                                                      tmpNode, "service" );
         if( nodeList == NULL ) {
-            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                "Service not found 3\n" );
+                                 "Service not found 3\n" );
-            continue;
+                 )
+                continue;
         }
         for( j = 0;; j++ ) {
             tmpNode = ixmlNodeList_item( nodeList, j );
-            if( tmpNode == NULL ) {
+            if( tmpNode == NULL )
                 break;
-            }
 
             ixmlNodeList_free( tmpNodeList );
             tmpNodeList = NULL;
-            tmpNodeList = ixmlElement_getElementsByTagName(
+            tmpNodeList = ixmlElement_getElementsByTagName( ( IXML_Element
-                ( IXML_Element *)tmpNode, "serviceType" );
+                                                              * ) tmpNode,
+                                                            "serviceType" );
+
             if( tmpNodeList == NULL ) {
-                UpnpPrintf( UPNP_CRITICAL, API, __FILE__, __LINE__,
+                DBGONLY( UpnpPrintf
-                    "ServiceType not found \n" );
+                         ( UPNP_CRITICAL, API, __FILE__, __LINE__,
-                continue;
+                           "ServiceType not found \n" );
+                     )
+                    continue;
             }
             tmpNode2 = ixmlNodeList_item( tmpNodeList, 0 );
             if( tmpNode2 == NULL ) {
@@ -350,34 +386,42 @@ int AdvertiseAndReply( IN int AdFlag,
                 continue;
             }
 
-            UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-                "ServiceType = %s\n", servType );
+                                 "ServiceType = %s\n", servType );
-            if( AdFlag ) {
+                 )
+                if( AdFlag ) {
                 if( AdFlag == 1 ) {
                     ServiceAdvertisement( UDNstr, servType,
                                           SInfo->DescURL, Exp );
-                } else {         // AdFlag == -1
+                } else          // AdFlag == -1
+                {
                     ServiceShutdown( UDNstr, servType,
                                      SInfo->DescURL, Exp );
                 }
+
             } else {
                 switch ( SearchType ) {
                     case SSDP_ALL:
-                        ServiceReply( DestAddr, servType,
+                        {
-                                      UDNstr, SInfo->DescURL,
+                            ServiceReply( DestAddr, servType,
-                                      defaultExp );
+                                          UDNstr, SInfo->DescURL,
-                        break;
+                                          defaultExp );
-                    case SSDP_SERVICE:
+                            break;
-                        if( ServiceType != NULL ) {
+                        }
-                            if( !strncasecmp( ServiceType,
+                    case SSDP_SERVICE:
-                                              servType,
+                        {
-                                              strlen( ServiceType ) ) ) {
+                            if( ServiceType != NULL ) {
-                                ServiceReply( DestAddr, servType,
+                                if( !strncasecmp( ServiceType,
-                                              UDNstr, SInfo->DescURL,
+                                                  servType,
-                                              defaultExp );
+                                                  strlen( ServiceType ) ) )
-                            }
+                                {
+                                    ServiceReply( DestAddr, servType,
+                                                  UDNstr, SInfo->DescURL,
+                                                  defaultExp );
+                                }
+                            }
+                            break;
                         }
-                        break;
                     default:
                         break;
                 }               // switch(SearchType)               
@@ -389,10 +433,11 @@ int AdvertiseAndReply( IN int AdFlag,
         ixmlNodeList_free( nodeList );
         nodeList = NULL;
     }
-    UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-        "Exiting AdvertiseAndReply : \n" );
+                         "Exiting AdvertiseAndReply : \n" );
+         )
 
-    HandleUnlock();
+        HandleUnlock(  );
 
     return UPNP_E_SUCCESS;
 
@@ -436,7 +481,7 @@ Make_Socket_NoBlocking( int sock )
 * Parameters:														
 *	IN char *cmd: Service Name string 
 *	OUT SsdpEvent *Evt: The SSDP event structure partially filled 
-*		by all the function.
+*						by all the function.
 *
 * Description:														
 *	This function fills the fields of the event structure like DeviceType,
@@ -632,7 +677,7 @@ free_ssdp_event_handler_data( void *the_data )
 * Returns: xboolean
 *	returns TRUE if msg is valid else FALSE
 ***************************************************************************/
-static UPNP_INLINE xboolean
+static XINLINE xboolean
 valid_ssdp_msg( IN http_message_t * hmsg )
 {
     memptr hdr_value;
@@ -674,7 +719,7 @@ valid_ssdp_msg( IN http_message_t * hmsg )
 * Returns: int
 *	0 if successful -1 if error
 ***************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 start_event_handler( void *Data )
 {
 
@@ -688,18 +733,20 @@ start_event_handler( void *Data )
     if( status == PARSE_FAILURE ) {
         if( parser->msg.method != HTTPMETHOD_NOTIFY ||
             !parser->valid_ssdp_notify_hack ) {
-            UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-                "SSDP recvd bad msg code = %d\n",
+                                 "SSDP recvd bad msg code = %d\n",
-                status );
+                                 status );
-            // ignore bad msg, or not enuf mem
+                 )
-            goto error_handler;
+                // ignore bad msg, or not enuf mem
+                goto error_handler;
         }
         // valid notify msg
     } else if( status != PARSE_SUCCESS ) {
-        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-            "SSDP recvd bad msg code = %d\n", status );
+                             "SSDP recvd bad msg code = %d\n", status );
+             )
 
-        goto error_handler;
+            goto error_handler;
     }
     // check msg
     if( !valid_ssdp_msg( &parser->msg ) ) {
@@ -737,10 +784,14 @@ ssdp_event_handler_thread( void *the_data )
     // send msg to device or ctrlpt
     if( ( hmsg->method == HTTPMETHOD_NOTIFY ) ||
         ( hmsg->request_method == HTTPMETHOD_MSEARCH ) ) {
+
         CLIENTONLY( ssdp_handle_ctrlpt_msg( hmsg, &data->dest_addr,
-                                            FALSE, NULL ););
+                                            FALSE, NULL );
+             );
     } else {
-        ssdp_handle_device_request( hmsg, &data->dest_addr );
+
+        DEVICEONLY( ssdp_handle_device_request( hmsg, &data->dest_addr );
+             );
     }
 
     // free data
@@ -810,22 +861,23 @@ readFromSSDPSocket( SOCKET socket )
                              ( struct sockaddr * )&clientAddr, &socklen );
 
     if( byteReceived > 0 ) {
+
         requestBuf[byteReceived] = '\0';
-        UpnpPrintf( UPNP_INFO, SSDP,
+        DBGONLY( UpnpPrintf( UPNP_INFO, SSDP,
-            __FILE__, __LINE__,
+                             __FILE__, __LINE__,
-            "Start of received response ----------------------------------------------------\n"
+                             "Received response !!!  "
-            "%s\n"
+                             "%s From host %s \n",
-            "End of received response ------------------------------------------------------\n"
+                             requestBuf,
-            "From host %s\n",
+                             inet_ntoa( clientAddr.sin_addr ) );
-            requestBuf,
+             )
-            inet_ntoa( clientAddr.sin_addr ) );
+
-        UpnpPrintf( UPNP_PACKET, SSDP, __FILE__, __LINE__,
+            DBGONLY( UpnpPrintf( UPNP_PACKET, SSDP,
-            "Start of received multicast packet --------------------------------------------\n"
+                                 __FILE__, __LINE__,
-            "%s\n"
+                                 "Received multicast packet:"
-            "End of received multicast packet ----------------------------------------------\n",
+                                 "\n %s\n", requestBuf );
-            requestBuf );
+             )
-        //add thread pool job to handle request
+            //add thread pool job to handle request
-        if( data != NULL ) {
+            if( data != NULL ) {
             data->parser.msg.msg.length += byteReceived;
             // null-terminate
             data->parser.msg.msg.buf[byteReceived] = 0;
@@ -839,6 +891,7 @@ readFromSSDPSocket( SOCKET socket )
                 free_ssdp_event_handler_data( data );
             }
         }
+
     } else {
         free_ssdp_event_handler_data( data );
     }
@@ -862,43 +915,46 @@ get_ssdp_sockets( MiniServerSockArray * out )
 {
     SOCKET ssdpSock;
 
-    CLIENTONLY( SOCKET ssdpReqSock; )
+    CLIENTONLY( SOCKET ssdpReqSock;
+         )
     int onOff = 1;
     u_char ttl = 4;
     struct ip_mreq ssdpMcastAddr;
     struct sockaddr_in ssdpAddr;
     int option = 1;
-    struct in_addr addr;
 
-CLIENTONLY(
+    CLIENTONLY( if( ( ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 ) )
-    if( ( ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) == UPNP_INVALID_SOCKET ) {
+                    == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
+                DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
+                                     SSDP, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
+                                     "Error in socket operation !!!\n" ); )
+                return UPNP_E_OUTOF_SOCKET;}
+                setsockopt( ssdpReqSock,
+                            IPPROTO_IP,
+                            IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
+                // just do it, regardless if fails or not.
+                Make_Socket_NoBlocking( ssdpReqSock ); gSsdpReqSocket = ssdpReqSock; )  //CLIENTONLY
+
+        if( ( ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 ) )
+            == UPNP_INVALID_SOCKET ) {
+            DBGONLY( UpnpPrintf( UPNP_CRITICAL,
+                                 SSDP, __FILE__, __LINE__,
+                                 "Error in socket operation !!!\n" );
+                 )
+                CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+            CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
             return UPNP_E_OUTOF_SOCKET;
-    }
+        }
-    setsockopt( ssdpReqSock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
-    // just do it, regardless if fails or not.
-    Make_Socket_NoBlocking( ssdpReqSock );
-    gSsdpReqSocket = ssdpReqSock; )
-// END CLIENTONLY
-
-    if( ( ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
-        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
-        return UPNP_E_OUTOF_SOCKET;
-    }
 
     onOff = 1;
     if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEADDR,
-            ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
+                    ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
-        UpnpPrintf( UPNP_CRITICAL,
+
-            SSDP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-            "Error in set reuse addr !!!\n" );
+                             SSDP, __FILE__, __LINE__,
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+                             "Error in set reuse addr !!!\n" );
+             )
+            CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
         CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         shutdown( ssdpSock, SD_BOTH );
         UpnpCloseSocket( ssdpSock );
@@ -907,11 +963,13 @@ CLIENTONLY(
     
     #ifdef __FreeBSD__
     if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
-            ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
+                    ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
-        UpnpPrintf( UPNP_CRITICAL,
+
-            SSDP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-            "Error in set reuse port !!!\n" );
+                             SSDP, __FILE__, __LINE__,
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+                             "Error in set reuse port !!!\n" );
+             )
+            CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
         CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         shutdown( ssdpSock, SD_BOTH );
         UpnpCloseSocket( ssdpSock );
@@ -924,11 +982,13 @@ CLIENTONLY(
     //  ssdpAddr.sin_addr.s_addr = inet_addr(LOCAL_HOST);
     ssdpAddr.sin_addr.s_addr = htonl( INADDR_ANY );
     ssdpAddr.sin_port = htons( SSDP_PORT );
-    if( bind( ssdpSock, ( struct sockaddr * )&ssdpAddr,
+    if( bind
-            sizeof( ssdpAddr ) ) != 0 ) {
+        ( ssdpSock, ( struct sockaddr * )&ssdpAddr,
-        UpnpPrintf( UPNP_CRITICAL,
+          sizeof( ssdpAddr ) ) != 0 ) {
-            SSDP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf
-            "Error in binding !!!\n" );
+                 ( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
+                   "Error in binding !!!\n" );
+             )
             shutdown( ssdpSock, SD_BOTH );
         UpnpCloseSocket( ssdpSock );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
@@ -937,49 +997,41 @@ CLIENTONLY(
     }
 
     memset( ( void * )&ssdpMcastAddr, 0, sizeof( struct ip_mreq ) );
-    ssdpMcastAddr.imr_interface.s_addr = inet_addr( LOCAL_HOST );
+    ssdpMcastAddr.imr_interface.s_addr = htonl( INADDR_ANY );
     ssdpMcastAddr.imr_multiaddr.s_addr = inet_addr( SSDP_IP );
     if( setsockopt( ssdpSock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-            ( char * )&ssdpMcastAddr, sizeof( struct ip_mreq ) ) != 0 ) {
+                    ( char * )&ssdpMcastAddr,
-        UpnpPrintf( UPNP_CRITICAL,
+                    sizeof( struct ip_mreq ) ) != 0 ) {
-            SSDP, __FILE__, __LINE__,
+        DBGONLY( UpnpPrintf
-            "Error in joining" " multicast group !!!\n" );
+                 ( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-        shutdown( ssdpSock, SD_BOTH );
+                   "Error in joining" " multicast group !!!\n" );
+             )
+            shutdown( ssdpSock, SD_BOTH );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
         UpnpCloseSocket( ssdpSock );
         CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         return UPNP_E_SOCKET_ERROR;
     }
-
-    /* Set multicast interface. */
-    memset( ( void * )&addr, 0, sizeof( struct in_addr ));
-    addr.s_addr = inet_addr(LOCAL_HOST);
-    if ( setsockopt(ssdpSock, IPPROTO_IP, IP_MULTICAST_IF,
-            (char *)&addr, sizeof addr) != 0) {
-        UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
-            "Couldn't set multicast interface.\n" );
-        /* This is probably not a critical error, so let's continue. */
-    }
-
     // result is not checked becuase it will fail in WinMe and Win9x.
     setsockopt( ssdpSock, IPPROTO_IP,
                 IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
     if( setsockopt( ssdpSock, SOL_SOCKET, SO_BROADCAST,
-            (char *)&option, sizeof(option) ) != 0) {
+                    ( char * )&option, sizeof( option ) ) != 0 ) {
-        UpnpPrintf( UPNP_CRITICAL,
+        DBGONLY( UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
+                             SSDP, __FILE__, __LINE__,
-            "Error in setting broadcast !!!\n" );
+                             "Error in setting broadcast !!!\n" );
-        shutdown( ssdpSock, SD_BOTH );
+             )
+            shutdown( ssdpSock, SD_BOTH );
         CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
         UpnpCloseSocket( ssdpSock );
         CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         return UPNP_E_NETWORK_ERROR;
     }
 
-    CLIENTONLY( out->ssdpReqSock = ssdpReqSock; );
+    CLIENTONLY( out->ssdpReqSock = ssdpReqSock;
+         );
     out->ssdpSock = ssdpSock;
     return UPNP_E_SUCCESS;
 }
 
 #endif // EXCLUDE_SSDP
-

upnp/src/urlconfig/urlconfig.c

@@ -32,7 +32,6 @@
 #include "config.h"
 #include <assert.h>
 #ifndef WIN32
- #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
@@ -63,7 +62,7 @@
 *
 *	Note :
 ************************************************************************/
-static UPNP_INLINE void
+static XINLINE void
 addrToString( IN const struct sockaddr_in *addr,
               OUT char ipaddr_port[] )
 {
@@ -88,7 +87,7 @@ addrToString( IN const struct sockaddr_in *addr,
 *
 *	Note : 'newAlias' should be freed using free()
 ************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 calc_alias( IN const char *alias,
             IN const char *rootPath,
             OUT char **newAlias )
@@ -149,7 +148,7 @@ calc_alias( IN const char *alias,
 *
 *	Note :
 ************************************************************************/
-static UPNP_INLINE int
+static XINLINE int
 calc_descURL( IN const char *ipPortStr,
               IN const char *alias,
               OUT char descURL[LINE_SIZE] )
@@ -169,10 +168,11 @@ calc_descURL( IN const char *ipPortStr,
     strcat( descURL, ipPortStr );
     strcat( descURL, alias );
 
-    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-        "desc url: %s\n", descURL );
+                         "desc url: %s\n", descURL );
+         )
 
-    return UPNP_E_SUCCESS;
+        return UPNP_E_SUCCESS;
 }
 
 /************************************************************************
@@ -213,7 +213,7 @@ config_description_doc( INOUT IXML_Document * doc,
     IXML_Node *rootNode = NULL;
     IXML_Node *urlbase_node = NULL;
     char *urlBaseStr = "URLBase";
-    const DOMString domStr = NULL;
+    DOMString domStr = NULL;
     uri_type uri;
     int err_code;
     int len;
@@ -408,16 +408,18 @@ configure_urlbase( INOUT IXML_Document * doc,
         goto error_handler;
     }
 
-    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+    DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-        "desc url: %s\n", docURL );
+                         "desc url: %s\n", docURL );
-    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+         )
-        "doc = %s\n", xml_str );
+        DBGONLY( UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-    // store in web server
+                             "doc = %s\n", xml_str );
-    err_code =
+         )
+        // store in web server
+        err_code =
         web_server_set_alias( new_alias, xml_str, strlen( xml_str ),
                               last_modified );
 
-error_handler:
+  error_handler:
     free( root_path );
     free( new_alias );
 

upnp/src/uuid/md5.c

@@ -50,11 +50,22 @@
 #define S43 15
 #define S44 21
 
-static void MD5Transform PROTO_LIST((UINT4[4], unsigned char[64]));
+static void MD5Transform PROTO_LIST( ( UINT4[4],
-static void Encode PROTO_LIST((unsigned char *, UINT4 *, unsigned int));
+                                       unsigned char[64] ) );
-static void Decode PROTO_LIST((UINT4 *, unsigned char *, unsigned int));
+static void Encode PROTO_LIST( ( unsigned char *,
-static void MD5_memcpy PROTO_LIST((POINTER, POINTER, unsigned int));
+                                 UINT4 *,
-static void MD5_memset PROTO_LIST((POINTER, int, unsigned int));
+                                 unsigned int ) );
+
+static void Decode PROTO_LIST( ( UINT4 *,
+                                 unsigned char *,
+                                 unsigned int ) );
+
+static void MD5_memcpy PROTO_LIST( ( POINTER,
+                                     POINTER,
+                                     unsigned int ) );
+static void MD5_memset PROTO_LIST( ( POINTER,
+                                     int,
+                                     unsigned int ) );
 
 static unsigned char PADDING[64] = {
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -107,10 +118,14 @@ static unsigned char PADDING[64] = {
    MD5 initialization. Begins an MD5 operation, writing a new context. 
  */
 void
-MD5Init(MD5_CTX * context)
+MD5Init( context )
+     MD5_CTX *context;          /* context */
 {
     context->count[0] = context->count[1] = 0;
-    /* Load magic initialization constants. */
+
+    /*
+       Load magic initialization constants.
+     */
     context->state[0] = 0x67452301;
     context->state[1] = 0xefcdab89;
     context->state[2] = 0x98badcfe;
@@ -124,72 +139,114 @@ MD5Init(MD5_CTX * context)
  */
 
 void
-MD5Update(MD5_CTX *context, unsigned char *input, unsigned int inputLen)
+MD5Update( context,
+           input,
+           inputLen )
+     MD5_CTX *context;          /* context */
+     unsigned char *input;      /* input block */
+     unsigned int inputLen;     /* length of input block */
 {
-	unsigned int i;
+    unsigned int i,
-	unsigned int index;
+      index,
-	unsigned int partLen;
+      partLen;
 
-	/* Compute number of bytes mod 64 */
+    /*
-	index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+       Compute number of bytes mod 64 
+     */
+    index = ( unsigned int )( ( context->count[0] >> 3 ) & 0x3F );
 
-	/* Update number of bits */
+    /*
-	if ((context->count[0] += ((UINT4)inputLen << 3)) < ((UINT4)inputLen << 3)) {
+       Update number of bits 
-		context->count[1]++;
+     */
-	}
+    if( ( context->count[0] +=
-	context->count[1] += ((UINT4)inputLen >> 29);
+          ( ( UINT4 ) inputLen << 3 ) ) < ( ( UINT4 ) inputLen << 3 ) )
-	partLen = 64 - index;
+        context->count[1]++;
 
-	/* Transform as many times as possible. */
+    context->count[1] += ( ( UINT4 ) inputLen >> 29 );
-	if (inputLen >= partLen) {
+
-		MD5_memcpy((POINTER)&context->buffer[index], (POINTER)input, partLen);
+    partLen = 64 - index;
-		MD5Transform(context->state, context->buffer);
+
-		for (i = partLen; i + 63 < inputLen; i += 64) {
+    /*
-			MD5Transform(context->state, &input[i]);
+       Transform as many times as possible.
-		}
+     */
-		index = 0;
+    if( inputLen >= partLen ) {
-	} else {
+
-		i = 0;
+        MD5_memcpy
-	}
+            ( ( POINTER ) & context->buffer[index], ( POINTER ) input,
+              partLen );
+        MD5Transform( context->state, context->buffer );
+
+        for( i = partLen; i + 63 < inputLen; i += 64 )
+            MD5Transform( context->state, &input[i] );
+
+        index = 0;
+    } else
+        i = 0;
+
+    /*
+       Buffer remaining input 
+     */
+    MD5_memcpy
+        ( ( POINTER ) & context->buffer[index], ( POINTER ) & input[i],
+          inputLen - i );
 
-	/* Buffer remaining input */
-	MD5_memcpy((POINTER)&context->buffer[index], (POINTER)&input[i], inputLen - i);
 }
 
 /*
    MD5 finalization. Ends an MD5 message-digest operation, writing the
    the message digest and zeroizing the context.
  */
+
 void
-MD5Final(unsigned char digest[16], MD5_CTX *context)
+MD5Final( digest,
+          context )
+     unsigned char digest[16];  /* message digest */
+     MD5_CTX *context;          /* context */
 {
+
     unsigned char bits[8];
-    unsigned int index;
+    unsigned int index,
-    unsigned int padLen;
+      padLen;
 
-    /* Save number of bits */
+    /*
-    Encode(bits, context->count, 8);
+       Save number of bits 
+     */
+    Encode( bits, context->count, 8 );
 
-    /* Pad out to 56 mod 64. */
+    /*
-    index = (unsigned int)((context->count[0] >> 3) & 0x3f);
+       Pad out to 56 mod 64.
-    padLen = (index < 56) ? (56 - index) : (120 - index);
+     */
-    MD5Update(context, PADDING, padLen);
+    index = ( unsigned int )( ( context->count[0] >> 3 ) & 0x3f );
 
-    /* Append length (before padding) */
+    padLen = ( index < 56 ) ? ( 56 - index ) : ( 120 - index );
-    MD5Update(context, bits, 8);
 
-    /* Store state in digest */
+    MD5Update( context, PADDING, padLen );
-    Encode(digest, context->state, 16);
+
+    /*
+       Append length (before padding) 
+     */
+    MD5Update( context, bits, 8 );
+
+    /*
+       Store state in digest 
+     */
+    Encode( digest, context->state, 16 );
+
+    /*
+       Zeroize sensitive information.
+     */
+    MD5_memset( ( POINTER ) context, 0, sizeof( *context ) );
 
-    /* Zeroize sensitive information. */
-    MD5_memset((POINTER)context, 0, sizeof(*context));
 }
 
 /*
    MD5 basic transformation. Transforms state based on block. 
  */
 static void
-MD5Transform(UINT4 state[4], unsigned char block[64])
+MD5Transform( state,
+              block )
+     UINT4 state[4];
+     unsigned char block[64];
 {
     UINT4 a = state[0],
       b = state[1],
@@ -296,16 +353,23 @@ MD5Transform(UINT4 state[4], unsigned char block[64])
    a multiple of 4.
  */
 static void
-Encode(unsigned char *output, UINT4 *input, unsigned int len)
+Encode( output,
+        input,
+        len )
+     unsigned char *output;
+     UINT4 *input;
+     unsigned int len;
 {
-	unsigned int i;
+    unsigned int i,
-	unsigned int j;
+      j;
-	for (i = 0, j = 0; j < len; ++i, j += 4) {
+
-		output[j+0] = (unsigned char)((input[i] >>  0) & 0xff);
+    for( i = 0, j = 0; j < len; i++, j += 4 ) {
-		output[j+1] = (unsigned char)((input[i] >>  8) & 0xff);
+        output[j] = ( unsigned char )( input[i] & 0xff );
-		output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
+        output[j + 1] = ( unsigned char )( ( input[i] >> 8 ) & 0xff );
-		output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
+        output[j + 2] = ( unsigned char )( ( input[i] >> 16 ) & 0xff );
-	}
+        output[j + 3] = ( unsigned char )( ( input[i] >> 24 ) & 0xff );
+    }
+
 }
 
 /*
@@ -314,40 +378,55 @@ Encode(unsigned char *output, UINT4 *input, unsigned int len)
  */
 
 static void
-Decode(UINT4 *output, unsigned char *input, unsigned int len)
+Decode( output,
+        input,
+        len )
+     UINT4 *output;
+     unsigned char *input;
+     unsigned int len;
 {
-	unsigned int i;
+    unsigned int i,
-	unsigned int j;
+      j;
-	for (i = 0, j = 0; j < len; ++i, j += 4) {
+
-		output[i] =
+    for( i = 0, j = 0; j < len; i++, j += 4 )
-			(((UINT4)input[j+0]) <<  0) |
+        output[i] =
-			(((UINT4)input[j+1]) <<  8) |
+            ( ( UINT4 ) input[j] ) | ( ( ( UINT4 ) input[j + 1] ) << 8 ) |
-			(((UINT4)input[j+2]) << 16) |
+            ( ( ( UINT4 ) input[j + 2] ) << 16 ) |
-			(((UINT4)input[j+3]) << 24);
+            ( ( ( UINT4 ) input[j + 3] ) << 24 );
-	}
 }
 
 /*
-   Note: Replace for loop with standard memcpy if possible.
+   Note: Replace &quot;for loop&quot; with standard memcpy if possible.
  */
 static void
-MD5_memcpy(POINTER  output, POINTER  input, unsigned int len)
+MD5_memcpy( output,
+            input,
+            len )
+     POINTER output;
+     POINTER input;
+     unsigned int len;
 {
-	unsigned int i;
+    unsigned int i;
-	for (i = 0; i < len; ++i) {
+
-		output[i] = input[i];
+    for( i = 0; i < len; i++ )
-	}
+        output[i] = input[i];
+
 }
 
 /*
-   Note: Replace for loop with standard memset if possible.
+   Note: Replace &quot;for loop&quot; with standard memset if possible.
  */
 static void
-MD5_memset(POINTER output, int value, unsigned int len)
+MD5_memset( output,
+            value,
+            len )
+     POINTER output;
+     int value;
+     unsigned int len;
 {
-	unsigned int i;
+    unsigned int i;
-	for (i = 0; i < len; ++i) {
-		((char *)output)[i] = (char)value;
-	}
-}
 
+    for( i = 0; i < len; i++ )
+        ( ( char * )output )[i] = ( char )value;
+
+}

upnp/src/uuid/sysdep.c

@@ -33,16 +33,17 @@
    This sample implementation generates a random node ID
  */
 void
-get_ieee_node_identifier(uuid_node_t *node)
+get_ieee_node_identifier( uuid_node_t * node )
 {
     char seed[16];
     static int inited = 0;
     static uuid_node_t saved_node;
 
-    if (!inited) {
+    if( !inited ) {
-        get_random_info(seed);
+        get_random_info( seed );
         seed[0] |= 0x80;
-        memcpy(&saved_node, seed, sizeof (uuid_node_t));
+        memcpy( &saved_node, seed, sizeof( uuid_node_t ) );
+
         inited = 1;
     };
 
@@ -82,48 +83,52 @@ get_system_time( uuid_time_t * uuid_time )
 
 /*-----------------------------------------------------------------------------*/
 void
-get_random_info(char seed[16])
+get_random_info( char seed[16] )
 {
-	MD5_CTX c;
+    MD5_CTX c;
-	typedef struct {
+    typedef struct {
-		MEMORYSTATUS m;
+        MEMORYSTATUS m;
-		SYSTEM_INFO s;
+        SYSTEM_INFO s;
-		FILETIME t;
+        FILETIME t;
-		LARGE_INTEGER pc;
+        LARGE_INTEGER pc;
-		DWORD tc;
+        DWORD tc;
-		DWORD l;
+        DWORD l;
-		char hostname[MAX_COMPUTERNAME_LENGTH + 1];
+        char hostname[MAX_COMPUTERNAME_LENGTH + 1];
-	} randomness;
+    } randomness;
-	randomness r;
+    randomness r;
 
-	/* Initialize memory area so that valgrind does not complain */
+    MD5Init( &c );
-	memset(&r, 0, sizeof r);
+    /*
+       memory usage stats 
+     */
+    GlobalMemoryStatus( &r.m );
+    /*
+       random system stats 
+     */
+    GetSystemInfo( &r.s );
+    /*
+       100ns resolution (nominally) time of day 
+     */
+    GetSystemTimeAsFileTime( &r.t );
+    /*
+       high resolution performance counter 
+     */
+    QueryPerformanceCounter( &r.pc );
+    /*
+       milliseconds since last boot 
+     */
+    r.tc = GetTickCount(  );
+    r.l = MAX_COMPUTERNAME_LENGTH + 1;
 
-	/* memory usage stats */
+    GetComputerName( r.hostname, &r.l );
-	GlobalMemoryStatus( &r.m );
+    MD5Update( &c, &r, sizeof( randomness ) );
-	/* random system stats */
+    MD5Final( seed, &c );
-	GetSystemInfo( &r.s );
-	/* 100ns resolution (nominally) time of day */
-	GetSystemTimeAsFileTime( &r.t );
-	/* high resolution performance counter */
-	QueryPerformanceCounter( &r.pc );
-	/* milliseconds since last boot */
-	r.tc = GetTickCount();
-	r.l = MAX_COMPUTERNAME_LENGTH + 1;
-
-	GetComputerName( r.hostname, &r.l );
-
-	/* MD5 it */
-	MD5Init(&c);
-	MD5Update(&c, &r, sizeof r);
-	MD5Final(seed, &c);
 };
-
+#else
-#else /* _WINDOWS_ */
 
 /*-----------------------------------------------------------------------------*/
 void
-get_system_time(uuid_time_t *uuid_time)
+get_system_time( uuid_time_t * uuid_time )
 {
     struct timeval tp;
 
@@ -140,28 +145,22 @@ get_system_time(uuid_time_t *uuid_time)
 
 /*-----------------------------------------------------------------------------*/
 void
-get_random_info(char seed[16])
+get_random_info( char seed[16] )
 {
-	MD5_CTX c;
+    MD5_CTX c;
-	typedef struct {
+    typedef struct {
-		//struct sysinfo s;
+//        struct sysinfo s;
-		struct timeval t;
+        struct timeval t;
-		char hostname[257];
+        char hostname[257];
-	} randomness;
+    } randomness;
-	randomness r;
+    randomness r;
 
-	/* Initialize memory area so that valgrind does not complain */
+    MD5Init( &c );
-	memset(&r, 0, sizeof r);
 
-	/* Get some random stuff */
+    gettimeofday( &r.t, ( struct timezone * )0 );
-	gettimeofday(&r.t, (struct timezone *)0);
+    gethostname( r.hostname, 256 );
-	gethostname(r.hostname, 256 );
+    MD5Update( &c, &r, sizeof( randomness ) );
-
+    MD5Final( seed, &c );
-	/* MD5 it */
-	MD5Init(&c);
-	MD5Update(&c, &r, sizeof r);
-	MD5Final(seed, &c);
 };
 
-#endif /* _WINDOWS_ */
+#endif
-

upnp/src/uuid/uuid.c

@@ -53,10 +53,10 @@ static unsigned16 true_random( void );
    uuid_create -- generator a UUID 
  */
 int
-uuid_create(uuid_upnp *uid)
+uuid_create( uuid_upnp * uid )
 {
-    uuid_time_t timestamp;
+    uuid_time_t timestamp,
-    uuid_time_t last_time;
+      last_time;
     unsigned16 clockseq;
     uuid_node_t node;
     uuid_node_t last_node;
@@ -65,64 +65,61 @@ uuid_create(uuid_upnp *uid)
     /*
        acquire system wide lock so we're alone 
      */
-    UUIDLock();
+    UUIDLock(  );
 
     /*
        get current time 
      */
-    get_current_time(&timestamp);
+    get_current_time( &timestamp );
 
     /*
        get node ID 
      */
-    get_ieee_node_identifier(&node);
+    get_ieee_node_identifier( &node );
 
     /*
        get saved state from NV storage 
      */
-    f = read_state(&clockseq, &last_time, &last_node);
+    f = read_state( &clockseq, &last_time, &last_node );
 
     /*
        if no NV state, or if clock went backwards, or node ID changed
        (e.g., net card swap) change clockseq 
      */
-    if (!f || memcmp(&node, &last_node, sizeof(uuid_node_t))) {
+    if( !f || memcmp( &node, &last_node, sizeof( uuid_node_t ) ) )
-        clockseq = true_random();
+        clockseq = true_random(  );
-    } else if (timestamp < last_time) {
+    else if( timestamp < last_time )
         clockseq++;
-    }
 
     /*
        stuff fields into the UUID 
      */
-    format_uuid_v1(uid, clockseq, timestamp, node);
+    format_uuid_v1( uid, clockseq, timestamp, node );
 
     /*
        save the state for next time 
      */
-    write_state(clockseq, timestamp, node);
+    write_state( clockseq, timestamp, node );
 
-    UUIDUnlock();
+    UUIDUnlock(  );
-    return 1;
+    return ( 1 );
 };
 
 /*-----------------------------------------------------------------------------*/
 void
-uuid_unpack(uuid_upnp *u, char *out)
+uuid_unpack( uuid_upnp * u,
+             char *out )
 {
-	sprintf(out,
+
-		"%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
+    sprintf( out,
-		(unsigned int)u->time_low,
+             "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
-		u->time_mid,
+             ( unsigned int )u->time_low, u->time_mid,
-		u->time_hi_and_version,
+             u->time_hi_and_version, u->clock_seq_hi_and_reserved,
-		u->clock_seq_hi_and_reserved,
+             u->clock_seq_low, u->node[0], u->node[1], u->node[2],
-		u->clock_seq_low,
+             u->node[3], u->node[4], u->node[5] );
-		u->node[0],
+
-		u->node[1],
+    *( out + 36 ) = '\0';
-		u->node[2],
+
-		u->node[3],
-		u->node[4],
-		u->node[5]);
 };
 
 /*-----------------------------------------------------------------------------*/
@@ -140,10 +137,11 @@ format_uuid_v1( uuid_upnp * uid,
        Construct a version 1 uuid with the information we've gathered
        * plus a few constants. 
      */
-    uid->time_low = (unsigned long)(timestamp & 0xFFFFFFFF);
+    uid->time_low = ( unsigned long )( timestamp & 0xFFFFFFFF );
-    uid->time_mid = (unsigned short)((timestamp >> 32) & 0xFFFF);
+    uid->time_mid = ( unsigned short )( ( timestamp >> 32 ) & 0xFFFF );
-    uid->time_hi_and_version = (unsigned short)((timestamp >> 48) & 0x0FFF);
+    uid->time_hi_and_version = ( unsigned short )( ( timestamp >> 48 ) &
-    uid->time_hi_and_version |= (1 << 12);
+                                                   0x0FFF );
+    uid->time_hi_and_version |= ( 1 << 12 );
     uid->clock_seq_low = clock_seq & 0xFF;
     uid->clock_seq_hi_and_reserved = ( clock_seq & 0x3F00 ) >> 8;
     uid->clock_seq_hi_and_reserved |= 0x80;
@@ -229,6 +227,7 @@ get_current_time( uuid_time_t * timestamp )
     static int inited = 0;
 
     if( !inited ) {
+        get_system_time( &time_now );
         uuids_this_tick = UUIDS_PER_TICK;
         inited = 1;
     };

upnp/test/test_init.c

@@ -105,7 +105,7 @@ main (int argc, char* argv[])
 	 * Test library initialisation
 	 */
 	printf ("\n");
-	printf ("Initializing UPnP ... \n");
+	printf ("Intializing UPnP ... \n");
 	rc = UpnpInit (NULL, 0);
 	if ( UPNP_E_SUCCESS == rc ) {
 		const char* ip_address = UpnpGetServerIpAddress();