--- embedaddon/miniupnpc/receivedata.c	2012/02/21 23:16:22	1.1.1.1
+++ embedaddon/miniupnpc/receivedata.c	2013/07/22 00:36:10	1.1.1.2
@@ -1,12 +1,13 @@
-/* $Id: receivedata.c,v 1.1.1.1 2012/02/21 23:16:22 misho Exp $ */
+/* $Id: receivedata.c,v 1.1.1.2 2013/07/22 00:36:10 misho Exp $ */
 /* Project : miniupnp
+ * Website : http://miniupnp.free.fr/
  * Author : Thomas Bernard
- * Copyright (c) 2011 Thomas Bernard
+ * Copyright (c) 2011-2012 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution. */
 
 #include <stdio.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
@@ -17,6 +18,7 @@
 #include <sys/select.h>
 #endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
 #include <sys/socket.h>
+#include <netinet/in.h>
 #if !defined(__amigaos__) && !defined(__amigaos4__)
 #include <poll.h>
 #endif
@@ -24,7 +26,7 @@
 #define MINIUPNPC_IGNORE_EINTR
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
 #else
 #define PRINT_SOCKET_ERROR(x) perror(x)
@@ -33,10 +35,16 @@
 #include "receivedata.h"
 
 int
-receivedata(int socket, char * data, int length, int timeout)
+receivedata(int socket,
+            char * data, int length,
+            int timeout, unsigned int * scope_id)
 {
+#if MINIUPNPC_GET_SRC_ADDR
+	struct sockaddr_storage src_addr;
+	socklen_t src_addr_len = sizeof(src_addr);
+#endif
     int n;
-#if !defined(WIN32) && !defined(__amigaos__) && !defined(__amigaos4__)
+#if !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__)
 	/* using poll */
     struct pollfd fds[1]; /* for the poll */
 #ifdef MINIUPNPC_IGNORE_EINTR
@@ -55,8 +63,8 @@ receivedata(int socket, char * data, int length, int t
 		/* timeout */
         return 0;
     }
-#else /* !defined(WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */
-	/* using select under WIN32 and amigaos */
+#else /* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */
+	/* using select under _WIN32 and amigaos */
     fd_set socketSet;
     TIMEVAL timeval;
     FD_ZERO(&socketSet);
@@ -69,12 +77,27 @@ receivedata(int socket, char * data, int length, int t
         return -1;
     } else if(n == 0) {
         return 0;
-    }    
+    }
 #endif
+#if MINIUPNPC_GET_SRC_ADDR
+	n = recvfrom(socket, data, length, 0,
+	             (struct sockaddr *)&src_addr, &src_addr_len);
+#else
 	n = recv(socket, data, length, 0);
+#endif
 	if(n<0) {
 		PRINT_SOCKET_ERROR("recv");
 	}
+#if MINIUPNPC_GET_SRC_ADDR
+	if (src_addr.ss_family == AF_INET6) {
+		const struct sockaddr_in6 * src_addr6 = (struct sockaddr_in6 *)&src_addr;
+#ifdef DEBUG
+		printf("scope_id=%u\n", src_addr6->sin6_scope_id);
+#endif
+		if(scope_id)
+			*scope_id = src_addr6->sin6_scope_id;
+	}
+#endif
 	return n;
 }