Changeset 3106 for pjproject/trunk/pjsip/src/pjsip/sip_util.c

Timestamp:

Feb 24, 2010 5:43:34 AM (14 years ago)

Author:

nanang

Message:

Ticket #1032:

• Initial version of server domain name verification:
  • Updated SSL certificate info, especially identities info
  • Updated verification mechanism as in the specifications in ticket desc.
  • Added server domain name info in pjsip_tx_data.
  • Added alternative API for acquiring transport and creating transport of transport factory to include pjsip_tx_data param.
  • Server identity match criteria:
    • full host name match
    • wild card not accepted
    • if identity is URI, it must be SIP/SIPS URI
• Initial version of transport state notifications:
  • Added new API to set transport state callback in PJSIP and PJSUA.
  • Defined states: connected/disconnected, accepted/rejected, verification errors.
• Minors:
  • Updated SSL socket test: dump verification result, test of requiring client cert, and few minors.
  • Updated test cert to include subjectAltName extensions.
  • Added SSL certificate dump function.
  • Updated max number of socket async operations in Symbian sample apps (RSocketServ::Connect()) to 32 (was default 8).

File:

• pjproject/trunk/pjsip/src/pjsip/sip_util.c (modified) (6 diffs)

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

@@ -779 +779 @@
             pjsip_hdr_clone(cancel_tdata->pool, req_tdata->saved_strict_route);
     }
+
+    /* Copy the destination host name from the original request */
+    pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name,
+              &req_tdata->dest_info.name);
 
     /* Finally copy the destination info from the original request */
@@ -1135 +1139 @@
 
         /* Acquire transport. */
-        status = pjsip_endpt_acquire_transport( stateless_data->endpt,
+        status = pjsip_endpt_acquire_transport2(stateless_data->endpt,
                                                 cur_addr_type,
                                                 cur_addr,
                                                 cur_addr_len,
                                                 &tdata->tp_sel,
+                                                tdata,
                                                 &stateless_data->cur_transport);
         if (status != PJ_SUCCESS) {
@@ -1320 +1325 @@
      */
     if (tdata->dest_info.addr.count == 0) {
+        /* Copy the destination host name to TX data */
+        pj_strdup(tdata->pool, &tdata->dest_info.name, &dest_info.addr.host);
+
         pjsip_endpt_resolve( endpt, tdata->pool, &dest_info, stateless_data,
                              &stateless_send_resolver_callback);
@@ -1466 +1474 @@
         pjsip_tpselector_add_ref(sraw_data->sel);
     }
+
+    /* Copy the destination host name to TX data */
+    pj_strdup(tdata->pool, &tdata->dest_info.name, &dest_info.addr.host);
 
     /* Resolve destination host.
@@ -1623 +1634 @@
 
     /* Acquire transport. */
-    status = pjsip_endpt_acquire_transport( send_state->endpt, 
+    status = pjsip_endpt_acquire_transport2(send_state->endpt, 
                                             addr->entry[0].type,
                                             &addr->entry[0].addr,
                                             addr->entry[0].addr_len,
                                             &send_state->tdata->tp_sel,
+                                            send_state->tdata,
                                             &send_state->cur_transport);
     if (status != PJ_SUCCESS) {
@@ -1703 +1715 @@
         }
     } else {
+        /* Copy the destination host name to TX data */
+        pj_strdup(tdata->pool, &tdata->dest_info.name, 
+                  &res_addr->dst_host.addr.host);
+
         pjsip_endpt_resolve(endpt, tdata->pool, &res_addr->dst_host, 
                             send_state, &send_response_resolver_cb);