Changeset 10739 for trunk/third-party/miniupnp/miniupnpc.c

Timestamp:

Jun 9, 2010, 11:22:00 PM (12 years ago)

Author:

livings124

Message:

update miniupnpc to 20100609

File:

• trunk/third-party/miniupnp/miniupnpc.c (modified) (4 diffs)

trunk/third-party/miniupnp/miniupnpc.c

@@ -1 @@
-/* $Id: miniupnpc.c,v 1.80 2010/04/12 20:39:41 nanard Exp $ */
+/* $Id: miniupnpc.c,v 1.81 2010/04/17 22:07:59 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas BERNARD
@@ -25 +25 @@
 #include <ws2tcpip.h>
 #include <io.h>
-/*#include <IPHlpApi.h>*/
+#include <IPHlpApi.h>
 #define snprintf _snprintf
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
@@ -421 +421 @@
         struct addrinfo hints, *servinfo, *p;
 #ifdef WIN32
-        /*MIB_IPFORWARDROW ip_forward;*/
+        MIB_IPFORWARDROW ip_forward;
 #endif
 
@@ -474 +474 @@
 /* This code could help us to use the right Network interface for 
  * SSDP multicast traffic */
-/* TODO : Get IP associated with the index given in the ip_forward struct
+/* Get IP associated with the index given in the ip_forward struct
  * in order to give this ip to setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF) */
- /*
         if(GetBestRoute(inet_addr("223.255.255.255"), 0, &ip_forward) == NO_ERROR) {
                 DWORD dwRetVal = 0;
                 PMIB_IPADDRTABLE pIPAddrTable;
-    DWORD dwSize = 0;
-    IN_ADDR IPAddr;
-    int i;
-    printf("ifIndex=%lu nextHop=%lx \n", ip_forward.dwForwardIfIndex, ip_forward.dwForwardNextHop);
-    pIPAddrTable = (MIB_IPADDRTABLE *) malloc(sizeof (MIB_IPADDRTABLE));
-    if (GetIpAddrTable(pIPAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
-            free(pIPAddrTable);
-      pIPAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
-    }
-    if(pIPAddrTable) {
-        dwRetVal = GetIpAddrTable( pIPAddrTable, &dwSize, 0 );
-        printf("\tNum Entries: %ld\n", pIPAddrTable->dwNumEntries);
-        for (i=0; i < (int) pIPAddrTable->dwNumEntries; i++) {
-        printf("\n\tInterface Index[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwIndex);
-        IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwAddr;
-        printf("\tIP Address[%d]:     \t%s\n", i, inet_ntoa(IPAddr) );
-        IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwMask;
-        printf("\tSubnet Mask[%d]:    \t%s\n", i, inet_ntoa(IPAddr) );
-        IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwBCastAddr;
-        printf("\tBroadCast[%d]:      \t%s (%ld)\n", i, inet_ntoa(IPAddr), pIPAddrTable->table[i].dwBCastAddr);
-        printf("\tReassembly size[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwReasmSize);
-        printf("\tType and State[%d]:", i);
-        printf("\n");
-        }
+                DWORD dwSize = 0;
+#ifdef DEBUG
+                IN_ADDR IPAddr;
+#endif
+                int i;
+#ifdef DEBUG
+                printf("ifIndex=%lu nextHop=%lx \n", ip_forward.dwForwardIfIndex, ip_forward.dwForwardNextHop);
+#endif
+                pIPAddrTable = (MIB_IPADDRTABLE *) malloc(sizeof (MIB_IPADDRTABLE));
+                if (GetIpAddrTable(pIPAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
                         free(pIPAddrTable);
-        pIPAddrTable = NULL;
-    }
-        }
-*/
+                        pIPAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+                }
+                if(pIPAddrTable) {
+                        dwRetVal = GetIpAddrTable( pIPAddrTable, &dwSize, 0 );
+#ifdef DEBUG
+                        printf("\tNum Entries: %ld\n", pIPAddrTable->dwNumEntries);
+#endif
+                        for (i=0; i < (int) pIPAddrTable->dwNumEntries; i++) {
+#ifdef DEBUG
+                                printf("\n\tInterface Index[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwIndex);
+                                IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwAddr;
+                                printf("\tIP Address[%d]:     \t%s\n", i, inet_ntoa(IPAddr) );
+                                IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwMask;
+                                printf("\tSubnet Mask[%d]:    \t%s\n", i, inet_ntoa(IPAddr) );
+                                IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwBCastAddr;
+                                printf("\tBroadCast[%d]:      \t%s (%ld)\n", i, inet_ntoa(IPAddr), pIPAddrTable->table[i].dwBCastAddr);
+                                printf("\tReassembly size[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwReasmSize);
+                                printf("\tType and State[%d]:", i);
+                                printf("\n");
+#endif
+                                if (pIPAddrTable->table[i].dwIndex == ip_forward.dwForwardIfIndex) {
+                                        /* Set the address of this interface to be used */
+                                        struct in_addr mc_if;
+                                        memset(&mc_if, 0, sizeof(mc_if));
+                                        mc_if.s_addr = pIPAddrTable->table[i].dwAddr;
+                                        if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) {
+                                                PRINT_SOCKET_ERROR("setsockopt");
+                                        }
+                                        ((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = pIPAddrTable->table[i].dwAddr;
+#ifndef DEBUG
+                                        break;
+#endif
+                                }
+                        }
+                        free(pIPAddrTable);
+                        pIPAddrTable = NULL;
+                }
+        }
 #endif