@@ -99,9 +99,15 @@ const char* AmBasicSipDialog::getStatusStr()

   return getStatusStr(status);

 }

-string AmBasicSipDialog::getContactHdr()

+string AmBasicSipDialog::getContactHdr() {

+  return

+    SIP_HDR_COLSP(SIP_HDR_CONTACT) "<"+ getContactUri() += ">" CRLF;

+}

+

+

+string AmBasicSipDialog::getContactUri()

 {

-  string contact_uri = SIP_HDR_COLSP(SIP_HDR_CONTACT) "<sip:";

+  string contact_uri = "sip:";

   if(!ext_local_tag.empty()) {

     contact_uri += local_tag + "@";

@@ -118,8 +124,6 @@ string AmBasicSipDialog::getContactHdr()

     contact_uri += ";" + contact_params;

   }

-  contact_uri += ">" CRLF;

-

   return contact_uri;

 }

@@ -310,6 +310,11 @@ public:

    */

   string getContactHdr();

+  /**

+   * Compute the Contact URI for the next request

+   */

+  string getContactUri();

+

   /**

    * Compute the Route-HF for the next request

    */