@@ -358,8 +358,7 @@ void AmBasicSipDialog::onRxRequest(const AmSipRequest& req)

     hdl->onSipRequest(req);

 }

-bool AmBasicSipDialog::onRxReplyStatus(const AmSipReply& reply, 

-				       TransMap::iterator t_uac_it)

+bool AmBasicSipDialog::onRxReplyStatus(const AmSipReply& reply)

 {

   /**

    * Error code list from RFC 5057:

@@ -448,15 +447,18 @@ void AmBasicSipDialog::onRxReply(const AmSipReply& reply)

   updateDialogTarget(reply);

   Status saved_status = status;

-  if(onRxReplyStatus(reply,t_it) && hdl)

-    hdl->onSipReply(t_it->second,reply,saved_status);

+  AmSipRequest orig_req(t_it->second);

+

+  if(onRxReplyStatus(reply) && hdl) {

+    hdl->onSipReply(orig_req,reply,saved_status);

+  }

   if((reply.code >= 200) && // final reply

      // but not for 2xx INV reply (wait for 200 ACK)

      ((reply.cseq_method != SIP_METH_INVITE) ||

       (reply.code >= 300))) {

-    uac_trans.erase(t_it);

+    uac_trans.erase(reply.cseq);

   }

 }

@@ -183,8 +183,7 @@ protected:

    *

    * @return true to continue processing, false otherwise

    */

-  virtual bool onRxReplyStatus(const AmSipReply& reply, 

-			       TransMap::iterator t_uac_it);

+  virtual bool onRxReplyStatus(const AmSipReply& reply);

   /**

    * Terminate pending UAS transactions

@@ -332,8 +332,7 @@ void AmSipDialog::onRequestTxed(const AmSipRequest& req)

   }

 }

-bool AmSipDialog::onRxReplyStatus(const AmSipReply& reply, 

-				  TransMap::iterator t_uac_it)

+bool AmSipDialog::onRxReplyStatus(const AmSipReply& reply)

 {

   // rfc3261 12.1

   // Dialog established only by 101-199 or 2xx 

@@ -68,7 +68,7 @@ protected:

   bool onRxReqSanity(const AmSipRequest& req);

   bool onRxReqStatus(const AmSipRequest& req);

-  bool onRxReplyStatus(const AmSipReply& reply, TransMap::iterator t_uac_it);

+  bool onRxReplyStatus(const AmSipReply& reply);

  public: