@@ -40,11 +40,12 @@ AmSipDispatcher* AmSipDispatcher::instance()

   return _instance ? _instance : ((_instance = new AmSipDispatcher()));

 }

-void AmSipDispatcher::handleSipMsg(AmSipReply &reply)

+void AmSipDispatcher::handleSipMsg(const string& dialog_id, AmSipReply &reply)

 {

+  const string& id = dialog_id.empty() ? reply.local_tag : dialog_id;

   AmSipReplyEvent* ev = new AmSipReplyEvent(reply);

-  if(!AmEventDispatcher::instance()->post(reply.from_tag,ev)){

+  if(!AmEventDispatcher::instance()->post(id,ev)){

     if ((reply.code >= 100) && (reply.code < 300)) {

       if (AmConfig::UnhandledReplyLoglevel >= 0) {

 	_LOG(AmConfig::UnhandledReplyLoglevel,

@@ -68,21 +69,25 @@ void AmSipDispatcher::handleSipMsg(AmSipRequest &req)

   if(!local_tag.empty()) {

     AmSipRequestEvent* ev = new AmSipRequestEvent(req);

-      if(!ev_disp->post(local_tag,ev)) {

-

-	  delete ev;

-	  if(req.method != SIP_METH_ACK) {

-	    AmSipDialog::reply_error(req,481,

-				     "Call leg/Transaction does not exist");

-	  }

-	  else {

-	    DBG("received ACK for non-existing dialog "

-		"(callid=%s;remote_tag=%s;local_tag=%s)\n",

-		callid.c_str(),remote_tag.c_str(),local_tag.c_str());

-	  }

-      }

+    if(ev_disp->post(local_tag,ev))

+      return;

+    // Contact-user may contain internal dialog ID

+    if(!req.user.empty() && ev_disp->post(req.user,ev))

       return;

+

+    delete ev;

+    if(req.method != SIP_METH_ACK) {

+      AmSipDialog::reply_error(req,481,

+			       "Call leg/Transaction does not exist");

+    }

+    else {

+      DBG("received ACK for non-existing dialog "

+	  "(callid=%s;remote_tag=%s;local_tag=%s)\n",

+	  callid.c_str(),remote_tag.c_str(),local_tag.c_str());

+    }

+

+    return;

   }

   DBG("method: `%s' [%zd].\n", req.method.c_str(), req.method.length());

@@ -36,7 +36,7 @@ class AmSipDispatcher

   public:

     void handleSipMsg(AmSipRequest &);

-    void handleSipMsg(AmSipReply &);

+    void handleSipMsg(const string& dialog_id, AmSipReply &);

     static AmSipDispatcher* instance();

 };

@@ -127,9 +127,8 @@ int SipCtrlInterface::cancel(trans_ticket* tt)

     return trans_layer::instance()->cancel(tt);

 }

-int SipCtrlInterface::send(AmSipRequest &req,

-			   const string& next_hop,

-			   int out_interface)

+int SipCtrlInterface::send(AmSipRequest &req, const string& dialog_id,

+			   const string& next_hop, int out_interface)

 {

     if(req.method == "CANCEL")

 	return cancel(&req.tt);

@@ -221,6 +220,7 @@ int SipCtrlInterface::send(AmSipRequest &req,

     }

     int res = trans_layer::instance()->send_request(msg,&req.tt,

+						    stl2cstr(dialog_id),

 						    stl2cstr(next_hop),

 						    out_interface);

     delete msg;

@@ -596,7 +596,7 @@ void SipCtrlInterface::handle_sip_request(const trans_ticket& tt, sip_msg* msg)

 	req.callid.c_str(), req.to_tag.c_str(), req.method.c_str());

 }

-void SipCtrlInterface::handle_sip_reply(sip_msg* msg)

+void SipCtrlInterface::handle_sip_reply(const string& dialog_id, sip_msg* msg)

 {

     assert(msg->from && msg->from->p);

     assert(msg->to && msg->to->p);

@@ -617,7 +617,7 @@ void SipCtrlInterface::handle_sip_reply(sip_msg* msg)

     DBG("hdrs = <%s>\n",reply.hdrs.c_str());

     DBG("body-ct = <%s>\n",reply.body.getCTStr().c_str());

-    AmSipDispatcher::instance()->handleSipMsg(reply);

+    AmSipDispatcher::instance()->handleSipMsg(dialog_id, reply);

     DBG("^^ M [%s|%s] ru SIP reply %u %s handled ^^\n",

 	reply.callid.c_str(), reply.from_tag.c_str(),

@@ -89,9 +89,8 @@ public:

      * @param req The request to send. If the request creates a transaction, 

      *            its ticket is written into req.tt.

      */

-    static int send(AmSipRequest &req,

-		    const string& next_hop = "",

-		    int outbound_interface = -1);

+    static int send(AmSipRequest &req, const string& dialog_id,

+		    const string& next_hop = "", int outbound_interface = -1);

     /**

      * Sends a SIP reply. 

@@ -112,7 +111,7 @@ public:

      * From sip_ua

      */

     void handle_sip_request(const trans_ticket& tt, sip_msg* msg);

-    void handle_sip_reply(sip_msg* msg);

+    void handle_sip_reply(const string& dialog_id, sip_msg* msg);

     void handle_reply_timeout(AmSipTimeoutEvent::EvType evt,

         sip_trans *tr, trans_bucket *buk=0);

 };

@@ -81,6 +81,9 @@ sip_trans::~sip_trans()

     if((type == TT_UAC) && to_tag.s){

 	delete [] to_tag.s;

     }

+    if(dialog_id.s) {

+	delete [] dialog_id.s;

+    }

 }

 /**

@@ -124,6 +124,9 @@ class sip_trans

     /** used by UAS only; keeps RSeq of last sent reliable 1xx */

     unsigned int last_rseq;

+    /** Dialog-ID used for UAC transactions */

+    cstring dialog_id;

+

     /**

      * Retransmission buffer

      *  - UAC transaction: ACK

@@ -41,7 +41,7 @@ public:

     virtual ~sip_ua() {}

     virtual void handle_sip_request(const trans_ticket& tt, sip_msg* msg)=0;

-    virtual void handle_sip_reply(sip_msg* msg)=0;

+  virtual void handle_sip_reply(const string& dialog_id, sip_msg* msg)=0;

     //virtual void handle_request_timeout(const sip_msg *msg)=0;

     virtual void handle_reply_timeout(AmSipTimeoutEvent::EvType evt,

@@ -814,14 +814,16 @@ void _trans_layer::timeout(trans_bucket* bucket, sip_trans* t)

     translate_hdr(&msg,msg.callid, req,req->callid);

+    string dialog_id(t->dialog_id.s,t->dialog_id.len);

     bucket->remove(t);

     bucket->unlock();

-    ua->handle_sip_reply(&msg);

+    ua->handle_sip_reply(dialog_id,&msg);

 }

-int _trans_layer::send_request(sip_msg* msg, trans_ticket* tt,

-			       const cstring& _next_hop,

+int _trans_layer::send_request(sip_msg* msg, trans_ticket* tt, 

+			       const cstring& dialog_id,

+			       const cstring& _next_hop, 

 			       int out_interface)

 {

     // Request-URI

@@ -999,6 +1001,11 @@ int _trans_layer::send_request(sip_msg* msg, trans_ticket* tt,

 	    DBG("Could not update UAC state for request\n");

 	    delete p_msg;

 	}

+	else if(dialog_id.len && !(tt->_t->dialog_id.len)) {

+	    tt->_t->dialog_id.s = new char[dialog_id.len];

+	    tt->_t->dialog_id.len = dialog_id.len;

+	    memcpy((void*)tt->_t->dialog_id.s,dialog_id.s,dialog_id.len);

+	}

     }

     tt->_bucket->unlock();

@@ -1296,8 +1303,9 @@ void _trans_layer::received_msg(sip_msg* msg)

 		break;

 	    }

 	    if (res) {

+		string dialog_id(t->dialog_id.s, t->dialog_id.len);

 		bucket->unlock();

-		ua->handle_sip_reply(msg);

+		ua->handle_sip_reply(dialog_id, msg);

 		DROP_MSG;

 		//return; - part of DROP_MSG

 	    }

@@ -101,9 +101,8 @@ public:

      * @param [in]  msg Pre-built message.

      * @param [out] tt transaction ticket (needed for replies & CANCEL)

      */

-    int send_request(sip_msg* msg, trans_ticket* tt,

-		     const cstring& _next_hop,

-		     int out_interface = -1);

+    int send_request(sip_msg* msg, trans_ticket* tt, const cstring& dialog_id,

+		     const cstring& _next_hop, int out_interface = -1);

     /**

      * Cancels a request.