Creation of the tag for release-1.6.6.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/tags/release-1.6.6@352 119443c7-1b9e-41f8-b6fc-b9c35fce742c
2008-04-26 00:52:45 +00:00
146 changed files with 48029 additions and 42919 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,105 +0,0 @@
-#
-# NOTE! Don't add files that are generated in specific
-# subdirectories here. Add them in the ".gitignore" file
-# in that subdirectory instead.
-#
-# NOTE! Please use 'git ls-files -i --exclude-standard'
-# command after changing this file, to see if there are
-# any tracked files which get ignored after the change.
-#
-# Normal rules
-#
-.*
-*.o
-*.o.*
-*.a
-*.s
-*.ko
-*.so
-*.so.dbg
-*.mod.c
-*.i
-*.lst
-*.symtypes
-*.order
-modules.builtin
-*.elf
-*.bin
-*.gz
-*.bz2
-*.lzma
-*.patch
-*.gcno
-
-#
-# Top-level generic files
-#
-/tags
-/TAGS
-/linux
-/vmlinux
-/vmlinuz
-/System.map
-/Module.markers
-/Module.symvers
-
-#
-# git files that we don't want to ignore even it they are dot-files
-#
-!.gitignore
-!.mailmap
-
-#
-# Generated include files
-#
-include/config
-include/linux/version.h
-include/generated
-
-# stgit generated dirs
-patches-*
-
-# quilt's files
-patches
-series
-
-# cscope files
-cscope.*
-ncscope.*
-
-# gnu global files
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-
-*.orig
-*~
-\#*#
-*.lo
-*.la
-Makefile
-Makefile.in
-aclocal.m4
-autoconfig.h
-autoconfig.h.in
-autom4te.cache/
-build-aux/
-config.log
-config.status
-configure
-libtool
-libupnp.pc
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-stamp-h1
-upnp/inc/stamp-h2
-upnp/inc/upnpconfig.h
-upnp/sample/tv_combo
-upnp/sample/tv_ctrlpt
-upnp/sample/tv_device
-docs/doxygen
-
--- a/1226
+++ b/1226
--- a/12
+++ b/12
@@ -31,7 +31,7 @@ PROJECT_NAME           = libUPnP
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.

-PROJECT_NUMBER         = 1.6.13
+PROJECT_NUMBER         = 1.4.7

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -91,7 +91,7 @@ ABBREVIATE_BRIEF       =
 # Doxygen will generate a detailed section even if there is only a brief 
 # description.

-ALWAYS_DETAILED_SEC    = YES
+ALWAYS_DETAILED_SEC    = NO

 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
 # inherited members of a class in the documentation of that class as if those 
@@ -290,7 +290,7 @@ HIDE_IN_BODY_DOCS      = NO
 # to NO (the default) then the documentation will be excluded. 
 # Set it to YES to include the internal documentation.

-INTERNAL_DOCS          = YES
+INTERNAL_DOCS          = NO

 # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
 # file names in lower-case letters. If set to YES upper-case letters are also 
@@ -462,7 +462,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.

-INPUT                  = upnp ixml threadutil
+INPUT                  = ./upnp ./ixml ./threadutil

 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -995,7 +995,7 @@ ENABLE_PREPROCESSING   = YES
 # compilation will be performed. Macro expansion can be done in a controlled 
 # way by setting EXPAND_ONLY_PREDEF to YES.

-MACRO_EXPANSION        = YES
+MACRO_EXPANSION        = NO

 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
@@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.

-PREDEFINED             = DEBUG UPNP_HAVE_TOOLS INCLUDE_DEVICE_APIS INCLUDE_CLIENT_APIS EXCLUDE_GENA=0 EXCLUDE_DOM=0
+PREDEFINED             = 

 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Top-level "Makefile.am" for libupnp
 #
-# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #

 ACLOCAL_AMFLAGS = -I m4
@@ -16,7 +16,6 @@ SUBDIRS = \


 EXTRA_DIST = \
-	Doxyfile \
 	libupnp.pc.in \
 	LICENSE \
 	THANKS \
@@ -26,23 +25,9 @@ EXTRA_DIST = \
 	build/libupnp.dsp \
 	build/libupnp.dsw \
 	build/inc/autoconfig.h \
+	build/inc/config.h \
 	build/inc/upnpconfig.h \
-	build/msvc/inttypes.h \
-	build/msvc/stdint.h \
-	build/vc8/ixml.vcproj \
-	build/vc8/libupnp.sln \
-	build/vc8/libupnp.vcproj \
-	build/vc8/threadutil.vcproj \
-	build/vc8/tvcombo.vcproj \
-	build/vc8/tvctrlpt.vcproj \
-	build/vc8/tvdevice.vcproj \
-	build/vc9/ixml.vcproj \
-	build/vc9/libupnp.sln \
-	build/vc9/libupnp.vcproj \
-	build/vc9/threadutil.vcproj \
-	build/vc9/tvcombo.vcproj \
-	build/vc9/tvctrlpt.vcproj \
-	build/vc9/tvdevice.vcproj 
+	build/msvc/inttypes.h


 # This variable must have 'exec' in its name, in order to be installed 
--- a/13
+++ b/13
@@ -1,7 +1,7 @@
 Portable SDK for UPnP* Devices (libupnp)

 Copyright (c) 2000-2003 Intel Corporation - All Rights Reserved.
-Copyright (c) 2005-2006 Rémi Turboult <r3mi@users.sourceforge.net>
+Copyright (c) 2005-2006 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 Copyright (c) 2006 Michel Pfeiffer and others <virtual_worlds@gmx.de>

 See LICENSE for details.
@@ -227,18 +227,17 @@ To build the samples (note: this is the default behaviour):
 % ./configure --enable-samples
 % make

-will build the sample device "$(LIBUPNP)/upnp/tv_device" and
-sample control point "$(LIBUPNP)/upnp/tv_ctrlpt". 
+will build the sample device "$(LIBUPNP)/upnp/upnp_tv_device" and
+sample control point "$(LIBUPNP)/upnp/upnp_tv_ctrlpt". 
 Note : the sample device won't be built if --disable-device has been 
 configured, and the sample control point won't be build if --disable-client 
 has been configured.

-To run the sample device, you need to create a tvdevice directory and move
-the web directory there, giving: "$(LIBUPNP)/upnp/sample/tvdevice/web".
-To run the sample invoke from the command line as follows:
+To run the sample device, you need the "$(LIBUPNP)/upnp/sample/tvdevice/web" 
+sub-directory. Example :

 % cd $(LIBUPNP)/upnp/sample/tvdevice
-% ../tv_device
+% ../../upnp_tv_device



--- a/17
+++ b/17
@@ -8,19 +8,13 @@ exempt of errors.

 - Alex (afaucher)
 - Andre Sodermans (wienerschnitzel)
- Anthony Viallard (homer242)
 - Apostolos Syropoulos
 - Arno Willig
 - Bob Ciora
- Carlo Parata
- Carl Benson
- Chandra (inactiveneurons)
 - Chaos
 - Charles Nepveu (cnepveu)
 - Chris Pickel
- Chuck Thomason (cyt4)
 - Craig Nelson
- David Blanchet
 - David Maass
 - Emil Ljungdahl
 - Erik Johansson
@@ -30,15 +24,12 @@ exempt of errors.
 - Fabrice Fontaine
 - Fredrik Svensson
 - Glen Masgai
- Hartmut Holzgraefe (hholzgra)
- Iain Denniston (ectotropic)
+- Hartmut Holzgraefe - hholzgra
 - Ingo Hofmann
- Ivan Romanov (ivanromanov)
 - Jiri Zouhar
 - John Dennis
 - Jonathan Casiot (no_dice)
 - Josh Carroll
- Juergen Lock
 - Keith Brindley
 - Leuk_He
 - Loigu
@@ -46,21 +37,15 @@ exempt of errors.
 - Marcelo Roberto Jimenez (mroberto)
 - Markus Strobl
 - Nektarios K. Papadopoulos (npapadop)
- Nicholas Kraft
- Nick Leverton (leveret)
- Obata Akio (obache)
 - Oskar Liljeblad
 - Michael (oxygenic)
 - Paul Vixie
 - Peter Hartley
 - Rene Hexel
 - Robert Gingher (robsbox)
- Ronan Menard
 - Siva Chandran
- Stefan Sommerfeld (zerocom)
 - Stéphane Corthésy
 - Steve Bresson
 - Timothy Redaelli
 - Titus Winters
- Tom (tomdev2)

--- a/23
+++ b/23
@@ -2,5 +2,28 @@
 To Be Done
 ==========

+- add FreeBSD patches
+  ( http://sf.net/tracker/index.php?func=detail&aid=1332618&group_id=7189&atid=307189 ?)
+
 - non-regression testing 

+- replace doc++ by Doxygen for documentation generation
+
+- incorporate public patches and fix reported bugs : 
+http://sourceforge.net/tracker/?group_id=7189&atid=107189 and 
+http://sourceforge.net/tracker/?group_id=7189&atid=307189
+
+- RPM packaging (a preliminary one here :
+    https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176617 )
+
+- make API clean for large files and 64 bits
+
+
+To Be Decided
+=============
+
+- IPV6 support ?
+
+
+
+
--- a/build/inc/autoconfig.h
+++ b/build/inc/autoconfig.h
@@ -19,9 +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

@@ -49,12 +55,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1

-/* Defines if strndup is available on your system */
-#define HAVE_STRNDUP 1
-
-/* Defines if strnlen is available on your system */
-#define HAVE_STRNLEN 1
-
 /* Define to 1 if you have the <syslog.h> header file. */
 #define HAVE_SYSLOG_H 1

@@ -67,6 +67,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1

+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#define HAVE_SYS_TIMEB_H 1
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1

@@ -79,13 +82,6 @@
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1

-/* Define to 1 if you have the <ws2tcpip.h> header file. */
-/* #undef HAVE_WS2TCPIP_H */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
 /* Define to 1 to prevent compilation of assert() */
 #define NDEBUG 1

@@ -105,13 +101,13 @@
 #define PACKAGE_NAME "libupnp"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libupnp 1.6.13"
+#define PACKAGE_STRING "libupnp 1.4.7"

 /* 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.6.13"
+#define PACKAGE_VERSION "1.4.7"

 /* Define to necessary symbol if this constant uses a non-standard name on
   your system. */
@@ -120,15 +116,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1

-/* see upnpconfig.h */
-#define UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS 1
-
-/* see upnpconfig.h */
-/* #undef UPNP_ENABLE_IPV6 */
-
-/* see upnpconfig.h */
-#define UPNP_ENABLE_NOTIFICATION_REORDERING 1
-
 /* see upnpconfig.h */
 #define UPNP_HAVE_CLIENT 1

@@ -144,32 +131,29 @@
 /* see upnpconfig.h */
 #define UPNP_HAVE_WEBSERVER 1

-/* Do not use pthread_rwlock_t */
-#define UPNP_USE_RWLOCK 1
-
 /* see upnpconfig.h */
 #define UPNP_VERSION_MAJOR 1

 /* see upnpconfig.h */
-#define UPNP_VERSION_MINOR 6
+#define UPNP_VERSION_MINOR 4

 /* see upnpconfig.h */
-#define UPNP_VERSION_PATCH 13
+#define UPNP_VERSION_PATCH 7

 /* see upnpconfig.h */
-#define UPNP_VERSION_STRING "1.6.13"
+#define UPNP_VERSION_STRING "1.4.7"

 /* Version number of package */
-#define VERSION "1.6.13"
+#define VERSION "1.4.7"

 /* File Offset size */
 #define _FILE_OFFSET_BITS 64

 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#define _LARGEFILE_SOURCE 1
+/* #undef _LARGEFILE_SOURCE */

 /* Large files support */
-#define _LARGE_FILE_SOURCE /**/
+#define _LARGE_FILE_SOURCE 

 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
@@ -180,5 +164,5 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */

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

 /** The library version (string) e.g. "1.3.0" */
-#define UPNP_VERSION_STRING "1.6.13"
+#define UPNP_VERSION_STRING "1.4.7"

 /** Major version of the library */
 #define UPNP_VERSION_MAJOR 1

 /** Minor version of the library */
-#define UPNP_VERSION_MINOR 6
+#define UPNP_VERSION_MINOR 4

 /** Patch version of the library */
-#define UPNP_VERSION_PATCH 13
+#define UPNP_VERSION_PATCH 7

 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
-  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
+  ((UPNP_VERSION_MAJOR*100 + UPNP_VERSION_MINOR)*100 + UPNP_VERSION_PATCH)



-/***************************************************************************
- * Large file support
- ***************************************************************************/
-
-/** File Offset size */
-#define _FILE_OFFSET_BITS 64
-
-/** Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#define _LARGEFILE_SOURCE 1
-
-/** Large files support */
-#define _LARGE_FILE_SOURCE /**/
-
 /***************************************************************************
 * Library optional features
- ***************************************************************************/
+ ***************************************************************************/ 

 /*
 * The following defines can be tested in order to know which 
@@ -104,9 +91,7 @@
 *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
 #define UPNP_HAVE_TOOLS 1

-/** Defined to 1 if the library has been compiled with ipv6 support
- *  (i.e. configure --enable-ipv6) */
-/* #undef UPNP_ENABLE_IPV6 */

-#endif /* UPNP_CONFIG_H */
+#endif // UPNP_CONFIG_H
+

--- a/build/libupnp.dsp
+++ b/build/libupnp.dsp
@@ -5,17 +5,17 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 CFG=libupnp - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE Dies ist kein g<EFBFBD>ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f<EFBFBD>hren Sie den Befehl
 !MESSAGE 
 !MESSAGE NMAKE /f "libupnp.mak".
 !MESSAGE 
-!MESSAGE Sie können beim Ausf?hren von NMAKE eine Konfiguration angeben
+!MESSAGE Sie k<EFBFBD>nnen beim Ausf<EFBFBD>hren von NMAKE eine Konfiguration angeben
 !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
 !MESSAGE 
 !MESSAGE NMAKE /f "libupnp.mak" CFG="libupnp - Win32 Debug"
 !MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE F<EFBFBD>r die Konfiguration stehen zur Auswahl:
 !MESSAGE 
 !MESSAGE "libupnp - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libupnp - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
@@ -389,6 +389,10 @@ 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
--- a/build/vc8/ixml.vcproj
+++ b/build/vc8/ixml.vcproj
@@ -1,217 +1,223 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ixml"
-	ProjectGUID="{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
-	RootNamespace="ixml"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc"
-				PreprocessorDefinitions="WIN32;IXML_INLINE="
-				RuntimeLibrary="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\ixml\src\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\document.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\element.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixml.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmldebug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlmembuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmlparser.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\namedNodeMap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\node.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\nodeList.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\ixml\inc\ixml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\inc\ixmldebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ixml"
+	ProjectGUID="{AD489FAF-9CDD-411B-BFE9-1B9C6C16D427}"
+	RootNamespace="ixml"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc"
+				PreprocessorDefinitions="WIN32;DEBUG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\ixml\src\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\document.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\element.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlmembuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\ixmlparser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\namedNodeMap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\node.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\nodeList.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\ixml\inc\ixml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ixml\src\inc\ixmlparser.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/build/vc8/libupnp.vcproj
+++ b/build/vc8/libupnp.vcproj
@@ -4,7 +4,6 @@
 	Version="8.00"
 	Name="libupnp"
 	ProjectGUID="{6227F51A-1498-4C4A-B213-F6FDED605125}"
-	RootNamespace="libupnp"
 	>
 	<Platforms>
 		<Platform
@@ -16,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory=".\out.vc8.$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -49,19 +48,18 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\pthreads\include,..\ixml\src\inc,..\ixml\inc,..\threadutil\inc,..\upnp\inc,..\upnp\src\inc,.\inc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libupnp.pch"
-				AssemblerListingLocation="$(OutDir)\"
-				ObjectFile="$(OutDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -76,8 +74,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib  iphlpapi.lib"
-				OutputFile="$(OutDir)\libupnp.dll"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
+				OutputFile=".\Release/libupnp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/libupnp.pdb"
@@ -146,7 +144,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\pthreads\include;..\..\ixml\src\inc;..\..\ixml\inc;..\..\threadutil\inc;..\..\upnp\inc;..\..\upnp\src\inc;..\inc;..\msvc"
-				PreprocessorDefinitions="DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="DEBUG;WIN32;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -158,7 +156,6 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -173,11 +170,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib iphlpapi.lib ixml.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\..\pthreads\lib\pthreadvc2.lib ws2_32.lib"
 				OutputFile="$(OutDir)\libupnp.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(OutDir)\..\ixml"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)\libupnp.pdb"
 				ImportLibrary="$(OutDir)\libupnp.lib"
@@ -218,14 +214,6 @@
 			Name="sources"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-			<File
-				RelativePath="..\..\upnp\src\api\ActionComplete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\ActionRequest.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\attr.c"
 				>
@@ -234,10 +222,6 @@
 				RelativePath="..\..\upnp\src\genlib\client_table\client_table.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\Discovery.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\document.c"
 				>
@@ -246,18 +230,6 @@
 				RelativePath="..\..\ixml\src\element.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\Event.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\EventSubscribe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\FileInfo.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\threadutil\src\FreeList.c"
 				>
@@ -358,10 +330,6 @@
 				RelativePath="..\..\upnp\src\ssdp\ssdp_device.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\ssdp\ssdp_server.c"
 				>
@@ -370,22 +338,10 @@
 				RelativePath="..\..\upnp\src\genlib\net\http\statcodes.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\StateVarComplete.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\StateVarRequest.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\genlib\util\strintmap.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\SubscriptionRequest.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\uuid\sysdep.c"
 				>
@@ -410,10 +366,6 @@
 				RelativePath="..\..\upnp\src\api\upnpdebug.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\api\UpnpString.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\api\upnptools.c"
 				>
@@ -447,14 +399,6 @@
 			Name="headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="..\..\upnp\inc\ActionComplete.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\actionrequest.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\client_table.h"
 				>
@@ -463,22 +407,6 @@
 				RelativePath="..\..\upnp\src\inc\config.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\discovery.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\Event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\EventSubscribe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\FileInfo.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\gena.h"
 				>
@@ -551,10 +479,6 @@
 				RelativePath="..\..\upnp\src\inc\sock.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\src\ssdp\ssdp_ResultData.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\ssdplib.h"
 				>
@@ -563,14 +487,6 @@
 				RelativePath="..\..\upnp\src\inc\statcodes.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\StateVarComplete.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\statevarrequest.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\statuscodes.h"
 				>
@@ -579,10 +495,6 @@
 				RelativePath="..\..\upnp\src\inc\strintmap.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\SubscriptionRequest.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\sysdep.h"
 				>
@@ -591,10 +503,6 @@
 				RelativePath="..\..\upnp\src\inc\unixutil.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\upnp.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\upnp_timeout.h"
 				>
@@ -603,18 +511,14 @@
 				RelativePath="..\..\upnp\src\inc\upnpapi.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\upnp\src\inc\upnpclosesocket.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\upnp\inc\upnpdebug.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\upnp\inc\UpnpString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\upnp\inc\upnptools.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\upnp\src\inc\uri.h"
 				>
@@ -640,6 +544,11 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="resources"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
 		<File
 			RelativePath="..\..\..\..\libupnp_win32.patch"
 			>
--- a/build/vc9/ixml.vcproj
+++ b/build/vc9/ixml.vcproj
@@ -11,20 +11,16 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -44,17 +40,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc"
+				PreprocessorDefinitions="DEBUG;WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -67,75 +59,6 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -155,12 +78,11 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -180,19 +102,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -204,12 +118,18 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -220,351 +140,7 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\ixml\inc;..\..\ixml\src\inc;..\inc;..\..\upnp\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -595,10 +171,6 @@
 				RelativePath="..\..\ixml\src\ixml.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\ixml\src\ixmldebug.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\ixmlmembuf.c"
 				>
@@ -629,10 +201,6 @@
 				RelativePath="..\..\ixml\inc\ixml.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\ixml\inc\ixmldebug.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ixml\src\inc\ixmlmembuf.h"
 				>
@@ -642,6 +210,12 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
--- a/build/vc9/libupnp.sln
+++ b/build/vc9/libupnp.sln
@@ -1,139 +1,67 @@

 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "libupnp.vcproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ixml", "ixml.vcproj", "{9C2C266D-35A3-465F-A297-0E21D54E5C89}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadutil", "threadutil.vcproj", "{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvctrlpt", "tvctrlpt.vcproj", "{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvdevice", "tvdevice.vcproj", "{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tvcombo", "tvcombo.vcproj", "{6365804B-22C6-4D5E-91F3-0C052EB55B4F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6227F51A-1498-4C4A-B213-F6FDED605125} = {6227F51A-1498-4C4A-B213-F6FDED605125}
+		{9C2C266D-35A3-465F-A297-0E21D54E5C89} = {9C2C266D-35A3-465F-A297-0E21D54E5C89}
+		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D} = {1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Lib|Win32 = Debug Lib|Win32
-		Debug Lib|x64 = Debug Lib|x64
 		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release Lib|Win32 = Release Lib|Win32
-		Release Lib|x64 = Release Lib|x64
 		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug Lib|x64.Build.0 = Debug Lib|x64
 		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|Win32.Build.0 = Debug|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.ActiveCfg = Debug|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.Build.0 = Debug|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release Lib|x64.Build.0 = Release Lib|x64
 		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.ActiveCfg = Release|Win32
 		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|Win32.Build.0 = Release|Win32
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.ActiveCfg = Release|x64
-		{6227F51A-1498-4C4A-B213-F6FDED605125}.Release|x64.Build.0 = Release|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug Lib|x64.Build.0 = Debug Lib|x64
 		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|Win32.Build.0 = Debug|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.ActiveCfg = Debug|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Debug|x64.Build.0 = Debug|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release Lib|x64.Build.0 = Release Lib|x64
 		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.ActiveCfg = Release|Win32
 		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|Win32.Build.0 = Release|Win32
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.ActiveCfg = Release|x64
-		{9C2C266D-35A3-465F-A297-0E21D54E5C89}.Release|x64.Build.0 = Release|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug Lib|x64.Build.0 = Debug Lib|x64
 		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|Win32.Build.0 = Debug|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.ActiveCfg = Debug|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Debug|x64.Build.0 = Debug|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release Lib|x64.Build.0 = Release Lib|x64
 		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.ActiveCfg = Release|Win32
 		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|Win32.Build.0 = Release|Win32
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.ActiveCfg = Release|x64
-		{1D3EEF7A-D248-48C0-B6B5-ECA229FE4B3D}.Release|x64.Build.0 = Release|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug Lib|x64.Build.0 = Debug Lib|x64
 		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|Win32.Build.0 = Debug|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.ActiveCfg = Debug|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Debug|x64.Build.0 = Debug|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release Lib|x64.Build.0 = Release Lib|x64
 		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.ActiveCfg = Release|Win32
 		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|Win32.Build.0 = Release|Win32
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.ActiveCfg = Release|x64
-		{8FB56F1C-E617-4B79-96AE-1FA499A3A9B5}.Release|x64.Build.0 = Release|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug Lib|x64.Build.0 = Debug Lib|x64
 		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|Win32.Build.0 = Debug|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.ActiveCfg = Debug|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Debug|x64.Build.0 = Debug|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release Lib|x64.Build.0 = Release Lib|x64
 		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.ActiveCfg = Release|Win32
 		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|Win32.Build.0 = Release|Win32
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.ActiveCfg = Release|x64
-		{7FB5F4A6-74F9-471D-B358-BAA0AC1CCA0A}.Release|x64.Build.0 = Release|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.ActiveCfg = Debug Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|Win32.Build.0 = Debug Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.ActiveCfg = Debug Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug Lib|x64.Build.0 = Debug Lib|x64
 		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|Win32.Build.0 = Debug|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.ActiveCfg = Debug|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Debug|x64.Build.0 = Debug|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.ActiveCfg = Release Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|Win32.Build.0 = Release Lib|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.ActiveCfg = Release Lib|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release Lib|x64.Build.0 = Release Lib|x64
 		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.ActiveCfg = Release|Win32
 		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|Win32.Build.0 = Release|Win32
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.ActiveCfg = Release|x64
-		{6365804B-22C6-4D5E-91F3-0C052EB55B4F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/vc9/libupnp.vcproj
+++ b/build/vc9/libupnp.vcproj
--- a/build/vc9/threadutil.vcproj
+++ b/build/vc9/threadutil.vcproj
@@ -11,19 +11,16 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="4"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -43,16 +40,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\ixml\inc;..\..\pthreads\include"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -65,73 +59,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				AdditionalDependencies="pthreadVC2.lib"
+				AdditionalLibraryDirectories="..\..\pthreads\lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -151,10 +80,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -175,18 +104,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -198,12 +120,18 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -214,341 +142,7 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBUPNP_EXPORTS;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="DEBUG;WIN32;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\threadutil\inc;..\..\upnp\inc;..\..\pthreads;..\..\pthreads\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -606,6 +200,12 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
--- a/build/vc9/tvcombo.vcproj
+++ b/build/vc9/tvcombo.vcproj
@@ -11,19 +11,16 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -43,16 +40,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
+				PreprocessorDefinitions="DEBUG;WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -65,12 +59,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,90 +86,12 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="0"
+			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -200,16 +113,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -222,12 +129,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
@@ -254,406 +156,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -668,18 +170,24 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_combo_main.c"
+				RelativePath="..\..\upnp\sample\tvcombo\linux\upnp_tv_combo_main.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.c"
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
@@ -690,11 +198,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.h"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_ctrlpt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.h"
+				RelativePath="..\..\upnp\sample\tvcombo\upnp_tv_device.h"
 				>
 			</File>
 		</Filter>
--- a/build/vc9/tvctrlpt.vcproj
+++ b/build/vc9/tvctrlpt.vcproj
@@ -11,17 +11,14 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -43,16 +40,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -65,12 +59,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,88 +86,10 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -200,16 +113,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -222,12 +129,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
@@ -254,406 +156,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\ixml\inc;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvctrlpt\linux;..\..\upnp\sample\tvctrlpt"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -668,11 +170,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.c"
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_ctrlpt_main.c"
+				RelativePath="..\..\upnp\sample\tvctrlpt\linux\upnp_tv_ctrlpt_main.c"
 				>
 			</File>
 		</Filter>
@@ -686,10 +188,16 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_ctrlpt.h"
+				RelativePath="..\..\upnp\sample\tvctrlpt\upnp_tv_ctrlpt.h"
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
--- a/build/vc9/tvdevice.vcproj
+++ b/build/vc9/tvdevice.vcproj
@@ -11,17 +11,14 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory=".\out.vc9.$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -43,16 +40,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
+				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
+				PreprocessorDefinitions="WIN32;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -65,12 +59,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
+				AdditionalDependencies="..\..\pthreads\lib\pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;.\out.vc9.$(ConfigurationName)\ixml&quot;;&quot;.\out.vc9.$(ConfigurationName)\threadutil&quot;;&quot;.\out.vc9.$(ConfigurationName)\libupnp&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,88 +86,10 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -200,16 +113,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -222,12 +129,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
@@ -254,406 +156,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;RELEASE;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\ixml\inc;..\..\upnp\sample\common;..\inc;..\..\threadutil\inc;..\..\pthreads;..\..\pthreads\include;..\..\upnp\sample\tvdevice;..\..\upnp\sample\tvdevice\linux"
-				PreprocessorDefinitions="WIN32;DEBUG;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|Win32"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Lib|x64"
-			OutputDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\bin\"
-			IntermediateDirectory="$(SolutionDir)\out.vc9.$(PlatformName)\$(ConfigurationName)\tmp\"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\upnp\inc;..\..\upnp\sample\common;..\..\upnp\sample;..\..\ixml\inc;..\..\pthreads;..\..\pthreads\include;..\inc;..\..\threadutil\inc;..\..\upnp\sample\tvcombo"
-				PreprocessorDefinitions="WIN32;NDEBUG;RELEASE;_WINDOWS;PTW32_STATIC_LIB;UPNP_STATIC_LIB;UPNP_USE_MSVCPP;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL;_SCL_SECURE_NO_WARNINGS;_SCL_SECURE_NO_DEPRECATE;_AFX_SECURE_NO_WARNINGS;_AFX_SECURE_NO_DEPRECATE;_SECURE_ATL;_ATL_NO_COM_SUPPORT;_ATL_SECURE_NO_WARNINGS;_ATL_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pthreadVC2.lib ixml.lib threadutil.lib libupnp.lib ws2_32.lib iphlpapi.lib "
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\pthreads\;..\..\pthreads\lib;$(OutDir)\..\lib;$(OutDir)\..\bin"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -668,11 +170,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.c"
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\linux\tv_device_main.c"
+				RelativePath="..\..\upnp\sample\tvdevice\linux\upnp_tv_device_main.c"
 				>
 			</File>
 		</Filter>
@@ -686,10 +188,16 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\upnp\sample\common\tv_device.h"
+				RelativePath="..\..\upnp\sample\tvdevice\upnp_tv_device.h"
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
--- a/configure.ac
+++ b/configure.ac
@@ -4,12 +4,12 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005-2007 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #

 AC_PREREQ(2.60)

-AC_INIT([libupnp], [1.6.13], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.6], [mroberto@users.sourceforge.net])
 dnl ############################################################################
 dnl # *Independently* of the above libupnp package version, the libtool version
 dnl # of the 3 libraries need to be updated whenever there is a change released:
@@ -144,120 +144,9 @@ dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:3:2])
 dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
 dnl #
 dnl ############################################################################
-dnl # Release 1.6.7:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 3 -> 4
-dnl # - Code has changed in upnp
-dnl #	revision: 5 -> 6
-dnl # - Interfaces have been changed, added and removed in upnp
-dnl #	current: 3 -> 4
-dnl #   revision: 6 -> 0
-dnl # - Interfaces removed in upnp:
-dnl #   age: -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:0:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
-dnl #
-dnl # Obs.: 1.6.7 was released with a version error, the correct nubers should
-dnl # have been:
-dnl #AC_SUBST([LT_VERSION_UPNP],       [4:0:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.8:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in ixml
-dnl #	revision: 4 -> 5
-dnl # - Code has changed in threadutil
-dnl #	revision: 0 -> 1
-dnl # - Code has changed in upnp
-dnl #	revision: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:5:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:1:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [4:1:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.9:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 1 -> 2
-dnl # - Code has changed in upnp
-dnl #	revision: 1 -> 2
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:5:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:2:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [4:2:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.10:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in ixml 
-dnl #	revision: 5 -> 6
-dnl # - Code has changed in threadutil
-dnl #	revision: 2 -> 3
-dnl # - Code has changed in upnp
-dnl #	revision: 2 -> 3
-dnl # - interface has changed in upnp
-dnl #   current: 4 -> 5
-dnl #   revision: 3 -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl ############################################################################
-dnl # Release 1.6.11:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 3 -> 4
-dnl # - Code has changed in upnp
-dnl #	revision: 3 -> 4
-dnl # - interface has changed in upnp
-dnl #   current: 5 -> 6
-dnl #   revision: 4 -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [5:4:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [6:0:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.12:
-dnl # "current:revision:age"
-dnl #
-dnl # - interface added in threadutil
-dnl #   current: 5 -> 6
-dnl #   revision: 4 - > 0
-dnl #   age: 2 -> 3
-dnl # - interfaces removed in threadutil
-dnl #   age: 3 -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [6:0:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.13:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in upnp
-dnl #	revision: 0 -> 1
-dnl # - interface added in upnp
-dnl #   current: 6 -> 7
-dnl #   revision: 1 - > 0
-dnl #   age: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [6:0:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [7:0:1])
-dnl #
-dnl ############################################################################
-AC_SUBST([LT_VERSION_IXML],       [2:6:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [6:0:0])
-AC_SUBST([LT_VERSION_UPNP],       [7:0:1])
+AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [4:3:2])
+AC_SUBST([LT_VERSION_UPNP],       [3:5:0])
 dnl ############################################################################
 dnl # Repeating the algorithm to place it closer to the modificatin place:
 dnl # 	- library code modified:		revision++
@@ -351,21 +240,6 @@ if test "x$enable_tools" = xyes ; then
 	AC_DEFINE(UPNP_HAVE_TOOLS, 1, [see upnpconfig.h])
 fi

-RT_BOOL_ARG_ENABLE([ipv6], [no], [ipv6 support])
-if test "x$enable_ipv6" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_IPV6, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([notification_reordering], [yes], [GENA notification reordering in gena_device.c])
-if test "x$enable_notification_reordering" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_NOTIFICATION_REORDERING, 1, [see upnpconfig.h])
-fi
-
-RT_BOOL_ARG_ENABLE([blocking_tcp_connections], [yes], [blocking TCP connections])
-if test "x$enable_blocking_tcp_connections" = xyes ; then
-        AC_DEFINE(UPNP_ENABLE_BLOCKING_TCP_CONNECTIONS, 1, [see upnpconfig.h])
-fi
-

 RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])

@@ -426,11 +300,10 @@ freebsd*)
 *)
 	echo "Using non-specific system compiler settings"
 	if test x"$enable_debug" = xyes; then
-		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default,
-		# but only if CFLAGS was not previously set.
+		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default
 		#:
 		# Use -O0 in debug so that variables do not get optimized out
-		AX_CFLAGS_GCC_OPTION([-O0, -g])
+		AX_CFLAGS_GCC_OPTION([-O0])
 	else
 		# add optimise for size
 		AX_CFLAGS_GCC_OPTION([-Os])
@@ -452,26 +325,9 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])


 #
-# Are we targetting Win32?
-#
-AC_MSG_CHECKING([for Win32])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifdef WIN32
-	#error Yup
-#endif
-],[])], [ac_cv_win32="no"], [ac_cv_win32="yes"])
-if test "$ac_cv_win32" = "yes"; then
-	AC_MSG_RESULT([yes])
-else
-	AC_MSG_RESULT([no])
-fi
-
-
-#
-# Checks for header files (which aren't needed on Win32)
+# Checks for header files
 #
 AC_HEADER_STDC
-if test "$ac_cv_win32" = "no"; then
 # libupnp code doesn't use autoconf variables yet,
 # so just abort if a header file is not found.
 AC_CHECK_HEADERS(
@@ -487,43 +343,19 @@ AC_CHECK_HEADERS(
 	sys/ioctl.h \
 	sys/socket.h \
 	sys/time.h \
+	sys/timeb.h \
 	syslog.h \
 	unistd.h \
 	],
 	[],
 	[AC_MSG_ERROR([required header file missing])])
-fi


 #
 # Checks for typedefs, structures, and compiler characteristics
 #	
 AC_C_CONST
-
-# The test for socklen_t was getting it wrong when it exists but is in ws2tcpip.h,
-# so we use a new test.
-#TYPE_SOCKLEN_T
-
-AC_CHECK_HEADERS([sys/types.h sys/socket.h ws2tcpip.h])
-AC_MSG_CHECKING(for socklen_t)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#ifdef HAVE_SYS_TYPES_H
-	#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-	#include <sys/socket.h>
-#endif
-#ifdef HAVE_WS2TCPIP_H
-	#include <ws2tcpip.h>
-#endif
-],[ socklen_t t = 0; return t; ])
-],[ac_cv_socklen_t="yes"],[ac_cv_socklen_t="no"])
-if test "$ac_cv_socklen_t" = "yes"; then
-	AC_MSG_RESULT([yes])
-else
-	AC_MSG_RESULT([no, using int])
-	AC_DEFINE(socklen_t, int, [Type for storing the length of struct sockaddr])
-fi
+TYPE_SOCKLEN_T


 #
@@ -531,15 +363,7 @@ fi
 #
 AC_FUNC_VPRINTF
 AC_FUNC_FSEEKO
-AC_CHECK_FUNC(strnlen,
-	AC_DEFINE(HAVE_STRNLEN, 1, [Defines if strnlen is available on your system]))
-AC_CHECK_FUNC(strndup,
-	AC_DEFINE(HAVE_STRNDUP, 1, [Defines if strndup is available on your system]))
-#
-# Solaris needs -lsocket -lnsl -lrt
-AC_SEARCH_LIBS([bind],           [socket])
-AC_SEARCH_LIBS([gethostbyname],  [nsl])
-AC_SEARCH_LIBS([sched_getparam], [rt])
+AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])


 #
@@ -596,11 +420,3 @@ AC_CONFIG_FILES([

 AC_OUTPUT

-#
-# Files copied for windows compilation.
-#
-echo "configure: copying \"autoconfig.h\"          to \"build/inc/autoconfig.h\""
-cp autoconfig.h build/inc/autoconfig.h
-echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\""
-cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h
-
--- a/ixml/Makefile.am
+++ b/ixml/Makefile.am
@@ -2,7 +2,7 @@
 #
 # "Makefile.am" for "libupnp/ixml"
 #
-# (C) Copyright 2005 Rémi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #

 SUBDIRS 		= doc
@@ -24,23 +24,15 @@ libixml_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
 			  -export-symbols-regex '^ixml.*'

 libixml_la_SOURCES	= \
-			src/attr.c \
-			src/document.c \
-			src/element.c \
-			src/inc/ixmlmembuf.h \
-			src/inc/ixmlparser.h \
-			src/ixml.c \
-			src/ixmldebug.c \
-			src/ixmlparser.c \
-			src/ixmlmembuf.c \
+			src/ixml.c src/node.c src/ixmlparser.c \
+			src/ixmlmembuf.c src/nodeList.c \
+			src/element.c src/attr.c src/document.c \
 			src/namedNodeMap.c \
-			src/node.c \
-			src/nodeList.c
+			src/inc/ixmlmembuf.h src/inc/ixmlparser.h

 upnpincludedir		= $(includedir)/upnp
-upnpinclude_HEADERS	= \
-			inc/ixml.h \
-			inc/ixmldebug.h
+upnpinclude_HEADERS	= inc/ixml.h 
+

 check_PROGRAMS          = test_document
 TESTS                   = test/test_document.sh
@@ -55,3 +47,4 @@ dist-hook:
 clean-local:
 	@if [ -d bin ] ; then  rm -rf bin ; fi

+
--- a/ixml/inc/ixml.h
+++ b/ixml/inc/ixml.h
--- a/ixml/inc/ixmldebug.h
+++ b/ixml/inc/ixmldebug.h
@@ -1,72 +0,0 @@
-
-
-#ifndef IXMLDEBUG_H
-#define IXMLDEBUG_H
-
-
-#include "UpnpGlobal.h"
-#include "ixml.h"
-
-
-/*!
- * \file
- *
- * \brief Auxiliar routines to aid debugging.
- */
-
-
-/*!
- * \brief Prints the debug statement either on the standard output or log file
- * along with the information from where this debug statement is coming.
- */ 
-#ifdef DEBUG
-void IxmlPrintf(
-	/*! [in] The file name, usually __FILE__. */
-	const char *DbgFileName,
-	/*! [in] The line number, usually __LINE__ or a variable that got the
-	 * __LINE__ at the appropriate place. */
-	int DbgLineNo,
-	/*! [in] The function name. */
-	const char *FunctionName,
-	/*! [in] Printf like format specification. */
-	const char* FmtStr,
-	/*! [in] Printf like Variable number of arguments that will go in the debug
-	 * statement. */
-	...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 4, 5)))
-#endif
-;
-#else /* DEBUG */
-static UPNP_INLINE void IxmlPrintf(
-	const char *FmtStr,
-	...)
-{
-	FmtStr = FmtStr;
-}
-#endif /* DEBUG */
-
-
-/*!
- * \brief Print the node names and values of a XML tree.
- */
-#ifdef DEBUG
-void printNodes(
-	/*! [in] The root of the tree to print. */
-	IXML_Node *tmpRoot,
-	/*! [in] The depth to print. */
-	int depth);
-#else
-static UPNP_INLINE void printNodes(
-	IXML_Node *tmpRoot,
-	int depth)
-{
-	tmpRoot = tmpRoot;
-	depth = depth;
-}
-#endif
-
-
-#endif /* IXMLDEBUG_H */
-
--- a/ixml/src/attr.c
+++ b/ixml/src/attr.c
@@ -1,53 +1,60 @@
-/*******************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////

 #include "ixmlparser.h"

-
-#include <string.h>
-
-
-void ixmlAttr_init(IN IXML_Attr *attr)
+/*================================================================
+*   Function: Attr_init
+*       Initializes an attribute node
+*       External function.
+*
+*=================================================================*/
+void
+ixmlAttr_init( IN IXML_Attr * attr )
 {
-	if (attr != NULL) {
-		memset(attr, 0, sizeof (IXML_Attr));
-	}
+    if( attr != NULL ) {
+        memset( attr, 0, sizeof( IXML_Attr ) );
+    }
 }

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

+#ifndef _IXML_MEMBUF_H
+#define _IXML_MEMBUF_H

+#include <stdlib.h>
 #include "ixml.h"

-
-#include <stdlib.h> /* for size_t */
-
-
-#define MINVAL(a, b) ( (a) < (b) ? (a) : (b) )
-#define MAXVAL(a, b) ( (a) > (b) ? (a) : (b) )
-
+#define MINVAL( a, b ) ( (a) < (b) ? (a) : (b) )
+#define MAXVAL( a, b ) ( (a) > (b) ? (a) : (b) )

 #define MEMBUF_DEF_SIZE_INC 20


-/*!
- * \brief The ixml_membuf type.
- */
-typedef struct
+typedef struct // ixml_membuf 
 {
-	char *buf;	
-	size_t length;
-	size_t capacity;
-	size_t size_inc;
+	char	*buf;
+				
+	size_t	length;
+	size_t	capacity;
+	size_t	size_inc;
+
 } ixml_membuf;

+//--------------------------------------------------
+//////////////// functions /////////////////////////
+//--------------------------------------------------
+/*
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+*/

-/*!
- * \brief ixml_membuf initialization routine.
- */
-void ixml_membuf_init(
-	/*! [in,out] The memory buffer to initializa. */
-	ixml_membuf *m);
-
-
-/*!
- * \brief ixml_membuf clearing routine.
- *
- * The internal buffer is deleted and ixml_membuf_init() is called in the end
- * to reinitialize the buffer.
- */
-void ixml_membuf_destroy(
-	/*! [in,out] The memory buffer to clear. */
-	ixml_membuf *m);
-
-
-/*!
- * \brief Copies the contents o a buffer to the designated ixml_membuf.
- *
- * The previous contents of the ixml_membuf are destroyed.
- *
- * \return IXML_SUCCESS if successfull, or the error code returned
- * by ixml_membuf_set_size().
- *
- * \sa ixml_membuf_assign_str().
- */
-int ixml_membuf_assign(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The input buffer to copy from. */
-	const void *buf, 
-	/*! [in] The number of bytes to copy from the input buffer. */
-	size_t buf_len);
-
-/*!
- * \brief Copies a \b NULL terminated string to the ixml_buffer.
- *
- * This is a convenience function that internally uses ixml_membuf_assign().
- *
- * \return The return value of ixml_membuf_assign().
- *
- * \sa ixml_membuf_assign().
- */
-int ixml_membuf_assign_str(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The input string to copy from. */
-	const char *c_str);
-
-/*!
- * \brief Appends one byte to the designated ixml_membuffer.
- *
- * This is a convenience function that internally uses ixml_membuf_insert().
- *
- * \return The return value of ixml_membuf_insert().
- *
- * \sa ixml_membuf_insert()
- */
-int ixml_membuf_append(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The pointer to the byte to append. */
-	const void *buf);
-
-/*!
- * \brief Appends the contents of a \b NULL terminated string to the designated
- * ixml_membuf.
- *
- * This is a convenience function that internally uses ixml_membuf_insert().
- *
- * \return The return value of ixml_membuf_insert().
- *
- * \sa ixml_membuf_insert().
- */
-int ixml_membuf_append_str(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The input string to copy from. */
-	const char *c_str);
-
-/*!
- * \brief 
- *
- * \return
- * 	\li 0 if successfull.
- * 	\li IXML_INDEX_SIZE_ERR if the index parameter is out of range.
- * 	\li Or the return code of ixml_membuf_set_size()
- *
- * \sa ixml_membuf_set_size()
- */
-int ixml_membuf_insert(
-	/*! [in,out] The memory buffer on which to operate. */
-	ixml_membuf *m,
-	/*! [in] The pointer to the input buffer. */
-	const void *buf, 
-	/*! [in] The buffer length. */
-	size_t buf_len,
-	/*! [in] The point of insertion relative to the beggining of the
-	 * ixml_membuf internal buffer. */
-	size_t index);
-
-
-#endif /* IXML_MEMBUF_H */
+void ixml_membuf_init(INOUT ixml_membuf *m);
+void ixml_membuf_destroy(INOUT ixml_membuf *m);
+int ixml_membuf_assign(INOUT ixml_membuf *m, IN const void *buf, 
+					 IN size_t buf_len );
+int ixml_membuf_assign_str(INOUT ixml_membuf *m, IN const char *c_str );
+int ixml_membuf_append(INOUT ixml_membuf *m, IN const void *buf);
+int ixml_membuf_append_str(INOUT ixml_membuf *m, IN const char *c_str);
+int ixml_membuf_insert(INOUT ixml_membuf *m, IN const void* buf, 
+					 IN size_t buf_len, int index );

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

 #include "ixml.h"
 #include "ixmlmembuf.h"

-
-/* Parser definitions */
+// Parser definitions
 #define QUOT        "&quot;"
 #define LT          "&lt;"
 #define GT          "&gt;"
@@ -52,218 +44,77 @@
 #define ESC_HEX     "&#x"
 #define ESC_DEC     "&#"

-
 typedef struct _IXML_NamespaceURI 
 {
-	char *nsURI;
-	char *prefix;
-	struct _IXML_NamespaceURI *nextNsURI;
+    char                        *nsURI;
+    char                        *prefix;
+    struct _IXML_NamespaceURI   *nextNsURI;
 } IXML_NamespaceURI;


 typedef struct _IXML_ElementStack
 {
-	char *element;
-	char *prefix;
-	char *namespaceUri;
-	IXML_NamespaceURI *pNsURI;
-	struct _IXML_ElementStack *nextElement;
+    char                    *element;
+    char                    *prefix;
+    char                    *namespaceUri;
+    IXML_NamespaceURI            *pNsURI;
+    struct _IXML_ElementStack    *nextElement;
 } IXML_ElementStack;


 typedef enum
 {
-	eELEMENT,
-	eATTRIBUTE,
-	eCONTENT,
+    eELEMENT,
+    eATTRIBUTE,
+    eCONTENT,
 } PARSER_STATE;

-
 typedef struct _Parser
 {
-	/*! Data buffer. */
-	char *dataBuffer;
-	/*! Pointer to the token parsed. */
-	char *curPtr;
-	/*! Saves for backup. */
-	char *savePtr;
-	ixml_membuf lastElem;
-	ixml_membuf tokenBuf;    
-	IXML_Node *pNeedPrefixNode;
-	IXML_ElementStack *pCurElement;
-	IXML_Node *currentNodePtr;
-	PARSER_STATE state;
-	BOOL bHasTopLevel;
+    char            *dataBuffer;	//data buffer
+    char            *curPtr;		//ptr to the token parsed 
+    char            *savePtr;		//Saves for backup
+    ixml_membuf     lastElem;
+    ixml_membuf     tokenBuf;    
+
+    IXML_Node           *pNeedPrefixNode;
+    IXML_ElementStack   *pCurElement;
+    IXML_Node           *currentNodePtr;
+    PARSER_STATE        state;
+
+    BOOL                bHasTopLevel;
+
 } Parser;


-/*!
- * \brief Check to see whether name is a valid xml name.
- */
-BOOL Parser_isValidXmlName(
-	/*! [in] The string to be checked. */
-	const DOMString name);

+int     Parser_LoadDocument( IXML_Document **retDoc, const char * xmlFile, BOOL file);
+BOOL    Parser_isValidXmlName( const DOMString name);
+int     Parser_setNodePrefixAndLocalName(IXML_Node *newIXML_NodeIXML_Attr);
+void    Parser_freeNodeContent( IXML_Node *IXML_Nodeptr);

-/*!
- * \brief Sets the error character.
- *
- * If 'c' is 0 (default), the parser is strict about XML encoding:
- * invalid UTF-8 sequences or "&" entities are rejected, and the parsing 
- * aborts.
- *
- * If 'c' is not 0, the parser is relaxed: invalid UTF-8 characters
- * are replaced by this character, and invalid "&" entities are left
- * untranslated. The parsing is then allowed to continue.
- */
-void Parser_setErrorChar(
-	/*! [in] The character to become the error character. */
-	char c);
+void    Parser_setErrorChar( char c );

+void    ixmlAttr_free(IXML_Attr *attrNode);
+void    ixmlAttr_init(IXML_Attr *attrNode);

-/*!
- * \brief Fees a node contents.
- */
-void Parser_freeNodeContent(
-	/*! [in] The Node to process. */
-	IXML_Node *IXML_Nodeptr);
+int     ixmlElement_setTagName(IXML_Element *element, const char *tagName);

-int Parser_LoadDocument(IXML_Document **retDoc, const char * xmlFile, BOOL file);
+void    ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap);
+int     ixmlNamedNodeMap_addToNamedNodeMap(IXML_NamedNodeMap **nnMap, IXML_Node *add);

-int Parser_setNodePrefixAndLocalName(IXML_Node *newIXML_NodeIXML_Attr);
+void    ixmlNode_init(IXML_Node *IXML_Nodeptr);
+BOOL    ixmlNode_compare(IXML_Node *srcIXML_Node, IXML_Node *destIXML_Node);

+void    ixmlNode_getElementsByTagName( IXML_Node *n, const char *tagname, IXML_NodeList **list);
+void    ixmlNode_getElementsByTagNameNS( IXML_Node *IXML_Node, const char *namespaceURI,
+                const char *localName, IXML_NodeList **list);

-void ixmlAttr_init(IXML_Attr *attrNode);
+int     ixmlNode_setNodeProperties(IXML_Node* node, IXML_Node *src);
+int     ixmlNode_setNodeName( IXML_Node* node, const DOMString qualifiedName);

-/*!
- * \brief Set the given element's tagName.
- *
- * \return One of the following:
- * 	\li \b IXML_SUCCESS, if successfull.
- * 	\li \b IXML_FAILED, if element of tagname is \b NULL.
- * 	\li \b IXML_INSUFFICIENT_MEMORY, if there is no memory to allocate the
- * 		buffer for the element's tagname.
- */
-int ixmlElement_setTagName(
-	/*! [in] The element to change the tagname. */
-	IXML_Element *element,
-	/*! [in] The new tagName for the element. */
-	const char *tagName);
+void    ixmlNodeList_init(IXML_NodeList *nList);
+int     ixmlNodeList_addToNodeList(IXML_NodeList **nList, IXML_Node *add);

-
-/*!
- * \brief Initializes a NamedNodeMap object.
- */
-void ixmlNamedNodeMap_init(
-	/*! [in] The named node map to process. */
-	IXML_NamedNodeMap *nnMap);
-
-
-/*!
- * \brief Add a node to a NamedNodeMap.
- *
- * \return IXML_SUCCESS or failure.
- */
-int ixmlNamedNodeMap_addToNamedNodeMap(
-	/* [in] The named node map. */
-	IXML_NamedNodeMap **nnMap,
-	/* [in] The node to add. */
-	IXML_Node *add);
-
-/*!
- * \brief Add a node to nodelist.
- */
-int ixmlNodeList_addToNodeList(
-	/*! [in] The pointer to the nodelist. */
-	IXML_NodeList **nList,
-	/*! [in] The node to add. */
-	IXML_Node *add);
-
-
-/*!
- * \brief Intializes a node.
- */
-void ixmlNode_init(
-	/*! [in] The \b Node to iniatialize. */
-	IN IXML_Node *nodeptr);
-
-
-/*!
- * \brief Compare two nodes to see whether they are the same node.
- * Parent, sibling and children node are ignored.
- *
- * \return
- * 	\li TRUE, the two nodes are the same.
- * 	\li FALSE, the two nodes are not the same.
- */
-BOOL ixmlNode_compare(
-	/*! [in] The first \b Node. */
-	IXML_Node *srcNode,
-	/*! [in] The second \b Node. */
- 	IXML_Node *destNode);
-
-
-/*!
- * \brief Returns a nodeList of all descendant Elements with a given tagName,
- * in the order in which they are encountered in a traversal of this element
- * tree.
- */
-void ixmlNode_getElementsByTagName(
-	/*! [in] The \b Node tree. */
-	IXML_Node *n,
-	/*! [in] The tag name to match. */
-	const char *tagname,
-	/*! [out] The output \b NodeList. */
-	IXML_NodeList **list);
-
-
-/*!
- * \brief Returns a nodeList of all the descendant Elements with a given local
- * name and namespace URI in the order in which they are encountered in a
- * preorder traversal of this Elememt tree.		
- */
-void ixmlNode_getElementsByTagNameNS(
-	/*! [in] The \b Element tree. */
-	IXML_Node *n,
-	/*! [in] The name space to match. */
-	const char *namespaceURI,
-	/*! [in] The local name to match. */
-	const char *localName,
-	/*! [out] The output \b NodeList. */
-	IXML_NodeList **list);
-
-
-/*!
- * \brief 
- *
- * \return 
- */
-int ixmlNode_setNodeName(
-	/*! [in] The \b Node. */
-	IXML_Node *node,
-	/*! [in] . */
-	const DOMString qualifiedName);
-
-
-/*!
- * \brief 
- *
- * \return 
- */
-int ixmlNode_setNodeProperties(
-	/*! [in] . */
-	IXML_Node *destNode,
-	/*! [in] . */
-	IXML_Node *src);
-
-
-/*!
- * \brief Initializes a nodelist 
- */
-void ixmlNodeList_init(
-	/*! [in,out] The \b NodeList to initialize. */
-	IXML_NodeList *nList);
-
-
-#endif  /* IXMLPARSER_H */
+#endif  // _IXMLPARSER_H

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

-
-/*!
- * \file
- */
-
-
-#include "ixmldebug.h"
 #include "ixmlmembuf.h"
 #include "ixmlparser.h"

-
-#include <stdlib.h> /* for free() */
-#include <string.h>
-
-
-/*!
- * \brief Appends a string to a buffer, substituting some characters by escape
- * sequences.
- */
-static void copy_with_escape(
-	/*! [in,out] The input/output buffer. */
-	ixml_membuf *buf,
-	/*! [in] The string to copy from. */
-	const char *p)
+/*================================================================
+*   copy_with_escape
+*
+*
+*=================================================================*/
+static void
+copy_with_escape( INOUT ixml_membuf * buf,
+                  IN const char *p )
 {
-	size_t i;
-	size_t plen;
+    int i;
+    int plen;

-	if (p == NULL)
-		return;
-	plen = strlen(p);
-	for (i = 0; i < plen; ++i) {
-		switch (p[i]) {
-		case '<':
-			ixml_membuf_append_str(buf, "&lt;");
-			break;
-		case '>':
-			ixml_membuf_append_str(buf, "&gt;");
-			break;
-		case '&':
-			ixml_membuf_append_str(buf, "&amp;");
-			break;
-		case '\'':
-			ixml_membuf_append_str(buf, "&apos;");
-			break;
-		case '\"':
-			ixml_membuf_append_str(buf, "&quot;");
-			break;
-		default:
-			ixml_membuf_append(buf, &p[i]);
-			break;
-		}
-	}
+    if( p == NULL )
+        return;
+
+    plen = strlen( p );
+
+    for( i = 0; i < plen; i++ ) {
+        switch ( p[i] ) {
+            case '<':
+                ixml_membuf_append_str( buf, "&lt;" );
+                break;
+
+            case '>':
+                ixml_membuf_append_str( buf, "&gt;" );
+                break;
+
+            case '&':
+                ixml_membuf_append_str( buf, "&amp;" );
+                break;
+
+            case '\'':
+                ixml_membuf_append_str( buf, "&apos;" );
+                break;
+
+            case '\"':
+                ixml_membuf_append_str( buf, "&quot;" );
+                break;
+
+            default:
+                ixml_membuf_append( buf, &p[i] );
+        }
+    }
+}
+
+/*================================================================
+*	ixmlPrintDomTreeRecursive
+*       It is a recursive function to print all the node in a tree.
+*       Internal to parser only.
+*
+*=================================================================*/
+void
+ixmlPrintDomTreeRecursive( IN IXML_Node * nodeptr,
+                           IN ixml_membuf * buf )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL,
+     *sibling = NULL;
+
+    if( nodeptr != NULL ) {
+        nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+        nodeValue = ixmlNode_getNodeValue( nodeptr );
+
+        switch ( ixmlNode_getNodeType( nodeptr ) ) {
+
+            case eTEXT_NODE:
+                copy_with_escape( buf, nodeValue );
+                break;
+
+            case eCDATA_SECTION_NODE:
+                ixml_membuf_append_str( buf, "<![CDATA[" );
+                ixml_membuf_append_str( buf, nodeValue );
+                ixml_membuf_append_str( buf, "]]>" );
+                break;
+
+            case ePROCESSING_INSTRUCTION_NODE:
+                ixml_membuf_append_str( buf, "<?" );
+                ixml_membuf_append_str( buf, nodeName );
+                ixml_membuf_append_str( buf, " " );
+                copy_with_escape( buf, nodeValue );
+                ixml_membuf_append_str( buf, "?>\n" );
+                break;
+
+            case eDOCUMENT_NODE:
+                ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild
+                                           ( nodeptr ), buf );
+                break;
+
+            case eATTRIBUTE_NODE:
+                ixml_membuf_append_str( buf, nodeName );
+                ixml_membuf_append_str( buf, "=\"" );
+                copy_with_escape( buf, nodeValue );
+                ixml_membuf_append_str( buf, "\"" );
+
+                if( nodeptr->nextSibling != NULL ) {
+                    ixml_membuf_append_str( buf, " " );
+                    ixmlPrintDomTreeRecursive( nodeptr->nextSibling, buf );
+                }
+                break;
+
+            case eELEMENT_NODE:
+                ixml_membuf_append_str( buf, "<" );
+                ixml_membuf_append_str( buf, nodeName );
+
+                if( nodeptr->firstAttr != NULL ) {
+                    ixml_membuf_append_str( buf, " " );
+                    ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+                }
+
+                child = ixmlNode_getFirstChild( nodeptr );
+                if( ( child != NULL )
+                    && ( ixmlNode_getNodeType( child ) ==
+                         eELEMENT_NODE ) ) {
+                    ixml_membuf_append_str( buf, ">\r\n" );
+                } else {
+                    ixml_membuf_append_str( buf, ">" );
+                }
+
+                //  output the children
+                ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild
+                                           ( nodeptr ), buf );
+
+                // Done with children.  Output the end tag.
+                ixml_membuf_append_str( buf, "</" );
+                ixml_membuf_append_str( buf, nodeName );
+
+                sibling = ixmlNode_getNextSibling( nodeptr );
+                if( sibling != NULL
+                    && ixmlNode_getNodeType( sibling ) == eTEXT_NODE ) {
+                    ixml_membuf_append_str( buf, ">" );
+                } else {
+                    ixml_membuf_append_str( buf, ">\r\n" );
+                }
+                ixmlPrintDomTreeRecursive( ixmlNode_getNextSibling
+                                           ( nodeptr ), buf );
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+/*================================================================
+*   ixmlPrintDomTree
+*       Print a DOM tree.
+*       Element, and Attribute nodes are handled differently.
+*       We don't want to print the Element and Attribute nodes' sibling.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlPrintDomTree( IN IXML_Node * nodeptr,
+                  IN ixml_membuf * buf )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL;
+
+    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+        return;
+    }
+
+    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+    nodeValue = ixmlNode_getNodeValue( nodeptr );
+
+    switch ( ixmlNode_getNodeType( nodeptr ) ) {
+
+        case eTEXT_NODE:
+        case eCDATA_SECTION_NODE:
+        case ePROCESSING_INSTRUCTION_NODE:
+        case eDOCUMENT_NODE:
+            ixmlPrintDomTreeRecursive( nodeptr, buf );
+            break;
+
+        case eATTRIBUTE_NODE:
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, "=\"" );
+            copy_with_escape( buf, nodeValue );
+            ixml_membuf_append_str( buf, "\"" );
+            break;
+
+        case eELEMENT_NODE:
+            ixml_membuf_append_str( buf, "<" );
+            ixml_membuf_append_str( buf, nodeName );
+
+            if( nodeptr->firstAttr != NULL ) {
+                ixml_membuf_append_str( buf, " " );
+                ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+            }
+
+            child = ixmlNode_getFirstChild( nodeptr );
+            if( ( child != NULL )
+                && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
+                ixml_membuf_append_str( buf, ">\r\n" );
+            } else {
+                ixml_membuf_append_str( buf, ">" );
+            }
+
+            //  output the children
+            ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild( nodeptr ),
+                                       buf );
+
+            // Done with children.  Output the end tag.
+            ixml_membuf_append_str( buf, "</" );
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, ">\r\n" );
+            break;
+
+        default:
+            break;
+    }
+}
+
+/*================================================================
+*   ixmlDomTreetoString
+*       Converts a DOM tree into a text string
+*       Element, and Attribute nodes are handled differently.
+*       We don't want to print the Element and Attribute nodes' sibling.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlDomTreetoString( IN IXML_Node * nodeptr,
+                     IN ixml_membuf * buf )
+{
+    const char *nodeName = NULL;
+    const char *nodeValue = NULL;
+    IXML_Node *child = NULL;
+
+    if( ( nodeptr == NULL ) || ( buf == NULL ) ) {
+        return;
+    }
+
+    nodeName = ( const char * )ixmlNode_getNodeName( nodeptr );
+    nodeValue = ixmlNode_getNodeValue( nodeptr );
+
+    switch ( ixmlNode_getNodeType( nodeptr ) ) {
+
+        case eTEXT_NODE:
+        case eCDATA_SECTION_NODE:
+        case ePROCESSING_INSTRUCTION_NODE:
+        case eDOCUMENT_NODE:
+            ixmlPrintDomTreeRecursive( nodeptr, buf );
+            break;
+
+        case eATTRIBUTE_NODE:
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, "=\"" );
+            copy_with_escape( buf, nodeValue );
+            ixml_membuf_append_str( buf, "\"" );
+            break;
+
+        case eELEMENT_NODE:
+            ixml_membuf_append_str( buf, "<" );
+            ixml_membuf_append_str( buf, nodeName );
+
+            if( nodeptr->firstAttr != NULL ) {
+                ixml_membuf_append_str( buf, " " );
+                ixmlPrintDomTreeRecursive( nodeptr->firstAttr, buf );
+            }
+
+            child = ixmlNode_getFirstChild( nodeptr );
+            if( ( child != NULL )
+                && ( ixmlNode_getNodeType( child ) == eELEMENT_NODE ) ) {
+                ixml_membuf_append_str( buf, ">" );
+            } else {
+                ixml_membuf_append_str( buf, ">" );
+            }
+
+            //  output the children
+            ixmlPrintDomTreeRecursive( ixmlNode_getFirstChild( nodeptr ),
+                                       buf );
+
+            // Done with children.  Output the end tag.
+            ixml_membuf_append_str( buf, "</" );
+            ixml_membuf_append_str( buf, nodeName );
+            ixml_membuf_append_str( buf, ">" );
+            break;
+
+        default:
+            break;
+    }
+}
+
+/*================================================================
+*   ixmlLoadDocumentEx
+*       Parses the given file, and returns the DOM tree from it.
+*       External function.
+*
+*=================================================================*/
+int
+ixmlLoadDocumentEx( IN const char *xmlFile,
+                    IXML_Document ** doc )
+{
+
+    if( ( xmlFile == NULL ) || ( doc == NULL ) ) {
+        return IXML_INVALID_PARAMETER;
+    }
+
+    return Parser_LoadDocument( doc, xmlFile, TRUE );
+}
+
+/*================================================================
+*   ixmlLoadDocument
+*       Parses the given file, and returns the DOM tree from it.
+*       External function.
+*
+*=================================================================*/
+IXML_Document *
+ixmlLoadDocument( IN const char *xmlFile )
+{
+
+    IXML_Document *doc = NULL;
+
+    ixmlLoadDocumentEx( xmlFile, &doc );
+    return doc;
+}
+
+/*================================================================
+*   ixmlPrintDocument
+*       Prints entire document, prepending XML prolog first.
+*       Puts lots of white spaces.
+*       External function.
+*
+*=================================================================*/
+
+DOMString
+ixmlPrintDocument(IXML_Document *doc)
+{
+    IXML_Node* rootNode = ( IXML_Node * )doc;
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( rootNode == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
+    ixmlPrintDomTree( rootNode, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlPrintNode
+*       Print DOM tree under node. Puts lots of white spaces
+*       External function.
+*
+*=================================================================*/
+DOMString
+ixmlPrintNode( IN IXML_Node * node )
+{
+
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( node == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixmlPrintDomTree( node, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlDocumenttoString
+*       converts DOM tree under node to text string,
+*       prepending XML prolog first.
+*       External function.
+*
+*=================================================================*/
+
+DOMString
+ixmlDocumenttoString(IXML_Document *doc)
+{
+    IXML_Node* rootNode = ( IXML_Node * )doc;
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( rootNode == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixml_membuf_append_str( buf, "<?xml version=\"1.0\"?>\r\n" );
+    ixmlDomTreetoString( rootNode, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlNodetoString
+*       converts DOM tree under node to text string
+*       External function.
+*
+*=================================================================*/
+DOMString
+ixmlNodetoString( IN IXML_Node * node )
+{
+
+    ixml_membuf memBuf;
+    ixml_membuf *buf = &memBuf;
+
+    if( node == NULL ) {
+        return NULL;
+    }
+
+    ixml_membuf_init( buf );
+    ixmlDomTreetoString( node, buf );
+    return buf->buf;
+
+}
+
+/*================================================================
+*   ixmlRelaxParser
+*       Makes the XML parser more tolerant to malformed text.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlRelaxParser(char errorChar)
+{
+    Parser_setErrorChar( errorChar );
 }


-/*!
- * \brief Recursive function to print all the node in a tree.
- * Internal to parser only.
- */
-static void ixmlPrintDomTreeRecursive(
-	/*! [in] \todo documentation. */
-	IXML_Node *nodeptr,
-	/*! [in] \todo documentation. */
-	ixml_membuf *buf)
+/*================================================================
+*   ixmlParseBufferEx
+*       Parse xml file stored in buffer.
+*       External function.
+*
+*=================================================================*/
+int
+ixmlParseBufferEx( IN const char *buffer,
+                   IXML_Document ** retDoc )
 {
-	const char *nodeName = NULL;
-	const char *nodeValue = NULL;
-	IXML_Node *child = NULL,
-	*sibling = NULL;

-	if (nodeptr != NULL) {
-		nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
-		nodeValue = ixmlNode_getNodeValue(nodeptr);
-		
-		switch (ixmlNode_getNodeType(nodeptr)) {
-		case eTEXT_NODE:
-			copy_with_escape(buf, nodeValue);
-			break;
+    if( ( buffer == NULL ) || ( retDoc == NULL ) ) {
+        return IXML_INVALID_PARAMETER;
+    }

-		case eCDATA_SECTION_NODE:
-			ixml_membuf_append_str(buf, "<![CDATA[");
-			ixml_membuf_append_str(buf, nodeValue);
-			ixml_membuf_append_str(buf, "]]>");
-			break;
+    if( buffer[0] == '\0' ) {
+        return IXML_INVALID_PARAMETER;
+    }

-		case ePROCESSING_INSTRUCTION_NODE:
-			ixml_membuf_append_str(buf, "<?");
-			ixml_membuf_append_str(buf, nodeName);
-			ixml_membuf_append_str(buf, " ");
-			copy_with_escape(buf, nodeValue);
-			ixml_membuf_append_str(buf, "?>\n");
-			break;
-
-		case eDOCUMENT_NODE:
-			ixmlPrintDomTreeRecursive(
-				ixmlNode_getFirstChild(nodeptr), buf);
-			break;
-
-		case eATTRIBUTE_NODE:
-			ixml_membuf_append_str(buf, nodeName);
-			ixml_membuf_append_str(buf, "=\"");
-			copy_with_escape(buf, nodeValue);
-			ixml_membuf_append_str(buf, "\"");
-			if (nodeptr->nextSibling != NULL) {
-				ixml_membuf_append_str(buf, " ");
-				ixmlPrintDomTreeRecursive(nodeptr->nextSibling, buf);
-			}
-			break;
-
-		case eELEMENT_NODE:
-			ixml_membuf_append_str(buf, "<");
-			ixml_membuf_append_str(buf, nodeName);
-			if (nodeptr->firstAttr != NULL) {
-				ixml_membuf_append_str(buf, " ");
-				ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
-			}
-			child = ixmlNode_getFirstChild(nodeptr);
-			if (child != NULL &&
-			    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
-				ixml_membuf_append_str(buf, ">\r\n");
-			} else {
-				ixml_membuf_append_str(buf, ">");
-			}
-			/* output the children */
-			ixmlPrintDomTreeRecursive(
-				ixmlNode_getFirstChild(nodeptr), buf);
-
-			/* Done with children.  Output the end tag. */
-			ixml_membuf_append_str(buf, "</");
-			ixml_membuf_append_str(buf, nodeName);
-
-			sibling = ixmlNode_getNextSibling(nodeptr);
-			if (sibling != NULL &&
-			    ixmlNode_getNodeType(sibling) == eTEXT_NODE) {
-				ixml_membuf_append_str( buf, ">" );
-			} else {
-				ixml_membuf_append_str( buf, ">\r\n" );
-			}
-			ixmlPrintDomTreeRecursive(
-				ixmlNode_getNextSibling(nodeptr), buf);
-			break;
-
-		default:
-			IxmlPrintf(__FILE__, __LINE__, "ixmlPrintDomTreeRecursive",
-				"Warning, unknown node type %d\n",
-				ixmlNode_getNodeType(nodeptr));
-			break;
-		}
-	}
+    return Parser_LoadDocument( retDoc, buffer, FALSE );
 }

-
-/*!
- * \brief Print a DOM tree.
- *
- * Element, and Attribute nodes are handled differently. We don't want to print
- * the Element and Attribute nodes' sibling.
- */
-static void ixmlPrintDomTree(
-	/*! [in] \todo documentation. */
-	IXML_Node *nodeptr,
-	/*! [in] \todo documentation. */
-	ixml_membuf *buf)
+/*================================================================
+*   ixmlParseBuffer
+*       Parse xml file stored in buffer.
+*       External function.
+*
+*=================================================================*/
+IXML_Document *
+ixmlParseBuffer( IN const char *buffer )
 {
-	const char *nodeName = NULL;
-	const char *nodeValue = NULL;
-	IXML_Node *child = NULL;
+    IXML_Document *doc = NULL;

-	if (nodeptr == NULL || buf == NULL) {
-		return;
-	}
-
-	nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
-	nodeValue = ixmlNode_getNodeValue(nodeptr);
-	switch (ixmlNode_getNodeType(nodeptr)) {
-	case eTEXT_NODE:
-	case eCDATA_SECTION_NODE:
-	case ePROCESSING_INSTRUCTION_NODE:
-	case eDOCUMENT_NODE:
-		ixmlPrintDomTreeRecursive(nodeptr, buf);
-		break;
-
-	case eATTRIBUTE_NODE:
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, "=\"");
-		copy_with_escape(buf, nodeValue);
-		ixml_membuf_append_str(buf, "\"");
-		break;
-
-	case eELEMENT_NODE:
-		ixml_membuf_append_str(buf, "<");
-		ixml_membuf_append_str(buf, nodeName);
-		if (nodeptr->firstAttr != NULL) {
-			ixml_membuf_append_str(buf, " ");
-			ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
-		}
-		child = ixmlNode_getFirstChild(nodeptr);
-		if (child != NULL &&
-		    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
-			ixml_membuf_append_str(buf, ">\r\n");
-		} else {
-			ixml_membuf_append_str(buf, ">");
-		}
-
-		/* output the children */
-		ixmlPrintDomTreeRecursive(
-			ixmlNode_getFirstChild(nodeptr), buf);
-
-		/* Done with children. Output the end tag. */
-		ixml_membuf_append_str(buf, "</");
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, ">\r\n");
-		break;
-
-	default:
-		IxmlPrintf(__FILE__, __LINE__, "ixmlPrintDomTree",
-			"Warning, unknown node type %d\n",
-			ixmlNode_getNodeType(nodeptr));
-		break;
-	}
+    ixmlParseBufferEx( buffer, &doc );
+    return doc;
 }

-
-/*!
- * \brief Converts a DOM tree into a text string.
- *
- * Element, and Attribute nodes are handled differently. We don't want to print
- * the Element and Attribute nodes' sibling.
- */
-static void ixmlDomTreetoString(
-	/*! [in] \todo documentation. */
-	IXML_Node *nodeptr,
-	/*! [in] \todo documentation. */
-	ixml_membuf *buf)
+/*================================================================
+*   ixmlCloneDOMString
+*       Clones a DOM String.
+*       External function.
+*
+*=================================================================*/
+DOMString
+ixmlCloneDOMString( IN const DOMString src )
 {
-	const char *nodeName = NULL;
-	const char *nodeValue = NULL;
-	IXML_Node *child = NULL;
+    if( src == NULL ) {
+        return NULL;
+    }

-	if (nodeptr == NULL || buf == NULL) {
-		return;
-	}
-
-	nodeName = (const char *)ixmlNode_getNodeName(nodeptr);
-	nodeValue = ixmlNode_getNodeValue(nodeptr);
-
-	switch (ixmlNode_getNodeType(nodeptr)) {
-	case eTEXT_NODE:
-	case eCDATA_SECTION_NODE:
-	case ePROCESSING_INSTRUCTION_NODE:
-	case eDOCUMENT_NODE:
-		ixmlPrintDomTreeRecursive(nodeptr, buf);
-		break;
-
-	case eATTRIBUTE_NODE:
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, "=\"");
-		copy_with_escape(buf, nodeValue );
-		ixml_membuf_append_str(buf, "\"");
-		break;
-
-	case eELEMENT_NODE:
-		ixml_membuf_append_str(buf, "<");
-		ixml_membuf_append_str(buf, nodeName);
-		if (nodeptr->firstAttr != NULL) {
-			ixml_membuf_append_str(buf, " ");
-			ixmlPrintDomTreeRecursive(nodeptr->firstAttr, buf);
-		}
-		child = ixmlNode_getFirstChild(nodeptr);
-		if (child != NULL &&
-		    ixmlNode_getNodeType(child) == eELEMENT_NODE) {
-			ixml_membuf_append_str(buf, ">");
-		} else {
-			ixml_membuf_append_str(buf, ">");
-		}
-
-		/* output the children */
-		ixmlPrintDomTreeRecursive(ixmlNode_getFirstChild(nodeptr), buf);
-
-		/* Done with children. Output the end tag. */
-		ixml_membuf_append_str(buf, "</");
-		ixml_membuf_append_str(buf, nodeName);
-		ixml_membuf_append_str(buf, ">");
-		break;
-
-	default:
-		IxmlPrintf(__FILE__, __LINE__, "ixmlPrintDomTreeRecursive",
-			"Warning, unknown node type %d\n",
-			ixmlNode_getNodeType(nodeptr));
-		break;
-	}
+    return ( strdup( src ) );
 }

-
-int ixmlLoadDocumentEx(const char *xmlFile, IXML_Document **doc)
+/*================================================================
+*   ixmlFreeDOMString
+*       Frees a DOM String.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlFreeDOMString( IN DOMString buf )
 {
-	if (xmlFile == NULL || doc == NULL) {
-		return IXML_INVALID_PARAMETER;
-	}
-
-	return Parser_LoadDocument(doc, xmlFile, TRUE);
+    if( buf != NULL ) {
+        free( buf );
+    }
 }
-
-
-IXML_Document *ixmlLoadDocument(const char *xmlFile)
-{
-	IXML_Document *doc = NULL;
-
-	ixmlLoadDocumentEx(xmlFile, &doc);
-
-	return doc;
-}
-
-
-DOMString ixmlPrintDocument(IXML_Document *doc)
-{
-	IXML_Node* rootNode = (IXML_Node *)doc;
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if(rootNode == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixml_membuf_append_str(buf, "<?xml version=\"1.0\"?>\r\n");
-	ixmlPrintDomTree(rootNode, buf);
-
-	return buf->buf;
-}
-
-
-DOMString ixmlPrintNode(IXML_Node *node)
-{
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if (node == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixmlPrintDomTree(node, buf);
-
-	return buf->buf;
-}
-
-
-DOMString ixmlDocumenttoString(IXML_Document *doc)
-{
-	IXML_Node* rootNode = (IXML_Node *)doc;
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if(rootNode == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixml_membuf_append_str(buf, "<?xml version=\"1.0\"?>\r\n");
-	ixmlDomTreetoString(rootNode, buf);
-
-	return buf->buf;
-}
-
-
-DOMString ixmlNodetoString(IXML_Node *node)
-{
-	ixml_membuf memBuf;
-	ixml_membuf *buf = &memBuf;
-
-	if (node == NULL) {
-		return NULL;
-	}
-
-	ixml_membuf_init(buf);
-	ixmlDomTreetoString(node, buf);
-
-	return buf->buf;
-}
-
-
-void ixmlRelaxParser(char errorChar)
-{
-	Parser_setErrorChar(errorChar);
-}
-
-
-int ixmlParseBufferEx(const char *buffer, IXML_Document **retDoc)
-{
-	if (buffer == NULL || retDoc == NULL) {
-		return IXML_INVALID_PARAMETER;
-	}
-
-	if (buffer[0] == '\0') {
-		return IXML_INVALID_PARAMETER;
-	}
-
-	return Parser_LoadDocument(retDoc, buffer, FALSE);
-}
-
-
-IXML_Document *ixmlParseBuffer(const char *buffer)
-{
-	IXML_Document *doc = NULL;
-
-	ixmlParseBufferEx(buffer, &doc);
-
-	return doc;
-}
-
-
-DOMString ixmlCloneDOMString(const DOMString src)
-{
-	if (src == NULL) {
-		return NULL;
-	}
-
-	return strdup(src);
-}
-
-
-void ixmlFreeDOMString(DOMString buf)
-{
-	if (buf != NULL) {
-		free(buf);
-	}
-}
-
--- a/ixml/src/ixmldebug.c
+++ b/ixml/src/ixmldebug.c
@@ -1,70 +0,0 @@
-
-
-/*!
- * \file
- */
-
-
-#include "autoconfig.h"
-
-
-#include "ixmldebug.h"
-
-
-#include <stdarg.h>
-#include <stdio.h>
-
-
-#ifdef DEBUG
-void IxmlPrintf(
-	const char *DbgFileName,
-	int DbgLineNo,
-	const char *FunctionName,
-	const char *FmtStr,
-	...)
-{
-	va_list ArgList;
-	
-	FILE *fp = stdout;
-	fprintf(fp, "(%s::%s), line %d", DbgFileName, FunctionName, DbgLineNo);
-	if (FmtStr) {
-		fprintf(fp, ": ");
-		va_start(ArgList, FmtStr);
-		vfprintf(fp, FmtStr, ArgList);
-		fflush(fp);
-		va_end(ArgList);
-	} else {
-		fprintf(fp, "\n");
-	}
-}
-
-
-void printNodes(IXML_Node *tmpRoot, int depth)
-{
-    unsigned long i;
-    IXML_NodeList *NodeList1;
-    IXML_Node *ChildNode1;
-    unsigned short NodeType;
-    const DOMString NodeValue;
-    const DOMString NodeName;
-    NodeList1 = ixmlNode_getChildNodes(tmpRoot);
-    for (i = 0; i < 100; ++i) {
-        ChildNode1 = ixmlNodeList_item(NodeList1, i);
-        if (ChildNode1 == NULL) {
-            break;
-        }
-    
-        printNodes(ChildNode1, depth+1);
-        NodeType = ixmlNode_getNodeType(ChildNode1);
-        NodeValue = ixmlNode_getNodeValue(ChildNode1);
-        NodeName = ixmlNode_getNodeName(ChildNode1);
-	IxmlPrintf(__FILE__, __LINE__, "printNodes",
-            "DEPTH-%2d-IXML_Node Type %d, "
-            "IXML_Node Name: %s, IXML_Node Value: %s\n",
-            depth, NodeType, NodeName, NodeValue);
-    }
-}
-
-
-#endif
-
--- a/ixml/src/ixmlmembuf.c
+++ b/ixml/src/ixmlmembuf.c
@@ -1,218 +1,236 @@
-/**************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- **************************************************************************/
-
-
-/*!
- * \file
- */
-
-
-#include "ixmlmembuf.h"
-#include "ixml.h"
-
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////

 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include "ixmlmembuf.h"
+#include "ixml.h"

-
-/*!
- * \brief Increases or decreases buffer capacity so that at least 'new_length'
- * bytes can be stored.
- *
- * On error, m's fields do not change.
- *
- * \return
- * 	\li UPNP_E_SUCCESS
- * 	\li UPNP_E_OUTOF_MEMORY
- */
-static int ixml_membuf_set_size(
-	/*! [in,out] The memory buffer. */
-	INOUT ixml_membuf *m,
-	/*! [in] The new lenght. */
-	IN size_t new_length)
+/*================================================================
+*   ixml_membuf_set_size
+*
+*   Increases or decreases buffer cap so that at least
+*   'new_length' bytes can be stored
+*
+*   On error, m's fields do not change.
+*
+*   returns:
+*       UPNP_E_SUCCESS
+*       UPNP_E_OUTOF_MEMORY
+*
+*=================================================================*/
+static int
+ixml_membuf_set_size( INOUT ixml_membuf * m,
+                      IN size_t new_length )
 {
-	size_t diff;
-	size_t alloc_len;
-	char *temp_buf;
+    size_t diff;
+    size_t alloc_len;
+    char *temp_buf;

-	if (new_length >= m->length) {
-		/* increase length */
-		/* need more mem? */
-		if (new_length <= m->capacity) {
-			/* have enough mem; done */
-			return 0;
-		}
+    if( new_length >= m->length )   // increase length
+    {
+        // need more mem?
+        if( new_length <= m->capacity ) {
+            return 0;           // have enough mem; done
+        }

-		diff = new_length - m->length;
-		alloc_len = MAXVAL(m->size_inc, diff) + m->capacity;
-	} else {
-		/* decrease length */
-		assert(new_length <= m->length);
+        diff = new_length - m->length;
+        alloc_len = MAXVAL( m->size_inc, diff ) + m->capacity;
+    } else                      // decrease length
+    {
+        assert( new_length <= m->length );

-		/* if diff is 0..m->size_inc, don't free */
-		if ((m->capacity - new_length) <= m->size_inc) {
-			return 0;
-		}
-		alloc_len = new_length + m->size_inc;
-	}
+        // if diff is 0..m->size_inc, don't free
+        if( ( m->capacity - new_length ) <= m->size_inc ) {
+            return 0;
+        }

-	assert(alloc_len >= new_length);
+        alloc_len = new_length + m->size_inc;
+    }

-	temp_buf = realloc(m->buf, alloc_len + 1);
-	if (temp_buf == NULL) {
-		/* try smaller size */
-		alloc_len = new_length;
-		temp_buf = realloc(m->buf, alloc_len + 1);
-		if (temp_buf == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-	}
-	/* save */
-	m->buf = temp_buf;
-	m->capacity = alloc_len;
+    assert( alloc_len >= new_length );

-	return 0;
+    temp_buf = realloc( m->buf, alloc_len + 1 );
+    if( temp_buf == NULL ) {
+        // try smaller size
+        alloc_len = new_length;
+        temp_buf = realloc( m->buf, alloc_len + 1 );
+
+        if( temp_buf == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+    }
+    // save
+    m->buf = temp_buf;
+    m->capacity = alloc_len;
+    return 0;
 }

-
-void ixml_membuf_init(ixml_membuf *m)
+/*================================================================
+*   membuffer_init
+*
+*
+*=================================================================*/
+void
+ixml_membuf_init( INOUT ixml_membuf * m )
 {
-	assert(m != NULL);
+    assert( m != NULL );

-	m->size_inc = MEMBUF_DEF_SIZE_INC;
-	m->buf = NULL;
-	m->length = 0;
-	m->capacity = 0;
+    m->size_inc = MEMBUF_DEF_SIZE_INC;
+    m->buf = NULL;
+    m->length = 0;
+    m->capacity = 0;
 }

-
-void ixml_membuf_destroy(ixml_membuf *m)
+/*================================================================
+*   membuffer_destroy
+*
+*
+*=================================================================*/
+void
+ixml_membuf_destroy( INOUT ixml_membuf * m )
 {
-	if (m == NULL) {
-		return;
-	}
+    if( m == NULL ) {
+        return;
+    }

-	free(m->buf);
-	ixml_membuf_init(m);
+    free( m->buf );
+    ixml_membuf_init( m );
 }

-
-int ixml_membuf_assign(
-	ixml_membuf *m,
-	const void *buf,
-	size_t buf_len)
+/*================================================================
+*   ixml_membuf_assign
+*
+*
+*=================================================================*/
+int
+ixml_membuf_assign( INOUT ixml_membuf * m,
+                    IN const void *buf,
+                    IN size_t buf_len )
 {
-	int return_code;
+    int return_code;

-	assert(m != NULL);
+    assert( m != NULL );

-	/* set value to null */
-	if (buf == NULL) {
-		ixml_membuf_destroy(m);
-		return IXML_SUCCESS;
-	}
-	/* alloc mem */
-	return_code = ixml_membuf_set_size(m, buf_len);
-	if (return_code != 0) {
-		return return_code;
-	}
+    // set value to null
+    if( buf == NULL ) {
+        ixml_membuf_destroy( m );
+        return IXML_SUCCESS;
+    }
+    // alloc mem
+    return_code = ixml_membuf_set_size( m, buf_len );
+    if( return_code != 0 ) {
+        return return_code;
+    }
+    // copy
+    memcpy( m->buf, buf, buf_len );
+    m->buf[buf_len] = 0;        // null-terminate

-	/* copy */
-	memcpy(m->buf, buf, buf_len);
+    m->length = buf_len;

-	/* null-terminate */
-	m->buf[buf_len] = 0;
-	m->length = buf_len;
+    return IXML_SUCCESS;

-	return IXML_SUCCESS;
 }

-
-int ixml_membuf_assign_str(
-	ixml_membuf *m,
-	const char *c_str)
+/*================================================================
+*   ixml_membuf_assign_str
+*
+*
+*=================================================================*/
+int
+ixml_membuf_assign_str( INOUT ixml_membuf * m,
+                        IN const char *c_str )
 {
-	return ixml_membuf_assign(m, c_str, strlen(c_str));
+    return ixml_membuf_assign( m, c_str, strlen( c_str ) );
 }

-
-int ixml_membuf_append(
-	INOUT ixml_membuf *m,
-	IN const void *buf)
+/*================================================================
+*   ixml_membuf_append
+*
+*
+*=================================================================*/
+int
+ixml_membuf_append( INOUT ixml_membuf * m,
+                    IN const void *buf )
 {
-	assert(m != NULL);
+    assert( m != NULL );

-	return ixml_membuf_insert(m, buf, 1, m->length);
+    return ixml_membuf_insert( m, buf, 1, m->length );
 }

-
-int ixml_membuf_append_str(
-	INOUT ixml_membuf *m,
-	IN const char *c_str)
+/*================================================================
+*   ixml_membuf_append_str
+*
+*
+*=================================================================*/
+int
+ixml_membuf_append_str( INOUT ixml_membuf * m,
+                        IN const char *c_str )
 {
-	return ixml_membuf_insert(m, c_str, strlen(c_str), m->length);
+    return ixml_membuf_insert( m, c_str, strlen( c_str ), m->length );
 }

-
-int ixml_membuf_insert(
-	INOUT ixml_membuf *m,
-	IN const void *buf,
-	IN size_t buf_len,
-	size_t index)
+/*================================================================
+*   ixml_membuf_insert
+*
+*
+*=================================================================*/
+int
+ixml_membuf_insert( INOUT ixml_membuf * m,
+                    IN const void *buf,
+                    IN size_t buf_len,
+                    int index )
 {
-	int return_code = 0;
+    int return_code;

-	assert(m != NULL);
+    assert( m != NULL );

-	if (index > m->length) {
-		return IXML_INDEX_SIZE_ERR;
-	}
+    if( index < 0 || index > ( int )m->length )
+        return IXML_INDEX_SIZE_ERR;

-	if (buf == NULL || buf_len == 0) {
-		return 0;
-	}
-	/* alloc mem */
-	return_code = ixml_membuf_set_size(m, m->length + buf_len);
-	if (return_code != 0) {
-		return return_code;
-	}
-	/* insert data */
-	/* move data to right of insertion point */
-	memmove(m->buf + index + buf_len, m->buf + index, m->length - index);
-	memcpy(m->buf + index, buf, buf_len);
-	m->length += buf_len;
-	/* Null terminate */
-	m->buf[m->length] = 0;
+    if( buf == NULL || buf_len == 0 ) {
+        return 0;
+    }
+    // alloc mem
+    return_code = ixml_membuf_set_size( m, m->length + buf_len );
+    if( return_code != 0 ) {
+        return return_code;
+    }
+    // insert data
+    // move data to right of insertion point
+    memmove( m->buf + index + buf_len, m->buf + index, m->length - index );
+    memcpy( m->buf + index, buf, buf_len );
+    m->length += buf_len;
+    m->buf[m->length] = 0;      // null-terminate

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

 #include "ixmlparser.h"

-
-#include <assert.h>
-#include <stdlib.h> /* for free(), malloc() */
-#include <string.h>
-
-
-/*!
- * \brief Return the item number of a item in NamedNodeMap.
- */
-static unsigned long ixmlNamedNodeMap_getItemNumber(
-	/*! [in] The named node map to process. */
-	IN IXML_NamedNodeMap *nnMap,
-	/*! [in] The name of the item to find. */
-	IN const char *name)
+/*================================================================
+*   NamedNodeMap_getItemNumber
+*       return the item number of a item in NamedNodeMap.
+*       Internal to parser only.
+*   Parameters:
+*       name: the name of the item to find
+*   
+*=================================================================*/
+unsigned long
+ixmlNamedNodeMap_getItemNumber( IN IXML_NamedNodeMap * nnMap,
+                                IN const char *name )
 {
-	IXML_Node *tempNode;
-	unsigned long returnItemNo = 0;
+    IXML_Node *tempNode;
+    unsigned long returnItemNo = 0;

-	assert(nnMap != NULL && name != NULL);
-	if (nnMap == NULL || name == NULL) {
-		return IXML_INVALID_ITEM_NUMBER;
-	}
+    assert( nnMap != NULL && name != NULL );
+    if( ( nnMap == NULL ) || ( name == NULL ) ) {
+        return IXML_INVALID_ITEM_NUMBER;
+    }

-	tempNode = nnMap->nodeItem;
-	while (tempNode != NULL) {
-		if (strcmp(name, tempNode->nodeName) == 0) {
-			return returnItemNo;
-		}
-		tempNode = tempNode->nextSibling;
-		returnItemNo++;
-	}
+    tempNode = nnMap->nodeItem;
+    while( tempNode != NULL ) {
+        if( strcmp( name, tempNode->nodeName ) == 0 ) {
+            return returnItemNo;
+        }

-	return IXML_INVALID_ITEM_NUMBER;
+        tempNode = tempNode->nextSibling;
+        returnItemNo++;
+    }
+
+    return IXML_INVALID_ITEM_NUMBER;
 }

-
-void ixmlNamedNodeMap_init(IXML_NamedNodeMap *nnMap)
+/*================================================================
+*   NamedNodeMap_init
+*       Initializes a NamedNodeMap object.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNamedNodeMap_init( IN IXML_NamedNodeMap * nnMap )
 {
-	assert(nnMap != NULL);
-
-	memset(nnMap, 0, sizeof (IXML_NamedNodeMap));
+    assert( nnMap != NULL );
+    memset( nnMap, 0, sizeof( IXML_NamedNodeMap ) );
 }

-
-IXML_Node *ixmlNamedNodeMap_getNamedItem(
-	IXML_NamedNodeMap *nnMap,
-	const DOMString name)
+/*================================================================
+*   NamedNodeMap_getNamedItem
+*       Retrieves a node specified by name.
+*       External function.
+*
+*   Parameter:
+*       name: type nodeName of a node to retrieve.
+*
+*   Return Value:
+*       A Node with the specified nodeName, or null if it
+*       does not identify any node in this map.
+*
+*=================================================================*/
+IXML_Node *
+ixmlNamedNodeMap_getNamedItem( IN IXML_NamedNodeMap * nnMap,
+                               IN const char *name )
 {
-	unsigned long index;
+    long index;

-	if (nnMap == NULL || name == NULL) {
-		return NULL;
-	}
+    if( ( nnMap == NULL ) || ( name == NULL ) ) {
+        return NULL;
+    }

-	index = ixmlNamedNodeMap_getItemNumber(nnMap, name);
-	if (index == IXML_INVALID_ITEM_NUMBER) {
-		return NULL;
-	} else {
-		return ixmlNamedNodeMap_item(nnMap, index);
-	}
+    index = ixmlNamedNodeMap_getItemNumber( nnMap, name );
+    if( index == IXML_INVALID_ITEM_NUMBER ) {
+        return NULL;
+    } else {
+        return ( ixmlNamedNodeMap_item( nnMap, ( unsigned long )index ) );
+    }
 }

-
-IXML_Node *ixmlNamedNodeMap_item(
-	IN IXML_NamedNodeMap *nnMap,
-	IN unsigned long index )
+/*================================================================
+*   NamedNodeMap_item
+*       Returns the indexth item in the map. If index is greater than or
+*       equal to the number of nodes in this map, this returns null.
+*       External function.
+*
+*   Parameter:
+*       index: index into this map.
+*
+*   Return Value:
+*       The node at the indexth position in the map, or null if that is
+*       not a valid index.
+*
+*=================================================================*/
+IXML_Node *
+ixmlNamedNodeMap_item( IN IXML_NamedNodeMap * nnMap,
+                       IN unsigned long index )
 {
-	IXML_Node *tempNode;
-	unsigned int i;
+    IXML_Node *tempNode;
+    unsigned int i;

-	if (nnMap == NULL) {
-		return NULL;
-	}
+    if( nnMap == NULL ) {
+        return NULL;
+    }

-	if (index > ixmlNamedNodeMap_getLength(nnMap) - 1) {
-		return NULL;
-	}
+    if( index > ixmlNamedNodeMap_getLength( nnMap ) - 1 ) {
+        return NULL;
+    }

-	tempNode = nnMap->nodeItem;
-	for (i = 0; i < index && tempNode != NULL; ++i) {
-		tempNode = tempNode->nextSibling;
-	}
+    tempNode = nnMap->nodeItem;
+    for( i = 0; i < index && tempNode != NULL; ++i ) {
+        tempNode = tempNode->nextSibling;
+    }

-	return tempNode;
+    return tempNode;
 }

-
-unsigned long ixmlNamedNodeMap_getLength(IXML_NamedNodeMap *nnMap)
+/*================================================================
+*   NamedNodeMap_getLength	
+*       Return the number of Nodes in this map.       
+*       External function.
+*   
+*   Parameters:
+*
+*=================================================================*/
+unsigned long
+ixmlNamedNodeMap_getLength( IN IXML_NamedNodeMap * nnMap )
 {
-	IXML_Node *tempNode;
-	unsigned long length = 0;
+    IXML_Node *tempNode;
+    unsigned long length = 0;

-	if (nnMap != NULL) {
-		tempNode = nnMap->nodeItem;
-		for (length = 0; tempNode != NULL; ++length) {
-			tempNode = tempNode->nextSibling;
-		}
-	}
-
-	return length;
+    if( nnMap != NULL ) {
+        tempNode = nnMap->nodeItem;
+        for( length = 0; tempNode != NULL; ++length ) {
+            tempNode = tempNode->nextSibling;
+        }
+    }
+    return length;
 }

-
-void ixmlNamedNodeMap_free(IXML_NamedNodeMap *nnMap)
+/*================================================================
+*   ixmlNamedNodeMap_free
+*       frees a NamedNodeMap.
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNamedNodeMap_free( IXML_NamedNodeMap * nnMap )
 {
-	IXML_NamedNodeMap *pNext;
+    IXML_NamedNodeMap *pNext;

-	while (nnMap != NULL) {
-		pNext = nnMap->next;
-		free(nnMap);
-		nnMap = pNext;
-	}
+    while( nnMap != NULL ) {
+        pNext = nnMap->next;
+        free( nnMap );
+        nnMap = pNext;
+    }
 }

-
-int ixmlNamedNodeMap_addToNamedNodeMap(
-	IXML_NamedNodeMap **nnMap,
-	IXML_Node *add)
+/*================================================================
+*   NamedNodeMap_addToNamedNodeMap
+*       add a node to a NamedNodeMap.
+*       Internal to parser only.
+*   Parameters:
+*       add: the node to add into NamedNodeMap.
+*   Return:
+*       IXML_SUCCESS or failure.
+*
+*=================================================================*/
+int
+ixmlNamedNodeMap_addToNamedNodeMap( IN IXML_NamedNodeMap ** nnMap,
+                                    IN IXML_Node * add )
 {
-	IXML_NamedNodeMap *traverse = NULL;
-	IXML_NamedNodeMap *p = NULL;
-	IXML_NamedNodeMap *newItem = NULL;
+    IXML_NamedNodeMap *traverse = NULL,
+     *p = NULL;
+    IXML_NamedNodeMap *newItem = NULL;

-	if(add == NULL) {
-		return IXML_SUCCESS;
-	}
+    if( add == NULL ) {
+        return IXML_SUCCESS;
+    }

-	if (*nnMap == NULL) {
-		/* nodelist is empty */
-		*nnMap = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
-		if (*nnMap == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-		ixmlNamedNodeMap_init(*nnMap);
-	}
-	if ((*nnMap)->nodeItem == NULL) {
-		(*nnMap)->nodeItem = add;
-	} else {
-		traverse = *nnMap;
-		p = traverse;
-		while (traverse != NULL) {
-			p = traverse;
-			traverse = traverse->next;
-		}
-		newItem = (IXML_NamedNodeMap *)malloc(sizeof (IXML_NamedNodeMap));
-		if (newItem == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-		p->next = newItem;
-		newItem->nodeItem = add;
-		newItem->next = NULL;
-	}
+    if( *nnMap == NULL )        // nodelist is empty
+    {
+        *nnMap =
+            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
+        if( *nnMap == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+        ixmlNamedNodeMap_init( *nnMap );
+    }

-	return IXML_SUCCESS;
+    if( ( *nnMap )->nodeItem == NULL ) {
+        ( *nnMap )->nodeItem = add;
+    } else {
+        traverse = *nnMap;
+        p = traverse;
+        while( traverse != NULL ) {
+            p = traverse;
+            traverse = traverse->next;
+        }
+
+        newItem =
+            ( IXML_NamedNodeMap * ) malloc( sizeof( IXML_NamedNodeMap ) );
+        if( newItem == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+        p->next = newItem;
+        newItem->nodeItem = add;
+        newItem->next = NULL;
+    }
+
+    return IXML_SUCCESS;
 }
-
--- a/ixml/src/node.c
+++ b/ixml/src/node.c
--- a/ixml/src/nodeList.c
+++ b/ixml/src/nodeList.c
@@ -1,152 +1,176 @@
-/*******************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-
-
-/*!
- * \file
- */
-
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////

 #include "ixmlparser.h"

-
-#include <assert.h>
-#include <string.h>
-
-
-void ixmlNodeList_init(IXML_NodeList *nList)
+/*================================================================
+*   ixmlNodeList_init
+*       initializes a nodelist 
+*       External function.
+*
+*=================================================================*/
+void
+ixmlNodeList_init( IXML_NodeList * nList )
 {
-	assert(nList != NULL);
+    assert( nList != NULL );
+
+    memset( nList, 0, sizeof( IXML_NodeList ) );

-	memset(nList, 0, sizeof (IXML_NodeList));
 }

-
-IXML_Node *ixmlNodeList_item(
-	IXML_NodeList *nList,
-	unsigned long index)
+/*================================================================
+*   ixmlNodeList_item
+*       Returns the indexth item in the collection. If index is greater
+*       than or equal to the number of nodes in the list, this returns 
+*       null.
+*       External function.
+*
+*=================================================================*/
+IXML_Node *
+ixmlNodeList_item( IXML_NodeList * nList,
+                   unsigned long index )
 {
-	IXML_NodeList *next;
-	unsigned int i;
+    IXML_NodeList *next;
+    unsigned int i;

-	/* if the list ptr is NULL */
-	if (nList == NULL) {
-		return NULL;
-	}
-	/* if index is more than list length */
-	if (index > ixmlNodeList_length(nList) - 1) {
-		return NULL;
-	}
+    // if the list ptr is NULL
+    if( nList == NULL ) {
+        return NULL;
+    }
+    // if index is more than list length
+    if( index > ixmlNodeList_length( nList ) - 1 ) {
+        return NULL;
+    }

-	next = nList;
-	for (i = 0; i < index && next != NULL; ++i) {
-		next = next->next;
-	}
+    next = nList;
+    for( i = 0; i < index && next != NULL; ++i ) {
+        next = next->next;
+    }

-	if (next == NULL) {
-		return NULL;
-	}
+    if( next == NULL ) return NULL;
+
+    return next->nodeItem;

-	return next->nodeItem;
 }

-int ixmlNodeList_addToNodeList(
-	IXML_NodeList **nList,
-	IXML_Node *add)
+/*================================================================
+*   ixmlNodeList_addToNodeList
+*       Add a node to nodelist
+*       Internal to parser only.
+*
+*=================================================================*/
+int
+ixmlNodeList_addToNodeList( IN IXML_NodeList ** nList,
+                            IN IXML_Node * add )
 {
-	IXML_NodeList *traverse = NULL;
-	IXML_NodeList *p = NULL;
-	IXML_NodeList *newListItem;
+    IXML_NodeList *traverse,
+     *p = NULL;
+    IXML_NodeList *newListItem;

-	assert(add != NULL);
+    assert( add != NULL );

-	if (add == NULL) {
-		return IXML_FAILED;
-	}
+    if( add == NULL ) {
+        return IXML_FAILED;
+    }

-	if (*nList == NULL) {
-		/* nodelist is empty */
-		*nList = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
-		if (*nList == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
+    if( *nList == NULL )        // nodelist is empty
+    {
+        *nList = ( IXML_NodeList * ) malloc( sizeof( IXML_NodeList ) );
+        if( *nList == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }

-		ixmlNodeList_init(*nList);
-	}
+        ixmlNodeList_init( *nList );
+    }

-	if ((*nList)->nodeItem == NULL) {
-		(*nList)->nodeItem = add;
-	} else {
-		traverse = *nList;
-		while (traverse != NULL) {
-			p = traverse;
-			traverse = traverse->next;
-		}
+    if( ( *nList )->nodeItem == NULL ) {
+        ( *nList )->nodeItem = add;
+    } else {
+        traverse = *nList;
+        while( traverse != NULL ) {
+            p = traverse;
+            traverse = traverse->next;
+        }

-		newListItem = (IXML_NodeList *)malloc(sizeof (IXML_NodeList));
-		if (newListItem == NULL) {
-			return IXML_INSUFFICIENT_MEMORY;
-		}
-		p->next = newListItem;
-		newListItem->nodeItem = add;
-		newListItem->next = NULL;
-	}
+        newListItem =
+            ( IXML_NodeList * ) malloc( sizeof( IXML_NodeList ) );
+        if( newListItem == NULL ) {
+            return IXML_INSUFFICIENT_MEMORY;
+        }
+        p->next = newListItem;
+        newListItem->nodeItem = add;
+        newListItem->next = NULL;
+    }

-	return IXML_SUCCESS;
+    return IXML_SUCCESS;
 }

-
-unsigned long ixmlNodeList_length(IXML_NodeList *nList)
+/*================================================================
+*   ixmlNodeList_length
+*       Returns the number of nodes in the list.  The range of valid
+*       child node indices is 0 to length-1 inclusive.
+*       External function.       
+*
+*=================================================================*/
+unsigned long
+ixmlNodeList_length( IN IXML_NodeList * nList )
 {
-	IXML_NodeList *list;
-	unsigned long length = 0;
+    IXML_NodeList *list;
+    unsigned long length = 0;

-	list = nList;
-	while (list != NULL) {
-		++length;
-		list = list->next;
-	}
+    list = nList;
+    while( list != NULL ) {
+        ++length;
+        list = list->next;
+    }

-	return length;
+    return length;
 }

-
-void ixmlNodeList_free(IXML_NodeList *nList)
+/*================================================================
+*   ixmlNodeList_free
+*       frees a nodeList
+*       External function
+*       
+*=================================================================*/
+void
+ixmlNodeList_free( IN IXML_NodeList * nList )
 {
-	IXML_NodeList *next;
+    IXML_NodeList *next;
+
+    while( nList != NULL ) {
+        next = nList->next;
+
+        free( nList );
+        nList = next;
+    }

-	while (nList != NULL) {
-		next = nList->next;
-		free(nList);
-		nList = next;
-	}
 }
-
--- a/libupnp.pc.in
+++ b/libupnp.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libupnp
 Description: Linux SDK for UPnP Devices
 Version: @VERSION@
-Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
+Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
 Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp

--- a/libupnp.spec
+++ b/libupnp.spec
@@ -1,4 +1,4 @@
-Version: 1.6.13
+Version: 1.6.6
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 1%{?dist}
--- a/threadutil/Makefile.am
+++ b/threadutil/Makefile.am
@@ -1,7 +1,8 @@
+# $Id: Makefile.am,v 1.2 2006/02/27 21:38:56 r3mi Exp $
 #
 # "Makefile.am" for "libupnp/threadutil"
 #
-# (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #

 AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
@@ -18,21 +19,12 @@ lib_LTLIBRARIES		= libthreadutil.la
 libthreadutil_la_LDFLAGS = -version-info $(LT_VERSION_THREADUTIL)

 libthreadutil_la_SOURCES = \
-			inc/FreeList.h \
-			src/FreeList.c \
-			inc/LinkedList.h \
-			src/LinkedList.c \
-			inc/ThreadPool.h \
-			src/ThreadPool.c \
-			inc/TimerThread.h \
-			src/TimerThread.c
+			src/FreeList.c src/LinkedList.c \
+			src/ThreadPool.c src/TimerThread.c

 upnpincludedir		= $(includedir)/upnp
-
 upnpinclude_HEADERS	= \
-			inc/ithread.h \
-			inc/FreeList.h \
-			inc/LinkedList.h \
-			inc/ThreadPool.h \
-			inc/TimerThread.h
+			inc/FreeList.h inc/LinkedList.h \
+			inc/ThreadPool.h inc/TimerThread.h \
+			inc/ithread.h

--- a/threadutil/inc/FreeList.h
+++ b/threadutil/inc/FreeList.h
@@ -32,96 +32,105 @@
 #ifndef FREE_LIST_H
 #define FREE_LIST_H

-/*!
- * \file
- */
-
 #ifdef __cplusplus
 extern "C" {
 #endif

 #include "ithread.h"
-
 #include <errno.h>

-/*!
- * Free list node. points to next free item.
- * Memory for node is borrowed from allocated items.
- * \internal
- */
+/****************************************************************************
+ * Name: FreeListNode
+ *
+ *  Description:
+ *      free list node. points to next free item.
+ *      memory for node is borrowed from allocated items.
+ *      Internal Use Only.
+ *****************************************************************************/
 typedef struct FREELISTNODE
 {
 	struct FREELISTNODE *next;
 } FreeListNode;

-/*!
- * Stores head and size of free list, as well as mutex for protection.
- * \internal
- */
+
+/****************************************************************************
+ * Name: FreeList
+ *
+ *  Description:
+ *      Stores head and size of free list, as well as mutex for protection.
+ *      Internal Use Only.
+ *****************************************************************************/
 typedef struct FREELIST
 {
 	FreeListNode *head;
 	size_t element_size;
 	int maxFreeListLength;
 	int freeListLength;
-} FreeList;
+        
+}FreeList;

-/*!
- * \brief Initializes Free List.
+/****************************************************************************
+ * Function: FreeListInit
 *
- * Must be called first and only once for FreeList.
- *
- * \return:
- *	\li \c 0 on success.
- *	\li \c EINVAL on failure.
- */
-int FreeListInit(
-	/*! Must be valid, non null, pointer to a linked list. */
-	FreeList *free_list,
-	/*! Size of elements to store in free list. */
-	size_t elementSize,
-	/*! Max size that the free list can grow to before returning
-	 * memory to O.S. */
-	int maxFreeListLength);
+ *  Description:
+ *      Initializes Free List. Must be called first.
+ *      And only once for FreeList.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *      size_t -     size of elements to store in free list
+ *      maxFreeListSize - max size that the free list can grow to
+ *                        before returning memory to O.S.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int FreeListInit(FreeList *free_list, 
+				 size_t elementSize, 
+				 int maxFreeListSize);

-/*!
- * \brief Allocates chunk of set size.
+/****************************************************************************
+ * Function: FreeListAlloc
 *
- * If a free item is available in the list, returnes the stored item,
- * otherwise calls the O.S. to allocate memory.
- *
- * \return Non NULL on success. NULL on failure.
- */
-void *FreeListAlloc(
-	/*! Must be valid, non null, pointer to a linked list. */
-	FreeList *free_list);
+ *  Description:
+ *      Allocates chunk of set size.
+ *      If a free item is available in the list, returnes the stored item.
+ *      Otherwise calls the O.S. to allocate memory.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      Non NULL on success. NULL on failure.
+ *****************************************************************************/
+void * FreeListAlloc (FreeList *free_list);

-/*!
- * \brief Returns an item to the Free List.
+/****************************************************************************
+ * Function: FreeListFree
 *
- * If the free list is smaller than the max size then adds the item to the
- * free list, otherwise returns the item to the O.S.
- *
- * \return:
- *	\li \c 0 on success.
- *	\li \c EINVAL on failure.
- */
-int FreeListFree(
-	/*! Must be valid, non null, pointer to a free list. */
-	FreeList *free_list,
-	/*! Must be a pointer allocated by FreeListAlloc. */
-	void *element);
+ *  Description:
+ *      Returns an item to the Free List.
+ *      If the free list is smaller than the max size than
+ *      adds the item to the free list.
+ *      Otherwise returns the item to the O.S.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int FreeListFree (FreeList *free_list,void * element);

-/*!
- * \brief Releases the resources stored with the free list.
+/****************************************************************************
+ * Function: FreeListDestroy
 *
- * \return:
- *	\li \c 0 on success.
- *	\li \c EINVAL on failure.
- */
-int FreeListDestroy(
-	/*! Must be valid, non null, pointer to a linked list. */
-	FreeList *free_list);
+ *  Description:
+ *      Releases the resources stored with the free list.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int FreeListDestroy (FreeList *free_list);
+

 #ifdef __cplusplus
 }
--- a/threadutil/inc/LinkedList.h
+++ b/threadutil/inc/LinkedList.h
@@ -32,10 +32,6 @@
 #ifndef LINKED_LIST_H
 #define LINKED_LIST_H

-/*!
- * \file
- */
-
 #include "FreeList.h"

 #ifdef __cplusplus
@@ -48,238 +44,284 @@ extern "C" {
 #define LIST_SUCCESS 1
 #define LIST_FAIL 0

-/*! Function for freeing list items. */
+/****************************************************************************
+ * Name: free_routine
+ *
+ *  Description:
+ *     Function for freeing list items
+ *****************************************************************************/
 typedef void (*free_function)(void *arg);

-/*! Function for comparing list items. Returns 1 if itemA==itemB */
+/****************************************************************************
+ * Name: cmp_routine
+ *
+ *  Description:
+ *     Function for comparing list items
+ *     Returns 1 if itemA==itemB
+ *****************************************************************************/
 typedef int (*cmp_routine)(void *itemA,void *itemB);

-/*! Linked list node. Stores generic item and pointers to next and prev.
- * \internal
- */
+/****************************************************************************
+ * Name: ListNode
+ *
+ *  Description:
+ *      linked list node. stores generic item and pointers to next and prev.
+ *      Internal Use Only.
+ *****************************************************************************/
 typedef struct LISTNODE
 {
-	struct LISTNODE *prev;
-	struct LISTNODE *next;
-	void *item;
+  struct LISTNODE *prev;
+  struct LISTNODE *next;
+  void *item;
 } ListNode;

-/*!
- * Linked list (no protection).
+/****************************************************************************
+ * Name: LinkedList
 *
- * Because this is for internal use, parameters are NOT checked for validity.
- * The first item of the list is stored at node: head->next
- * The last item of the list is stored at node: tail->prev
- * If head->next=tail, then list is empty.
- * To iterate through the list:
+ *  Description:
+ *      linked list (no protection). Internal Use Only.
+ *      Because this is for internal use, parameters are NOT checked for 
+ *      validity.
+ *      The first item of the list is stored at node: head->next
+ *      The last item of the list is stored at node: tail->prev
+ *      If head->next=tail, then list is empty.
+ *      To iterate through the list:
 *
- *	LinkedList g;
- *	ListNode *temp = NULL;
- *	for (temp = ListHead(g);temp!=NULL;temp = ListNext(g,temp)) {
- *	}
+ *       LinkedList g;
+ *       ListNode *temp = NULL;
+ *       for (temp = ListHead(g);temp!=NULL;temp = ListNext(g,temp))
+ *       {
+ *        }
 *
- * \internal
- */
+ *****************************************************************************/
 typedef struct LINKEDLIST
 {
-	/*! head, first item is stored at: head->next */
-	ListNode head;
-	/*! tail, last item is stored at: tail->prev  */
-	ListNode tail;
-	/*! size of list */
-	long size;
-	/*! free list to use */
-	FreeList freeNodeList;
-	/*! free function to use */
-	free_function free_func;
-	/*! compare function to use */
-	cmp_routine cmp_func;
+  ListNode head; /* head, first item is stored at: head->next */
+  ListNode tail; /* tail, last item is stored at: tail->prev  */
+  long size;     /* size of list */
+  FreeList freeNodeList;   /* free list to use */
+  free_function free_func; /* free function to use */
+  cmp_routine cmp_func;    /* compare function to use */
 } LinkedList;

-/*!
- * \brief Initializes LinkedList. Must be called first and only once for List.
- * 
- *  \return
- *	\li \c 0 on success.
- *	\li \c EOUTOFMEM on failure.
- */
-int ListInit(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Function used to compare items. (May be NULL). */
-	cmp_routine cmp_func,
-	/*! Function used to free items. (May be NULL). */
-	free_function free_func);
-
-/*!
- * \brief Adds a node to the head of the list. Node gets immediately after
- * list head.
+/****************************************************************************
+ * Function: ListInit
 *
+ *  Description:
+ *      Initializes LinkedList. Must be called first.
+ *      And only once for List.
+ *  Parameters:
+ *      list  - must be valid, non null, pointer to a linked list.
+ *      cmp_func - function used to compare items. (May be NULL)
+ *      free_func - function used to free items. (May be NULL)
+ *  Returns:
+ *      0 on success, EOUTOFMEM on failure.
+ *****************************************************************************/
+int ListInit(LinkedList *list,cmp_routine cmp_func, free_function free_func);
+
+/****************************************************************************
+ * Function: ListAddHead
+ *
+ *  Description:
+ *      Adds a node to the head of the list.
+ *      Node gets immediately after list.head.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
 *  Precondition:
 *      The list has been initialized.
- *
- * \return The pointer to the ListNode on success, NULL on failure.
- */
-ListNode *ListAddHead(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item);
+ *****************************************************************************/
+ListNode *ListAddHead(LinkedList *list, void *item);

-/*!
- * \brief Adds a node to the tail of the list. Node gets added immediately
- * before list.tail.
+/****************************************************************************
+ * Function: ListAddTail
 *
- * Precondition: The list has been initialized.
- *
- * \return The pointer to the ListNode on success, NULL on failure.
- */
-ListNode *ListAddTail(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item);
+ *  Description:
+ *      Adds a node to the tail of the list.
+ *      Node gets added immediately before list.tail.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *ListAddTail(LinkedList *list, void *item);

-/*!
- * \brief Adds a node after the specified node. Node gets added immediately
- * after bnode.
+/****************************************************************************
+ * Function: ListAddAfter
 *
- *  Precondition: The list has been initialized.
- *
- * \return The pointer to the ListNode on success, NULL on failure.
- */
-ListNode *ListAddAfter(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item,
-	/*! Node to add after. */
-	ListNode *bnode);
+ *  Description:
+ *      Adds a node after the specified node.
+ *      Node gets added immediately after bnode.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *      ListNode * bnode - node to add after
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *ListAddAfter(LinkedList *list, void *item, ListNode *bnode);

-/*!
- * \brief Adds a node before the specified node. Node gets added immediately
- * before anode.
- *
- * Precondition: The list has been initialized.
- *
- * \return The pointer to the ListNode on success, NULL on failure.
- */
-ListNode *ListAddBefore(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Item to be added. */
-	void *item,
-	/*! Node to add in front of. */
-	ListNode *anode);

-/*!
- * \brief Removes a node from the list. The memory for the node is freed.
+/****************************************************************************
+ * Function: ListAddBefore
 *
- * Precondition: The list has been initialized.
- *
- * \return The pointer to the item stored in the node or NULL if the item
- * is freed.
- */
-void *ListDelNode(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Node to delete. */
-	ListNode *dnode,
-	/*! if !0 then item is freed using free function. If 0 (or free
-	 * function is NULL) then item is not freed. */
-	int freeItem);
+ *  Description:
+ *      Adds a node before the specified node.
+ *      Node gets added immediately before anode.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode * anode  - node to add the in front of.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *ListAddBefore(LinkedList *list,void *item, ListNode *anode);

-/*!
- * \brief Removes all memory associated with list nodes. Does not free
- * LinkedList *list.
- *
- * Precondition: The list has been initialized.
- *
- * \return 0 on success, EINVAL on failure.
- */
-int ListDestroy(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! if !0 then item is freed using free function. If 0 (or free
-	 * function is NULL) then item is not freed. */
-	int freeItem);

-/*!
- * \brief Returns the head of the list.
+/****************************************************************************
+ * Function: ListDelNode
+ *
+ *  Description:
+ *      Removes a node from the list
+ *      The memory for the node is freed.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *dnode - done to delete.
+ *      freeItem - if !0 then item is freed using free function.
+ *                 if 0 (or free function is NULL) then item is not freed
+ *  Returns:
+ *      The pointer to the item stored in the node or NULL if the item is freed.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+void *ListDelNode(LinkedList *list,ListNode *dnode, int freeItem);
+
+/****************************************************************************
+ * Function: ListDestroy
+ *
+ *  Description:
+ *      Removes all memory associated with list nodes. 
+ *      Does not free LinkedList *list. 
 *    
- * Precondition: The list has been initialized.
- *
- * \return The head of the list. NULL if list is empty.
- */
-ListNode *ListHead(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list);
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      freeItem - if !0 then items are freed using the free_function.
+ *                 if 0 (or free function is NULL) then items are not freed.
+ *  Returns:
+ *      0 on success. Always returns 0.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int ListDestroy(LinkedList *list, int freeItem);

-/*!
- * \brief Returns the tail of the list.
+
+/****************************************************************************
+ * Function: ListHead
+ *
+ *  Description:
+ *      Returns the head of the list.
 *    
- * Precondition: The list has been initialized.
- *
- * \return The tail of the list. NULL if list is empty.
- */
-ListNode *ListTail(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list);
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The head of the list. NULL if list is empty.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode* ListHead(LinkedList *list);

-/*!
- * \brief Returns the next item in the list.
+/****************************************************************************
+ * Function: ListTail
+ *
+ *  Description:
+ *      Returns the tail of the list.
 *    
- * Precondition: The list has been initialized.
- *
- * \return The next item in the list. NULL if there are no more items in list.
- */
-ListNode *ListNext(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Node from the list. */
-	ListNode *node);
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The tail of the list. NULL if list is empty.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode* ListTail(LinkedList *list);

-/*!
- * \brief Returns the previous item in the list.
+/****************************************************************************
+ * Function: ListNext
+ *
+ *  Description:
+ *      Returns the next item in the list.
 *    
- * Precondition: The list has been initialized.
- *
- * \return The previous item in the list. NULL if there are no more items in list.
- */
-ListNode *ListPrev(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! Node from the list. */
-	ListNode *node);
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The next item in the list. NULL if there are no more items in list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode* ListNext(LinkedList *list, ListNode * node);

-/*!
- * \brief Finds the specified item in the list.
+/****************************************************************************
+ * Function: ListPrev
 *
- * Uses the compare function specified in ListInit. If compare function
- * is NULL then compares items as pointers.
- *
- * Precondition: The list has been initialized.
- *
- * \return The node containing the item. NULL if no node contains the item.
- */
-ListNode* ListFind(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList *list,
-	/*! The node to start from, NULL if to start from beginning. */
-	ListNode *start,
-	/*! The item to search for. */
-	void *item);
+ *  Description:
+ *      Returns the previous item in the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The previous item in the list. NULL if there are no more items in list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode* ListPrev(LinkedList *list, ListNode * node);

-/*!
- * \brief Returns the size of the list.
+/****************************************************************************
+ * Function: ListFind
 *
- * Precondition: The list has been initialized.
+ *  Description:
+ *      Finds the specified item in the list.
+ *      Uses the compare function specified in ListInit. If compare function
+ *      is NULL then compares items as pointers.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *start - the node to start from, NULL if to start from 
+ *                        beginning.
+ *      void * item - the item to search for.
+ *  Returns:
+ *      The node containing the item. NULL if no node contains the item.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode* ListFind(LinkedList *list, ListNode *start, void * item);
+
+/****************************************************************************
+ * Function: ListSize
 *
- * \return The number of items in the list.
- */
-long ListSize(
-	/*! Must be valid, non null, pointer to a linked list. */
-	LinkedList* list);
+ *  Description:
+ *     Returns the size of the list.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ 
+ *  Returns:
+ *      The number of items in the list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int ListSize(LinkedList* list);
+

 #ifdef __cplusplus
 }
--- a/threadutil/inc/ThreadPool.h
+++ b/threadutil/inc/ThreadPool.h
@@ -32,133 +32,125 @@
 #ifndef THREADPOOL_H
 #define THREADPOOL_H

-/*!
- * \file
- */
-
-#include "FreeList.h"
-#include "ithread.h"
-#include "LinkedList.h"
-#include "UpnpInet.h"
-#include "UpnpGlobal.h" /* for UPNP_INLINE, EXPORT_SPEC */
-
-#include <errno.h>
-
-#ifdef WIN32
-	#include <time.h>
-	struct timezone
-	{
-		int  tz_minuteswest; /* minutes W of Greenwich */
-		int  tz_dsttime;     /* type of dst correction */
-	};
-	int gettimeofday(struct timeval *tv, struct timezone *tz);
-#else /* WIN32 */
-	#include <sys/param.h>
-	#include <sys/time.h> /* for gettimeofday() */
-	#if defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__)
-		#include <sys/resource.h>	/* for setpriority() */
-	#endif
+#ifdef UPNP_USE_MSVCPP
+	#define UPNP_INLINE
+#else
+	#define UPNP_INLINE inline
 #endif

 #ifdef __cplusplus
 extern "C" {
 #endif

-/*! Size of job free list */
+/* Size of job free list */
 #define JOBFREELISTSIZE 100

 #define INFINITE_THREADS -1

 #define EMAXTHREADS (-8 & 1<<29)

-/*! Invalid Policy */
+/* Invalid Policy */
 #define INVALID_POLICY (-9 & 1<<29)

-/*! Invalid JOB Id */
+/* Invalid JOB Id */
 #define INVALID_JOB_ID (-2 & 1<<29)

-typedef enum duration {
-	SHORT_TERM,
-	PERSISTENT
-} Duration;
+typedef enum duration {SHORT_TERM,PERSISTENT} Duration;

-typedef enum priority {
-	LOW_PRIORITY,
-	MED_PRIORITY,
-	HIGH_PRIORITY
-} ThreadPriority;
+typedef enum priority {LOW_PRIORITY,
+		       MED_PRIORITY,
+		       HIGH_PRIORITY} ThreadPriority;

-/*! default priority used by TPJobInit */
-#define DEFAULT_PRIORITY MED_PRIORITY
+#define DEFAULT_PRIORITY MED_PRIORITY /* default priority used by TPJobInit */
+#define DEFAULT_MIN_THREADS 1	      /* default minimum used by TPAttrInit */
+#define DEFAULT_MAX_THREADS 10	      /* default max used by TPAttrInit	*/
+#define DEFAULT_JOBS_PER_THREAD 10    /* default jobs per thread used by TPAttrInit */
+#define DEFAULT_STARVATION_TIME	500   /* default starvation time used by TPAttrInit */
+#define DEFAULT_IDLE_TIME 10 * 1000   /* default idle time used by TPAttrInit */
+#define DEFAULT_FREE_ROUTINE NULL     /* default free routine used TPJobInit */
+#define DEFAULT_MAX_JOBS_TOTAL 100    /* default max jobs used TPAttrInit */

-/*! default minimum used by TPAttrInit */
-#define DEFAULT_MIN_THREADS 1
-
-/*! default max used by TPAttrInit */
-#define DEFAULT_MAX_THREADS 10
-
-/*! default stack size used by TPAttrInit */
-#define DEFAULT_STACK_SIZE 0
-
-/*! default jobs per thread used by TPAttrInit */
-#define DEFAULT_JOBS_PER_THREAD 10
-
-/*! default starvation time used by TPAttrInit */
-#define DEFAULT_STARVATION_TIME	500
-
-/*! default idle time used by TPAttrInit */
-#define DEFAULT_IDLE_TIME 10 * 1000
-
-/*! default free routine used TPJobInit */
-#define DEFAULT_FREE_ROUTINE NULL
-
-/*! default max jobs used TPAttrInit */
-#define DEFAULT_MAX_JOBS_TOTAL 100
-
-/*!
- * \brief Statistics.
- *
- * Always include stats because code change is minimal.
- */
+/* Statistics */
+/* always include stats because code change is minimal */
 #define STATS 1

 #ifdef _DEBUG
 	#define DEBUG 1
 #endif

+#include "LinkedList.h"
+
+#ifdef WIN32
+    #include <time.h>
+    #include <winsock2.h>
+    struct timezone 
+    {
+        int  tz_minuteswest; /* minutes W of Greenwich */
+        int  tz_dsttime;     /* type of dst correction */
+    };
+    int gettimeofday(struct timeval *tv, struct timezone *tz);
+#else /* WIN32 */
+    #include <sys/time.h> /* for gettimeofday() */
+#endif
+
+#include "FreeList.h"
+
+#include "ithread.h"
+#include <errno.h>
+
+#define EXPORT
+
 typedef int PolicyType;
-
 #define DEFAULT_POLICY SCHED_OTHER
+#define DEFAULT_SCHED_PARAM 0 /* default priority */

-/*! Function for freeing a thread argument. */
+/****************************************************************************
+ * Name: free_routine
+ *
+ *  Description:
+ *     Function for freeing a thread argument
+ *****************************************************************************/
 typedef void (*free_routine)(void *arg);

-
-/*! Attributes for thread pool. Used to set and change parameters of thread
- * pool. */
+/****************************************************************************
+ * Name: ThreadPoolAttr
+ *
+ *  Description:
+ *     Attributes for thread pool. Used to set and change parameters of
+ *     thread pool
+ *****************************************************************************/
 typedef struct THREADPOOLATTR
 {
-	/*! ThreadPool will always maintain at least this many threads. */
+	/* minThreads, ThreadPool will always maintain at least this many threads */
 	int minThreads;
-	/*! ThreadPool will never have more than this number of threads. */
+
+	/* maxThreads, ThreadPool will never have more than this number of threads */
 	int maxThreads;
-	/*! This is the minimum stack size allocated for each thread. */
-	size_t stackSize;
-	/*! This is the maximum time a thread will
-	 * remain idle before dying (in milliseconds). */
+
+	/* maxIdleTime (in milliseconds) this is the maximum time a thread will
+	 * remain idle before dying */
 	int maxIdleTime;
-	/*! Jobs per thread to maintain. */
+
+	/* jobs per thread to maintain */
 	int jobsPerThread;
-	/*! Maximum number of jobs that can be queued totally. */
+
+	/* maximum number of jobs that can be queued totally. */
 	int maxJobsTotal;
-	/*! the time a low priority or med priority job waits before getting
-	 * bumped up a priority (in milliseconds). */
+
+	/* the time a low priority or med priority job waits before getting bumped
+	 * up a priority (in milliseconds) */
 	int starvationTime;
-	/*! scheduling policy to use. */
+
+	/* scheduling policy to use */
 	PolicyType schedPolicy;
 } ThreadPoolAttr;

-/*! Internal ThreadPool Job. */
+/****************************************************************************
+ * Name: ThreadPool
+ *
+ *  Description:
+ *     Internal ThreadPool Job
+ *****************************************************************************/
 typedef struct THREADPOOLJOB
 {
 	start_routine func;
@@ -169,7 +161,13 @@ typedef struct THREADPOOLJOB
 	int jobId;
 } ThreadPoolJob;

-/*! Structure to hold statistics. */
+/****************************************************************************
+ * Name: ThreadPoolStats
+ *
+ *  Description:
+ *     Structure to hold statistics
+ *****************************************************************************/
+
 typedef struct TPOOLSTATS
 {
 	double totalTimeHQ;
@@ -193,343 +191,367 @@ typedef struct TPOOLSTATS
 	int currentJobsMQ;
 } ThreadPoolStats;

-/*!
- * \brief A thread pool similar to the thread pool in the UPnP SDK.
+
+/****************************************************************************
+ * Name: ThreadPool
 *
- * Allows jobs to be scheduled for running by threads in a 
- * thread pool. The thread pool is initialized with a 
- * minimum and maximum thread number as well as a max idle time
- * and a jobs per thread ratio. If a worker thread waits the whole
- * max idle time without receiving a job and the thread pool
- * currently has more threads running than the minimum
- * then the worker thread will exit. If when 
- * scheduling a job the current job to thread ratio
- * becomes greater than the set ratio and the thread pool currently has
- * less than the maximum threads then a new thread will
- * be created.
- */
+ *  Description:
+ *     A thread pool similar to the thread pool in the UPnP SDK.
+ *     Allows jobs to be scheduled for running by threads in a 
+ *     thread pool. The thread pool is initialized with a 
+ *     minimum and maximum thread number as well as a 
+ *	   max idle time
+ *     and a jobs per thread ratio. If a worker thread waits the whole
+ *     max idle time without receiving a job and the thread pool
+ *     currently has more threads running than the minimum
+ *     then the worker thread will exit. If when 
+ *     scheduling a job the current job to thread ratio
+ *     becomes greater than the set ratio and the thread pool currently has
+ *     less than the maximum threads then a new thread will
+ *     be created.
+ *
+ *****************************************************************************/
+
 typedef struct THREADPOOL
 {
-	/*! Mutex to protect job qs. */
-	ithread_mutex_t mutex;
-	/*! Condition variable to signal Q. */
-	ithread_cond_t condition;
-	/*! Condition variable for start and stop. */
-	ithread_cond_t start_and_shutdown;
-	/*! ids for jobs */
-	int lastJobId;
-	/*! whether or not we are shutting down */
-	int shutdown;
-	/*! total number of threads */
-	int totalThreads;
-	/*! flag that's set when waiting for a new worker thread to start */
-	int pendingWorkerThreadStart;
-	/*! number of threads that are currently executing jobs */
-	int busyThreads;
-	/*! number of persistent threads */
-	int persistentThreads;
-	/*! free list of jobs */
-	FreeList jobFreeList;
-	/*! low priority job Q */
-	LinkedList lowJobQ;
-	/*! med priority job Q */
-	LinkedList medJobQ;
-	/*! high priority job Q */
-	LinkedList highJobQ;
-	/*! persistent job */
-	ThreadPoolJob *persistentJob;
-	/*! thread pool attributes */
-	ThreadPoolAttr attr;
-	/*! statistics */
+	ithread_mutex_t mutex; /* mutex to protect job qs */
+	ithread_cond_t condition; /* condition variable to signal Q */
+	ithread_cond_t start_and_shutdown; /* condition variable for start 
+					and stop */
+	int lastJobId; /* ids for jobs */
+	int shutdown;  /* whether or not we are shutting down */
+	int totalThreads;      /* total number of threads */
+	int persistentThreads; /* number of persistent threads */
+	FreeList jobFreeList;  /* free list of jobs */
+	LinkedList lowJobQ;    /* low priority job Q */
+	LinkedList medJobQ;    /* med priority job Q */
+	LinkedList highJobQ;   /* high priority job Q */
+	ThreadPoolJob *persistentJob; /* persistent job */
+
+	ThreadPoolAttr attr; /* thread pool attributes */
+
+	/* statistics */
 	ThreadPoolStats stats;
 } ThreadPool;

-/*!
- * \brief Initializes and starts ThreadPool. Must be called first and
- * only once for ThreadPool.
- *
- * \return
- * \li \c 0 on success.
- * \li \c EAGAIN if not enough system resources to create minimum threads.
- * \li \c INVALID_POLICY if schedPolicy can't be set.
- * \li \c EMAXTHREADS if minimum threads is greater than maximum threads.
- */
-int ThreadPoolInit(
-	/*! Must be valid, non null, pointer to ThreadPool. */
-	ThreadPool *tp,
-	/*! Can be null. if not null then attr contains the following fields:
-	 * \li \c minWorkerThreads - minimum number of worker threads thread
-	 * pool will never have less than this number of threads.
-	 * \li \c maxWorkerThreads - maximum number of worker threads thread
-	 * pool will never have more than this number of threads.
-	 * \li \c maxIdleTime - maximum time that a worker thread will spend
-	 * idle. If a worker is idle longer than this time and there are more
-	 * than the min number of workers running, then the worker thread
-	 * exits.
-	 * \li \c jobsPerThread - ratio of jobs to thread to try and maintain
-	 * if a job is scheduled and the number of jobs per thread is greater
-	 * than this number,and if less than the maximum number of workers are
-	 * running then a new thread is started to help out with efficiency.
-	 * \li \c schedPolicy - scheduling policy to try and set (OS dependent).
-	 */
-	ThreadPoolAttr *attr);

-/*!
- * \brief Adds a persistent job to the thread pool.
+
+/****************************************************************************
+ * Function: ThreadPoolInit
 *
- * Job will be run as soon as possible. Call will block until job is scheduled.
+ *  Description:
+ *      Initializes and starts ThreadPool. Must be called first.
+ *      And only once for ThreadPool.
+ *  Parameters:
+ *      tp  - must be valid, non null, pointer to ThreadPool.
+ *      attr - can be null
+ *
+ *       if not null then attr contains the following fields:
+ *
+ *      minWorkerThreads - minimum number of worker threads
+ *                                 thread pool will never have less than this
+ *                                  number of threads.
+ *      maxWorkerThreads - maximum number of worker threads
+ *                         thread pool will never have more than this
+ *                         number of threads.
+ *      maxIdleTime      - maximum time that a worker thread will spend
+ *                         idle. If a worker is idle longer than this
+ *                         time and there are more than the min
+ *                         number of workers running, than the
+ *                         worker thread exits.
+ *      jobsPerThread    - ratio of jobs to thread to try and maintain
+ *                         if a job is scheduled and the number of jobs per
+ *                         thread is greater than this number,and  
+ *                         if less than the maximum number of
+ *                         workers are running then a new thread is 
+ *                         started to help out with efficiency.
+ *      schedPolicy      - scheduling policy to try and set (OS dependent)
+ *  Returns:
+ *      0 on success, nonzero on failure.
+ *      EAGAIN if not enough system resources to create minimum threads.
+ *      INVALID_POLICY if schedPolicy can't be set
+ *      EMAXTHREADS if minimum threads is greater than maximum threads
+ *****************************************************************************/
+int ThreadPoolInit(ThreadPool *tp, ThreadPoolAttr *attr);
+
+/****************************************************************************
+ * Function: ThreadPoolAddPersistent
+ *
+ *  Description:
+ *      Adds a persistent job to the thread pool.
+ *      Job will be run as soon as possible.
+ *      Call will block until job is scheduled.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      ThreadPoolJob - valid thread pool job with the following fields:
+ *
+ *        func - ThreadFunction to run
+ *        arg - argument to function.
+ *        priority - priority of job.
 * 
- * \return
- *	\li \c 0 on success.
- *	\li \c EOUTOFMEM not enough memory to add job.
- *	\li \c EMAXTHREADS not enough threads to add persistent job.
- */
-int ThreadPoolAddPersistent(
-	/*! Valid thread pool pointer. */
-	ThreadPool*tp,
-	/*! Valid thread pool job. */
-	ThreadPoolJob *job,
-	/*! . */
-	int *jobId);
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      EOUTOFMEM not enough memory to add job.
+ *      EMAXTHREADS not enough threads to add persistent job.
+ *****************************************************************************/
+int ThreadPoolAddPersistent(ThreadPool*tp, ThreadPoolJob *job, int *jobId);

-/*!
- * \brief Gets the current set of attributes associated with the thread pool.
+/****************************************************************************
+ * Function: ThreadPoolGetAttr
 *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- */
-int ThreadPoolGetAttr(
-	/*! valid thread pool pointer. */
-	ThreadPool *tp,
-	/*! non null pointer to store attributes. */
-	ThreadPoolAttr *out);
+ *  Description:
+ *      Gets the current set of attributes
+ *      associated with the thread pool.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      out - non null pointer to store attributes
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      Always returns 0.
+ *****************************************************************************/
+int ThreadPoolGetAttr(ThreadPool *tp, ThreadPoolAttr *out);
+/****************************************************************************
+ * Function: ThreadPoolSetAttr
+ *
+ *  Description:
+ *      Sets the attributes for the thread pool.
+ *      Only affects future calculations. 
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      attr - pointer to attributes, null sets attributes to default.
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      Returns INVALID_POLICY if policy can not be set.
+ *****************************************************************************/
+int ThreadPoolSetAttr(ThreadPool *tp, ThreadPoolAttr *attr);

-/*!
- * \brief Sets the attributes for the thread pool.
- * Only affects future calculations.
+/****************************************************************************
+ * Function: ThreadPoolAdd
 *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- * 	\li \c INVALID_POLICY if policy can not be set.
- */
-int ThreadPoolSetAttr(
-	/*! valid thread pool pointer. */
-	ThreadPool *tp,
-	/*! pointer to attributes, null sets attributes to default. */
-	ThreadPoolAttr *attr);
+ *  Description:
+ *      Adds a job to the thread pool.
+ *      Job will be run as soon as possible.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      func - ThreadFunction to run
+ *      arg - argument to function.
+ *      priority - priority of job.
+ *      poolid - id of job
+ *      free_function - function to use when freeing argument 
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      EOUTOFMEM if not enough memory to add job.
+ *****************************************************************************/
+int ThreadPoolAdd (ThreadPool*tp, ThreadPoolJob *job, int *jobId);

-/*!
- * \brief Adds a job to the thread pool. Job will be run as soon as possible.
+/****************************************************************************
+ * Function: ThreadPoolRemove
 *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- * 	\li \c EOUTOFMEM if not enough memory to add job.
- */
-int ThreadPoolAdd(
-	/*! valid thread pool pointer. */
-	ThreadPool*tp,
-	/*! . */
-	ThreadPoolJob *job,
-	/*! id of job. */
-	int *jobId);
+ *  Description:
+ *      Removes a job from the thread pool.
+ *      Can only remove jobs which are not
+ *      currently running.
+ *  Parameters:
+ *      tp - valid thread pool pointer
+ *      jobid - id of job
+ *      out - space for removed job.
+ *  Returns:
+ *      0 on success, nonzero on failure.
+ *      INVALID_JOB_ID if job not found. 
+ *****************************************************************************/
+int ThreadPoolRemove(ThreadPool *tp, int jobId, ThreadPoolJob *out);

-/*!
- * \brief Removes a job from the thread pool. Can only remove jobs which
- * are not currently running.
- *
- * \return
- * 	\li \c 0 on success, nonzero on failure.
- * 	\li \c INVALID_JOB_ID if job not found. 
- */
-int ThreadPoolRemove(
-	/*! valid thread pool pointer. */
-	ThreadPool *tp,
-	/*! id of job. */
-	int jobId,
-	/*! space for removed job. */
-	ThreadPoolJob *out);

-/*!
- * \brief Shuts the thread pool down. Waits for all threads to finish.
- * May block indefinitely if jobs do not exit.
- *
- * \return 0 on success, nonzero on failure
- */
-int ThreadPoolShutdown(
-	/*! must be valid tp. */
-	ThreadPool *tp);

-/*!
- * \brief Initializes thread pool job. Sets the priority to default defined
- * in ThreadPool.h. Sets the free_routine to default defined in ThreadPool.h.
+/****************************************************************************
+ * Function: ThreadPoolShutdown
 *
- * \return Always returns 0.
- */
-int TPJobInit(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolJob *job,
-	/*! function to run, must be valid. */
-	start_routine func,
-	/*! argument to pass to function. */
-	void *arg);
+ *  Description:
+ *      Shuts the thread pool down.
+ *      Waits for all threads to finish. 
+ *      May block indefinitely if jobs do not
+ *      exit.
+ *  Parameters:
+ *      tp - must be valid tp     
+ *  Returns:
+ *      0 on success, nonzero on failure
+ *      Always returns 0.
+ *****************************************************************************/
+int ThreadPoolShutdown(ThreadPool *tp);

-/*!
- * \brief Sets the max threads for the thread pool attributes.
- *
- * \return Always returns 0.
- */
-int TPJobSetPriority(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolJob *job,
-	/*! value to set. */
-	ThreadPriority priority);

-/*!
- * \brief Sets the max threads for the thread pool attributes.
+/****************************************************************************
+ * Function: TPJobInit
 *
- * \return Always returns 0.
- */
-int TPJobSetFreeFunction(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolJob *job,
-	/*! value to set. */
-	free_routine func);
+ *  Description:
+ *      Initializes thread pool job.
+ *      Sets the priority to default defined in ThreadPool.h.
+ *      Sets the free_routine to default defined in ThreadPool.h
+ *  Parameters:
+ *      ThreadPoolJob *job - must be valid thread pool attributes.    
+ *      start_routine func - function to run, must be valid
+ *      void * arg - argument to pass to function.
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPJobInit(ThreadPoolJob *job, start_routine func, void *arg);

-/*!
- * \brief Initializes thread pool attributes. Sets values to defaults defined
- * in ThreadPool.h.
+/****************************************************************************
+ * Function: TPJobSetPriority
 *
- * \return Always returns 0.
- */
-int TPAttrInit(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr);
+ *  Description:
+ *      Sets the max threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      maxThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPJobSetPriority(ThreadPoolJob *job, ThreadPriority priority);

-/*!
- * \brief Sets the max threads for the thread pool attributes.
+/****************************************************************************
+ * Function: TPJobSetFreeFunction
 *
- * \return Always returns 0.
- */
-int TPAttrSetMaxThreads(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! value to set. */
-	int maxThreads);
+ *  Description:
+ *      Sets the max threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      maxThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPJobSetFreeFunction(ThreadPoolJob *job, free_routine func);

-/*!
- * \brief Sets the min threads for the thread pool attributes.
+/****************************************************************************
+ * Function: TPAttrInit
 *
- * \return Always returns 0.
- */
-int TPAttrSetMinThreads(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! value to set. */
-	int minThreads);
+ *  Description:
+ *      Initializes thread pool attributes.
+ *      Sets values to defaults defined in ThreadPool.h.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrInit(ThreadPoolAttr *attr);

-/*!
- * \brief Sets the stack size for the thread pool attributes.
+/****************************************************************************
+ * Function: TPAttrSetMaxThreads
 *
- * \return Always returns 0.
- */
-int TPAttrSetStackSize(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! value to set. */
-	size_t stackSize);
+ *  Description:
+ *      Sets the max threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      maxThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetMaxThreads(ThreadPoolAttr *attr, int maxThreads);

-/*!
- * \brief Sets the idle time for the thread pool attributes.
+/****************************************************************************
+ * Function: TPAttrSetMinThreads
 *
- * \return Always returns 0.
- */
-int TPAttrSetIdleTime(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! . */
-	int idleTime);
+ *  Description:
+ *      Sets the min threads for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes. 
+ *      minThreads - value to set
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetMinThreads(ThreadPoolAttr *attr, int minThreads);

-/*!
- * \brief Sets the jobs per thread ratio
+/****************************************************************************
+ * Function: TPAttrSetIdleTime
 *
- * \return Always returns 0.
- */
-int TPAttrSetJobsPerThread(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! number of jobs per thread to maintain. */
-	int jobsPerThread);
+ *  Description:
+ *      Sets the idle time for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetIdleTime(ThreadPoolAttr *attr, int idleTime);

-/*!
- * \brief Sets the starvation time for the thread pool attributes.
+/****************************************************************************
+ * Function: TPAttrSetJobsPerThread
 *
- * \return Always returns 0.
- */
-int TPAttrSetStarvationTime(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! milliseconds. */
-	int starvationTime);
+ *  Description:
+ *      Sets the jobs per thread ratio
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.
+ *      jobsPerThread - number of jobs per thread to maintain
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetJobsPerThread(ThreadPoolAttr *attr, int jobsPerThread);

-/*!
- * \brief Sets the scheduling policy for the thread pool attributes.
+/****************************************************************************
+ * Function: TPAttrSetStarvationTime
 *
- * \return Always returns 0.
- */
-int TPAttrSetSchedPolicy(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! must be a valid policy type. */
-	PolicyType schedPolicy);
+ *  Description:
+ *      Sets the starvation time for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *      int starvationTime - milliseconds
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetStarvationTime(ThreadPoolAttr *attr, int starvationTime);

-/*!
- * \brief Sets the maximum number jobs that can be qeued totally.
+/****************************************************************************
+ * Function: TPAttrSetSchedPolicy
 *
- * \return Always returns 0.
- */
-int TPAttrSetMaxJobsTotal(
-	/*! must be valid thread pool attributes. */
-	ThreadPoolAttr *attr,
-	/*! maximum number of jobs. */
-	int maxJobsTotal);
+ *  Description:
+ *      Sets the scheduling policy for the thread pool attributes.
+ *  Parameters:
+ *      attr - must be valid thread pool attributes.    
+ *      PolicyType schedPolicy - must be a valid policy type.
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
+int TPAttrSetSchedPolicy(ThreadPoolAttr *attr, PolicyType schedPolicy);

-/*!
- * \brief Returns various statistics about the thread pool.
+
+/****************************************************************************
+ * Function: TPAttrSetMaxJobsTotal
 *
- * Only valid if STATS has been defined.
+ *  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
 *
- * \return Always returns 0.
- */
+ *  Description:
+ *      Returns various statistics about the
+ *      thread pool.
+ *      Only valid if STATS has been defined.
+ *  Parameters:
+ *      ThreadPool *tp - valid initialized threadpool    
+ *      ThreadPoolStats *stats - valid stats, out parameter
+ *  Returns:
+ *      Always returns 0.
+ *****************************************************************************/
 #ifdef STATS
-	EXPORT_SPEC int ThreadPoolGetStats(
-		/*! Valid initialized threadpool. */
-		ThreadPool *tp,
-		/*! Valid stats, out parameter. */
-		ThreadPoolStats *stats);
-#else
-	static UPNP_INLINE int ThreadPoolGetStats(
-		/*! Valid initialized threadpool. */
-		ThreadPool *tp,
-		/*! Valid stats, out parameter. */
-		ThreadPoolStats *stats) {}
-#endif
+	EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);

-/*!
- * \brief
- */
-#ifdef STATS
-	EXPORT_SPEC void ThreadPoolPrintStats(
-		/*! . */
-		ThreadPoolStats *stats);
+	EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats);
 #else
-	static UPNP_INLINE void ThreadPoolPrintStats(
-		/*! . */
-		ThreadPoolStats *stats) {}
+	static UPNP_INLINE int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats) {}
+
+	static UPNP_INLINE void ThreadPoolPrintStats(ThreadPoolStats *stats) {}
 #endif

 #ifdef __cplusplus
 }
 #endif

-#endif /* THREADPOOL_H */
+#endif /* ThreadPool */

--- a/threadutil/inc/TimerThread.h
+++ b/threadutil/inc/TimerThread.h
@@ -32,13 +32,9 @@
 #ifndef TIMERTHREAD_H
 #define TIMERTHREAD_H

-/*!
- * \file
- */
-
-#include "FreeList.h"
 #include "ithread.h"
 #include "LinkedList.h"
+#include "FreeList.h"
 #include "ThreadPool.h"

 #ifdef __cplusplus
@@ -47,111 +43,146 @@ extern "C" {

 #define INVALID_EVENT_ID (-10 & 1<<29)

-/*! Timeout Types. */
-typedef enum timeoutType {
-	/*! seconds from Jan 1, 1970. */
-	ABS_SEC,
-	/*! seconds from current time. */
-	REL_SEC
-} TimeoutType;
+/* Timeout Types */
+/* absolute means in seconds from Jan 1, 1970 */
+/* relative means in seconds from current time */
+typedef enum timeoutType {ABS_SEC,REL_SEC} TimeoutType;

-/*!
- * A timer thread similar to the one in the Upnp SDK that allows
- * the scheduling of a job to run at a specified time in the future.
- *
- * Because the timer thread uses the thread pool there is no 
- * gurantee of timing, only approximate timing.
- *
- * Uses ThreadPool, Mutex, Condition, Thread.
- */
+
+/****************************************************************************
+ * Name: TimerThread
+ * 
+ *   Description:
+ *     A timer thread similar to the one in the Upnp SDK that allows
+ *     the scheduling of a job to run at a specified time in the future
+ *     Because the timer thread uses the thread pool there is no 
+ *     gurantee of timing, only approximate timing.
+ *     Uses ThreadPool, Mutex, Condition, Thread
+ *    
+ * 
+ *****************************************************************************/
 typedef struct TIMERTHREAD
 {
-	ithread_mutex_t mutex;
-	ithread_cond_t condition;
-	int lastEventId;
-	LinkedList eventQ;
-	int shutdown;
-	FreeList freeEvents;
-	ThreadPool *tp;
+  ithread_mutex_t mutex;
+  ithread_cond_t condition;
+  int lastEventId;
+  LinkedList eventQ;
+  int shutdown;
+  FreeList freeEvents;
+  ThreadPool *tp;
 } TimerThread;

-/*!
- * Struct to contain information for a timer event.
- *
- * Internal to the TimerThread.
- */
+
+/****************************************************************************
+ * Name: TimerEvent
+ * 
+ *   Description:
+ *     
+ *     Struct to contain information for a timer event.
+ *     Internal to the TimerThread
+ *   
+ *****************************************************************************/
 typedef struct TIMEREVENT
 {
-	ThreadPoolJob job;
-	/*! [in] Absolute time for event in seconds since Jan 1, 1970. */
-	time_t eventTime;
-	/*! [in] Long term or short term job. */
-	Duration persistent;
-	int id;
+  ThreadPoolJob job;
+  time_t eventTime; /* absolute time for event in seconds since Jan 1, 1970 */
+  Duration persistent;  /* long term or short term job */
+  int id;
 } TimerEvent;

-/*!
- * \brief Initializes and starts timer thread.
- *
- * \return 0 on success, nonzero on failure. Returns error from
- * 	ThreadPoolAddPersistent on failure.
- */
-int TimerThreadInit(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] Valid thread pool to use. Must be started. Must be valid for
-	 * lifetime of timer. Timer must be shutdown BEFORE thread pool. */
-	ThreadPool *tp);

-/*!
- * \brief Schedules an event to run at a specified time.
- *
- * \return 0 on success, nonzero on failure, EOUTOFMEM if not enough memory
- * 	to schedule job.
- */
-int TimerThreadSchedule(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread* timer,
-	/*! [in] time of event. Either in absolute seconds, or relative
-	 * seconds in the future. */
-	time_t time, 
-	/*! [in] either ABS_SEC, or REL_SEC. If REL_SEC, then the event
-	 * will be scheduled at the current time + REL_SEC. */
-	TimeoutType type,
-	/*! [in] Valid Thread pool job with following fields. */
-	ThreadPoolJob *job,
-	/*! [in] . */
-	Duration duration,
-	/*! [in] Id of timer event. (out, can be null). */
-	int *id);

-/*!
- * \brief Removes an event from the timer Q.
- *
- * Events can only be removed before they have been placed in the thread pool.
- *
- * \return 0 on success, INVALID_EVENT_ID on failure.
- */
-int TimerThreadRemove(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] Id of event to remove. */
-	int id,
-	/*! [in] Space for thread pool job. */
-	ThreadPoolJob *out);

-/*!
- * \brief Shutdown the timer thread.
+/************************************************************************
+ * Function: TimerThreadInit
+ * 
+ *  Description:
+ *     Initializes and starts timer thread.
 *
- * Events scheduled in the future will NOT be run.
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             tp  - valid thread pool to use. Must be
+ *                   started. Must be valid for lifetime
+ *                   of timer.  Timer must be shutdown
+ *                   BEFORE thread pool.
+ *  Return:
+ *            0 on success, nonzero on failure
+ *            Returns error from ThreadPoolAddPersistent on failure.
 *
- * Timer thread should be shutdown BEFORE it's associated thread pool.
+ ************************************************************************/
+int TimerThreadInit(TimerThread *timer,
+		    ThreadPool *tp);
+
+
+/************************************************************************
+ * Function: TimerThreadSchedule
+ * 
+ *  Description:
+ *     Schedules an event to run at a specified time.
 *
- * \return 0 if succesfull, nonzero otherwise. Always returns 0.
- */
-int TimerThreadShutdown(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer);
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             time_t - time of event.
+ *                      either in absolute seconds,
+ *                      or relative seconds in the future.
+ *             timeoutType - either ABS_SEC, or REL_SEC.
+ *                           if REL_SEC, then the event
+ *                           will be scheduled at the
+ *                           current time + REL_SEC.
+ *             job-> valid Thread pool job with following fields
+ *             func - function to schedule
+ *             arg - argument to function
+ *             priority - priority of job.
+ *         
+ *             id - id of timer event. (out, can be null)
+ *  Return:
+ *            0 on success, nonzero on failure
+ *            EOUTOFMEM if not enough memory to schedule job.
+ *
+ ************************************************************************/
+int TimerThreadSchedule(TimerThread* timer,
+			time_t time, 
+			TimeoutType type,
+			ThreadPoolJob *job,
+			Duration duration,
+			int *id);
+
+/************************************************************************
+ * Function: TimerThreadRemove
+ * 
+ *  Description:
+ *     Removes an event from the timer Q.
+ *     Events can only be removed 
+ *     before they have been placed in the
+ *     thread pool.
+ *
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             id - id of event to remove.
+ *             ThreadPoolJob *out - space for thread pool job.
+ *  Return:
+ *            0 on success, 
+ *            INVALID_EVENT_ID on failure
+ *			 
+ ************************************************************************/
+int TimerThreadRemove(TimerThread *timer,
+			   int id,
+			   ThreadPoolJob *out);
+
+/************************************************************************
+ * Function: TimerThreadShutdown
+ * 
+ *  Description:
+ *    Shutdown the timer thread
+ *    Events scheduled in the future will NOT be run.
+ *    Timer thread should be shutdown BEFORE it's associated
+ *    thread pool.
+ *  Returns:
+ *    returns 0 if succesfull,
+ *            nonzero otherwise.
+ *            Always returns 0.
+ ***********************************************************************/   
+int TimerThreadShutdown(TimerThread *timer);

 #ifdef __cplusplus
 }
--- a/threadutil/inc/ithread.h
+++ b/threadutil/inc/ithread.h
@@ -1,6 +1,3 @@
-#ifndef ITHREAD_H
-#define ITHREAD_H
-
 /*******************************************************************************
 *
 * Copyright (c) 2000-2003 Intel Corporation 
@@ -32,29 +29,23 @@
 *
 ******************************************************************************/

-/*!
- * \file
- */
-
-#if !defined(WIN32)
-	#include <sys/param.h>
-#endif
-
-#include "UpnpGlobal.h" /* For UPNP_INLINE, EXPORT_SPEC */
-#include "UpnpUniStd.h" /* for close() */
-
+#ifndef ITHREADH
+#define ITHREADH
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include <pthread.h>

-#if defined(BSD)
+#include <pthread.h>
+#ifndef WIN32
+	#include <unistd.h>
+#endif
+
+#ifdef __FreeBSD__
 	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif

-
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#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
 	 */
@@ -74,10 +65,7 @@ extern "C" {

 #define ITHREAD_CANCELED PTHREAD_CANCELED

-
-#define ITHREAD_STACK_MIN PTHREAD_STACK_MIN
-
-
+  
 /***************************************************************************
 * Name: ithread_t
 *
@@ -86,8 +74,7 @@ extern "C" {
 *      typedef to pthread_t.
 *      Internal Use Only.
 ***************************************************************************/
-typedef pthread_t ithread_t;
-
+typedef pthread_t ithread_t; 
  
 /****************************************************************************
 * Name: ithread_attr_t
@@ -107,7 +94,7 @@ typedef pthread_attr_t ithread_attr_t;
 *      Thread start routine 
 *      Internal Use Only.
 ***************************************************************************/
-typedef void *(*start_routine)(void *arg);
+typedef void * (*start_routine) (void *arg);

  
 /****************************************************************************
@@ -163,9 +150,7 @@ typedef pthread_condattr_t ithread_condattr_t;
 *      typedef to pthread_rwlockattr_t
 *      Internal Use Only
 ***************************************************************************/
-#if UPNP_USE_RWLOCK
 typedef pthread_rwlockattr_t ithread_rwlockattr_t;	
-#endif /* UPNP_USE_RWLOCK */


 /****************************************************************************
@@ -176,101 +161,7 @@ typedef pthread_rwlockattr_t ithread_rwlockattr_t;
 *      typedef to pthread_rwlock_t
 *      Internal Use Only
 ***************************************************************************/
-#if UPNP_USE_RWLOCK
-	typedef pthread_rwlock_t ithread_rwlock_t;
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	typedef ithread_mutex_t ithread_rwlock_t;
-#endif /* UPNP_USE_RWLOCK */
-
-
-/****************************************************************************
- * Function: ithread_initialize_library
- *
- *  Description:
- *      Initializes the library. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_initialize_library(void) {
-	int ret = 0;
-
-#if defined(WIN32) && defined(PTW32_STATIC_LIB)
-	ret = !pthread_win32_process_attach_np();
-#endif
-
-	return ret;
-}
-
-
-/****************************************************************************
- * Function: ithread_cleanup_library
- *
- *  Description:
- *      Clean up library resources. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_cleanup_library(void) {
-	int ret = 0;
-
-#if defined(WIN32) && defined(PTW32_STATIC_LIB)
-	ret = !pthread_win32_process_detach_np();
-#endif
-
-	return ret;
-}
-
-
-/****************************************************************************
- * Function: ithread_initialize_thread
- *
- *  Description:
- *      Initializes the thread. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_initialize_thread(void) {
-	int ret = 0;
-
-#if defined(WIN32) && defined(PTW32_STATIC_LIB)
-	ret = !pthread_win32_thread_attach_np();
-#endif
-
-	return ret;
-}
-
-
-/****************************************************************************
- * Function: ithread_cleanup_thread
- *
- *  Description:
- *      Clean up thread resources. Does nothing in all implementations, except
- *      when statically linked for WIN32.
- *  Parameters:
- *      none.
- *  Returns:
- *      0 on success, Nonzero on failure.
- ***************************************************************************/
-static UPNP_INLINE int ithread_cleanup_thread(void) {
-	int ret = 0;
-
-#if defined(WIN32) && defined(PTW32_STATIC_LIB)
-	ret = !pthread_win32_thread_detach_np();
-#endif
-
-	return ret;
-}
-
+typedef pthread_rwlock_t ithread_rwlock_t;	

 /****************************************************************************
 * Function: ithread_mutexattr_init
@@ -325,11 +216,11 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Returns EINVAL if the kind is not supported.
 *      See man page for pthread_mutexattr_setkind_np
 *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#ifdef PTHREAD_MUTEX_RECURSIVE
 	#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
 #else
 	#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
-#endif /* UPNP_USE_RWLOCK */
+#endif

 /****************************************************************************
 * Function: ithread_mutexattr_getkind_np
@@ -350,11 +241,11 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Always returns 0.
 *      See man page for pthread_mutexattr_getkind_np
 *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
+#ifdef PTHREAD_MUTEX_RECURSIVE
 	#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
 #else
 	#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
-#endif /* UPNP_USE_RWLOCK */
+#endif

  
 /****************************************************************************
@@ -442,9 +333,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Always returns 0.
 *      See man page for pthread_rwlockattr_init
 ***************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlockattr_init pthread_rwlockattr_init
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlockattr_init pthread_rwlockattr_init


 /****************************************************************************
@@ -460,9 +349,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Always returns 0.
 *      See man page for pthread_rwlockattr_destroy
 ***************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
  
  
 /****************************************************************************
@@ -483,9 +370,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Returns EINVAL if the kind is not supported.
 *      See man page for pthread_rwlockattr_setkind_np
 *****************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared


 /****************************************************************************
@@ -506,9 +391,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Always returns 0.
 *      See man page for pthread_rwlockatttr_getpshared
 *****************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared

  
 /****************************************************************************
@@ -519,19 +402,15 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Must be called before use.
 *      
 *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      const ithread_rwlockattr_t *rwlock_attr 
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      const ithread_rwlockattr_t * rwlock_attr 
 *  Returns:
 *      0 on success, Nonzero on failure.
 *      Always returns 0.
 *      See man page for pthread_rwlock_init
 *****************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlock_init pthread_rwlock_init
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_init ithread_mutex_init
-#endif
+#define ithread_rwlock_init pthread_rwlock_init
+

 /****************************************************************************
 * Function: ithread_rwlock_rdlock
@@ -539,7 +418,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *  Description:
 *      Locks rwlock for reading.
 *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
 *      rwlock must be initialized.
 *      
 *  Returns:
@@ -547,12 +426,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Always returns 0.
 *      See man page for pthread_rwlock_rdlock
 *****************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlock_rdlock pthread_rwlock_rdlock
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_rdlock ithread_mutex_lock
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlock_rdlock pthread_rwlock_rdlock
+

 /****************************************************************************
 * Function: ithread_rwlock_wrlock
@@ -560,7 +435,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *  Description:
 *      Locks rwlock for writting.
 *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
 *      rwlock must be initialized.
 *      
 *  Returns:
@@ -568,12 +443,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Always returns 0.
 *      See man page for pthread_rwlock_wrlock
 *****************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlock_wrlock pthread_rwlock_wrlock
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_wrlock ithread_mutex_lock
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlock_wrlock pthread_rwlock_wrlock


 /****************************************************************************
@@ -583,7 +453,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Unlocks rwlock.
 *
 *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
 *      rwlock must be initialized.
 *      
 *  Returns:
@@ -591,12 +461,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Always returns 0.
 *      See man page for pthread_rwlock_unlock
 *****************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlock_unlock pthread_rwlock_unlock
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_unlock ithread_mutex_unlock
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlock_unlock pthread_rwlock_unlock


 /****************************************************************************
@@ -608,19 +473,14 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *		rwlock is only destroyed when there are no longer any threads waiting on it. 
 *		rwlock cannot be destroyed if it is locked.
 *  Parameters:
- *      ithread_rwlock_t *rwlock (must be valid non NULL pointer to pthread_rwlock_t)
+ *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
 *      rwlock must be initialized.
 *  Returns:
 *      0 on success. Nonzero on failure.
 *      Always returns 0.
 *      See man page for pthread_rwlock_destroy
 *****************************************************************************/
-#if UPNP_USE_RWLOCK
-	#define ithread_rwlock_destroy pthread_rwlock_destroy
-#else
-	/* Read-write locks aren't available: use mutex instead. */
-	#define ithread_rwlock_destroy ithread_mutex_destroy
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_rwlock_destroy pthread_rwlock_destroy


 /****************************************************************************
@@ -630,8 +490,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Initializes condition variable.
 *      Must be called before use.
 *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to pthread_cond_t)
- *      const ithread_condattr_t *cond_attr (ignored)
+ *      ithread_cond_t * cond (must be valid non NULL pointer to pthread_cond_t)
+ *      const ithread_condattr_t * cond_attr (ignored)
 *  Returns:
 *      0 on success, Nonzero on failure.
 *      See man page for pthread_cond_init
@@ -639,6 +499,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 #define ithread_cond_init pthread_cond_init


+
 /****************************************************************************
 * Function: ithread_cond_signal
 *
@@ -646,7 +507,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Wakes up exactly one thread waiting on condition.
 *      Associated mutex MUST be locked by thread before entering this call.
 *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to 
+ *      ithread_cond_t * cond (must be valid non NULL pointer to 
 *      ithread_cond_t)
 *      cond must be initialized
 *  Returns:
@@ -663,7 +524,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Wakes up all threads waiting on condition.
 *      Associated mutex MUST be locked by thread before entering this call.
 *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to 
+ *      ithread_cond_t * cond (must be valid non NULL pointer to 
 *      ithread_cond_t)
 *      cond must be initialized
 *  Returns:
@@ -681,7 +542,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *      Associated mutex MUST be locked by thread before entering this call.
 *      Mutex is reacquired when call returns.
 *  Parameters:
- *      ithread_cond_t *cond (must be valid non NULL pointer to 
+ *      ithread_cond_t * cond (must be valid non NULL pointer to 
 *      ithread_cond_t)
 *      cond must be initialized
 *      ithread_mutex_t *mutex (must be valid non NULL pointer to 
@@ -697,19 +558,23 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
  /****************************************************************************
   * Function: pthread_cond_timedwait
   *
-   *	Description:      
-   *		Atomically releases the associated mutex and waits on the
-   *	condition.
-   *		If the condition is not signaled in the specified time than the
-   *	call times out and returns.
-   *		Associated mutex MUST be locked by thread before entering this call.
-   *		Mutex is reacquired when call returns.
+   *  Description:      
+   *      Atomically releases the associated mutex and waits on the condition. 
+   *		If the condition is not signaled in the specified time 
+   *              than the 
+   *		call times out and returns.
+   *		Associated mutex MUST be locked by thread before entering 
+   *              this call.
+   *      Mutex is reacquired when call returns.
   *  Parameters:
-   *      ithread_cond_t *cond (must be valid non NULL pointer to ithread_cond_t)
-   *      	cond must be initialized
-   *      ithread_mutex_t *mutex (must be valid non NULL pointer to ithread_mutex_t)
-   *      	Mutex must be locked.
-   *      const struct timespec *abstime (absolute time, measured from Jan 1, 1970)
+   *      ithread_cond_t * cond (must be valid non NULL pointer to 
+   *      ithread_cond_t)
+   *      cond must be initialized
+   *      ithread_mutex_t *mutex (must be valid non NULL pointer to 
+   *      ithread_mutex_t)
+   *      Mutex must be locked.
+   *      const struct timespec *abstime (absolute time, measured 
+   *      from Jan 1, 1970)
   *  Returns:
   *      0 on success. ETIMEDOUT on timeout. Nonzero on failure.
   *      See man page for pthread_cond_timedwait
@@ -725,7 +590,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   *      Releases any resources held by the condition variable. 
   *		Condition variable can no longer be used after this call.	
   *  Parameters:
-   *      ithread_cond_t *cond (must be valid non NULL pointer to 
+   *      ithread_cond_t * cond (must be valid non NULL pointer to 
   *      ithread_cond_t)
   *      cond must be initialized.
   *  Returns:
@@ -734,49 +599,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   ***************************************************************************/
 #define ithread_cond_destroy pthread_cond_destroy

-  /****************************************************************************
-   * Function: ithread_attr_init
-   *
-   *  Description:
-   *      Initialises thread attribute object.
-   *  Parameters:
-   *      ithread_attr_t *attr (must be valid non NULL pointer to
-   *      ithread_attr_t)
-   *  Returns:
-   *      0 on success. Nonzero on failure.
-   *      See man page for pthread_attr_init
-   ***************************************************************************/
-#define ithread_attr_init pthread_attr_init
-
-  /****************************************************************************
-   * Function: ithread_attr_destroy
-   *
-   *  Description:
-   *      Destroys thread attribute object.
-   *  Parameters:
-   *      ithread_attr_t *attr (must be valid non NULL pointer to
-   *      ithread_attr_t)
-   *  Returns:
-   *      0 on success. Nonzero on failure.
-   *      See man page for pthread_attr_destroy
-   ***************************************************************************/
-#define ithread_attr_destroy pthread_attr_destroy
-
-  /****************************************************************************
-   * Function: ithread_attr_setstacksize
-   *
-   *  Description:
-   *      Sets stack size of a thread attribute object.
-   *  Parameters:
-   *      ithread_attr_t *attr (must be valid non NULL pointer to
-   *      ithread_attr_t)
-   *      size_t stacksize (value of stacksize must be greater than
-   *      ITHREAD_STACK_MIN and lower than system-imposed limits
-   *  Returns:
-   *      0 on success. Nonzero on failure.
-   *      See man page for pthread_attr_setstacksize
-   ***************************************************************************/
-#define ithread_attr_setstacksize pthread_attr_setstacksize

  /****************************************************************************
   * Function: ithread_create
@@ -786,7 +608,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   *      and argument.
   *  Parameters:
   *      ithread_t * thread (must be valid non NULL pointer to pthread_t)
-   *      ithread_attr_t *attr
+   *      ithread_attr_t *attr, IGNORED
   *      void * (start_routine) (void *arg) (start routine)
   *      void * arg - argument.
   *  Returns:
@@ -824,7 +646,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   ***************************************************************************/
 #define ithread_exit pthread_exit

-
 /****************************************************************************
   * Function: ithread_get_current_thread_id
   *
@@ -848,7 +669,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   ***************************************************************************/
 #define ithread_self pthread_self

-
  /****************************************************************************
   * Function: ithread_detach
   *
@@ -862,7 +682,6 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
   ***************************************************************************/
 #define ithread_detach pthread_detach  

-
  /****************************************************************************
   * Function: ithread_join
   *
@@ -882,6 +701,7 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 #define ithread_join pthread_join
  

+
 /****************************************************************************
 * Function: isleep
 *
@@ -895,13 +715,12 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *		0 on success, Nonzero on failure.
 *              See man page for sleep (man 3 sleep)
 *****************************************************************************/
-#ifdef WIN32
-	#define isleep(x) Sleep((x)*1000)
+#ifndef WIN32
+#define isleep sleep
 #else
-	#define isleep sleep
+#define isleep(x) Sleep((x)*1000)
 #endif

-
 /****************************************************************************
 * Function: isleep
 *
@@ -915,23 +734,36 @@ static UPNP_INLINE int ithread_cleanup_thread(void) {
 *		0 on success, Nonzero on failure.
 *              See man page for sleep (man 3 sleep)
 *****************************************************************************/
-#ifdef WIN32
-	#define imillisleep Sleep
+#ifndef WIN32
+#define imillisleep(x) usleep(1000*x)
 #else
-	#define imillisleep(x) usleep(1000*x)
+#define imillisleep	Sleep
+#endif
+
+#ifdef WIN32
+	#ifndef UPNP_STATIC_LIB
+		#ifdef LIBUPNP_EXPORTS
+			/* set up declspec for dll export to make functions visible to library users */
+			#define EXPORT_SPEC __declspec(dllexport)
+		#else
+			#define EXPORT_SPEC __declspec(dllimport)
+		#endif
+	#else
+		#define EXPORT_SPEC
+	#endif
+#else
+	#define EXPORT_SPEC
 #endif


-#if !defined(PTHREAD_MUTEX_RECURSIVE) && !defined(__DragonFly__)
+#ifndef PTHREAD_MUTEX_RECURSIVE
 /* 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 /* ITHREAD_H */
+#endif /* ITHREADH */

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

 #include "FreeList.h"

 #include <assert.h>
 #include <stdlib.h>

-int FreeListInit(FreeList *free_list, size_t elementSize, int maxFreeListLength)
+/****************************************************************************
+ * Function: FreeListInit
+ *
+ *  Description:
+ *      Initializes Free List. Must be called first.
+ *      And only once for FreeList.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *      size_t -     size of elements to store in free list
+ *      maxFreeListSize - max size that the free list can grow to
+ *                        before returning memory to O.S.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int
+FreeListInit( FreeList * free_list,
+              size_t elementSize,
+              int maxFreeListLength )
 {
-	assert(free_list != NULL);
+    assert( free_list != NULL );

-	if (free_list == NULL)
-		return EINVAL;
-	free_list->element_size = elementSize;
-	free_list->maxFreeListLength = maxFreeListLength;
-	free_list->head = NULL;
-	free_list->freeListLength = 0;
+    if( free_list == NULL )
+        return EINVAL;

-	return 0;
+    free_list->element_size = elementSize;
+    free_list->maxFreeListLength = maxFreeListLength;
+    free_list->head = NULL;
+    free_list->freeListLength = 0;
+    return 0;
 }

-void *FreeListAlloc(FreeList *free_list)
+/****************************************************************************
+ * Function: FreeListAlloc
+ *
+ *  Description:
+ *      Allocates chunk of set size.
+ *      If a free item is available in the list, returnes the stored item.
+ *      Otherwise calls the O.S. to allocate memory.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      Non NULL on success. NULL on failure.
+ *****************************************************************************/
+void *
+FreeListAlloc( FreeList * free_list )
 {
-	FreeListNode *ret = NULL;
+    FreeListNode *ret = NULL;

-	assert(free_list != NULL);
+    assert( free_list != NULL );

-	if (free_list == NULL)
-		return NULL;
+    if( free_list == NULL )
+        return NULL;

-	if (free_list->head) {
-		ret = free_list->head;
-		free_list->head = free_list->head->next;
-		free_list->freeListLength--;
-	} else {
-		ret = malloc(free_list->element_size);
-	}
+    if( free_list->head ) {
+        ret = free_list->head;
+        free_list->head = free_list->head->next;
+        free_list->freeListLength--;
+    } else {
+        ret = malloc( free_list->element_size );
+    }

-	return ret;
+    return ret;
 }

-int FreeListFree(FreeList *free_list, void *element)
+/****************************************************************************
+ * Function: FreeListFree
+ *
+ *  Description:
+ *      Returns an item to the Free List.
+ *      If the free list is smaller than the max size than
+ *      adds the item to the free list.
+ *      Otherwise returns the item to the O.S.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a free list.
+ *      element - must be a pointer allocated by FreeListAlloc
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int
+FreeListFree( FreeList * free_list,
+              void *element )
 {
-	FreeListNode *temp = NULL;

-	assert(free_list != NULL);
+    FreeListNode *temp = NULL;

-	if (free_list == NULL)
-		return EINVAL;
-	if (element != NULL &&
-	    free_list->freeListLength + 1 < free_list->maxFreeListLength) {
-		free_list->freeListLength++;
-		temp = (FreeListNode *)element;
-		temp->next = free_list->head;
-		free_list->head = temp;
-	} else {
-		free(element);
-	}
+    assert( free_list != NULL );

-	return 0;
+    if( free_list == NULL )
+        return EINVAL;
+
+    if( ( element != NULL ) &&
+        ( ( free_list->freeListLength + 1 ) <
+          free_list->maxFreeListLength ) ) {
+        free_list->freeListLength++;
+        temp = ( FreeListNode * ) element;
+        temp->next = free_list->head;
+        free_list->head = temp;
+
+    } else {
+
+        free( element );
+    }
+
+    return 0;
 }

-int FreeListDestroy(FreeList *free_list)
+/****************************************************************************
+ * Function: FreeListDestroy
+ *
+ *  Description:
+ *      Releases the resources stored with the free list.
+ *  Parameters:
+ *      free_list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *****************************************************************************/
+int
+FreeListDestroy( FreeList * free_list )
 {
-	FreeListNode *temp = NULL;
-	int i = 0;
+    FreeListNode *temp = NULL;
+    int i = 0;

-	assert(free_list != NULL);
+    assert( free_list != NULL );

-	if (!free_list)
-		return EINVAL;
-	while (free_list->head) {
-		i++;
-		temp = free_list->head->next;
-		free(free_list->head);
-		free_list->head = temp;
-	}
-	free_list->freeListLength = 0;
+    if( free_list == NULL )
+        return EINVAL;

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

 #include "LinkedList.h"
-
-#ifdef WIN32
-	/* Do not #include <sys/param.h> */
-#else
+#ifndef WIN32
 	#include <sys/param.h>
 #endif
-
 #if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
 	#include <stdlib.h>
 #else
 	#include <malloc.h>
 #endif
-
 #include <assert.h>

-static int freeListNode(ListNode *node, LinkedList *list)
+static int
+freeListNode( ListNode * node,
+              LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );

-	return FreeListFree(&list->freeNodeList, node);
+    return FreeListFree( &list->freeNodeList, node );
 }

-/*!
- * \brief Dynamically creates a list node.
+/****************************************************************************
+ * Function: CreateListNode
+ *
+ *  Description:
+ *      Creates a list node. Dynamically.
 *      
 *  Parameters:
 *      void * item - the item to store
 *  Returns:
 *      The new node, NULL on failure.
- */
-static ListNode *CreateListNode(
-	/*! the item to store. */
-	void *item,
-	/*! The list to add it to. */
-	LinkedList *list)
+ *****************************************************************************/
+static ListNode *
+CreateListNode( void *item,
+                LinkedList * list )
 {
-	ListNode *temp = NULL;

-	assert(list != NULL);
+    ListNode *temp = NULL;

-	temp = (ListNode *)FreeListAlloc(&list->freeNodeList);
-	if (temp) {
-		temp->prev = NULL;
-		temp->next = NULL;
-		temp->item = item;
-	}
+    assert( list != NULL );

-	return temp;
+    temp = ( ListNode * ) FreeListAlloc( &list->freeNodeList );
+    if( temp ) {
+        temp->prev = NULL;
+        temp->next = NULL;
+        temp->item = item;
+    }
+    return temp;
 }

-int ListInit(LinkedList *list, cmp_routine cmp_func, free_function free_func)
+/****************************************************************************
+ * Function: ListInit
+ *
+ *  Description:
+ *      Initializes LinkedList. Must be called first.
+ *      And only once for List.
+ *  Parameters:
+ *      list  - must be valid, non null, pointer to a linked list.
+ *      cmp_func - function used to compare items. (May be NULL)
+ *      free_func - function used to free items. (May be NULL)
+ *  Returns:
+ *      0 on success, EOUTOFMEM on failure.
+ *****************************************************************************/
+int
+ListInit( LinkedList * list,
+          cmp_routine cmp_func,
+          free_function free_func )
 {
-	int retCode = 0;

-	assert(list != NULL);
+    int retCode = 0;

-	if (!list)
-		return EINVAL;
-	list->size = 0;
-	list->cmp_func = cmp_func;
-	list->free_func = free_func;
-	retCode = FreeListInit(&list->freeNodeList, sizeof(ListNode), FREELISTSIZE);
+    assert( list != NULL );

-	assert(retCode == 0);
+    if( list == NULL )
+        return EINVAL;

-	list->head.item = NULL;
-	list->head.next = &list->tail;
-	list->head.prev = NULL;
-	list->tail.item = NULL;
-	list->tail.prev = &list->head;
-	list->tail.next = NULL;
+    list->size = 0;
+    list->cmp_func = cmp_func;
+    list->free_func = free_func;

-	return 0;
+    retCode =
+        FreeListInit( &list->freeNodeList, sizeof( ListNode ),
+                      FREELISTSIZE );
+
+    assert( retCode == 0 );
+
+    list->head.item = NULL;
+    list->head.next = &list->tail;
+    list->head.prev = NULL;
+
+    list->tail.item = NULL;
+    list->tail.prev = &list->head;
+    list->tail.next = NULL;
+
+    return 0;
 }

-ListNode *ListAddHead(LinkedList *list, void *item)
+/****************************************************************************
+ * Function: ListAddHead
+ *
+ *  Description:
+ *      Adds a node to the head of the list.
+ *      Node gets immediately after list.head.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddHead( LinkedList * list,
+             void *item )
 {
-	assert(list != NULL);
+    assert( list != NULL );

-	if (list == NULL)
-	return NULL;
+    if( list == NULL )
+        return NULL;

-	return ListAddAfter(list, item, &list->head);
+    return ListAddAfter( list, item, &list->head );
 }

-ListNode *ListAddTail(LinkedList *list, void *item)
+/****************************************************************************
+ * Function: ListAddTail
+ *
+ *  Description:
+ *      Adds a node to the tail of the list.
+ *      Node gets added immediately before list.tail.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddTail( LinkedList * list,
+             void *item )
 {
-	assert(list != NULL);
+    assert( list != NULL );

-	if (!list)
-		return NULL;
+    if( list == NULL )
+        return NULL;

-	return ListAddBefore(list, item, &list->tail);
+    return ListAddBefore( list, item, &list->tail );
 }

-ListNode *ListAddAfter(LinkedList *list, void *item, ListNode *bnode)
+/****************************************************************************
+ * Function: ListAddAfter
+ *
+ *  Description:
+ *      Adds a node after the specified node.
+ *      Node gets added immediately after bnode.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      void * item - item to be added
+ *      ListNode * bnode - node to add after
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddAfter( LinkedList * list,
+              void *item,
+              ListNode * bnode )
 {
-	ListNode *newNode = NULL;
+    ListNode *newNode = NULL;

-	assert(list != NULL);
+    assert( list != NULL );

-	if (!list || !bnode)
-		return NULL;
-	newNode = CreateListNode(item, list);
-	if (newNode) {
-		ListNode *temp = bnode->next;
+    if( ( list == NULL ) || ( bnode == NULL ) )
+        return NULL;

-		bnode->next = newNode;
-		newNode->prev = bnode;
-		newNode->next = temp;
-		temp->prev = newNode;
-		list->size++;
+    newNode = CreateListNode( item, list );
+    if( newNode ) {
+        ListNode *temp = bnode->next;

-		return newNode;
-	}
-
-	return NULL;
+        bnode->next = newNode;
+        newNode->prev = bnode;
+        newNode->next = temp;
+        temp->prev = newNode;
+        list->size++;
+        return newNode;
+    }
+    return NULL;
 }

-ListNode *ListAddBefore(LinkedList *list, void *item, ListNode *anode)
+/****************************************************************************
+ * Function: ListAddBefore
+ *
+ *  Description:
+ *      Adds a node before the specified node.
+ *      Node gets added immediately before anode.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode * anode  - node to add the in front of.
+ *      void * item - item to be added
+ *  Returns:
+ *      The pointer to the ListNode on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListAddBefore( LinkedList * list,
+               void *item,
+               ListNode * anode )
 {
-	ListNode *newNode = NULL;
+    ListNode *newNode = NULL;

-	assert(list != NULL);
+    assert( list != NULL );

-	if (!list || !anode)
-		return NULL;
-	newNode = CreateListNode(item, list);
-	if (newNode) {
-		ListNode *temp = anode->prev;
+    if( ( list == NULL ) || ( anode == NULL ) )
+        return NULL;

-		anode->prev = newNode;
-		newNode->next = anode;
-		newNode->prev = temp;
-		temp->next = newNode;
-		list->size++;
+    newNode = CreateListNode( item, list );

-		return newNode;
-	}
+    if( newNode ) {
+        ListNode *temp = anode->prev;

-	return NULL;
+        anode->prev = newNode;
+        newNode->next = anode;
+        newNode->prev = temp;
+        temp->next = newNode;
+        list->size++;
+        return newNode;
+    }
+    return NULL;
 }

-void *ListDelNode(LinkedList *list, ListNode *dnode, int freeItem)
+/****************************************************************************
+ * Function: ListDelNode
+ *
+ *  Description:
+ *      Removes a node from the list
+ *      The memory for the node is freed but the
+ *      the memory for the items are not.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *dnode - done to delete.
+ *  Returns:
+ *      The pointer to the item stored in node on success, NULL on failure.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+void *
+ListDelNode( LinkedList * list,
+             ListNode * dnode,
+             int freeItem )
 {
-	void *temp;
+    void *temp;

-	assert(list != NULL);
-	assert(dnode != &list->head);
-	assert(dnode != &list->tail);
+    assert( list != NULL );
+    assert( dnode != &list->head );
+    assert( dnode != &list->tail );

-	if (!list || dnode == &list->head || dnode == &list->tail || !dnode)
-		return NULL;
-	temp = dnode->item;
-	dnode->prev->next = dnode->next;
-	dnode->next->prev = dnode->prev;
-	freeListNode(dnode, list);
-	list->size--;
-	if (freeItem && list->free_func) {
-		list->free_func(temp);
-		temp = NULL;
-	}
+    if( ( list == NULL ) ||
+        ( dnode == &list->head ) ||
+        ( dnode == &list->tail ) || ( dnode == NULL ) ) {
+        return NULL;
+    }

-	return temp;
+    temp = dnode->item;
+    dnode->prev->next = dnode->next;
+    dnode->next->prev = dnode->prev;
+
+    freeListNode( dnode, list );
+    list->size--;
+
+    if( freeItem && list->free_func ) {
+        list->free_func( temp );
+        temp = NULL;
+    }
+
+    return temp;
 }

-int ListDestroy(LinkedList *list, int freeItem)
+/****************************************************************************
+ * Function: ListDestroy
+ *
+ *  Description:
+ *      Removes all memory associated with list nodes. 
+ *      Does not free LinkedList *list. 
+ *      Items stored in the list are not freed, only nodes are.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  Returns:
+ *      0 on success. Nonzero on failure.
+ *      Always returns 0.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int
+ListDestroy( LinkedList * list,
+             int freeItem )
 {
-	ListNode *dnode = NULL;
-	ListNode *temp = NULL;
+    ListNode *dnode = NULL;
+    ListNode *temp = NULL;

-	if(!list)
-		return EINVAL;
+    if( list == NULL )
+        return EINVAL;

-	for (dnode = list->head.next; dnode != &list->tail; ) {
-		temp = dnode->next;
-		ListDelNode(list, dnode, freeItem);
-		dnode = temp;
-	}
-	list->size = 0;
-	FreeListDestroy(&list->freeNodeList);
+    for( dnode = list->head.next; dnode != &list->tail; ) {
+        temp = dnode->next;
+        ListDelNode( list, dnode, freeItem );
+        dnode = temp;
+    }

-	return 0;
+    list->size = 0;
+    FreeListDestroy( &list->freeNodeList );
+    return 0;
 }

-ListNode *ListHead(LinkedList *list)
+/****************************************************************************
+ * Function: ListHead
+ *
+ *  Description:
+ *      Returns the head of the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The head of the list. NULL if list is empty.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListHead( LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );

-	if (!list)
-		return NULL;
+    if( list == NULL )
+        return NULL;

-	if (!list->size)
-		return NULL;
-	else
-		return list->head.next;
+    if( list->size == 0 )
+        return NULL;
+    else
+        return list->head.next;
 }

-ListNode *ListTail(LinkedList *list)
+/****************************************************************************
+ * Function: ListTail
+ *
+ *  Description:
+ *      Returns the tail of the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The tail of the list. NULL if list is empty.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListTail( LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );

-	if (!list)
-		return NULL;
+    if( list == NULL )
+        return NULL;

-	if (!list->size)
-		return NULL;
-	else
-		return list->tail.prev;
+    if( list->size == 0 )
+        return NULL;
+    else
+        return list->tail.prev;
 }

-ListNode *ListNext(LinkedList *list, ListNode *node)
+/****************************************************************************
+ * Function: ListNext
+ *
+ *  Description:
+ *      Returns the next item in the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The next item in the list. NULL if there are no more items in list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListNext( LinkedList * list,
+          ListNode * node )
 {
-	assert(list != NULL);
-	assert(node != NULL);
+    assert( list != NULL );
+    assert( node != NULL );

-	if (!list || !node)
-		return NULL;
-	if (node->next == &list->tail)
-		return NULL;
-	else
-		return node->next;
+    if( ( list == NULL ) || ( node == NULL ) )
+        return NULL;
+
+    if( node->next == &list->tail )
+        return NULL;
+    else
+        return node->next;
 }

-ListNode *ListPrev(LinkedList *list, ListNode *node)
+/****************************************************************************
+ * Function: ListPrev
+ *
+ *  Description:
+ *      Returns the previous item in the list.
+ *    
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *  
+ *  Returns:
+ *      The previous item in the list. NULL if there are no more items in list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListPrev( LinkedList * list,
+          ListNode * node )
 {
-	assert(list != NULL);
-	assert(node != NULL);
+    assert( list != NULL );
+    assert( node != NULL );

-	if (!list || !node)
-		return NULL;
+    if( ( list == NULL ) || ( node == NULL ) )
+        return NULL;

-	if (node->prev == &list->head)
-		return NULL;
-	else
-		return node->prev;
+    if( node->prev == &list->head )
+        return NULL;
+    else
+        return node->prev;
 }

-ListNode *ListFind(LinkedList *list, ListNode *start, void *item)
+/****************************************************************************
+ * Function: ListFind
+ *
+ *  Description:
+ *      Finds the specified item in the list.
+ *      Uses the compare function specified in ListInit. If compare function
+ *      is NULL then compares items as pointers.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ *      ListNode *start - the node to start from, NULL if to start from 
+ *                        beginning.
+ *      void * item - the item to search for.
+ *  Returns:
+ *      The node containing the item. NULL if no node contains the item.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+ListNode *
+ListFind( LinkedList * list,
+          ListNode * start,
+          void *item )
 {
-	ListNode *finger = NULL;

-	if (!list)
-		return NULL;
-	if (!start)
-		start = &list->head;
+    ListNode *finger = NULL;

-	assert(start);
+    if( list == NULL )
+        return NULL;

-	finger = start->next;
+    if( start == NULL )
+        start = &list->head;

-	assert(finger);
+    assert( start );

-	while (finger != &list->tail) {
-		if (list->cmp_func) {
-			if (list->cmp_func(item, finger->item))
-				return finger;
-		} else {
-			if (item == finger->item)
-				return finger;
-		}
-		finger = finger->next;
-	}
+    finger = start->next;
+
+    assert( finger );
+
+    while( finger != &list->tail ) {
+        if( list->cmp_func ) {
+            if( list->cmp_func( item, finger->item ) )
+                return finger;
+        } else {
+            if( item == finger->item )
+                return finger;
+        }
+        finger = finger->next;
+    }
+
+    return NULL;

-	return NULL;
 }

-long ListSize(LinkedList *list)
+/****************************************************************************
+ * Function: ListSize
+ *
+ *  Description:
+ *     Returns the size of the list.
+ *  Parameters:
+ *      LinkedList *list  - must be valid, non null, pointer to a linked list.
+ 
+ *  Returns:
+ *      The number of items in the list.
+ *  Precondition:
+ *      The list has been initialized.
+ *****************************************************************************/
+int
+ListSize( LinkedList * list )
 {
-	assert(list != NULL);
+    assert( list != NULL );

-	if (!list)
-		return EINVAL;
+    if( list == NULL )
+        return EINVAL;

-	return list->size;
+    return list->size;
 }

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

 #include "TimerThread.h"
-
 #include <assert.h>

-/*!
- * \brief Deallocates a dynamically allocated TimerEvent.
- */
-static void FreeTimerEvent(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] Must be allocated with CreateTimerEvent*/
-	TimerEvent *event)
+/****************************************************************************
+ * Function: FreeTimerEvent
+ *
+ *  Description:
+ *      Deallocates a dynamically allocated TimerEvent.
+ *  Parameters:
+ *      TimerEvent *event - must be allocated with CreateTimerEvent
+ *****************************************************************************/
+static void
+FreeTimerEvent( TimerThread * timer,
+                TimerEvent * event )
 {
-	assert(timer != NULL);

-	FreeListFree(&timer->freeEvents, event);
+    assert( timer != NULL );
+
+    FreeListFree( &timer->freeEvents, event );
 }

-/*!
- * \brief Implements timer thread.
+/****************************************************************************
+ * Function: TimerThreadWorker
 *
- * Waits for next event to occur and schedules associated job into threadpool.
- */
-static void *TimerThreadWorker(
-	/*! [in] arg is cast to (TimerThread *). */
-	void *arg)
+ *  Description:
+ *      Implements timer thread.
+ *      Waits for next event to occur and schedules
+ *      associated job into threadpool.
+ *      Internal Only.
+ *  Parameters:
+ *      void * arg -> is cast to TimerThread *
+ *****************************************************************************/
+static void *
+TimerThreadWorker( void *arg )
 {
    TimerThread *timer = ( TimerThread * ) arg;
    ListNode *head = NULL;
+
    TimerEvent *nextEvent = NULL;
+
    time_t currentTime = 0;
    time_t nextEventTime = 0;
    struct timespec timeToWait;
+
    int tempId;

    assert( timer != NULL );

    ithread_mutex_lock( &timer->mutex );
-    while (1) {
-        /* mutex should always be locked at top of loop */
-	/* Check for shutdown. */
-        if (timer->shutdown) {
+
+    while( 1 )
+    {
+
+        //mutex should always be locked at top of loop
+
+        //Check for shutdown
+
+        if( timer->shutdown )
+        {
+
            timer->shutdown = 0;
            ithread_cond_signal( &timer->condition );
            ithread_mutex_unlock( &timer->mutex );
            return NULL;
+
        }
+
        nextEvent = NULL;
-        /* Get the next event if possible. */
-        if (timer->eventQ.size > 0) {
+
+        //Get the next event if possible
+        if( timer->eventQ.size > 0 )
+        {
            head = ListHead( &timer->eventQ );
+
            nextEvent = ( TimerEvent * ) head->item;
            nextEventTime = nextEvent->eventTime;
        }
-        currentTime = time(NULL);
-        /* If time has elapsed, schedule job. */
-        if (nextEvent && currentTime >= nextEventTime) {
+
+        currentTime = time( NULL );
+
+        //If time has elapsed, schedule job
+
+        if( ( nextEvent != NULL ) && ( currentTime >= nextEventTime ) )
+        {
+
            if( nextEvent->persistent ) {
+
                ThreadPoolAddPersistent( timer->tp, &nextEvent->job,
                                         &tempId );
            } else {
+
                ThreadPoolAdd( timer->tp, &nextEvent->job, &tempId );
            }
+
            ListDelNode( &timer->eventQ, head, 0 );
            FreeTimerEvent( timer, nextEvent );
+
            continue;
+
        }
-        if (nextEvent) {
+
+        if( nextEvent != NULL ) {
            timeToWait.tv_nsec = 0;
            timeToWait.tv_sec = nextEvent->eventTime;
+
            ithread_cond_timedwait( &timer->condition, &timer->mutex,
                                    &timeToWait );
+
        } else {
            ithread_cond_wait( &timer->condition, &timer->mutex );
        }
+
    }
 }

-
-/*!
- * \brief Calculates the appropriate timeout in absolute seconds
- * since Jan 1, 1970.
+/****************************************************************************
+ * Function: CalculateEventTime
 *
- * \return 
- */
-static int CalculateEventTime(
-	/*! [in] Timeout. */
-	time_t *timeout,
-	/*! [in] Timeout type. */
-	TimeoutType type)
+ *  Description:
+ *      Calculates the appropriate timeout in absolute seconds since
+ *      Jan 1, 1970
+ *      Internal Only.
+ *  Parameters:
+ *      time_t *timeout - timeout
+ *      
+ *****************************************************************************/
+static int
+CalculateEventTime( time_t * timeout,
+                    TimeoutType type )
 {
    time_t now;

    assert( timeout != NULL );

-    if (type == ABS_SEC)
+    if( type == ABS_SEC )
        return 0;
-    else /*if (type == REL_SEC) */{
-        time(&now);
+    else if( type == REL_SEC ) {
+        time( &now );
        ( *timeout ) += now;
        return 0;
    }

    return -1;
+
 }

-/*!
- * \brief Creates a Timer Event. (Dynamically allocated).
+/****************************************************************************
+ * Function: CreateTimerEvent
 *
- * \return (TimerEvent *) on success, NULL on failure.
- */
-static TimerEvent *CreateTimerEvent(
-	/*! [in] Valid timer thread pointer. */
-	TimerThread *timer,
-	/*! [in] . */
-	ThreadPoolJob *job,
-	/*! [in] . */
-	Duration persistent,
-	/*! [in] The absoule time of the event in seconds from Jan, 1970. */
-	time_t eventTime,
-	/*! [in] Id of job. */
-	int id)
+ *  Description:
+ *      Creates a Timer Event. (Dynamically allocated)
+ *      Internal to timer thread.
+ *  Parameters:
+ *      func - thread function to run.
+ *      arg - argument to function.
+ *      priority - priority of job.
+ *      eventTime - the absoule time of the event
+ *                  in seconds from Jan, 1970
+ *      id - id of job
+ *      
+ *  Returns:
+ *      TimerEvent * on success, NULL on failure.
+ ****************************************************************************/
+static TimerEvent *
+CreateTimerEvent( TimerThread * timer,
+                  ThreadPoolJob * job,
+                  Duration persistent,
+                  time_t eventTime,
+                  int id )
 {
    TimerEvent *temp = NULL;

@@ -172,8 +215,25 @@ static TimerEvent *CreateTimerEvent(
    return temp;
 }

-
-int TimerThreadInit(TimerThread *timer, ThreadPool *tp)
+/************************************************************************
+ * Function: TimerThreadInit
+ * 
+ *  Description:
+ *     Initializes and starts timer thread.
+ *
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             tp  - valid thread pool to use. Must be
+ *                   started. Must be valid for lifetime
+ *                   of timer.  Timer must be shutdown
+ *                   BEFORE thread pool.
+ *  Return:
+ *            0 on success, nonzero on failure
+ *            Returns error from ThreadPoolAddPersistent if failure.
+ ************************************************************************/
+int
+TimerThreadInit( TimerThread * timer,
+                 ThreadPool * tp )
 {

    int rc = 0;
@@ -227,16 +287,42 @@ int TimerThreadInit(TimerThread *timer, ThreadPool *tp)
    }

    return rc;
+
 }

-int TimerThreadSchedule(
-	TimerThread *timer,
-	time_t timeout,
-	TimeoutType type,
-	ThreadPoolJob *job,
-	Duration duration,
-	int *id)
+/************************************************************************
+ * Function: TimerThreadSchedule
+ * 
+ *  Description:
+ *     Schedules an event to run at a specified time.
+ *
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             time_t - time of event.
+ *                      either in absolute seconds,
+ *                      or relative seconds in the future.
+ *             timeoutType - either ABS_SEC, or REL_SEC.
+ *                           if REL_SEC, then the event
+ *                           will be scheduled at the
+ *                           current time + REL_SEC.
+ *             
+ *             func - function to schedule
+ *             arg - argument to function
+ *             priority - priority of job.
+ *             id - id of timer event. (out)
+ *  Return:
+ *            0 on success, nonzero on failure
+ *			  EOUTOFMEM if not enough memory to schedule job
+ ************************************************************************/
+int
+TimerThreadSchedule( TimerThread * timer,
+                     time_t timeout,
+                     TimeoutType type,
+                     ThreadPoolJob * job,
+                     Duration duration,
+                     int *id )
 {
+
    int rc = EOUTOFMEM;
    int found = 0;
    int tempId = 0;
@@ -269,25 +355,35 @@ int TimerThreadSchedule(
    }

    tempNode = ListHead( &timer->eventQ );
-    /* add job to Q. Q is ordered by eventTime with the head of the Q being
-     * the next event. */
+    //add job to Q
+    //Q is ordered by eventTime
+    //with the head of the Q being the next event
+
    while( tempNode != NULL ) {
        temp = ( TimerEvent * ) tempNode->item;
-        if( temp->eventTime >= timeout ) {
-            if (ListAddBefore( &timer->eventQ, newEvent, tempNode))
+        if( temp->eventTime >= timeout )
+        {
+
+            if( ListAddBefore( &timer->eventQ, newEvent, tempNode ) !=
+                NULL )
                rc = 0;
            found = 1;
            break;
+
        }
        tempNode = ListNext( &timer->eventQ, tempNode );
    }
-    /* add to the end of Q. */
-    if (!found) {
+
+    //add to the end of Q
+    if( !found ) {
+
        if( ListAddTail( &timer->eventQ, newEvent ) != NULL )
            rc = 0;
+
    }
-    /* signal change in Q. */
+    //signal change in Q
    if( rc == 0 ) {
+
        ithread_cond_signal( &timer->condition );
    } else {
        FreeTimerEvent( timer, newEvent );
@@ -298,10 +394,28 @@ int TimerThreadSchedule(
    return rc;
 }

-int TimerThreadRemove(
-	TimerThread *timer,
-	int id,
-	ThreadPoolJob *out)
+/************************************************************************
+ * Function: TimerThreadRemove
+ * 
+ *  Description:
+ *     Removes an event from the timer Q.
+ *     Events can only be removed 
+ *     before they have been placed in the
+ *     thread pool.
+ *
+ *  Parameters:
+ *             timer - valid timer thread pointer.
+ *             id - id of event to remove.
+ *             out - space for returned job (Can be NULL)
+ *  Return:
+ *            0 on success.
+ *            INVALID_EVENT_ID on error.
+ *
+ ************************************************************************/
+int
+TimerThreadRemove( TimerThread * timer,
+                   int id,
+                   ThreadPoolJob * out )
 {
    int rc = INVALID_EVENT_ID;
    ListNode *tempNode = NULL;
@@ -336,7 +450,21 @@ int TimerThreadRemove(
    return rc;
 }

-int TimerThreadShutdown(TimerThread *timer)
+/************************************************************************
+ * Function: TimerThreadShutdown
+ * 
+ *  Description:
+ *    Shutdown the timer thread
+ *    Events scheduled in the future will NOT be run.
+ *    Timer thread should be shutdown BEFORE it's associated
+ *    thread pool.
+ *  Returns:
+ *    returns 0 if succesfull,
+ *            nonzero otherwise.
+ *            Always returns 0.
+ ***********************************************************************/
+int
+TimerThreadShutdown( TimerThread * timer )
 {
    ListNode *tempNode2 = NULL;
    ListNode *tempNode = NULL;
@@ -352,7 +480,9 @@ int TimerThreadShutdown(TimerThread *timer)
    timer->shutdown = 1;
    tempNode = ListHead( &timer->eventQ );

-    /* Delete nodes in Q. Call registered free function on argument. */
+    //Delete nodes in Q
+    //call registered free function 
+    //on argument
    while( tempNode != NULL ) {
        TimerEvent *temp = ( TimerEvent * ) tempNode->item;

@@ -370,19 +500,20 @@ int TimerThreadShutdown(TimerThread *timer)

    ithread_cond_broadcast( &timer->condition );

-    while (timer->shutdown) {
-	/* wait for timer thread to shutdown. */
+    while( timer->shutdown )    //wait for timer thread to shutdown
+    {
        ithread_cond_wait( &timer->condition, &timer->mutex );
    }
-    ithread_mutex_unlock(&timer->mutex);

-    /* destroy condition. */
-    while(ithread_cond_destroy(&timer->condition) != 0) {
+    ithread_mutex_unlock( &timer->mutex );
+
+    //destroy condition
+    while( ithread_cond_destroy( &timer->condition ) != 0 ) {
    }
-    /* destroy mutex. */
-    while (ithread_mutex_destroy(&timer->mutex) != 0) {
+
+    //destroy mutex
+    while( ithread_mutex_destroy( &timer->mutex ) != 0 ) {
    }

    return 0;
 }
-
--- a/upnp/Makefile.am
+++ b/upnp/Makefile.am
@@ -1,7 +1,7 @@
 #
 # "Makefile.am" for "libupnp/upnp"
 #
-# Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 #

 SUBDIRS = doc . sample
@@ -19,14 +19,8 @@ LDADD = \

 upnpincludedir = $(includedir)/upnp
 upnpinclude_HEADERS = \
-	inc/UpnpString.h \
 	inc/upnp.h \
-	inc/upnpdebug.h \
-	inc/UpnpGlobal.h \
-	inc/UpnpInet.h \
-	inc/UpnpIntTypes.h \
-	inc/UpnpStdInt.h \
-	inc/UpnpUniStd.h
+	inc/upnpdebug.h

 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
@@ -52,6 +46,7 @@ libupnp_la_SOURCES = \
 	src/inc/gena_device.h \
 	src/inc/global.h \
 	src/inc/gmtdate.h \
+	src/inc/http_client.h \
 	src/inc/httpparser.h \
 	src/inc/httpreadwrite.h \
 	src/inc/md5.h \
@@ -70,17 +65,17 @@ libupnp_la_SOURCES = \
 	src/inc/sysdep.h \
 	src/inc/unixutil.h \
 	src/inc/upnpapi.h \
+	src/inc/upnpclosesocket.h \
 	src/inc/upnp_timeout.h \
 	src/inc/uri.h \
 	src/inc/urlconfig.h \
-	src/inc/upnputil.h \
+	src/inc/util.h \
+	src/inc/utilall.h \
 	src/inc/uuid.h \
-	src/inc/VirtualDir.h \
 	src/inc/webserver.h

 # ssdp
 libupnp_la_SOURCES += \
-        src/ssdp/ssdp_ResultData.h \
 	src/ssdp/ssdp_device.c \
 	src/ssdp/ssdp_ctrlpt.c \
 	src/ssdp/ssdp_server.c
@@ -115,14 +110,10 @@ libupnp_la_SOURCES += \
 	src/gena/gena_callback2.c

 # api
-libupnp_la_SOURCES += \
-	src/api/UpnpString.c \
-	src/api/upnpapi.c
-
+libupnp_la_SOURCES += src/api/upnpapi.c
 if ENABLE_TOOLS
 libupnp_la_SOURCES += src/api/upnptools.c
 endif
-
 if ENABLE_DEBUG
 libupnp_la_SOURCES += src/api/upnpdebug.c 
 endif
@@ -139,12 +130,6 @@ libupnp_la_SOURCES += \
 libupnp_la_SOURCES += src/urlconfig/urlconfig.c


-# inet_pton (needed on Win32, compiles to nothing elsewhere)
-libupnp_la_SOURCES += \
-	src/inet_pton.c \
-	src/inc/inet_pton.h
-
-
 # check / distcheck tests
 check_PROGRAMS = test_init
 TESTS = test_init
@@ -153,7 +138,8 @@ test_init_SOURCES = test/test_init.c

 EXTRA_DIST = \
 	LICENSE \
-	m4/libupnp.m4 \
+	src/inc/inet_pton.h \
+	src/inet_pton.c \
 	src/win_dll.c


--- a/upnp/inc/UpnpGlobal.h
+++ b/upnp/inc/UpnpGlobal.h
@@ -1,122 +0,0 @@
-#ifndef UPNPGLOBAL_H
-#define UPNPGLOBAL_H
-
-/*!
- * \file
- *
- * \brief Defines constants that for some reason are not defined on some systems.
- */
-
-#if defined MYLIB_LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 != 64
-	#if defined __GNUC__
-		#warning libupnp requires largefile mode - use AC_SYS_LARGEFILE
-	#else
-		#error  libupnp requires largefile mode - use AC_SYS_LARGEFILE
-	#endif
-#endif
-
-#ifdef WIN32
-	/*
-	 * EXPORT_SPEC
-	 */
-	#ifdef UPNP_STATIC_LIB
-		#define EXPORT_SPEC
-	#else /* UPNP_STATIC_LIB */
-		#ifdef LIBUPNP_EXPORTS
-			/*! set up declspec for dll export to make functions
-			 * visible to library users */
-			#define EXPORT_SPEC __declspec(dllexport)
-		#else /* LIBUPNP_EXPORTS */
-			#define EXPORT_SPEC __declspec(dllimport)
-		#endif /* LIBUPNP_EXPORTS */
-	#endif /* UPNP_STATIC_LIB */
-
-	/*
-	 * UPNP_INLINE
-	 * PRId64
-	 * PRIzd
-	 * PRIzu
-	 * PRIzx
-	 */
-	#ifdef UPNP_USE_MSVCPP
-		/* define some things the M$ VC++ doesn't know */
-		#define UPNP_INLINE
-		typedef __int64 int64_t;
-		#define PRId64 "I64d"
-		#define PRIzd "ld"
-		#define PRIzu "lu"
-		#define PRIzx "lx"
-	#endif /* UPNP_USE_MSVCPP */
-
-	#ifdef UPNP_USE_BCBPP
-		/* define some things Borland Builder doesn't know */
-		#define UPNP_INLINE inline
-		typedef __int64 int64_t;
-		#warning The Borland C compiler is probably broken on PRId64,
-		#warning please someone provide a proper fix here
-		#define PRId64 "I64d"
-		#define PRIzd "zd"
-		#define PRIzu "zu"
-		#define PRIzx "zx"
-	#endif /* UPNP_USE_BCBPP */
-
-	#ifdef __GNUC__
-		#define UPNP_INLINE inline
-		/* Note with PRIzu that in the case of Mingw32, it's the MS C
-		 * runtime printf which ends up getting called, not the glibc
-		 * printf, so it genuinely doesn't have "zu"
-		 */
-		#define PRIzd "ld"
-		#define PRIzu "lu"
-		#define PRIzx "lx"
-	#endif /* __GNUC__ */
-#else
-	/*! 
-	 * \brief Export functions on WIN32 DLLs.
-	 *
-	 * Every funtion that belongs to the library API must use this
-	 * definition upon declaration or it will not be exported on WIN32
-	 * DLLs.
-	 */
-	#define EXPORT_SPEC
-
-	/*!
-	 * \brief Declares an inline function.
-	 *
-	 * Surprisingly, there are some compilers that do not understand the
-	 * inline keyword. This definition makes the use of this keyword
-	 * portable to these systems.
-	 */
-	#ifdef __STRICT_ANSI__
-		#define UPNP_INLINE __inline__
-	#else
-		#define UPNP_INLINE inline
-	#endif
-
-	/*!
-	 * \brief Supply the PRId64 printf() macro.
-	 *
-	 * MSVC still does not know about this.
-	 */
-	/* #define PRId64 PRId64 */
-
-	/*!
-	 * \brief Supply the PRIz* printf() macros.
-	 *
-	 * These macros were invented so that we can live a little longer with
-	 * MSVC lack of C99. "z" is the correct printf() size specifier for
-	 * the size_t type.
-	 */
-	#define PRIzd "zd"
-	#define PRIzu "zu"
-	#define PRIzx "zx"
-#endif
-
-/*
- * Defining this macro here gives some interesting information about unused
- * functions in the code. Of course, this should never go uncommented on a
- * release.
- */
-/*#define inline*/
-
-#endif /* UPNPGLOBAL_H */
--- a/upnp/inc/UpnpInet.h
+++ b/upnp/inc/UpnpInet.h
@@ -1,57 +0,0 @@
-#ifndef UPNPINET_H
-#define UPNPINET_H
-
-/*!
- * \addtogroup Sock
- * 
- * @{
- * 
- * \file
- *
- * \brief Provides a platform independent way to include TCP/IP types and functions.
- */
-
-#include "UpnpUniStd.h" /* for close() */
-
-#ifdef WIN32
-	#include <stdarg.h>
-	#include <windef.h>
-	#include <winbase.h>
-	#include <winsock2.h>
-	#include <iphlpapi.h>
-	#include <ws2tcpip.h>
-
-	#define UpnpCloseSocket closesocket
-#else /* WIN32 */
-	#include <sys/param.h>
-	#if defined(__sun)
-		#include <fcntl.h>
-		#include <sys/sockio.h>
-	#elif (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)
-		#include <ifaddrs.h>
-		/* Do not move or remove the include below for "sys/socket"!
-		 * Will break FreeBSD builds. */
-		#include <sys/socket.h>
-	#endif
-	#include <arpa/inet.h>  /* for inet_pton() */
-	#include <net/if.h>
-	#include <netinet/in.h>
-
-	/*! This typedef makes the code slightly more WIN32 tolerant.
-	 * On WIN32 systems, SOCKET is unsigned and is not a file
-	 * descriptor. */
-	typedef int SOCKET;
-
-	/*! INVALID_SOCKET is unsigned on win32. */
-	#define INVALID_SOCKET (-1)
-
-	/*! select() returns SOCKET_ERROR on win32. */
-	#define SOCKET_ERROR (-1)
-
-	/*! Alias to close() to make code more WIN32 tolerant. */
-	#define UpnpCloseSocket close
-#endif /* WIN32 */
-
-/* @} Sock */
-
-#endif /* UPNPINET_H */
--- a/upnp/inc/UpnpIntTypes.h
+++ b/upnp/inc/UpnpIntTypes.h
@@ -1,11 +0,0 @@
-#ifndef UPNPINTTYPES_H
-#define UPNPINTTYPES_H
-
-#if !defined(UPNP_USE_BCBPP) && !defined(UPNP_USE_MSVCPP)
-
-/* Printf format for integers. */
-#include <inttypes.h>
-
-#endif /* !defined(UPNP_USE_BCBPP) && !defined(UPNP_USE_MSVCPP) */
-
-#endif /* UPNPINTTYPES_H */
--- a/upnp/inc/UpnpStdInt.h
+++ b/upnp/inc/UpnpStdInt.h
@@ -1,11 +0,0 @@
-#ifndef UPNPSTDINT_H
-#define UPNPSTDINT_H
-
-#if !defined(UPNP_USE_BCBPP) && !defined(UPNP_USE_MSVCPP)
-
-/* Sized integer types. */
-#include <stdint.h>
-
-#endif /* !defined(UPNP_USE_BCBPP) && !defined(UPNP_USE_MSVCPP) */
-
-#endif /* UPNPSTDINT_H */
--- a/upnp/inc/UpnpString.h
+++ b/upnp/inc/UpnpString.h
@@ -1,171 +0,0 @@
-
-
-#ifndef STRING_H
-#define STRING_H
-
-
-/*!
- * \defgroup UpnpString The UpnpString Class
- *
- * \brief Implements string operations in the UPnP library.
- *
- * \author Marcelo Roberto Jimenez
- *
- * \version 1.0
- *
- * @{
- *
- * \file
- *
- * \brief UpnpString object declaration.
- */
-
-
-#include "UpnpGlobal.h" /* for EXPORT_SPEC */
-
-
-#include <stdlib.h> /* for size_t */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/*!
- * \brief Type of the string objects inside libupnp.
- */
-typedef struct s_UpnpString UpnpString;
-
-
-/*!
- * \brief Constructor.
- *
- * \return A pointer to a new allocated object.
- */
-EXPORT_SPEC UpnpString *UpnpString_new();
-
-
-/*!
- * \brief Destructor.
- */
-EXPORT_SPEC void UpnpString_delete(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p);
-
-
-/*!
- * \brief Copy Constructor.
- *
- * \return A pointer to a new allocated copy of the original object.
- */
-EXPORT_SPEC UpnpString *UpnpString_dup(
-	/*! [in] The \em \b this pointer. */
-	const UpnpString *p);
-
-
-/*!
- * \brief Assignment operator.
- */
-EXPORT_SPEC void UpnpString_assign(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] The \em \b that pointer. */
-	const UpnpString *q);
-
-
-/*!
- * \brief Returns the length of the string.
- *
- * \return The length of the string.
- * */
-EXPORT_SPEC size_t UpnpString_get_Length(
-	/*! [in] The \em \b this pointer. */
-	const UpnpString *p);
-
-
-/*!
- * \brief Truncates the string to the specified lenght, or does nothing
- * if the current lenght is less than or equal to the requested length.
- * */
-EXPORT_SPEC void UpnpString_set_Length(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] The requested length. */
-	size_t n);
-
-
-/*!
- * \brief Returns the pointer to char.
- *
- * \return The pointer to char.
- */
-EXPORT_SPEC const char *UpnpString_get_String(
-	/*! [in] The \em \b this pointer. */
-	const UpnpString *p);
-
-
-/*!
- * \brief Sets the string from a pointer to char.
- */
-EXPORT_SPEC int UpnpString_set_String(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] (char *) to copy from. */
-	const char *s);
-
-
-/*!
- * \brief Sets the string from a pointer to char using a maximum of N chars.
- */
-EXPORT_SPEC int UpnpString_set_StringN(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p,
-	/*! [in] (char *) to copy from. */
-	const char *s,
-	/*! Maximum number of chars to copy.*/
-	size_t n);
-
-
-/*!
- * \brief Clears the string, sets its size to zero.
- */
-EXPORT_SPEC void UpnpString_clear(
-	/*! [in] The \em \b this pointer. */
-	UpnpString *p);
-
-
-/*!
- * \brief Compares two strings for equality. Case matters.
- *
- * \return The result of strcmp().
- */
-EXPORT_SPEC int UpnpString_cmp(
-	/*! [in] The \em \b the first string. */
-	UpnpString *p,
-	/*! [in] The \em \b the second string. */
-	UpnpString *q);
-
-
-/*!
- * \brief Compares two strings for equality. Case does not matter.
- *
- * \return The result of strcasecmp().
- */
-EXPORT_SPEC int UpnpString_casecmp(
-	/*! [in] The \em \b the first string. */
-	UpnpString *p,
-	/*! [in] The \em \b the second string. */
-	UpnpString *q);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-/* @} UpnpString The UpnpString API */
-
-
-#endif /* STRING_H */
-
--- a/upnp/inc/UpnpUniStd.h
+++ b/upnp/inc/UpnpUniStd.h
@@ -1,10 +0,0 @@
-#ifndef UPNPUNISTD_H
-#define UPNPUNISTD_H
-
-#ifdef WIN32
-	/* Do not #include <unistd.h> on WIN32. */
-#else /* WIN32 */
-	#include <unistd.h> /* for close() */
-#endif /* WIN32 */
-
-#endif /* UPNPUNISTD_H */
--- a/upnp/inc/upnp.h
+++ b/upnp/inc/upnp.h
--- a/upnp/inc/upnpconfig.h.in
+++ b/upnp/inc/upnpconfig.h.in
@@ -1,7 +1,7 @@
 /* -*- C -*- */
 /*******************************************************************************
 *
- * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net>
 * All rights reserved. 
 *
 * Redistribution and use in source and binary forms, with or without 
@@ -52,26 +52,13 @@

 /** The library version (numeric) e.g. 10300 means version 1.3.0 */
 #define UPNP_VERSION	\
-  ((UPNP_VERSION_MAJOR * 100 + UPNP_VERSION_MINOR) * 100 + UPNP_VERSION_PATCH)
+  ((UPNP_VERSION_MAJOR*100 + UPNP_VERSION_MINOR)*100 + UPNP_VERSION_PATCH)



-/***************************************************************************
- * Large file support
- ***************************************************************************/
-
-/** File Offset size */
-#undef _FILE_OFFSET_BITS
-
-/** Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/** Large files support */
-#undef _LARGE_FILE_SOURCE
-
 /***************************************************************************
 * Library optional features
- ***************************************************************************/
+ ***************************************************************************/ 

 /*
 * The following defines can be tested in order to know which 
@@ -103,9 +90,6 @@
 *  (i.e. configure --enable-tools) : <upnp/upnptools.h> file is available */
 #undef UPNP_HAVE_TOOLS

-/** Defined to 1 if the library has been compiled with ipv6 support
- *  (i.e. configure --enable-ipv6) */
-#undef UPNP_ENABLE_IPV6

 #endif /* UPNP_CONFIG_H */

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

 #ifndef UPNP_DEBUG_H
-#define UPNP_DEBUG_H
+#define UPNP_DEBUG_H 

-/*!
- * \file
- */
-
-#include "ThreadPool.h"
+#include "upnp.h"
 #include "upnpconfig.h"
-#include "UpnpGlobal.h"		/* for UPNP_INLINE */

 #include <stdio.h>

@@ -47,15 +42,16 @@
 extern "C" {
 #endif

-/*! \name Other debugging features
- *
- * The UPnP SDK contains other features to aid in debugging.
- */
-/*@{*/

-/*! \name Upnp_LogLevel
+/** @name Other debugging features
+          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,
- *  see \c UpnpSetLogLevel. 
+ *  see {\tt UpnpSetLogLevel}. 
 *  The critical level will show only those messages 
 *  which can halt the normal processing of the library, like memory 
 *  allocation errors. The remaining three levels are just for debugging 
@@ -64,11 +60,14 @@ extern "C" {
 *  Info Level displays the other important operational information 
 *  regarding the working of the library. If the user selects All, 
 *  then the library displays all the debugging information that it has.
- *    \li \c UPNP_CRITICAL [0]
- *    \li \c UPNP_PACKET [1]
- *    \li \c UPNP_INFO [2]
- *    \li \c UPNP_ALL [3]
+ *  \begin{itemize}
+ *    \item {\tt UPNP_CRITICAL [0]}
+ *    \item {\tt UPNP_PACKET [1]}
+ *    \item {\tt UPNP_INFO [2]}
+ *    \item {\tt UPNP_ALL [3]}
+ *  \end{itemize}
 */
+
 typedef enum Upnp_Module {
 	SSDP,
 	SOAP,
@@ -80,213 +79,256 @@ typedef enum Upnp_Module {
 	HTTP
 } Dbg_Module;

-/*@{*/
+/*! @{ */
 typedef enum Upnp_LogLevel_e {
 	UPNP_CRITICAL,
 	UPNP_PACKET,
 	UPNP_INFO,
 	UPNP_ALL
 } Upnp_LogLevel;
-/*@}*/
+/*! @} */

-/*!
- * Default log level : see \c Upnp_LogLevel
+
+/**
+ * Default log level : see {\tt Upnp_LogLevel}
 */
 #define UPNP_DEFAULT_LOG_LEVEL	UPNP_ALL

-/*!
- * \brief Initialize the log files.
+
+
+/***************************************************************************
+ * Function : UpnpInitLog
 *
- * \return -1 if fails or UPNP_E_SUCCESS if succeeds.
- */
+ * Parameters:	void
+ *
+ * Description:
+ *	This functions initializes the log files
+ *
+ * Returns: int
+ *	-1 : If fails
+ *	UPNP_E_SUCCESS : if success
+ ***************************************************************************/
 #ifdef DEBUG
-int UpnpInitLog(void);
+int UpnpInitLog();
 #else
-static UPNP_INLINE int UpnpInitLog(void)
-{
-	return UPNP_E_SUCCESS;
-}
-#endif
-/*!
- * \brief Set the log level (see \c Upnp_LogLevel).
- */
-#ifdef DEBUG
-void UpnpSetLogLevel(
-	/*! [in] Log level. */
-	Upnp_LogLevel log_level);
-#else
-static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level)
-{
-	return;
-	log_level = log_level;
-}
+static UPNP_INLINE int UpnpInitLog() { return UPNP_E_SUCCESS; }
 #endif

-/*!
- * \brief Closes the log files.
- */
+
+/***************************************************************************
+ * Function : UpnpSetLogLevel
+ *				
+ * Parameters: Upnp_LogLevel log_level
+ *
+ * Description:							
+ *	This functions set the log level (see {\tt Upnp_LogLevel}
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
-void UpnpCloseLog(void);
+void UpnpSetLogLevel(Upnp_LogLevel log_level);
 #else
-static UPNP_INLINE void UpnpCloseLog(void)
-{
-}
+static UPNP_INLINE void UpnpSetLogLevel(Upnp_LogLevel log_level) {}
 #endif

-/*!
- * \brief Set the name for error and information files, respectively.
- */
+
+/***************************************************************************
+ * Function : UpnpCloseLog						
+ *								
+ * Parameters:	void					
+ *								
+ * Description:							
+ *	This functions closes the log files
+ * Returns: void
+ ***************************************************************************/
+#ifdef DEBUG
+void UpnpCloseLog();
+#else
+static UPNP_INLINE void UpnpCloseLog() {}
+#endif
+
+
+/***************************************************************************
+ * Function : UpnpSetLogFileNames		
+ *							
+ * Parameters:						
+ *	IN const char* ErrFileName: name of the error file
+ *	IN const char *InfoFileName: name of the information file
+ *	IN int size: Size of the buffer
+ *	IN int starLength: This parameter provides the width of the banner
+ *								
+ * Description:							
+ *	This functions takes the buffer and writes the buffer in the file as 
+ *	per the requested banner	
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
 void UpnpSetLogFileNames(
-	/*! [in] Name of the error file. */
 	const char *ErrFileName,
-	/*! [in] Name of the information file. */
 	const char *InfoFileName);
 #else
-static UPNP_INLINE void UpnpSetLogFileNames(const char *ErrFileName,
-	const char *InfoFileName)
-{
-	return;
-	ErrFileName = ErrFileName;
-	InfoFileName = InfoFileName;
-}
+static UPNP_INLINE void UpnpSetLogFileNames(
+	const char *ErrFileName,
+	const char *InfoFileName) {}
 #endif

-/*!
- * \brief Check if the module is turned on for debug and returns the file
- * descriptor corresponding to the debug level
- *
- * \return NULL if the module is turn off for debug otheriwse returns the
- *	right file descriptor.
- */
+
+/***************************************************************************
+ * Function : UpnpGetDebugFile		
+ *						
+ * Parameters:					
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *								
+ * Description:
+ *	This function checks if the module is turned on for debug 
+ *	and returns the file descriptor corresponding to the debug level
+ * Returns: FILE *
+ *	NULL : if the module is turn off for debug 
+ *	else returns the right file descriptor
+ ***************************************************************************/
 #ifdef DEBUG
-FILE *UpnpGetDebugFile(
-	/*! [in] The level of the debug logging. It will decide whether debug
-	 * statement will go to standard output, or any of the log files. */
-	Upnp_LogLevel level,
-	/*! [in] debug will go in the name of this module. */
-	Dbg_Module module);
+FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module);
 #else
 static UPNP_INLINE FILE *UpnpGetDebugFile(Upnp_LogLevel level, Dbg_Module module)
 {
 	return NULL;
-	level = level;
-	module = module;
 }
 #endif

-/*!
- * \brief Returns true if debug output should be done in this module.
+
+/***************************************************************************
+ * Function : DebugAtThisLevel					
+ *									
+ * Parameters:			
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *					
+ * Description:					
+ *	This functions returns true if debug output should be done in this
+ *	module.
 *
- * \return Nonzero value if true, zero if false.
- */
+ * Returns: int
+ ***************************************************************************/
 #ifdef DEBUG
 int DebugAtThisLevel(
-	/*! [in] The level of the debug logging. It will decide whether debug
-	 * statement will go to standard output, or any of the log files. */
-	Upnp_LogLevel DLevel,
-	/*! [in] Debug will go in the name of this module. */
-	Dbg_Module Module);
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module);
 #else
-static UPNP_INLINE int DebugAtThisLevel(Upnp_LogLevel DLevel, Dbg_Module Module)
-{
-	return 0;
-	DLevel = DLevel;
-	Module = Module;
-}
+static UPNP_INLINE int DebugAtThisLevel(
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module) { return 0; }
 #endif

-/*!
- * \brief Prints the debug statement either on the standard output or log file
- * along with the information from where this debug statement is coming.
- */
+
+/***************************************************************************
+ * Function : UpnpPrintf				
+ *									
+ * Parameters:								
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *	IN char *DbgFileName: Name of the file from where debug statement is
+ *							coming
+ *	IN int DbgLineNo : Line number of the file from where debug statement 
+ *				is coming
+ *	IN char * FmtStr, ...: Variable number of arguments that will go 
+ *				in the debug statement
+ *					
+ * Description:							
+ *	This functions prints the debug statement either on the startdard 
+ *	output or log file along with the information from where this 
+ *	debug statement is coming
+ * Returns: void
+ ***************************************************************************/ 
 #ifdef DEBUG
 void UpnpPrintf(
-	/*! [in] The level of the debug logging. It will decide whether debug
-	 * statement will go to standard output, or any of the log files. */
 	Upnp_LogLevel DLevel,
-	/*! [in] debug will go in the name of this module. */
 	Dbg_Module Module,
-	/*! [in] Name of the file from where debug statement is coming. */
-	const char *DbgFileName,
-	/*! [in] Line number of the file from where debug statement is coming. */
+	const char* DbgFileName,
 	int DbgLineNo,
-	/*! [in] Printf like format specification. */
-	const char *FmtStr,
-	/*! [in] Printf like Variable number of arguments that will go in the
-	 * debug statement. */
+	const char* FmtStr,
 	...)
 #if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler. */
-	__attribute__ ((format(__printf__, 5, 6)))
+	/* 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, ...)
-{
-	return;
-	DLevel = DLevel;
-	Module = Module;
-	DbgFileName = DbgFileName;
-	DbgLineNo = DbgLineNo;
-	FmtStr = FmtStr;
-}
+static UPNP_INLINE void UpnpPrintf(
+	Upnp_LogLevel DLevel,
+	Dbg_Module Module,
+	const char* DbgFileName,
+	int DbgLineNo,
+	const char* FmtStr,
+	...) {}
 #endif /* DEBUG */

-/*!
- * \brief Writes the file name and file number from where debug statement is
- * coming to the log file.
- */
-#ifdef DEBUG
-void UpnpDisplayFileAndLine(
-	/*! [in] File descriptor where line number and file name will be
-	 * written. */
-	FILE * fd,
-	/*! [in] Name of the file. */
-	const char *DbgFileName,
-	/*! [in] Line number of the file. */
-	int DbgLineNo);
-#else
-static UPNP_INLINE void UpnpDisplayFileAndLine(FILE *fd,
-	const char *DbgFileName, int DbgLineNo)
-{
-	return;
-	fd = fd;
-	DbgFileName = DbgFileName;
-	DbgLineNo = DbgLineNo;
-}
-#endif

-/*!
- * \brief Writes the buffer in the file as per the requested banner
- */
+/***************************************************************************
+ * Function : UpnpDisplayBanner				
+ *							
+ * Parameters:							
+ *	IN FILE *fd: file descriptor where the banner will be written
+ *	IN char **lines: The buffer that will be written
+ *	IN int size: Size of the buffer
+ *	IN int starLength: This parameter provides the width of the banner
+ *									
+ * Description:							
+ *	This functions takes the buffer and writes the buffer in the file as 
+ *	per the requested banner			
+ * Returns: void
+ ***************************************************************************/
 #ifdef DEBUG
 void UpnpDisplayBanner(
-	/*! [in] file descriptor where the banner will be written. */
-	FILE * fd,
-	/*! [in] The buffer that will be written. */
+	FILE *fd,
 	const char **lines,
-	/*! [in] Size of the buffer. */
 	size_t size,
-	/*! [in] This parameter provides the width of the banner. */
-	size_t starlength);
+	int starlength);
 #else
-static UPNP_INLINE void UpnpDisplayBanner(FILE *fd, const char **lines,
-	size_t size, int starlength)
-{
-	return;
-	fd = fd;
-	lines = lines;
-	size = size;
-	starlength = starlength;
-}
+static UPNP_INLINE void UpnpDisplayBanner(
+	FILE *fd,
+	const char **lines,
+	size_t size,
+	int starlength) {}
 #endif

-/*@}*/
+
+/***************************************************************************
+ * Function : UpnpDisplayFileAndLine				
+ *								
+ * Parameters:							
+ *	IN FILE *fd: File descriptor where line number and file name will be 
+ *			written 
+ *	IN char *DbgFileName: Name of the file  
+ *	IN int DbgLineNo : Line number of the file
+ *								
+ * Description:
+ *	This function writes the file name and file number from where
+ *		debug statement is coming to the log file
+ * Returns: void
+ ***************************************************************************/
+#ifdef DEBUG
+void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo);
+#else
+static UPNP_INLINE void UpnpDisplayFileAndLine(
+	FILE *fd,
+	const char *DbgFileName,
+	int DbgLineNo) {}
+#endif
+
+/*! @} */

 #ifdef __cplusplus
 }
 #endif

 #endif /* UPNP_DEBUG_H */
+
--- a/upnp/inc/upnptools.h
+++ b/upnp/inc/upnptools.h
@@ -29,261 +29,201 @@
 *
 ******************************************************************************/

+/** @name Optional Tool APIs
+ *  The Linux SDK for UPnP Devices contains some additional, optional 
+ *  utility APIs that can be helpful in writing applications using the 
+ *  SDK. These additional APIs can be compiled out in order to save code 
+ *  size in the SDK. Refer to the README for details.
+ */
+
+/*! @{ */

 #ifndef UPNP_TOOLS_H
 #define UPNP_TOOLS_H

-
-/*!
- * \file
- *
- * \defgroup UPnPTools Optional Tool API
- *
- * \brief Additional, optional utility API that can be helpful in writing
- * applications.
- *
- * This additional API can be compiled out in order to save code size in the
- * library. Refer to the file README for details.
- *
- * @{
- */
-
-
-#include "ixml.h" /* for IXML_Document */
-
+#include "upnp.h"

 /* Function declarations only if tools compiled into the library */
 #if UPNP_HAVE_TOOLS

-
 #ifdef __cplusplus
 extern "C" {
 #endif

-
-/*!
- * \brief Converts an SDK error code into a string error message suitable for
- * display. The memory returned from this function should NOT be freed.
+/** {\bf UpnpResolveURL} combines a base URL and a relative URL into
+ *  a single absolute URL.  The memory for {\bf AbsURL} needs to be
+ *  allocated by the caller and must be large enough to hold the
+ *  {\bf BaseURL} and {\bf RelURL} combined.
 *
- * \return An ASCII text string representation of the error message associated
- * 	with the error code or the string "Unknown error code"
- */
-EXPORT_SPEC const char *UpnpGetErrorMessage(
-	/*! [in] The SDK error code to convert. */
-	int errorcode);
-
-
-/*!
- * \brief Combines a base URL and a relative URL into a single absolute URL.
- *
- * The memory for \b AbsURL needs to be allocated by the caller and must
- * be large enough to hold the \b BaseURL and \b RelURL combined.
- *
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: \b RelURL is <tt>NULL</tt>.
- *	\li <tt>UPNP_E_INVALID_URL</tt>: The \b BaseURL / \b RelURL 
+ *  @return [int] An integer representing one of the following:
+ *    \begin{itemize}
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
+ *      \item {\tt UPNP_E_INVALID_PARAM}: {\bf RelURL} is {\tt NULL}.
+ *      \item {\tt UPNP_E_INVALID_URL}: The {\bf BaseURL} / {\bf RelURL} 
 *              combination does not form a valid URL.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to 
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
 *              complete this operation.
+ *    \end{itemize}
 */
+
 EXPORT_SPEC int UpnpResolveURL(
-	/*! [in] The base URL to combine. */
-	const char *BaseURL,
-	/*! [in] The relative URL to \b BaseURL. */
-	const char *RelURL,
-	/*! [out] A pointer to a buffer to store the absolute URL. */
-	char *AbsURL);
+    IN const char * BaseURL,  /** The base URL to combine. */
+    IN const char * RelURL,   /** The relative URL to {\bf BaseURL}. */
+    OUT char * AbsURL   /** A pointer to a buffer to store the 
+                            absolute URL. */
+    );

-
-/*!
- * \brief Combines a base URL and a relative URL into a single absolute URL.
- *
- * The memory for \b AbsURL becomes owned by the caller and should be freed
- * later.
- *
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: \b RelURL is <tt>NULL</tt>.
- *	\li <tt>UPNP_E_INVALID_URL</tt>: The \b BaseURL / \b RelURL 
- *              combination does not form a valid URL.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to 
- *              complete this operation.
- */
-EXPORT_SPEC int UpnpResolveURL2(
-	/*! [in] The base URL to combine. */
-	const char *BaseURL,
-	/*! [in] The relative URL to \b BaseURL. */
-	const char *RelURL,
-	/*! [out] A pointer to a pointer to a buffer to store the
-	 * absolute URL. Must be freed later by the caller. */
-	char **AbsURL);
-
-
-/*!
- * \brief Creates an action request packet based on its input parameters
- * (status variable name and value pair).
- *
- * Any number of input parameters can be passed to this function but every
- * input variable name should have a matching value argument. 
- *
- * It is a wrapper function that calls makeAction() function to create the
- * action request.
- * 
- * \return The action node of \b Upnp_Document type or <tt>NULL</tt> if the
- * 	operation failed.
- */
-EXPORT_SPEC IXML_Document *UpnpMakeAction(
-	/*! [in] Name of the action request or response. */
-	const char *ActionName,
-	/*! [in] The service type. */
-	const char *ServType,
-	/*! [in] Number of argument pairs to be passed. */
-	int NumArg,
-	/*! [in] pointer to the first argument. */
-	const char *Arg,
-	/*! [in] Argument list. */
-	...);
-
-
-/*!
- * \brief Ceates an action response packet based on its output parameters
- * (status variable name and value pair).
- *
- * Any number of input parameters can be passed to this function but every
- * output variable name should have a matching value argument. 
+/** {\bf UpnpMakeAction} creates an action request packet based on its input 
+ *  parameters (status variable name and value pair). Any number of input 
+ *  parameters can be passed to this function but every input variable name 
+ *  should have a matching value argument. 
 *   
- * It is a wrapper function that calls makeAction() function to create the
- * action request.
- * 
- * \return The action node of \b Upnp_Document type or <tt>NULL</tt> if the
- * 	operation failed.
+ *  @return [IXML_Document*] The action node of {\bf Upnp_Document} type or 
+ *                      {\tt NULL} if the operation failed.
 */
-EXPORT_SPEC IXML_Document *UpnpMakeActionResponse(
-	/*! [in] The action name. */
-	const char *ActionName,
-	/*! [in] The service type.. */
-	const char *ServType,
-	/*! [in] The number of argument pairs passed. */
-	int NumArg,
-	/*! [in] The status variable name and value pair. */
-	const char *Arg,
-	/*! [in] Other status variable name and value pairs. */
-	...);

+EXPORT_SPEC IXML_Document* UpnpMakeAction(
+    IN const char * ActionName, /** The action name. */
+    IN const char * ServType,   /** The service type.  */
+    IN int NumArg,              /** Number of argument pairs to be passed. */ 
+    IN const char * Arg,        /** Status variable name and value pair. */
+    IN ...                   /*  Other status variable name and value pairs. */
+    );

-/*!
- * \brief Adds the argument in the action request.
- * 
- * This API is specially suitable inside a loop to add any number input
- * parameters into an existing action. If no action document exists in the
- * beginning then a <b>Upnp_Document variable initialized with <tt>NULL</tt></b>
- * should be passed as a parameter.
+/** {\bf UpnpAddToAction} creates an action request packet based on its input 
+ *  parameters (status variable name and value pair). This API is specially 
+ *  suitable inside a loop to add any number input parameters into an existing
+ *  action. If no action document exists in the beginning then a 
+ *  {\bf Upnp_Document} variable initialized with {\tt NULL} should be passed 
+ *  as a parameter.
 *
- * It is a wrapper function that calls addToAction() function to add the
- * argument in the action request.
- * 
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: One or more of the parameters are invalid.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to
- *		complete this operation.
+ *  @return [int] An integer representing one of the following:
+ *    \begin{itemize}
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
+ *      \item {\tt UPNP_E_INVALID_PARAM}: One or more of the parameters 
+ *                                        are invalid.
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
+ *              complete this operation.
+ *    \end{itemize}
 */
+
 EXPORT_SPEC int UpnpAddToAction(
-	/*! [in,out] A pointer to store the action document node. */
-	IXML_Document **ActionDoc,
-	/*! [in] The action name. */
-	const char *ActionName,
-	/*! [in] The service type. */
-	const char *ServType,
-	/*! [in] The status variable name. */
-	const char *ArgName,
-	/*! [in] The status variable value. */
-	const char *ArgVal);
+        IN OUT IXML_Document ** ActionDoc, 
+	                              /** A pointer to store the action 
+				          document node. */
+        IN const char * ActionName,   /** The action name. */
+        IN const char * ServType,     /** The service type.  */
+        IN const char * ArgName,      /** The status variable name. */
+        IN const char * ArgVal        /** The status variable value.  */
+        );

-
-/*!
- * \brief Creates an action response packet based on its output parameters
- * (status variable name and value pair).
- *
- * This API is especially suitable inside a loop to add any number of input
- * parameters into an existing action response. If no action document exists
- * in the beginning, a \b Upnp_Document variable initialized with <tt>NULL</tt>
- * should be passed as a parameter.
- *
- * It is a wrapper function that calls addToAction() function to add the
- * argument in the action request.
- * 
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: One or more of the parameters are invalid.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to
- *		complete this operation.
+/** {\bf UpnpMakeActionResponse} creates an action response packet based 
+ *  on its output parameters (status variable name and value pair). Any  
+ *  number of input parameters can be passed to this function but every output
+ *  variable name should have a matching value argument. 
+ *   
+ *  @return [IXML_Document*] The action node of {\bf Upnp_Document} type or 
+ *                           {\tt NULL} if the operation failed.
 */
+
+EXPORT_SPEC IXML_Document* UpnpMakeActionResponse(
+    IN const char * ActionName, /** The action name. */
+    IN const char * ServType,   /** The service type.  */
+    IN int NumArg,              /** The number of argument pairs passed. */  
+    IN const char * Arg,        /** The status variable name and value pair. */
+    IN ...                   /*  Other status variable name and value pairs. */
+    );
+
+/** {\bf UpnpAddToActionResponse} creates an action response
+ *  packet based on its output parameters (status variable name
+ *  and value pair). This API is especially suitable inside
+ *  a loop to add any number of input parameters into an existing action 
+ *  response. If no action document exists in the beginning, a 
+ *  {\bf Upnp_Document} variable initialized with {\tt NULL} should be passed 
+ *  as a parameter.
+ *
+ *  @return [int] An integer representing one of the following:
+ *    \begin{itemize}
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
+ *      \item {\tt UPNP_E_INVALID_PARAM}: One or more of the parameters 
+ *                                        are invalid.
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
+ *              complete this operation.
+ *    \end{itemize}
+ */
+
 EXPORT_SPEC int UpnpAddToActionResponse(
-	/*! [in,out] Pointer to a document to store the action document node. */
-        IXML_Document **ActionResponse, 
-	/*! [in] The action name. */
-        const char *ActionName,
-	/*! [in] The service type. */
-        const char *ServType,
-	/*! [in] The status variable name. */
-        const char *ArgName,
-	/*! [in] The status variable value. */
-        const char *ArgVal);
+        IN OUT IXML_Document ** ActionResponse, 
+	                                   /** Pointer to a document to 
+					       store the action document 
+					       node. */
+        IN const char * ActionName,        /** The action name. */
+        IN const char * ServType,          /** The service type.  */
+        IN const char * ArgName,           /** The status variable name. */
+        IN const char * ArgVal             /** The status variable value.  */
+        );

-
-/*!
- * \brief Creates a property set message packet.
- *
- * Any number of input parameters can be passed to this function but every
- * input variable name should have a matching value input argument.
+/** {\bf UpnpAddToPropertySet} can be used when an application needs to 
+ *  transfer the status of many variables at once. It can be used 
+ *  (inside a loop) to add some extra status variables into an existing
+ *  property set. If the application does not already have a property
+ *  set document, the application should create a variable initialized 
+ *  with {\tt NULL} and pass that as the first parameter.
 *  
- * \return <tt>NULL</tt> on failure, or the property-set document node.
- */
-EXPORT_SPEC IXML_Document *UpnpCreatePropertySet(
-	/*! [in] The number of argument pairs passed. */
-	int NumArg,
-	/*! [in] The status variable name and value pair. */
-	const char *Arg,
-	/*! [in] Variable sized list with the rest of the parameters. */
-	...);
-
-
-/*!
- * \brief Can be used when an application needs to transfer the status of many
- * variables at once.
+ *  @return [int] An integer representing one of the following:
+ *    \begin{itemize}
+ *      \item {\tt UPNP_E_SUCCESS}: The operation completed successfully.
+ *      \item {\tt UPNP_E_INVALID_PARAM}: One or more of the parameters 
+ *                                        are invalid.
+ *      \item {\tt UPNP_E_OUTOF_MEMORY}: Insufficient resources exist to 
+ *              complete this operation.
+ *    \end{itemize}
 *
- * It can be used (inside a loop) to add some extra status variables into an
- * existing property set. If the application does not already have a property
- * set document, the application should create a variable initialized with
- * <tt>NULL</tt> and pass that as the first parameter.
- *  
- * \return An integer representing one of the following:
- *	\li <tt>UPNP_E_SUCCESS</tt>: The operation completed successfully.
- *	\li <tt>UPNP_E_INVALID_PARAM</tt>: One or more of the parameters are invalid.
- *	\li <tt>UPNP_E_OUTOF_MEMORY</tt>: Insufficient resources exist to
- *		complete this operation.
 */
+
 EXPORT_SPEC int UpnpAddToPropertySet(
-	/*! [in,out] A pointer to the document containing the property set document node. */
-	IXML_Document **PropSet,
-	/*! [in] The status variable name. */
-	const char *ArgName,
-	/*! [in] The status variable value. */
-	const char *ArgVal);
+    IN OUT IXML_Document **PropSet,    
+                                  /** A pointer to the document containing 
+				      the property set document node. */
+    IN const char * ArgName,      /** The status variable name. */  
+    IN const char * ArgVal        /** The status variable value.  */
+    );

+/** {\bf UpnpCreatePropertySet} creates a property set  
+ *  message packet. Any number of input parameters can be passed  
+ *  to this function but every input variable name should have 
+ *  a matching value input argument.
+ *  
+ *  @return [IXML_Document*] {\tt NULL} on failure, or the property-set 
+ *                           document node.
+ *
+ */
+
+EXPORT_SPEC IXML_Document* UpnpCreatePropertySet(
+    IN int NumArg,        /** The number of argument pairs passed. */
+    IN const char* Arg,   /** The status variable name and value pair. */
+    IN ...
+    );
+
+/** {\bf UpnpGetErrorMessage} converts an SDK error code into a 
+ *  string error message suitable for display.  The memory returned
+ *  from this function should NOT be freed.
+ *
+ *  @return [char*] An ASCII text string representation of the error message 
+ *                  associated with the error code. 
+ */
+
+EXPORT_SPEC const char * UpnpGetErrorMessage(
+        int errorcode  /** The SDK error code to convert. */
+        );
+
+/*! @} */

 #ifdef __cplusplus
 }
 #endif

-
-/*! @} */
-
-
 #endif /* UPNP_HAVE_TOOLS */

-
 #endif /* UPNP_TOOLS_H */

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

+
 # samples
 noinst_PROGRAMS =
 if ENABLE_SAMPLES
 if ENABLE_CLIENT
-noinst_PROGRAMS += tv_ctrlpt
-tv_ctrlpt_CPPFLAGS = \
+noinst_PROGRAMS += upnp_tv_ctrlpt
+upnp_tv_ctrlpt_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvctrlpt
 if ENABLE_DEVICE
-noinst_PROGRAMS += tv_combo
-tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
+noinst_PROGRAMS += upnp_tv_combo
+upnp_tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvcombo
 endif
 endif
 if ENABLE_DEVICE
-noinst_PROGRAMS += tv_device
-tv_device_CPPFLAGS = \
+noinst_PROGRAMS += upnp_tv_device
+upnp_tv_device_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvdevice
 endif
 endif

-tv_device_SOURCES = \
-	common/sample_util.c \
-	common/sample_util.h \
-	common/tv_device.c \
-	common/tv_device.h \
-	linux/tv_device_main.c

-tv_ctrlpt_SOURCES = \
+upnp_tv_device_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
-	common/tv_ctrlpt.c \
-	common/tv_ctrlpt.h \
-	linux/tv_ctrlpt_main.c
+	tvdevice/upnp_tv_device.c \
+	tvdevice/upnp_tv_device.h \
+	tvdevice/linux/upnp_tv_device_main.c

-tv_combo_SOURCES = \
+
+upnp_tv_ctrlpt_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
-	common/tv_ctrlpt.c \
-	common/tv_ctrlpt.h \
-	common/tv_device.c \
-	common/tv_device.h \
-	linux/tv_combo_main.c
+	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 = \
-		$(sort \
-			$(tv_ctrlpt_SOURCES) \
-			$(tv_device_SOURCES))
+		$(upnp_tv_ctrlpt_SOURCES) \
+		$(upnp_tv_device_SOURCES)
 endif

+
 EXTRA_DIST = \
 	web/tvcombodesc.xml \
 	web/tvcontrolSCPD.xml \
--- a/upnp/sample/common/sample_util.c
+++ b/upnp/sample/common/sample_util.c
--- a/upnp/sample/common/sample_util.h
+++ b/upnp/sample/common/sample_util.h
@@ -1,70 +1,54 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 SAMPLE_UTIL_H
 #define SAMPLE_UTIL_H

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

-#include "ithread.h"
-#include "ixml.h" /* for IXML_Document, IXML_Element */
-#include "upnp.h" /* for Upnp_EventType */
-#include "upnptools.h"

 #include <stdlib.h>
 #include <string.h>

-#ifdef SAMPLE_UTIL_C
-	/*! Service types for tv services. */
-	const char *TvServiceType[] = {
-		"urn:schemas-upnp-org:service:tvcontrol:1",
-		"urn:schemas-upnp-org:service:tvpicture:1"
-	};
-#else /* SAMPLE_UTIL_C */
-	extern const char *TvServiceType[];
-#endif /* SAMPLE_UTIL_C */
+#include "ithread.h"
+#include "ixml.h"
+#include "upnptools.h"

-/* mutex to control displaying of events */
+
+// mutex to control displaying of events
 extern ithread_mutex_t display_mutex;

+
 typedef enum {
 	STATE_UPDATE = 0,
 	DEVICE_ADDED = 1,
@@ -72,198 +56,233 @@ typedef enum {
 	GET_VAR_COMPLETE = 3
 } eventType;

-/*!
- * \brief Given a DOM node such as <Channel>11</Channel>, this routine
- * extracts the value (e.g., 11) from the node and returns it as 
- * a string. The string must be freed by the caller using free.
+
+/********************************************************************************
+ * SampleUtil_GetElementValue
 *
- * \return The DOM node as a string.
- */
-char *SampleUtil_GetElementValue(
-	/*! [in] The DOM node from which to extract the value. */
-	IXML_Element *element);
-
-/*!
- * \brief Given a DOM node representing a UPnP Device Description Document,
- * this routine parses the document and finds the first service list
- * (i.e., the service list for the root device).  The service list
- * is returned as a DOM node list. The NodeList must be freed using
- * NodeList_free.
+ * Description: 
+ *       Given a DOM node such as <Channel>11</Channel>, this routine
+ *       extracts the value (e.g., 11) from the node and returns it as 
+ *       a string. The string must be freed by the caller using 
+ *       free.
 *
- * \return The service list is returned as a DOM node list.
- */
-IXML_NodeList *SampleUtil_GetFirstServiceList(
-	/*! [in] The DOM node from which to extract the service list. */
-	IXML_Document *doc); 
+ * Parameters:
+ *   node -- The DOM node from which to extract the value
+ *
+ ********************************************************************************/
+char *SampleUtil_GetElementValue(IN IXML_Element *element);

-/*!
- * \brief Given a document node, this routine searches for the first element
- * named by the input string item, and returns its value as a string.
- * String must be freed by caller using free.
- */
-char *SampleUtil_GetFirstDocumentItem(
-	/*! [in] The DOM document from which to extract the value. */
-	IXML_Document *doc,
-	/*! [in] The item to search for. */
-	const char *item); 
+/********************************************************************************
+ * SampleUtil_GetFirstServiceList
+ *
+ * Description: 
+ *       Given a DOM node representing a UPnP Device Description Document,
+ *       this routine parses the document and finds the first service list
+ *       (i.e., the service list for the root device).  The service list
+ *       is returned as a DOM node list. The NodeList must be freed using
+ *       NodeList_free.
+ *
+ * Parameters:
+ *   node -- The DOM node from which to extract the service list
+ *
+ ********************************************************************************/

-/*!
- * \brief Given a DOM element, this routine searches for the first element
- * named by the input string item, and returns its value as a string.
- * The string must be freed using free.
- */
-char *SampleUtil_GetFirstElementItem(
-	/*! [in] The DOM element from which to extract the value. */
-	IXML_Element *element,
-	/*! [in] The item to search for. */
-	const char *item); 
+IXML_NodeList *SampleUtil_GetFirstServiceList(IN IXML_Document *doc); 

-/*!
- * \brief Prints a callback event type as a string.
- */
-void SampleUtil_PrintEventType(
-	/*! [in] The callback event. */
-	Upnp_EventType S);

-/*!
- * \brief Prints callback event structure details.
- */
-int SampleUtil_PrintEvent(
-	/*! [in] The type of callback event. */
-	Upnp_EventType EventType, 
-	/*! [in] The callback event structure. */
-	void *Event);
+/********************************************************************************
+ * SampleUtil_GetFirstDocumentItem
+ *
+ * Description: 
+ *       Given a document node, this routine searches for the first element
+ *       named by the input string item, and returns its value as a string.
+ *       String must be freed by caller using free.
+ * Parameters:
+ *   doc -- The DOM document from which to extract the value
+ *   item -- The item to search for
+ *
+ ********************************************************************************/
+char *SampleUtil_GetFirstDocumentItem(IN IXML_Document *doc, IN const char *item); 

-/*!
- * \brief This routine finds the first occurance of a service in a DOM
- * representation of a description document and parses it.  Note that this
- * function currently assumes that the eventURL and controlURL values in
- * the service definitions are full URLs.  Relative URLs are not handled here.
- */
+
+
+/********************************************************************************
+ * SampleUtil_GetFirstElementItem
+ *
+ * Description: 
+ *       Given a DOM element, this routine searches for the first element
+ *       named by the input string item, and returns its value as a string.
+ *       The string must be freed using free.
+ * Parameters:
+ *   node -- The DOM element from which to extract the value
+ *   item -- The item to search for
+ *
+ ********************************************************************************/
+char *SampleUtil_GetFirstElementItem(IN IXML_Element *element, IN const char *item); 
+
+/********************************************************************************
+ * SampleUtil_PrintEventType
+ *
+ * Description: 
+ *       Prints a callback event type as a string.
+ *
+ * Parameters:
+ *   S -- The callback event
+ *
+ ********************************************************************************/
+void SampleUtil_PrintEventType(IN Upnp_EventType S);
+
+/********************************************************************************
+ * SampleUtil_PrintEvent
+ *
+ * Description: 
+ *       Prints callback event structure details.
+ *
+ * Parameters:
+ *   EventType -- The type of callback event
+ *   Event -- The callback event structure
+ *
+ ********************************************************************************/
+int SampleUtil_PrintEvent(IN Upnp_EventType EventType, 
+			  IN void *Event);
+
+/********************************************************************************
+ * SampleUtil_FindAndParseService
+ *
+ * Description: 
+ *       This routine finds the first occurance of a service in a DOM representation
+ *       of a description document and parses it.  Note that this function currently
+ *       assumes that the eventURL and controlURL values in the service definitions
+ *       are full URLs.  Relative URLs are not handled here.
+ *
+ * Parameters:
+ *   DescDoc -- The DOM description document
+ *   location -- The location of the description document
+ *   serviceSearchType -- The type of service to search for
+ *   serviceId -- OUT -- The service ID
+ *   eventURL -- OUT -- The event URL for the service
+ *   controlURL -- OUT -- The control URL for the service
+ *
+ ********************************************************************************/
 int SampleUtil_FindAndParseService (
-	/*! [in] The DOM description document. */
-	IXML_Document *DescDoc,
-	/*! [in] The location of the description document. */
-	const char *location, 
-	/*! [in] The type of service to search for. */
-	const char *serviceType,
-	/*! [out] The service ID. */
-	char **serviceId, 
-	/*! [out] The event URL for the service. */
-	char **eventURL,
-	/*! [out] The control URL for the service. */
-	char **controlURL);
+	IN IXML_Document *DescDoc,
+	IN char* location, 
+	IN char *serviceType,
+	OUT char **serviceId, 
+	OUT char **eventURL,
+	OUT char **controlURL);

-/*!
- * \brief Prototype for displaying strings. All printing done by the device,
- * control point, and sample util, ultimately use this to display strings 
- * to the user.
- */
-typedef void (*print_string)(
-	/*! [in] Format. */
-	const char *string,
-	/*! [in] Arguments. */
-	...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 1, 2)))
-#endif
-;

-/*! global print function used by sample util */
+/********************************************************************************
+ * print_string
+ *
+ * Description: 
+ *       Prototype for displaying strings. All printing done by the device,
+ *       control point, and sample util, ultimately use this to display strings 
+ *       to the user.
+ *
+ * Parameters:
+ *   const char * string.
+ *
+ ********************************************************************************/
+typedef void (*print_string)(const char *string);
+
+//global print function used by sample util
 extern print_string gPrintFun;

-/*!
- * \brief Prototype for passing back state changes.
- */
+/********************************************************************************
+ * state_update
+ *
+ * Description: 
+ *     Prototype for passing back state changes
+ *
+ * Parameters:
+ *   const char * varName
+ *   const char * varValue
+ *   const char * UDN
+ *   int          newDevice
+ ********************************************************************************/
 typedef void (*state_update)(
-	/*! [in] . */
 	const char *varName,
-	/*! [in] . */
 	const char *varValue,
-	/*! [in] . */
 	const char *UDN,
-	/*! [in] . */
 	eventType type);

-/*! global state update function used by smaple util */
+//global state update function used by smaple util
 extern state_update gStateUpdateFun;

-/*!
- * \brief Initializes the sample util. Must be called before any sample util
- * functions. May be called multiple times.
- */
-int SampleUtil_Initialize(
-	/*! [in] Print function to use in SampleUtil_Print. */
-	print_string print_function);
+/********************************************************************************
+ * SampleUtil_Initialize
+ *
+ * Description: 
+ *     Initializes the sample util. Must be called before any sample util 
+ *     functions. May be called multiple times.
+ *
+ * Parameters:
+ *   print_function - print function to use in SampleUtil_Print
+ *
+ ********************************************************************************/
+int SampleUtil_Initialize(print_string print_function);

-/*!
- * \brief Releases Resources held by sample util.
- */
+/********************************************************************************
+ * SampleUtil_Finish
+ *
+ * Description: 
+ *     Releases Resources held by sample util.
+ *
+ * Parameters:
+ *
+ ********************************************************************************/
 int SampleUtil_Finish();

-/*!
- * \brief Function emulating printf that ultimately calls the registered print
- * function with the formatted string.
+/********************************************************************************
+ * SampleUtil_Print
 *
- * Provides platform-specific print functionality.  This function should be
- * called when you want to print content suitable for console output (i.e.,
- * in a large text box or on a screen).  If your device/operating system is 
- * not supported here, you should add a port.
+ * Description: 
+ *     Function emulating printf that ultimately calls the registered print 
+ *     function with the formatted string.
 *
- * \return The same as printf.
- */
-int SampleUtil_Print(
-	/*! [in] Format (see printf). */
-	const char *fmt,
-	/*! [in] Format data. */
-	...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 1, 2)))
-#endif
-;
+ * Parameters:
+ *   fmt - format (see printf)
+ *   . . .  - variable number of args. (see printf)
+ *
+ ********************************************************************************/
+int SampleUtil_Print(char *fmt, ...);

-/*!
- * \brief
- */
-int SampleUtil_RegisterUpdateFunction(
-	/*! [in] . */
-	state_update update_function);
+/********************************************************************************
+ * SampleUtil_RegisterUpdateFunction
+ *
+ * Description: 
+ *
+ * Parameters:
+ *
+ ********************************************************************************/
+int SampleUtil_RegisterUpdateFunction(state_update update_function);

-/*!
- * \brief
- */
+/********************************************************************************
+ * SampleUtil_StateUpdate
+ *
+ * Description: 
+ *
+ * Parameters:
+ *
+ ********************************************************************************/
 void SampleUtil_StateUpdate(
-	/*! [in] . */
 	const char *varName,
-	/*! [in] . */
 	const char *varValue,
-	/*! [in] . */
 	const char *UDN,
-	/*! [in] . */
 	eventType type);

-/*!
- * \brief Prints a string to standard out.
- */
-void linux_print(const char *format, ...)
-#if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
-	__attribute__((format (__printf__, 1, 2)))
-#endif
-;
-
 #ifdef __cplusplus
 };
 #endif /* __cplusplus */

+
 #ifdef WIN32
 	#define snprintf	_snprintf
 	#define strcasecmp	stricmp
 #endif

-/*! @} UpnpSamples */

 #endif /* SAMPLE_UTIL_H */

--- a/upnp/sample/common/tv_ctrlpt.c
+++ b/upnp/sample/common/tv_ctrlpt.c
--- a/upnp/sample/common/tv_ctrlpt.h
+++ b/upnp/sample/common/tv_ctrlpt.h
@@ -1,225 +0,0 @@
-#ifndef UPNP_TV_CTRLPT_H
-#define UPNP_TV_CTRLPT_H
-
-/**************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- **************************************************************************/
-
-/*!
- * \addtogroup UpnpSamples
- *
- * @{
- *
- * \name Contro Point Sample API
- *
- * @{
- *
- * \file
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "sample_util.h"
-
-#include "upnp.h"
-#include "UpnpString.h"
-#include "upnptools.h"
-
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.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 const char *TvServiceName[];
-extern const 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(const char *);
-int		TvCtrlPointRemoveAll(void);
-int		TvCtrlPointRefresh(void);
-
-int		TvCtrlPointSendAction(int, int, const char *, const char **, char **, int);
-int		TvCtrlPointSendActionNumericArg(int devnum, int service, const char *actionName, const 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, const 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 *, const char *, int); 
-void    TvCtrlPointHandleGetVar(const char *, const char *, const DOMString);
-
-/*!
- * \brief Update a Tv state table. Called when an event is received.
- *
- * Note: this function is NOT thread save. It must be called from another
- * function that has locked the global device list.
- **/
-void TvStateUpdate(
-	/*! [in] The UDN of the parent device. */
-	char *UDN,
-	/*! [in] The service state table to update. */
-	int Service,
-	/*! [out] DOM document representing the XML received with the event. */
-	IXML_Document *ChangedVariables,
-	/*! [out] pointer to the state table for the Tv  service to update. */
-	char **State);
-
-void	TvCtrlPointHandleEvent(const char *, int, IXML_Document *); 
-void	TvCtrlPointHandleSubscribeUpdate(const char *, const Upnp_SID, int); 
-int		TvCtrlPointCallbackEventHandler(Upnp_EventType, void *, void *);
-
-/*!
- * \brief Checks the advertisement each device in the global device list.
- *
- * If an advertisement expires, the device is removed from the list.
- *
- * If an advertisement is about to expire, a search request is sent for that
- * device.
- */
-void TvCtrlPointVerifyTimeouts(
-	/*! [in] The increment to subtract from the timeouts each time the
-	 * function is called. */
-	int incr);
-
-void	TvCtrlPointPrintCommands(void);
-void*	TvCtrlPointCommandLoop(void *);
-int		TvCtrlPointStart(print_string printFunctionPtr, state_update updateFunctionPtr, int combo);
-int		TvCtrlPointStop(void);
-int		TvCtrlPointProcessCommand(char *cmdline);
-
-/*!
- * \brief Print help info for this application.
- */
-void TvCtrlPointPrintShortHelp(void);
-
-/*!
- * \brief Print long help info for this application.
- */
-void TvCtrlPointPrintLongHelp(void);
-
-/*!
- * \briefPrint the list of valid command line commands to the user
- */
-void TvCtrlPointPrintCommands(void);
-
-/*!
- * \brief Function that receives commands from the user at the command prompt
- * during the lifetime of the device, and calls the appropriate
- * functions for those commands.
- */
-void *TvCtrlPointCommandLoop(void *args);
-
-/*!
- * \brief
- */
-int TvCtrlPointProcessCommand(char *cmdline);
-
-#ifdef __cplusplus
-};
-#endif
-
-
-/*! @} Device Sample */
-
-/*! @} UpnpSamples */
-
-#endif /* UPNP_TV_CTRLPT_H */
--- a/upnp/sample/common/tv_device.c
+++ b/upnp/sample/common/tv_device.c
--- a/upnp/sample/common/tv_device.h
+++ b/upnp/sample/common/tv_device.h
@@ -1,571 +0,0 @@
-#ifndef UPNP_TV_DEVICE_H
-#define UPNP_TV_DEVICE_H
-
-/**************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- **************************************************************************/
-
-/*!
- * \addtogroup UpnpSamples
- *
- * @{
- *
- * \name Device Sample API
- *
- * @{
- *
- * \file
- */
-
-#include <stdio.h>
-#include <signal.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "sample_util.h"
-
-#include "ithread.h"
-#include "upnp.h"
-
-#include <stdlib.h>
-#include <string.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
-
-/*!
- * \brief 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.
- */
-typedef int (*upnp_action)(
-	/*! [in] Document of action request. */
-	IXML_Document *request,
-	/*! [out] Action result. */
-	IXML_Document **out,
-	/*! [out] Error string in case action was unsuccessful. */
-	const char **errorString);
-
-/*! Structure for storing Tv Service identifiers and state table. */
-struct TvService {
-	/*! Universally Unique Device Name. */
-	char UDN[NAME_SIZE];
-	/*! . */
-	char ServiceId[NAME_SIZE];
-	/*! . */
-	char ServiceType[NAME_SIZE];
-	/*! . */
-	const char *VariableName[TV_MAXVARS]; 
-	/*! . */
-	char *VariableStrVal[TV_MAXVARS];
-	/*! . */
-	const char *ActionNames[TV_MAXACTIONS];
-	/*! . */
-	upnp_action actions[TV_MAXACTIONS];
-	/*! . */
-	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;
-
-/*!
- * \brief Initializes the action table for the specified service.
- *
- * Note that knowledge of the service description is assumed.
- * Action names are hardcoded.
- */
-int SetActionTable(
-	/*! [in] one of TV_SERVICE_CONTROL or, TV_SERVICE_PICTURE. */
-	int serviceType,
-	/*! [in,out] service containing action table to set. */
-	struct TvService *out);
-
-/*!
- * \brief 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.
- */
-int TvDeviceStateTableInit(
-	/*! [in] The description document URL. */
-	char *DescDocURL);
-
-/*!
- * \brief 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.
- */
-int TvDeviceHandleSubscriptionRequest(
-	/*! [in] The subscription request event structure. */
-	struct Upnp_Subscription_Request *sr_event);
-
-/*!
- * \brief 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.
- */
-int TvDeviceHandleGetVarRequest(
-	/*! [in,out] The control get variable request event structure. */
-	struct Upnp_State_Var_Request *cgv_event);
-
-/*!
- * \brief 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.
- */
-int TvDeviceHandleActionRequest(
-	/*! [in,out] The control action request event structure. */
-	struct Upnp_Action_Request *ca_event);
-
-/*!
- * \brief 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: 
- *	\li 1) Event Subscription requests.  
- *	\li 2) Get Variable requests. 
- *	\li 3) Action requests.
- */
-int TvDeviceCallbackEventHandler(
-	/*! [in] The type of callback event. */
-	Upnp_EventType,
-	/*! [in] Data structure containing event data. */
-	void *Event,
-	/*! [in] Optional data specified during callback registration. */
-	void *Cookie);
-
-/*!
- * \brief 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.
- */
-int TvDeviceSetServiceTableVar(
-	/*! [in] The service number (TV_SERVICE_CONTROL or TV_SERVICE_PICTURE). */
-	unsigned int service,
-	/*! [in] 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). */
-	int variable,
-	/*! [in] The string representation of the new value. */
-	char *value);
-
-/* Control Service Actions */
-
-/*!
- * \brief Turn the power on.
- */
-int TvDevicePowerOn(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Turn the power off.
- */
-int TvDevicePowerOff(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the channel, update the TvDevice control service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetChannel(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the channel.  
- */
-int TvDeviceIncreaseChannel(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the channel.  
- */
-int TvDeviceDecreaseChannel(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the volume, update the TvDevice control service
- *       state table, and notify all subscribed control points of the
- *       updated state.
- */
-int TvDeviceSetVolume(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the volume. 
- */
-int TvDeviceIncreaseVolume(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the volume.
- */
-int TvDeviceDecreaseVolume(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*Picture Service Actions */
-
-/*!
- * \brief Change the color, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetColor(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the color.
- */
-int TvDeviceIncreaseColor(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the color.  
- */
-int TvDeviceDecreaseColor(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the tint, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetTint(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase tint.
- */
-int TvDeviceIncreaseTint(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease tint.
- */
-int TvDeviceDecreaseTint(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the contrast, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetContrast(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase the contrast.
- */
-int TvDeviceIncreaseContrast(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease the contrast.
- */
-int TvDeviceDecreaseContrast(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Change the brightness, update the TvDevice picture service
- * state table, and notify all subscribed control points of the
- * updated state.
- */
-int TvDeviceSetBrightness(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Increase brightnesss.
- */
-int TvDeviceIncreaseBrightness(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Decrease brightnesss.
- */
-int TvDeviceDecreaseBrightness(
-	/*! [in] Document of action request. */
-	IXML_Document *in,
-	/*! [in] Action result. */
-	IXML_Document **out,
-	/*! [out] ErrorString in case action was unsuccessful. */
-	const char **errorString);
-
-/*!
- * \brief Initializes the UPnP Sdk, registers the device, and sends out
- * advertisements.
- */
-int TvDeviceStart(
-	/*! [in] ip address to initialize the sdk (may be NULL)
-	 * if null, then the first non null loopback address is used. */
-	char *ip_address,
-	/*! [in] port number to initialize the sdk (may be 0)
-	 * if zero, then a random number is used. */
-	unsigned short port,
-	/*! [in] name of description document.
-	 * may be NULL. Default is tvdevicedesc.xml. */
-	const char *desc_doc_name,
-	/*! [in] path of web directory.
-	 * may be NULL. Default is ./web (for Linux) or ../tvdevice/web. */
-	const char *web_dir_path,
-	/*! [in] print function to use. */
-	print_string pfun,
-	/*! [in] Non-zero if called from the combo application. */
-	int combo);
-
-/*!
- * \brief Stops the device. Uninitializes the sdk.
- */
-int TvDeviceStop(void);
-
-/*!
- * \brief Function that receives commands from the user at the command prompt
- * during the lifetime of the device, and calls the appropriate
- * functions for those commands. Only one command, exit, is currently
- * defined.
- */
-void *TvDeviceCommandLoop(void *args);
-
-/*!
- * \brief Main entry point for tv device application.
- *
- * Initializes and registers with the sdk.
- * Initializes the state stables of the service.
- * Starts the command loop.
- *
- * Accepts the following optional arguments:
- *	\li \c -ip ipaddress
- *	\li \c -port port
- *	\li \c -desc desc_doc_name
- *	\li \c -webdir web_dir_path
- *	\li \c -help
- */
-int device_main(int argc, char *argv[]);
-
-#ifdef __cplusplus
-}
-#endif
-
-/*! @} Control Point Sample API */
-
-/*! @} UpnpSamples */
-
-#endif /* UPNP_TV_DEVICE_H */
--- a/upnp/sample/linux/tv_combo_main.c
+++ b/upnp/sample/linux/tv_combo_main.c
@@ -1,72 +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 "tv_ctrlpt.h"
-#include "tv_device.h"
-
-#include <stdio.h>
-#include <string.h>
-
-int main(int argc, char *argv[])
-{
-	int rc;
-	ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
-	int sig;
-	sigset_t sigs_to_catch;
-#endif
-	int code;
-
-	device_main(argc, argv);
-	rc = TvCtrlPointStart(linux_print, NULL, 1);
-	if (rc != TV_SUCCESS) {
-		SampleUtil_Print("Error starting UPnP TV Control Point\n");
-		return rc;
-	}
-	/* start a command loop thread */
-	code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
-#ifdef WIN32
-	ithread_join(cmdloop_thread, NULL);
-#else
-	/* Catch Ctrl-C and properly shutdown */
-	sigemptyset(&sigs_to_catch);
-	sigaddset(&sigs_to_catch, SIGINT);
-	sigwait(&sigs_to_catch, &sig);
-	SampleUtil_Print("Shutting down on signal %d...\n", sig);
-#endif
-	TvDeviceStop();
-	rc = TvCtrlPointStop();
-
-	return rc;
-}
-
--- a/upnp/sample/linux/tv_ctrlpt_main.c
+++ b/upnp/sample/linux/tv_ctrlpt_main.c
@@ -1,72 +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 "tv_ctrlpt.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-int main(int argc, char **argv)
-{
-	int rc;
-	ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
-	int sig;
-	sigset_t sigs_to_catch;
-#endif
-	int code;
-
-	rc = TvCtrlPointStart(linux_print, NULL, 0);
-	if (rc != TV_SUCCESS) {
-		SampleUtil_Print("Error starting UPnP TV Control Point\n");
-		return rc;
-	}
-	/* start a command loop thread */
-	code = ithread_create(&cmdloop_thread, NULL, TvCtrlPointCommandLoop, NULL);
-#ifdef WIN32
-	ithread_join(cmdloop_thread, NULL);
-#else
-	/* Catch Ctrl-C and properly shutdown */
-	sigemptyset(&sigs_to_catch);
-	sigaddset(&sigs_to_catch, SIGINT);
-	sigwait(&sigs_to_catch, &sig);
-	SampleUtil_Print("Shutting down on signal %d...\n", sig);
-#endif
-	rc = TvCtrlPointStop();
-
-	return rc;
-	argc = argc;
-	argv = argv;
-}
-
--- a/upnp/sample/linux/tv_device_main.c
+++ b/upnp/sample/linux/tv_device_main.c
@@ -1,65 +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 "tv_device.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-
-int main(int argc, char *argv[])
-{
-	int rc;
-	ithread_t cmdloop_thread;
-#ifdef WIN32
-#else
-	int sig;
-	sigset_t sigs_to_catch;
-#endif
-	int code;
-
-	device_main(argc, argv);
-	/* start a command loop thread */
-	code = ithread_create(&cmdloop_thread, NULL, TvDeviceCommandLoop, NULL);
-#ifdef WIN32
-	ithread_join(cmdloop_thread, NULL);
-#else
-	/* Catch Ctrl-C and properly shutdown */
-	sigemptyset(&sigs_to_catch);
-	sigaddset(&sigs_to_catch, SIGINT);
-	sigwait(&sigs_to_catch, &sig);
-	SampleUtil_Print("Shutting down on signal %d...\n", sig);
-#endif
-	rc = TvDeviceStop();
-
-	return rc;
-}
-
--- a/upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
+++ b/upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
@@ -0,0 +1,491 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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;
+#ifndef WIN32
+    int sig;
+    sigset_t sigs_to_catch;
+#endif
+    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 );
+
+#ifndef WIN32
+    /*
+       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...\n", sig );
+#else
+	ithread_join(cmdloop_thread, NULL);
+#endif
+    TvDeviceStop();
+    rc = TvCtrlPointStop();
+    
+    return rc;
+}
+
--- a/upnp/sample/tvcombo/upnp_tv_ctrlpt.c
+++ b/upnp/sample/tvcombo/upnp_tv_ctrlpt.c
--- a/upnp/sample/tvcombo/upnp_tv_ctrlpt.h
+++ b/upnp/sample/tvcombo/upnp_tv_ctrlpt.h
@@ -0,0 +1,160 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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"
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#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
--- a/upnp/sample/tvcombo/upnp_tv_device.c
+++ b/upnp/sample/tvcombo/upnp_tv_device.c
--- a/upnp/sample/tvcombo/upnp_tv_device.h
+++ b/upnp/sample/tvcombo/upnp_tv_device.h
@@ -0,0 +1,640 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#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
--- a/upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
+++ b/upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
@@ -0,0 +1,441 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 <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, described in the tvdevicedesc.xml description document." );
+    SampleUtil_Print( "" );
+    SampleUtil_Print( "Commands:" );
+    SampleUtil_Print( "  Help" );
+    SampleUtil_Print( "       Print this help info." );
+    SampleUtil_Print( "  ListDev" );
+    SampleUtil_Print( "       Print the current list of TV Device Emulators that this" );
+    SampleUtil_Print( "         control point is aware of.  Each device is preceded by a" );
+    SampleUtil_Print( "         device number which corresponds to the devnum argument of" );
+    SampleUtil_Print( "         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
+main( int argc,
+      char **argv )
+{
+    int rc;
+    ithread_t cmdloop_thread;
+#ifndef WIN32
+    int sig;
+    sigset_t sigs_to_catch;
+#endif
+    int code;
+
+    rc = TvCtrlPointStart( linux_print, NULL );
+    if( rc != TV_SUCCESS ) {
+        SampleUtil_Print( "Error starting UPnP TV Control Point" );
+        return rc;
+    }
+    // start a command loop thread
+    code =
+        ithread_create( &cmdloop_thread, NULL, TvCtrlPointCommandLoop,
+                        NULL );
+
+#ifndef WIN32
+    /*
+       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 );
+#else
+	ithread_join(cmdloop_thread, NULL);
+#endif
+
+    rc = TvCtrlPointStop();
+    return rc;
+}
--- a/upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c
+++ b/upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c
--- a/upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h
+++ b/upnp/sample/tvctrlpt/upnp_tv_ctrlpt.h
@@ -0,0 +1,160 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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"
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#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
--- a/upnp/sample/tvdevice/linux/upnp_tv_device_main.c
+++ b/upnp/sample/tvdevice/linux/upnp_tv_device_main.c
@@ -0,0 +1,197 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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_device.h"
+
+
+#include <stdio.h>
+
+
+/******************************************************************************
+ * linux_print
+ *
+ * Description: 
+ *       Prints a string to standard out.
+ *
+ * Parameters:
+ *    None
+ *
+ *****************************************************************************/
+void
+linux_print( const char *string )
+{
+    printf( "%s", string );
+}
+
+/******************************************************************************
+ * TvDeviceCommandLoop
+ *
+ * Description: 
+ *       Function that receives commands from the user at the command prompt
+ *       during the lifetime of the device, and calls the appropriate
+ *       functions for those commands. Only one command, exit, is currently
+ *       defined.
+ *
+ * Parameters:
+ *    None
+ *
+ *****************************************************************************/
+void *
+TvDeviceCommandLoop( void *args )
+{
+    int stoploop = 0;
+    char cmdline[100];
+    char cmd[100];
+
+    while( !stoploop ) {
+        sprintf( cmdline, " " );
+        sprintf( cmd, " " );
+
+        SampleUtil_Print( "\n>> " );
+
+        // Get a command line
+        fgets( cmdline, 100, stdin );
+
+        sscanf( cmdline, "%s", cmd );
+
+        if( strcasecmp( cmd, "exit" ) == 0 ) {
+            SampleUtil_Print( "Shutting down...\n" );
+            TvDeviceStop();
+            exit( 0 );
+        } else {
+            SampleUtil_Print( "\n   Unknown command: %s\n\n", cmd );
+            SampleUtil_Print( "   Valid Commands:\n" );
+            SampleUtil_Print( "     Exit\n\n" );
+        }
+
+    }
+
+    return NULL;
+}
+
+/******************************************************************************
+ * main
+ *
+ * Description: 
+ *       Main entry point for tv device application.
+ *       Initializes and registers with the sdk.
+ *       Initializes the state stables of the service.
+ *       Starts the command loop.
+ *
+ * Parameters:
+ *    int argc  - count of arguments
+ *    char ** argv -arguments. The application 
+ *                  accepts the following optional arguments:
+ *
+ *                  -ip ipaddress 
+ *                  -port port
+ *		    -desc desc_doc_name 
+ *	            -webdir web_dir_path"
+ *		    -help 
+ *                 
+ *
+ *****************************************************************************/
+int main( IN int argc, IN char **argv )
+{
+
+    unsigned int portTemp = 0;
+    char *ip_address = NULL,
+     *desc_doc_name = NULL,
+     *web_dir_path = NULL;
+    int rc;
+    ithread_t cmdloop_thread;
+#ifndef WIN32
+    int sig;
+    sigset_t sigs_to_catch;
+#endif
+    int code;
+    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.: tvdevicedesc.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/tvdevice/web\n" );
+            return 1;
+        }
+    }
+
+    port = ( unsigned short )portTemp;
+
+    TvDeviceStart( ip_address, port, desc_doc_name, web_dir_path, linux_print );
+
+    /* start a command loop thread */
+    code = ithread_create( &cmdloop_thread, NULL, TvDeviceCommandLoop, NULL );
+
+#ifndef WIN32
+    /*
+       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...\n", sig );
+#else
+	ithread_join(cmdloop_thread, NULL);
+#endif
+    rc = TvDeviceStop();
+    
+    return rc;
+}
+
--- a/upnp/sample/tvdevice/upnp_tv_device.c
+++ b/upnp/sample/tvdevice/upnp_tv_device.c
--- a/upnp/sample/tvdevice/upnp_tv_device.h
+++ b/upnp/sample/tvdevice/upnp_tv_device.h
@@ -0,0 +1,640 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#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
--- a/upnp/src/api/UpnpString.c
+++ b/upnp/src/api/UpnpString.c
@@ -1,206 +0,0 @@
-/*!
- * \addtogroup UpnpString
- *
- * Due to its heavy use, this class is coded for efficiency, not for beauty.
- * Do not use this as example to other classes. Please take a look at any
- * other one.
- *
- * \todo Always alloc a minimum size like 64 bytes or so and when shrinking
- * do not perform a new memory allocation.
- *
- * @{
- *
- * \file
- *
- * \brief UpnpString object implementation.
- */
-
-#include "config.h"
-
-#include "UpnpString.h"
-
-#include <stdlib.h> /* for calloc(), free() */
-#include <string.h> /* for strlen(), strdup() */
-
-#ifdef WIN32
-	#define strcasecmp stricmp
-#else
-	/* Other systems have strncasecmp */
-#endif
-
-/* strnlen() is a GNU extension. */
-#if HAVE_STRNLEN
-	extern size_t strnlen(const char *s, size_t maxlen);
-#else /* HAVE_STRNLEN */
-	static size_t strnlen(const char *s, size_t n)
-	{
-		const char *p = (const char *)memchr(s, 0, n);
-		return p ? p - s : n;
-	}
-#endif /* HAVE_STRNLEN */
-
-/* strndup() is a GNU extension. */
-#if HAVE_STRNDUP && !defined(WIN32)
-	extern char *strndup(__const char *__string, size_t __n);
-#else /* HAVE_STRNDUP && !defined(WIN32) */
-	static char *strndup(const char *__string, size_t __n)
-	{
-		size_t strsize = strnlen(__string, __n);
-		char *newstr = (char *)malloc(strsize + 1);
-
-		strncpy(newstr, __string, strsize);
-		newstr[strsize] = 0;
-
-		return newstr;
-	}
-#endif /* HAVE_STRNDUP && !defined(WIN32) */
-
-/*!
- * \brief Internal implementation of the class UpnpString.
- *
- * \internal
- */
-struct SUpnpString
-{
-	/*! \brief Length of the string. */
-	size_t m_length;
-	/*! \brief Pointer to a dynamically allocated area that holds the NULL
-	 * terminated string. */
-	char *m_string;
-};
-
-UpnpString *UpnpString_new()
-{
-	/* All bytes are zero, and so is the length of the string. */
-	struct SUpnpString *p = calloc(1, sizeof (struct SUpnpString));
-	if (p == NULL) {
-		goto error_handler1;
-	}
-#if 0
-	p->m_length = 0;
-#endif
-
-	/* This byte is zero, calloc does initialize it. */
-	p->m_string = calloc(1, 1);
-	if (p->m_string == NULL) {
-		goto error_handler2;
-	}
-
-	return (UpnpString *)p;
-
-	/*free(p->m_string); */
-error_handler2:
-	free(p);
-error_handler1:
-	return NULL;
-}
-
-void UpnpString_delete(UpnpString *p)
-{
-	struct SUpnpString *q = (struct SUpnpString *)p;
-		
-	if (!q) return;
-
-	q->m_length = 0;
-
-	free(q->m_string);
-	q->m_string = NULL;
-
-	free(p);
-}
-
-UpnpString *UpnpString_dup(const UpnpString *p)
-{
-	struct SUpnpString *q = calloc(1, sizeof (struct SUpnpString));
-	if (q == NULL) {
-		goto error_handler1;
-	}
-	q->m_length = ((struct SUpnpString *)p)->m_length;
-	q->m_string = strdup(((struct SUpnpString *)p)->m_string);
-	if (q->m_string == NULL) {
-		goto error_handler2;
-	}
-
-	return (UpnpString *)q;
-
-	/*free(q->m_string); */
-error_handler2:
-	free(q);
-error_handler1:
-	return NULL;
-}
-
-void UpnpString_assign(UpnpString *p, const UpnpString *q)
-{
-	if (p != q) {
-		UpnpString_set_String(p, UpnpString_get_String(q));
-	}
-}
-
-size_t UpnpString_get_Length(const UpnpString *p)
-{
-	return ((struct SUpnpString *)p)->m_length;
-}
-
-void UpnpString_set_Length(UpnpString *p, size_t n)
-{
-	if (((struct SUpnpString *)p)->m_length > n) {
-		((struct SUpnpString *)p)->m_length = n;
-		/* No need to realloc now, will do later when needed. */
-		((struct SUpnpString *)p)->m_string[n] = 0;
-	}
-}
-
-const char *UpnpString_get_String(const UpnpString *p)
-{
-	return ((struct SUpnpString *)p)->m_string;
-}
-
-int UpnpString_set_String(UpnpString *p, const char *s)
-{
-	char *q = strdup(s);
-	if (!q) goto error_handler1;
-	free(((struct SUpnpString *)p)->m_string);
-	((struct SUpnpString *)p)->m_length = strlen(q);
-	((struct SUpnpString *)p)->m_string = q;
-
-error_handler1:
-	return q != NULL;
-}
-
-int UpnpString_set_StringN(UpnpString *p, const char *s, size_t n)
-{
-	char *q = strndup(s, n);
-	if (!q) goto error_handler1;
-	free(((struct SUpnpString *)p)->m_string);
-	((struct SUpnpString *)p)->m_length = strlen(q);
-	((struct SUpnpString *)p)->m_string = q;
-
-error_handler1:
-	return q != NULL;
-}
-
-void UpnpString_clear(UpnpString *p)
-{
-	((struct SUpnpString *)p)->m_length = 0;
-	/* No need to realloc now, will do later when needed. */
-	((struct SUpnpString *)p)->m_string[0] = 0;
-}
-
-int UpnpString_cmp(UpnpString *p, UpnpString *q)
-{
-	const char *cp = UpnpString_get_String(p);
-	const char *cq = UpnpString_get_String(q);
-
-	return strcmp(cp, cq);
-}
-
-int UpnpString_casecmp(UpnpString *p, UpnpString *q)
-{
-	const char *cp = UpnpString_get_String(p);
-	const char *cq = UpnpString_get_String(q);
-
-	return strcasecmp(cp, cq);
-}
-
-/* @} UpnpString */
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
--- a/upnp/src/api/upnpdebug.c
+++ b/upnp/src/api/upnpdebug.c
@@ -1,174 +1,314 @@
-/*******************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-
-/*!
- * \file
- */
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////

 #include "config.h"
-
-#include "ithread.h"
-#include "ixml.h"
-#include "upnp.h"
 #include "upnpdebug.h"
-
-#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include "ithread.h"
+#include "upnp.h"
+#include <stdarg.h>
 #include <string.h>

-#ifdef DEBUG

-/*! Mutex to synchronize all the log file opeartions in the debug mode */
+
+//Mutex to synchronize all the log file opeartions in the debug mode
 static ithread_mutex_t GlobalDebugMutex;

-/*! Global log level */
+// Global log level
 static Upnp_LogLevel g_log_level = UPNP_DEFAULT_LOG_LEVEL;

-/*! File handle for the error log file */
+//File handle for the error log file
 static FILE *ErrFileHnd = NULL;

-/*! File handle for the information log file */
+//File handle for the information log file
 static FILE *InfoFileHnd = NULL;

-/*! Name of the error file */
+//Name of the error file
 static const char *errFileName = "IUpnpErrFile.txt";

-/*! Name of the info file */
+//Name of the info file
 static const char *infoFileName = "IUpnpInfoFile.txt";

-int UpnpInitLog(void)
+
+
+/***************************************************************************
+ * Function : UpnpSetLogFileNames					
+ *								
+ * Parameters:							
+ *	IN const char* ErrFileName: name of the error file
+ *	IN const char *InfoFileName: name of the information file
+ *	IN int size: Size of the buffer
+ *	IN int starLength: This parameter provides the width of the banner
+ *									
+ * Description:							
+ *	This functions takes the buffer and writes the buffer in the file as 
+ *	per the requested banner					
+ * Returns: void
+ ***************************************************************************/
+void
+UpnpSetLogFileNames ( IN const char *ErrFileName,
+		      IN const char *InfoFileName )
 {
-	ithread_mutex_init(&GlobalDebugMutex, NULL);
-	if (DEBUG_TARGET == 1) {
-		if ((ErrFileHnd = fopen(errFileName, "a")) == NULL) {
-			return -1;
-		}
-		if ((InfoFileHnd = fopen(infoFileName, "a")) == NULL) {
-			return -1;
-		}
-	}
-	return UPNP_E_SUCCESS;
+    if( ErrFileName ) {
+        errFileName = ErrFileName;
+    }
+    if( InfoFileName ) {
+        infoFileName = InfoFileName;
+    }
 }

-void UpnpSetLogLevel(Upnp_LogLevel log_level)
+
+/***************************************************************************
+ * Function : UpnpInitLog
+ *
+ * Parameters:	void
+ *
+ * Description:
+ *	This functions initializes the log files
+ *
+ * Returns: int
+ *	-1 : If fails
+ *	UPNP_E_SUCCESS : if success
+ ***************************************************************************/
+int
+UpnpInitLog()
+{
+    ithread_mutex_init( &GlobalDebugMutex, NULL );
+
+    if( DEBUG_TARGET == 1 ) {
+        if( ( ErrFileHnd = fopen( errFileName, "a" ) ) == NULL )
+            return -1;
+        if( ( InfoFileHnd = fopen( infoFileName, "a" ) ) == NULL )
+            return -1;
+    }
+    return UPNP_E_SUCCESS;
+}
+
+
+/***************************************************************************
+ * Function : UpnpSetLogLevel
+ *				
+ * Parameters:	Upnp_LogLevel log_level
+ *
+ * Description:							
+ *	This functions set the log level (see {\tt Upnp_LogLevel}
+ * Returns: void
+ ***************************************************************************/
+void 
+UpnpSetLogLevel (Upnp_LogLevel log_level)
 {
 	g_log_level = log_level;
 }

-void UpnpCloseLog(void)
+
+/***************************************************************************
+ * Function : UpnpCloseLog					
+ *								
+ * Parameters:	void					
+ *								
+ * Description:						
+ *	This functions closes the log files
+ * Returns: void
+ ***************************************************************************/
+void
+UpnpCloseLog()
 {
-	if (DEBUG_TARGET == 1) {
-		fflush(ErrFileHnd);
-		fflush(InfoFileHnd);
-		fclose(ErrFileHnd);
-		fclose(InfoFileHnd);
-	}
-	ithread_mutex_destroy(&GlobalDebugMutex);
+    if( DEBUG_TARGET == 1 ) {
+        fflush( ErrFileHnd );
+        fflush( InfoFileHnd );
+        fclose( ErrFileHnd );
+        fclose( InfoFileHnd );
+    }
+    ithread_mutex_destroy( &GlobalDebugMutex );
+
 }

-void UpnpSetLogFileNames(const char *ErrFileName, const char *InfoFileName)
-{
-	if (ErrFileName) {
-		errFileName = ErrFileName;
-	}
-	if (InfoFileName) {
-		infoFileName = InfoFileName;
-	}
-}

-int DebugAtThisLevel(Upnp_LogLevel DLevel, Dbg_Module Module)
+/***************************************************************************
+ * Function : DebugAtThisLevel					
+ *									
+ * Parameters:			
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *					
+ * Description:					
+ *	This functions returns true if debug output should be done in this
+ *	module.
+ *
+ * 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);
-
+		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

-void UpnpPrintf(Upnp_LogLevel DLevel,
-		Dbg_Module Module,
-		const char *DbgFileName, int DbgLineNo, const char *FmtStr, ...)
+
+/***************************************************************************
+ * Function : UpnpPrintf					
+ *									
+ * Parameters:			
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *	IN char *DbgFileName: Name of the file from where debug statement is
+ *							coming
+ *	IN int DbgLineNo : Line number of the file from where debug statement 
+ *				is coming
+ *	IN char * FmtStr, ...: Variable number of arguments that will go 
+ *				in the debug statement
+ *					
+ * Description:					
+ *	This functions prints the debug statement either on the startdard 
+ *	output or log file along with the information from where this debug 
+ *	statement is coming
+ * Returns: void
+ ***************************************************************************/
+#ifdef DEBUG
+void UpnpPrintf(
+	IN Upnp_LogLevel DLevel,
+	IN Dbg_Module Module,
+	IN const char *DbgFileName,
+	IN int DbgLineNo,
+	IN const char *FmtStr,
+	... )
 {
 	va_list ArgList;
-
-	if (!DebugAtThisLevel(DLevel, Module))
+	
+	if (!DebugAtThisLevel(DLevel, Module)) {
 		return;
+	}
+	
 	ithread_mutex_lock(&GlobalDebugMutex);
 	va_start(ArgList, FmtStr);
 	if (!DEBUG_TARGET) {
-		if (DbgFileName)
+		if( DbgFileName ) {
 			UpnpDisplayFileAndLine(stdout, DbgFileName, DbgLineNo);
+		}
 		vfprintf(stdout, FmtStr, ArgList);
 		fflush(stdout);
 	} else if (DLevel == 0) {
-		if (DbgFileName)
-			UpnpDisplayFileAndLine(ErrFileHnd, DbgFileName,
-					       DbgLineNo);
+		if (DbgFileName) {
+			UpnpDisplayFileAndLine(ErrFileHnd, DbgFileName, DbgLineNo);
+		}
 		vfprintf(ErrFileHnd, FmtStr, ArgList);
 		fflush(ErrFileHnd);
 	} else {
-		if (DbgFileName)
-			UpnpDisplayFileAndLine(InfoFileHnd, DbgFileName,
-					       DbgLineNo);
+		if (DbgFileName) {
+			UpnpDisplayFileAndLine(InfoFileHnd, DbgFileName, DbgLineNo);
+		}
 		vfprintf(InfoFileHnd, FmtStr, ArgList);
 		fflush(InfoFileHnd);
 	}
 	va_end(ArgList);
 	ithread_mutex_unlock(&GlobalDebugMutex);
 }
+#endif

-FILE *GetDebugFile(Upnp_LogLevel DLevel, Dbg_Module Module)
+
+/***************************************************************************
+ * Function : UpnpGetDebugFile					
+ *				
+ * Parameters:			
+ *	IN Upnp_LogLevel DLevel: The level of the debug logging. It will decide 
+ *		whether debug statement will go to standard output, 
+ *		or any of the log files.
+ *	IN Dbg_Module Module: debug will go in the name of this module
+ *								
+ * Description:
+ *	This function checks if the module is turned on for debug 
+ *	and returns the file descriptor corresponding to the debug level
+ * Returns: FILE *
+ *	NULL : if the module is turn off for debug 
+ *	else returns the right file descriptor
+ ***************************************************************************/
+#ifdef DEBUG
+FILE *GetDebugFile( Upnp_LogLevel DLevel, Dbg_Module Module )
 {
 	FILE *ret;

-	if (!DebugAtThisLevel(DLevel, Module))
+	if (!DebugAtThisLevel(DLevel, Module)) {
 		ret = NULL;
-	if (!DEBUG_TARGET)
+	}
+	
+	if (!DEBUG_TARGET) {
 		ret = stdout;
-	else if (DLevel == 0)
+	} else if (DLevel == 0) {
 		ret = ErrFileHnd;
-	else
+	} else {
 		ret = InfoFileHnd;
+	}

 	return ret;
 }
+#endif

-void UpnpDisplayFileAndLine(FILE *fd, const char *DbgFileName, int DbgLineNo)
+
+/***************************************************************************
+ * Function : UpnpDisplayFileAndLine				
+ *	
+ * Parameters:	
+ *	IN FILE *fd: File descriptor where line number and file name will be 
+ *			written 
+ *	IN char *DbgFileName: Name of the file  
+ *	IN int DbgLineNo : Line number of the file
+ *		
+ * Description:
+ *	This function writes the file name and file number from where
+ *		debug statement is coming to the log file
+ * Returns: void
+ ***************************************************************************/
+#ifdef DEBUG
+void UpnpDisplayFileAndLine(
+	IN FILE * fd,
+	IN const char *DbgFileName,
+	IN int DbgLineNo)
 {
 #define NLINES 2
 #define MAX_LINE_SIZE 512
@@ -178,70 +318,93 @@ void UpnpDisplayFileAndLine(FILE *fd, const char *DbgFileName, int DbgLineNo)
 	int i;

 	/* Initialize the pointer array */
-	for (i = 0; i < NLINES; i++)
+	for (i = 0; i < NLINES; i++) {
 		lines[i] = buf[i];
+	}
+
 	/* Put the debug lines in the buffer */
 	sprintf(buf[0], "DEBUG - THREAD ID: 0x%lX",
-#ifdef WIN32
-		(unsigned long int)ithread_self().p
-#else
-		(unsigned long int)ithread_self()
-#endif
-	    );
-	if (DbgFileName)
-		sprintf(buf[1], "FILE: %s, LINE: %d", DbgFileName, DbgLineNo);
+		(unsigned long int)ithread_self());
+	if (DbgFileName) {
+		sprintf(buf[1],
+			"FILE: %s, LINE: %d",
+			DbgFileName,
+			DbgLineNo);
+	}
+
 	/* Show the lines centered */
 	UpnpDisplayBanner(fd, lines, NLINES, NUMBER_OF_STARS);
 	fflush(fd);
 }
+#endif

-void UpnpDisplayBanner(FILE * fd,
-		       const char **lines, size_t size, size_t starLength)
+
+/***************************************************************************
+ * Function : UpnpDisplayBanner	
+ *
+ * Parameters:			
+ *	IN FILE *fd: file descriptor where the banner will be written
+ *	IN char **lines: The buffer that will be written
+ *	IN int size: Size of the buffer
+ *	IN int starLength: This parameter provides the width of the banner
+ *	
+ * Description:			
+ *	This functions takes the buffer and writes the buffer in the file as 
+ *	per the requested banner
+ * Returns: void
+ ***************************************************************************/
+#ifdef DEBUG
+void UpnpDisplayBanner(
+	IN FILE * fd,
+	IN const char **lines,
+	IN size_t size,
+	IN int starLength)
 {
-	size_t leftMarginLength = starLength / 2 + 1;
-	size_t rightMarginLength = starLength / 2 + 1;
-	size_t i = 0;
-	size_t LineSize = 0;
-	size_t starLengthMinus2 = starLength - 2;
+	int leftMarginLength = starLength / 2 + 1;
+	int rightMarginLength = starLength / 2 + 1;
+	int i = 0;
+	int LineSize = 0;
+	int starLengthMinus2 = starLength - 2;

-	char *leftMargin = malloc(leftMarginLength);
-	char *rightMargin = malloc(rightMarginLength);
-	char *stars = malloc(starLength + 1);
-	char *currentLine = malloc(starLength + 1);
+	char *leftMargin = ( char * )malloc( leftMarginLength );
+	char *rightMargin = ( char * )malloc( rightMarginLength );
+	char *stars = ( char * )malloc( starLength + 1 );
+	char *currentLine = ( char * )malloc( starLength + 1 );
 	const char *line = NULL;

-	memset(stars, '*', starLength);
+	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]);
+	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 > starLengthMinus2) {
-			memcpy(currentLine, line, starLengthMinus2);
+		while( LineSize > starLengthMinus2 ) {
+			memcpy( currentLine, line, starLengthMinus2 );
 			currentLine[starLengthMinus2] = 0;
-			fprintf(fd, "*%s*\n", currentLine);
+			fprintf( fd, "*%s*\n", currentLine );
 			LineSize -= starLengthMinus2;
 			line += starLengthMinus2;
 		}
-		leftMarginLength = (starLengthMinus2 - LineSize) / 2;
-		if (LineSize % 2 == 0)
+		leftMarginLength = (starLengthMinus2 - LineSize)/2;
+		if( LineSize % 2 == 0 ) {
 			rightMarginLength = leftMarginLength;
-		else
+		} else {
 			rightMarginLength = leftMarginLength + 1;
-		memset(leftMargin, ' ', leftMarginLength);
-		memset(rightMargin, ' ', rightMarginLength);
+		}
+		memset( leftMargin, ' ', leftMarginLength );
+		memset( rightMargin, ' ', rightMarginLength );
 		leftMargin[leftMarginLength] = 0;
 		rightMargin[rightMarginLength] = 0;
-		fprintf(fd, "*%s%s%s*\n", leftMargin, line, rightMargin);
+		fprintf( fd, "*%s%s%s*\n", leftMargin, line, rightMargin );
 	}
-	fprintf(fd, "%s\n\n", stars);
+	fprintf( fd, "%s\n\n", stars );

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

 #include "config.h"
 #if EXCLUDE_GENA == 0
@@ -63,7 +63,7 @@ error_respond( IN SOCKINFO * info,
    int major,
      minor;

-    /* retrieve the minor and major version from the GENA request */
+    // retrieve the minor and major version from the GENA request
    http_CalcResponseVersion( hmsg->major_version,
                              hmsg->minor_version, &major, &minor );

@@ -90,40 +90,38 @@ genaCallback( IN http_parser_t * parser,
              IN http_message_t * request,
              INOUT SOCKINFO * info )
 {
-    int found_function = FALSE;
+    xboolean found_function = FALSE;

    if( request->method == HTTPMETHOD_SUBSCRIBE ) {
 #ifdef INCLUDE_DEVICE_APIS
        found_function = TRUE;
        if( httpmsg_find_hdr( request, HDR_NT, NULL ) == NULL ) {
-            /* renew subscription */
+            // renew subscription
            gena_process_subscription_renewal_request
            ( info, request );
 	} else {
-            /* subscribe */
+            // 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 */
+        // unsubscribe
        gena_process_unsubscribe_request( info, request );
 #endif
    } else if( request->method == HTTPMETHOD_NOTIFY ) {
 #ifdef INCLUDE_CLIENT_APIS
        found_function = TRUE;
-        /* notify */
+        // notify
        gena_process_notification_event( info, request );
 #endif
    }

    if( !found_function ) {
-            /* handle missing functions of device or ctrl pt */
+            // handle missing functions of device or ctrl pt
            error_respond( info, HTTP_NOT_IMPLEMENTED, request );
    }
-    return;
-    parser = parser;
 }
-#endif /* EXCLUDE_GENA */
+#endif // EXCLUDE_GENA

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

 /************************************************************************
- * Purpose: This file defines the functions for clients. It defines 
- * functions for adding and removing clients to and from the client table, 
- * adding and accessing subscription and other attributes pertaining to the 
- * client  
- ************************************************************************/
-
+* Purpose: This file defines the functions for clients. It defines 
+* functions for adding and removing clients to and from the client table, 
+* adding and accessing subscription and other attributes pertaining to the 
+* client  
+************************************************************************/

 #include "config.h"
-
-
 #include "client_table.h"

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

-/*!
- * \file
- *
- * Purpose: This file a function to extract the header information from
- * an http message and then matches the data with XML data.
- */
+/************************************************************************
+* Purpose: This file a function to extract the header information from	*
+* an http message and then matches the data with XML data.				*
+************************************************************************/

 #include "config.h"
 #include <assert.h>
-#include "upnputil.h"
+#include "util.h"
 #include "membuffer.h"
 #include "httpparser.h"
 #include "statcodes.h"
 #include "parsetools.h"

-int has_xml_content_type(http_message_t *hmsg)
+/************************************************************************
+* Function: has_xml_content_type										
+*																		
+* Parameters:															
+*	IN http_message_t* hmsg	; HTTP Message object
+*																		
+* Description: Find the header from the HTTP message and match the		
+*	header for xml data.												
+*																		
+* Returns:																
+*	 BOOLEAN															
+************************************************************************/
+xboolean
+has_xml_content_type( IN http_message_t * hmsg )
 {
-	memptr hdr_value;
+    memptr hdr_value;

-	assert(hmsg);
+    assert( hmsg );

-	/* find 'content-type' header which must have text/xml */
-	if (httpmsg_find_hdr(hmsg, HDR_CONTENT_TYPE, &hdr_value) &&
-	    matchstr(hdr_value.buf, hdr_value.length, "%itext%w/%wxml" ) == PARSE_OK) {
-		return TRUE;
-	}
-	return FALSE;
+    // find 'content-type' header which must have text/xml
+    if( httpmsg_find_hdr( hmsg, HDR_CONTENT_TYPE, &hdr_value ) != NULL &&
+        matchstr( hdr_value.buf, hdr_value.length,
+                  "%itext%w/%wxml" ) == PARSE_OK ) {
+        return TRUE;
+    }
+    return FALSE;
 }
-
--- a/upnp/src/genlib/net/http/statcodes.c
+++ b/upnp/src/genlib/net/http/statcodes.c
@@ -1,33 +1,33 @@
-/*******************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * - Neither name of Intel Corporation nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////

 /************************************************************************
 * Purpose: This file defines status codes, buffers to store the status	*
@@ -37,7 +37,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "upnputil.h"
+#include "util.h"
 #include "statcodes.h"

 #ifdef WIN32
@@ -96,7 +96,7 @@ static const char *Http5xxStr =
    "Service Unavailable\0"
    "Gateway Timeout\0" "HTTP Version Not Supported\0";

-static int gInitialized = FALSE;
+static xboolean gInitialized = FALSE;

 /************************************************************************
 ************************* Functions *************************************
@@ -128,7 +128,7 @@ init_table( IN const char *encoded_str,

    for( i = 0; i < tbl_size; i++ ) {
        table[i] = s;
-        s += strlen( s ) + 1;   /* next entry */
+        s += strlen( s ) + 1;   // next entry
    }
 }

@@ -153,7 +153,7 @@ init_tables( void )
    init_table( Http4xxStr, Http4xxCodes, NUM_4XX_CODES );
    init_table( Http5xxStr, Http5xxCodes, NUM_5XX_CODES );

-    gInitialized = TRUE;        /* mark only after complete */
+    gInitialized = TRUE;        // mark only after complete
 }

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

-/*!
- * \addtogroup Sock
- * 
- * @{
- * 
- * \file
- *
- * \brief Implements the sockets functionality.
- */
+/************************************************************************
+* Purpose: This file implements the sockets functionality 
+************************************************************************/

 #include "config.h"
-
-#include "sock.h"
-
-#include "unixutil.h"	/* for socklen_t, EAFNOSUPPORT */
-#include "upnp.h"
-
 #include <assert.h>
 #include <errno.h>
-#include <fcntl.h>	/* for F_GETFL, F_SETFL, O_NONBLOCK */
 #include <time.h>
 #include <string.h>

-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-int sock_init(SOCKINFO *info, SOCKET sockfd)
-{
-	assert(info);
-
-	memset(info, 0, sizeof(SOCKINFO));
-	info->socket = sockfd;
-
-	return UPNP_E_SUCCESS;
-}
-
-int sock_init_with_ip(SOCKINFO *info, SOCKET sockfd,
-	struct sockaddr *foreign_sockaddr)
-{
-	int ret;
-
-	ret = sock_init(info, sockfd);
-	if (ret != UPNP_E_SUCCESS) {
-		return ret;
-	}
-
-	memcpy(&info->foreign_sockaddr, foreign_sockaddr,
-	       sizeof(info->foreign_sockaddr));
-
-	return UPNP_E_SUCCESS;
-}
-
-int sock_destroy(SOCKINFO *info, int ShutdownMethod)
-{
-	int ret = UPNP_E_SUCCESS;
-
-	if (info->socket != -1) {
-		shutdown(info->socket, ShutdownMethod);
-		if (sock_close(info->socket) == -1) {
-			ret = UPNP_E_SOCKET_ERROR;
-		}
-		info->socket = -1;
-	}
-
-	return ret;
-}
-
-/*!
- * \brief Receives or sends data. Also returns the time taken to receive or
- * send data.
- *
- * \return
- *	\li \c numBytes - On Success, no of bytes received or sent or
- *	\li \c UPNP_E_TIMEDOUT - Timeout
- *	\li \c UPNP_E_SOCKET_ERROR - Error on socket calls
- */
-static int sock_read_write(
-	/*! [in] Socket Information Object. */
-	SOCKINFO *info,
-	/*! [out] Buffer to get data to or send data from. */
-	char *buffer,
-	/*! [in] Size of the buffer. */
-	int bufsize,
-	/*! [in] timeout value. */
-	int *timeoutSecs,
-	/*! [in] Boolean value specifying read or write option. */
-	int bRead)
-{
-	int retCode;
-	fd_set readSet;
-	fd_set writeSet;
-	struct timeval timeout;
-	long numBytes;
-	time_t start_time = time(NULL);
-	SOCKET sockfd = info->socket;
-	long bytes_sent = 0;
-	long byte_left = 0;
-	long num_written;
-
-	if (*timeoutSecs < 0)
-		return UPNP_E_TIMEDOUT;
-	FD_ZERO(&readSet);
-	FD_ZERO(&writeSet);
-	if (bRead)
-		FD_SET(sockfd, &readSet);
-	else
-		FD_SET(sockfd, &writeSet);
-	timeout.tv_sec = *timeoutSecs;
-	timeout.tv_usec = 0;
-	while (TRUE) {
-		if (*timeoutSecs == 0)
-			retCode = select(sockfd + 1, &readSet, &writeSet,
-				NULL, NULL);
-		else
-			retCode = select(sockfd + 1, &readSet, &writeSet,
-				NULL, &timeout);
-		if (retCode == 0)
-			return UPNP_E_TIMEDOUT;
-		if (retCode == -1) {
-			if (errno == EINTR)
-				continue;
-			return UPNP_E_SOCKET_ERROR;
-		} else
-			/* read or write. */
-			break;
-	}
-#ifdef SO_NOSIGPIPE
-	{
-		int old;
-		int set = 1;
-		socklen_t olen = sizeof(old);
-		getsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, &olen);
-		setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set));
-#endif
-		if (bRead) {
-			/* read data. */
-			numBytes = (long)recv(sockfd, buffer, (size_t)bufsize, MSG_NOSIGNAL);
-		} else {
-			byte_left = bufsize;
-			bytes_sent = 0;
-			while (byte_left > 0) {
-				/* write data. */
-				num_written = send(sockfd,
-					buffer + bytes_sent, (size_t)byte_left,
-					MSG_DONTROUTE | MSG_NOSIGNAL);
-				if (num_written == -1) {
-#ifdef SO_NOSIGPIPE
-					setsockopt(sockfd, SOL_SOCKET,
-						SO_NOSIGPIPE, &old, olen);
-#endif
-					return (int)num_written;
-				}
-				byte_left = byte_left - num_written;
-				bytes_sent += num_written;
-			}
-			numBytes = bytes_sent;
-		}
-#ifdef SO_NOSIGPIPE
-		setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
-	}
-#endif
-	if (numBytes < 0)
-		return UPNP_E_SOCKET_ERROR;
-	/* subtract time used for reading/writing. */
-	if (*timeoutSecs != 0)
-		*timeoutSecs -= (int)(time(NULL) - start_time);
-
-	return (int)numBytes;
-}
-
-int sock_read(SOCKINFO *info, char *buffer, int bufsize, int *timeoutSecs)
-{
-	return sock_read_write(info, buffer, bufsize, timeoutSecs, TRUE);
-}
-
-int sock_write(SOCKINFO *info, const char *buffer, int bufsize, int *timeoutSecs)
-{
-	/* Consciently removing constness. */
-	return sock_read_write(info, (char *)buffer, bufsize, timeoutSecs, FALSE);
-}
-
-int sock_make_blocking(SOCKET sock)
-{
-#ifdef WIN32
-	u_long val = 0;
-	return ioctlsocket(sock, FIONBIO, &val);
+#include "sock.h"
+#include "upnp.h"
+#ifndef WIN32
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <unistd.h>
 #else
-	int val;
-
-	val = fcntl(sock, F_GETFL, 0);
-	if (fcntl(sock, F_SETFL, val & ~O_NONBLOCK) == -1) {
-		return -1;
-	}
+ #include <winsock2.h>
 #endif
-	return 0;
-}
+#include "unixutil.h"

+#ifndef MSG_NOSIGNAL
+ #define MSG_NOSIGNAL 0
+#endif

-int sock_make_no_blocking(SOCKET sock)
+/************************************************************************
+*	Function :	sock_init
+*
+*	Parameters :
+*		OUT SOCKINFO* info ;	Socket Information Object
+*		IN int sockfd ;			Socket Descriptor
+*
+*	Description :	Assign the passed in socket descriptor to socket 
+*		descriptor in the SOCKINFO structure.
+*
+*	Return : int;
+*		UPNP_E_SUCCESS	
+*		UPNP_E_OUTOF_MEMORY
+*		UPNP_E_SOCKET_ERROR
+*
+*	Note :
+************************************************************************/
+int
+sock_init( OUT SOCKINFO * info,
+           IN int sockfd )
 {
-#ifdef WIN32
-	u_long val = 1;
-	return ioctlsocket(sock, FIONBIO, &val);
-#else /* WIN32 */
-	int val;
+    assert( info );

-	val = fcntl(sock, F_GETFL, 0);
-	if (fcntl(sock, F_SETFL, val | O_NONBLOCK) == -1) {
-		return -1;
-	}
-#endif /* WIN32 */
-	return 0;
+    memset( info, 0, sizeof( SOCKINFO ) );
+
+    info->socket = sockfd;
+
+    return UPNP_E_SUCCESS;
 }

-/* @} Sock */
+/************************************************************************
+*	Function :	sock_init_with_ip
+*
+*	Parameters :
+*		OUT SOCKINFO* info ;				Socket Information Object
+*		IN int sockfd ;						Socket Descriptor
+*		IN struct in_addr foreign_ip_addr ;	Remote IP Address
+*		IN unsigned short foreign_ip_port ;	Remote Port number
+*
+*	Description :	Calls the sock_init function and assigns the passed in
+*		IP address and port to the IP address and port in the SOCKINFO
+*		structure.
+*
+*	Return : int;
+*		UPNP_E_SUCCESS	
+*		UPNP_E_OUTOF_MEMORY
+*		UPNP_E_SOCKET_ERROR
+*
+*	Note :
+************************************************************************/
+int
+sock_init_with_ip( OUT SOCKINFO * info,
+                   IN int sockfd,
+                   IN struct in_addr foreign_ip_addr,
+                   IN unsigned short foreign_ip_port )
+{
+    int ret;
+
+    ret = sock_init( info, sockfd );
+    if( ret != UPNP_E_SUCCESS ) {
+        return ret;
+    }
+
+    info->foreign_ip_addr = foreign_ip_addr;
+    info->foreign_ip_port = foreign_ip_port;
+
+    return UPNP_E_SUCCESS;
+}
+
+/************************************************************************
+*	Function :	sock_destroy
+*
+*	Parameters :
+*		INOUT SOCKINFO* info ;	Socket Information Object
+*		int ShutdownMethod ;	How to shutdown the socket. Used by  
+*								sockets's shutdown() 
+*
+*	Description :	Shutsdown the socket using the ShutdownMethod to 
+*		indicate whether sends and receives on the socket will be 
+*		dis-allowed. After shutting down the socket, closesocket is called
+*		to release system resources used by the socket calls.
+*
+*	Return : int;
+*		UPNP_E_SOCKET_ERROR on failure
+*		UPNP_E_SUCCESS on success
+*
+*	Note :
+************************************************************************/
+int
+sock_destroy( INOUT SOCKINFO * info,
+              int ShutdownMethod )
+{
+    shutdown( info->socket, ShutdownMethod );
+    if( UpnpCloseSocket( info->socket ) == -1 ) {
+        return UPNP_E_SOCKET_ERROR;
+    }
+
+    return UPNP_E_SUCCESS;
+}
+
+/************************************************************************
+*	Function :	sock_read_write
+*
+*	Parameters :
+*		IN SOCKINFO *info ;	Socket Information Object
+*		OUT char* buffer ;	Buffer to get data to or send data from 
+*		IN size_t bufsize ;	Size of the buffer
+*	    IN int *timeoutSecs ;	timeout value
+*		IN xboolean bRead ;	Boolean value specifying read or write option
+*
+*	Description :	Receives or sends data. Also returns the time taken
+*		to receive or send data.
+*
+*	Return :int ;
+*		numBytes - On Success, no of bytes received or sent		
+*		UPNP_E_TIMEDOUT - Timeout
+*		UPNP_E_SOCKET_ERROR - Error on socket calls
+*
+*	Note :
+************************************************************************/
+static int
+sock_read_write( IN SOCKINFO * info,
+                 OUT char *buffer,
+                 IN size_t bufsize,
+                 IN int *timeoutSecs,
+                 IN xboolean bRead )
+{
+    int retCode;
+    fd_set readSet;
+    fd_set writeSet;
+    struct timeval timeout;
+    int numBytes;
+    time_t start_time = time( NULL );
+    int sockfd = info->socket;
+    long bytes_sent = 0,
+      byte_left = 0,
+      num_written;
+
+    if( *timeoutSecs < 0 ) {
+        return UPNP_E_TIMEDOUT;
+    }
+
+    FD_ZERO( &readSet );
+    FD_ZERO( &writeSet );
+    if( bRead ) {
+        FD_SET( ( unsigned )sockfd, &readSet );
+    } else {
+        FD_SET( ( unsigned )sockfd, &writeSet );
+    }
+
+    timeout.tv_sec = *timeoutSecs;
+    timeout.tv_usec = 0;
+
+    while( TRUE ) {
+        if( *timeoutSecs == 0 ) {
+            retCode =
+                select( sockfd + 1, &readSet, &writeSet, NULL, NULL );
+        } else {
+            retCode =
+                select( sockfd + 1, &readSet, &writeSet, NULL, &timeout );
+        }
+
+        if( retCode == 0 ) {
+            return UPNP_E_TIMEDOUT;
+        }
+        if( retCode == -1 ) {
+            if( errno == EINTR )
+                continue;
+            return UPNP_E_SOCKET_ERROR; // error
+        } else {
+            break;              // read or write
+        }
+    }
+
+#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);
+    } else {
+        byte_left = bufsize;
+        bytes_sent = 0;
+        while( byte_left > 0 ) {
+            // write data
+            num_written =
+                send( sockfd, buffer + bytes_sent, byte_left,
+                      MSG_DONTROUTE|MSG_NOSIGNAL);
+            if( num_written == -1 ) {
+#ifdef SO_NOSIGPIPE
+	        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
+#endif
+                return num_written;
+            }
+
+            byte_left = byte_left - num_written;
+            bytes_sent += num_written;
+        }
+
+        numBytes = bytes_sent;
+    }
+
+#ifdef SO_NOSIGPIPE
+	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
+    }
+#endif
+
+    if( numBytes < 0 ) {
+        return UPNP_E_SOCKET_ERROR;
+    }
+    // subtract time used for reading/writing
+    if( *timeoutSecs != 0 ) {
+        *timeoutSecs -= time( NULL ) - start_time;
+    }
+
+    return numBytes;
+}
+
+/************************************************************************
+*	Function :	sock_read
+*
+*	Parameters :
+*		IN SOCKINFO *info ;	Socket Information Object
+*		OUT char* buffer ;	Buffer to get data to  
+*		IN size_t bufsize ;	Size of the buffer
+*	    IN int *timeoutSecs ;	timeout value
+*
+*	Description :	Calls sock_read_write() for reading data on the 
+*		socket
+*
+*	Return : int;
+*		Values returned by sock_read_write() 
+*
+*	Note :
+************************************************************************/
+int
+sock_read( IN SOCKINFO * info,
+           OUT char *buffer,
+           IN size_t bufsize,
+           INOUT int *timeoutSecs )
+{
+    return sock_read_write( info, buffer, bufsize, timeoutSecs, TRUE );
+}
+
+/************************************************************************
+*	Function :	sock_write
+*
+*	Parameters :
+*		IN SOCKINFO *info ;	Socket Information Object
+*		IN char* buffer ;	Buffer to send data from 
+*		IN size_t bufsize ;	Size of the buffer
+*	    IN int *timeoutSecs ;	timeout value
+*
+*	Description :	Calls sock_read_write() for writing data on the 
+*		socket
+*
+*	Return : int;
+*		sock_read_write()
+*
+*	Note :
+************************************************************************/
+int
+sock_write( IN SOCKINFO * info,
+            IN char *buffer,
+            IN size_t bufsize,
+            INOUT int *timeoutSecs )
+{
+    return sock_read_write( info, buffer, bufsize, timeoutSecs, FALSE );
+}
--- a/upnp/src/genlib/net/uri/uri.c
+++ b/upnp/src/genlib/net/uri/uri.c
--- a/upnp/src/genlib/service_table/service_table.c
+++ b/upnp/src/genlib/service_table/service_table.c
@@ -1,34 +1,33 @@
-/*******************************************************************************
- *
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * - Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * - Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * - Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////

 /************************************************************************
 * Purpose: This file defines the functions for services. It defines 
@@ -52,7 +51,7 @@
 *	Description :	Makes a copy of the subscription
 *
 *	Return : int ;
-*		HTTP_SUCCESS - On success
+*		HTTP_SUCCESS - On Sucess
 *
 *	Note :
 ************************************************************************/
@@ -117,8 +116,25 @@ RemoveSubscriptionSID( Upnp_SID sid,

 }

-
-subscription *GetSubscriptionSID(const Upnp_SID sid, service_info *service)
+/************************************************************************
+*	Function :	GetSubscriptionSID
+*
+*	Parameters :
+*		Upnp_SID sid ;	subscription ID
+*		service_info * service ;	service object providing the list of
+*						subscriptions
+*
+*	Description :	Return the subscription from the service table 
+*		that matches const Upnp_SID sid value. 
+*
+*	Return : subscription * - Pointer to the matching subscription 
+*		node;
+*
+*	Note :
+************************************************************************/
+subscription *
+GetSubscriptionSID( Upnp_SID sid,
+                    service_info * service )
 {
    subscription *next = service->subscriptionList;
    subscription *previous = NULL;
@@ -135,7 +151,7 @@ subscription *GetSubscriptionSID(const Upnp_SID sid, service_info *service)
        }
    }
    if( found ) {
-        /*get the current_time */
+        //get the current_time
        time( &current_time );
        if( ( found->expireTime != 0 )
            && ( found->expireTime < current_time ) ) {
@@ -153,15 +169,31 @@ subscription *GetSubscriptionSID(const Upnp_SID sid, service_info *service)

 }

-
-subscription *GetNextSubscription(service_info *service, subscription *current)
+/************************************************************************
+*	Function :	GetNextSubscription
+*
+*	Parameters :
+*		service_info * service ; service object providing the list of
+*						subscriptions
+*		subscription *current ;	current subscription object
+*
+*	Description :	Get current and valid subscription from the service 
+*		table.
+*
+*	Return : subscription * - Pointer to the next subscription node;
+*
+*	Note :
+************************************************************************/
+subscription *
+GetNextSubscription( service_info * service,
+                     subscription * current )
 {
    time_t current_time;
    subscription *next = NULL;
    subscription *previous = NULL;
    int notDone = 1;

-    /* get the current_time */
+    //get the current_time
    time( &current_time );
    while( ( notDone ) && ( current ) ) {
        previous = current;
@@ -186,26 +218,52 @@ subscription *GetNextSubscription(service_info *service, subscription *current)
    return next;
 }

-
-subscription *GetFirstSubscription(service_info *service)
+/************************************************************************
+*	Function :	GetFirstSubscription
+*
+*	Parameters :
+*		service_info *service ;	service object providing the list of
+*						subscriptions
+*
+*	Description :	Gets pointer to the first subscription node in the 
+*		service table.
+*
+*	Return : subscription * - pointer to the first subscription node ;
+*
+*	Note :
+************************************************************************/
+subscription *
+GetFirstSubscription( service_info * service )
 {
-	subscription temp;
-	subscription *next = NULL;
+    subscription temp;
+    subscription *next = NULL;

-	temp.next = service->subscriptionList;
-	next = GetNextSubscription(service, &temp);
-	service->subscriptionList = temp.next;
-	/* service->subscriptionList = next; */
-	
-	return next;
+    temp.next = service->subscriptionList;
+    next = GetNextSubscription( service, &temp );
+    service->subscriptionList = temp.next;
+    //  service->subscriptionList=next;
+    return next;
 }

-
-void freeSubscription(subscription *sub)
+/************************************************************************
+*	Function :	freeSubscription
+*
+*	Parameters :
+*		subscription * sub ;	subscription to be freed
+*
+*	Description :	Free's the memory allocated for storing the URL of 
+*		the subscription.
+*
+*	Return : void ;
+*
+*	Note :
+************************************************************************/
+void
+freeSubscription( subscription * sub )
 {
-	if (sub) {
-		free_URL_list(&sub->DeliveryURLs);
-	}
+    if( sub ) {
+        free_URL_list( &sub->DeliveryURLs );
+    }
 }

 /************************************************************************
@@ -718,119 +776,162 @@ getSubElement( const char *element_name,
 *
 *	Note :
 ************************************************************************/
-service_info *getServiceList(
-	IXML_Node *node,
-	service_info **end,
-	char *URLBase)
+service_info *
+getServiceList( IXML_Node * node,
+                service_info ** end,
+                char *URLBase )
 {
-	IXML_Node *serviceList = NULL;
-	IXML_Node *current_service = NULL;
-	IXML_Node *UDN = NULL;
+    IXML_Node *serviceList = NULL;
+    IXML_Node *current_service = NULL;
+    IXML_Node *UDN = NULL;

-	IXML_Node *serviceType = NULL;
-	IXML_Node *serviceId = NULL;
-	IXML_Node *SCPDURL = NULL;
-	IXML_Node *controlURL = NULL;
-	IXML_Node *eventURL = NULL;
-	DOMString tempDOMString = NULL;
-	service_info *head = NULL;
-	service_info *current = NULL;
-	service_info *previous = NULL;
-	IXML_NodeList *serviceNodeList = NULL;
-	long unsigned int NumOfServices = 0;
-	long unsigned int i = 0;
-	int fail = 0;
+    IXML_Node *serviceType = NULL;
+    IXML_Node *serviceId = NULL;
+    IXML_Node *SCPDURL = NULL;
+    IXML_Node *controlURL = NULL;
+    IXML_Node *eventURL = NULL;
+    DOMString tempDOMString = NULL;
+    service_info *head = NULL;
+    service_info *current = NULL;
+    service_info *previous = NULL;
+    IXML_NodeList *serviceNodeList = NULL;
+    int NumOfServices = 0;
+    int i = 0;
+    int fail = 0;
+
+    if( getSubElement( "UDN", node, &UDN ) &&
+        getSubElement( "serviceList", node, &serviceList ) ) {
+
+        serviceNodeList = ixmlElement_getElementsByTagName( ( IXML_Element
+                                                              * )
+                                                            serviceList,
+                                                            "service" );
+
+        if( serviceNodeList != NULL ) {
+            NumOfServices = ixmlNodeList_length( serviceNodeList );
+            for( i = 0; i < NumOfServices; i++ ) {
+                current_service = ixmlNodeList_item( serviceNodeList, i );
+                fail = 0;
+
+                if( current ) {
+                    current->next =
+                        ( service_info * )
+                        malloc( sizeof( service_info ) );
+
+                    previous = current;
+                    current = current->next;
+                } else {
+                    head =
+                        ( service_info * )
+                        malloc( sizeof( service_info ) );
+                    current = head;
+                }
+
+                if( !current ) {
+                    freeServiceList( head );
+                    return NULL;
+                }
+
+                current->next = NULL;
+                current->controlURL = NULL;
+                current->eventURL = NULL;
+                current->serviceType = NULL;
+                current->serviceId = NULL;
+                current->SCPDURL = NULL;
+                current->active = 1;
+                current->subscriptionList = NULL;
+                current->TotalSubscriptions = 0;
+
+                if( !( current->UDN = getElementValue( UDN ) ) )
+                    fail = 1;
+
+                if( ( !getSubElement( "serviceType", current_service,
+                                      &serviceType ) ) ||
+                    ( !( current->serviceType =
+                         getElementValue( serviceType ) ) ) )
+                    fail = 1;
+
+                if( ( !getSubElement( "serviceId", current_service,
+                                      &serviceId ) ) ||
+                    ( !
+                      ( current->serviceId =
+                        getElementValue( serviceId ) ) ) )
+                    fail = 1;
+
+                if( ( !
+                      ( getSubElement
+                        ( "SCPDURL", current_service, &SCPDURL ) ) )
+                    || ( !( tempDOMString = getElementValue( SCPDURL ) ) )
+                    ||
+                    ( !
+                      ( current->SCPDURL =
+                        resolve_rel_url( URLBase, tempDOMString ) ) ) )
+                    fail = 1;
+
+                ixmlFreeDOMString( tempDOMString );
+                tempDOMString = NULL;
+
+                if( ( !
+                      ( getSubElement
+                        ( "controlURL", current_service, &controlURL ) ) )
+                    ||
+                    ( !( tempDOMString = getElementValue( controlURL ) ) )
+                    ||
+                    ( !
+                      ( current->controlURL =
+                        resolve_rel_url( URLBase, tempDOMString ) ) ) ) {
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "BAD OR MISSING CONTROL URL" );
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "CONTROL URL SET TO NULL IN SERVICE INFO" );
+                    current->controlURL = NULL;
+                    fail = 0;
+                }
+
+                ixmlFreeDOMString( tempDOMString );
+                tempDOMString = NULL;
+
+                if( ( !
+                      ( getSubElement
+                        ( "eventSubURL", current_service, &eventURL ) ) )
+                    || ( !( tempDOMString = getElementValue( eventURL ) ) )
+                    ||
+                    ( !
+                      ( current->eventURL =
+                        resolve_rel_url( URLBase, tempDOMString ) ) ) ) {
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "BAD OR MISSING EVENT URL" );
+                    UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
+                        "EVENT URL SET TO NULL IN SERVICE INFO" );
+                    current->eventURL = NULL;
+                    fail = 0;
+                }
+
+                ixmlFreeDOMString( tempDOMString );
+                tempDOMString = NULL;
+
+                if( fail ) {
+                    freeServiceList( current );
+
+                    if( previous )
+                        previous->next = NULL;
+                    else
+                        head = NULL;
+
+                    current = previous;
+                }
+
+            }
+
+            ixmlNodeList_free( serviceNodeList );
+        }
+
+        ( *end ) = current;
+
+        return head;
+    } else
+        return NULL;

-	if (getSubElement("UDN", node, &UDN) &&
-	    getSubElement("serviceList", node, &serviceList)) {
-		serviceNodeList = ixmlElement_getElementsByTagName(
-			(IXML_Element *)serviceList, "service");
-		if (serviceNodeList != NULL) {
-			NumOfServices = ixmlNodeList_length(serviceNodeList);
-			for (i = 0; i < NumOfServices; i++) {
-				current_service =
-				    ixmlNodeList_item(serviceNodeList, i);
-				fail = 0;
-				if (current) {
-					current->next = malloc(sizeof(service_info));
-					previous = current;
-					current = current->next;
-				} else {
-					head = malloc(sizeof(service_info));
-					current = head;
-				}
-				if (!current) {
-					freeServiceList(head);
-					return NULL;
-				}
-				current->next = NULL;
-				current->controlURL = NULL;
-				current->eventURL = NULL;
-				current->serviceType = NULL;
-				current->serviceId = NULL;
-				current->SCPDURL = NULL;
-				current->active = 1;
-				current->subscriptionList = NULL;
-				current->TotalSubscriptions = 0;
-				if (!(current->UDN = getElementValue(UDN)))
-					fail = 1;
-				if (!getSubElement("serviceType", current_service, &serviceType) ||
-				    !(current->serviceType = getElementValue(serviceType)))
-					fail = 1;
-				if (!getSubElement("serviceId", current_service, &serviceId) ||
-				    !(current->serviceId = getElementValue(serviceId)))
-					fail = 1;
-				if (!getSubElement("SCPDURL", current_service, &SCPDURL) ||
-				    !(tempDOMString = getElementValue(SCPDURL)) ||
-				    !(current->SCPDURL = resolve_rel_url(URLBase, tempDOMString)))
-					fail = 1;
-				ixmlFreeDOMString(tempDOMString);
-				tempDOMString = NULL;
-				if (!(getSubElement("controlURL", current_service, &controlURL)) ||
-				    !(tempDOMString = getElementValue(controlURL)) ||
-				    !(current->controlURL = resolve_rel_url(URLBase, tempDOMString))) {
-					UpnpPrintf(UPNP_INFO, GENA, __FILE__,
-						   __LINE__,
-						   "BAD OR MISSING CONTROL URL");
-					UpnpPrintf(UPNP_INFO, GENA, __FILE__,
-						   __LINE__,
-						   "CONTROL URL SET TO NULL IN SERVICE INFO");
-					current->controlURL = NULL;
-					fail = 0;
-				}
-				ixmlFreeDOMString(tempDOMString);
-				tempDOMString = NULL;
-				if (!getSubElement("eventSubURL", current_service, &eventURL) ||
-				    !(tempDOMString = getElementValue(eventURL)) ||
-				    !(current->eventURL = resolve_rel_url(URLBase, tempDOMString))) {
-					UpnpPrintf(UPNP_INFO, GENA, __FILE__,
-						   __LINE__,
-						   "BAD OR MISSING EVENT URL");
-					UpnpPrintf(UPNP_INFO, GENA, __FILE__,
-						   __LINE__,
-						   "EVENT URL SET TO NULL IN SERVICE INFO");
-					current->eventURL = NULL;
-					fail = 0;
-				}
-				ixmlFreeDOMString(tempDOMString);
-				tempDOMString = NULL;
-				if (fail) {
-					freeServiceList(current);
-					if (previous)
-						previous->next = NULL;
-					else
-						head = NULL;
-					current = previous;
-				}
-			}
-			ixmlNodeList_free(serviceNodeList);
-		}
-		(*end) = current;
-		return head;
-	} else {
-		(*end) = NULL;
-		return NULL;
-	}
 }

 /************************************************************************
@@ -854,37 +955,38 @@ getAllServiceList( IXML_Node * node,
                   char *URLBase,
                   service_info ** out_end )
 {
-	service_info *head = NULL;
-	service_info *end = NULL;
-	service_info *next_end = NULL;
-	IXML_NodeList *deviceList = NULL;
-	IXML_Node *currentDevice = NULL;
+    service_info *head = NULL;
+    service_info *end = NULL;
+    service_info *next_end = NULL;
+    IXML_NodeList *deviceList = NULL;
+    IXML_Node *currentDevice = NULL;

-	long unsigned int NumOfDevices = 0;
-	long unsigned int i = 0;
+    int NumOfDevices = 0;
+    int i = 0;

-	(*out_end) = NULL;
+    ( *out_end ) = NULL;

-	deviceList = ixmlElement_getElementsByTagName(
-		(IXML_Element *)node, "device");
-	if (deviceList) {
-		NumOfDevices = ixmlNodeList_length(deviceList);
-		for (i = 0; i < NumOfDevices; i++) {
-			currentDevice = ixmlNodeList_item(deviceList, i);
-			if (head) {
-				end->next = getServiceList(currentDevice,
-					&next_end, URLBase);
-				if (next_end)
-					end = next_end;
-			} else
-				head = getServiceList(currentDevice, &end,
-					URLBase);
-		}
-		ixmlNodeList_free(deviceList);
-	}
+    deviceList =
+        ixmlElement_getElementsByTagName( ( IXML_Element * ) node,
+                                          "device" );
+    if( deviceList != NULL ) {
+        NumOfDevices = ixmlNodeList_length( deviceList );
+        for( i = 0; i < NumOfDevices; i++ ) {
+            currentDevice = ixmlNodeList_item( deviceList, i );
+            if( head ) {
+                end->next =
+                    getServiceList( currentDevice, &next_end, URLBase );
+                end = next_end;
+            } else
+                head = getServiceList( currentDevice, &end, URLBase );

-	(*out_end) = end;
-	return head;
+        }
+
+        ixmlNodeList_free( deviceList );
+    }
+
+    ( *out_end ) = end;
+    return head;
 }

 /************************************************************************
@@ -916,8 +1018,8 @@ removeServiceTable( IXML_Node * node,
    service_info *current_service = NULL;
    service_info *start_search = NULL;
    service_info *prev_service = NULL;
-    long unsigned int NumOfDevices = 0;
-    long unsigned int i = 0;
+    int NumOfDevices = 0;
+    int i = 0;

    if( getSubElement( "root", node, &root ) ) {
        current_service = in->serviceList;
@@ -933,9 +1035,9 @@ removeServiceTable( IXML_Node * node,
                    && ( ( getSubElement( "UDN", node, &currentUDN ) )
                         && ( UDN = getElementValue( currentUDN ) ) ) ) {
                    current_service = start_search;
-                    /*Services are put in the service table in the order in which they appear in the  */
-                    /*description document, therefore we go through the list only once to remove a particular */
-                    /*root device */
+                    //Services are put in the service table in the order in which they appear in the 
+                    //description document, therefore we go through the list only once to remove a particular
+                    //root device
                    while( ( current_service )
                           && ( strcmp( current_service->UDN, UDN ) ) ) {
                        current_service = current_service->next;
@@ -1061,5 +1163,4 @@ getServiceTable( IXML_Node * node,
    return 0;
 }

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

-/*
- * \file
- *
- * \brief This file contains functions that operate on memory and buffers,
- * allocation, re-allocation, and modification of the memory
- */
+/************************************************************************
+* Purpose: This file contains functions that operate on memory and 
+*	buffers, allocation, re-allocation, and modification of the memory 
+************************************************************************/

 #include "config.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "membuffer.h"
+#include <membuffer.h>
 #include "upnp.h"
 #include "unixutil.h"

-char *str_alloc(const char *str, size_t str_len)
+/************************************************************************
+*								 string									*
+************************************************************************/
+
+/************************************************************************
+*	Function :	str_alloc
+*
+*	Parameters :
+*		IN const char* str ;	input string object
+*		IN size_t str_len ;		input string length
+*
+*	Description :	Allocate memory and copy information from the input 
+*		string to the newly allocated memory.
+*
+*	Return : char* ;
+*		Pointer to the newly allocated memory.
+*		NULL if memory cannot be allocated.
+*
+*	Note :
+************************************************************************/
+char *
+str_alloc( IN const char *str,
+           IN size_t str_len )
 {
-	char *s;
+    char *s;

-	s = (char *)malloc(str_len + 1);
-	if (s == NULL) {
-		return NULL;	/* no mem */
-	}
+    s = ( char * )malloc( str_len + 1 );
+    if( s == NULL ) {
+        return NULL;            // no mem
+    }

-	memcpy(s, str, str_len);
-	s[str_len] = '\0';
+    memcpy( s, str, str_len );
+    s[str_len] = '\0';

-	return s;
+    return s;
 }

-int memptr_cmp(memptr * m, const char *s)
+/************************************************************************
+*								memptr									*
+************************************************************************/
+
+/************************************************************************
+*	Function :	memptr_cmp
+*
+*	Parameters :
+*		IN memptr* m ;	input memory object
+*		IN const char* s ;	constatnt string for the memory object to be 
+*					compared with
+*
+*	Description : Compares characters of strings passed for number of 
+*		bytes. If equal for the number of bytes, the length of the bytes 
+*		determines which buffer is shorter.
+*
+*	Return : int ;
+*		< 0 string1 substring less than string2 substring 
+*		0 string1 substring identical to string2 substring 
+*		> 0 string1 substring greater than string2 substring 
+*
+*	Note :
+************************************************************************/
+int
+memptr_cmp( IN memptr * m,
+            IN const char *s )
 {
-	int cmp;
+    int cmp;

-	cmp = strncmp(m->buf, s, m->length);
+    cmp = strncmp( m->buf, s, m->length );

-	if (cmp == 0 && m->length < strlen(s)) {
-		/* both strings equal for 'm->length' chars */
-		/*  if m is shorter than s, then s is greater */
-		return -1;
-	}
+    if( cmp == 0 && m->length < strlen( s ) ) {
+        // both strings equal for 'm->length' chars
+        //  if m is shorter than s, then s is greater
+        return -1;
+    }

-	return cmp;
+    return cmp;
 }

-int memptr_cmp_nocase(memptr * m, const char *s)
+/************************************************************************
+*	Function :	memptr_cmp_nocase
+*
+*	Parameters :
+*		IN memptr* m ;	input memory object
+*		IN const char* s ;	constatnt string for the memory object to be 
+*					compared with
+*
+*	Description : Compares characters of 2 strings irrespective of the 
+*		case for a specific count of bytes  If the character comparison 
+*		is the same the length of the 2 srings determines the shorter 
+*		of the 2 strings.
+*
+*	Return : int ;
+*		< 0 string1 substring less than string2 substring 
+*		0 string1 substring identical to string2 substring 
+*		> 0 string1 substring greater than string2 substring 
+*  
+*	Note :
+************************************************************************/
+int
+memptr_cmp_nocase( IN memptr * m,
+                   IN const char *s )
 {
-	int cmp;
+    int cmp;

-	cmp = strncasecmp(m->buf, s, m->length);
-	if (cmp == 0 && m->length < strlen(s)) {
-		/* both strings equal for 'm->length' chars */
-		/*  if m is shorter than s, then s is greater */
-		return -1;
-	}
+    cmp = strncasecmp( m->buf, s, m->length );
+    if( cmp == 0 && m->length < strlen( s ) ) {
+        // both strings equal for 'm->length' chars
+        //  if m is shorter than s, then s is greater
+        return -1;
+    }

-	return cmp;
+    return cmp;
 }

-/*!
- * \brief Initialize the buffer.
- */
-static UPNP_INLINE void membuffer_initialize(
-	/*! [in,out] Buffer to be initialized. */
-	membuffer *m)
+/************************************************************************
+*							 membuffer									*
+************************************************************************/
+
+/************************************************************************
+*	Function :	membuffer_initialize
+*
+*	Parameters :
+*		INOUT membuffer* m ;	buffer to be initialized
+*
+*	Description :	Initialize the buffer
+*
+*	Return : void ;
+*
+*	Note :
+************************************************************************/
+static UPNP_INLINE void
+membuffer_initialize( INOUT membuffer * m )
 {
-	m->buf = NULL;
-	m->length = 0;
-	m->capacity = 0;
+    m->buf = NULL;
+    m->length = 0;
+    m->capacity = 0;
 }

-int membuffer_set_size(membuffer *m, size_t new_length)
+/************************************************************************
+*	Function :	membuffer_set_size
+*
+*	Parameters :
+*		INOUT membuffer* m ;	buffer whose size is to be modified
+*		IN size_t new_length ;	new size to which the buffer will be 
+*					modified
+*
+*	Description : Increases or decreases buffer cap so that at least
+*	   'new_length' bytes can be stored
+*
+*	Return : int ;
+*		UPNP_E_SUCCESS - On Success
+*		UPNP_E_OUTOF_MEMORY - On failure to allocate memory.
+*
+*	Note :
+************************************************************************/
+int
+membuffer_set_size( INOUT membuffer * m,
+                    IN size_t new_length )
 {
-	size_t diff;
-	size_t alloc_len;
-	char *temp_buf;
+    size_t diff;
+    size_t alloc_len;
+    char *temp_buf;

-	if (new_length >= m->length) {	/* increase length */
-		/* need more mem? */
-		if (new_length <= m->capacity) {
-			return 0;	/* have enough mem; done */
-		}
+    if( new_length >= m->length )   // increase length
+    {
+        // need more mem?
+        if( new_length <= m->capacity ) {
+            return 0;           // have enough mem; done
+        }

-		diff = new_length - m->length;
-		alloc_len = MAXVAL(m->size_inc, diff) + m->capacity;
-	} else {		/* decrease length */
+        diff = new_length - m->length;
+        alloc_len = MAXVAL( m->size_inc, diff ) + m->capacity;
+    } else                      // decrease length
+    {
+        assert( new_length <= m->length );

-		assert(new_length <= m->length);
+        // if diff is 0..m->size_inc, don't free
+        if( ( m->capacity - new_length ) <= m->size_inc ) {
+            return 0;
+        }

-		/* if diff is 0..m->size_inc, don't free */
-		if ((m->capacity - new_length) <= m->size_inc) {
-			return 0;
-		}
+        alloc_len = new_length + m->size_inc;
+    }

-		alloc_len = new_length + m->size_inc;
-	}
+    assert( alloc_len >= new_length );

-	assert(alloc_len >= new_length);
+    temp_buf = realloc( m->buf, alloc_len + 1 );    //LEAK_FIX_MK

-	temp_buf = realloc(m->buf, alloc_len + 1);	/*LEAK_FIX_MK */
+    //temp_buf = Realloc( m->buf,m->length, alloc_len + 1 );//LEAK_FIX_MK

-	/*temp_buf = Realloc( m->buf,m->length, alloc_len + 1 );LEAK_FIX_MK */
+    if( temp_buf == NULL ) {
+        // try smaller size
+        alloc_len = new_length;
+        temp_buf = realloc( m->buf, alloc_len + 1 );    //LEAK_FIX_MK
+        //temp_buf = Realloc( m->buf,m->length, alloc_len + 1 );//LEAK_FIX_MK

-	if (temp_buf == NULL) {
-		/* try smaller size */
-		alloc_len = new_length;
-		temp_buf = realloc(m->buf, alloc_len + 1);	/*LEAK_FIX_MK */
-		/*temp_buf = Realloc( m->buf,m->length, alloc_len + 1 );LEAK_FIX_MK */
-
-		if (temp_buf == NULL) {
-			return UPNP_E_OUTOF_MEMORY;
-		}
-	}
-	/* save */
-	m->buf = temp_buf;
-	m->capacity = alloc_len;
-	return 0;
+        if( temp_buf == NULL ) {
+            return UPNP_E_OUTOF_MEMORY;
+        }
+    }
+    // save
+    m->buf = temp_buf;
+    m->capacity = alloc_len;
+    return 0;
 }

-void membuffer_init(membuffer *m)
+/************************************************************************
+*	Function :	membuffer_init
+*
+*	Parameters :
+*		INOUT membuffer* m ; buffer	to be initialized
+*
+*	Description : Wrapper to membuffer_initialize().
+*		Set the size of the buffer to MEMBUF_DEF_SIZE_INC
+*		Initializes m->buf to NULL, length=0
+*
+*	Return : void ;
+*
+*	Note :
+************************************************************************/
+void
+membuffer_init( INOUT membuffer * m )
 {
-	assert(m != NULL);
+    assert( m != NULL );

-	m->size_inc = MEMBUF_DEF_SIZE_INC;
-	membuffer_initialize(m);
+    m->size_inc = MEMBUF_DEF_SIZE_INC;
+    membuffer_initialize( m );
 }

-void membuffer_destroy(membuffer *m)
+/************************************************************************
+*	Function :	membuffer_destroy
+*
+*	Parameters :
+*		INOUT membuffer* m ;	buffer to be destroyed
+*
+*	Description : Free's memory allocated for membuffer* m.
+*
+*	Return : void ;
+*
+*	Note :
+************************************************************************/
+void
+membuffer_destroy( INOUT membuffer * m )
 {
-	if (m == NULL) {
-		return;
-	}
+    if( m == NULL ) {
+        return;
+    }

-	free(m->buf);
-	membuffer_init(m);
+    free( m->buf );
+    membuffer_init( m );
 }

-int membuffer_assign(membuffer *m, const void *buf, size_t buf_len)
+/************************************************************************
+*	Function :	membuffer_assign
+*
+*	Parameters :
+*		INOUT membuffer* m ; buffer whose memory is to be allocated and 
+*					assigned.
+*		IN const void* buf ; source buffer whose contents will be copied
+*		IN size_t buf_len ;	 length of the source buffer
+*
+*	Description : Allocate memory to membuffer* m and copy the contents 
+*		of the in parameter IN const void* buf.
+*
+*	Return : int ;
+*	 UPNP_E_SUCCESS
+*	 UPNP_E_OUTOF_MEMORY
+*
+*	Note :
+************************************************************************/
+int
+membuffer_assign( INOUT membuffer * m,
+                  IN const void *buf,
+                  IN size_t buf_len )
 {
-	int return_code;
+    int return_code;

-	assert(m != NULL);
+    assert( m != NULL );

-	/* set value to null */
-	if (buf == NULL) {
-		membuffer_destroy(m);
-		return 0;
-	}
-	/* alloc mem */
-	return_code = membuffer_set_size(m, buf_len);
-	if (return_code != 0)
-		return return_code;
-	/* copy */
-	if (buf_len) {
-		memcpy(m->buf, buf, buf_len);
-		m->buf[buf_len] = 0;	/* null-terminate */
-	}
-	m->length = buf_len;
+    // set value to null
+    if( buf == NULL ) {
+        membuffer_destroy( m );
+        return 0;
+    }
+    // alloc mem
+    return_code = membuffer_set_size( m, buf_len );
+    if( return_code != 0 ) {
+        return return_code;
+    }
+    // copy
+    if( buf_len ) {
+        memcpy( m->buf, buf, buf_len );
+        m->buf[buf_len] = 0;        // null-terminate
+    }
+    m->length = buf_len;

-	return 0;
+    return 0;
 }

-int membuffer_assign_str(membuffer *m, const char *c_str)
+/************************************************************************
+*	Function :	membuffer_assign_str
+*
+*	Parameters :
+*		INOUT membuffer* m ;	buffer to be allocated and assigned
+*		IN const char* c_str ;	source buffer whose contents will be 
+*					copied
+*
+*	Description : Wrapper function for membuffer_assign()
+*
+*	Return : int ;
+*	 UPNP_E_SUCCESS
+*	 UPNP_E_OUTOF_MEMORY
+*
+*	Note :
+************************************************************************/
+int
+membuffer_assign_str( INOUT membuffer * m,
+                      IN const char *c_str )
 {
-	return membuffer_assign(m, c_str, strlen(c_str));
+    return membuffer_assign( m, c_str, strlen( c_str ) );
 }

-int membuffer_append(membuffer *m, const void *buf, size_t buf_len)
+/************************************************************************
+*	Function :	membuffer_append
+*
+*	Parameters :
+*		INOUT membuffer* m ; buffer whose memory is to be appended.
+*		IN const void* buf ; source buffer whose contents will be 
+*					copied
+*		IN size_t buf_len ;	length of the source buffer
+*
+*	Description : Invokes function to appends data from a constant buffer 
+*		to the buffer 
+*
+*	Return : int ;
+*
+*	Note :
+************************************************************************/
+int
+membuffer_append( INOUT membuffer * m,
+                  IN const void *buf,
+                  IN size_t buf_len )
 {
-	assert(m != NULL);
+    assert( m != NULL );

-	return membuffer_insert(m, buf, buf_len, m->length);
+    return membuffer_insert( m, buf, buf_len, m->length );
 }

-int membuffer_append_str(membuffer *m, const char *c_str)
+/************************************************************************
+*	Function :	membuffer_append_str
+*
+*	Parameters :
+*		INOUT membuffer* m ;	buffer whose memory is to be appended.
+*		IN const char* c_str ;	source buffer whose contents will be 
+*					copied
+*
+*	Description : Invokes function to appends data from a constant string 
+*		to the buffer 	
+*
+*	Return : int ;
+*
+*	Note :
+************************************************************************/
+int
+membuffer_append_str( INOUT membuffer * m,
+                      IN const char *c_str )
 {
-	return membuffer_insert(m, c_str, strlen(c_str), m->length);
+    return membuffer_insert( m, c_str, strlen( c_str ), m->length );
 }

-int membuffer_insert(membuffer * m, const void *buf, size_t buf_len,
-		     size_t index)
+/************************************************************************
+*	Function :	membuffer_insert
+*
+*	Parameters :
+*		INOUT membuffer* m ; buffer whose memory size is to be increased  
+*					and appended.
+*		IN const void* buf ; source buffer whose contents will be 
+*					copied
+*		 IN size_t buf_len ; size of the source buffer
+*		int index ;	index to determine the bounds while movinf the data
+*
+*	Description : Allocates memory for the new data to be inserted. Does
+*		memory management by moving the data from the existing memory to 
+*		the newly allocated memory and then appending the new data.
+*
+*	Return : int ;
+*
+*	Note :
+************************************************************************/
+int
+membuffer_insert( INOUT membuffer * m,
+                  IN const void *buf,
+                  IN size_t buf_len,
+                  int index )
 {
-	int return_code;
+    int return_code;

-	assert(m != NULL);
+    assert( m != NULL );

-	if (index > m->length)
-		return UPNP_E_OUTOF_BOUNDS;
-	if (!buf || !buf_len) {
-		return 0;
-	}
-	/* alloc mem */
-	return_code = membuffer_set_size(m, m->length + buf_len);
-	if (return_code) {
-		return return_code;
-	}
-	/* insert data */
-	/* move data to right of insertion point */
-	memmove(m->buf + index + buf_len, m->buf + index, m->length - index);
-	memcpy(m->buf + index, buf, buf_len);
-	m->length += buf_len;
-	/* null-terminate */
-	m->buf[m->length] = 0;
+    if( index < 0 || index > ( int )m->length )
+        return UPNP_E_OUTOF_BOUNDS;

-	return 0;
+    if( buf == NULL || buf_len == 0 ) {
+        return 0;
+    }
+    // alloc mem
+    return_code = membuffer_set_size( m, m->length + buf_len );
+    if( return_code != 0 ) {
+        return return_code;
+    }
+    // insert data
+
+    // move data to right of insertion point
+    memmove( m->buf + index + buf_len, m->buf + index, m->length - index );
+    memcpy( m->buf + index, buf, buf_len );
+    m->length += buf_len;
+    m->buf[m->length] = 0;      // null-terminate
+
+    return 0;
 }

-void membuffer_delete(membuffer * m, size_t index, size_t num_bytes)
+/************************************************************************
+*	Function :	membuffer_delete
+*
+*	Parameters :
+*		INOUT membuffer* m ; buffer whose memory size is to be decreased
+*					and copied to the odified location
+*		IN int index ;	index to determine bounds while moving data
+*		IN size_t num_bytes ;	number of bytes that the data needs to 
+*					shrink by
+*
+*	Description : Shrink the size of the buffer depending on the current 
+*		size of the bufer and te input parameters. Move contents from the 
+*		old buffer to the new sized buffer.
+*
+*	Return : void ;
+*
+*	Note :
+************************************************************************/
+void
+membuffer_delete( INOUT membuffer * m,
+                  IN int index,
+                  IN size_t num_bytes )
 {
-	int return_value;
-	size_t new_length;
-	size_t copy_len;
+    int return_value;
+    int new_length;
+    size_t copy_len;

-	assert(m != NULL);
+    assert( m != NULL );

-	if (!m || !m->length)
-		return;
-	/* shrink count if it goes beyond buffer */
-	if (index + num_bytes > m->length) {
-		num_bytes = m->length - index;
-		/* every thing at and after index purged */
-		copy_len = 0;
-	} else {
-		/* calc num bytes after deleted string */
-		copy_len = m->length - (index + num_bytes);
-	}
-	memmove(m->buf + index, m->buf + index + num_bytes, copy_len);
-	new_length = m->length - num_bytes;
-	/* trim buffer */
-	return_value = membuffer_set_size(m, new_length);
-	/* shrinking should always work */
-	assert(return_value == 0);
+    if( m->length == 0 ) {
+        return;
+    }

-	/* don't modify until buffer is set */
-	m->length = new_length;
-	m->buf[new_length] = 0;
+    assert( index >= 0 && index < ( int )m->length );
+
+    // shrink count if it goes beyond buffer
+    if( index + num_bytes > m->length ) {
+        num_bytes = m->length - ( size_t ) index;
+        copy_len = 0;           // every thing at and after index purged
+    } else {
+        // calc num bytes after deleted string
+        copy_len = m->length - ( index + num_bytes );
+    }
+
+    memmove( m->buf + index, m->buf + index + num_bytes, copy_len );
+
+    new_length = m->length - num_bytes;
+    return_value = membuffer_set_size( m, new_length ); // trim buffer
+    assert( return_value == 0 );    // shrinking should always work
+
+    // don't modify until buffer is set
+    m->length = new_length;
+    m->buf[new_length] = 0;
 }

-char *membuffer_detach(membuffer *m)
+/************************************************************************
+*	Function :	membuffer_detach
+*
+*	Parameters :
+*		INOUT membuffer* m ; buffer to be returned and updated.	
+*
+*	Description : Detaches current buffer and returns it. The caller
+*		must free the returned buffer using free().
+*		After this call, length becomes 0.
+*
+*	Return : char* ;
+*		a pointer to the current buffer
+*
+*	Note :
+************************************************************************/
+char *
+membuffer_detach( INOUT membuffer * m )
 {
-	char *buf;
+    char *buf;

-	assert(m != NULL);
+    assert( m != NULL );

-	buf = m->buf;
+    buf = m->buf;

-	/* free all */
-	membuffer_initialize(m);
+    // free all
+    membuffer_initialize( m );

-	return buf;
+    return buf;
 }

-void membuffer_attach(membuffer *m, char *new_buf, size_t buf_len)
+/************************************************************************
+*	Function :	membuffer_attach
+*
+*	Parameters :
+*		INOUT membuffer* m ;	buffer to be updated
+*		IN char* new_buf ;	 source buffer which will be assigned to the 
+*					buffer to be updated
+*		IN size_t buf_len ;	length of the source buffer 
+*
+*	Description : Free existing memory in membuffer and assign the new 
+*		buffer in its place.
+*
+*	Return : void ;
+*
+*	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 )
 {
-	assert(m != NULL);
+    assert( m != NULL );

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

 /************************************************************************
 * Purpose: This file contains string to integer and integer to string 
@@ -48,7 +48,7 @@
 *					matched.
 *		IN int num_entries ; number of entries in the table that need 
 *					to be searched.
-*		IN int case_sensitive ; whether the case should be case
+*		IN xboolean case_sensitive ; whether the case should be case
 *					sensitive or not
 *
 *	Description : Match the given name with names from the entries in the 
@@ -65,7 +65,7 @@ map_str_to_int( IN const char *name,
                IN size_t name_len,
                IN str_int_entry * table,
                IN int num_entries,
-                IN int case_sensitive )
+                IN xboolean case_sensitive )
 {
    int top,
      mid,
@@ -82,24 +82,24 @@ map_str_to_int( IN const char *name,
    while( top <= bot ) {
        mid = ( top + bot ) / 2;
        if( case_sensitive ) {
-            /*cmp = strcmp( name, table[mid].name ); */
+            //cmp = strcmp( name, table[mid].name );
            cmp = memptr_cmp( &name_ptr, table[mid].name );
        } else {
-            /*cmp = strcasecmp( name, table[mid].name ); */
+            //cmp = strcasecmp( name, table[mid].name );
            cmp = memptr_cmp_nocase( &name_ptr, table[mid].name );
        }

        if( cmp > 0 ) {
-            top = mid + 1;      /* look below mid */
+            top = mid + 1;      // look below mid
        } else if( cmp < 0 ) {
-            bot = mid - 1;      /* look above mid */
-        } else                  /* cmp == 0 */
+            bot = mid - 1;      // look above mid
+        } else                  // cmp == 0
        {
-            return mid;         /* match; return table index */
+            return mid;         // match; return table index
        }
    }

-    return -1;                  /* header name not found */
+    return -1;                  // header name not found
 }

 /************************************************************************
--- a/Show More
+++ b/Show More