Changeset 1605 for pjproject/trunk

Timestamp:

Dec 1, 2007 9:07:42 AM (17 years ago)

Author:

bennylp

Message:

Added strerror.c sample and adjusted code because of IPv6 support in pjlib

Location:

pjproject/trunk/pjsip-apps

Files:

• build/Samples-vc.mak (modified) (1 diff)
• build/Samples.mak (modified) (1 diff)
• build/samples.dsp (modified) (1 diff)
• build/samples.vcproj (modified) (1 diff)
• src/samples/proxy.h (modified) (3 diffs)
• src/samples/strerror.c (added)

pjproject/trunk/pjsip-apps/build/Samples-vc.mak

@@ -66 +66 @@
           $(BINDIR)\stateless_proxy.exe \
           $(BINDIR)\streamutil.exe \
+          $(BINDIR)\strerror.exe \
           $(BINDIR)\tonegen.exe
 

pjproject/trunk/pjsip-apps/build/Samples.mak

@@ -30 +30 @@
            stateless_proxy \
            streamutil \
+           strerror \
            tonegen
 

pjproject/trunk/pjsip-apps/build/samples.dsp

@@ -171 +171 @@
 # Begin Source File
 
+SOURCE=..\src\samples\strerror.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\samples\tonegen.c
 # End Source File

pjproject/trunk/pjsip-apps/build/samples.vcproj

@@ -151 +151 @@
                         </File>
                         <File
+                                RelativePath="..\src\samples\strerror.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\samples\tonegen.c"
                                 >

pjproject/trunk/pjsip-apps/src/samples/proxy.h

@@ -236 +236 @@
 static pj_status_t init_proxy(void)
 {
-    pj_in_addr pri_addr;
-    pj_in_addr addr_list[16];
+    pj_sockaddr pri_addr;
+    pj_sockaddr addr_list[16];
     unsigned addr_cnt = PJ_ARRAY_SIZE(addr_list);
     unsigned i;
@@ -251 +251 @@
      * to be added in Record-Route.
      */
-    if (pj_gethostip(&pri_addr)==PJ_SUCCESS) {
+    if (pj_gethostip(pj_AF_INET(), &pri_addr)==PJ_SUCCESS) {
         pj_strdup2(global.pool, &global.name[global.name_cnt].host,
-                   pj_inet_ntoa(pri_addr));
+                   pj_inet_ntoa(pri_addr.ipv4.sin_addr));
         global.name[global.name_cnt].port = global.port;
         global.name_cnt++;
@@ -259 +259 @@
 
     /* Get the rest of IP interfaces */
-    if (pj_enum_ip_interface(&addr_cnt, addr_list) == PJ_SUCCESS) {
+    if (pj_enum_ip_interface(pj_AF_INET(), &addr_cnt, addr_list) == PJ_SUCCESS) {
         for (i=0; i<addr_cnt; ++i) {
 
-            if (addr_list[i].s_addr == pri_addr.s_addr)
+            if (addr_list[i].ipv4.sin_addr.s_addr == pri_addr.ipv4.sin_addr.s_addr)
                 continue;
 
             pj_strdup2(global.pool, &global.name[global.name_cnt].host,
-                       pj_inet_ntoa(addr_list[i]));
+                       pj_inet_ntoa(addr_list[i].ipv4.sin_addr));
             global.name[global.name_cnt].port = global.port;
             global.name_cnt++;