Changeset 105 for pjproject/trunk/pjsip/src/pjsip/sip_util.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_util.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -677 +677 @@
                                             const pjsip_transport *req_transport,
                                             const pjsip_via_hdr *via,
-                                            pjsip_host_port *send_addr)
+                                            pjsip_host_info *send_addr)
 {
     /* Determine the destination address (section 18.2.2):
@@ -689 +689 @@
      */
     send_addr->flag = req_transport->flag;
-    send_addr->type = req_transport->type;
+    send_addr->type = req_transport->key.type;
 
     if (PJSIP_TRANSPORT_IS_RELIABLE(req_transport)) {
-        const pj_sockaddr_in *remote_addr;
-        remote_addr = &req_transport->rem_addr;
-        pj_strdup2(pool, &send_addr->host, 
-                   pj_inet_ntoa(remote_addr->sin_addr));
-        send_addr->port = pj_sockaddr_in_get_port(remote_addr);
+        pj_strdup( pool, &send_addr->addr.host, 
+                   &req_transport->remote_name.host);
+        send_addr->addr.port = req_transport->remote_name.port;
 
     } else {
         /* Set the host part */
         if (via->maddr_param.slen) {
-            pj_strdup(pool, &send_addr->host, &via->maddr_param);
+            pj_strdup(pool, &send_addr->addr.host, &via->maddr_param);
         } else if (via->recvd_param.slen) {
-            pj_strdup(pool, &send_addr->host, &via->recvd_param);
+            pj_strdup(pool, &send_addr->addr.host, &via->recvd_param);
         } else {
-            pj_strdup(pool, &send_addr->host, &via->sent_by.host);
+            pj_strdup(pool, &send_addr->addr.host, &via->sent_by.host);
         }
 
         /* Set the port */
-        send_addr->port = via->sent_by.port;
+        send_addr->addr.port = via->sent_by.port;
     }