Tag for release 1.4.7, the release that never was.

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

ChangeLog

@@ -1,171 +1,3 @@
-*******************************************************************************
-Version 1.6.3
-*******************************************************************************
-
-2007-12-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Using pthread flags for the whole project, not just at the places
-	individually indicated by several Makefile.am files spread all over
-	the directories. That was too much error prone.
-
-2007-12-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added a configure test to check if pthread_rwlock_t is available.
-	Define _GNU_SOURCE if needed. The fallback behaviou will only be
-	implemented if _GNU_SOURCE prooves to be insufficient on some
-	platforms. Thanks to Jonathan Casiot (no_dice) and Robert Gingher
-	(robsbox).
-
-2007-12-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Removed unused iasnprintf.{c,h} files.
-
-2007-12-17 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Removed STATSONLY() macro from ThreadPool.{c,h}.
-	* Removed time() usage from ThreadPool.c.
-	* Fixed STATS = 0 compilation.
-
-2007-12-16 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Library was not compiling on FreeBSD 7. Code now no longer uses
-	ftime(), using gettimeofday() instead. Thanks to Josh Carroll.
-
-
-*******************************************************************************
-Version 1.6.2
-*******************************************************************************
-
-2007-12-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fixed a compilation error due to a missing #ifdef in
-	upnp/src/genlib/miniserver/miniserver.c. Thanks to Eugene Christensen.
-
-2007-11-12 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* "make check" was failing because ixml/test/test_document.sh did not
-	have the executable flag set. Thanks to Steve Bresson.
-
-2007-11-12 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fixed a memory leak in upnpapi.c to delete gMiniServerThreadPool in
-	the call to UpnpFinish(). Thanks to Fabrice Fontaine.
-
-2007-11-09 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added a isleep() call to the error handler of select() in
-	RunMiniServer(), so that it does not take 100% cpu in case select()
-	fails repeatedly.
-
-*******************************************************************************
-Version 1.6.1
-*******************************************************************************
-
-2007-11-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1825278 ] AdvertiseAndReply sleeps with handle lock out
-	Applied patch from Alex (afaucher) to change some write locks to read
-	locks.
-
-2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Adjusting libtool library numbers to reflect the last changes.
-
-2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1825278 ] AdvertiseAndReply sleeps with handle lock out
-	GlobalHndMutex, which was a mutex is now GlobalHndRWLock, which is a
-	rwlock. HandleLock() is mapped to HandleWriteLock() while all other
-	instances have not been checked. One instance in AdvertiseAndReply()
-	has been changed to HandleReadLock(). Thanks to Alex (afaucher) for the 
-	bug report and suggestions.
-
-2007-11-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Added support for rwlocks.
-
-2007-11-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1825929 ] woker thread still alive after UpnpFinish()
-	Submitted By: Luke Kim - nereusuj
-	Worker thread still alive after calling UpnpFinish() because
-	ThreadPoolShutdown() is in the #ifdef DEBUG block.
-	421
-	422 #ifdef DEBUG
-	423 ThreadPoolShutdown( &gSendThreadPool );
-	424 ThreadPoolShutdown( &gRecvThreadPool );
-
-2007-08-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Changed the calls to virtualDirCallback.open(filename, UPNP_WRITE)
-	to (virtualDirCallback.open)(filename, UPNP_WRITE) (notice the
-	parenthesis) due to a change in glibc that produces compilation
-	errors.
-
-2007-08-28 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Initialization of the "randomness" struct so that valgrind does not
-	complain.
-
-2007-08-06 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Merge of patch submitted By Keith Brindley - brindlk
-	SF Bug Tracker [ 1762758 ] Seek not working for large files
-	Problem:
-	Requests from the uPnP client to seek to a position beyond 2GB in a large
-	file are handled as a request to see from the 2GB point.
-
-	Impact:
-	Varies depending on client. The Xbox 360 kills the connection when it
-	realises.
-
-	Solution:
-	GetNextRange function (webserver.c) is updated to handle large file sizes.
-	Fix should also recognise when built on a 32bit platform rather than 64 and
-	handle accordingly.
-
-2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Merge of Mac OS X patch from St<53>phane Corth<74>sy (davelopper),
-	SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
-	Some of the proposed changes were already done by Rene Hexel's patch.
-
-*******************************************************************************
-Version 1.6.0
-*******************************************************************************
-
-2007-06-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* More fixes to Mac OS X and NetBSD from Rene Hexel:
-	[pupnp-devel] NetBSD & Mac OS X packages and patches
-
-	  Okay, I found a couple more things.  I have attached a patch file
-	against the trunk (version 206) that make the repository code compile
-	and run on both Mac OS X and NetBSD.
-
-	This fixes the following issues:
-
-	   upnp/src/api/upnpapi.c: SIOCGIFCONF didn't work properly, use
-	getifaddrs() instead (on BSD systems).
-
-	  threadutil/src/ThreadPool.c: priorities only work if
-	_POSIX_PRIORITY_SCHEDULING is defined (and greater than 0).
-
-	  threadutil/src/LinkedList.c and threadutil/src/iasnprintf.c: use
-	stdlib.h instead of malloc.h on all BSD systems (not just FreeBSD).
-	This is important, because malloc.h does not exist on Darwin/Mac OS X.
-
-	  Cheers
-	      ,
-	   Rene
-
-2007-06-09 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* [pupnp-devel] NetBSD & Mac OS X packages and patches.
-	Rene Hexel's <rh@netbsd.org> patch to compile in NetBSD and Mac OS X.
-
-2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Updated the macro files acx_pthread.m4, ax_cflags_gcc_option.m4,
-	ax_cflags_warn_all.m4, m4/ax_cflags_warn_all_ansi.m4,
-	m4/type_socklen_t.m4.
-
-2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Fixed an issue with the instalation of the file upnpdebug.h. Since
-	the last modifications that removed the macro DEBUV_ONLY, this file
-	must be installed even on a non-debug build.
-
-2007-05-26 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* SF Bug Tracker [ 1711325 ] Bad DestAddr in Upnp_Discovery structure
-	Submitted By: Bob Ciora
-	The field DestAddr of the structure Upnp_Discovery is now a full
-	SOCKADDRIN instead of a pointer to SOCKADDRIN. Commented code sugests
-	that in a previous moment, the function ssdp_handle_ctrlpt_msg() did
-	not use a postponed thread to call ctrlpt_callback(). Now the code
-	uses a thread, and most probably the original data would get lost and
-	the pointer would point to an invalid memory region. This fix caused
-	an interface change in the library and the minor library version was
-	bumped. Also, the libtool library numbers were changed accordingly.
-
 *******************************************************************************
 Version 1.4.7
 *******************************************************************************
@@ -387,7 +219,7 @@ Version 1.4.2
 2007-01-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 
 	* SF Tracker [ 1634922 ] Support for large files (>= 2 GiB), part 2
-	Submitted By: Jonathan Casiot - no_dice
+	Submitted By: Jonathan - no_dice
 	Summary: This patch hopefully fixes the remaining types and related
 	code to enable files >= 2 GiB to be streamed. Jonathan claims to have
 	tested this with a patched version of ushare-0.9.8 and a D-Link DSM-520.
@@ -532,14 +364,14 @@ Version 1.4.0
 FORK FROM DEAD libupnp
 *******************************************************************************
 
-2006-04-29  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-29  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* THANKS: new file with list of contributors
 
 	* upnp/src/gena/gena_device.c (respond_ok): add 'Content-Length: 0'
 	  in subscription response. Patch by Chaos (Bug # 1455367).
 
-2006-04-08  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-08  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/doc/UPnP_Programming_Guide.pdf: replace this document with 
 	  the one in libupnp-doc-1.2.1 because current CVS version 
@@ -550,20 +382,20 @@ FORK FROM DEAD libupnp
 	* changes applied to several files to work under Sparc Solaris, temporarily
 	  requiring a define SPARC_SOLARIS
 
-2006-04-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/Makefile.am: install upnp samples in $(docdir)/examples
 
-2006-03-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add --with-docdir option to choose where documentation
 	  is installed (or -without-docdir to not install the documentation)
 
-2006-03-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/test: add simple test suite for xml parser
 
-2006-03-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/ixmlparser.c (Parser_processCDSect): fix bug which prevents
 	  CDATA sections which contain a 0 (zero) to be parsed (instead the
@@ -574,18 +406,18 @@ FORK FROM DEAD libupnp
 	  option, and move samples compilation from check_PROGRAMS to
 	  noinst_PROGRAMS
 
-2006-03-25  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-25  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/genlib/miniserver/miniserver.c (get_miniserver_sockets): 
 	  fix bug if new socket created has fd 0 (can only occur when stdin
 	  has been closed). Patch by Oskar Liljeblad 2004-07-02 :
 	  http://sourceforge.net/mailarchive/message.php?msg_id=8870528
 	
-2006-03-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/test/test_init.c: add some version checks and exit if failure
 
-2006-03-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* libupnp version 1.3.1
 
@@ -600,11 +432,11 @@ FORK FROM DEAD libupnp
 	  dependencies between upnp and ixml / threadutil, so that programs 
 	  linking against upnp only still work.
 
-2006-03-04  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-04  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* libupnp version 1.3.0
 
-2006-03-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/genlib/net/http/httpreadwrite.c (get_sdk_info): use
 	  package version string from configure to set sdk info
@@ -612,7 +444,7 @@ FORK FROM DEAD libupnp
 	* upnp/Makefile.am: add sample/tvdevice/web/ files in EXTRA_DIST
 	  + do not distribute generated upnpconfig.h file.
 
-2006-02-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/inc/config.h, configure.ac: use only new defines
 	  UPNP_HAVE_xx instead of INCLUDE_yyy_APIS and INTERNAL_WEB_SERVER
@@ -621,7 +453,7 @@ FORK FROM DEAD libupnp
 	  the librarie LDFLAGS in order to export only the symbols defined 
 	  in the API
 
-2006-02-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add libtool versions for the 3 libraries
 
@@ -629,7 +461,7 @@ FORK FROM DEAD libupnp
 
 	* threadutil/src/ThreadPool.c (SetSeed): add missing 'static' 
 
-2006-02-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/inc/iasnprintf.h: add gcc __printf__ format attribute
 	  to "iasnprintf"
@@ -650,11 +482,11 @@ FORK FROM DEAD libupnp
 	  the configuration of the installed libraries (generates installed
 	  file <upnp/upnpconfig.h>)
 
-2006-02-22  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-22  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/ : add missing include of config.h in some .c files
 
-2006-02-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/upnp.h: move some definitions which should not be
 	  exported into "upnp/src/inc/util.h"
@@ -662,12 +494,12 @@ FORK FROM DEAD libupnp
 	* import all modifications below from libupnp in djmount 0.51
 	  into official libupnp
 	
-2006-01-17  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-17  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/Makefile.am (libthreadutil_la_SOURCES): remove extraneous
 	  file
 
-2006-01-15  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-15  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* configure.ac: add checks for large-file support
 
@@ -687,53 +519,53 @@ FORK FROM DEAD libupnp
 	* ixml/src/node.c (ixmlNode_getNodeType): fix compilation warning
 	  on const return type
 
-2006-01-12  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-12  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/inc/readwrite.h : suppress unused C++ header file
 
-2006-01-11  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-11  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/config.h, upnp/src/inc/upnpapi.h, 
 	  upnp/src/inc/httpreadwrite.h: remove internal configuration variable 
 	  MINIMUM_DELAY (no clear purpose)
 
-2005-12-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-12-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/upnp.h: re-declare obsolete method UpnpSetContentLength,
 	  for binary compatibility with previous libupnp version.
 
 	* upnp/src/api/upnpapi.c: correct type of g_maxContentLength to size_t
 
-2005-11-01  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-11-01  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* autoconfiscate library : replace all makefiles by Makefile.am
 	  for automake support, + preliminary autoconf support
 	  (generated config.h not yet used in source files)
 
-2005-10-18  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-18  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/makefile: fix location of DEBUG STATIC libupnp library
 	
 	* upnp/sample/tvctrlpt/linux/Makefile, 
 	  upnp/sample/tvdevice/linux/Makefile: fix STATIC library support
 
-2005-10-16  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-16  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* threadutil/src/Makefile (clean): remove built library
 
-2005-08-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/ixml.h, ixml/src/ixml.c (ixmlRelaxParser) : new function
 
 	* ixml/src/ixmlparser.h, ixml/src/ixmlparser.c (Parser_setErrorChar) :
 	  new function
 
-2005-08-02  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-02  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/Makefile: correct bug for static library being incorrectly 
 	  stripped when building non-debug
 
-2005-06-09  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-06-09  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* ixml/src/element.c (ixmlElement_removeAttributeNode): 
 	  remove some compilation warning
@@ -744,7 +576,7 @@ FORK FROM DEAD libupnp
 	* upnp/inc/upnptools.h, upnp/src/api/upnptools.c : 
 	  add missing const's in public API
 
-2005-05-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/inc/config.h: suppress HTTP_READ_BYTES (unused)
 	  and replace by DEFAULT_SOAP_CONTENT_LENGTH (previously in upnpapi.h)
@@ -765,7 +597,7 @@ FORK FROM DEAD libupnp
 	* upnp/src/genlib/net/http/httpreadwrite.c : corrected an incorrect
 	  sprintf format
 	
-2005-05-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/makefile, upnp/src/makefile, 
 	  ixml/Makefile, ixml/src/Makefile, 
@@ -773,7 +605,7 @@ FORK FROM DEAD libupnp
 	  implement STATIC library support (from patch at 
 	  http://sourceforge.net/tracker/?group_id=7189&atid=307189 )
 
-2005-05-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
 
 	* upnp/src/api/upnpapi.c, upnp/src/soap/soap_device.c,
 	  upnp/src/soap/makefile : 

Makefile.am

@@ -1,7 +1,8 @@
+
 #
 # Top-level "Makefile.am" for libupnp
 #
-# Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 ACLOCAL_AMFLAGS = -I m4

README

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

THANKS

@@ -6,9 +6,7 @@ suggesting various improvements or submitting actual code.
 Here is a list of these people. Help us keep it complete and
 exempt of errors.
 
-- Alex (afaucher)
 - Arno Willig
-- Bob Ciora
 - Chaos
 - Craig Nelson
 - David Maass
@@ -16,29 +14,21 @@ exempt of errors.
 - Erik Johansson
 - Eric Tanguy
 - Erwan Velu
-- Eugene Christensen
-- Fabrice Fontaine
 - Fredrik Svensson
 - Glen Masgai
 - Jiri Zouhar
 - John Dennis
-- Jonathan Casiot (no_dice)
-- Josh Carroll
-- Keith Brindley
+- Jonathan (no_dice)
 - Leuk_He
 - Loigu
 - Luke Kim
-- Marcelo Roberto Jimenez (mroberto)
+- Marcelo Roberto Jimenez
 - Markus Strobl
-- Nektarios K. Papadopoulos (npapadop)
+- Nektarios K. Papadopoulos
 - Oskar Liljeblad
-- Michael (oxygenic)
+- Michael (Oxy)
 - Paul Vixie
-- Rene Hexel
-- Robert Gingher (robsbox)
 - Siva Chandran
-- Stéphane Corthésy
-- Steve Bresson
 - Timothy Redaelli
 - Titus Winters
 

build/inc/config.h

@@ -261,7 +261,7 @@
 
 /** @name Other debugging features
           The UPnP SDK contains other features to aid in debugging:
-	  see <upnp/inc/upnpdebug.h>
+	  see <upnp/upnpdebug.h>
  */
 
 #define DEBUG_ALL		1   

build/inc/upnpconfig.h

@@ -2,7 +2,7 @@
 // -*- C -*-
 ///////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+// Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
 // All rights reserved. 
 //
 // Redistribution and use in source and binary forms, with or without 

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<>ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f<>hren Sie den Befehl
 !MESSAGE 
 !MESSAGE NMAKE /f "libupnp.mak".
 !MESSAGE 
-!MESSAGE Sie k<>nnen beim Ausf<73>hren von NMAKE eine Konfiguration angeben
+!MESSAGE Sie k<>nnen beim Ausf<73>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<>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")

configure.ac

@@ -4,130 +4,49 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# (C) Copyright 2005-2007 R<>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005-2006 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 AC_PREREQ(2.60)
 
-AC_INIT([libupnp], [1.6.3], [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:
-dnl # "current:revision:age" (this is NOT the same as the package version),
-dnl # where:
-dnl # 	- library code modified:		revision++
-dnl # 	- interfaces changed/added/removed:	current++ and revision=0
-dnl # 	- interfaces added: 			age++
-dnl # 	- interfaces removed:			age=0
-dnl # *please update only once, before a formal release, not for each change*
-dnl #
-dnl ############################################################################
-dnl # Release 1.4.1:
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:2:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [2:2:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.4.6:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in ixml
-dnl #	revision: 2 -> 3
-dnl # - Code has changed in threadutil
-dnl #	revision: 2 -> 3
-dnl # - Interface added in threadutil
-dnl #	current: 2 -> 3
-dnl #	revisiion: 3 -> 0
-dnl #	age: 0 -> 1
-dnl # - Code has changed in upnp
-dnl #	revision: 2 -> 3
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:3:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [2:3:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.0:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in ixml
-dnl #	revision: 3 -> 4
-dnl # - Code has changed in threadutil
-dnl #	revision: 0 -> 1
-dnl # - Code has changed in upnp
-dnl #	revision: 3 -> 4
-dnl # - Interface changed in upnp
-dnl #	current: 2 -> 3
-dnl #	revision: 4 -> 0
-dnl # - Interface removed in upnp
-dnl #	age: 0 -> 0
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [3:1:1])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:0:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.1:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 1 -> 2
-dnl # - Interface added in threadutil
-dnl #	current: 3 -> 4
-dnl #	revision: 2 -> 0
-dnl # - Interface added in threadutil
-dnl #	age: 1 -> 2
-dnl # - Code has changed in upnp
-dnl #	revision: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:1:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.2:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in upnp
-dnl #	revision: 1 -> 2
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:0:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
-dnl #
-dnl ############################################################################
-dnl # Release 1.6.3:
-dnl # "current:revision:age"
-dnl #
-dnl # - Code has changed in threadutil
-dnl #	revision: 0 -> 1
-dnl #
-dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2])
-dnl #AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
-dnl #
-dnl ############################################################################
-AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2])
-AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
-dnl ############################################################################
-dnl # Repeating the algorithm to place it closer to the modificatin place:
-dnl # 	- library code modified:		revision++
-dnl # 	- interfaces changed/added/removed:	current++ and revision=0
-dnl # 	- interfaces added: 			age++
-dnl # 	- interfaces removed:			age=0
-dnl # *please update only once, before a formal release, not for each change*
-dnl ############################################################################
+AC_INIT([libupnp], [1.4.7], [mroberto@users.sourceforge.net])
+# *Independently* of the above libupnp package version, the libtool version
+# of the 3 libraries need to be updated whenever there is a change released :
+# "current:revision:age" (this is NOT the same as the package version), where:
+# 	- library code modified:		revision++
+# 	- interfaces changed/added/removed:	current++ and revision=0
+# 	- interfaces added: 			age++
+# 	- interfaces removed:			age=0
+# *please update only once, before a formal release, not for each change*
+#
+# For release 1.4.1, we had:
+#AC_SUBST([LT_VERSION_IXML],       [2:2:0])
+#AC_SUBST([LT_VERSION_THREADUTIL], [2:2:0])
+#AC_SUBST([LT_VERSION_UPNP],       [2:2:0])
+#
+# "current:revision:age"
+#
+# - Code has changed in ixml
+#	revision: 2 -> 3
+# - Code has changed in threadutil
+#	revision: 2 -> 3
+# - Interface added in threadutil
+#	current: 2 -> 3
+#	revisiion: 3 -> 0
+#	age: 0 -> 1
+# - Code has changed in upnp (revision 2 -> 3)
+#	revision: 2 -> 3
+AC_SUBST([LT_VERSION_IXML],       [2:3:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [3:0:1])
+AC_SUBST([LT_VERSION_UPNP],       [2:3:0])
 
 
 AC_CONFIG_AUX_DIR(config.aux)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_SRCDIR(upnp/inc/upnp.h)
 
-
 AM_INIT_AUTOMAKE([1.8 -Wall foreign subdir-objects dist-bzip2])
 
-
 #
 # Get canonical host names in host and host_os
 #
@@ -152,7 +71,8 @@ AC_REVISION([$Revision: 1.11 $])
 upnpmaj=`echo "$PACKAGE_VERSION" | sed 's/\..*//' `
 upnpmin=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.// ; s/[^0-9].*$//' `]
 upnppatch=[`echo "$PACKAGE_VERSION" | sed 's/^[^.]\.[^.]\.// ; s/[^0-9].*$//' `]
-AC_DEFINE_UNQUOTED([UPNP_VERSION_STRING], "$PACKAGE_VERSION", [see upnpconfig.h])
+AC_DEFINE_UNQUOTED([UPNP_VERSION_STRING], "$PACKAGE_VERSION",
+	[see upnpconfig.h])
 AC_DEFINE_UNQUOTED([UPNP_VERSION_MAJOR], $upnpmaj, [see upnpconfig.h])
 AC_DEFINE_UNQUOTED([UPNP_VERSION_MINOR], $upnpmin, [see upnpconfig.h])
 AC_DEFINE_UNQUOTED([UPNP_VERSION_PATCH], $upnppatch, [see upnpconfig.h])
@@ -174,6 +94,7 @@ fi
 #
 # Check for libupnp subsets
 #
+
 RT_BOOL_ARG_ENABLE([client], [yes], [control point code (client)])
 if test "x$enable_client" = xyes ; then
 	AC_DEFINE(UPNP_HAVE_CLIENT, 1, [see upnpconfig.h])
@@ -207,13 +128,11 @@ fi
 RT_BOOL_ARG_ENABLE([samples], [yes], [compilation of upnp/sample/ code])
 
 
-#
 # doc installation
 # autoconf >= 2.60 already defines ${docdir}, but we will not use its 
 # default value, which is ${datarootdir}/doc/${PACKAGE_TARNAME}.
 # That would give us ${datarootdir}/doc/libupnp, and we want the package
 # version on that.
-#
 docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 AC_MSG_CHECKING([for documentation directory])
 AC_ARG_WITH(
@@ -228,9 +147,7 @@ AS_HELP_STRING(
 	[],
 	[with_documentation=no])
 
-#
 # If something has been entered after an equal sign, assume it is the directory
-#
 if test x"$with_documentation" != xyes -a x"$with_documentation" != xno; then
 	docdir="$with_documentation"
 fi
@@ -316,6 +233,7 @@ AC_CHECK_HEADERS(
 # Checks for typedefs, structures, and compiler characteristics
 #	
 AC_C_CONST
+AC_TYPE_SIZE_T
 TYPE_SOCKLEN_T
 
 
@@ -330,40 +248,9 @@ AC_CHECK_FUNCS(ftime,, [AC_CHECK_LIB(compat, ftime)])
 #
 # Checks for POSIX Threads
 #
-echo "--------------------------- pthread stuff -------------------------------------"
 ACX_PTHREAD(
 	[],
 	[AC_MSG_ERROR([POSIX threads are required to build this program])])
-#
-# Update environment variables for pthreads
-#
-CC="$PTHREAD_CC"
-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-LIBS="$PTHREAD_LIBS $LIBS"
-#
-# Determine if pthread_rwlock_t is available
-#
-echo "----------------------- pthread_rwlock_t stuff --------------------------------"
-AC_MSG_CHECKING([if pthread_rwlock_t is available])
-AC_LANG([C])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[#include <pthread.h>],
-		[pthread_rwlock_t *x;])],
-	[AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
-		AC_MSG_RESULT([yes, supported without any options])],
-	[AC_COMPILE_IFELSE(
-		[AC_LANG_PROGRAM(
-			[#define _GNU_SOURCE
-			#include <pthread.h>],
-			[pthread_rwlock_t *x;])],
-		[AC_DEFINE([UPNP_USE_RWLOCK], [1], [Use pthread_rwlock_t])
-			CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-			AC_MSG_RESULT([yes, definition of _GNU_SOURCE required])],
-		[AC_DEFINE([UPNP_USE_RWLOCK], [0], [Do not use pthread_rwlock_t])
-			AC_MSG_RESULT([no, needs to fallback to pthread_mutex])
-			AC_MSG_ERROR([pthread_rwlock_t not available])])])
-echo "-------------------------------------------------------------------------------"
 
 
 AC_CONFIG_FILES([

ixml/src/inc/ixmlmembuf.h

@@ -38,7 +38,11 @@
 #define MINVAL( a, b ) ( (a) < (b) ? (a) : (b) )
 #define MAXVAL( a, b ) ( (a) > (b) ? (a) : (b) )
 
-#define MEMBUF_DEF_SIZE_INC 20
+#ifndef WIN32
+ #define	UPNP_INLINE inline
+#endif
+
+#define MEMBUF_DEF_SIZE_INC		20
 
 
 typedef struct // ixml_membuf 

ixml/src/ixmlparser.c

@@ -501,22 +501,17 @@ Parser_init(  )
 }
 
 /*================================================================
- * Parser_isValidEndElement
- *	check if a new node->nodeName matches top of element stack.
- *	Internal to parser only.
- *=================================================================*/
+*   Parser_isValidEndElement
+*       check if a new node->nodeName matches top of element stack.
+*       Internal to parser only.
+*
+*=================================================================*/
 static int
-Parser_isValidEndElement(
-	IN Parser * xmlParser,
-	IN IXML_Node * newNode )
+Parser_isValidEndElement( IN Parser * xmlParser,
+                          IN IXML_Node * newNode )
 {
-    assert( xmlParser );
-    assert( xmlParser->pCurElement );
-    assert( xmlParser->pCurElement->element );
-    assert( newNode );
-    assert( newNode->nodeName );
-
-    return strcmp( xmlParser->pCurElement->element, newNode->nodeName ) == 0;
+    return ( strcmp( xmlParser->pCurElement->element, newNode->nodeName )
+             == 0 );
 }
 
 /*===============================================================
@@ -926,8 +921,6 @@ Parser_parseDocument( OUT IXML_Document ** retDoc,
     int rc = IXML_SUCCESS;
     IXML_CDATASection *cdataSecNode = NULL;
 
-    // It is important that the node gets initialized here, otherwise things
-    // can go wrong on the error handler.
     ixmlNode_init( &newNode );
 
     rc = ixmlDocument_createDocumentEx( &gRootDoc );
@@ -943,9 +936,7 @@ Parser_parseDocument( OUT IXML_Document ** retDoc,
     }
 
     while( bETag == FALSE ) {
-        // clear the newNode contents. Redundant on the first iteration,
-	// but nonetheless, necessary due to the possible calls to
-	// ErrorHandler above. Currently, this is just a memset to zero.
+        // clear the newNode contents
         ixmlNode_init( &newNode );
 
         if( Parser_getNextNode( xmlParser, &newNode, &bETag ) ==
@@ -1039,7 +1030,7 @@ Parser_parseDocument( OUT IXML_Document ** retDoc,
     Parser_free( xmlParser );
     return rc;
 
-ErrorHandler:
+  ErrorHandler:
     Parser_freeNodeContent( &newNode );
     ixmlDocument_free( gRootDoc );
     Parser_free( xmlParser );
@@ -2506,4 +2497,3 @@ Parser_getNextNode( IN Parser * xmlParser,
     return IXML_SYNTAX_ERR;
 
 }
-

libupnp.pc.in

@@ -9,3 +9,4 @@ Version: @VERSION@
 Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
 Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
 
+

libupnp.spec

@@ -1,4 +1,4 @@
-Version: 1.6.2
+Version: 1.4.7
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 1%{?dist}
@@ -77,9 +77,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf %{buildroot}
 
 %changelog
-* Mon Nov 19 2007 Marcelo Jimenez <mroberto@users.sourceforge.net> - 1.6.2-1
-- Update to version 1.6.2
-
 * Mon Nov 19 2007 Marcelo Jimenez <mroberto@users.sourceforge.net> - 1.4.7-1
 - Update to version 1.4.7
 

m4/acx_pthread.m4

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

m4/ax_cflags_gcc_option.m4

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

m4/ax_cflags_warn_all.m4

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

m4/ax_cflags_warn_all_ansi.m4

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

m4/type_socklen_t.m4

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

threadutil/Makefile.am

@@ -6,6 +6,7 @@
 #
 
 AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
+AM_CFLAGS		= $(PTHREAD_CFLAGS)
 
 if ENABLE_DEBUG
     AM_CPPFLAGS		+= -DDEBUG -DSTATS
@@ -20,11 +21,12 @@ libthreadutil_la_LDFLAGS = -version-info $(LT_VERSION_THREADUTIL)
 
 libthreadutil_la_SOURCES = \
 			src/FreeList.c src/LinkedList.c \
-			src/ThreadPool.c src/TimerThread.c
+			src/ThreadPool.c src/TimerThread.c \
+			src/iasnprintf.c
 
 upnpincludedir		= $(includedir)/upnp
 upnpinclude_HEADERS	= \
 			inc/FreeList.h inc/LinkedList.h \
 			inc/ThreadPool.h inc/TimerThread.h \
-			inc/ithread.h
+			inc/iasnprintf.h inc/ithread.h
 

threadutil/inc/ThreadPool.h

@@ -32,12 +32,6 @@
 #ifndef THREADPOOL_H
 #define THREADPOOL_H
 
-#ifdef UPNP_USE_MSVCPP
-	#define UPNP_INLINE
-#else
-	#define UPNP_INLINE inline
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -70,23 +64,32 @@ typedef enum priority {LOW_PRIORITY,
 #define DEFAULT_FREE_ROUTINE NULL     /* default free routine used TPJobInit */
 #define DEFAULT_MAX_JOBS_TOTAL 100    /* default max jobs used TPAttrInit */
 
+#define STATS 1 /* always include stats because code change is minimal */
+
+
 /* Statistics */
-/* always include stats because code change is minimal */
-#define STATS 1
+#ifdef WIN32 /* TODO: check why STATSONLY fails during compilation */
+	#undef STATS
+#endif
+
+#ifdef STATS
+	#define STATSONLY(x) x
+#else
+	#define STATSONLY(x)
+#endif
 
 #ifdef _DEBUG
 	#define DEBUG 1
 #endif
 
 #include "LinkedList.h"
-#include <sys/time.h> /* for gettimeofday() */
+#include <sys/timeb.h>
 #include "FreeList.h"
 
 #include "ithread.h"
 #include <errno.h>
-
+#include <sys/timeb.h>
 #define EXPORT
-
 typedef int PolicyType;
 #define DEFAULT_POLICY SCHED_OTHER
 #define DEFAULT_SCHED_PARAM 0 /* default priority */
@@ -108,28 +111,26 @@ typedef void (*free_routine)(void *arg);
  *****************************************************************************/
 typedef struct THREADPOOLATTR
 {
-	/* minThreads, ThreadPool will always maintain at least this many threads */
-	int minThreads;
+  int minThreads;     /* minThreads, ThreadPool will always maintain at least
+                         this many threads */
 
-	/* maxThreads, ThreadPool will never have more than this number of threads */
-	int maxThreads;
+  int maxThreads;     /* maxThreads, ThreadPool will never have more than this
+                         number of threads */
 
-	/* maxIdleTime (in milliseconds) this is the maximum time a thread will
-	 * remain idle before dying */
-	int maxIdleTime;
+  int maxIdleTime;    /* maxIdleTime (in milliseconds)
+                         this is the maximum time a thread will remain idle
+                         before dying */
 
-	/* jobs per thread to maintain */
-	int jobsPerThread;
+  int jobsPerThread;  /* jobs per thread to maintain */
 
-	/* maximum number of jobs that can be queued totally. */
-	int maxJobsTotal;
+  int maxJobsTotal;   /* maximum number of jobs that can be queued totally. */
 
-	/* the time a low priority or med priority job waits before getting bumped
-	 * up a priority (in milliseconds) */
-	int starvationTime;
+  int starvationTime; /* the time a low priority or med priority
+	                 job waits before getting bumped
+                         up a priority (in milliseconds) */
+
+  PolicyType schedPolicy; /* scheduling policy to use */
 
-	/* scheduling policy to use */
-	PolicyType schedPolicy;
 } ThreadPoolAttr;
 
 /****************************************************************************
@@ -140,12 +141,12 @@ typedef struct THREADPOOLATTR
  *****************************************************************************/
 typedef struct THREADPOOLJOB
 {
-	start_routine func;
-	void *arg;
-	free_routine free_func;
-	struct timeval requestTime;
-	int priority;
-	int jobId;
+  start_routine func;
+  void *arg;
+  free_routine free_func;
+  struct timeb requestTime;
+  int priority;
+  int jobId;
 } ThreadPoolJob;
 
 /****************************************************************************
@@ -155,28 +156,32 @@ typedef struct THREADPOOLJOB
  *     Structure to hold statistics
  *****************************************************************************/
 
+#ifdef STATS
+
 typedef struct TPOOLSTATS
 {
-	double totalTimeHQ;
-	int totalJobsHQ;
-	double avgWaitHQ;
-	double totalTimeMQ;
-	int totalJobsMQ;
-	double avgWaitMQ;
-	double totalTimeLQ;
-	int totalJobsLQ;
-	double avgWaitLQ;
-	double totalWorkTime;
-	double totalIdleTime;
-	int workerThreads;
-	int idleThreads;
-	int persistentThreads;
-	int totalThreads;
-	int maxThreads;
-	int currentJobsHQ;
-	int currentJobsLQ;
-	int currentJobsMQ;
-} ThreadPoolStats;
+  double totalTimeHQ;
+  int totalJobsHQ;
+  double avgWaitHQ;
+  double totalTimeMQ;
+  int totalJobsMQ;
+  double avgWaitMQ;
+  double totalTimeLQ;
+  int totalJobsLQ;
+  double avgWaitLQ;
+  double totalWorkTime;
+  double totalIdleTime;
+  int workerThreads;
+  int idleThreads;
+  int persistentThreads;
+  int totalThreads;
+  int maxThreads;
+  int currentJobsHQ;
+  int currentJobsLQ;
+  int currentJobsMQ;
+}ThreadPoolStats;
+
+#endif
 
 
 /****************************************************************************
@@ -201,24 +206,27 @@ typedef struct TPOOLSTATS
 
 typedef struct THREADPOOL
 {
-	ithread_mutex_t mutex; /* mutex to protect job qs */
-	ithread_cond_t condition; /* condition variable to signal Q */
-	ithread_cond_t start_and_shutdown; /* condition variable for start 
-					and stop */
-	int lastJobId; /* ids for jobs */
-	int shutdown;  /* whether or not we are shutting down */
-	int totalThreads;      /* total number of threads */
-	int 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 */
+  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 */
+  ThreadPoolAttr attr; /* thread pool attributes */
+  
+#ifdef STATS
+  /* statistics */
+  ThreadPoolStats stats;
+#endif
  
-	/* statistics */
-	ThreadPoolStats stats;
 } ThreadPool;
 
 
@@ -259,7 +267,8 @@ typedef struct THREADPOOL
  *      INVALID_POLICY if schedPolicy can't be set
  *      EMAXTHREADS if minimum threads is greater than maximum threads
  *****************************************************************************/
-int ThreadPoolInit(ThreadPool *tp, ThreadPoolAttr *attr);
+int ThreadPoolInit(ThreadPool *tp,
+  ThreadPoolAttr *attr);
 
 /****************************************************************************
  * Function: ThreadPoolAddPersistent
@@ -281,7 +290,9 @@ int ThreadPoolInit(ThreadPool *tp, ThreadPoolAttr *attr);
  *      EOUTOFMEM not enough memory to add job.
  *      EMAXTHREADS not enough threads to add persistent job.
  *****************************************************************************/
-int ThreadPoolAddPersistent(ThreadPool*tp, ThreadPoolJob *job, int *jobId);
+int ThreadPoolAddPersistent (ThreadPool*tp,
+  ThreadPoolJob *job,
+  int *jobId);
 
 /****************************************************************************
  * Function: ThreadPoolGetAttr
@@ -296,7 +307,8 @@ int ThreadPoolAddPersistent(ThreadPool*tp, ThreadPoolJob *job, int *jobId);
  *      0 on success, nonzero on failure
  *      Always returns 0.
  *****************************************************************************/
-int ThreadPoolGetAttr(ThreadPool *tp, ThreadPoolAttr *out);
+int ThreadPoolGetAttr(ThreadPool *tp,
+  ThreadPoolAttr *out);
 /****************************************************************************
  * Function: ThreadPoolSetAttr
  *
@@ -310,7 +322,8 @@ int ThreadPoolGetAttr(ThreadPool *tp, ThreadPoolAttr *out);
  *      0 on success, nonzero on failure
  *      Returns INVALID_POLICY if policy can not be set.
  *****************************************************************************/
-int ThreadPoolSetAttr(ThreadPool *tp, ThreadPoolAttr *attr);
+int ThreadPoolSetAttr(ThreadPool *tp,
+  ThreadPoolAttr *attr);
 
 /****************************************************************************
  * Function: ThreadPoolAdd
@@ -329,7 +342,9 @@ int ThreadPoolSetAttr(ThreadPool *tp, ThreadPoolAttr *attr);
  *      0 on success, nonzero on failure
  *      EOUTOFMEM if not enough memory to add job.
  *****************************************************************************/
-int ThreadPoolAdd (ThreadPool*tp, ThreadPoolJob *job, int *jobId);
+int ThreadPoolAdd (ThreadPool*tp,
+  ThreadPoolJob *job,
+  int *jobId);
 
 /****************************************************************************
  * Function: ThreadPoolRemove
@@ -346,7 +361,8 @@ int ThreadPoolAdd (ThreadPool*tp, ThreadPoolJob *job, int *jobId);
  *      0 on success, nonzero on failure.
  *      INVALID_JOB_ID if job not found. 
  *****************************************************************************/
-int ThreadPoolRemove(ThreadPool *tp, int jobId, ThreadPoolJob *out);
+int ThreadPoolRemove(ThreadPool *tp,
+  int jobId, ThreadPoolJob *out);
 
 
 
@@ -409,6 +425,7 @@ int TPJobSetPriority(ThreadPoolJob *job, ThreadPriority priority);
  *****************************************************************************/
 int TPJobSetFreeFunction(ThreadPoolJob *job, free_routine func);
 
+
 /****************************************************************************
  * Function: TPAttrInit
  *
@@ -530,10 +547,6 @@ int TPAttrSetMaxJobsTotal(ThreadPoolAttr *attr, int maxJobsTotal);
 	EXPORT int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats);
 
 	EXPORT void ThreadPoolPrintStats(ThreadPoolStats *stats);
-#else
-	static UPNP_INLINE int ThreadPoolGetStats(ThreadPool *tp, ThreadPoolStats *stats) {}
-
-	static UPNP_INLINE void ThreadPoolPrintStats(ThreadPoolStats *stats) {}
 #endif
 
 #ifdef __cplusplus

threadutil/inc/iasnprintf.h

@@ -0,0 +1,66 @@
+/*******************************************************************************
+ *
+ * Copyright (c) 2000-2003 Intel Corporation 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met: 
+ *
+ * * Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * * Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * * Neither name of Intel Corporation nor the names of its contributors 
+ * may be used to endorse or promote products derived from this software 
+ * without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************/
+
+#include <stdarg.h>
+
+#define EXPORT
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Allocates enough memory for the
+ * Formatted string, up to max
+ * specified.
+ * With max set to -1, allocates
+ * as much size as needed.
+ * Memory must be freed using free.
+ */
+
+EXPORT int iasnprintf(char **ret,
+	       int incr,
+	       int max,
+	       const char * fmt, ...)
+#ifndef SPARC_SOLARIS
+ #if (__GNUC__ >= 3)
+	__attribute__((format (__printf__, 4, 5)));
+ #else
+ ;
+ #endif
+ EXPORT void iasnprintfFree(char *);
+#else
+;
+#endif
+
+#ifdef __cplusplus
+}
+#endif

threadutil/inc/ithread.h

@@ -42,158 +42,131 @@ extern "C" {
 #endif
 
 #ifdef __FreeBSD__
-	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
 #endif
 
 #ifdef PTHREAD_MUTEX_RECURSIVE
-	/* This system has SuS2-compliant mutex attributes.
-	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
-	 */
-	#define ITHREAD_MUTEX_FAST_NP       PTHREAD_MUTEX_NORMAL
-	#define ITHREAD_MUTEX_RECURSIVE_NP  PTHREAD_MUTEX_RECURSIVE
-	#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK
-#else /* PTHREAD_MUTEX_RECURSIVE */
-	#define ITHREAD_MUTEX_FAST_NP       PTHREAD_MUTEX_FAST_NP
-	#define ITHREAD_MUTEX_RECURSIVE_NP  PTHREAD_MUTEX_RECURSIVE_NP
-	#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK_NP
-#endif /* PTHREAD_MUTEX_RECURSIVE */
-
-
-#define ITHREAD_PROCESS_PRIVATE PTHREAD_PROCESS_PRIVATE
-#define ITHREAD_PROCESS_SHARED  PTHREAD_PROCESS_SHARED
-
+/* This system has SuS2-compliant mutex attributes.
+ * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
+ */
+#define ITHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_NORMAL
+#define ITHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK
+#else
+#define ITHREAD_MUTEX_FAST_NP PTHREAD_MUTEX_FAST_NP
+#define ITHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE_NP
+#define ITHREAD_MUTEX_ERRORCHECK_NP PTHREAD_MUTEX_ERRORCHECK_NP
+#endif
 
 #define ITHREAD_CANCELED PTHREAD_CANCELED
 
   
-/***************************************************************************
- * Name: ithread_t
- *
- *  Description:
- *      Thread handle.
- *      typedef to pthread_t.
- *      Internal Use Only.
- ***************************************************************************/
-typedef pthread_t ithread_t; 
+  /***************************************************************************
+   * Name: ithread_t
+   *
+   *  Description:
+   *      Thread handle.
+   *      typedef to pthread_t.
+   *      Internal Use Only.
+   ***************************************************************************/
+  typedef pthread_t ithread_t; 
   
-/****************************************************************************
- * Name: ithread_attr_t
- *
- *  Description:
- *      Thread attribute.
- *      typedef to pthread_attr_t
- *      Internal Use Only
- ***************************************************************************/
-typedef pthread_attr_t ithread_attr_t;	
+  /****************************************************************************
+   * Name: ithread_attr_t
+   *
+   *  Description:
+   *      Thread attribute.
+   *      typedef to pthread_attr_t
+   *      Internal Use Only
+   ***************************************************************************/
+  typedef pthread_attr_t ithread_attr_t;	
 
 
-/****************************************************************************
- * Name: start_routine
- *
- *  Description:
- *      Thread start routine 
- *      Internal Use Only.
- ***************************************************************************/
-typedef void * (*start_routine) (void *arg);
+  /****************************************************************************
+   * Name: start_routine
+   *
+   *  Description:
+   *      Thread start routine 
+   *      Internal Use Only.
+   ***************************************************************************/
+  typedef void * (*start_routine) (void *arg);
 
   
-/****************************************************************************
- * Name: ithread_cond_t
- *
- *  Description:
- *      condition variable.
- *      typedef to pthread_cond_t
- *      Internal Use Only.
- ***************************************************************************/
-typedef pthread_cond_t ithread_cond_t;
+  /****************************************************************************
+   * Name: ithread_cond_t
+   *
+   *  Description:
+   *      condition variable.
+   *      typedef to pthread_cond_t
+   *      Internal Use Only.
+   ***************************************************************************/
+  typedef pthread_cond_t ithread_cond_t;
 
 
-/****************************************************************************
- * Name: ithread_mutexattr_t
- *
- *  Description:
- *      Mutex attribute.
- *      typedef to pthread_mutexattr_t
- *      Internal Use Only
- ***************************************************************************/
-typedef pthread_mutexattr_t ithread_mutexattr_t;	
+  /****************************************************************************
+   * Name: ithread_mutexattr_t
+   *
+   *  Description:
+   *      Mutex attribute.
+   *      typedef to pthread_mutexattr_t
+   *      Internal Use Only
+   ***************************************************************************/
+  typedef pthread_mutexattr_t ithread_mutexattr_t;	
 
 
-/****************************************************************************
- * Name: ithread_mutex_t
- *
- *  Description:
- *      Mutex.
- *      typedef to pthread_mutex_t
- *      Internal Use Only.
- ***************************************************************************/
-typedef pthread_mutex_t ithread_mutex_t;
+  /****************************************************************************
+   * Name: ithread_mutex_t
+   *
+   *  Description:
+   *      Mutex.
+   *      typedef to pthread_mutex_t
+   *      Internal Use Only.
+   ***************************************************************************/
+  typedef pthread_mutex_t ithread_mutex_t;
 
 
-/****************************************************************************
- * Name: ithread_condattr_t
- *
- *  Description:
- *      Condition attribute.
- *      typedef to pthread_condattr_t
- *      NOT USED
- *      Internal Use Only
- ***************************************************************************/
-typedef pthread_condattr_t ithread_condattr_t;	
+  /****************************************************************************
+   * Name: ithread_condattr_t
+   *
+   *  Description:
+   *      Condition attribute.
+   *      typedef to pthread_condattr_t
+   *      NOT USED
+   *      Internal Use Only
+   ***************************************************************************/
+  typedef pthread_condattr_t ithread_condattr_t;	
 
+  /****************************************************************************
+   * Function: ithread_mutexattr_init
+   *
+   *  Description:
+   *      Initializes a mutex attribute variable.
+   *      Used to set the type of the mutex.
+   *  Parameters:
+   *      ithread_mutexattr_init * attr (must be valid non NULL pointer to 
+   *                                     pthread_mutexattr_t)
+   *  Returns:
+   *      0 on success, Nonzero on failure.
+   *      Always returns 0.
+   *      See man page for pthread_mutexattr_init
+   ***************************************************************************/
   
-/****************************************************************************
- * Name: ithread_rwlockattr_t
- *
- *  Description:
- *      Mutex attribute.
- *      typedef to pthread_rwlockattr_t
- *      Internal Use Only
- ***************************************************************************/
-typedef pthread_rwlockattr_t ithread_rwlockattr_t;	
-
-
-/****************************************************************************
- * Name: ithread_rwlock_t
- *
- *  Description:
- *      Condition attribute.
- *      typedef to pthread_rwlock_t
- *      Internal Use Only
- ***************************************************************************/
-typedef pthread_rwlock_t ithread_rwlock_t;	
-
-/****************************************************************************
- * Function: ithread_mutexattr_init
- *
- *  Description:
- *      Initializes a mutex attribute variable.
- *      Used to set the type of the mutex.
- *  Parameters:
- *      ithread_mutexattr_init * attr (must be valid non NULL pointer to 
- *                                     pthread_mutexattr_t)
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_mutexattr_init
- ***************************************************************************/
 #define ithread_mutexattr_init pthread_mutexattr_init
   
-
-/****************************************************************************
- * Function: ithread_mutexattr_destroy
- *
- *  Description:
- *      Releases any resources held by the mutex attribute.
- *      Currently there are no resources associated with the attribute
- *  Parameters:
- *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
- *                                  pthread_mutexattr_t)
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_mutexattr_destroy
- ***************************************************************************/
+  /****************************************************************************
+   * Function: ithread_mutexattr_destroy
+   *
+   *  Description:
+   *      Releases any resources held by the mutex attribute.
+   *      Currently there are no resources associated with the attribute
+   *  Parameters:
+   *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
+   *                                  pthread_mutexattr_t)
+   *  Returns:
+   *      0 on success, Nonzero on failure.
+   *      Always returns 0.
+   *      See man page for pthread_mutexattr_destroy
+   ***************************************************************************/
 #define ithread_mutexattr_destroy pthread_mutexattr_destroy
   
   
@@ -207,7 +180,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *                       ITHREAD_MUTEX_ERRORCHECK_NP
  *
  *  Parameters:
- *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
+ *      ithread_mutexattr_t * mutex (must be valid non NULL pointer to 
  *                                   ithread_mutexattr_t)
  *      int kind (one of ITHREAD_MUTEX_FAST_NP or ITHREAD_MUTEX_RECURSIVE_NP
  *                or ITHREAD_MUTEX_ERRORCHECK_NP)
@@ -217,9 +190,9 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      See man page for pthread_mutexattr_setkind_np
  *****************************************************************************/
 #ifdef PTHREAD_MUTEX_RECURSIVE
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
 #else
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
+#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
 #endif
 
 /****************************************************************************
@@ -232,7 +205,7 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *                       ITHREAD_MUTEX_ERRORCHECK_NP
  *
  *  Parameters:
- *      ithread_mutexattr_t * attr (must be valid non NULL pointer to 
+ *      ithread_mutexattr_t * mutex (must be valid non NULL pointer to 
  *                                   pthread_mutexattr_t)
  *      int *kind (one of ITHREAD_MUTEX_FAST_NP or ITHREAD_MUTEX_RECURSIVE_NP
  *                or ITHREAD_MUTEX_ERRORCHECK_NP)
@@ -242,9 +215,9 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *      See man page for pthread_mutexattr_getkind_np
  *****************************************************************************/
 #ifdef PTHREAD_MUTEX_RECURSIVE
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
 #else
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
+#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
 #endif
 
   
@@ -265,7 +238,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
  *****************************************************************************/
 #define ithread_mutex_init pthread_mutex_init
   
-
 /****************************************************************************
  * Function: ithread_mutex_lock
  *
@@ -320,169 +292,6 @@ typedef pthread_rwlock_t ithread_rwlock_t;
 #define ithread_mutex_destroy pthread_mutex_destroy
 
   
-/****************************************************************************
- * Function: ithread_rwlockattr_init
- *
- *  Description:
- *      Initializes a rwlock attribute variable to default values.
- *  Parameters:
- *      const ithread_rwlockattr_init *attr (must be valid non NULL pointer to 
- *                                           pthread_rwlockattr_t)
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlockattr_init
- ***************************************************************************/
-#define ithread_rwlockattr_init pthread_rwlockattr_init
-
-
-/****************************************************************************
- * Function: ithread_rwlockattr_destroy
- *
- *  Description:
- *      Releases any resources held by the rwlock attribute.
- *  Parameters:
- *      ithread_rwlockattr_t *attr (must be valid non NULL pointer to 
- *                                  pthread_rwlockattr_t)
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlockattr_destroy
- ***************************************************************************/
-#define ithread_rwlockattr_destroy pthread_rwlockattr_destroy
-  
-  
-/****************************************************************************
- * Function: ithread_rwlockatttr_setpshared
- *
- *  Description:
- *      Sets the rwlock type in the attribute.
- *      Valid types are: ITHREAD_PROCESS_PRIVATE 
- *                       ITHREAD_PROCESS_SHARED
- *
- *  Parameters:
- *      ithread_rwlockattr_t * attr (must be valid non NULL pointer to 
- *                                   ithread_rwlockattr_t)
- *      int kind (one of ITHREAD_PROCESS_PRIVATE or ITHREAD_PROCESS_SHARED)
- *
- *  Returns:
- *      0 on success. Nonzero on failure.
- *      Returns EINVAL if the kind is not supported.
- *      See man page for pthread_rwlockattr_setkind_np
- *****************************************************************************/
-#define ithread_rwlockatttr_setpshared pthread_rwlockatttr_setpshared
-
-
-/****************************************************************************
- * Function: ithread_rwlockatttr_getpshared
- *
- *  Description:
- *      Gets the rwlock type in the attribute.
- *      Valid types are: ITHREAD_PROCESS_PRIVATE 
- *                       ITHREAD_PROCESS_SHARED 
- *
- *  Parameters:
- *      ithread_rwlockattr_t * attr (must be valid non NULL pointer to 
- *                                   pthread_rwlockattr_t)
- *      int *kind (one of ITHREAD_PROCESS_PRIVATE or ITHREAD_PROCESS_SHARED)
- *
- *  Returns:
- *      0 on success. Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlockatttr_getpshared
- *****************************************************************************/
-#define ithread_rwlockatttr_getpshared pthread_rwlockatttr_getpshared
-
-  
-/****************************************************************************
- * Function: ithread_rwlock_init
- *
- *  Description:
- *      Initializes rwlock.
- *      Must be called before use.
- *      
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      const ithread_rwlockattr_t * rwlock_attr 
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_init
- *****************************************************************************/
-#define ithread_rwlock_init pthread_rwlock_init
-
-
-/****************************************************************************
- * Function: ithread_rwlock_rdlock
- *
- *  Description:
- *      Locks rwlock for reading.
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *      
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_rdlock
- *****************************************************************************/
-#define ithread_rwlock_rdlock pthread_rwlock_rdlock
-
-
-/****************************************************************************
- * Function: ithread_rwlock_wrlock
- *
- *  Description:
- *      Locks rwlock for writting.
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *      
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_wrlock
- *****************************************************************************/
-#define ithread_rwlock_wrlock pthread_rwlock_wrlock
-
-
-/****************************************************************************
- * Function: ithread_rwlock_unlock
- *
- *  Description:
- *      Unlocks rwlock.
- *
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *      
- *  Returns:
- *      0 on success, Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_unlock
- *****************************************************************************/
-#define ithread_rwlock_unlock pthread_rwlock_unlock
-
-
-/****************************************************************************
- * Function: ithread_rwlock_destroy
- *
- *  Description:
- *      Releases any resources held by the rwlock. 
- *		rwlock can no longer be used after this call.
- *		rwlock is only destroyed when there are no longer any threads waiting on it. 
- *		rwlock cannot be destroyed if it is locked.
- *  Parameters:
- *      ithread_rwlock_t * rwlock (must be valid non NULL pointer to pthread_rwlock_t)
- *      rwlock must be initialized.
- *  Returns:
- *      0 on success. Nonzero on failure.
- *      Always returns 0.
- *      See man page for pthread_rwlock_destroy
- *****************************************************************************/
-#define ithread_rwlock_destroy pthread_rwlock_destroy
-
-
 /****************************************************************************
  * Function: ithread_cond_init
  *

threadutil/src/LinkedList.c

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

threadutil/src/iasnprintf.c

@@ -0,0 +1,152 @@
+///////////////////////////////////////////////////////////////////////////
+//
+// 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 <stdarg.h>
+#include <assert.h>
+#ifdef __FreeBSD__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#include <stdio.h>
+#include "iasnprintf.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifdef WIN32
+ #define vsnprintf _vsnprintf
+#endif
+
+/**
+ * Allocates enough memory for the
+ * Formatted string, up to max
+ * specified.
+ * With max set to -1, it allocates as
+ * much size as needed.
+ * Memory must be freed using free.
+ */
+
+int
+iasnprintf( char **ret,
+            int incr,
+            int max,
+            const char *fmt,
+            ... )
+{
+    int size = incr;
+    int retc = 0;
+    va_list ap;
+    char *temp = NULL;
+
+    assert( ret );
+    assert( fmt );
+    ( *ret ) = ( char * )malloc( incr );
+
+    if( ( *ret ) == NULL ) return -1;
+
+    while( 1 ) {
+        va_start( ap, fmt );
+        retc = vsnprintf( ( *ret ), size, fmt, ap );
+        va_end( ap );
+
+        if( retc < 0 ) {
+            //size not big enough
+            //and vsnprintf does NOT return the
+            //necessary number of bytes
+            if( ( max != -1 ) && ( size == max ) )  //max reached
+            {
+                break;
+            }
+
+            incr *= 2;          //increase increment
+            //increase size and try again  
+            if( ( max != -1 ) && ( ( size + incr ) > max ) ) {
+                incr = ( max - size );
+            }
+
+            temp = ( char * )realloc( ( *ret ), size + incr );
+            if( temp == NULL ) {
+                break;
+            }
+            size += incr;
+            ( *ret ) = temp;
+
+        } else {
+            if( ( retc + 1 ) > size ) {
+                //size not big enough
+                //and vsnprintf 
+                //returns the necessary 
+                //number of bytes
+                if( ( max != -1 ) && ( retc + 1 > max ) ) {
+                    retc = -1;
+                    break;
+                }
+
+                temp = ( char * )realloc( ( *ret ), retc + 1 );
+                if( temp == NULL ) {
+                    retc = -1;
+                    break;
+                }
+                size = retc + 1;
+                ( *ret ) = temp;    //size increased try again
+            } else if( ( retc + 1 ) < size ) {
+                //size is bigger than needed
+                //try and reallocate smaller
+
+                temp = ( char * )realloc( ( *ret ), retc + 1 );
+                if( temp != NULL ) {
+                    ( *ret ) = temp;
+                }
+                break;
+            } else              //size is just right, exit
+            {
+                break;
+            }
+
+        }
+    }
+
+    if( retc < 0 ) {
+        free( ( *ret ) );
+        ( *ret ) = NULL;
+    }
+
+    return retc;
+}
+
+void
+iasnprintfFree( char *fChar )
+{
+    free( fChar );
+    fChar = NULL;
+}

upnp/Makefile.am

@@ -1,7 +1,8 @@
+
 #
 # "Makefile.am" for "libupnp/upnp"
 #
-# Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 
 SUBDIRS = doc . sample
@@ -11,6 +12,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/threadutil/inc \
 	-I$(top_srcdir)/ixml/inc
 
+AM_CFLAGS = $(PTHREAD_CFLAGS)
+
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
 LDADD = \
 	libupnp.la \
 	$(top_builddir)/threadutil/libthreadutil.la \
@@ -18,14 +23,14 @@ LDADD = \
 
 
 upnpincludedir = $(includedir)/upnp
-upnpinclude_HEADERS = \
-	inc/upnp.h \
-	inc/upnpdebug.h
-
+upnpinclude_HEADERS = inc/upnp.h 
 nodist_upnpinclude_HEADERS = inc/upnpconfig.h 
 if ENABLE_TOOLS
 upnpinclude_HEADERS += inc/upnptools.h 
 endif
+if ENABLE_DEBUG
+upnpinclude_HEADERS += inc/upnpdebug.h
+endif
 
 
 lib_LTLIBRARIES = libupnp.la

upnp/doc/Makefile.am

@@ -2,7 +2,7 @@
 #
 # "Makefile.am" for "libunp/upnp/doc" 
 #
-# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #
 ##########################################################################
 #

upnp/inc/upnp.h

@@ -47,8 +47,7 @@
 
 
 #include <stdio.h>
-#include <sys/param.h>
-#if (defined(BSD) && BSD >= 199306)
+#ifdef __FreeBSD__
 	#include <time.h>
 #endif
 #include "ixml.h"
@@ -829,42 +828,46 @@ struct Upnp_Event
  * Upnp_Discovery structure correctly.
  */
 
+typedef struct sockaddr_in SOCKADDRIN;
 
 /** Returned in a {\bf UPNP_DISCOVERY_RESULT} callback. */
+
 struct Upnp_Discovery
 {
-	/** The result code of the {\bf UpnpSearchAsync} call. */
-	int  ErrCode;                  
 
-	/** The expiration time of the advertisement. */
-	int  Expires;                  
+  /** The result code of the {\bf UpnpSearchAsync} call. */
+  int  ErrCode;                  
 				     
-	/** The unique device identifier. */
-	char DeviceId[LINE_SIZE];      
+  /** The expiration time of the advertisement. */
+  int  Expires;                  
                                      
-	/** The device type. */
-	char DeviceType[LINE_SIZE];    
+  /** The unique device identifier. */
+  char DeviceId[LINE_SIZE];      
 
-	/** The service type. */
-	char ServiceType[LINE_SIZE];
+  /** The device type. */
+  char DeviceType[LINE_SIZE];    
 
-	/** The service version. */
-	char ServiceVer[LINE_SIZE];    
+  /** The service type. */
+  char ServiceType[LINE_SIZE];
 
-	/** The URL to the UPnP description document for the device. */
-	char Location[LINE_SIZE];      
+  /** The service version. */
+  char ServiceVer[LINE_SIZE];    
 
-	/** The operating system the device is running. */
-	char Os[LINE_SIZE];            
+  /** The URL to the UPnP description document for the device. */
+  char Location[LINE_SIZE];      
 
-	/** Date when the response was generated. */
-	char Date[LINE_SIZE];            
+  /** The operating system the device is running. */
+  char Os[LINE_SIZE];            
 				     
-	/** Confirmation that the MAN header was understood by the device. */
-	char Ext[LINE_SIZE];           
+  /** Date when the response was generated. */
+  char Date[LINE_SIZE];            
+				     
+  /** Confirmation that the MAN header was understood by the device. */
+  char Ext[LINE_SIZE];           
+				     
+  /** The host address of the device responding to the search. */
+  SOCKADDRIN * DestAddr; 
 
-	/** The host address of the device responding to the search. */
-	struct sockaddr_in DestAddr; 
 };
 
 /** Returned along with a {\bf UPNP_EVENT_SUBSCRIBE_COMPLETE} or {\bf

upnp/inc/upnpconfig.h.in

@@ -1,7 +1,7 @@
 /* -*- C -*- */
 /*******************************************************************************
  *
- * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
  * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 

upnp/inc/upnpdebug.h

@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Copyright (c) 2000-2003 Intel Corporation 
- * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
  * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without 
@@ -246,19 +246,15 @@ static UPNP_INLINE int DebugAtThisLevel(
  * Returns: void
  ***************************************************************************/ 
 #ifdef DEBUG
-void UpnpPrintf(
-	Upnp_LogLevel DLevel,
-	Dbg_Module Module,
-	const char* DbgFileName,
-	int DbgLineNo,
-	const char* FmtStr,
-	...)
+void UpnpPrintf (Upnp_LogLevel DLevel, Dbg_Module Module,
+		 const char* DbgFileName, int DbgLineNo,
+		 const char* FmtStr,
+		 ...)
 #if (__GNUC__ >= 3)
-	/* This enables printf like format checking by the compiler */
 	__attribute__((format (__printf__, 5, 6)))
 #endif
 ;
-#else /* DEBUG */
+#else
 static UPNP_INLINE void UpnpPrintf(
 	Upnp_LogLevel DLevel,
 	Dbg_Module Module,
@@ -266,7 +262,7 @@ static UPNP_INLINE void UpnpPrintf(
 	int DbgLineNo,
 	const char* FmtStr,
 	...) {}
-#endif /* DEBUG */
+#endif
 
 
 /***************************************************************************

upnp/sample/Makefile.am

@@ -9,6 +9,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/threadutil/inc \
 	-I$(top_srcdir)/ixml/inc
 
+AM_CFLAGS = $(PTHREAD_CFLAGS)
+
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
 LDADD = \
 	$(top_builddir)/upnp/libupnp.la \
 	$(top_builddir)/threadutil/libthreadutil.la \
@@ -75,9 +79,8 @@ endif
 
 
 EXTRA_DIST = \
-	web/tvcombodesc.xml \
-	web/tvcontrolSCPD.xml \
-	web/tvdevicedesc.xml \
-	web/tvdevicepres.html \
-	web/tvpictureSCPD.xml
+	tvdevice/web/tvcontrolSCPD.xml \
+	tvdevice/web/tvdevicedesc.xml \
+	tvdevice/web/tvdevicepres.html \
+	tvdevice/web/tvpictureSCPD.xml
 

upnp/sample/tvctrlpt/upnp_tv_ctrlpt.c

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

upnp/src/api/upnpapi.c

@@ -37,7 +37,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #ifndef WIN32
-	#include <sys/types.h>
 	#include <sys/socket.h>
 	#include <netinet/in.h>
 	#include <arpa/inet.h>
@@ -54,11 +53,6 @@
 	#include <sys/ioctl.h>
 	#include <sys/utsname.h>
 	#include <unistd.h>
-
-	#include <sys/param.h>
-	#if (defined(BSD) && BSD >= 199306)
-		#include <ifaddrs.h>
-	#endif
 #endif
 #include "upnpapi.h"
 #include "httpreadwrite.h"
@@ -79,22 +73,22 @@
 	#include "urlconfig.h"
 #endif // INTERNAL_WEB_SERVER
 
-virtualDirList *pVirtualDirList;
-
 // Mutex to synchronize the subscription handling at the client side
 CLIENTONLY( ithread_mutex_t GlobalClientSubscribeMutex; )
 
-// rwlock to synchronize handles (root device or control point handle)
-    ithread_rwlock_t GlobalHndRWLock;
+//Mutex to synchronize handles ( root device or control point handle)
+    ithread_mutex_t GlobalHndMutex;
 
 // Mutex to synchronize the uuid creation process
     ithread_mutex_t gUUIDMutex;
 
     TimerThread gTimerThread;
 
-    ThreadPool gSendThreadPool;
     ThreadPool gRecvThreadPool;
-    ThreadPool gMiniServerThreadPool;
+
+    ThreadPool gSendThreadPool;
+
+     ThreadPool gMiniServerThreadPool;
 
 //Flag to indicate the state of web server
      WebServerState bWebServerState = WEB_SERVER_DISABLED;
@@ -211,26 +205,26 @@ int UpnpInit( IN const char *HostIP,
 #ifdef __CYGWIN__
         /* On Cygwin, pthread_mutex_init() fails without this memset. */
         /* TODO: Fix Cygwin so we don't need this memset(). */
-        memset(&GlobalHndRWLock, 0, sizeof(GlobalHndRWLock));
+        memset(&GlobalHndMutex, 0, sizeof(GlobalHndMutex));
 #endif
-    if (ithread_rwlock_init(&GlobalHndRWLock, NULL) != 0) {
+        if( ithread_mutex_init( &GlobalHndMutex, NULL ) != 0 ) {
         return UPNP_E_INIT_FAILED;
     }
 
-    if (ithread_mutex_init(&gUUIDMutex, NULL) != 0) {
+    if( ithread_mutex_init( &gUUIDMutex, NULL ) != 0 ) {
         return UPNP_E_INIT_FAILED;
     }
     // initialize subscribe mutex
 #ifdef INCLUDE_CLIENT_APIS
-    if (ithread_mutex_init(&GlobalClientSubscribeMutex, NULL) != 0) {
+    if ( ithread_mutex_init( &GlobalClientSubscribeMutex, NULL ) != 0 ) {
         return UPNP_E_INIT_FAILED;
     }
 #endif
 
-    HandleLock();
-    if( HostIP != NULL ) {
+        HandleLock();
+    if( HostIP != NULL )
         strcpy( LOCAL_HOST, HostIP );
-    } else {
+    else {
         if( getlocalhostname( LOCAL_HOST ) != UPNP_E_SUCCESS ) {
             HandleUnlock();
             return UPNP_E_INIT_FAILED;
@@ -266,7 +260,7 @@ int UpnpInit( IN const char *HostIP,
 
     if( ThreadPoolInit( &gMiniServerThreadPool, &attr ) != UPNP_E_SUCCESS ) {
         UpnpSdkInit = 0;
-        UpnpFinish();
+        UpnpFinish(  );
         return UPNP_E_INIT_FAILED;
     }
 
@@ -321,54 +315,27 @@ int UpnpInit( IN const char *HostIP,
 
 #ifdef DEBUG
 static void 
-PrintThreadPoolStats(
-	ThreadPool *tp, 
-	const char *DbgFileName,
-	int DbgLineNo,
-	const char *msg)
+PrintThreadPoolStats (const char* DbgFileName, int DbgLineNo,
+		      const char* msg, const ThreadPoolStats* const stats)
 {
-	ThreadPoolStats stats;
-	ThreadPoolGetStats(tp, &stats);
-	UpnpPrintf(UPNP_INFO, API, DbgFileName, DbgLineNo, 
-		"%s \n"
-		"High Jobs pending: %d\n"
-		"Med Jobs Pending: %d\n"
-		"Low Jobs Pending: %d\n"
-		"Average wait in High Q in milliseconds: %lf\n"
-		"Average wait in Med Q in milliseconds: %lf\n"
-		"Average wait in Low Q in milliseconds: %lf\n"
-		"Max Threads Used: %d\n"
-		"Worker Threads: %d\n"
-		"Persistent Threads: %d\n"
-		"Idle Threads: %d\n"
-		"Total Threads: %d\n"
-		"Total Work Time: %lf\n"
-		"Total Idle Time: %lf\n",
-		msg,
-		stats.currentJobsHQ,
-		stats.currentJobsMQ,
-		stats.currentJobsLQ,
-		stats.avgWaitHQ,
-		stats.avgWaitMQ,
-		stats.avgWaitLQ,
-		stats.maxThreads,
-		stats.workerThreads,
-		stats.persistentThreads,
-		stats.idleThreads,
-		stats.totalThreads,
-		stats.totalWorkTime,
-		stats.totalIdleTime);
+	UpnpPrintf (UPNP_INFO, API, DbgFileName, DbgLineNo, 
+		    "%s \n High Jobs pending = %d \nMed Jobs Pending = %d\n"
+		    " Low Jobs Pending = %d \nWorker Threads = %d\n"
+		    "Idle Threads = %d\nPersistent Threads = %d\n"
+		    "Average Time spent in High Q = %lf\n"
+		    "Average Time spent in Med Q = %lf\n"
+		    "Average Time spent in Low Q = %lf\n"
+		    "Max Threads Used: %d\nTotal Work Time= %lf\n"
+		    "Total Idle Time = %lf\n",
+		    msg,
+		    stats->currentJobsHQ, stats->currentJobsMQ,
+		    stats->currentJobsLQ, stats->workerThreads,
+		    stats->idleThreads, stats->persistentThreads,
+		    stats->avgWaitHQ, stats->avgWaitMQ, stats->avgWaitLQ,
+		    stats->maxThreads, stats->totalWorkTime,
+		    stats->totalIdleTime );
 }
-#else /* DEBUG */
-static UPNP_INLINE void 
-PrintThreadPoolStats(
-	ThreadPool *tp, 
-	const char *DbgFileName,
-	int DbgLineNo,
-	const char *msg)
-{
-}
-#endif /* DEBUG */
+#endif
 
      
 /****************************************************************************
@@ -399,8 +366,12 @@ UpnpFinish()
 #endif
     struct Handle_Info *temp;
 
+#ifdef DEBUG
+    ThreadPoolStats stats;
+#endif
+
 #ifdef WIN32
-//	WSACleanup();
+//	WSACleanup( );
 #endif
 
     if( UpnpSdkInit != 1 ) {
@@ -408,15 +379,20 @@ UpnpFinish()
     }
 
     UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-        "Inside UpnpFinish : UpnpSdkInit is :%d:\n", UpnpSdkInit );
+        "Inside UpnpFinish : UpnpSdkInit is :%d:\n",
+        UpnpSdkInit );
+#ifdef DEBUG
     if( UpnpSdkInit == 1 ) {
         UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
             "UpnpFinish : UpnpSdkInit is ONE\n" );
     }
-    PrintThreadPoolStats(&gSendThreadPool, __FILE__, __LINE__, "Send Thread Pool");
-    PrintThreadPoolStats(&gRecvThreadPool, __FILE__, __LINE__, "Recv Thread Pool");
-    PrintThreadPoolStats(&gMiniServerThreadPool, __FILE__, __LINE__, "MiniServer Thread Pool");
-
+    ThreadPoolGetStats( &gRecvThreadPool, &stats );
+    PrintThreadPoolStats (__FILE__, __LINE__,
+	"Recv Thread Pool", &stats);
+    ThreadPoolGetStats( &gSendThreadPool, &stats );
+    PrintThreadPoolStats (__FILE__, __LINE__,
+	"Send Thread Pool", &stats);
+#endif
 #ifdef INCLUDE_DEVICE_APIS
     if( GetDeviceHandleInfo( &device_handle, &temp ) == HND_DEVICE )
         UpnpUnRegisterRootDevice( device_handle );
@@ -428,47 +404,51 @@ UpnpFinish()
 #endif
 
     TimerThreadShutdown( &gTimerThread );
+
     StopMiniServer();
 
 #if EXCLUDE_WEB_SERVER == 0
     web_server_destroy();
 #endif
 
-    ThreadPoolShutdown(&gMiniServerThreadPool);
-    ThreadPoolShutdown(&gRecvThreadPool);
-    ThreadPoolShutdown(&gSendThreadPool);
-
-    PrintThreadPoolStats(&gSendThreadPool, __FILE__, __LINE__, "Send Thread Pool");
-    PrintThreadPoolStats(&gRecvThreadPool, __FILE__, __LINE__, "Recv Thread Pool");
-    PrintThreadPoolStats(&gMiniServerThreadPool, __FILE__, __LINE__, "MiniServer Thread Pool");
+#ifdef DEBUG
+    ThreadPoolShutdown( &gSendThreadPool );
+    ThreadPoolShutdown( &gRecvThreadPool );
+    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+        "Exiting UpnpFinish : UpnpSdkInit is :%d:\n",
+	UpnpSdkInit );
+    ThreadPoolGetStats( &gRecvThreadPool, &stats );
+    PrintThreadPoolStats( __FILE__, __LINE__,
+        "Recv Thread Pool", &stats);
+    ThreadPoolGetStats( &gSendThreadPool, &stats );
+    PrintThreadPoolStats(__FILE__, __LINE__,
+        "Send Thread Pool", &stats);
+    UpnpCloseLog();
+#endif
 
 #ifdef INCLUDE_CLIENT_APIS
-    ithread_mutex_destroy(&GlobalClientSubscribeMutex);
+    ithread_mutex_destroy( &GlobalClientSubscribeMutex );
 #endif
-    ithread_rwlock_destroy(&GlobalHndRWLock);
-    ithread_mutex_destroy(&gUUIDMutex);
+    ithread_mutex_destroy( &GlobalHndMutex );
+    ithread_mutex_destroy( &gUUIDMutex );
 
     // remove all virtual dirs
     UpnpRemoveAllVirtualDirs();
-
-    // allow static linking
+    // leuk_he allow static linking:
 #ifdef WIN32
 #ifdef PTW32_STATIC_LIB
-    pthread_win32_thread_detach_np();
+    pthread_win32_thread_detach_np ();
 #endif
 #endif
 
+
     UpnpSdkInit = 0;
-    UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-        "Exiting UpnpFinish : UpnpSdkInit is :%d:\n", UpnpSdkInit);
-    UpnpCloseLog();
 
     return UPNP_E_SUCCESS;
 
-}
-/*************************** End of  UpnpFinish  *****************************/
+}  /********************* End of  UpnpFinish  *************************/
 
-/******************************************************************************
+/****************************************************************************
  * Function: UpnpGetServerPort
  *
  * Parameters: NONE
@@ -965,7 +945,7 @@ GetDescDocumentAndURL( IN Upnp_DescType descriptionType,
     char *temp_str = NULL;
     FILE *fp = NULL;
     off_t fileLen;
-    size_t num_read;
+    unsigned num_read;
     time_t last_modified;
     struct stat file_info;
     struct sockaddr_in serverAddr;
@@ -1571,7 +1551,7 @@ UpnpSearchAsync( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpSearchAsync \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -1747,7 +1727,7 @@ UpnpSubscribeAsync( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpSubscribeAsync \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -1764,13 +1744,15 @@ UpnpSubscribeAsync( IN UpnpClient_Handle Hnd,
         HandleUnlock();
         return UPNP_E_INVALID_PARAM;
     }
-    HandleUnlock();
 
-    Param = (struct UpnpNonblockParam *)
-        malloc(sizeof (struct UpnpNonblockParam));
+    Param =
+        ( struct UpnpNonblockParam * )
+        malloc( sizeof( struct UpnpNonblockParam ) );
     if( Param == NULL ) {
+        HandleUnlock();
         return UPNP_E_OUTOF_MEMORY;
     }
+    HandleUnlock();
 
     Param->FunName = SUBSCRIBE;
     Param->Handle = Hnd;
@@ -1830,7 +1812,7 @@ UpnpSubscribe( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpSubscribe \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -1890,7 +1872,7 @@ UpnpUnSubscribe( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpUnSubscribe \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -1949,7 +1931,7 @@ UpnpUnSubscribeAsync( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpUnSubscribeAsync \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2023,7 +2005,7 @@ UpnpRenewSubscription( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpRenewSubscription \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2088,7 +2070,7 @@ UpnpRenewSubscriptionAsync( IN UpnpClient_Handle Hnd,
 
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpRenewSubscriptionAsync \n" );
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2183,7 +2165,7 @@ UpnpNotify( IN UpnpDevice_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpNotify \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_DEVICE ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2254,7 +2236,7 @@ UpnpNotifyExt( IN UpnpDevice_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpNotify \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_DEVICE ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2331,7 +2313,7 @@ UpnpAcceptSubscription( IN UpnpDevice_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpAcceptSubscription \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_DEVICE ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2407,7 +2389,7 @@ UpnpAcceptSubscriptionExt( IN UpnpDevice_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpAcceptSubscription \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_DEVICE ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2503,7 +2485,7 @@ UpnpSendAction( IN UpnpClient_Handle Hnd,
     }
     DevUDN_const = NULL;
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2587,7 +2569,7 @@ UpnpSendActionEx( IN UpnpClient_Handle Hnd,
         return retVal;
     }
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2663,7 +2645,7 @@ UpnpSendActionAsync( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpSendActionAsync \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2783,7 +2765,7 @@ UpnpSendActionExAsync( IN UpnpClient_Handle Hnd,
         return retVal;
     }
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2897,7 +2879,7 @@ UpnpGetServiceVarStatusAsync( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpGetServiceVarStatusAsync \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -2977,7 +2959,7 @@ UpnpGetServiceVarStatus( IN UpnpClient_Handle Hnd,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Inside UpnpGetServiceVarStatus \n" );
 
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_CLIENT ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
@@ -3305,15 +3287,17 @@ UpnpDownloadXmlDoc( const char *url,
     } else {
 #ifdef DEBUG
         xml_buf = ixmlPrintNode( ( IXML_Node * ) * xmlDoc );
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "Printing the Parsed xml document \n %s\n", xml_buf );
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "****************** END OF Parsed XML Doc *****************\n" );
-        ixmlFreeDOMString( xml_buf );
+                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                             "Printing the Parsed xml document \n %s\n",
+                             xml_buf );
+                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                             "****************** END OF Parsed XML Doc *****************\n" );
+                 ixmlFreeDOMString( xml_buf );
+                 UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
+                             "Exiting UpnpDownloadXmlDoc\n" );
 #endif
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "Exiting UpnpDownloadXmlDoc\n" );
-        return UPNP_E_SUCCESS;
+
+            return UPNP_E_SUCCESS;
     }
 }
 
@@ -3645,6 +3629,7 @@ int PrintHandleInfo( IN UpnpClient_Handle Hnd )
     struct Handle_Info * HndInfo;
     if (HandleTable[Hnd] != NULL) {
         HndInfo = HandleTable[Hnd];
+#ifdef DEBUG
             UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
                 "Printing information for Handle_%d\n", Hnd);
             UpnpPrintf(UPNP_ALL, API, __FILE__, __LINE__,
@@ -3653,6 +3638,7 @@ int PrintHandleInfo( IN UpnpClient_Handle Hnd )
                 if(HndInfo->HType != HND_CLIENT)
                     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
                         "DescURL_%s\n", HndInfo->DescURL );
+#endif
 #endif
     } else {
         return UPNP_E_INVALID_HANDLE;
@@ -3731,44 +3717,8 @@ void printNodes( IXML_Node * tmpRoot, int depth )
  			strcpy( out, inet_ntoa(LocalAddr.sin_addr));
  		}
  		return UPNP_E_SUCCESS;
-#elif (defined(BSD) && BSD >= 199306)
-    struct ifaddrs *ifap, *ifa;
-
-    if (getifaddrs(&ifap) != 0) {
-        UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-            "DiscoverInterfaces: getifaddrs() returned error\n" );
-        return UPNP_E_INIT;
-    }
-
-    // cycle through available interfaces
-    for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
-        // Skip loopback, point-to-point and down interfaces, 
-        // except don't skip down interfaces
-        // if we're trying to get a list of configurable interfaces. 
-        if( ( ifa->ifa_flags & IFF_LOOPBACK )
-            || ( !( ifa->ifa_flags & IFF_UP ) ) ) {
-            continue;
-        }
-        if( ifa->ifa_addr->sa_family == AF_INET ) {
-            // We don't want the loopback interface. 
-            if( ((struct sockaddr_in *)(ifa->ifa_addr))->sin_addr.s_addr ==
-                htonl( INADDR_LOOPBACK ) ) {
-                continue;
-            }
-
-            strncpy( out, inet_ntoa( ((struct sockaddr_in *)(ifa->ifa_addr))->
-                sin_addr ), LINE_SIZE );
-            out[LINE_SIZE-1] = '\0';
-            UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
-                "Inside getlocalhostname : after strncpy %s\n",
-                out );
-            break;
-        }
-    }
-    freeifaddrs(ifap);
-
-    return ifa ? UPNP_E_SUCCESS : UPNP_E_INIT;
 #else
+
     char szBuffer[MAX_INTERFACES * sizeof( struct ifreq )];
     struct ifconf ifConf;
     struct ifreq ifReq;

upnp/src/api/upnpdebug.c

@@ -173,7 +173,7 @@ int DebugAtThisLevel(
 	IN Upnp_LogLevel DLevel,
 	IN Dbg_Module Module)
 {
-	int ret = DLevel <= g_log_level;
+	int ret = g_log_level >= DLevel;
 	ret &=
 		DEBUG_ALL ||
 		(Module == SSDP  && DEBUG_SSDP ) ||

upnp/src/api/upnptools.c

@@ -36,7 +36,7 @@
 #include "uri.h"
 #define HEADER_LENGTH 2000
 
-// Structure to maintain a error code and string associated with the 
+//Structure to maintain a error code and string associated with the 
 // error code
 struct ErrorString {
     int rc;                     /* error code */
@@ -44,7 +44,7 @@ struct ErrorString {
 
 };
 
-// Initializing the array of error structures. 
+//Intializing the array of error structures. 
 struct ErrorString ErrorMessages[] = { {UPNP_E_SUCCESS, "UPNP_E_SUCCESS"},
 {UPNP_E_INVALID_HANDLE, "UPNP_E_INVALID_HANDLE"},
 {UPNP_E_INVALID_PARAM, "UPNP_E_INVALID_PARAM"},
@@ -155,7 +155,7 @@ UpnpResolveURL( IN const char *BaseURL,
 *																	
 * Parameters:														
 *	IN int response: flag to tell if the ActionDoc is for response 
-*		or request
+*					or request
 *	INOUT IXML_Document **ActionDoc: request or response document
 *	IN char *ActionName: Name of the action request or response
 *	IN char *ServType: Service type
@@ -234,7 +234,7 @@ addToAction( IN int response,
 *																	
 * Parameters:														
 *	IN int response: flag to tell if the ActionDoc is for response 
-*		or request
+*					or request
 *	IN char * ActionName: Name of the action request or response
 *	IN char * ServType: Service type
 *	IN int NumArg :Number of arguments in the action request or response
@@ -581,5 +581,4 @@ UpnpCreatePropertySet( IN int NumArg,
     return PropSet;
 }
 
-#endif // EXCLUDE_DOM == 0
-
+#endif

upnp/src/gena/gena_ctrlpt.c

@@ -93,7 +93,7 @@ GenaAutoRenewSubscription( IN void *input )
         }
     }
     if( send_callback ) {
-        HandleReadLock();
+        HandleLock();
         if( GetHandleInfo( event->handle, &handle_info ) != HND_CLIENT ) {
             HandleUnlock();
             free_upnp_timeout( event );
@@ -543,10 +543,10 @@ genaSubscribe( IN UpnpClient_Handle client_handle,
 
     UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__,
         "GENA SUBSCRIBE BEGIN" );
+    HandleLock();
 
     memset( out_sid, 0, sizeof( Upnp_SID ) );
 
-    HandleReadLock();
     // validate handle
     if( GetHandleInfo( client_handle, &handle_info ) != HND_CLIENT ) {
         HandleUnlock();
@@ -881,4 +881,3 @@ gena_process_notification_event( IN SOCKINFO * info,
 
 #endif // INCLUDE_CLIENT_APIS
 #endif // EXCLUDE_GENA
-

upnp/src/gena/gena_device.c

@@ -365,7 +365,7 @@ genaNotifyThread( IN void *input )
     struct Handle_Info *handle_info;
     ThreadPoolJob job;
 
-    HandleReadLock();
+    HandleLock();
     //validate context
 
     if( GetHandleInfo( in->device_handle, &handle_info ) != HND_DEVICE ) {

upnp/src/genlib/miniserver/miniserver.c

@@ -36,18 +36,18 @@
 
 #include "config.h"
 #ifndef WIN32
-	#include <arpa/inet.h>
-	#include <netinet/in.h>
-	#include <sys/socket.h>
-	#include <sys/wait.h>
-	#include <unistd.h>
-	#include <sys/time.h>
-#else /* WIN32 */
-	#include <winsock2.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+#else
+ #include <winsock2.h>
 
-	typedef int socklen_t;
-	#define EAFNOSUPPORT 97
-#endif /* WIN32 */
+ typedef int socklen_t;
+ #define EAFNOSUPPORT 97
+#endif
 #include "unixutil.h"
 #include "ithread.h"
 
@@ -88,16 +88,17 @@ static MiniServerCallback gGenaCallback = NULL;
 static MiniServerState gMServState = MSERV_IDLE;
 
 /************************************************************************
- * Function: SetHTTPGetCallback
- *
- * Parameters :
- * 	MiniServerCallback callback - HTTP Callback to be invoked 
- *
- * Description:
- * 	Set HTTP Get Callback
- *
- * Return: void
- ************************************************************************/
+*	Function :	SetHTTPGetCallback
+*
+*	Parameters :
+*		MiniServerCallback callback ; - HTTP Callback to be invoked 
+*
+*	Description :	Set HTTP Get Callback
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 void
 SetHTTPGetCallback( MiniServerCallback callback )
 {
@@ -105,35 +106,35 @@ SetHTTPGetCallback( MiniServerCallback callback )
 }
 
 /************************************************************************
- * Function: SetSoapCallback
- *
- * Parameters:
- *	MiniServerCallback callback - SOAP Callback to be invoked 
- *
- * Description:
- * 	Set SOAP Callback
- *
- * Return: void
- ************************************************************************/
-#ifdef INCLUDE_DEVICE_APIS
+* Function :	SetSoapCallback
+*
+* Parameters :
+*	MiniServerCallback callback ; - SOAP Callback to be invoked 
+*
+* Description :	Set SOAP Callback
+*
+* Return :	void
+*
+* Note :
+************************************************************************/
 void
 SetSoapCallback( MiniServerCallback callback )
 {
     gSoapCallback = callback;
 }
-#endif /* INCLUDE_DEVICE_APIS */
 
 /************************************************************************
- * Function: SetGenaCallback
- *
- * Parameters:
- *	MiniServerCallback callback - GENA Callback to be invoked
- *
- * Description:
- * 	Set GENA Callback
- *
- * Return: void
- ************************************************************************/
+*	Function :	SetGenaCallback
+*
+*	Parameters :
+*		MiniServerCallback callback ; - GENA Callback to be invoked
+*
+*	Description :	Set GENA Callback
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 void
 SetGenaCallback( MiniServerCallback callback )
 {
@@ -141,19 +142,21 @@ SetGenaCallback( MiniServerCallback callback )
 }
 
 /************************************************************************
- * Function :	dispatch_request
- *
- * Parameters :
- *	IN SOCKINFO *info	- Socket Information object.
- *	http_parser_t* hparser	- HTTP parser object.
- *
- * Description :
- *	Based on the type pf message, appropriate callback is issued
- *
- * Return: int
- *	0 - On Success
- *	HTTP_INTERNAL_SERVER_ERROR - Callback is NULL
- ************************************************************************/
+*	Function :	dispatch_request
+*
+*	Parameters :
+*		IN SOCKINFO *info ;		 Socket Information object.
+*		http_parser_t* hparser ; HTTP parser object.
+*
+*	Description :	Based on the type pf message, appropriate callback 
+*		is issued
+*
+*	Return : int ;
+*		0 - On Success
+*		HTTP_INTERNAL_SERVER_ERROR - Callback is NULL
+*
+*	Note :
+************************************************************************/
 static int
 dispatch_request( IN SOCKINFO * info,
                   http_parser_t * hparser )
@@ -197,19 +200,21 @@ dispatch_request( IN SOCKINFO * info,
 }
 
 /************************************************************************
- * Function: handle_error
- *
- * Parameters:
- * 	IN SOCKINFO *info	- Socket Inforamtion Object
- * 	int http_error_code	- HTTP Error Code
- * 	int major		- Major Version Number
- * 	int minor		- Minor Version Number
- *
- * Description:
- * 	Send Error Message
- *
- * Return: void
- ************************************************************************/
+*	Function :	handle_error
+*
+*	Parameters :
+*		
+*		IN SOCKINFO *info ;		Socket Inforamtion Object
+*		int http_error_code ;	HTTP Error Code
+*		int major ;				Major Version Number
+*		int minor ;				Minor Version Number
+*
+*	Description :	Send Error Message
+*
+*	Return : void;
+*
+*	Note :
+************************************************************************/
 static UPNP_INLINE void
 handle_error( IN SOCKINFO * info,
               int http_error_code,
@@ -220,17 +225,18 @@ handle_error( IN SOCKINFO * info,
 }
 
 /************************************************************************
- * Function: free_handle_request_arg
- *
- * Parameters:
- *	void *args ; Request Message to be freed
- *
- * Description:
- * 	Free memory assigned for handling request and unitialize socket
- * 	functionality
- *
- * Return: void
- ************************************************************************/
+*	Function :	free_handle_request_arg
+*
+*	Parameters :
+*		void *args ; Request Message to be freed
+*
+*	Description :	Free memory assigned for handling request and unitial-
+*	-ize socket functionality
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 static void
 free_handle_request_arg( void *args )
 {
@@ -242,16 +248,17 @@ free_handle_request_arg( void *args )
 }
 
 /************************************************************************
- * Function: handle_request
- *
- * Parameters:
- *	void *args - Request Message to be handled
- *
- * Description:
- * 	Receive the request and dispatch it for handling
- *
- * Return: void
- ************************************************************************/
+*	Function :	handle_request
+*
+*	Parameters :
+*		void *args ;	Request Message to be handled
+*
+*	Description :	Receive the request and dispatch it for handling
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 static void
 handle_request( void *args )
 {
@@ -312,18 +319,20 @@ handle_request( void *args )
 }
 
 /************************************************************************
- * Function: schedule_request_job
- *
- * Parameters:
- *	IN int connfd - Socket Descriptor on which connection is accepted
- *	IN struct sockaddr_in* clientAddr - Clients Address information
- *
- * Description:
- * 	Initilize the thread pool to handle a request.
- *	Sets priority for the job and adds the job to the thread pool
- *
- * Return: void
- ************************************************************************/
+*	Function :	schedule_request_job
+*
+*	Parameters :
+*		IN int connfd ;	Socket Descriptor on which connection is accepted
+*		IN struct sockaddr_in* clientAddr ;	Clients Address information
+*
+*	Description :	Initilize the thread pool to handle a request.
+*		Sets priority for the job and adds the job to the thread pool
+*
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 static UPNP_INLINE void
 schedule_request_job( IN int connfd,
                       IN struct sockaddr_in *clientAddr )
@@ -362,31 +371,32 @@ schedule_request_job( IN int connfd,
 }
 
 /************************************************************************
- * Function: RunMiniServer
- *
- * Parameters:
- *	MiniServerSockArray *miniSock - Socket Array
- *
- * Description:
- * 	Function runs the miniserver. The MiniServer accepts a 
- *	new request and schedules a thread to handle the new request.
- *	Checks for socket state and invokes appropriate read and shutdown 
- *	actions for the Miniserver and SSDP sockets 
- *
- * Return: void
- ************************************************************************/
+*	Function :	RunMiniServer
+*
+*	Parameters :
+*		MiniServerSockArray *miniSock ;	Socket Array
+*
+*	Description :	Function runs the miniserver. The MiniServer accepts a 
+*		new request and schedules a thread to handle the new request.
+*		Checks for socket state and invokes appropriate read and shutdown 
+*		actions for the Miniserver and SSDP sockets 
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 static void
 RunMiniServer( MiniServerSockArray * miniSock )
 {
     struct sockaddr_in clientAddr;
     socklen_t clientLen;
-    SOCKET connectHnd;
-    SOCKET miniServSock = miniSock->miniServerSock;
-    SOCKET miniServStopSock =  miniSock->miniServerStopSock;
-    SOCKET ssdpSock = miniSock->ssdpSock;
-#ifdef INCLUDE_CLIENT_APIS
-    SOCKET ssdpReqSock = miniSock->ssdpReqSock;
-#endif
+    SOCKET miniServSock,
+      connectHnd;
+    SOCKET miniServStopSock;
+    SOCKET ssdpSock;
+
+    CLIENTONLY( SOCKET ssdpReqSock;
+         )
 
     fd_set expSet;
     fd_set rdSet;
@@ -394,55 +404,66 @@ RunMiniServer( MiniServerSockArray * miniSock )
     int byteReceived;
     char requestBuf[256];
 
-    maxMiniSock = max( miniServSock, miniServStopSock) ;
-    maxMiniSock = max( maxMiniSock, (SOCKET)(ssdpSock) );
-#ifdef INCLUDE_CLIENT_APIS
-    maxMiniSock = max( maxMiniSock, (SOCKET)(ssdpReqSock) );
-#endif
-    ++maxMiniSock;
+    miniServSock = miniSock->miniServerSock;
+    miniServStopSock = miniSock->miniServerStopSock;
+
+    ssdpSock = miniSock->ssdpSock;
+
+    CLIENTONLY( ssdpReqSock = miniSock->ssdpReqSock;
+         );
 
     gMServState = MSERV_RUNNING;
+    maxMiniSock = max( miniServSock, miniServStopSock );
+    maxMiniSock = max( maxMiniSock, ( SOCKET ) ( ssdpSock ) );
+
+    CLIENTONLY( maxMiniSock =
+                max( maxMiniSock, ( SOCKET ) ( ssdpReqSock ) ) );
+
+    ++maxMiniSock;
+
     while( TRUE ) {
         FD_ZERO( &rdSet );
         FD_ZERO( &expSet );
 
         FD_SET( miniServStopSock, &expSet );
+
         FD_SET( miniServSock, &rdSet );
         FD_SET( miniServStopSock, &rdSet );
         FD_SET( ssdpSock, &rdSet );
-#ifdef INCLUDE_CLIENT_APIS
-        FD_SET( ssdpReqSock, &rdSet );
-#endif
+        CLIENTONLY( FD_SET( ssdpReqSock, &rdSet ) );
 
         if( select( maxMiniSock, &rdSet, NULL, &expSet, NULL ) ==
             UPNP_SOCKETERROR ) {
             UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
-                "Error in select call!\n" );
-	    /* Avoid 100% CPU in case of repeated error in select() */
-	    isleep( 1 );
+                "Error in select call !!!\n" );
             continue;
         } else {
+
             if( FD_ISSET( miniServSock, &rdSet ) ) {
                 clientLen = sizeof( struct sockaddr_in );
                 connectHnd = accept( miniServSock,
-                    ( struct sockaddr * )&clientAddr, &clientLen );
+                                     ( struct sockaddr * )&clientAddr,
+                                     &clientLen );
                 if( connectHnd == UPNP_INVALID_SOCKET ) {
                     UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
-                        "miniserver: Error in accepting connection\n" );
+                        "miniserver: Error"
+                        " in accepting connection\n" );
                     continue;
                 }
                 schedule_request_job( connectHnd, &clientAddr );
             }
-#ifdef INCLUDE_CLIENT_APIS
-            // ssdp
-            if( FD_ISSET( ssdpReqSock, &rdSet ) ) {
-                readFromSSDPSocket( ssdpReqSock );
-            }
-#endif
-            if( FD_ISSET( ssdpSock, &rdSet ) ) {
+            //ssdp
+            CLIENTONLY( if( FD_ISSET( ssdpReqSock, &rdSet ) ) {
+
+                        readFromSSDPSocket( ssdpReqSock );}
+             )
+
+                if( FD_ISSET( ssdpSock, &rdSet ) ) {
                     readFromSSDPSocket( ssdpSock );
-            }
+                }
+
             if( FD_ISSET( miniServStopSock, &rdSet ) ) {
+
                 clientLen = sizeof( struct sockaddr_in );
                 memset( ( char * )&clientAddr, 0,
                         sizeof( struct sockaddr_in ) );
@@ -458,6 +479,7 @@ RunMiniServer( MiniServerSockArray * miniSock )
                     UpnpPrintf( UPNP_PACKET, MSERV, __FILE__, __LINE__,
                         "Received multicast packet: \n %s\n",
                         requestBuf );
+
                     if( NULL != strstr( requestBuf, "ShutDown" ) ) {
                         break;
 		    }
@@ -472,30 +494,31 @@ RunMiniServer( MiniServerSockArray * miniSock )
     UpnpCloseSocket( miniServStopSock );
     shutdown( ssdpSock, SD_BOTH );
     UpnpCloseSocket( ssdpSock );
-#ifdef INCLUDE_CLIENT_APIS
-    shutdown( ssdpReqSock, SD_BOTH );
-    UpnpCloseSocket( ssdpReqSock );
-#endif
+    CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+    CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
 
     free( miniSock );
+
     gMServState = MSERV_IDLE;
 
     return;
+
 }
 
 /************************************************************************
- * Function: get_port
- *
- * Parameters:
- *	int sockfd - Socket Descriptor 
- *
- * Description:
- * 	Returns port to which socket, sockfd, is bound.
- *
- * Return: int
- *	-1 on error; check errno
- *	 > 0 means port number
- ************************************************************************/
+*	Function :	get_port
+*
+*	Parameters :
+*		int sockfd ; Socket Descriptor 
+*
+*	Description :	Returns port to which socket, sockfd, is bound.
+*
+*	Return :	int, 
+*		-1 on error; check errno
+*		 > 0 means port number
+*
+*	Note :
+************************************************************************/
 static int
 get_port( int sockfd )
 {
@@ -518,28 +541,28 @@ get_port( int sockfd )
 }
 
 /************************************************************************
- * Function: get_miniserver_sockets
- *
- * Parameters:
- *	MiniServerSockArray *out   - Socket Array
- *	unsigned short listen_port - port on which the server is
- *		listening for incoming connections	
- *
- * Description:
- * 	Creates a STREAM socket, binds to INADDR_ANY and listens for
- * 	incoming connecttions. Returns the actual port which the sockets
- * 	sub-system returned. 
- *
- *	Also creates a DGRAM socket, binds to the loop back address and 
- *	returns the port allocated by the socket sub-system.
- *
- * Return: int 
- *	UPNP_E_OUTOF_SOCKET - Failed to create a socket
- *	UPNP_E_SOCKET_BIND - Bind() failed
- *	UPNP_E_LISTEN	- Listen() failed	
- *	UPNP_E_INTERNAL_ERROR - Port returned by the socket layer is < 0
- *	UPNP_E_SUCCESS	- Success
- ************************************************************************/
+*	Function :	get_miniserver_sockets
+*
+*	Parameters :
+*		MiniServerSockArray *out ;	Socket Array
+*		unsigned short listen_port ; port on which the server is listening 
+*									for incoming connections	
+*
+*	Description :	Creates a STREAM socket, binds to INADDR_ANY and 
+*		listens for incoming connecttions. Returns the actual port which 
+*		the sockets sub-system returned. 
+*		Also creates a DGRAM socket, binds to the loop back address and 
+*		returns the port allocated by the socket sub-system.
+*
+*	Return :	int : 
+*		UPNP_E_OUTOF_SOCKET - Failed to create a socket
+*		UPNP_E_SOCKET_BIND - Bind() failed
+*		UPNP_E_LISTEN	- Listen() failed	
+*		UPNP_E_INTERNAL_ERROR - Port returned by the socket layer is < 0
+*		UPNP_E_SUCCESS	- Success
+*		
+*	Note :
+************************************************************************/
 int
 get_miniserver_sockets( MiniServerSockArray * out,
                         unsigned short listen_port )
@@ -669,8 +692,8 @@ get_miniserver_sockets( MiniServerSockArray * out,
     miniStopSockPort = get_port( miniServerStopSock );
     if( miniStopSockPort <= 0 ) {
         shutdown( miniServerStopSock, SD_BOTH );
-        UpnpCloseSocket( miniServerStopSock );
         shutdown( listenfd, SD_BOTH );
+        UpnpCloseSocket( miniServerStopSock );
         UpnpCloseSocket( listenfd );
         return UPNP_E_INTERNAL_ERROR;
     }
@@ -685,29 +708,31 @@ get_miniserver_sockets( MiniServerSockArray * out,
 }
 
 /************************************************************************
- * Function: StartMiniServer
- *
- * Parameters :
- *	unsigned short listen_port - Port on which the server listens for 
- *		incoming connections
- *
- * Description:
- * 	Initialize the sockets functionality for the 
- *	Miniserver. Initialize a thread pool job to run the MiniServer
- *	and the job to the thread pool. If listen port is 0, port is 
- *	dynamically picked
- *
- *	Use timer mechanism to start the MiniServer, failure to meet the 
- *	allowed delay aborts the attempt to launch the MiniServer.
- *
- * Return: int
- *	Actual port socket is bound to - On Success
- *	A negative number UPNP_E_XXX - On Error
- ************************************************************************/
+*	Function :	StartMiniServer
+*
+*	Parameters :
+*		unsigned short listen_port ; Port on which the server listens for 
+*									incoming connections
+*
+*	Description :	Initialize the sockets functionality for the 
+*		Miniserver. Initialize a thread pool job to run the MiniServer
+*		and the job to the thread pool. If listen port is 0, port is 
+*		dynamically picked
+*
+*		Use timer mechanism to start the MiniServer, failure to meet the 
+*		allowed delay aborts the attempt to launch the MiniServer.
+*
+*	Return : int ;
+*		Actual port socket is bound to - On Success: 
+*		A negative number UPNP_E_XXX - On Error   			
+*	Note :
+************************************************************************/
 int
 StartMiniServer( unsigned short listen_port )
 {
+
     int success;
+
     int count;
     int max_count = 10000;
 
@@ -730,10 +755,12 @@ StartMiniServer( unsigned short listen_port )
     }
 
     if( ( success = get_ssdp_sockets( miniSocket ) ) != UPNP_E_SUCCESS ) {
+
         shutdown( miniSocket->miniServerSock, SD_BOTH );
         UpnpCloseSocket( miniSocket->miniServerSock );
         shutdown( miniSocket->miniServerStopSock, SD_BOTH );
         UpnpCloseSocket( miniSocket->miniServerStopSock );
+
         free( miniSocket );
 
         return success;
@@ -749,15 +776,14 @@ StartMiniServer( unsigned short listen_port )
 
     if( success < 0 ) {
         shutdown( miniSocket->miniServerSock, SD_BOTH );
-        UpnpCloseSocket( miniSocket->miniServerSock );
         shutdown( miniSocket->miniServerStopSock, SD_BOTH );
-        UpnpCloseSocket( miniSocket->miniServerStopSock );
         shutdown( miniSocket->ssdpSock, SD_BOTH );
+        CLIENTONLY( shutdown( miniSocket->ssdpReqSock, SD_BOTH ) );
+        UpnpCloseSocket( miniSocket->miniServerSock );
+        UpnpCloseSocket( miniSocket->miniServerStopSock );
         UpnpCloseSocket( miniSocket->ssdpSock );
-#ifdef INCLUDE_CLIENT_APIS
-        shutdown( miniSocket->ssdpReqSock, SD_BOTH );
-        UpnpCloseSocket( miniSocket->ssdpReqSock );
-#endif
+
+        CLIENTONLY( UpnpCloseSocket( miniSocket->ssdpReqSock ) );
 
         return UPNP_E_OUTOF_MEMORY;
     }
@@ -770,16 +796,16 @@ StartMiniServer( unsigned short listen_port )
 
     // taking too long to start that thread
     if( count >= max_count ) {
+
         shutdown( miniSocket->miniServerSock, SD_BOTH );
-        UpnpCloseSocket( miniSocket->miniServerSock );
         shutdown( miniSocket->miniServerStopSock, SD_BOTH );
-        UpnpCloseSocket( miniSocket->miniServerStopSock );
         shutdown( miniSocket->ssdpSock, SD_BOTH );
+        CLIENTONLY( shutdown( miniSocket->ssdpReqSock, SD_BOTH ) );
+
+        UpnpCloseSocket( miniSocket->miniServerSock );
+        UpnpCloseSocket( miniSocket->miniServerStopSock );
         UpnpCloseSocket( miniSocket->ssdpSock );
-#ifdef INCLUDE_CLIENT_APIS
-        shutdown( miniSocket->ssdpReqSock, SD_BOTH );
-        UpnpCloseSocket( miniSocket->ssdpReqSock );
-#endif
+        CLIENTONLY( UpnpCloseSocket( miniSocket->ssdpReqSock ) );
 
         return UPNP_E_INTERNAL_ERROR;
     }
@@ -788,33 +814,33 @@ StartMiniServer( unsigned short listen_port )
 }
 
 /************************************************************************
- * Function: StopMiniServer
- *
- * Parameters:
- *	void
- *
- * Description:
- * 	Stop and Shutdown the MiniServer and free socket 
- *	resources.
- *
- * Return: int
- *		Always returns 0 
- ************************************************************************/
+*	Function :	StopMiniServer
+*
+*	Parameters :
+*		void ;	
+*
+*	Description :	Stop and Shutdown the MiniServer and free socket 
+*		resources.
+*
+*	Return : int ;
+*		Always returns 0 
+*
+*	Note :
+************************************************************************/
 int
 StopMiniServer( void )
 {
 
-    int socklen = sizeof( struct sockaddr_in );
-    int sock;
+    int socklen = sizeof( struct sockaddr_in ),
+      sock;
     struct sockaddr_in ssdpAddr;
     char buf[256] = "ShutDown";
     int bufLen = strlen( buf );
 
-    if( gMServState == MSERV_RUNNING ) {
+    if( gMServState == MSERV_RUNNING )
         gMServState = MSERV_STOPPING;
-    } else {
+    else
         return 0;
-    }
 
     sock = socket( AF_INET, SOCK_DGRAM, 0 );
     if( sock == UPNP_INVALID_SOCKET ) {
@@ -838,4 +864,3 @@ StopMiniServer( void )
     UpnpCloseSocket( sock );
     return 0;
 }
-

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

@@ -396,7 +396,7 @@ scanner_get_str( IN scanner_t * scanner )
 * Note :
 ************************************************************************/
 #warning The only use of the function 'scanner_pushback()' in the code is commented out.
-#warning 'scanner_pushback()' is a candidate for removal.
+#warning 'scanner_pushback()' is a good candidate for removal.
 static UPNP_INLINE void
 scanner_pushback( INOUT scanner_t * scanner,
                   IN size_t pushback_bytes )
@@ -966,7 +966,7 @@ read_until_crlf( INOUT scanner_t * scanner,
 *   PARSE_INCOMPLETE
 ************************************************************************/
 #warning There are currently no uses of the function 'skip_to_end_of_header()' in the code.
-#warning 'skip_to_end_of_header()' is a candidate for removal.
+#warning 'skip_to_end_of_header()' is a good candidate for removal.
 static UPNP_INLINE int
 skip_to_end_of_header( INOUT scanner_t * scanner )
 {

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

@@ -29,10 +29,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-/******************************************************************************
- * Purpose: This file defines the Web Server and has functions to carry out
- * operations of the Web Server.
- ******************************************************************************/
+/************************************************************************
+* Purpose: This file defines the Web Server and has functions to carry out 
+* operations of the Web Server.										
+************************************************************************/
 
 #include "config.h"
 #include <assert.h>
@@ -64,12 +64,8 @@
 /*
    Response Types 
  */
-enum resp_type {
-	RESP_FILEDOC,
-	RESP_XMLDOC,
-	RESP_HEADERS,
-	RESP_WEBDOC,
-	RESP_POST };
+enum resp_type { RESP_FILEDOC, RESP_XMLDOC, RESP_HEADERS, RESP_WEBDOC,
+        RESP_POST };
 
 // mapping of file extension to content-type of document
 struct document_type_t {
@@ -99,18 +95,18 @@ static const char *gMediaTypes[] = {
  */
 
 // index into 'gMediaTypes'
-#define AUDIO_STR        "\1"
-#define VIDEO_STR        "\2"
-#define IMAGE_STR        "\3"
-#define APPLICATION_STR  "\4"
-#define TEXT_STR         "\5"
+#define AUDIO_STR		"\1"
+#define VIDEO_STR		"\2"
+#define IMAGE_STR		"\3"
+#define APPLICATION_STR "\4"
+#define TEXT_STR		"\5"
 
 // int index
-#define APPLICATION_INDEX 4
-#define TEXT_INDEX        5
+#define APPLICATION_INDEX	4
+#define TEXT_INDEX			5
 
 // general
-#define NUM_MEDIA_TYPES       69
+#define NUM_MEDIA_TYPES 69
 #define NUM_HTTP_HEADER_NAMES 33
 
 // sorted by file extension; must have 'NUM_MEDIA_TYPES' extensions
@@ -186,9 +182,12 @@ static const char *gEncodedMediaTypes =
     "zip\0" APPLICATION_STR "zip\0" "\0";
     // *** end ***
 
-/************************************************************************
+/***********************************************************************/
+/*
    module variables - Globals, static and externs                      
-************************************************************************/
+ */
+
+/***********************************************************************/
 static struct document_type_t gMediaTypeList[NUM_MEDIA_TYPES];
 membuffer gDocumentRootDir;     // a local dir which serves as webserver root
 static struct xml_alias_t gAliasDoc;    // XML document
@@ -196,16 +195,16 @@ static ithread_mutex_t gWebMutex;
 extern str_int_entry Http_Header_Names[NUM_HTTP_HEADER_NAMES];
 
 /************************************************************************
- * Function: has_xml_content_type
- *
- * Parameters:
- *	none
- *
- * Description: decodes list and stores it in gMediaTypeList
- *
- * Returns:
- *	 void
- ************************************************************************/
+* Function: has_xml_content_type										
+*																		
+* Parameters:															
+*	none																
+*																		
+* Description: decodes list and stores it in gMediaTypeList				
+*																		
+* Returns:																
+*	 void																
+************************************************************************/
 static UPNP_INLINE void
 media_list_init( void )
 {
@@ -230,20 +229,20 @@ media_list_init( void )
 }
 
 /************************************************************************
- * Function: has_xml_content_type
- *
- * Parameters:
- *	IN const char* extension ;
- *	OUT const char** con_type,
- *	OUT const char** con_subtype
- *
- * Description: Based on the extension, returns the content type and
- *	content subtype
- *
- * Returns:
- *	 0 on success;
- *	-1 on error
- ************************************************************************/
+* Function: has_xml_content_type										
+*																		
+* Parameters:															
+*	IN const char* extension ; 											
+*	OUT const char** con_type,											
+*	OUT const char** con_subtype										
+*																		
+* Description: Based on the extension, returns the content type and 	
+*	content subtype														
+*																		
+* Returns:																
+*	 0 on success;														
+*	-1 on error															
+************************************************************************/
 static UPNP_INLINE int
 search_extension( IN const char *extension,
                   OUT const char **con_type,
@@ -277,20 +276,20 @@ search_extension( IN const char *extension,
 }
 
 /************************************************************************
- * Function: get_content_type
- *
- * Parameters:
- *	IN const char* filename,
- *	OUT DOMString* content_type
- *
- * Description: Based on the extension, clones an XML string based on
- *	type and content subtype. If content type and sub type are not
- *	found, unknown types are used
- *
- * Returns:
- *	 0 - On Sucess
- *	 UPNP_E_OUTOF_MEMORY - on memory allocation failures
- ************************************************************************/
+* Function: get_content_type											
+*																		
+* Parameters:															
+*	IN const char* filename,											
+*	OUT DOMString* content_type											
+*																		
+* Description: Based on the extension, clones an XML string based on	
+*	type and content subtype. If content type and sub type are not		
+*	found, unknown types are used										
+*																		
+* Returns:																
+*	 0 - On Sucess														
+*	 UPNP_E_OUTOF_MEMORY - on memory allocation failures				
+************************************************************************/
 UPNP_INLINE int
 get_content_type( IN const char *filename,
                   OUT DOMString * content_type )
@@ -338,17 +337,17 @@ get_content_type( IN const char *filename,
 }
 
 /************************************************************************
- * Function: glob_alias_init
- *
- * Parameters:
- *	none
- *
- * Description: Initialize the global XML document. Allocate buffers
- *	for the XML document
- *
- * Returns:
- *	 void
- ************************************************************************/
+* Function: glob_alias_init												
+*																		
+* Parameters:															
+*	none																
+*																		
+* Description: Initialize the global XML document. Allocate buffers		
+*	for the XML document												
+*																		
+* Returns:																
+*	 void																
+************************************************************************/
 static UPNP_INLINE void
 glob_alias_init( void )
 {
@@ -361,16 +360,16 @@ glob_alias_init( void )
 }
 
 /************************************************************************
- * Function: is_valid_alias
- *
- * Parameters:
- *	IN const struct xml_alias_t* alias ; XML alias object
- *
- * Description: Check for the validity of the XML object buffer
- *
- * Returns:
- *	 BOOLEAN
- ************************************************************************/
+* Function: is_valid_alias												
+*																		
+* Parameters:															
+*	IN const struct xml_alias_t* alias ; XML alias object				
+*																		
+* Description: Check for the validity of the XML object buffer													
+*																		
+* Returns:																
+*	 BOOLEAN															
+************************************************************************/
 static UPNP_INLINE xboolean
 is_valid_alias( IN const struct xml_alias_t *alias )
 {
@@ -378,17 +377,17 @@ is_valid_alias( IN const struct xml_alias_t *alias )
 }
 
 /************************************************************************
- * Function: alias_grab
- *
- * Parameters:
- *	OUT struct xml_alias_t* alias ; XML alias object
- *
- * Description: Copy the contents of the global XML document into the
- *	local OUT parameter
- *
- * Returns:
- *	 void
- ************************************************************************/
+* Function: alias_grab													
+*																		
+* Parameters:															
+*	OUT struct xml_alias_t* alias ; XML alias object										
+*																		
+* Description: Copy the contents of the global XML document into the	
+*	local OUT parameter																							
+*																		
+* Returns:																
+*	 void																
+************************************************************************/
 static void
 alias_grab( OUT struct xml_alias_t *alias )
 {
@@ -403,17 +402,17 @@ alias_grab( OUT struct xml_alias_t *alias )
 }
 
 /************************************************************************
- * Function: alias_release
- *
- * Parameters:
- *	IN struct xml_alias_t* alias ; XML alias object
- *
- * Description: Release the XML document referred to by the IN parameter
- *	Free the allocated buffers associated with this object
- *
- * Returns:
- *	void
- ************************************************************************/
+* Function: alias_release												
+*																		
+* Parameters:															
+*	IN struct xml_alias_t* alias ; XML alias object										
+*																		
+* Description: Release the XML document referred to by the IN parameter 
+*	Free the allocated buffers associated with this object				
+*																		
+* Returns:																
+*	void																
+************************************************************************/
 static void
 alias_release( IN struct xml_alias_t *alias )
 {
@@ -437,24 +436,24 @@ alias_release( IN struct xml_alias_t *alias )
 }
 
 /************************************************************************
- * Function: web_server_set_alias
- *
- * Parameters:
- *	alias_name: webserver name of alias; created by caller and freed by
- *		caller (doesn't even have to be malloc()d .)
- *	alias_content:	the xml doc; this is allocated by the caller; and
- *		freed by the web server
- *	alias_content_length: length of alias body in bytes
- *	last_modified:	time when the contents of alias were last
- *		changed (local time)
- *
- * Description: Replaces current alias with the given alias. To remove
- *	the current alias, set alias_name to NULL.
- *
- * Returns:
- *	0 - OK
- *	UPNP_E_OUTOF_MEMORY: note: alias_content is not freed here
- ************************************************************************/
+* Function: web_server_set_alias										
+*																		
+* Parameters:															
+*	alias_name: webserver name of alias; created by caller and freed by 
+*				caller (doesn't even have to be malloc()d .)					
+*	alias_content:	the xml doc; this is allocated by the caller; and	
+*					freed by the web server											
+*	alias_content_length: length of alias body in bytes					
+*	last_modified:	time when the contents of alias were last			
+*					changed (local time)											
+*																		
+* Description: Replaces current alias with the given alias. To remove	
+*	the current alias, set alias_name to NULL.							
+*																		
+* Returns:																
+*	0 - OK																
+*	UPNP_E_OUTOF_MEMORY: note: alias_content is not freed here			
+************************************************************************/
 int
 web_server_set_alias( IN const char *alias_name,
                       IN const char *alias_content,
@@ -517,19 +516,19 @@ web_server_set_alias( IN const char *alias_name,
 }
 
 /************************************************************************
- * Function: web_server_init
- *
- * Parameters:
- *	none
- *
- * Description: Initilialize the different documents. Initialize the
- *	memory for root directory for web server. Call to initialize global
- *	XML document. Sets bWebServerState to WEB_SERVER_ENABLED
- *
- * Returns:
- *	0 - OK
- *	UPNP_E_OUTOF_MEMORY: note: alias_content is not freed here
- ************************************************************************/
+* Function: web_server_init												
+*																		
+* Parameters:															
+*	none																
+*																		
+* Description: Initilialize the different documents. Initialize the		
+*	memory for root directory for web server. Call to initialize global 
+*	XML document. Sets bWebServerState to WEB_SERVER_ENABLED			
+*																		
+* Returns:																
+*	0 - OK																
+*	UPNP_E_OUTOF_MEMORY: note: alias_content is not freed here			
+************************************************************************/
 int
 web_server_init( void )
 {
@@ -553,18 +552,18 @@ web_server_init( void )
 }
 
 /************************************************************************
- * Function: web_server_destroy
- *
- * Parameters:
- *	none
- *
- * Description: Release memory allocated for the global web server root
- *	directory and the global XML document
- *	Resets the flag bWebServerState to WEB_SERVER_DISABLED
- *
- * Returns:
- *	void
- ************************************************************************/
+* Function: web_server_destroy											
+*																		
+* Parameters:															
+*	none																
+*																		
+* Description: Release memory allocated for the global web server root	
+*	directory and the global XML document								
+*	Resets the flag bWebServerState to WEB_SERVER_DISABLED				
+*																		
+* Returns:																
+*	void																
+************************************************************************/
 void
 web_server_destroy( void )
 {
@@ -585,22 +584,23 @@ web_server_destroy( void )
 }
 
 /************************************************************************
- * Function: get_file_info
- *
- * Parameters:
- *	IN const char* filename ;     Filename having the description document
- *	OUT struct File_Info * info ; File information object having file 
- *		attributes such as filelength, when was the file last
- *		modified, whether a file or a directory and whether the
- *		file or directory is readable.
- *
- * Description: Release memory allocated for the global web server root
- *	directory and the global XML document
- *	Resets the flag bWebServerState to WEB_SERVER_DISABLED
- *
- * Returns:
- *	int
- ************************************************************************/
+* Function: get_file_info												
+*																		
+* Parameters:															
+*	IN const char* filename ; 	Filename having the description document
+*	OUT struct File_Info * info ; File information object having file 
+*								  attributes such as filelength, when was 
+*								  the file last modified, whether a file 
+*								  or a directory and whether the file or
+*								  directory is readable. 
+*																		
+* Description: Release memory allocated for the global web server root	
+*	directory and the global XML document								
+*	Resets the flag bWebServerState to WEB_SERVER_DISABLED				
+*																		
+* Returns:																
+*	int																	
+************************************************************************/
 static int
 get_file_info( IN const char *filename,
                OUT struct File_Info *info )
@@ -647,19 +647,19 @@ get_file_info( IN const char *filename,
 }
 
 /************************************************************************
- * Function: web_server_set_root_dir
- *
- * Parameters:
- *	IN const char* root_dir ; String having the root directory for the
- *		document
- *
- * Description: Assign the path specfied by the IN const char* root_dir
- *	parameter to the global Document root directory. Also check for
- *	path names ending in '/'
- *
- * Returns:
- *	int
- ************************************************************************/
+* Function: web_server_set_root_dir										
+*																		
+* Parameters:															
+*	IN const char* root_dir ; String having the root directory for the 
+*								document		 						
+*																		
+* Description: Assign the path specfied by the IN const char* root_dir	
+*	parameter to the global Document root directory. Also check for		
+*	path names ending in '/'											
+*																		
+* Returns:																
+*	int																	
+************************************************************************/
 int
 web_server_set_root_dir( IN const char *root_dir )
 {
@@ -682,23 +682,24 @@ web_server_set_root_dir( IN const char *root_dir )
 }
 
 /************************************************************************
- * Function: get_alias
- *
- * Parameters:
- *	IN const char* request_file ; request file passed in to be compared with
- *	OUT struct xml_alias_t* alias ; xml alias object which has a file name
- *		stored
- *   OUT struct File_Info * info	 ; File information object which will be
- *		filled up if the file comparison succeeds
- *
- * Description: Compare the files names between the one on the XML alias
- *	the one passed in as the input parameter. If equal extract file
- *	information
- *
- * Returns:
- *	TRUE - On Success
- *	FALSE if request is not an alias
- ************************************************************************/
+* Function: get_alias													
+*																		
+* Parameters:															
+*	IN const char* request_file ; request file passed in to be compared with
+*	OUT struct xml_alias_t* alias ; xml alias object which has a file name 
+*									stored										
+*   OUT struct File_Info * info	 ; File information object which will be 
+*									filled up if the file comparison 
+*									succeeds										
+*																		
+* Description: Compare the files names between the one on the XML alias 
+*	the one passed in as the input parameter. If equal extract file 
+*	information
+*																		
+* Returns:																
+*	TRUE - On Success													
+*	FALSE if request is not an alias									
+************************************************************************/
 static UPNP_INLINE xboolean
 get_alias( IN const char *request_file,
            OUT struct xml_alias_t *alias,
@@ -719,17 +720,17 @@ get_alias( IN const char *request_file,
 }
 
 /************************************************************************
- * Function: isFileInVirtualDir
- *
- * Parameters:
- *	IN char *filePath ; directory path to be tested for virtual directory
- *
- * Description: Compares filePath with paths from the list of virtual
- *	directory lists
- *
- * Returns:
- *	BOOLEAN	
- ************************************************************************/
+* Function: isFileInVirtualDir											
+*																		
+* Parameters:															
+*	IN char *filePath ; directory path to be tested for virtual directory
+*																		
+* Description: Compares filePath with paths from the list of virtual
+*				directory lists
+*																		
+* Returns:																
+*	BOOLEAN																
+************************************************************************/
 int
 isFileInVirtualDir( IN char *filePath )
 {
@@ -756,16 +757,16 @@ isFileInVirtualDir( IN char *filePath )
 }
 
 /************************************************************************
- * Function: ToUpperCase
- *
- * Parameters:
- *	INOUT char * Str ; Input string to be converted
- *
- * Description: Converts input string to upper case
- *
- * Returns:
- *	int
- ************************************************************************/
+* Function: ToUpperCase
+*
+* Parameters:
+*	INOUT char * Str ; Input string to be converted
+*
+* Description: Converts input string to upper case
+*
+* Returns:
+*	int
+************************************************************************/
 int
 ToUpperCase( char *Str )
 {
@@ -778,17 +779,17 @@ ToUpperCase( char *Str )
 }
 
 /************************************************************************
- * Function: StrStr
- *
- * Parameters:
- *	IN char * S1 ; Input string
- *	IN char * S2 ; Input sub-string
- *
- * Description: Finds a substring from a string
- *
- * Returns:
- *	char * ptr - pointer to the first occurence of S2 in S1
- ************************************************************************/
+* Function: StrStr
+*
+* Parameters:
+*	IN char * S1 ; Input string
+*	IN char * S2 ; Input sub-string
+*
+* Description: Finds a substring from a string
+*
+* Returns:
+*	char * ptr - pointer to the first occurence of S2 in S1				
+************************************************************************/
 char *
 StrStr( char *S1,
         char *S2 )
@@ -828,17 +829,17 @@ StrStr( char *S1,
 }
 
 /************************************************************************
- * Function: StrTok
- *
- * Parameters:
- *	IN char ** Src ; String containing the token
- *	IN char * del ; Set of delimiter characters
- *
- * Description: Finds next token in a string
- *
- * Returns:
- *	char * ptr - pointer to the first occurence of S2 in S1
- ************************************************************************/
+* Function: StrTok														
+*																		
+* Parameters:															
+*	IN char ** Src ; String containing the token													
+*	IN char * del ; Set of delimiter characters														
+*																		
+* Description: Finds next token in a string							
+*																		
+* Returns:																
+*	char * ptr - pointer to the first occurence of S2 in S1				
+************************************************************************/
 char *
 StrTok( char **Src,
         char *Del )
@@ -862,41 +863,39 @@ StrTok( char **Src,
 }
 
 /************************************************************************
- * Function: GetNextRange
- *
- * Parameters:
- *	IN char ** SrcRangeStr ; string containing the token / range
- *	OUT int * FirstByte ;	 gets the first byte of the token
- *	OUT int * LastByte	; gets the last byte of the token
- *
- * Description: Returns a range of integers from a string
- *
- * Returns: int	;
- *	always returns 1;
- ************************************************************************/
+* Function: GetNextRange												
+*																		
+* Parameters:															
+*	IN char ** SrcRangeStr ; string containing the token / range										
+*	OUT int * FirstByte ;	 gets the first byte of the token												
+*	OUT int * LastByte	; gets the last byte of the token												
+*																		
+* Description: Returns a range of integers from a sring					
+*																		
+* Returns: int	;
+*	always returns 1;				
+************************************************************************/
 int
 GetNextRange( char **SrcRangeStr,
               off_t *FirstByte,
               off_t *LastByte )
 {
-    char *Ptr;
-    char *Tok;
-    int i;
-    int64_t F = -1;
-    int64_t L = -1;
+    char *Ptr,
+     *Tok;
+    int i,
+      F = -1,
+      L = -1;
     int Is_Suffix_byte_Range = 1;
 
-    if( *SrcRangeStr == NULL ) {
+    if( *SrcRangeStr == NULL )
         return -1;
-    }
 
     Tok = StrTok( SrcRangeStr, "," );
 
-    if( ( Ptr = strstr( Tok, "-" ) ) == NULL ) {
+    if( ( Ptr = strstr( Tok, "-" ) ) == NULL )
         return -1;
-    }
     *Ptr = ' ';
-    sscanf( Tok, "%"SCNd64"%"SCNd64, &F, &L );
+    sscanf( Tok, "%d%d", &F, &L );
 
     if( F == -1 || L == -1 ) {
         *Ptr = '-';
@@ -911,35 +910,36 @@ GetNextRange( char **SrcRangeStr,
         }
 
         if( Is_Suffix_byte_Range ) {
-            *FirstByte = (off_t)L;
-            *LastByte = (off_t)F;
+            *FirstByte = L;
+            *LastByte = F;
             return 1;
         }
     }
-    *FirstByte = (off_t)F;
-    *LastByte = (off_t)L;
 
+    *FirstByte = F;
+    *LastByte = L;
     return 1;
+
 }
 
 /************************************************************************
- * Function: CreateHTTPRangeResponseHeader
- *
- * Parameters:
- *	char * ByteRangeSpecifier ; String containing the range
- *	long FileLength ; Length of the file
- *	OUT struct SendInstruction * Instr ; SendInstruction object
- *		where the range operations will be stored
- *
- * Description: Fills in the Offset, read size and contents to send out
- *	as an HTTP Range Response
- *
- * Returns:
- *	HTTP_BAD_REQUEST
- *	UPNP_E_OUTOF_MEMORY
- *	HTTP_REQUEST_RANGE_NOT_SATISFIABLE
- *	HTTP_OK	
- ************************************************************************/
+* Function: CreateHTTPRangeResponseHeader								
+*																		
+* Parameters:															
+*	char * ByteRangeSpecifier ; String containing the range 	
+*	long FileLength ; Length of the file													
+*	OUT struct SendInstruction * Instr ; SendInstruction object	where the 
+*										range operations will be stored
+*																		
+* Description: Fills in the Offset, read size and contents to send out	
+*	as an HTTP Range Response											
+*																		
+* Returns:																
+*	HTTP_BAD_REQUEST													
+*	UPNP_E_OUTOF_MEMORY													
+*	HTTP_REQUEST_RANGE_NOT_SATISFIABLE									
+*	HTTP_OK																
+************************************************************************/
 int
 CreateHTTPRangeResponseHeader( char *ByteRangeSpecifier,
                                off_t FileLength,
@@ -1035,24 +1035,24 @@ CreateHTTPRangeResponseHeader( char *ByteRangeSpecifier,
 }
 
 /************************************************************************
- * Function: CheckOtherHTTPHeaders
- *
- * Parameters:
- *	IN http_message_t * Req ;  HTTP Request message
- *	OUT struct SendInstruction * RespInstr ; Send Instruction object to
- *		data for the response
- *	int FileSize ;	Size of the file containing the request document
- *
- * Description: Get header id from the request parameter and take
- *	appropriate action based on the ids.
- *	as an HTTP Range Response
- *
- * Returns:
- *	HTTP_BAD_REQUEST
- *	UPNP_E_OUTOF_MEMORY
- *	HTTP_REQUEST_RANGE_NOT_SATISFIABLE
- *	HTTP_OK
- ************************************************************************/
+* Function: CheckOtherHTTPHeaders										
+*																		
+* Parameters:															
+*	IN http_message_t * Req ;  HTTP Request message
+*	OUT struct SendInstruction * RespInstr ; Send Instruction object to 
+*							data for the response
+*	int FileSize ;	Size of the file containing the request document
+*																		
+* Description: Get header id from the request parameter and take		
+*	appropriate action based on the ids.								
+*	as an HTTP Range Response											
+*																		
+* Returns:																
+*	HTTP_BAD_REQUEST													
+*	UPNP_E_OUTOF_MEMORY													
+*	HTTP_REQUEST_RANGE_NOT_SATISFIABLE									
+*	HTTP_OK																
+************************************************************************/
 int
 CheckOtherHTTPHeaders( IN http_message_t * Req,
                        OUT struct SendInstruction *RespInstr,
@@ -1166,27 +1166,27 @@ CheckOtherHTTPHeaders( IN http_message_t * Req,
 }
 
 /************************************************************************
- * Function: process_request
- *
- * Parameters:
- *	IN http_message_t *req ; HTTP Request message
- *	OUT enum resp_type *rtype ; Tpye of response
- *	OUT membuffer *headers ;
- *	OUT membuffer *filename ; Get filename from request document
- *	OUT struct xml_alias_t *alias ; Xml alias document from the
- *		request document,
- *	OUT struct SendInstruction * RespInstr ; Send Instruction object
- *		where the response is set up.
- *
- * Description: Processes the request and returns the result in the OUT
- *	parameters
- *
- * Returns:
- *	HTTP_BAD_REQUEST
- *	UPNP_E_OUTOF_MEMORY
- *	HTTP_REQUEST_RANGE_NOT_SATISFIABLE
- *	HTTP_OK
- ************************************************************************/
+* Function: process_request												
+*																		
+* Parameters:															
+*	IN http_message_t *req ; HTTP Request message												
+*	OUT enum resp_type *rtype ; Tpye of response											
+*	OUT membuffer *headers ; 												
+*	OUT membuffer *filename ; Get filename from request document
+*	OUT struct xml_alias_t *alias ; Xml alias document from the 
+*									request document,										
+*	OUT struct SendInstruction * RespInstr ; Send Instruction object 
+*					where the response is set up.										
+*																		
+* Description: Processes the request and returns the result in the OUT	
+*	parameters															
+*																		
+* Returns:																
+*	HTTP_BAD_REQUEST													
+*	UPNP_E_OUTOF_MEMORY													
+*	HTTP_REQUEST_RANGE_NOT_SATISFIABLE									
+*	HTTP_OK																
+************************************************************************/
 static int
 process_request( IN http_message_t * req,
                  OUT enum resp_type *rtype,
@@ -1494,23 +1494,23 @@ process_request( IN http_message_t * req,
 }
 
 /************************************************************************
- * Function: http_RecvPostMessage
- *
- * Parameters:
- *	http_parser_t* parser ; HTTP Parser object
- *	IN SOCKINFO *info ; Socket Information object
- *	char * filename ; 	File where received data is copied to
- *	struct SendInstruction * Instr	; Send Instruction object which gives
- *		information whether the file is a virtual file or not.
- *
- * Description: Receives the HTTP post message
- *
- * Returns:
- *	HTTP_INTERNAL_SERVER_ERROR
- *	HTTP_UNAUTHORIZED
- *	HTTP_REQUEST_RANGE_NOT_SATISFIABLE
- *	HTTP_OK
- ************************************************************************/
+* Function: http_RecvPostMessage										
+*																		
+* Parameters:															
+*	http_parser_t* parser ; HTTP Parser object							
+*	IN SOCKINFO *info ; Socket Information object													
+*	char * filename ; 	File where received data is copied to
+*	struct SendInstruction * Instr	; Send Instruction object which gives
+*			information whether the file is a virtual file or not.
+*																		
+* Description: Receives the HTTP post message														
+*																		
+* Returns:																
+*	HTTP_INTERNAL_SERVER_ERROR											
+*	HTTP_UNAUTHORIZED													
+*	HTTP_REQUEST_RANGE_NOT_SATISFIABLE									
+*	HTTP_OK																
+************************************************************************/
 int
 http_RecvPostMessage( http_parser_t * parser,
                       IN SOCKINFO * info,
@@ -1531,7 +1531,7 @@ http_RecvPostMessage( http_parser_t * parser,
 
     if( Instr && Instr->IsVirtualFile ) {
 
-        Fp = (virtualDirCallback.open)( filename, UPNP_WRITE );
+        Fp = virtualDirCallback.open( filename, UPNP_WRITE );
         if( Fp == NULL ) {
             return HTTP_INTERNAL_SERVER_ERROR;
         }
@@ -1658,19 +1658,19 @@ http_RecvPostMessage( http_parser_t * parser,
 }
 
 /************************************************************************
- * Function: web_server_callback
- *
- * Parameters:
- *	IN http_parser_t *parser ; HTTP Parser Object
- *	INOUT http_message_t* req ; HTTP Message request
- *	IN SOCKINFO *info ;	Socket information object
- *
- * Description: main entry point into web server;
- *	handles HTTP GET and HEAD requests
- *
- * Returns:
- *	void
- ************************************************************************/
+* Function: web_server_callback											
+*																		
+* Parameters:															
+*	IN http_parser_t *parser ; HTTP Parser Object						
+*	INOUT http_message_t* req ; HTTP Message request										
+*	IN SOCKINFO *info ;			Socket information object													
+*																		
+* Description: main entry point into web server;						
+*	handles HTTP GET and HEAD requests									
+*																		
+* Returns:																
+*	void																
+************************************************************************/
 void
 web_server_callback( IN http_parser_t * parser,
                      INOUT http_message_t * req,
@@ -1763,4 +1763,3 @@ web_server_callback( IN http_parser_t * parser,
     membuffer_destroy( &headers );
     membuffer_destroy( &filename );
 }
-

upnp/src/genlib/net/sock.c

@@ -231,15 +231,6 @@ sock_read_write( IN SOCKINFO * info,
         }
     }
 
-#ifdef SO_NOSIGPIPE
-    {
-	int old;
-	int set = 1;
-	socklen_t olen = sizeof(old);
-	getsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, &olen);
-	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set));
-#endif
-
     if( bRead ) {
         // read data
         numBytes = recv( sockfd, buffer, bufsize,MSG_NOSIGNAL);
@@ -252,9 +243,6 @@ sock_read_write( IN SOCKINFO * info,
                 send( sockfd, buffer + bytes_sent, byte_left,
                       MSG_DONTROUTE|MSG_NOSIGNAL);
             if( num_written == -1 ) {
-#ifdef SO_NOSIGPIPE
-	        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
-#endif
                 return num_written;
             }
 
@@ -265,11 +253,6 @@ sock_read_write( IN SOCKINFO * info,
         numBytes = bytes_sent;
     }
 
-#ifdef SO_NOSIGPIPE
-	setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen);
-    }
-#endif
-
     if( numBytes < 0 ) {
         return UPNP_E_SOCKET_ERROR;
     }

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

@@ -555,7 +555,7 @@ parse_hostport( const char *in,
     int begin_port;
     int hostport_size = 0;
     int host_size = 0;
-#if !defined(WIN32) && !defined(__OSX__)
+#ifndef WIN32
     char temp_hostbyname_buff[BUFFER_SIZE];
     struct hostent h_buf;
 #endif
@@ -626,61 +626,27 @@ parse_hostport( const char *in,
         // TODO: Use autoconf to discover this rather than the
         // platform-specific stuff below
 #if defined(WIN32) || defined(__CYGWIN__)
-        h = gethostbyname(temp_host_name);
+        h=gethostbyname(temp_host_name);
 #elif defined(SPARC_SOLARIS)
-        errCode = gethostbyname_r(
-                temp_host_name,
-                &h,
-                temp_hostbyname_buff,
-                BUFFER_SIZE, &errcode );
+        errCode = gethostbyname_r( temp_host_name,
+                                   &h,
+                                   temp_hostbyname_buff,
+                                   BUFFER_SIZE, &errcode );
 #elif defined(__FreeBSD__) && __FreeBSD_version < 601103
-        h = lwres_gethostbyname_r(
-                temp_host_name,
-                &h_buf,
-                temp_hostbyname_buff,
-                BUFFER_SIZE, &errcode );
+        h = lwres_gethostbyname_r( temp_host_name,
+                                   &h_buf,
+                                   temp_hostbyname_buff,
+                                   BUFFER_SIZE, &errcode );
         if ( h == NULL ) {
-                errCode = 1;
+            errCode = 1;
         }
-#elif defined(__OSX__)
-        h = gethostbyname(temp_host_name);
-        if ( h == NULL ) {
-                errCode = 1;
-        }
-#elif defined(__linux__)
-        errCode = gethostbyname_r(
-                temp_host_name,
-                &h_buf,
-                temp_hostbyname_buff,
-                BUFFER_SIZE, &h, &errcode );
 #else
-        {
-        struct addrinfo hints, *res, *res0;
-
-        h = NULL;
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = PF_INET;
-        hints.ai_socktype = SOCK_STREAM;
-        errCode = getaddrinfo(temp_host_name, "http", &hints, &res0);
-
-        if (!errCode) {
-            for (res = res0; res; res = res->ai_next) {
-                if (res->ai_family == PF_INET &&
-                    res->ai_addr->sa_family == AF_INET)
-                {
-                    h = &h_buf;
-                    h->h_addrtype = res->ai_addr->sa_family;
-                    h->h_length = 4;
-                    h->h_addr = (void *) temp_hostbyname_buff;
-                    *(struct in_addr *)h->h_addr =
-                        ((struct sockaddr_in *)res->ai_addr)->sin_addr;
-                        break;
-                }
-            }
-            freeaddrinfo(res0);
-        }
-        }
+        errCode = gethostbyname_r( temp_host_name,
+                                   &h_buf,
+                                   temp_hostbyname_buff,
+                                   BUFFER_SIZE, &h, &errcode );
 #endif 
+
         if( errCode == 0 ) {
             if( h ) {
                 if( ( h->h_addrtype == AF_INET ) && ( h->h_length == 4 ) ) {

upnp/src/inc/config.h

@@ -261,7 +261,7 @@
 
 /** @name Other debugging features
           The UPnP SDK contains other features to aid in debugging:
-	  see <upnp/inc/upnpdebug.h>
+	  see <upnp/upnpdebug.h>
  */
 
 #define DEBUG_ALL		1   

upnp/src/inc/httpreadwrite.h

@@ -50,78 +50,73 @@ int
 http_CancelHttpGet( IN void *Handle );
 
 /************************************************************************
- * Function: http_FixUrl
- *
- * Parameters:
- *	IN uri_type* url;		URL to be validated and fixed
- *	OUT uri_type* fixed_url;	URL after being fixed.
- *
- * Description:
- *	Validates URL
- *
- * Returns:
- *	 UPNP_E_INVALID_URL
- * 	 UPNP_E_SUCCESS
- ************************************************************************/
+* Function: http_FixUrl													
+*																		
+* Parameters:															
+*	IN uri_type* url ;			URL to be validated and fixed
+*	OUT uri_type* fixed_url ;	URL after being fixed.
+*																		
+* Description: Validates URL											
+*																		
+* Returns:																
+*	 UPNP_E_INVALID_URL													
+* 	 UPNP_E_SUCCESS														
+************************************************************************/
 int http_FixUrl( IN uri_type* url, OUT uri_type* fixed_url );
 
-
 /************************************************************************
- * Function: http_FixStrUrl
- *
- * Parameters:
- *	IN char* urlstr ; 		Character string as a URL
- *	IN int urlstrlen ; 		Length of the character string
- *	OUT uri_type* fixed_url	;	Fixed and corrected URL
- *
- * Description:
- *	Parses URL and then validates URL
- *
- * Returns:
- *	 UPNP_E_INVALID_URL
- * 	 UPNP_E_SUCCESS
- ************************************************************************/
+* Function: http_FixStrUrl												
+*																		
+* Parameters:															
+*	IN char* urlstr ; 			Character string as a URL				
+*	IN int urlstrlen ; 			Length of the character string								
+*	OUT uri_type* fixed_url	;	Fixed and corrected URL
+*																		
+* Description: Parses URL and then validates URL						
+*																		
+* Returns:																
+*	 UPNP_E_INVALID_URL													
+* 	 UPNP_E_SUCCESS														
+************************************************************************/
 int http_FixStrUrl( IN char* urlstr, IN int urlstrlen, OUT uri_type* fixed_url );
 
 
 /************************************************************************
- * Function: http_Connect
- *
- * Parameters:
- *	IN uri_type* destination_url;	URL containing destination information
- *	OUT uri_type *url;		Fixed and corrected URL
- *
- * Description:
- *	Gets destination address from URL and then connects to the remote end
- *
- *  Returns:
- *	socket descriptor on sucess
- *	UPNP_E_OUTOF_SOCKET
- *	UPNP_E_SOCKET_CONNECT on error
- ************************************************************************/
+* Function: http_Connect												
+*																		
+* Parameters:															
+*	IN uri_type* destination_url ; URL containing destination information					
+*	OUT uri_type *url ;			   Fixed and corrected URL
+*																		
+* Description: Gets destination address from URL and then connects to the 
+*	remote end
+*																		
+* Returns:																
+*	socket descriptor on sucess											
+*	UPNP_E_OUTOF_SOCKET													
+*	UPNP_E_SOCKET_CONNECT on error										
+************************************************************************/
 int http_Connect( IN uri_type* destination_url, OUT uri_type *url );
 
-
 /************************************************************************
- * Function: http_RecvMessage
- *
- * Parameters:
- *	IN SOCKINFO *info;			Socket information object
- *	OUT http_parser_t* parser;		HTTP parser object
- *	IN http_method_t request_method;	HTTP request method
- *	IN OUT int* timeout_secs;		time out
- *	OUT int* http_error_code;		HTTP error code returned
- *
- * Description:
- *	Get the data on the socket and take actions based on the read data
- *	to modify the parser objects buffer. If an error is reported while
- *	parsing the data, the error code is passed in the http_errr_code
- *	parameter
- *
- * Returns:
- *	 UPNP_E_BAD_HTTPMSG
- * 	 UPNP_E_SUCCESS
- ************************************************************************/
+* Function: http_RecvMessage											
+*																		
+* Parameters:															
+*	IN SOCKINFO *info ;					Socket information object
+*	OUT http_parser_t* parser,			HTTP parser object
+*	IN http_method_t request_method ;	HTTP request method					
+*	IN OUT int* timeout_secs ;			time out											
+*	OUT int* http_error_code ;			HTTP error code returned
+*																		
+* Description: Get the data on the socket and take actions based on the 
+*	read data to modify the parser objects buffer. If an error is reported 
+*	while parsing the data, the error code is passed in the http_errr_code 
+*	parameter
+*																		
+* Returns:																
+*	 UPNP_E_BAD_HTTPMSG													
+* 	 UPNP_E_SUCCESS														
+************************************************************************/
 int http_RecvMessage( IN SOCKINFO *info, OUT http_parser_t* parser,
 		IN http_method_t request_method, 
 		IN OUT int* timeout_secs,
@@ -129,311 +124,302 @@ int http_RecvMessage( IN SOCKINFO *info, OUT http_parser_t* parser,
 
 
 /************************************************************************
- * Function: http_SendMessage
- *
- * Parameters:
- *	IN SOCKINFO *info ;		Socket information object
- *	IN OUT int * TimeOut ;		time out value
- *	IN const char* fmt, ...	 Pattern format to take actions upon
- *
- * Description:
- *	Sends a message to the destination based on the
- *	IN const char* fmt parameter
- *	fmt types:
- *		'f':	arg = const char * file name
- *		'm':	arg1 = const char * mem_buffer; arg2= size_t buf_length
- *	E.g.:
- *		char *buf = "POST /xyz.cgi http/1.1\r\n\r\n";
- *		char *filename = "foo.dat";
- *		int status = http_SendMessage( tcpsock, "mf",
- *			buf, strlen(buf),	// args for memory buffer
- *			filename );		// arg for file
- *
- * Returns:
- *	UPNP_E_OUTOF_MEMORY
- * 	UPNP_E_FILE_READ_ERROR
- *	UPNP_E_SUCCESS
- ************************************************************************/
-int http_SendMessage(
-	IN SOCKINFO *info,
-	IN OUT int* timeout_secs, 
-	IN const char* fmt, ... );
+* Function: http_SendMessage											
+*																		
+* Parameters:															
+*	IN SOCKINFO *info ;		Socket information object
+*	IN OUT int * TimeOut ; 	time out value											
+*	IN const char* fmt, ...	 Pattern format to take actions upon								
+*																		
+* Description: Sends a message to the destination based on the			
+*	IN const char* fmt parameter										
+*	fmt types:															
+*		'f':	arg = const char * file name							
+*		'm':	arg1 = const char * mem_buffer; arg2= size_t buf_length	
+*	E.g.:																
+*		char *buf = "POST /xyz.cgi http/1.1\r\n\r\n";					
+*		char *filename = "foo.dat";										
+*		int status = http_SendMessage( tcpsock, "mf",					
+*					buf, strlen(buf),	// args for memory buffer		
+*					filename );			// arg for file					
+*																		
+* Returns:																
+*	UPNP_E_OUTOF_MEMORY													
+* 	UPNP_E_FILE_READ_ERROR												
+*	UPNP_E_SUCCESS														
+************************************************************************/
+int http_SendMessage( IN SOCKINFO *info, IN OUT int* timeout_secs, 
+					  IN const char* fmt, ... );
+
+/************************************************************************
+* Function: http_RequestAndResponse										
+*																		
+* Parameters:															
+*	IN uri_type* destination ;		Destination URI object which contains 
+*									remote IP address among other elements
+*	IN const char* request ;		Request to be sent
+*	IN size_t request_length ;		Length of the request
+*	IN http_method_t req_method ;	HTTP Request method
+*	IN int timeout_secs ;			time out value
+*	OUT http_parser_t* response	;	Parser object to receive the repsonse
+*																		
+* Description: Initiates socket, connects to the destination, sends a	
+*	request and waits for the response from the remote end				
+*																		
+* Returns:																
+*	UPNP_E_SOCKET_ERROR													
+* 	UPNP_E_SOCKET_CONNECT												
+*	Error Codes returned by http_SendMessage							
+*	Error Codes returned by http_RecvMessage							
+************************************************************************/
+int http_RequestAndResponse( IN uri_type* destination,
+						   IN const char* request, IN size_t request_length,
+						   IN http_method_t req_method,
+						   IN int timeout_secs, 
+						   OUT http_parser_t* response );
+
+/************************************************************************
+*  return codes:
+*		0 -- success
+*		UPNP_E_OUTOF_MEMORY
+*		UPNP_E_TIMEDOUT
+*		UPNP_E_BAD_REQUEST
+*		UPNP_E_BAD_RESPONSE
+*		UPNP_E_INVALID_URL
+*		UPNP_E_SOCKET_READ
+*		UPNP_E_SOCKET_WRITE
+************************************************************************/
+
+/************************************************************************
+*	Function :	http_Download
+*
+*	Parameters :
+*		IN const char* url_str :	String as a URL
+*		IN int timeout_secs :		time out value
+*		OUT char** document :		buffer to store the document extracted
+*									from the donloaded message.
+*		OUT int* doc_length :		length of the extracted document
+*	    OUT char* content_type :	Type of content
+*
+*	Description :	Download the document message and extract the document 
+*		from the message.
+*
+*	Return : int;
+*		UPNP_E_SUCCESS;
+*		UPNP_E_INVALID_URL;
+*			
+*
+*	Note :
+************************************************************************/
+int http_Download( IN const char* url, 
+				   IN int timeout_secs,
+				   OUT char** document, OUT int* doc_length,
+				   OUT char* content_type );
 
 
 /************************************************************************
- * Function: http_RequestAndResponse
- *
- * Parameters:
- *	IN uri_type* destination;	Destination URI object which contains
- *					remote IP address among other elements
- *	IN const char* request;		Request to be sent
- *	IN size_t request_length;	Length of the request
- *	IN http_method_t req_method;	HTTP Request method
- *	IN int timeout_secs;		time out value
- *	OUT http_parser_t* response;	Parser object to receive the repsonse
- *
- * Description:
- *	Initiates socket, connects to the destination, sends a
- *	request and waits for the response from the remote end
- *
- * Returns:
- *	UPNP_E_SOCKET_ERROR
- * 	UPNP_E_SOCKET_CONNECT
- *	Error Codes returned by http_SendMessage
- *	Error Codes returned by http_RecvMessage
- ************************************************************************/
-int http_RequestAndResponse(
-	IN uri_type* destination,
-	IN const char* request,
-	IN size_t request_length,
-	IN http_method_t req_method,
-	IN int timeout_secs, 
-	OUT http_parser_t* response );
-
-
-/************************************************************************
- * return codes:
- *	0 -- success
- *	UPNP_E_OUTOF_MEMORY
- *	UPNP_E_TIMEDOUT
- *	UPNP_E_BAD_REQUEST
- *	UPNP_E_BAD_RESPONSE
- *	UPNP_E_INVALID_URL
- *	UPNP_E_SOCKET_READ
- *	UPNP_E_SOCKET_WRITE
- ************************************************************************/
-
-
-/************************************************************************
- * Function: http_Download
- *
- * Parameters:
- *	IN const char* url_str;	String as a URL
- *	IN int timeout_secs;	time out value
- *	OUT char** document;	buffer to store the document extracted
- *				from the donloaded message.
- *	OUT int* doc_length;	length of the extracted document
- *	OUT char* content_type;	Type of content
- *
- * Description:
- *	Download the document message and extract the document 
- *	from the message.
- *
- * Return: int
- *	UPNP_E_SUCCESS
- *	UPNP_E_INVALID_URL
- ************************************************************************/
-int http_Download(
-	IN const char* url, 
-	IN int timeout_secs,
-	OUT char** document,
-	OUT int* doc_length,
-	OUT char* content_type );
-
-
-/************************************************************************
- * Function: http_WriteHttpPost
- *
- * Parameters:
- *	IN void *Handle:	Handle to the http post object
- *	IN char *buf:		Buffer to send to peer, if format used
- *				is not UPNP_USING_CHUNKED, 
- *	IN unsigned int *size:	Size of the data to be sent.
- *	IN int timeout:		time out value
- *
- * Description:
- *	Formats data if format used is UPNP_USING_CHUNKED.
- *	Writes data on the socket connected to the peer.
- *
- * Return: int
- *	UPNP_E_SUCCESS - On Success
- *	UPNP_E_INVALID_PARAM - Invalid Parameter
- *	-1 - On Socket Error.
- ************************************************************************/
+*	Function :	http_WriteHttpPost
+*
+*	Parameters :
+*		IN void *Handle :		Handle to the http post object
+*		IN char *buf :			Buffer to send to peer, if format used
+*								is not UPNP_USING_CHUNKED, 
+*		IN unsigned int *size :	Size of the data to be sent.
+*		IN int timeout :		time out value
+*
+*	Description :	Formats data if format used is UPNP_USING_CHUNKED.
+*		Writes data on the socket connected to the peer.
+*
+*	Return : int ;
+*		UPNP_E_SUCCESS - On Success
+*		UPNP_E_INVALID_PARAM - Invalid Parameter
+*		-1 - On Socket Error.
+*
+*	Note :
+************************************************************************/
 int http_WriteHttpPost(IN void *Handle,
 		       IN char *buf,
 		       IN unsigned int *size,
 		       IN int timeout);
 
-
 /************************************************************************
- * Function: http_CloseHttpPost
- *
- * Parameters:
- *	IN void *Handle;	Handle to the http post object
- *	IN OUT int *httpStatus;	HTTP status returned on receiving a
- *				response message
- *	IN int timeout;		time out value
- *
- * Description:
- *	Sends remaining data if using  UPNP_USING_CHUNKED 
- *	format. Receives any more messages. Destroys socket and any socket
- *	associated memory. Frees handle associated with the HTTP POST msg.
- *
- * Return: int
- *	UPNP_E_SUCCESS		- On Sucess
- *	UPNP_E_INVALID_PARAM	- Invalid Parameter
- ************************************************************************/
+*	Function :	http_CloseHttpPost
+*
+*	Parameters :
+*		IN void *Handle :			Handle to the http post object
+*		IN OUT int *httpStatus :	HTTP status returned on receiving a
+*									response message
+*		IN int timeout :			time out value
+*
+*	Description :	Sends remaining data if using  UPNP_USING_CHUNKED 
+*		format. Receives any more messages. Destroys socket and any socket
+*		associated memory. Frees handle associated with the HTTP POST msg.
+*
+*	Return : int ;
+*		UPNP_E_SUCCESS - On Sucess ;
+*		UPNP_E_INVALID_PARAM  - Invalid Parameter;
+*
+*	Note :
+************************************************************************/
 int http_CloseHttpPost(IN void *Handle, 
 		       IN OUT int *httpStatus,
 		       IN int timeout);
 
-
 /************************************************************************
- * Function: http_OpenHttpPost
- *
- * Parameters:
- *	IN const char *url_str;		String as a URL	
- *	IN OUT void **Handle;		Pointer to buffer to store HTTP
- *					post handle
- *	IN const char *contentType;	Type of content
- *	IN int contentLength;		length of content
- *	IN int timeout;			time out value
- *
- * Description:
- *	Makes the HTTP POST message, connects to the peer, 
- *	sends the HTTP POST request. Adds the post handle to buffer of 
- *	such handles
- *
- * Return : int;
- *	UPNP_E_SUCCESS		- On Sucess
- *	UPNP_E_INVALID_PARAM	- Invalid Parameter
- *	UPNP_E_OUTOF_MEMORY
- *	UPNP_E_SOCKET_ERROR
- *	UPNP_E_SOCKET_CONNECT
- ************************************************************************/
+*	Function :	http_OpenHttpPost
+*
+*	Parameters :
+*		IN const char *url_str :		String as a URL	
+*		IN OUT void **Handle :			Pointer to buffer to store HTTP
+*										post handle
+*		IN const char *contentType :	Type of content
+*		IN int contentLength :			length of content
+*		IN int timeout :				time out value
+*
+*	Description :	Makes the HTTP POST message, connects to the peer, 
+*		sends the HTTP POST request. Adds the post handle to buffer of 
+*		such handles
+*
+*	Return : int;
+*		UPNP_E_SUCCESS - On Sucess ;
+*		UPNP_E_INVALID_PARAM - Invalid Paramter ;
+*		UPNP_E_OUTOF_MEMORY ;
+*		UPNP_E_SOCKET_ERROR ;
+*		UPNP_E_SOCKET_CONNECT ;
+*
+*	Note :
+************************************************************************/
 int http_OpenHttpPost(IN const char *url_str,
 		      IN OUT void **Handle,
 		      IN const char *contentType,
 		      IN int contentLength,
 		      IN int timeout);
 
+/************************************************************************
+*	Function :	http_ReadHttpGet
+*
+*	Parameters :
+*		IN void *Handle :			Handle to the HTTP get object
+*		IN OUT char *buf :			Buffer to get the read and parsed data
+*		IN OUT unsigned int *size :	Size of tge buffer passed
+*		IN int timeout :			time out value
+*
+*	Description :	Parses already existing data, then gets new data.
+*		Parses and extracts information from the new data.
+*
+*	Return : int ;
+*		UPNP_E_SUCCESS - On Sucess ;
+*		UPNP_E_INVALID_PARAM  - Invalid Parameter;
+*		UPNP_E_BAD_RESPONSE ;
+*		UPNP_E_BAD_HTTPMSG ;
+*
+*	Note :
+************************************************************************/
+int http_ReadHttpGet(IN void *Handle,
+					IN OUT char *buf,
+					IN OUT unsigned int *size,
+					IN int timeout);
 
 /************************************************************************
- * Function: http_ReadHttpGet
- *
- * Parameters:
- *	IN void *Handle;		Handle to the HTTP get object
- *	IN OUT char *buf;		Buffer to get the read and parsed data
- *	IN OUT unsigned int *size;	Size of the buffer passed
- *	IN int timeout;			time out value
- *
- * Description:
- *	Parses already existing data, then gets new data.
- *	Parses and extracts information from the new data.
- *
- * Return: int
- *	UPNP_E_SUCCESS		- On Sucess
- *	UPNP_E_INVALID_PARAM	- Invalid Parameter
- *	UPNP_E_BAD_RESPONSE
- *	UPNP_E_BAD_HTTPMSG
- *	UPNP_E_CANCELED
- ************************************************************************/
-int http_ReadHttpGet(
-	IN void *Handle,
-	IN OUT char *buf,
-	IN OUT unsigned int *size,
-	IN int timeout);
-
+*   Function :  http_HttpGetProgress
+*
+*   Parameters :
+*       IN void *Handle :           Handle to the HTTP get object
+*       OUT unsigned int *length :  Buffer to get the read and parsed data
+*       OUT unsigned int *total :   Size of tge buffer passed
+*
+*   Description :   Extracts information from the Handle to the HTTP get
+*                   object.
+*
+*   Return : int ;
+*       UPNP_E_SUCCESS - On Sucess ;
+*       UPNP_E_INVALID_PARAM  - Invalid Parameter;
+*
+*   Note :
+************************************************************************/
+int http_HttpGetProgress(IN void *Handle,
+						OUT unsigned int *length,
+						OUT unsigned int *total );
 
 /************************************************************************
- * Function: http_HttpGetProgress
- *
- * Parameters:
- *	IN void *Handle;		Handle to the HTTP get object
- *	OUT unsigned int *length;	Buffer to get the read and parsed data
- *	OUT unsigned int *total;	Size of tge buffer passed
- *
- * Description:
- *	Extracts information from the Handle to the HTTP get object.
- *
- * Return: int
- *	UPNP_E_SUCCESS		- On Sucess
- *	UPNP_E_INVALID_PARAM	- Invalid Parameter
- ************************************************************************/
-int http_HttpGetProgress(
-	IN void *Handle,
-	OUT unsigned int *length,
-	OUT unsigned int *total );
-
-
-/************************************************************************
- * Function: http_CloseHttpGet
- *
- * Parameters:
- *	IN void *Handle;	Handle to HTTP get object
- *
- * Description:
- *	Clears the handle allocated for the HTTP GET operation
- *	Clears socket states and memory allocated for socket operations. 
- *
- * Return: int
- *	UPNP_E_SUCCESS		- On Success
- *	UPNP_E_INVALID_PARAM	- Invalid Parameter
- ************************************************************************/
+*	Function :	http_CloseHttpGet
+*
+*	Parameters :
+*		IN void *Handle ;	Handle to HTTP get object
+*
+*	Description :	Clears the handle allocated for the HTTP GET operation
+*		Clears socket states and memory allocated for socket operations. 
+*
+*	Return : int ;
+*		UPNP_E_SUCCESS - On Success
+*		UPNP_E_INVALID_PARAM - Invalid Parameter
+*
+*	Note :
+************************************************************************/
 int http_CloseHttpGet(IN void *Handle);
 
+/************************************************************************
+*	Function :	http_OpenHttpGet
+*
+*	Parameters :
+*		IN const char *url_str :	String as a URL
+*		IN OUT void **Handle :		Pointer to buffer to store HTTP
+*									post handle
+*		IN OUT char **contentType :	Type of content
+*		OUT int *contentLength :	length of content
+*		OUT int *httpStatus :		HTTP status returned on receiving a
+*									response message
+*		IN int timeout :			time out value
+*
+*	Description :	Makes the HTTP GET message, connects to the peer, 
+*		sends the HTTP GET request, gets the response and parses the 
+*		response.
+*
+*	Return : int;
+*		UPNP_E_SUCCESS - On Success ;
+*		UPNP_E_INVALID_PARAM - Invalid Paramters ;
+*		UPNP_E_OUTOF_MEMORY ;
+*		UPNP_E_SOCKET_ERROR ;
+*		UPNP_E_BAD_RESPONSE ;
+*
+*	Note :
+*
+************************************************************************/
+int http_OpenHttpGet(IN const char *url_str,
+					IN OUT void **Handle,
+					IN OUT char **contentType,
+					OUT int *contentLength,
+					OUT int *httpStatus,
+					IN int timeout);
 
 /************************************************************************
- * Function: http_OpenHttpGet
- *
- * Parameters:
- *	IN const char *url_str:		String as a URL
- *	IN OUT void **Handle:		Pointer to buffer to store HTTP
- *					post handle
- *	IN OUT char **contentType:	Type of content
- *	OUT int *contentLength:		length of content
- *	OUT int *httpStatus:		HTTP status returned on receiving a
- *					response message
- *	IN int timeout:			time out value
- *
- * Description:
- *	Makes the HTTP GET message, connects to the peer, 
- *	sends the HTTP GET request, gets the response and parses the 
- *	response.
- *
- * Return: int
- *	UPNP_E_SUCCESS		- On Success
- *	UPNP_E_INVALID_PARAM	- Invalid Paramters
- *	UPNP_E_OUTOF_MEMORY
- *	UPNP_E_SOCKET_ERROR
- *	UPNP_E_BAD_RESPONSE
- ************************************************************************/
-int http_OpenHttpGet(
-	IN const char *url_str,
-	IN OUT void **Handle,
-	IN OUT char **contentType,
-	OUT int *contentLength,
-	OUT int *httpStatus,
-	IN int timeout);
-
-
-/************************************************************************
- * Function: http_OpenHttpGetProxy
- *
- * Parameters:
- *	IN const char *url_str;		String as a URL
- *	IN const char *proxy_str;	String as a URL
- *	IN OUT void **Handle;		Pointer to buffer to store HTTP
- *					post handle
- *	IN OUT char **contentType;	Type of content
- *	OUT int *contentLength;		length of content
- *	OUT int *httpStatus;		HTTP status returned on receiving a
- *					response message
- *	IN int timeout:			time out value
- *
- * Description:
- *	Makes the HTTP GET message, connects to the peer, 
- *	sends the HTTP GET request, gets the response and parses the response.
- *	If a proxy URL is defined then the connection is made there.
- *
- * Return: int
- *	UPNP_E_SUCCESS		- On Success
- *	UPNP_E_INVALID_PARAM	- Invalid Paramters
- *	UPNP_E_OUTOF_MEMORY
- *	UPNP_E_SOCKET_ERROR
- *	UPNP_E_BAD_RESPONSE
- ************************************************************************/
+*	Function :	http_OpenHttpGetProxy
+*
+*	Parameters :
+*		IN const char *url_str :	String as a URL
+*		IN const char *proxy_str :	String as a URL to the proxy
+*		IN OUT void **Handle :		Pointer to buffer to store HTTP
+*									post handle
+*		IN OUT char **contentType :	Type of content
+*		OUT int *contentLength :	length of content
+*		OUT int *httpStatus :		HTTP status returned on receiving a
+*									response message
+*		IN int timeout :			time out value
+*
+*	Description :	Makes the HTTP GET message, connects to the peer, 
+*		sends the HTTP GET request, gets the response and parses the 
+*		response.
+*
+*	Return : int;
+*		UPNP_E_SUCCESS - On Success ;
+*		UPNP_E_INVALID_PARAM - Invalid Paramters ;
+*		UPNP_E_OUTOF_MEMORY ;
+*		UPNP_E_SOCKET_ERROR ;
+*		UPNP_E_BAD_RESPONSE ;
+*
+*	Note :
+*
+************************************************************************/
 int http_OpenHttpGetProxy(IN const char *url_str,
 					IN const char *proxy_str,
 					IN OUT void **Handle,
@@ -444,134 +430,126 @@ int http_OpenHttpGetProxy(IN const char *url_str,
 
 
 /************************************************************************
- * Function: http_SendStatusResponse
- *
- * Parameters:
- *	IN SOCKINFO *info;		Socket information object
- *	IN int http_status_code;	error code returned while making 
- *					or sending the response message
- *	IN int request_major_version;	request major version
- *	IN int request_minor_version;	request minor version
- *
- * Description:
- *	Generate a response message for the status query and send the
- *	status response.
- *
- * Return: int
- *	0 -- success
- *	UPNP_E_OUTOF_MEMORY
- *	UPNP_E_SOCKET_WRITE
- *	UPNP_E_TIMEDOUT
- ************************************************************************/
-int http_SendStatusResponse(
-	IN SOCKINFO *info,
-	IN int http_status_code,
-	IN int request_major_version,
-	IN int request_minor_version );
+*	Function :	http_SendStatusResponse
+*
+*	Parameters :
+*		IN SOCKINFO *info :				Socket information object
+*		IN int http_status_code :		error code returned while making 
+*										or sending the response message
+*		IN int request_major_version :	request major version
+*		IN int request_minor_version :	request minor version
+*
+*	Description :	Generate a response message for the status query and
+*		send the status response.
+*
+*	Return : int;
+*		0 -- success
+*		UPNP_E_OUTOF_MEMORY
+*		UPNP_E_SOCKET_WRITE
+*		UPNP_E_TIMEDOUT
+*
+*	Note :
+************************************************************************/
+int http_SendStatusResponse( IN SOCKINFO *info, IN int http_status_code,
+						  IN int request_major_version,
+						  IN int request_minor_version );
 
 
 /************************************************************************
- * Function: http_MakeMessage
- *
- * Parameters:
- *	INOUT membuffer* buf;		buffer with the contents of the 
- *					message
- *	IN int http_major_version;	HTTP major version
- *	IN int http_minor_version;	HTTP minor version
- *	IN const char* fmt;		Pattern format 
- *	...;	
- *
- * Description:
- *	Generate an HTTP message based on the format that is specified
- *	in the input parameters.
- *
- * fmt types:
- *	'B':	arg = int status_code 
- *		appends content-length, content-type and HTML body
- *		for given code
- *	'b':	arg1 = const char* buf;
- *		arg2 = size_t buf_length memory ptr
- *	'C':	(no args) appends a HTTP CONNECTION: close header 
- *			depending on major,minor version
- *	'c':	(no args) appends CRLF "\r\n"
- *	'D':	(no args) appends HTTP DATE: header
- *	'd':	arg = int number            // appends decimal number
- *	'G':	arg = range information     // add range header
- *	'h':	arg = off_t number          // appends off_t number
- *	'K':	(no args)                   // add chunky header
- *	'N':	arg1 = off_t content_length // content-length header
- *	'q':    arg1 = http_method_t        // request start line and HOST header
- *		arg2 = (uri_type *)
- *	'Q':	arg1 = http_method_t;       // start line of request
- *		arg2 = char* url; 
- *		arg3 = size_t url_length 
- *	'R':	arg = int status_code       // adds a response start line
- *	'S':	(no args) appends HTTP SERVER: header
- *	's':	arg = const char* C_string
- *	'T':	arg = char * content_type; format
- *		e.g: "text/html"; content-type header
- *	't':	arg = time_t * gmt_time     // appends time in RFC 1123 fmt
- *	'U':	(no args) appends HTTP USER-AGENT: header
- *      'X':    arg = const char useragent; "redsonic" HTTP X-User-Agent: useragent
- *
- * Return: int
- *	0 - On Success
- *	UPNP_E_OUTOF_MEMORY
- *	UPNP_E_INVALID_URL
- ************************************************************************/
-int http_MakeMessage(
-	INOUT membuffer* buf, 
-	IN int http_major_version,
-	IN int http_minor_version,
-	IN const char* fmt, ... );
-
+*	Function :	http_MakeMessage
+*
+*	Parameters :
+*		INOUT membuffer* buf :		buffer with the contents of the 
+*									message
+*		IN int http_major_version :	HTTP major version
+*		IN int http_minor_version :	HTTP minor version
+*		IN const char* fmt :		Pattern format 
+*		... :	
+*
+*	Description :	Generate an HTTP message based on the format that is 
+*		specified in the input parameters.
+*
+*		fmt types:
+*		's':	arg = const char* C_string
+*		'b':	arg1 = const char* buf; arg2 = size_t buf_length 
+*				memory ptr
+*		'c':	(no args) appends CRLF "\r\n"
+*		'd':	arg = int number		// appends decimal number
+*		'h':	arg = off_t number		// appends off_t number
+*		't':	arg = time_t * gmt_time	// appends time in RFC 1123 fmt
+*		'D':	(no args) appends HTTP DATE: header
+*		'S':	(no args) appends HTTP SERVER: header
+*		'U':	(no args) appends HTTP USER-AGENT: header
+*		'C':	(no args) appends a HTTP CONNECTION: close header 
+*				depending on major,minor version
+*		'N':	arg1 = int content_length	// content-length header
+*		'Q':	arg1 = http_method_t; arg2 = char* url; 
+*				arg3 = int url_length // start line of request
+*		'R':	arg = int status_code // adds a response start line
+*		'B':	arg = int status_code 
+*				appends content-length, content-type and HTML body for given code
+*		'T':	arg = char * content_type; format e.g: "text/html";	
+*				 content-type header
+*
+*	Return : int;
+*		0 - On Success
+*		UPNP_E_OUTOF_MEMORY
+*		UPNP_E_INVALID_URL;
+*
+*	Note :
+************************************************************************/
+int http_MakeMessage( INOUT membuffer* buf, 
+			IN int http_major_version,
+			IN int http_minor_version,
+			IN const char* fmt, ... );
 
 /************************************************************************
- * Function: http_CalcResponseVersion
- *
- * Parameters:
- *	IN int request_major_vers;	Request major version
- *	IN int request_minor_vers;	Request minor version
- *	OUT int* response_major_vers;	Response mojor version
- *	OUT int* response_minor_vers;	Response minor version
- *
- * Description:
- *	Calculate HTTP response versions based on the request versions.
- *
- * Return: void
- ************************************************************************/
+*	Function :	http_CalcResponseVersion
+*
+*	Parameters :
+*		IN int request_major_vers :		Request major version
+*		IN int request_minor_vers :		Request minor version
+*		OUT int* response_major_vers :	Response mojor version
+*		OUT int* response_minor_vers :	Response minor version
+*
+*	Description :	Calculate HTTP response versions based on the request
+*		versions.
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 void http_CalcResponseVersion( 
-	IN int request_major_vers,
-	IN int request_minor_vers,
-	OUT int* response_major_vers,
-	OUT int* response_minor_vers );
-
+		IN int request_major_vers, IN int request_minor_vers,
+		OUT int* response_major_vers, OUT int* response_minor_vers );
 
 /************************************************************************
- * Function: http_OpenHttpGetEx
- *
- * Parameters:
- *	IN const char *url_str;		String as a URL
- *	IN OUT void **Handle;		Pointer to buffer to store HTTP
- *					post handle
- *	IN OUT char **contentType;	Type of content
- *	OUT int *contentLength;		length of content
- *	OUT int *httpStatus;		HTTP status returned on receiving a
- *					response message
- *	IN int timeout;			time out value
- *
- * Description:
- *	Makes the HTTP GET message, connects to the peer, 
- *	sends the HTTP GET request, gets the response and parses the 
- *	response.
- *
- * Return: int
- *	UPNP_E_SUCCESS		- On Success
- *	UPNP_E_INVALID_PARAM	- Invalid Paramters
- *	UPNP_E_OUTOF_MEMORY
- *	UPNP_E_SOCKET_ERROR
- *	UPNP_E_BAD_RESPONSE
- ************************************************************************/
+*	Function :	http_OpenHttpGetEx
+*
+*	Parameters :
+*		IN const char *url_str :	String as a URL
+*		IN OUT void **Handle :		Pointer to buffer to store HTTP
+*									post handle
+*		IN OUT char **contentType :	Type of content
+*		OUT int *contentLength :	length of content
+*		OUT int *httpStatus :		HTTP status returned on receiving a
+*									response message
+*		IN int timeout :			time out value
+*
+*	Description :	Makes the HTTP GET message, connects to the peer, 
+*		sends the HTTP GET request, gets the response and parses the 
+*		response.
+*
+*	Return : int;
+*		UPNP_E_SUCCESS - On Success ;
+*		UPNP_E_INVALID_PARAM - Invalid Paramters ;
+*		UPNP_E_OUTOF_MEMORY ;
+*		UPNP_E_SOCKET_ERROR ;
+*		UPNP_E_BAD_RESPONSE ;
+*
+*	Note :
+*
+************************************************************************/
 int http_OpenHttpGetEx(IN const char *url_str,
 		     IN OUT void **Handle,
 		     IN OUT char **contentType,
@@ -581,19 +559,19 @@ int http_OpenHttpGetEx(IN const char *url_str,
 			 IN int highRange,
 		     IN int timeout);
 
-
 /************************************************************************
- * Function: get_sdk_info
- *
- * Parameters:
- *	OUT char *info;	buffer to store the operating system information
- *
- * Description:
- *	Returns the server information for the operating system
- *
- * Return:
- *	UPNP_INLINE void
- ************************************************************************/
+*	Function :	get_sdk_info
+*
+*	Parameters :
+*		OUT char *info ;	
+*
+*	Description :	Returns the server information for the operating 
+*		system
+*
+*	Return : void ;
+*
+*	Note :
+************************************************************************/
 void get_sdk_info( OUT char *info );
 
 #ifdef __cplusplus
@@ -602,4 +580,3 @@ void get_sdk_info( OUT char *info );
 
 
 #endif // GENLIB_NET_HTTP_HTTPREADWRITE_H
-

upnp/src/inc/miniserver.h

@@ -1,150 +1,154 @@
-/************************************************************************
- * 
- * Copyright (c) 2000-2003 Intel Corporation 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- *
- * * Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * * Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * Neither name of Intel Corporation nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ************************************************************************/
+///////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2000-2003 Intel Corporation 
+// All rights reserved. 
+//
+// Redistribution and use in source and binary forms, with or without 
+// modification, are permitted provided that the following conditions are met: 
+//
+// * Redistributions of source code must retain the above copyright notice, 
+// this list of conditions and the following disclaimer. 
+// * Redistributions in binary form must reproduce the above copyright notice, 
+// this list of conditions and the following disclaimer in the documentation 
+// and/or other materials provided with the distribution. 
+// * Neither name of Intel Corporation nor the names of its contributors 
+// may be used to endorse or promote products derived from this software 
+// without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR 
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////
 
 #ifndef MINISERVER_H
 #define MINISERVER_H
 
-
 #include "sock.h"
 #include "httpparser.h"
 
-
 extern SOCKET gMiniServerStopSock;
 
-
 typedef struct MServerSockArray {
-	/* socket for listening for miniserver requests */
-	int miniServerSock;
-	/* socket for stopping miniserver */
-	int miniServerStopSock;
-	/* socket for incoming advertisments and search requests */
-	int ssdpSock;
+  int miniServerSock;     //socket for listening for miniserver
+                          //requests
+  int miniServerStopSock; //socket for stopping miniserver 
+  int ssdpSock; //socket for incoming advertisments and search requests
 
-	int stopPort;
-	int miniServerPort;
+  int stopPort;
+  int miniServerPort;
+
+  CLIENTONLY(int ssdpReqSock;) //socket for sending search 
+       //requests and receiving
+       // search replies
       
-	/* socket for sending search requests and receiving search replies */
-	CLIENTONLY(int ssdpReqSock;)
 } MiniServerSockArray;
 
+//typedef void (*MiniServerCallback) ( const char* document, int sockfd );
 
-typedef void (*MiniServerCallback)(
-	IN http_parser_t *parser,
-	IN http_message_t* request, 
-	IN SOCKINFO *info );
-
+typedef void (*MiniServerCallback) ( IN http_parser_t *parser,
+									 IN http_message_t* request, 
+									 IN SOCKINFO *info );
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /************************************************************************
- * Function: SetHTTPGetCallback
- *
- * Parameters:
- *	MiniServerCallback callback; - HTTP Callback to be invoked 
- *
- * Description:	Set HTTP Get Callback
- *
- * Return: void
- ************************************************************************/
+*	Function :	SetHTTPGetCallback
+*
+*	Parameters :
+*		MiniServerCallback callback ; - HTTP Callback to be invoked 
+*
+*	Description :	Set HTTP Get Callback
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 void SetHTTPGetCallback( MiniServerCallback callback );
 
 /************************************************************************
- * Function: SetSoapCallback
- *
- * Parameters:
- *	MiniServerCallback callback; - SOAP Callback to be invoked 
- *
- * Description: Set SOAP Callback
- *
- * Return: void
- ************************************************************************/
+*	Function :	SetSoapCallback
+*
+*	Parameters :
+*		MiniServerCallback callback ; - SOAP Callback to be invoked 
+*
+*	Description :	Set SOAP Callback
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 #ifdef INCLUDE_DEVICE_APIS
 void SetSoapCallback( MiniServerCallback callback );
-#else  /* INCLUDE_DEVICE_APIS */
+#else 
 static inline void SetSoapCallback( MiniServerCallback callback ) {}
-#endif /* INCLUDE_DEVICE_APIS */
+#endif
 
 /************************************************************************
- * Function: SetGenaCallback
- *
- * Parameters:
- *	MiniServerCallback callback; - GENA Callback to be invoked
- *
- * D6escription: Set GENA Callback
- *
- * Return: void
- ************************************************************************/
+*	Function :	SetGenaCallback
+*
+*	Parameters :
+*		MiniServerCallback callback ; - GENA Callback to be invoked
+*
+*	Description :	Set GENA Callback
+*
+*	Return :	void
+*
+*	Note :
+************************************************************************/
 void SetGenaCallback( MiniServerCallback callback );
 
 /************************************************************************
- * Function: StartMiniServer
- *
- * Parameters:
- *	unsigned short listen_port ; Port on which the server listens for 
- *	incoming connections
- *
- * Description: Initialize the sockets functionality for the 
- *	Miniserver. Initialize a thread pool job to run the MiniServer
- *	and the job to the thread pool. If listen port is 0, port is 
- *	dynamically picked
- *
- * 	Use timer mechanism to start the MiniServer, failure to meet the 
- *	allowed delay aborts the attempt to launch the MiniServer.
- *
- * Return: int;
- *	Actual port socket is bound to - On Success: 
- *	A negative number UPNP_E_XXX - On Error   			
- ************************************************************************/
+*	Function :	StartMiniServer
+*
+*	Parameters :
+*		unsigned short listen_port ; Port on which the server listens for 
+*									incoming connections
+*
+*	Description :	Initialize the sockets functionality for the 
+*		Miniserver. Initialize a thread pool job to run the MiniServer
+*		and the job to the thread pool. If listen port is 0, port is 
+*		dynamically picked
+*
+*		Use timer mechanism to start the MiniServer, failure to meet the 
+*		allowed delay aborts the attempt to launch the MiniServer.
+*
+*	Return : int ;
+*		Actual port socket is bound to - On Success: 
+*		A negative number UPNP_E_XXX - On Error   			
+*	Note :
+************************************************************************/
 int StartMiniServer( unsigned short listen_port );
 
 /************************************************************************
- * Function: StopMiniServer
- *
- * Parameters:
- *	void;	
- *
- * Description: Stop and Shutdown the MiniServer and free socket resources.
- *
- * Return : int;
- *	Always returns 0 
- ************************************************************************/
-int StopMiniServer();
+*	Function :	StopMiniServer
+*
+*	Parameters :
+*		void ;	
+*
+*	Description :	Stop and Shutdown the MiniServer and free socket 
+*		resources.
+*
+*	Return : int ;
+*		Always returns 0 
+*
+*	Note :
+************************************************************************/
+int StopMiniServer( void );
 
 
 #ifdef __cplusplus
 }   /* extern C */
 #endif
 
-
 #endif /* MINISERVER_H */
-

upnp/src/inc/upnpapi.h

@@ -98,25 +98,18 @@ struct Handle_Info
     int   aliasInstalled;       // 0 = not installed; otherwise installed
 };
 
-extern ithread_rwlock_t GlobalHndRWLock;
+extern ithread_mutex_t GlobalHndMutex;
 Upnp_Handle_Type GetHandleInfo(int Hnd, struct Handle_Info **HndInfo); 
 
-#define HandleLock() HandleWriteLock()
-
-#define HandleWriteLock()  \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying a write lock"); \
-	ithread_rwlock_wrlock(&GlobalHndRWLock); \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Write lock acquired");
-
-#define HandleReadLock()  \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying a read lock"); \
-	ithread_rwlock_rdlock(&GlobalHndRWLock); \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Read lock acquired");
+#define HandleLock()  \
+	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Trying Lock"); \
+	ithread_mutex_lock(&GlobalHndMutex); \
+	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "LOCK");
 
 #define HandleUnlock() \
 	UpnpPrintf(UPNP_INFO, API,__FILE__, __LINE__, "Trying Unlock"); \
-	ithread_rwlock_unlock(&GlobalHndRWLock); \
-	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Unlocked rwlock");
+	ithread_mutex_unlock(&GlobalHndMutex); \
+	UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__, "Unlock");
 
 Upnp_Handle_Type GetClientHandleInfo(int *client_handle_out, 
                                      struct Handle_Info **HndInfo);
@@ -183,6 +176,7 @@ void UpnpThreadDistribution(struct UpnpNonblockParam * Param);
 void AutoAdvertise(void *input); 
 int getlocalhostname(char *out);
 
+virtualDirList *pVirtualDirList;
 extern WebServerState bWebServerState;
 
 #endif

upnp/src/ssdp/ssdp_ctrlpt.c

@@ -125,7 +125,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
 
     // we are assuming that there can be only one client supported at a time
 
-    HandleReadLock();
+    HandleLock();
 
     if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
         HandleUnlock();
@@ -159,7 +159,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
     }
 
     // dest addr
-    memcpy(&param.DestAddr, dest_addr, sizeof(struct sockaddr_in) );
+    param.DestAddr = dest_addr;
 
     // EXT
     param.Ext[0] = '\0';
@@ -267,7 +267,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
             strlen( param.Location ) == 0 || !usn_found || !st_found ) {
             return;             // bad reply
         }
-        // check each current search
+        //check each current search
         HandleLock();
         if( GetClientHandleInfo( &handle, &ctrlpt_info ) != HND_CLIENT ) {
             HandleUnlock();
@@ -275,14 +275,14 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
         }
         node = ListHead( &ctrlpt_info->SsdpSearchList );
 
-        // temporary add null termination
+        //temporary add null termination
         //save_char = hdr_value.buf[ hdr_value.length ];
         //hdr_value.buf[ hdr_value.length ] = '\0';
 
         while( node != NULL ) {
             searchArg = node->item;
             matched = 0;
-            // check for match of ST header and search target
+            //check for match of ST header and search target
             switch ( searchArg->requestType ) {
                 case SSDP_ALL:
                     {
@@ -327,7 +327,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
             }
 
             if( matched ) {
-                // schedule call back
+                //schedule call back
                 threadData =
                     ( ResultData * ) malloc( sizeof( ResultData ) );
                 if( threadData != NULL ) {
@@ -366,7 +366,7 @@ ssdp_handle_ctrlpt_msg( IN http_message_t * hmsg,
 *
 ***************************************************************************/
 #warning There are currently no uses of the function 'process_reply()' in the code.
-#warning 'process_reply()' is a candidate for removal.
+#warning 'process_reply()' is a good candidate for removal.
 static UPNP_INLINE void
 process_reply( IN char *request_buf,
                IN int buf_len,
@@ -538,7 +538,8 @@ SearchByTarget( IN int Mx,
     if( ReqBuf == NULL )
         return UPNP_E_OUTOF_MEMORY;
 
-    UpnpPrintf(UPNP_INFO, SSDP, __FILE__, __LINE__, ">>> SSDP SEND >>>\n");
+    UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
+        ">>> SSDP SEND >>>\n%s\n", ReqBuf );
 
     timeTillRead = Mx;
 

upnp/src/ssdp/ssdp_device.c

@@ -242,7 +242,7 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
         // "If a multicast resource would send a response(s) to any copy of the 
         //  request, it SHOULD send its response(s) to each copy of the request 
         //  it receives. It MUST NOT repeat its response(s) per copy of the 
-        //  request."
+        //  reuqest."
         //  
         // http://www.upnp.org/download/draft-goland-http-udp-04.txt
         //
@@ -270,7 +270,7 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
 *																	
 * Parameters:														
 *	IN int msg_type : type of the message ( Search Reply, Advertisement 
-*		or Shutdown )
+*												or Shutdown )
 *	IN char * nt : ssdp type
 *	IN char * usn : unique service name ( go in the HTTP Header)
 *	IN char * location :Location URL.
@@ -280,7 +280,7 @@ NewRequestHandler( IN struct sockaddr_in *DestAddr,
 * Description:														
 *	This function creates a HTTP request packet.  Depending 
 *	on the input parameter it either creates a service advertisement
-*	request or service shutdown request etc.
+*   request or service shutdown request etc.
 *
 * Returns: void
 *	
@@ -530,6 +530,7 @@ SendReply( IN struct sockaddr_in *DestAddr,
 *	IN char * Udn: Device UDN
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Life time of this device.
+
 * Description:														
 *	This function creates the reply packet based on the input parameter, 
 *	and send it to the client address given in its input parameter DestAddr.
@@ -606,9 +607,11 @@ DeviceReply( IN struct sockaddr_in *DestAddr,
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Life time of this device.
+
 * Description:														
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
+
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
@@ -653,9 +656,11 @@ ServiceAdvertisement( IN char *Udn,
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Life time of this device.
+
 * Description:														
 *	This function creates the advertisement packet based 
 *	on the input parameter, and send it to the multicast channel.
+
 *
 * Returns: int
 *	UPNP_E_SUCCESS if successful else appropriate error
@@ -695,6 +700,7 @@ ServiceReply( IN struct sockaddr_in *DestAddr,
 *	IN char *ServType: Service Type.
 *	IN char * Location: Location of Device description document.
 *	IN int  Duration :Service duration in sec.
+
 * Description:														
 *	This function creates a HTTP service shutdown request packet 
 *	and sent it to the multicast channel through RequestHandler.
@@ -815,4 +821,3 @@ DeviceShutdown( IN char *DevType,
 
 #endif // EXCLUDE_SSDP
 #endif // INCLUDE_DEVICE_APIS
-

upnp/src/ssdp/ssdp_server.c

@@ -43,54 +43,54 @@
 #include "httpreadwrite.h"
 
 #ifdef WIN32
-	#include <winsock2.h>
-	#include <ws2tcpip.h>
-	#include "unixutil.h"
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #include "unixutil.h"
 #endif
 
 #define MAX_TIME_TOREAD  45
 
-CLIENTONLY( SOCKET gSsdpReqSocket = 0; )
+CLIENTONLY( SOCKET gSsdpReqSocket = 0;
+     )
 
-void RequestHandler();
-Event ErrotEvt;
+     void RequestHandler(  );
+     Event ErrotEvt;
 
-enum Listener { Idle, Stopping, Running };
+     enum Listener { Idle, Stopping, Running };
 
-unsigned short ssdpStopPort;
+     unsigned short ssdpStopPort;
 
-struct SSDPSockArray {
-	// socket for incoming advertisments and search requests
-	int ssdpSock;
-	// socket for sending search requests and receiving search replies
-	CLIENTONLY( int ssdpReqSock; )
-};
+     struct SSDPSockArray {
+         int ssdpSock;          //socket for incoming advertisments and search requests
+           CLIENTONLY( int ssdpReqSock;
+              )                 //socket for sending search 
+             //requests and receiving
+             // search replies
+     };
 
 #ifdef INCLUDE_DEVICE_APIS
 #if EXCLUDE_SSDP == 0
 
 /************************************************************************
- * Function : AdvertiseAndReply
- *
- * Parameters:
- *	IN int AdFlag:
- *		-1 = Send shutdown,
- *		 0 = send reply, 
- *		 1 = Send Advertisement
- *	IN UpnpDevice_Handle Hnd: Device handle
- *	IN enum SsdpSearchType SearchType:Search type for sending replies
- *	IN struct sockaddr_in *DestAddr:Destination address
- *   IN char *DeviceType:Device type
- *	IN char *DeviceUDN:Device UDN
- *   IN char *ServiceType:Service type
- *	IN int Exp:Advertisement age
- *
- * Description:
- *	This function sends SSDP advertisements, replies and shutdown messages.
- *
- * Returns: int
- *	UPNP_E_SUCCESS if successful else appropriate error
- ***************************************************************************/
+* Function : AdvertiseAndReply									
+*																	
+* Parameters:														
+*	IN int AdFlag: -1 = Send shutdown, 0 = send reply, 
+*					1 = Send Advertisement
+*	IN UpnpDevice_Handle Hnd: Device handle
+*	IN enum SsdpSearchType SearchType:Search type for sending replies
+*	IN struct sockaddr_in *DestAddr:Destination address
+*   IN char *DeviceType:Device type
+*	IN char *DeviceUDN:Device UDN
+*   IN char *ServiceType:Service type
+*	IN int Exp:Advertisement age
+*
+* Description:														
+*	This function sends SSDP advertisements, replies and shutdown messages.
+*
+* Returns: int
+*	UPNP_E_SUCCESS if successful else appropriate error
+***************************************************************************/
 int AdvertiseAndReply( IN int AdFlag,
                        IN UpnpDevice_Handle Hnd,
                        IN enum SsdpSearchType SearchType,
@@ -120,14 +120,18 @@ int AdvertiseAndReply( IN int AdFlag,
         "Inside AdvertiseAndReply with AdFlag = %d\n",
         AdFlag );
 
-    // Use a read lock
-    HandleReadLock();
+    HandleLock();
     if( GetHandleInfo( Hnd, &SInfo ) != HND_DEVICE ) {
         HandleUnlock();
         return UPNP_E_INVALID_HANDLE;
     }
     defaultExp = SInfo->MaxAge;
 
+    //Modifed to prevent more than one thread from accessing the 
+    //UpnpDocument stored with the handle at the same time
+    // HandleUnlock();
+    nodeList = NULL;
+
     //get server info
 
     get_sdk_info( SERVER );
@@ -146,13 +150,15 @@ int AdvertiseAndReply( IN int AdFlag,
         }
 
         dbgStr = ixmlNode_getNodeName( tmpNode );
-        UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
-            "Extracting device type once for %s\n", dbgStr );
-        // extract device type 
-        ixmlNodeList_free( nodeList );
+                 UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
+                     "Extracting device type once for %s\n",
+                     dbgStr );
+            // extract device type 
+            ixmlNodeList_free( nodeList );
         nodeList = NULL;
-        nodeList = ixmlElement_getElementsByTagName(
-            ( IXML_Element * ) tmpNode, "deviceType" );
+        nodeList =
+            ixmlElement_getElementsByTagName( ( IXML_Element * ) tmpNode,
+                                              "deviceType" );
         if( nodeList == NULL ) {
             continue;
         }
@@ -160,6 +166,7 @@ int AdvertiseAndReply( IN int AdFlag,
         dbgStr = ixmlNode_getNodeName( tmpNode );
         UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
             "Extracting UDN for %s\n", dbgStr );
+
         UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
             "Extracting device type\n" );
 
@@ -229,12 +236,13 @@ int AdvertiseAndReply( IN int AdFlag,
 
         UpnpPrintf( UPNP_INFO, API, __FILE__, __LINE__,
             "Sending UDNStr = %s \n", UDNstr );
-        if( AdFlag ) {
+            if( AdFlag ) {
             // send the device advertisement 
             if( AdFlag == 1 ) {
                 DeviceAdvertisement( devType, i == 0,
                                      UDNstr, SInfo->DescURL, Exp );
-            } else {             // AdFlag == -1
+            } else              // AdFlag == -1
+            {
                 DeviceShutdown( devType, i == 0, UDNstr,
                                 SERVER, SInfo->DescURL, Exp );
             }
@@ -316,9 +324,8 @@ int AdvertiseAndReply( IN int AdFlag,
         }
         for( j = 0;; j++ ) {
             tmpNode = ixmlNodeList_item( nodeList, j );
-            if( tmpNode == NULL ) {
+            if( tmpNode == NULL )
                 break;
-            }
 
             ixmlNodeList_free( tmpNodeList );
             tmpNodeList = NULL;
@@ -327,7 +334,7 @@ int AdvertiseAndReply( IN int AdFlag,
             if( tmpNodeList == NULL ) {
                 UpnpPrintf( UPNP_CRITICAL, API, __FILE__, __LINE__,
                     "ServiceType not found \n" );
-                continue;
+                    continue;
             }
             tmpNode2 = ixmlNodeList_item( tmpNodeList, 0 );
             if( tmpNode2 == NULL ) {
@@ -360,21 +367,26 @@ int AdvertiseAndReply( IN int AdFlag,
             } else {
                 switch ( SearchType ) {
                     case SSDP_ALL:
-                        ServiceReply( DestAddr, servType,
-                                      UDNstr, SInfo->DescURL,
-                                      defaultExp );
-                        break;
-                    case SSDP_SERVICE:
-                        if( ServiceType != NULL ) {
-                            if( !strncasecmp( ServiceType,
-                                              servType,
-                                              strlen( ServiceType ) ) ) {
-                                ServiceReply( DestAddr, servType,
-                                              UDNstr, SInfo->DescURL,
-                                              defaultExp );
-                            }
+                        {
+                            ServiceReply( DestAddr, servType,
+                                          UDNstr, SInfo->DescURL,
+                                          defaultExp );
+                            break;
+                        }
+                    case SSDP_SERVICE:
+                        {
+                            if( ServiceType != NULL ) {
+                                if( !strncasecmp( ServiceType,
+                                                  servType,
+                                                  strlen( ServiceType ) ) )
+                                {
+                                    ServiceReply( DestAddr, servType,
+                                                  UDNstr, SInfo->DescURL,
+                                                  defaultExp );
+                                }
+                            }
+                            break;
                         }
-                        break;
                     default:
                         break;
                 }               // switch(SearchType)               
@@ -389,27 +401,27 @@ int AdvertiseAndReply( IN int AdFlag,
     UpnpPrintf( UPNP_ALL, API, __FILE__, __LINE__,
         "Exiting AdvertiseAndReply : \n" );
 
-    HandleUnlock();
+    HandleUnlock(  );
 
     return UPNP_E_SUCCESS;
 
 }  /****************** End of AdvertiseAndReply *********************/
 
-#endif /* EXCLUDE_SSDP == 0 */
-#endif /* INCLUDE_DEVICE_APIS */
+#endif
+#endif
 
 /************************************************************************
- * Function : Make_Socket_NoBlocking
- *
- * Parameters:
- *	IN int sock: socket
- *
- * Description:
- *	This function makes socket non-blocking.
- *
- * Returns: int
- *	0 if successful else -1 
- ***************************************************************************/
+* Function : Make_Socket_NoBlocking									
+*																	
+* Parameters:														
+*	IN int sock: socket 
+*
+* Description:														
+*	This function makes socket non-blocking.
+*
+* Returns: int
+*	0 if successful else -1 
+***************************************************************************/
 int
 Make_Socket_NoBlocking( int sock )
 {
@@ -428,20 +440,20 @@ Make_Socket_NoBlocking( int sock )
 }
 
 /************************************************************************
- * Function : unique_service_name
- *
- * Parameters:
- *	IN char *cmd: Service Name string
- *	OUT SsdpEvent *Evt: The SSDP event structure partially filled
- *		by all the function.
- *
- * Description:
- *	This function fills the fields of the event structure like DeviceType,
- *	Device UDN and Service Type
- *
- * Returns: int
- *	0 if successful else -1
- ***************************************************************************/
+* Function : unique_service_name								
+*																	
+* Parameters:														
+*	IN char *cmd: Service Name string 
+*	OUT SsdpEvent *Evt: The SSDP event structure partially filled 
+*						by all the function.
+*
+* Description:														
+*	This function fills the fields of the event structure like DeviceType,
+*	Device UDN and Service Type
+*
+* Returns: int
+*	0 if successful else -1 
+***************************************************************************/
 int
 unique_service_name( IN char *cmd,
                      IN SsdpEvent * Evt )
@@ -523,18 +535,18 @@ unique_service_name( IN char *cmd,
 }
 
 /************************************************************************
- * Function : ssdp_request_type1
- *
- * Parameters:
- *	IN char *cmd: command came in the ssdp request
- *
- * Description:
- *	This function figures out the type of the SSDP search in the
- *	in the request.
- *
- * Returns: enum SsdpSearchType
- *	return appropriate search type else returns SSDP_ERROR
- ***************************************************************************/
+* Function : ssdp_request_type1								
+*																	
+* Parameters:														
+*	IN char *cmd: command came in the ssdp request
+*
+* Description:														
+*	This function figures out the type of the SSDP search in the 
+*	in the request.
+*
+* Returns: enum SsdpSearchType
+*	return appropriate search type else returns SSDP_ERROR
+***************************************************************************/
 enum SsdpSearchType
 ssdp_request_type1( IN char *cmd )
 {
@@ -559,20 +571,20 @@ ssdp_request_type1( IN char *cmd )
 }
 
 /************************************************************************
- * Function : ssdp_request_type
- *
- * Parameters:
- *	IN char *cmd: command came in the ssdp request
- *	OUT SsdpEvent *Evt: The event structure partially filled by
- *		 this function.
- *
- * Description:
- *	This function starts filling the SSDP event structure based upon the 
- *	request received.
- *
- * Returns: int
- *	0 on success; -1 on error
- ***************************************************************************/
+* Function : ssdp_request_type								
+*																	
+* Parameters:														
+*	IN char *cmd: command came in the ssdp request
+*	OUT SsdpEvent *Evt: The event structure partially filled by
+*		 this function.
+*
+* Description:														
+*	This function starts filling the SSDP event structure based upon the 
+*	request received. 
+*
+* Returns: int
+*	0 on success; -1 on error
+***************************************************************************/
 int
 ssdp_request_type( IN char *cmd,
                    OUT SsdpEvent * Evt )
@@ -590,18 +602,18 @@ ssdp_request_type( IN char *cmd,
 }
 
 /************************************************************************
- * Function : free_ssdp_event_handler_data
- *
- * Parameters:
- *	IN void *the_data: ssdp_thread_data structure. This structure contains
- *			SSDP request message.
- *
- * Description:
- *	This function frees the ssdp request
- *
- * Returns: VOID
- *
- ***************************************************************************/
+* Function : free_ssdp_event_handler_data								
+*																	
+* Parameters:														
+*	IN void *the_data: ssdp_thread_data structure. This structure contains
+*			SSDP request message.
+*
+* Description:														
+*	This function frees the ssdp request
+*
+* Returns: VOID
+*	
+***************************************************************************/
 static void
 free_ssdp_event_handler_data( void *the_data )
 {
@@ -617,18 +629,18 @@ free_ssdp_event_handler_data( void *the_data )
 }
 
 /************************************************************************
- * Function : valid_ssdp_msg
- *
- * Parameters:
- *	IN void *the_data: ssdp_thread_data structure. This structure contains
- *			SSDP request message.
- *
- * Description:
- *	This function do some quick checking of the ssdp msg
- *
- * Returns: xboolean
- *	returns TRUE if msg is valid else FALSE
- ***************************************************************************/
+* Function : valid_ssdp_msg								
+*																	
+* Parameters:														
+*	IN void *the_data: ssdp_thread_data structure. This structure contains
+*			SSDP request message.
+*
+* Description:														
+*	This function do some quick checking of the ssdp msg
+*
+* Returns: xboolean
+*	returns TRUE if msg is valid else FALSE
+***************************************************************************/
 static UPNP_INLINE xboolean
 valid_ssdp_msg( IN http_message_t * hmsg )
 {
@@ -658,19 +670,19 @@ valid_ssdp_msg( IN http_message_t * hmsg )
 }
 
 /************************************************************************
- * Function : start_event_handler
- *
- * Parameters:
- *	IN void *the_data: ssdp_thread_data structure. This structure contains
- *			SSDP request message.
- *
- * Description:
- *	This function parses the message and dispatches it to a handler
- *	which handles the ssdp request msg
- *
- * Returns: int
- *	0 if successful -1 if error
- ***************************************************************************/
+* Function : start_event_handler								
+*																	
+* Parameters:														
+*	IN void *the_data: ssdp_thread_data structure. This structure contains
+*			SSDP request message.
+*
+* Description:														
+*	This function parses the message and dispatches it to a handler 
+*	which handles the ssdp request msg
+*
+* Returns: int
+*	0 if successful -1 if error
+***************************************************************************/
 static UPNP_INLINE int
 start_event_handler( void *Data )
 {
@@ -710,18 +722,18 @@ start_event_handler( void *Data )
 }
 
 /************************************************************************
- * Function : ssdp_event_handler_thread
- *
- * Parameters:
- *	IN void *the_data: ssdp_thread_data structure. This structure contains
- *			SSDP request message.
- *
- * Description:
- *	This function is a thread that handles SSDP requests.
- *
- * Returns: void
- *
- ***************************************************************************/
+* Function : ssdp_event_handler_thread								
+*																	
+* Parameters:														
+*	IN void *the_data: ssdp_thread_data structure. This structure contains
+*			SSDP request message.
+*
+* Description:														
+*	This function is a thread that handles SSDP requests.
+*
+* Returns: void
+*	
+***************************************************************************/
 static void
 ssdp_event_handler_thread( void *the_data )
 {
@@ -734,7 +746,8 @@ ssdp_event_handler_thread( void *the_data )
     // send msg to device or ctrlpt
     if( ( hmsg->method == HTTPMETHOD_NOTIFY ) ||
         ( hmsg->request_method == HTTPMETHOD_MSEARCH ) ) {
-        CLIENTONLY( ssdp_handle_ctrlpt_msg( hmsg, &data->dest_addr, FALSE, NULL );)
+        CLIENTONLY( ssdp_handle_ctrlpt_msg( hmsg, &data->dest_addr,
+                                            FALSE, NULL ););
     } else {
         ssdp_handle_device_request( hmsg, &data->dest_addr );
     }
@@ -744,17 +757,17 @@ ssdp_event_handler_thread( void *the_data )
 }
 
 /************************************************************************
- * Function : readFromSSDPSocket
- *
- * Parameters:
- *	IN SOCKET socket: SSDP socket
- *
- * Description:
- *	This function reads the data from the ssdp socket.
- *
- * Returns: void
- *
- ***************************************************************************/
+* Function : readFromSSDPSocket								
+*																	
+* Parameters:														
+*	IN SOCKET socket: SSDP socket
+*
+* Description:														
+*	This function reads the data from the ssdp socket.
+*
+* Returns: void
+*	
+***************************************************************************/
 void
 readFromSSDPSocket( SOCKET socket )
 {
@@ -806,20 +819,18 @@ readFromSSDPSocket( SOCKET socket )
                              ( struct sockaddr * )&clientAddr, &socklen );
 
     if( byteReceived > 0 ) {
+
         requestBuf[byteReceived] = '\0';
         UpnpPrintf( UPNP_INFO, SSDP,
-            __FILE__, __LINE__,
-            "Start of received response ----------------------------------------------------\n"
-            "%s\n"
-            "End of received response ------------------------------------------------------\n"
-            "From host %s\n",
-            requestBuf,
-            inet_ntoa( clientAddr.sin_addr ) );
+                             __FILE__, __LINE__,
+                             "Received response !!!  "
+                             "%s From host %s \n",
+                             requestBuf,
+                             inet_ntoa( clientAddr.sin_addr ) );
+
         UpnpPrintf( UPNP_PACKET, SSDP, __FILE__, __LINE__,
-            "Start of received multicast packet --------------------------------------------\n"
-            "%s\n"
-            "End of received multicast packet ----------------------------------------------\n",
-            requestBuf );
+            "Received multicast packet:"
+            "\n %s\n", requestBuf );
         //add thread pool job to handle request
         if( data != NULL ) {
             data->parser.msg.msg.length += byteReceived;
@@ -841,93 +852,98 @@ readFromSSDPSocket( SOCKET socket )
 }
 
 /************************************************************************
- * Function : get_ssdp_sockets								
- *
- * Parameters:
- *	OUT MiniServerSockArray *out: Arrays of SSDP sockets
- *
- * Description:
- *	This function creates the ssdp sockets. It set their option to listen
- *	for multicast traffic.
- *
- * Returns: int
- *	return UPNP_E_SUCCESS if successful else returns appropriate error
- ***************************************************************************/
+* Function : get_ssdp_sockets								
+*																	
+* Parameters:														
+*	OUT MiniServerSockArray *out: Arrays of SSDP sockets
+*
+* Description:														
+*	This function creates the ssdp sockets. It set their option to listen 
+*	for multicast traffic.
+*
+* Returns: int
+*	return UPNP_E_SUCCESS if successful else returns appropriate error
+***************************************************************************/
 int
 get_ssdp_sockets( MiniServerSockArray * out )
 {
+    SOCKET ssdpSock;
+
+    CLIENTONLY( SOCKET ssdpReqSock;
+         )
     int onOff = 1;
     u_char ttl = 4;
     struct ip_mreq ssdpMcastAddr;
     struct sockaddr_in ssdpAddr;
     int option = 1;
     struct in_addr addr;
-    SOCKET ssdpSock;
-#if INCLUDE_CLIENT_APIS
-    SOCKET ssdpReqSock;
 
-    if( ( ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
+    CLIENTONLY( if( ( ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 ) )
+                    == UPNP_INVALID_SOCKET ) {
+                UpnpPrintf( UPNP_CRITICAL,
+                    SSDP, __FILE__, __LINE__,
+                    "Error in socket operation !!!\n" );
+                return UPNP_E_OUTOF_SOCKET;}
+                setsockopt( ssdpReqSock,
+                            IPPROTO_IP,
+                            IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
+                // just do it, regardless if fails or not.
+                Make_Socket_NoBlocking( ssdpReqSock ); gSsdpReqSocket = ssdpReqSock; )  //CLIENTONLY
+
+        if( ( ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 ) )
+            == UPNP_INVALID_SOCKET ) {
+            UpnpPrintf( UPNP_CRITICAL,
+                SSDP, __FILE__, __LINE__,
+                "Error in socket operation !!!\n" );
+            CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+            CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
             return UPNP_E_OUTOF_SOCKET;
-    }
-    setsockopt( ssdpReqSock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
-    // just do it, regardless if fails or not.
-    Make_Socket_NoBlocking( ssdpReqSock );
-    gSsdpReqSocket = ssdpReqSock;
-#endif /* INCLUDE_CLIENT_APIS */
-
-    if( ( ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 ) ) == UPNP_INVALID_SOCKET ) {
-        UpnpPrintf( UPNP_CRITICAL,
-            SSDP, __FILE__, __LINE__,
-            "Error in socket operation !!!\n" );
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
-        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
-        return UPNP_E_OUTOF_SOCKET;
-    }
+        }
 
     onOff = 1;
     if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEADDR,
-            ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
+                    ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
+
         UpnpPrintf( UPNP_CRITICAL,
             SSDP, __FILE__, __LINE__,
             "Error in set reuse addr !!!\n" );
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
-        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         shutdown( ssdpSock, SD_BOTH );
         UpnpCloseSocket( ssdpSock );
         return UPNP_E_SOCKET_ERROR;
     }
     
-#ifdef __FreeBSD__
+    #ifdef __FreeBSD__
     if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
-            ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
+                    ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
+
         UpnpPrintf( UPNP_CRITICAL,
             SSDP, __FILE__, __LINE__,
             "Error in set reuse port !!!\n" );
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
-        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         shutdown( ssdpSock, SD_BOTH );
         UpnpCloseSocket( ssdpSock );
         return UPNP_E_SOCKET_ERROR;
     }
-#endif /* __FreeBSD__ */
+    #endif
 
     memset( ( void * )&ssdpAddr, 0, sizeof( struct sockaddr_in ) );
     ssdpAddr.sin_family = AF_INET;
     //  ssdpAddr.sin_addr.s_addr = inet_addr(LOCAL_HOST);
     ssdpAddr.sin_addr.s_addr = htonl( INADDR_ANY );
     ssdpAddr.sin_port = htons( SSDP_PORT );
-    if( bind( ssdpSock, ( struct sockaddr * )&ssdpAddr,
-            sizeof( ssdpAddr ) ) != 0 ) {
+    if( bind
+        ( ssdpSock, ( struct sockaddr * )&ssdpAddr,
+          sizeof( ssdpAddr ) ) != 0 ) {
         UpnpPrintf( UPNP_CRITICAL,
             SSDP, __FILE__, __LINE__,
             "Error in binding !!!\n" );
             shutdown( ssdpSock, SD_BOTH );
         UpnpCloseSocket( ssdpSock );
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
-        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
+        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         return UPNP_E_SOCKET_BIND;
     }
 
@@ -935,46 +951,47 @@ get_ssdp_sockets( MiniServerSockArray * out )
     ssdpMcastAddr.imr_interface.s_addr = inet_addr( LOCAL_HOST );
     ssdpMcastAddr.imr_multiaddr.s_addr = inet_addr( SSDP_IP );
     if( setsockopt( ssdpSock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-            ( char * )&ssdpMcastAddr, sizeof( struct ip_mreq ) ) != 0 ) {
+                    ( char * )&ssdpMcastAddr,
+                    sizeof( struct ip_mreq ) ) != 0 ) {
         UpnpPrintf( UPNP_CRITICAL,
             SSDP, __FILE__, __LINE__,
             "Error in joining" " multicast group !!!\n" );
         shutdown( ssdpSock, SD_BOTH );
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
+        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
         UpnpCloseSocket( ssdpSock );
-        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         return UPNP_E_SOCKET_ERROR;
     }
 
     /* Set multicast interface. */
     memset( ( void * )&addr, 0, sizeof( struct in_addr ));
     addr.s_addr = inet_addr(LOCAL_HOST);
-    if ( setsockopt(ssdpSock, IPPROTO_IP, IP_MULTICAST_IF,
-            (char *)&addr, sizeof addr) != 0) {
+    if (setsockopt(ssdpSock, IPPROTO_IP, IP_MULTICAST_IF,
+                   (char *)&addr, sizeof addr) != 0) {
         UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
             "Couldn't set multicast interface.\n" );
         /* This is probably not a critical error, so let's continue. */
     }
 
-    /* result is not checked becuase it will fail in WinMe and Win9x. */
+    // result is not checked becuase it will fail in WinMe and Win9x.
     setsockopt( ssdpSock, IPPROTO_IP,
                 IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
     if( setsockopt( ssdpSock, SOL_SOCKET, SO_BROADCAST,
-            (char *)&option, sizeof(option) ) != 0) {
+                    ( char * )&option, sizeof( option ) ) != 0 ) {
         UpnpPrintf( UPNP_CRITICAL,
             SSDP, __FILE__, __LINE__,
             "Error in setting broadcast !!!\n" );
         shutdown( ssdpSock, SD_BOTH );
-        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
+        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
         UpnpCloseSocket( ssdpSock );
-        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
         return UPNP_E_NETWORK_ERROR;
     }
 
-    CLIENTONLY( out->ssdpReqSock = ssdpReqSock; )
+    CLIENTONLY( out->ssdpReqSock = ssdpReqSock;
+         );
     out->ssdpSock = ssdpSock;
     return UPNP_E_SUCCESS;
 }
 
-#endif /* EXCLUDE_SSDP */
-
+#endif // EXCLUDE_SSDP

upnp/src/urlconfig/urlconfig.c

@@ -32,7 +32,6 @@
 #include "config.h"
 #include <assert.h>
 #ifndef WIN32
- #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>

upnp/src/uuid/md5.c

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

upnp/src/uuid/sysdep.c

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

upnp/src/uuid/uuid.c

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

upnp/test/test_init.c

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