Changeset 1119 for pjproject

Timestamp:

Mar 30, 2007 6:54:46 PM (18 years ago)

Author:

bennylp

Message:

Fixed not enough buffer error with IP helper on XP SP2

File:

• pjproject/trunk/pjlib/src/pj/ip_helper_win32.c (modified) (5 diffs)

pjproject/trunk/pjlib/src/pj/ip_helper_win32.c

@@ -45 +45 @@
      * error 22 ("Not Enough Buffer") error.
      */
-    MIB_IPADDRTABLE ipTabBuff[4];
+    char ipTabBuff[1024];
     MIB_IPADDRTABLE *pTab;
     ULONG tabSize;
@@ -53 +53 @@
     PJ_ASSERT_RETURN(p_cnt && ifs, PJ_EINVAL);
 
-    pTab = ipTabBuff;
+    pTab = (MIB_IPADDRTABLE*)ipTabBuff;
 
     /* Get IP address table */
     tabSize = sizeof(ipTabBuff);
-    rc = GetIpAddrTable(ipTabBuff, &tabSize, FALSE);
+    rc = GetIpAddrTable(pTab, &tabSize, FALSE);
     if (rc != NO_ERROR)
         return PJ_RETURN_OS_ERROR(rc);
@@ -86 +86 @@
                                      pj_ip_route_entry routes[])
 {
-    MIB_IPADDRTABLE ipTabBuff[4];
+    char ipTabBuff[1024];
     MIB_IPADDRTABLE *pIpTab;
-    MIB_IPFORWARDTABLE rtabBuff[4];
+    char rtabBuff[1024];
     MIB_IPFORWARDTABLE *prTab;
     ULONG tabSize;
@@ -96 +96 @@
     PJ_ASSERT_RETURN(p_cnt && routes, PJ_EINVAL);
 
-    pIpTab = ipTabBuff;
-    prTab = rtabBuff;
+    pIpTab = (MIB_IPADDRTABLE *)ipTabBuff;
+    prTab = (MIB_IPFORWARDTABLE *)rtabBuff;
 
     /* First get IP address table */
     tabSize = sizeof(ipTabBuff);
-    rc = GetIpAddrTable(ipTabBuff, &tabSize, FALSE);
+    rc = GetIpAddrTable(pIpTab, &tabSize, FALSE);
     if (rc != NO_ERROR)
         return PJ_RETURN_OS_ERROR(rc);
@@ -107 +107 @@
     /* Next get IP route table */
     tabSize = sizeof(rtabBuff);
-    rc = GetIpForwardTable(rtabBuff, &tabSize, 1);
+    rc = GetIpForwardTable(prTab, &tabSize, 1);
     if (rc != NO_ERROR)
         return PJ_RETURN_OS_ERROR(rc);