Changeset 557

Timestamp:

Jun 28, 2006 11:10:02 AM (18 years ago)

Author:

bennylp

Message:

Fixed bug in sockaddr_in: the sin_zero part of the sockaddr_in is not zeroed, causing SIP transport hash table to behave erraticly

Location:

pjproject/trunk/pjlib/src

Files:

• pj/sock_bsd.c (modified) (3 diffs)
• pjlib-test/sock.c (modified) (3 diffs)

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

@@ -211 +211 @@
     RESET_LEN(addr);
     addr->sin_family = AF_INET;
+    pj_memset(addr->sin_zero, 0, sizeof(addr->sin_zero));
 
     if (str_addr && str_addr->slen) {
@@ -248 +249 @@
     RESET_LEN(addr);
     addr->sin_family = PJ_AF_INET;
+    pj_memset(addr->sin_zero, 0, sizeof(addr->sin_zero));
     pj_sockaddr_in_set_port(addr, port);
     return pj_sockaddr_in_set_str_addr(addr, str_addr);
@@ -369 +371 @@
     SET_LEN(&addr, sizeof(pj_sockaddr_in));
     addr.sin_family = PJ_AF_INET;
+    pj_memset(addr.sin_zero, 0, sizeof(addr.sin_zero));
     addr.sin_addr.s_addr = pj_htonl(addr32);
     addr.sin_port = pj_htons(port);

pjproject/trunk/pjlib/src/pjlib-test/sock.c

@@ -79 +79 @@
     unsigned char *p;
     pj_in_addr addr;
+    char zero[64];
+    pj_sockaddr_in addr2;
     const pj_str_t *hostname;
 
@@ -104 +106 @@
         return -30;
 
+    /* Test that pj_sockaddr_in_init() initialize the whole structure, 
+     * including sin_zero.
+     */
+    pj_sockaddr_in_init(&addr2, 0, 1000);
+    pj_memset(zero, 0, sizeof(zero));
+    if (pj_memcmp(addr2.sin_zero, zero, sizeof(addr2.sin_zero)) != 0)
+        return -35;
+
     /* pj_gethostname() */
     hostname = pj_gethostname();
@@ -113 +123 @@
 
     /* pj_gethostaddr() */
+
 
     return 0;