Changeset 1621

Timestamp:

Dec 5, 2007 5:08:29 AM (16 years ago)

Author:

bennylp

Message:

Fixed run-time error on MacOS X (and possibly BSD based systems) when bind() is called with larger addrlen

Location:

pjproject/trunk

Files:

• pjlib/src/pj/sock_bsd.c (modified) (4 diffs)
• pjmedia/src/pjmedia/stream.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

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

@@ -123 +123 @@
 const int PJ_MSG_DONTROUTE      = MSG_DONTROUTE;
 
+
+#if 0
+static void CHECK_ADDR_LEN(const pj_sockaddr *addr, int len)
+{
+    pj_sockaddr *a = (pj_sockaddr*)addr;
+    pj_assert((a->addr.sa_family==PJ_AF_INET && len==sizeof(pj_sockaddr_in)) ||
+              (a->addr.sa_family==PJ_AF_INET6 && len==sizeof(pj_sockaddr_in6)));
+
+}
+#else
+#define CHECK_ADDR_LEN(addr,len)
+#endif
 
 /*
@@ -450 +462 @@
 #endif
 
-
 /*
  * Bind socket.
@@ -461 +472 @@
 
     PJ_ASSERT_RETURN(addr && len >= (int)sizeof(struct sockaddr_in), PJ_EINVAL);
+
+    CHECK_ADDR_LEN(addr, len);
 
     if (bind(sock, (struct sockaddr*)addr, len) != 0)
@@ -575 +588 @@
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(len, PJ_EINVAL);
+    
+    CHECK_ADDR_LEN(to, tolen);
 
     *len = sendto(sock, (const char*)buf, *len, flags, 

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1369 +1369 @@
     /* Only attach transport when stream is ready. */
     status = pjmedia_transport_attach(tp, stream, &info->rem_addr, 
-                                      &info->rem_rtcp, sizeof(info->rem_addr), 
+                                      &info->rem_rtcp, 
+                                      pj_sockaddr_get_len(&info->rem_addr), 
                                       &on_rx_rtp, &on_rx_rtcp);
     if (status != PJ_SUCCESS)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1238 +1238 @@
     }
 
-    status = pj_sock_bind(sock, &bind_addr, sizeof(bind_addr));
+    status = pj_sock_bind(sock, &bind_addr, pj_sockaddr_get_len(&bind_addr));
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "bind() error", status);