Changeset 611 for pjproject/trunk

Timestamp:

Jul 18, 2006 12:33:02 AM (18 years ago)

Author:

bennylp

Message:

More intelligent PJSUA-LIB in selecting the appropriate address for Contact header

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (2 diffs)
• include/pjsip/sip_uri.h (modified) (2 diffs)
• include/pjsua-lib/pjsua.h (modified) (1 diff)
• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsip/sip_transport.c (modified) (3 diffs)
• src/pjsip/sip_uri.c (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (11 diffs)
• src/pjsua-lib/pjsua_call.c (modified) (5 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua-lib/pjsua_im.c (modified) (4 diffs)
• src/pjsua-lib/pjsua_pres.c (modified) (4 diffs)

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

@@ -63 +63 @@
     PJSIP_TRANSPORT_RELIABLE        = 1,    /**< Transport is reliable.     */
     PJSIP_TRANSPORT_SECURE          = 2,    /**< Transport is secure.       */
-    PJSIP_TRANSPORT_DATAGRAM        = 4,    /**< Datagram based transport.  */
+    PJSIP_TRANSPORT_DATAGRAM        = 4,    /**< Datagram based transport.  
+                                                 (it's also assumed to be 
+                                                 connectionless)            */
 };
 
@@ -787 +789 @@
 
 /**
+ * Find out the appropriate local address info (IP address and port) to
+ * advertise in Contact header based on the remote address to be 
+ * contacted. The local address info would be the address name of the
+ * transport or listener which will be used to send the request.
+ *
+ * In this implementation, it will only select the transport based on
+ * the transport type in the request.
+ *
+ * @param tpmgr     The transport manager.
+ * @param pool      Pool to allocate memory for the IP address.
+ * @param h         Destination address to contact.
+ * @param ip_addr   Pointer to receive the IP address.
+ * @param port      Pointer to receive the port number.
+ *
+ * @return          PJ_SUCCESS, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsip_tpmgr_find_local_addr( pjsip_tpmgr *tpmgr,
+                                                  pj_pool_t *pool,
+                                                  pjsip_transport_type_e type,
+                                                  pj_str_t *ip_addr,
+                                                  int *port);
+
+
+/**
  * Destroy transport manager.
  */

pjproject/trunk/pjsip/include/pjsip/sip_uri.h

@@ -360 +360 @@
  * Create new SIP URL and initialize all fields with zero or NULL.
  * @param pool      The pool.
- * @param secure    Tlag to indicate whether secure transport should be used.
+ * @param secure    Flag to indicate whether secure transport should be used.
  * @return SIP URL.
  */
-PJ_DECL(pjsip_sip_uri*) pjsip_sip_uri_create( pj_pool_t *pool, int secure );
-
-/**
- * Create new SIPS URL and initialize all fields with zero or NULL.
- * @param pool      The pool.
- * @return          SIPS URL.
- */
-PJ_DECL(pjsip_sip_uri*) pjsip_sips_uri_create( pj_pool_t *pool );
+PJ_DECL(pjsip_sip_uri*) pjsip_sip_uri_create( pj_pool_t *pool, 
+                                              pj_bool_t secure );
+
+/**
+ * Change the SIP URI scheme to sip or sips based on the secure flag.
+ * This would not change anything except the scheme.
+ * @param uri       The URI
+ * @param secure    Non-zero if sips is wanted.
+ */
+PJ_DECL(void) pjsip_sip_uri_set_secure( pjsip_sip_uri *uri, 
+                                        pj_bool_t secure );
 
 /**
@@ -377 +380 @@
  * @param secure    Create sips URI?
  */
-PJ_DECL(void)  pjsip_sip_uri_init(pjsip_sip_uri *url, int secure);
+PJ_DECL(void)  pjsip_sip_uri_init(pjsip_sip_uri *url, pj_bool_t secure);
 
 /**

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -1303 +1303 @@
 PJ_DECL(pjsua_acc_id) pjsua_acc_find_for_incoming(pjsip_rx_data *rdata);
 
+
+/**
+ * Create a suitable URI to be put as Contact based on the specified
+ * target URI for the specified account.
+ *
+ * @param pool          Pool to allocate memory for the string.
+ * @param contact       The string where the Contact URI will be stored.
+ * @param acc_id        Account ID.
+ * @param uri           Destination URI of the request.
+ *
+ * @return              PJ_SUCCESS on success, other on error.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool,
+                                                   pj_str_t *contact,
+                                                   pjsua_acc_id acc_id,
+                                                   const pj_str_t *uri);
+                                                           
+
+
+/**
+ * Create a suitable URI to be put as Contact based on the information
+ * in the incoming request.
+ *
+ * @param pool          Pool to allocate memory for the string.
+ * @param contact       The string where the Contact URI will be stored.
+ * @param acc_id        Account ID.
+ * @param rdata         Incoming request.
+ *
+ * @return              PJ_SUCCESS on success, other on error.
+ */
+PJ_DECL(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool,
+                                                   pj_str_t *contact,
+                                                   pjsua_acc_id acc_id,
+                                                   pjsip_rx_data *rdata );
+                                                           
 
 

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -80 +80 @@
 
     int              index;         /**< Index in accounts array.       */
+    pj_str_t         display;       /**< Display name, if any.          */
     pj_str_t         user_part;     /**< User part of local URI.        */
-    pj_str_t         real_contact;  /**< Real contact address.          */
 
     pj_str_t         srv_domain;    /**< Host part of reg server.       */

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;
+};
+
 /*****************************************************************************
  *
@@ -818 +825 @@
 }
 
+
+
+/*
+ * Find out the appropriate local address info (IP address and port) to
+ * advertise in Contact header based on the remote address to be 
+ * contacted. The local address info would be the address name of the
+ * transport or listener which will be used to send the request.
+ *
+ * In this implementation, it will only select the transport based on
+ * the transport type in the request.
+ */
+PJ_DEF(pj_status_t) pjsip_tpmgr_find_local_addr( pjsip_tpmgr *tpmgr,
+                                                 pj_pool_t *pool,
+                                                 pjsip_transport_type_e type,
+                                                 pj_str_t *ip_addr,
+                                                 int *port)
+{
+    pj_status_t status = PJSIP_EUNSUPTRANSPORT;
+    unsigned flag;
+
+    /* Sanity checks */
+    PJ_ASSERT_RETURN(tpmgr && pool && ip_addr && port, PJ_EINVAL);
+
+    ip_addr->slen = 0;
+    *port = 0;
+
+    flag = pjsip_transport_get_flag_from_type(type);
+
+    if ((flag & PJSIP_TRANSPORT_DATAGRAM) != 0) {
+        
+        pj_sockaddr_in remote;
+        pjsip_transport *tp;
+
+        pj_sockaddr_in_init(&remote, NULL, 0);
+        status = pjsip_tpmgr_acquire_transport(tpmgr, type, &remote,
+                                               sizeof(remote), &tp);
+
+        if (status == PJ_SUCCESS) {
+            pj_strdup(pool, ip_addr, &tp->local_name.host);
+            *port = tp->local_name.port;
+            status = PJ_SUCCESS;
+
+            pjsip_transport_dec_ref(tp);
+        }
+
+    } else {
+        /* For connection oriented transport, enum the factories */
+        pjsip_tpfactory *f;
+
+        pj_lock_acquire(tpmgr->lock);
+
+        f = tpmgr->factory_list.next;
+        while (f != &tpmgr->factory_list) {
+            if (f->type == type)
+                break;
+            f = f->next;
+        }
+
+        if (f != &tpmgr->factory_list) {
+            pj_strdup(pool, ip_addr, &f->addr_name.host);
+            *port = f->addr_name.port;
+            status = PJ_SUCCESS;
+        }
+        pj_lock_release(tpmgr->lock);
+    }
+
+    return PJ_SUCCESS;
+}
+
+
 /*
  * pjsip_tpmgr_destroy()
@@ -1062 +1139 @@
                                                   pjsip_transport **tp)
 {
-    struct transport_key
-    {
-        pjsip_transport_type_e  type;
-        pj_sockaddr             addr;
-    } key;
+    struct transport_key key;
     int key_len;
     pjsip_transport *transport;

pjproject/trunk/pjsip/src/pjsip/sip_uri.c

@@ -207 +207 @@
 }
 
-PJ_DEF(void) pjsip_sip_uri_init(pjsip_sip_uri *url, int secure)
+PJ_DEF(void) pjsip_sip_uri_set_secure( pjsip_sip_uri *url, 
+                                       pj_bool_t secure )
+{
+    url->vptr = secure ? &sips_url_vptr : &sip_url_vptr;
+}
+
+PJ_DEF(void) pjsip_sip_uri_init(pjsip_sip_uri *url, pj_bool_t secure)
 {
     pj_bzero(url, sizeof(*url));
     url->ttl_param = -1;
-    url->vptr = secure ? &sips_url_vptr : &sip_url_vptr;
+    pjsip_sip_uri_set_secure(url, secure);
     pj_list_init(&url->other_param);
     pj_list_init(&url->header_param);
 }
 
-PJ_DEF(pjsip_sip_uri*) pjsip_sip_uri_create( pj_pool_t *pool, int secure )
+PJ_DEF(pjsip_sip_uri*) pjsip_sip_uri_create( pj_pool_t *pool, 
+                                             pj_bool_t secure )
 {
     pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -72 +72 @@
 
 /*
- * Update account's real contact address.
- */
-static void update_acc_contact(unsigned acc_id,
-                               unsigned tp_id)
-{
-    pjsua_acc *acc = &pjsua_var.acc[acc_id];
-    struct transport_data *t = &pjsua_var.tpdata[tp_id];
-    char uri[80];
-
-    /* Transport must be valid */
-    pj_assert(t->data.ptr != NULL);
-    
-    /* Build URI for the account */
-    pj_ansi_sprintf(uri, "<sip:%.*s:%d;transport=%s>", 
-                         (int)t->local_name.host.slen,
-                         t->local_name.host.ptr,
-                         t->local_name.port,
-                         pjsip_transport_get_type_name(t->type));
-
-
-    pj_strdup2(pjsua_var.pool, &acc->real_contact, uri);
-}
-
-
-/*
  * Initialize a new account (after configuration is set).
  */
@@ -103 +78 @@
     pjsua_acc_config *acc_cfg = &pjsua_var.acc[acc_id].cfg;
     pjsua_acc *acc = &pjsua_var.acc[acc_id];
-    pjsip_uri *uri;
+    pjsip_name_addr *name_addr;
     pjsip_sip_uri *sip_uri, *sip_reg_uri;
     unsigned i;
@@ -109 +84 @@
     /* Need to parse local_uri to get the elements: */
 
-    uri = pjsip_parse_uri(pjsua_var.pool, acc_cfg->id.ptr,
-                          acc_cfg->id.slen, 0);
-    if (uri == NULL) {
+    name_addr = (pjsip_name_addr*)
+                    pjsip_parse_uri(pjsua_var.pool, acc_cfg->id.ptr,
+                                    acc_cfg->id.slen, 
+                                    PJSIP_PARSE_URI_AS_NAMEADDR);
+    if (name_addr == NULL) {
         pjsua_perror(THIS_FILE, "Invalid local URI", 
                      PJSIP_EINVALIDURI);
@@ -119 +96 @@
     /* Local URI MUST be a SIP or SIPS: */
 
-    if (!PJSIP_URI_SCHEME_IS_SIP(uri) && 
-        !PJSIP_URI_SCHEME_IS_SIPS(uri)) 
+    if (!PJSIP_URI_SCHEME_IS_SIP(name_addr) && 
+        !PJSIP_URI_SCHEME_IS_SIPS(name_addr)) 
     {
         pjsua_perror(THIS_FILE, "Invalid local URI", 
@@ -129 +106 @@
 
     /* Get the SIP URI object: */
-    sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(uri);
+    sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(name_addr);
 
 
@@ -163 +140 @@
      * account for incoming requests.
      */
+    acc->display = name_addr->display;
     acc->user_part = sip_uri->user;
     acc->srv_domain = sip_uri->host;
@@ -175 +153 @@
     //  acc_cfg->contact = acc_cfg->id;
     //}
-
-    PJ_TODO(attach_account_to_transport);
-    if (pjsua_var.tpdata[0].data.ptr)
-        update_acc_contact(acc_id, 0);
 
     /* Build account route-set from outbound proxies and route set from 
@@ -377 +351 @@
 {
     PJ_TODO(pjsua_acc_modify);
+    PJ_UNUSED_ARG(acc_id);
+    PJ_UNUSED_ARG(cfg);
     return PJ_EINVALIDOP;
 }
@@ -462 +438 @@
 {
     pjsua_acc *acc;
+    pj_str_t contact;
     pj_status_t status;
 
@@ -482 +459 @@
     }
 
+    status = pjsua_acc_create_uac_contact( pjsua_var.pool, &contact,
+                                           acc_id, &acc->cfg.reg_uri);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate suitable Contact header"
+                                " for registration", 
+                     status);
+        return status;
+    }
+
     status = pjsip_regc_init( acc->regc,
                               &acc->cfg.reg_uri, 
                               &acc->cfg.id, 
                               &acc->cfg.id,
-                              1, &acc->real_contact, 
+                              1, &contact, 
                               acc->cfg.reg_timeout);
     if (status != PJ_SUCCESS) {
@@ -823 +809 @@
 }
 
+
+PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool,
+                                                  pj_str_t *contact,
+                                                  pjsua_acc_id acc_id,
+                                                  const pj_str_t *suri)
+{
+    pjsua_acc *acc;
+    pjsip_sip_uri *sip_uri;
+    pj_status_t status;
+    pjsip_transport_type_e tp_type = PJSIP_TRANSPORT_UNSPECIFIED;
+    pj_str_t local_addr;
+    unsigned flag;
+    int secure;
+    int local_port;
+    
+    acc = &pjsua_var.acc[acc_id];
+
+    /* If route-set is configured for the account, then URI is the 
+     * first entry of the route-set.
+     */
+    if (!pj_list_empty(&acc->route_set)) {
+        sip_uri = (pjsip_sip_uri*) acc->route_set.next->name_addr.uri;
+    } else {
+        pj_str_t tmp;
+        pjsip_uri *uri;
+
+        pj_strdup_with_null(pool, &tmp, suri);
+
+        uri = pjsip_parse_uri(pool, tmp.ptr, tmp.slen, 0);
+        if (uri == NULL)
+            return PJSIP_EINVALIDURI;
+
+        /* For non-SIP scheme, route set should be configured */
+        if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
+            return PJSIP_EINVALIDREQURI;
+
+        sip_uri = (pjsip_sip_uri*)uri;
+    }
+
+    /* Get transport type of the URI */
+    if (PJSIP_URI_SCHEME_IS_SIPS(sip_uri))
+        tp_type = PJSIP_TRANSPORT_TLS;
+    else if (sip_uri->transport_param.slen == 0) {
+        tp_type = PJSIP_TRANSPORT_UDP;
+    } else
+        tp_type = pjsip_transport_get_type_from_name(&sip_uri->transport_param);
+    
+    if (tp_type == PJSIP_TRANSPORT_UNSPECIFIED)
+        return PJSIP_EUNSUPTRANSPORT;
+
+    flag = pjsip_transport_get_flag_from_type(tp_type);
+    secure = (flag & PJSIP_TRANSPORT_SECURE) != 0;
+
+    /* Get local address suitable to send request from */
+    status = pjsip_tpmgr_find_local_addr(pjsip_endpt_get_tpmgr(pjsua_var.endpt),
+                                         pool, tp_type, &local_addr, &local_port);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Create the contact header */
+    contact->ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
+    contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
+                                     "%.*s%s<%s:%.*s%s%.*s:%d;transport=%s>",
+                                     (int)acc->display.slen,
+                                     acc->display.ptr,
+                                     (acc->display.slen?" " : ""),
+                                     (secure ? "sips" : "sip"),
+                                     (int)acc->user_part.slen,
+                                     acc->user_part.ptr,
+                                     (acc->user_part.slen?"@":""),
+                                     (int)local_addr.slen,
+                                     local_addr.ptr,
+                                     local_port,
+                                     pjsip_transport_get_type_name(tp_type));
+
+    return PJ_SUCCESS;
+}
+
+
+
+PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool,
+                                                  pj_str_t *contact,
+                                                  pjsua_acc_id acc_id,
+                                                  pjsip_rx_data *rdata )
+{
+    /* 
+     *  Section 12.1.1, paragraph about using SIPS URI in Contact.
+     *  If the request that initiated the dialog contained a SIPS URI 
+     *  in the Request-URI or in the top Record-Route header field value, 
+     *  if there was any, or the Contact header field if there was no 
+     *  Record-Route header field, the Contact header field in the response
+     *  MUST be a SIPS URI.
+     */
+    pjsua_acc *acc;
+    pjsip_sip_uri *sip_uri;
+    pj_status_t status;
+    pjsip_transport_type_e tp_type = PJSIP_TRANSPORT_UNSPECIFIED;
+    pj_str_t local_addr;
+    unsigned flag;
+    int secure;
+    int local_port;
+    
+    acc = &pjsua_var.acc[acc_id];
+
+    /* If Record-Route is present, then URI is the top Record-Route. */
+    if (rdata->msg_info.record_route) {
+        sip_uri = (pjsip_sip_uri*) rdata->msg_info.record_route->name_addr.uri;
+    } else {
+        pjsip_contact_hdr *h_contact;
+        pjsip_uri *uri = NULL;
+
+        /* Otherwise URI is Contact URI */
+        h_contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT,
+                                       NULL);
+        if (h_contact)
+            uri = pjsip_uri_get_uri(h_contact->uri);
+        
+
+        /* Or if Contact URI is not present, take the remote URI from
+         * the From URI.
+         */
+        if (uri == NULL)
+            uri = pjsip_uri_get_uri(rdata->msg_info.from->uri);
+
+
+        /* Can only do sip/sips scheme at present. */
+        if (!PJSIP_URI_SCHEME_IS_SIP(uri) && !PJSIP_URI_SCHEME_IS_SIPS(uri))
+            return PJSIP_EINVALIDREQURI;
+
+        sip_uri = (pjsip_sip_uri*)uri;
+    }
+
+    /* Get transport type of the URI */
+    if (PJSIP_URI_SCHEME_IS_SIPS(sip_uri))
+        tp_type = PJSIP_TRANSPORT_TLS;
+    else if (sip_uri->transport_param.slen == 0) {
+        tp_type = PJSIP_TRANSPORT_UDP;
+    } else
+        tp_type = pjsip_transport_get_type_from_name(&sip_uri->transport_param);
+    
+    if (tp_type == PJSIP_TRANSPORT_UNSPECIFIED)
+        return PJSIP_EUNSUPTRANSPORT;
+
+    flag = pjsip_transport_get_flag_from_type(tp_type);
+    secure = (flag & PJSIP_TRANSPORT_SECURE) != 0;
+
+    /* Get local address suitable to send request from */
+    status = pjsip_tpmgr_find_local_addr(pjsip_endpt_get_tpmgr(pjsua_var.endpt),
+                                         pool, tp_type, &local_addr, &local_port);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Create the contact header */
+    contact->ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
+    contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
+                                     "%.*s%s<%s:%.*s%s%.*s:%d;transport=%s>",
+                                     (int)acc->display.slen,
+                                     acc->display.ptr,
+                                     (acc->display.slen?" " : ""),
+                                     (secure ? "sips" : "sip"),
+                                     (int)acc->user_part.slen,
+                                     acc->user_part.ptr,
+                                     (acc->user_part.slen?"@":""),
+                                     (int)local_addr.slen,
+                                     local_addr.ptr,
+                                     local_port,
+                                     pjsip_transport_get_type_name(tp_type));
+
+    return PJ_SUCCESS;
+}
+
+
+

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -192 +192 @@
     pjsua_call *call;
     unsigned call_id;
+    pj_str_t contact;
     pjsip_tx_data *tdata;
     pj_status_t status;
@@ -233 +234 @@
     call->res_time.sec = 0;
 
+    /* Create suitable Contact header */
+    status = pjsua_acc_create_uac_contact(pjsua_var.pool, &contact,
+                                          acc_id, dest_uri);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        PJSUA_UNLOCK();
+        return status;
+    }
+
     /* Create outgoing dialog: */
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
-                                   &acc->cfg.id, &acc->real_contact,
+                                   &acc->cfg.id, &contact,
                                    dest_uri, dest_uri, &dlg);
     if (status != PJ_SUCCESS) {
@@ -346 +356 @@
 pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata)
 {
+    pj_str_t contact;
     pjsip_dialog *dlg = pjsip_rdata_get_dlg(rdata);
     pjsip_transaction *tsx = pjsip_rdata_get_tsx(rdata);
@@ -440 +451 @@
     acc_id = pjsua_acc_find_for_incoming(rdata);
 
+    /* Get suitable Contact header */
+    status = pjsua_acc_create_uas_contact(rdata->tp_info.pool, &contact,
+                                          acc_id, rdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
+                                      NULL, NULL);
+        return PJ_TRUE;
+    }
+
     /* Create dialog: */
     status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata,
-                                   &pjsua_var.acc[acc_id].real_contact, 
-                                   &dlg);
+                                   &contact, &dlg);
     if (status != PJ_SUCCESS) {
         pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
@@ -922 +942 @@
 
     /* Create SDP */
+    PJ_TODO(create_active_inactive_sdp_based_on_unhold_arg);
     status = pjmedia_endpt_create_sdp( pjsua_var.med_endpt, call->inv->pool, 
                                        1, &call->skinfo, &sdp);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -987 +987 @@
     /* To be done!! */
     PJ_TODO(pjsua_transport_set_enable);
+    PJ_UNUSED_ARG(enabled);
 
     return PJ_EINVALIDOP;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_im.c

@@ -418 +418 @@
     pjsip_media_type media_type;
     pjsua_im_data *im_data;
+    pj_str_t contact;
     pj_status_t status;
 
@@ -438 +439 @@
 
     /* Add contact. */
+    status = pjsua_acc_create_uac_contact(tdata->pool, &contact, acc_id, to);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        pjsip_tx_data_dec_ref(tdata);
+        return status;
+    }
+
     pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*)
         pjsip_generic_string_hdr_create(tdata->pool, 
-                                        &STR_CONTACT,
-                                        &pjsua_var.acc[acc_id].real_contact));
+                                        &STR_CONTACT, &contact));
 
     /* Create IM data to keep message details and give it back to
@@ -501 +508 @@
     pjsua_im_data *im_data;
     pjsip_tx_data *tdata;
+    pj_str_t contact;
     pj_status_t status;
 
@@ -519 +527 @@
 
     /* Add contact. */
+    status = pjsua_acc_create_uac_contact(tdata->pool, &contact, acc_id, to);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        pjsip_tx_data_dec_ref(tdata);
+        return status;
+    }
+
     pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*)
         pjsip_generic_string_hdr_create(tdata->pool, 
-                                        &STR_CONTACT,
-                                        &pjsua_var.acc[acc_id].real_contact));
+                                        &STR_CONTACT, &contact));
 
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -441 +441 @@
     int acc_id;
     pjsua_acc *acc;
+    pj_str_t contact;
     pjsip_method *req_method = &rdata->msg_info.msg->line.req.method;
     pjsua_srv_pres *uapres;
@@ -464 +465 @@
               acc_id));
     
+    /* Create suitable Contact header */
+    status = pjsua_acc_create_uas_contact(rdata->tp_info.pool, &contact,
+                                          acc_id, rdata);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        PJSUA_UNLOCK();
+        return PJ_TRUE;
+    }
+
     /* Create UAS dialog: */
     status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, 
-                                  &acc->real_contact,
-                                  &dlg);
+                                  &contact, &dlg);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, 
@@ -762 +771 @@
     int acc_id;
     pjsua_acc *acc;
+    pj_str_t contact;
     pjsip_dialog *dlg;
     pjsip_tx_data *tdata;
@@ -774 +784 @@
                          acc_id, index));
 
+    /* Generate suitable Contact header */
+    status = pjsua_acc_create_uac_contact(pjsua_var.pool, &contact,
+                                          acc_id, &buddy->uri);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to generate Contact header", status);
+        return;
+    }
+
     /* Create UAC dialog */
     status = pjsip_dlg_create_uac( pjsip_ua_instance(), 
                                    &acc->cfg.id,
-                                   &acc->real_contact,
+                                   &contact,
                                    &buddy->uri,
                                    NULL, &dlg);