Changeset 1604 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

Dec 1, 2007 9:04:24 AM (16 years ago)

Author:

bennylp

Message:

Related to ticket #415: modification in pjlib API to support IPv6

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (5 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -347 +347 @@
         /* Socket is bound to INADDR_ANY */
         unsigned i, ifs_cnt;
-        pj_in_addr ifs[PJ_ICE_ST_MAX_CAND-2];
+        pj_sockaddr ifs[PJ_ICE_ST_MAX_CAND-2];
 
         /* Reset default candidate */
@@ -354 +354 @@
         /* Enum all IP interfaces in the host */
         ifs_cnt = PJ_ARRAY_SIZE(ifs);
-        status = pj_enum_ip_interface(&ifs_cnt, ifs);
+        status = pj_enum_ip_interface(pj_AF_INET(), &ifs_cnt, ifs);
         if (status != PJ_SUCCESS)
             goto on_error;
 
         /* Set default IP interface as the base address */
-        status = pj_gethostip(&comp->local_addr.ipv4.sin_addr);
+        status = pj_gethostip(pj_AF_INET(), &comp->local_addr);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -370 +370 @@
 
             /* Ignore 127.0.0.0/24 address */
-            if ((pj_ntohl(ifs[i].s_addr) >> 24)==127)
+            if ((pj_ntohl(ifs[i].ipv4.sin_addr.s_addr) >> 24)==127)
                 continue;
 
             pj_memcpy(&cand_addr, &comp->local_addr, sizeof(pj_sockaddr_in));
-            cand_addr.sin_addr.s_addr = ifs[i].s_addr;
+            cand_addr.sin_addr.s_addr = ifs[i].ipv4.sin_addr.s_addr;
 
 
@@ -380 +380 @@
              * as default candidate.
              */
-            if (ifs[i].s_addr == comp->local_addr.ipv4.sin_addr.s_addr) {
+            if (ifs[i].ipv4.sin_addr.s_addr == comp->local_addr.ipv4.sin_addr.s_addr) {
                 set_default = PJ_TRUE;
                 local_pref = 65535;
@@ -413 +413 @@
          */
         if (comp->local_addr.ipv4.sin_addr.s_addr == 0) {
-            status = pj_gethostip(&comp->local_addr.ipv4.sin_addr);
+            status = pj_gethostip(pj_AF_INET(), &comp->local_addr);
             if (status != PJ_SUCCESS)
                 return status;