Changeset 338 for pjproject/trunk/pjlib/src/pj/sock_bsd.c

Timestamp:

Mar 20, 2006 12:39:24 PM (19 years ago)

Author:

bennylp

Message:

Ported pjlib to PowerPC/MacOS

File:

• pjproject/trunk/pjlib/src/pj/sock_bsd.c (modified) (8 diffs)

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

@@ -83 +83 @@
 
 
+#if defined(PJ_SOCKADDR_HAS_LEN) && PJ_SOCKADDR_HAS_LEN!=0
+#   define SET_LEN(addr,len) (((pj_sockaddr*)(addr))->sa_zero_len=(len))
+#   define RESET_LEN(addr)   (((pj_sockaddr*)(addr))->sa_zero_len=0)
+#else
+#   define SET_LEN(addr,len) 
+#   define RESET_LEN(addr)
+#endif
+
+
 /*
  * Convert 16-bit value from network byte order to host byte order.
@@ -191 +200 @@
                      (addr->sin_addr.s_addr=PJ_INADDR_NONE, PJ_EINVAL));
 
+    RESET_LEN(addr);
     addr->sin_family = AF_INET;
 
@@ -227 +237 @@
     PJ_ASSERT_RETURN(addr, (addr->sin_addr.s_addr=PJ_INADDR_NONE, PJ_EINVAL));
 
+    RESET_LEN(addr);
     addr->sin_family = PJ_AF_INET;
     pj_sockaddr_in_set_port(addr, port);
@@ -347 +358 @@
     PJ_CHECK_STACK();
 
+    SET_LEN(&addr, sizeof(pj_sockaddr_in));
     addr.sin_family = PJ_AF_INET;
     addr.sin_addr.s_addr = pj_htonl(addr32);
@@ -386 +398 @@
     if (getpeername(sock, (struct sockaddr*)addr, (socklen_t*)namelen) != 0)
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
-    else
-        return PJ_SUCCESS;
+    else {
+        RESET_LEN(addr);
+        return PJ_SUCCESS;
+    }
 }
 
@@ -400 +414 @@
     if (getsockname(sock, (struct sockaddr*)addr, (socklen_t*)namelen) != 0)
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
-    else
-        return PJ_SUCCESS;
+    else {
+        RESET_LEN(addr);
+        return PJ_SUCCESS;
+    }
 }
 
@@ -484 +500 @@
     if (*len < 0) 
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
-    else
-        return PJ_SUCCESS;
+    else {
+        RESET_LEN(from);
+        return PJ_SUCCESS;
+    }
 }
 
@@ -575 +593 @@
     PJ_ASSERT_RETURN(newsock != NULL, PJ_EINVAL);
 
+#if defined(PJ_SOCKADDR_HAS_LEN) && PJ_SOCKADDR_HAS_LEN!=0
+    if (addr) {
+        SET_LEN(addr, *addrlen);
+    }
+#endif
+    
     *newsock = accept(serverfd, (struct sockaddr*)addr, (socklen_t*)addrlen);
     if (*newsock==PJ_INVALID_SOCKET)
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
-    else
-        return PJ_SUCCESS;
+    else {
+        
+#if defined(PJ_SOCKADDR_HAS_LEN) && PJ_SOCKADDR_HAS_LEN!=0
+        if (addr) {
+            RESET_LEN(addr);
+        }
+#endif
+            
+        return PJ_SUCCESS;
+    }
 }
 #endif  /* PJ_HAS_TCP */