Nicholas Kraft's patch to fix some IPv6 copy/paste issues. He

reported to be getting infinite loops with the svn code.


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

ChangeLog

@@ -2,6 +2,10 @@
 Version 1.8.0
 *******************************************************************************
 
+2008-06-27 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Nicholas Kraft's patch to fix some IPv6 copy/paste issues. He
+	reported to be getting infinite loops with the svn code.
+
 2008-06-13 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* SF Bug Tracker [ 1984541 ]
 	ixmlDocumenttoString does not render the namespace tag.

THANKS

@@ -37,6 +37,7 @@ exempt of errors.
 - Marcelo Roberto Jimenez (mroberto)
 - Markus Strobl
 - Nektarios K. Papadopoulos (npapadop)
+- Nicholas Kraft
 - Oskar Liljeblad
 - Michael (oxygenic)
 - Paul Vixie

upnp/src/genlib/miniserver/miniserver.c

@@ -669,9 +669,8 @@ static int get_miniserver_sockets(
 	} else {
 		if (listenfd4 != INVALID_SOCKET) {
 			do {
-				serverAddr4->sin_port = htons(listen_port4++ );
+				serverAddr4->sin_port = htons(listen_port4++);
-				sockError = bind(listenfd4, (struct sockaddr *)&__ss_v4,
+				sockError = bind(listenfd4, (struct sockaddr *)&__ss_v4, sizeof(__ss_v4));
-					sizeof(__ss_v4));
 				if (sockError == -1) {
 #ifdef WIN32
 					errCode = WSAGetLastError();
@@ -701,9 +700,8 @@ static int get_miniserver_sockets(
 
 		if (listenfd6 != INVALID_SOCKET) {
 			do {
-				serverAddr4->sin_port = htons(listen_port6++);
+				serverAddr6->sin6_port = htons(listen_port6++);
-				sockError = bind(listenfd6, (struct sockaddr *)&__ss_v4,
+				sockError = bind(listenfd6, (struct sockaddr *)&__ss_v6, sizeof(__ss_v6));
-					sizeof(__ss_v4));
 				if (sockError == -1) {
 #ifdef WIN32
 					errCode = WSAGetLastError();

upnp/src/inc/uri.h

@@ -40,15 +40,16 @@
 
 
 #include "UpnpGlobal.h" /* for */
+#include "UpnpInet.h"
 
 
+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <time.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
 
 
 #ifdef WIN32