Changeset 1310 for pjproject

Timestamp:

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

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (2 diffs)
• src/pjsip/sip_transport.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -606 +606 @@
  *
  *****************************************************************************/
+/**
+ * Type of callback to receive transport operation status.
+ */
 typedef void (*pjsip_transport_callback)(pjsip_transport *tp, void *token,
                                          pj_ssize_t sent_bytes);
+
+/**
+ * This structure describes transport key to be registered to hash table.
+ */
+typedef struct pjsip_transport_key
+{
+    /**
+     * Transport type.
+     */
+    long                    type;
+
+    /**
+     * Destination address.
+     */
+    pj_sockaddr             rem_addr;
+
+} pjsip_transport_key;
+
 /**
  * This structure represent the "public" interface of a SIP transport.
@@ -624 +645 @@
 
     /** Key for indexing this transport in hash table. */
-    struct {
-        pjsip_transport_type_e  type;       /**< Transport type.            */
-        pj_sockaddr             rem_addr;   /**< Remote addr (zero for UDP) */
-    } key;
+    pjsip_transport_key     key;
 
     char                   *type_name;      /**< Type name.                 */

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));