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

Timestamp:

Dec 26, 2005 12:52:19 PM (18 years ago)

Author:

bennylp

Message:

Modify transport to use generic sockaddr address

File:

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

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

@@ -47 +47 @@
 };
 
-
-
 /*****************************************************************************
  *
@@ -82 +80 @@
     unsigned i;
 
+    /* Sanity check. 
+     * Check that transport_names[] are indexed on transport type. 
+     */
+    PJ_ASSERT_RETURN(transport_names[PJSIP_TRANSPORT_UDP].type ==
+                     PJSIP_TRANSPORT_UDP, PJSIP_TRANSPORT_UNSPECIFIED);
+
+    /* Get transport type from name. */
     for (i=0; i<PJ_ARRAY_SIZE(transport_names); ++i) {
         if (pj_stricmp(name, &transport_names[i].name) == 0) {
@@ -101 +106 @@
     unsigned i;
 
+    /* Sanity check. 
+     * Check that transport_names[] are indexed on transport type. 
+     */
+    PJ_ASSERT_RETURN(transport_names[PJSIP_TRANSPORT_UDP].type ==
+                     PJSIP_TRANSPORT_UDP, PJSIP_TRANSPORT_UNSPECIFIED);
+
+    /* Get the transport type for the specified flags. */
     for (i=0; i<PJ_ARRAY_SIZE(transport_names); ++i) {
         if (transport_names[i].flag == flag) {
@@ -114 +126 @@
 pjsip_transport_get_flag_from_type( pjsip_transport_type_e type )
 {
+    /* Sanity check. 
+     * Check that transport_names[] are indexed on transport type. 
+     */
+    PJ_ASSERT_RETURN(transport_names[PJSIP_TRANSPORT_UDP].type ==
+                     PJSIP_TRANSPORT_UDP, 0);
+
+    /* Check that argument is valid. */
     PJ_ASSERT_RETURN(type < PJ_ARRAY_SIZE(transport_names), 0);
+
+    /* Return transport flag. */
     return transport_names[type].flag;
 }
@@ -124 +145 @@
 pjsip_transport_get_default_port_for_type(pjsip_transport_type_e type)
 {
+    /* Sanity check. 
+     * Check that transport_names[] are indexed on transport type. 
+     */
+    PJ_ASSERT_RETURN(transport_names[PJSIP_TRANSPORT_UDP].type ==
+                     PJSIP_TRANSPORT_UDP, 0);
+
+    /* Check that argument is valid. */
     PJ_ASSERT_RETURN(type < PJ_ARRAY_SIZE(transport_names), 5060);
+
+    /* Return the port. */
     return transport_names[type].port;
 }
@@ -225 +255 @@
  *****************************************************************************/
 
-/*
- * Transport key for indexing in the hash table.
- */
-typedef struct transport_key
-{
-    pj_uint8_t  type;
-    pj_uint8_t  zero;
-    pj_uint16_t port;
-    pj_uint32_t addr;
-} transport_key;
-
 
 /*****************************************************************************
@@ -270 +289 @@
 PJ_DEF(pj_status_t) pjsip_transport_send(  pjsip_transport *tr, 
                                            pjsip_tx_data *tdata,
-                                           const pj_sockaddr_in *addr,
+                                           const pj_sockaddr *addr,
+                                           int addr_len,
                                            void *token,
                                            void (*cb)(void *token, 
@@ -318 +338 @@
 
     /* Send to transport. */
-    status = (*tr->send_msg)(tr, tdata,  addr, (void*)tdata, 
+    status = (*tr->send_msg)(tr, tdata,  addr, addr_len, (void*)tdata, 
                              &transport_send_callback);
 
@@ -396 +416 @@
                                               pjsip_transport *tp )
 {
-    transport_key key;
+    int key_len;
 
     /* Init. */
@@ -407 +427 @@
      * Register to hash table.
      */
-    key.type = (pj_uint8_t)tp->type;
-    key.zero = 0;
-    key.addr = pj_ntohl(tp->rem_addr.sin_addr.s_addr);
-    key.port = pj_ntohs(tp->rem_addr.sin_port);
-
+    key_len = sizeof(tp->key.type) + tp->addr_len;
     pj_lock_acquire(mgr->lock);
-    pj_hash_set(tp->pool, mgr->table, &key, sizeof(key), tp);
+    pj_hash_set(tp->pool, mgr->table, &tp->key, key_len, tp);
     pj_lock_release(mgr->lock);
 
@@ -426 +442 @@
                                                 pjsip_transport *tp)
 {
-    transport_key key;
-
+    int key_len;
+
+    /* Must have no user. */
     PJ_ASSERT_RETURN(pj_atomic_get(tp->ref_cnt) == 0, PJSIP_EBUSY);
 
@@ -445 +462 @@
      * Unregister from hash table.
      */
-    key.type = (pj_uint8_t)tp->type;
-    key.zero = 0;
-    key.addr = pj_ntohl(tp->rem_addr.sin_addr.s_addr);
-    key.port = pj_ntohs(tp->rem_addr.sin_port);
-
-    pj_hash_set(tp->pool, mgr->table, &key, sizeof(key), NULL);
+    key_len = sizeof(tp->key.type) + tp->addr_len;
+    pj_hash_set(tp->pool, mgr->table, &tp->key, key_len, NULL);
 
     pj_lock_release(mgr->lock);
@@ -602 +615 @@
 {
     pjsip_transport *tr = rdata->tp_info.transport;
-    pj_str_t s;
 
     char *current_pkt;
@@ -683 +695 @@
          * MUST add received parameter to the via.
          */
-        s = pj_str(pj_inet_ntoa(rdata->pkt_info.addr.sin_addr));
-        if (pj_strcmp(&s, &rdata->msg_info.via->sent_by.host) != 0) {
-            pj_strdup(rdata->tp_info.pool, 
-                      &rdata->msg_info.via->recvd_param, &s);
+        if (pj_strcmp2(&rdata->msg_info.via->sent_by.host, 
+                       rdata->pkt_info.src_name) != 0) 
+        {
+            pj_strdup2(rdata->tp_info.pool, 
+                       &rdata->msg_info.via->recvd_param, 
+                       rdata->pkt_info.src_name);
         }
 
@@ -693 +707 @@
          */
         if (rdata->msg_info.via->rport_param == 0) {
-            rdata->msg_info.via->rport_param = 
-                pj_ntohs(rdata->pkt_info.addr.sin_port);
+            rdata->msg_info.via->rport_param = rdata->pkt_info.src_port;
         }
 
@@ -736 +749 @@
 PJ_DEF(pj_status_t) pjsip_tpmgr_alloc_transport( pjsip_tpmgr *mgr,
                                                  pjsip_transport_type_e type,
-                                                 const pj_sockaddr_in *remote,
+                                                 const pj_sockaddr_t *remote,
+                                                 int addr_len,
                                                  pjsip_transport **p_transport)
 {
-    transport_key key;
+    struct transport_key
+    {
+        pjsip_transport_type_e  type;
+        pj_sockaddr             addr;
+    } key;
+    int key_len;
     pjsip_transport *transport;
     pjsip_tpfactory *factory;
@@ -746 +765 @@
     pj_lock_acquire(mgr->lock);
 
+    key_len = sizeof(key.type) + addr_len;
+
     /* First try to get exact destination. */
-    key.type = (pj_uint8_t)type;
-    key.zero = 0;
-    key.addr = pj_ntohl(remote->sin_addr.s_addr);
-    key.port = pj_ntohs(remote->sin_port);
-
-    transport = pj_hash_get(mgr->table, &key, sizeof(key));
-    if (transport != NULL) {
+    key.type = type;
+    pj_memcpy(&key.addr, remote, addr_len);
+
+    transport = pj_hash_get(mgr->table, &key, key_len);
+    if (transport == NULL) {
         unsigned flag = pjsip_transport_get_flag_from_type(type);
-        
-        /* For datagram transports, try lookup with zero address. */
-        if (flag & PJSIP_TRANSPORT_DATAGRAM) {
-            key.addr = 0;
-            key.port = 0;
-
-            transport = pj_hash_get(mgr->table, &key, sizeof(key));
+        const pj_sockaddr *remote_addr = (const pj_sockaddr*)remote;
+
+        /* For datagram transports, try lookup with zero address. 
+         */
+        if ( (flag & PJSIP_TRANSPORT_DATAGRAM) && 
+             (remote_addr->sa_family == PJ_AF_INET)) 
+        {
+            pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.addr;
+
+            pj_memset(addr, 0, sizeof(pj_sockaddr_in));
+            addr->sin_family = PJ_AF_INET;
+            addr->sin_addr.s_addr = 0;
+            addr->sin_port = 0;
+
+            key_len = sizeof(key.type) + sizeof(pj_sockaddr_in);
+            transport = pj_hash_get(mgr->table, &key, key_len);
         }
     }
@@ -816 +844 @@
 
         do {
-            char src_addr[128], dst_addr[128];
-            int src_port, dst_port;
-            pjsip_transport *t;
-
-            t = pj_hash_this(mgr->table, itr);
-            pj_native_strcpy(src_addr, pj_inet_ntoa(t->local_addr.sin_addr));
-            src_port = pj_ntohs(t->local_addr.sin_port);
-
-            pj_native_strcpy(dst_addr, pj_inet_ntoa(t->rem_addr.sin_addr));
-            dst_port = pj_ntohs(t->rem_addr.sin_port);
-
-            PJ_LOG(3, (THIS_FILE, "  %s %s %s:%d --> %s:%d (refcnt=%d)", 
-                       t->type_name,
+            pjsip_transport *t = pj_hash_this(mgr->table, itr);
+
+            PJ_LOG(3, (THIS_FILE, "  %s %s (refcnt=%d)", 
                        t->obj_name,
-                       src_addr, src_port,
-                       dst_addr, dst_port,
+                       t->info,
                        pj_atomic_get(t->ref_cnt)));