Changeset 1310 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

May 28, 2007 12:58:57 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #306: Error in SIP transport lookup because of memory alignment problem (thanks Samuel Vinson)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -82 +82 @@
 };
 
-/* Key for looking up hash table */
-struct transport_key
-{
-    pjsip_transport_type_e  type;
-    pj_sockaddr             addr;
-};
 
 /*****************************************************************************
@@ -1352 +1346 @@
          * In this case, lookup the transport from the hash table.
          */
-        struct transport_key key;
+        pjsip_transport_key key;
         int key_len;
         pjsip_transport *transport;
 
+        pj_bzero(&key, sizeof(key));
         key_len = sizeof(key.type) + addr_len;
 
         /* First try to get exact destination. */
         key.type = type;
-        pj_memcpy(&key.addr, remote, addr_len);
+        pj_memcpy(&key.rem_addr, remote, addr_len);
 
         transport = (pjsip_transport*)
@@ -1372 +1367 @@
                      type == PJSIP_TRANSPORT_LOOP_DGRAM)
             {
-                pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.addr;
+                pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.rem_addr;
 
                 pj_bzero(addr, sizeof(pj_sockaddr_in));
@@ -1384 +1379 @@
                      (remote_addr->addr.sa_family == PJ_AF_INET)) 
             {
-                pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.addr;
+                pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.rem_addr;
 
                 pj_bzero(addr, sizeof(pj_sockaddr_in));