Forward port of svn revision 505:

SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
	Submitted By: zephyrus ( zephyrus00jp )



git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@506 119443c7-1b9e-41f8-b6fc-b9c35fce742c

ChangeLog

@@ -2,6 +2,11 @@
 Version 1.8.0
 *******************************************************************************
 
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Forward port of svn revision 505:
+	SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
+	Submitted By: zephyrus ( zephyrus00jp )
+
 2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* SF Patch Tracker [ 2969188 ] 1.8.0: patch for FreeBSD compilation
 	Submitted By: Nick Leverton (leveret)
@@ -188,6 +193,58 @@ Version 1.8.0
 Version 1.6.7
 *******************************************************************************
 
+2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
+	Submitted By: zephyrus ( zephyrus00jp )
+	Obs by Marcelo: The issue with linking with -lsocket -lnsl -lrt is not
+	covered in this changeset beacuse I don't have solaris to test. I will
+	need some help from zephyrus in this regard. The issue will be addressed
+	in a future changeset.
+
+	Compilation for solaris
+
+	I have used gcc3.x and gcc4.x under solaris 10 for x86 / 64 bits.
+
+	A couple of Source file fixes were necessary for successful compilation
+	and runtime behavior.
+
+	threadutil/src/ThreadPool.c
+
+	POSIX
+	sched_setschduler() returns non-negative value for success.
+
+	Without the fix, UpnpInit() fails immediately.
+
+	upnpp/src/api/upnpai.c
+
+	There is a typo of a macro name "__sun" in one of the
+	CPP conditional.
+	Without the fix, the compilation aborts due to unknown constant
+	in socket ioctl call.
+
+	A few structs and an array is not properly initialized.
+	Well, I think it may be safe as is, but when I checked it
+	using purify evaluation version, it was reported that
+	uninitizlied iszBuffer may cause read of uninitialized memory.
+	So play it safe.
+
+	Configure issue.
+	This has to be more of a configure magic.
+	To link a program successfully using network, we need
+	-lsocket and -lnsl library specifications on the link line.
+	We also need -lrt for programs that use thread scheduling features.
+
+	The sample program under upnp/sample requires
+	-lsocket -lnsl -lrt
+	for successful linking.
+	I added -lsocket -lnsl -lrt to Makefile.in.
+	configure probably needs to take care of these.
+
+	I don't know much about configure, automake, etc., so
+	I am just raising a flag here.
+
+	TIA
+	
 2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* SF Patch Tracker [ 2836704 ] Search for nested serviceList (not
 	stopping at the first lis

threadutil/src/ThreadPool.c

@@ -48,6 +48,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>	/* for memset()*/
 
 
 /****************************************************************************
@@ -207,7 +208,7 @@ static int CmpThreadPoolJob( void *jobA, void *jobB )
 	assert(jobA != NULL);
 	assert(jobB != NULL);
 
-	return ( a->jobId == b->jobId );
+	return a->jobId == b->jobId;
 }
 
 /****************************************************************************
@@ -250,12 +251,20 @@ static int SetPolicyType(PolicyType in)
 	return sched_setscheduler(0, in);
 #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
 	struct sched_param current;
-	int sched_result;
+	int rc;
 
+	memset(&current, 0, sizeof(current)); /* purify? */
 	sched_getparam(0, &current);
 	current.sched_priority = DEFAULT_SCHED_PARAM;
-	sched_result =  sched_setscheduler(0, in, &current);
-	return (-1 != sched_result || EPERM == errno) ? 0 : -1;
+
+	/* Solaris returns -1 if failure ..., but can return
+	 * non-zero values for 0, ..., 5 [former scheduling values.] */
+	rc = sched_setscheduler(0, in, &current);
+	if (rc == -1) {
+		return rc;
+	} else {
+		return 0;
+	}
 #else
 	return 0;
 #endif
@@ -335,14 +344,13 @@ static void BumpPriority( ThreadPool *tp )
 	assert(tp != NULL);
 
 	gettimeofday(&now, NULL);	
-
 	while (!done) {
 		if (tp->medJobQ.size) {
 			tempJob = (ThreadPoolJob *)tp->medJobQ.head.next->item;
 			diffTime = DiffMillis(&now, &tempJob->requestTime);
-            if( diffTime >= ( tp->attr.starvationTime ) ) {
-                // If job has waited longer than the starvation time
-                // bump priority (add to higher priority Q)
+			if (diffTime >= tp->attr.starvationTime) {
+				/* If job has waited longer than the starvation time
+				* bump priority (add to higher priority Q) */
 				StatsAccountMQ(tp, diffTime);
 				ListDelNode(&tp->medJobQ, tp->medJobQ.head.next, 0);
 				ListAddTail(&tp->highJobQ, tempJob);
@@ -352,9 +360,9 @@ static void BumpPriority( ThreadPool *tp )
 		if (tp->lowJobQ.size) {
 			tempJob = (ThreadPoolJob *)tp->lowJobQ.head.next->item;
 			diffTime = DiffMillis(&now, &tempJob->requestTime);
-            if( diffTime >= ( tp->attr.maxIdleTime ) ) {
-                // If job has waited longer than the starvation time
-                // bump priority (add to higher priority Q)
+			if (diffTime >= tp->attr.maxIdleTime) {
+				/* If job has waited longer than the starvation time
+				 * bump priority (add to higher priority Q) */
 				StatsAccountLQ(tp, diffTime);
 				ListDelNode(&tp->lowJobQ, tp->lowJobQ.head.next, 0);
 				ListAddTail(&tp->medJobQ, tempJob);
@@ -1657,4 +1665,3 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
     return 0;
 }
 #endif /* WIN32 */
-

upnp/src/api/upnpapi.c

@@ -51,7 +51,7 @@
 	/* Do not include these files */
 #else
 	#include <sys/param.h>
-	#if defined(_sun)
+	#if defined(__sun)
 		#include <fcntl.h>
 		#include <sys/sockio.h>
 	#elif defined(BSD) && BSD >= 199306
@@ -3545,6 +3545,11 @@ int getlocalhostname(char *out, const int out_len)
 	struct sockaddr_in LocalAddr;
 	int j = 0;
 
+	/* purify */
+	memset(&ifConf,  0, sizeof(ifConf));
+	memset(&ifReq,   0, sizeof(ifReq));
+	memset(szBuffer, 0, sizeof(szBuffer));
+
 	/* Create an unbound datagram socket to do the SIOCGIFADDR ioctl on.  */
 	LocalSock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	if (LocalSock < 0) {