@@ -127,8 +127,13 @@ class SIPRegistration : public AmSipDialogEventHandler,

   void onSipReply(const AmSipReply& reply, int old_dlg_status);

   void onSipRequest(const AmSipRequest& req) {}

   void onInvite2xx(const AmSipReply&) {}

+#if 0

   void onNo2xxACK(unsigned int) {}

   void onNoErrorACK(unsigned int) {}

+#else

+  void onNoAck(unsigned int) {}

+  void onNoPrack(unsigned int) {}

+#endif

   /** is this registration registered? */

   bool active; 

@@ -36,6 +36,7 @@

 #include "log.h"

 #include "AmConfigReader.h"

 #include "AmUtils.h"

+#include "AmSession.h"

 #include <fstream>

 #include <cctype>

@@ -89,6 +90,8 @@ unsigned int AmConfig::OptionsSessionLimit            = 0;

 unsigned int AmConfig::OptionsSessionLimitErrCode     = 503;

 string       AmConfig::OptionsSessionLimitErrReason   = "Server overload";

+unsigned char AmConfig::rel100                 = REL100_SUPPORTED;

+

 vector <string> AmConfig::CodecOrder;

 Dtmf::InbandDetectorType 

@@ -519,5 +522,20 @@ int AmConfig::readConfiguration()

     }

   }

+  if (cfg.hasParameter("100rel")) {

+    string rel100s = cfg.getParameter("100rel");

+    if (rel100s == "disabled" || rel100s == "off") {

+      rel100 = REL100_DISABLED;

+    } else if (rel100s == "supported") {

+      rel100 = REL100_SUPPORTED;

+    } else if (rel100s == "require") {

+      rel100 = REL100_REQUIRE;

+    } else {

+      ERROR("unknown setting for '100rel' config option.\n");

+      return -1;

+    }

+  }

+  INFO("100rel: %d.\n", AmConfig::rel100);

+

   return 0;

 }	

@@ -135,6 +135,8 @@ struct AmConfig

   static unsigned int OptionsSessionLimitErrCode;

   static string OptionsSessionLimitErrReason;

+  static unsigned char rel100;

+

   /** Time of no RTP after which Session is regarded as dead, 0 for no Timeout */

   static unsigned int DeadRtpTime;

@@ -36,6 +36,7 @@

 #include "AmMediaProcessor.h"

 #include "AmDtmfDetector.h"

 #include "AmPlayoutBuffer.h"

+#include "AmSipHeaders.h"

 #ifdef WITH_ZRTP

 #include "AmZRTP.h"

@@ -49,6 +50,7 @@

 #include <assert.h>

 #include <sys/time.h>

+

 volatile unsigned int AmSession::session_num = 0;

 AmMutex AmSession::session_num_mut;

@@ -65,6 +67,7 @@ AmSession::AmSession()

     m_dtmfDetector(this), m_dtmfEventQueue(&m_dtmfDetector),

     m_dtmfDetectionEnabled(true),

     accept_early_session(false),

+    reliable_1xx(AmConfig::rel100),

     processing_status(SESSION_PROCESSING_EVENTS)

 #ifdef WITH_ZRTP

   ,  zrtp_session(NULL), zrtp_audio(NULL), enable_zrtp(true)

@@ -76,6 +79,8 @@ AmSession::AmSession()

 {

   use_local_audio[AM_AUDIO_IN] = false;

   use_local_audio[AM_AUDIO_OUT] = false;

+  if (reliable_1xx)

+    dlg.rseq = 0; //???

 }

 AmSession::~AmSession()

@@ -668,8 +673,41 @@ void AmSession::onSipRequest(const AmSipRequest& req)

   CALL_EVENT_H(onSipRequest,req);

   DBG("onSipRequest: method = %s\n",req.method.c_str());

-  if(req.method == "INVITE"){

-	

+  if(req.method == SIP_METH_INVITE){

+

+    switch(reliable_1xx) {

+      case REL100_SUPPORTED: /* if support is on, enforce if asked by UAC */

+        if (key_in_list(getHeader(req.hdrs, SIP_HDR_SUPPORTED), 

+              SIP_EXT_100REL) ||

+            key_in_list(getHeader(req.hdrs, SIP_HDR_REQUIRE), 

+              SIP_EXT_100REL)) {

+          reliable_1xx = REL100_REQUIRE;

+          DBG(SIP_EXT_100REL " now active.\n");

+        }

+        break;

+      case REL100_REQUIRE: /* if support is required, reject if UAC doesn't */

+        if (! (key_in_list(getHeader(req.hdrs,SIP_HDR_SUPPORTED), 

+              SIP_EXT_100REL) ||

+            key_in_list(getHeader(req.hdrs, SIP_HDR_REQUIRE), 

+              SIP_EXT_100REL))) {

+          ERROR("'" SIP_EXT_100REL "' extension required, but not advertised"

+            " by peer.\n");

+          dlg.reply(req, 421, "Extension Required", "", "",

+              SIP_HDR_COLSP(SIP_HDR_REQUIRE) SIP_EXT_100REL CRLF);

+          if (dlg.getStatus() < AmSipDialog::Connected)

+            setStopped();

+          return;

+        }

+      default:

+        ERROR("BUG: unexpected value `%d' for '" SIP_EXT_100REL "' switch.", 

+          reliable_1xx);

+#ifndef NDEBUG

+        abort();

+#endif

+      case 0: /* support disabled */

+        break;

+    }

+

     onInvite(req);

     if(detached.get() && !getStopped()){

@@ -702,9 +740,25 @@ void AmSession::onSipRequest(const AmSipRequest& req)

     } else {

       dlg.reply(req, 415, "Unsupported Media Type");

     }

-  } 

-}

+  } else if( req.method == SIP_METH_PRACK ) {

+    if (reliable_1xx != REL100_REQUIRE) {

+      WARN("unexpected PRACK received while " SIP_EXT_100REL " not active.\n");

+      return;

+    }

+    if ((1<<MAX_RSEQ_BITS)<=req.rseq && req.rseq<=(unsigned)abs(dlg.rseq)) {

+      // call interface function

+      onPrack(req, LOC_RSEQ_ORDER(req.rseq));

+      if (req.rseq == (unsigned)-dlg.rseq) {

+        dlg.rseq = -dlg.rseq; // confirmed

+        DBG("latest RSeq (%u) confirmed.\n", dlg.rseq);

+      }

+    } else {

+      WARN("no matching RAck value in PRACK (%s).\n", req.hdrs.c_str());

+      return;

+    }

+  }

+}

 void AmSession::onSipReply(const AmSipReply& reply, int old_dlg_status)

 {

@@ -755,7 +809,7 @@ void AmSession::onSipReply(const AmSipReply& reply, int old_dlg_status)

 	break;

       case AmSipDialog::Pending:

-	

+

 	switch(reply.code){

 	  // todo: 180 with body (remote rbt)

 	case 180: { 

@@ -793,17 +847,61 @@ void AmSession::onSipReply(const AmSipReply& reply, int old_dlg_status)

 	} break;

 	default:  break;// continue waiting.

 	}

-      }

-    }

-  }

+

+        // FIXME: should this stay under negotiate_onreply???

+        if (100 < reply.code && reply.code < 200 && 

+            reply.method == SIP_METH_INVITE) {

+          switch (reliable_1xx) {

+          case REL100_SUPPORTED:

+            if (key_in_list(getHeader(reply.hdrs, SIP_HDR_REQUIRE), 

+                SIP_EXT_100REL))

+              reliable_1xx = REL100_REQUIRE;

+            else

+              break;

+

+          case REL100_REQUIRE: {

+            if (! reply.rseq) {

+              ERROR("no RSeq value (or unsupported 0) in reliable 1xx.\n");

+              dlg.cancel();

+              setStopped();

+              break;

+            }

+            string cseq_val = int2str(reply.cseq) + " " + reply.method;

+            sendPrack(/*rcvd sdp_offr [TODO]*/"",int2str(reply.rseq),cseq_val);

+            DBG(SIP_EXT_100REL " now active.\n");

+          }

+          break;

+

+          case 0:

+            // 100rel support disabled

+            break;

+          default:

+            ERROR("BUG: unexpected value `%d' for " SIP_EXT_100REL " switch.", 

+                reliable_1xx);

+#ifndef NDEBUG

+            abort();

+#endif

+          } // switch reliable 1xx

+        } else if (300<=reply.code && reliable_1xx && 

+            reply.method==SIP_METH_PRACK) {

+          // if PRACK fails, tear down session

+          dlg.cancel();

+          setStopped();

+        } // if 1xx && INVITE || failed && PRACK

+      } // switch dlg status

+    } // status < Connected

+  } //if negotiate_onreply

 }

+

+

 void AmSession::onInvite2xx(const AmSipReply& reply)

 {

   AmSipTransaction* t = dlg.get_uac_trans(reply.cseq);

   if(t) dlg.send_200_ack(*t);

 }

+#if 0

 void AmSession::onNo2xxACK(unsigned int cseq)

 {

   dlg.bye();

@@ -814,6 +912,29 @@ void AmSession::onNoErrorACK(unsigned int cseq)

 {

   setStopped();

 }

+#else

+void AmSession::onNoAck(unsigned int cseq)

+{

+  if (dlg.getStatus() == AmSipDialog::Connected)

+    dlg.bye();

+  setStopped();

+}

+

+void AmSession::onNoPrack(const AmSipRequest &req, const AmSipReply &rpl)

+{

+  INFO("reply <%s> timed out.\n", rpl.print().c_str());

+  if (100 < rpl.code && rpl.code < 200 && reliable_1xx == REL100_REQUIRE &&

+      (unsigned)dlg.rseq == rpl.rseq && rpl.method == SIP_METH_INVITE) {

+    INFO("reliable %d reply timed out; rejecting request.\n", rpl.code);

+    dlg.reply(req, 504, "Server Time-out");

+    if (dlg.getStatus() < AmSipDialog::Connected)

+      setStopped();

+  } else {

+    WARN("reply timed-out, but not reliable.\n"); // debugging

+  }

+}

+

+#endif

 void AmSession::onAudioEvent(AmAudioEvent* audio_ev)

 {

@@ -844,6 +965,12 @@ void AmSession::onBye(const AmSipRequest& req)

   setStopped();

 }

+void AmSession::onPrack(const AmSipRequest& req, unsigned cnt)

+{

+  DBG("handling #%u PRACK.\n", cnt);

+  dlg.reply(req, 200, "OK");

+}

+

 int AmSession::acceptAudio(const string& body,

 			   const string& hdrs,

 			   string*       sdp_reply)

@@ -906,6 +1033,47 @@ void AmSession::onSendReply(const AmSipRequest& req, unsigned int  code,

 			    const string& reason, const string& content_type,

 			    const string& body, string& hdrs, int flags)

 {

+  if (req.method == SIP_METH_INVITE) {

+    if (100 < code && code < 200) {

+      switch (reliable_1xx) {

+        case REL100_SUPPORTED:

+          hdrs += SIP_HDR_COLSP(SIP_HDR_SUPPORTED) SIP_EXT_100REL CRLF;

+          break;

+        case REL100_REQUIRE:

+          // add Require HF

+          hdrs += SIP_HDR_COLSP(SIP_HDR_REQUIRE) SIP_EXT_100REL CRLF;

+          // add RSeq HF

+#ifndef NDEBUG

+          if ((abs(dlg.rseq) & ((1 << MAX_RSEQ_BITS) - 1)) == 

+              ((1 << MAX_RSEQ_BITS) - 1)) {

+            ERROR("CRITICAL: RSeq value too high: increase MAX_RSEQ_BITS "

+              "(now %d) and recompile.\n", MAX_RSEQ_BITS);

+            abort();

+          }

+#endif

+          if (dlg.rseq < 0) { // RSeq not yet PRACKed

+            // refuse subsequent 1xx if first isn't yet PRACKed

+            if ((((unsigned)-dlg.rseq) & ((1 << MAX_RSEQ_BITS) - 1)) == 0)

+              throw AmSession::Exception(491, "last reliable 1xx not yet "

+                  "PRACKed");

+            dlg.rseq --;

+          } else if (! dlg.rseq) { // only init rseq if 1xx is used

+            unsigned rseq_1st = (get_random() + 1) << MAX_RSEQ_BITS;

+            rseq_1st &= 0x7fffffff;

+            dlg.rseq = -((signed)rseq_1st);

+          } else {

+            dlg.rseq = -(++dlg.rseq);

+          }

+          // FIXME: code above is not re-entrant; should it actually be???

+          hdrs += SIP_HDR_COLSP(SIP_HDR_RSEQ) + int2str(-dlg.rseq) + CRLF;

+          break;

+      }

+    } else if (code < 300 && reliable_1xx == REL100_REQUIRE) {

+      if (dlg.rseq < 0) // reliable 1xx is pending

+        throw AmSession::Exception(491, "last reliable 1xx not yet PRACKed");

+    }

+  }

+

   CALL_EVENT_H(onSendReply,req,code,reason,content_type,body,hdrs,flags);

 }

@@ -915,9 +1083,47 @@ void AmSession::onRtpTimeout()

   setStopped();

 }

-void AmSession::sendUpdate() 

+void AmSession::sendUpdate(string &cont_type, string &body, string &hdrs)

+{

+  dlg.update(cont_type, body, hdrs);

+}

+

+void AmSession::sendPrack(const string &sdp_offer, 

+                          const string &rseq_val, 

+                          const string &cseq_val)

+{

+  string hdrs = "RAck: " + rseq_val + " " + cseq_val + "\r\n";

+

+  // TODO: digest an answer based on the sdp_offer

+

+  // TODO: should't cseq&rseq be handled in dialog, entirely?!?!

+  if (dlg.prack(/*cont. type*/"", /*body*/"", hdrs) < 0)

+    ERROR("failed to send PRACK request in session '%s'.\n",sid4dbg().c_str());

+}

+

+string AmSession::sid4dbg()

 {

-  dlg.update("");

+  string dbg;

+  dbg = dlg.callid + "/" + dlg.local_tag + "/" + dlg.remote_tag + "/" + 

+      int2str(RTPStream()->getLocalPort()) + "/" + 

+      RTPStream()->getRHost() + ":" + int2str(RTPStream()->getRPort());

+  return dbg;

+}

+

+static inline string get_100rel_hdr(unsigned char reliable_1xx)

+{

+  switch(reliable_1xx) {

+    case REL100_SUPPORTED: 

+      return SIP_HDR_COLSP(SIP_HDR_SUPPORTED) SIP_EXT_100REL CRLF;

+    case REL100_REQUIRE: 

+      return SIP_HDR_COLSP(SIP_HDR_REQUIRE) SIP_EXT_100REL CRLF;

+    default:

+      ERROR("BUG: unexpected reliability switch value of '%d'.\n",

+          reliable_1xx);

+    case 0:

+      break;

+  }

+  return "";

 }

 void AmSession::sendReinvite(bool updateSDP, const string& headers) 

@@ -926,9 +1132,10 @@ void AmSession::sendReinvite(bool updateSDP, const string& headers)

     RTPStream()->setLocalIP(AmConfig::LocalIP);

     string sdp_body;

     sdp.genResponse(advertisedIP(), RTPStream()->getLocalPort(), sdp_body);

-    dlg.reinvite(headers, "application/sdp", sdp_body);

+    dlg.reinvite(headers + get_100rel_hdr(reliable_1xx), "application/sdp",

+        sdp_body);

   } else {

-    dlg.reinvite(headers, "", "");

+    dlg.reinvite(headers + get_100rel_hdr(reliable_1xx), "", "");

   }

 }

@@ -943,7 +1150,8 @@ int AmSession::sendInvite(const string& headers)

   // Generate SDP.

   string sdp_body;

   sdp.genRequest(advertisedIP(), RTPStream()->getLocalPort(), sdp_body);

-  return dlg.invite(headers, "application/sdp", sdp_body);

+  return dlg.invite(headers + get_100rel_hdr(reliable_1xx), "application/sdp",

+      sdp_body);

 }

 void AmSession::setOnHold(bool hold)

@@ -61,6 +61,14 @@ class AmDtmfEvent;

 #define AM_AUDIO_IN  0

 #define AM_AUDIO_OUT 1

+

+/* maximum number of reliable 1xx supported; needed for marking first 1xx

+ * (which can not be followed by subsequent ones w/o being PRACKed), as

+ * opposed to having another value storing it's value. */

+#define MAX_RSEQ_BITS           24

+#define LOC_RSEQ_ORDER(_rseq)   (_rseq & ((1 << MAX_RSEQ_BITS) - 1))

+

+

 /**

  * \brief Implements the default behavior of one session

  * 

@@ -156,6 +164,12 @@ protected:

   /** do accept early session? */

   bool accept_early_session;

+  /** enable the reliability of provisional replies? */

+  unsigned char reliable_1xx;

+#define REL100_DISABLED         0

+#define REL100_SUPPORTED        1

+#define REL100_REQUIRE          2

+#define REL100_MAX              REL100_REQUIRE

   vector<AmSessionEventHandler*> ev_handlers;

@@ -329,11 +343,15 @@ public:

 			 string* sdp_reply);

   /** send an UPDATE in the session */

-  virtual void sendUpdate();

+  void sendUpdate(string &cont_type, string &body, string &hdrs);

   /** send a Re-INVITE (if connected) */

   virtual void sendReinvite(bool updateSDP = true, const string& headers = "");

   /** send an INVITE */

   virtual int sendInvite(const string& headers = "");

+  /** send a PRACK request */

+  void sendPrack(const string &sdp_offer, 

+                 const string &rseq_val, 

+                 const string &cseq_val);

   /** set the session on/off hold */

   virtual void setOnHold(bool hold);

@@ -418,6 +436,14 @@ public:

    */

   virtual void onCancel(){}

+  /**

+   * onPrack is called when a PRACK request is received for the session.

+   * The sequencing correctness (RAck fits) is already checked.

+   * Should be overridden if SDP offer is expected with it.

+   * @param cnt order of which 1xx this PRACK is for 

+   */

+  virtual void onPrack(const AmSipRequest& req, unsigned cnt);

+

   /**

    * onSessionStart will be called after call setup.

    *

@@ -464,14 +490,25 @@ public:

   virtual void onSipRequest(const AmSipRequest& req);

   /** Entry point for SIP Replies   */

   virtual void onSipReply(const AmSipReply& reply, int old_dlg_status);

+#if 0

+  /** There was a timeout receiving a reply for the given SIP request */

+  virtual void onSipReqTimeout(const AmSipRequest &req);

+  /** There was a timeout receiving a request (PR-/ACK) for given SIP reply */

+  virtual void onSipRplTimeout(const AmSipRequest &req, const AmSipReply &rpl);

+#endif

   /** 2xx reply has been received for an INVITE transaction */

   virtual void onInvite2xx(const AmSipReply& reply);

+#if 0

   /** missing 2xx-ACK */

   virtual void onNo2xxACK(unsigned int cseq);

   /** missing non-2xx-ACK */

   virtual void onNoErrorACK(unsigned int cseq);

+#else

+  virtual void onNoAck(unsigned int cseq);

+  virtual void onNoPrack(const AmSipRequest &req, const AmSipReply &rpl);

+#endif

   /**

    * Entry point for Audio events

@@ -518,6 +555,8 @@ public:

   // The IP address to put as c= in SDP bodies and to use for Contact:.

   string advertisedIP();

+

+  string sid4dbg();

 };

 inline AmRtpAudio* AmSession::RTPStream() {

@@ -48,6 +48,17 @@ bool AmSessionEventHandler::onSipReply(const AmSipReply& reply)

   return false;

 }

+bool AmSessionEventHandler::onSipReqTimeout(const AmSipRequest &)

+{

+  return false;

+}

+

+bool AmSessionEventHandler::onSipRplTimeout(const AmSipRequest &, 

+    const AmSipReply &)

+{

+  return false;

+}

+

 bool AmSessionEventHandler::onSendRequest(const string& method, 

 					  const string& content_type,

 					  const string& body,

@@ -67,6 +67,8 @@ public:

   virtual bool onSipRequest(const AmSipRequest&);

   virtual bool onSipReply(const AmSipReply&);

+  virtual bool onSipReqTimeout(const AmSipRequest &);

+  virtual bool onSipRplTimeout(const AmSipRequest &, const AmSipReply &);

   virtual bool onSendRequest(const string& method, 

 			     const string& content_type,

@@ -254,6 +254,7 @@ void AmSipDialog::updateStatus(const AmSipReply& reply)

     break;

   case Pending:

+    // TODO [SBGW]: if negative and PRACK, tear down the call (???)

   case Disconnected:

     // only change status of dialog if reply 

     // to INVITE received

@@ -299,6 +300,7 @@ void AmSipDialog::uasTimeout(AmSipTimeoutEvent* to_ev)

   assert(to_ev);

   switch(to_ev->type){

+#if 0

   case AmSipTimeoutEvent::no2xxACK:

     DBG("Timeout: missing 2xx-ACK\n");

     if(hdl) hdl->onNo2xxACK(to_ev->cseq);

@@ -308,10 +310,16 @@ void AmSipDialog::uasTimeout(AmSipTimeoutEvent* to_ev)

     DBG("Timeout: missing non-2xx-ACK\n");

     if(hdl) hdl->onNoErrorACK(to_ev->cseq);

     break;

+#else

+  case AmSipTimeoutEvent::noACK:

+    DBG("Timeout: missing ACK\n");

+    if(hdl) hdl->onNoAck(to_ev->cseq);

+    break;

+#endif

   case AmSipTimeoutEvent::noPRACK:

-    //TODO

     DBG("Timeout: missing PRACK\n");

+    if(hdl) hdl->onNoPrack(to_ev->req, to_ev->rpl);

     break;

   case AmSipTimeoutEvent::_noEv:

@@ -375,8 +383,8 @@ int AmSipDialog::reply(const AmSipRequest& req,

       reply.hdrs += SIP_HDR_COLSP(SIP_HDR_SERVER) + AmConfig::Signature + CRLF;

   }

-  if ((req.method!="CANCEL")&&

-      !((req.method=="BYE")&&(code<300)))

+  if (code < 300 && req.method != "CANCEL" && req.method != "BYE")

+    /* if 300<=code<400, explicit contact setting should be done */

     reply.contact = getContactHdr();

   reply.content_type = content_type;

@@ -489,22 +497,19 @@ int AmSipDialog::invite(const string& hdrs,

   }	

 }

-int AmSipDialog::update(const string& hdrs)

+int AmSipDialog::update(const string &cont_type, 

+                        const string &body, 

+                        const string &hdrs)

 {

   switch(status){

   case Connected:

-    return sendRequest("UPDATE", "", "", hdrs);

-  case Disconnecting:

   case Pending:

-    DBG("update(): we are not yet connected."

-	"(status=%i). do nothing!\n",status);

+    return sendRequest(SIP_METH_UPDATE, cont_type, body, hdrs);

-    return 0;

   default:

-    DBG("update(): we are not connected "

-	"(status=%i). do nothing!\n",status);

-    return 0;

+    DBG("update(): dialog not connected (status=%i). do nothing!\n",status);

   }	

+  return -1;

 }

 int AmSipDialog::refer(const string& refer_to,

@@ -567,6 +572,25 @@ int AmSipDialog::transfer(const string& target)

   return 0;

 }

+int AmSipDialog::prack(const string &cont_type, 

+                       const string &body, 

+                       const string &hdrs)

+{

+  switch(status) {

+    case Pending:

+      break;

+    case Disconnected:

+    case Connected:

+    case Disconnecting:

+      ERROR("can not send PRACK while dialog is in state '%d'.\n", status);

+      return -1;

+    default:

+      ERROR("BUG: unexpected dialog state '%d'.\n", status);

+      return -1;

+  }

+  return sendRequest(SIP_METH_PRACK, cont_type, body, hdrs);

+}

+

 int AmSipDialog::cancel()

 {

     for(TransMap::reverse_iterator t = uac_trans.rbegin();

@@ -96,11 +96,19 @@ class AmSipDialogEventHandler

   /** Hook called when a local INVITE request has been replied with 2xx */

   virtual void onInvite2xx(const AmSipReply& reply)=0;

+#if 0

   /** Hook called when a UAS INVITE transaction did not receive a 2xx-ACK */

   virtual void onNo2xxACK(unsigned int cseq)=0;

   /** Hook called when a UAS INVITE transaction did not receive a non-2xx-ACK */

   virtual void onNoErrorACK(unsigned int cseq)=0;

+#else

+  /** Hook called when a UAS INVITE transaction did not receive the ACK */

+  virtual void onNoAck(unsigned int)=0;

+

+  /** Hook called when a UAS INVITE transaction did not receive the PRACK */

+  virtual void onNoPrack(const AmSipRequest &, const AmSipReply &)=0;

+#endif

   virtual ~AmSipDialogEventHandler() {};

 };

@@ -152,6 +160,7 @@ class AmSipDialog

   string outbound_proxy;

   bool   force_outbound_proxy;

+  int rseq;          // RSeq for next request (NOTE: keep it signed!)

   unsigned int cseq; // Local CSeq for next request

   bool r_cseq_i;

   unsigned int r_cseq; // last remote CSeq  

@@ -193,7 +202,12 @@ class AmSipDialog

   int bye(const string& hdrs = "");

   int cancel();

-  int update(const string& hdrs);

+  int prack(const string &cont_type, 

+            const string &body, 

+            const string &hdrs);

+  int update(const string &cont_type, 

+            const string &body, 

+            const string &hdrs);

   int reinvite(const string& hdrs,  

 	       const string& content_type,

 	       const string& body);

@@ -7,6 +7,26 @@ void AmSipTimeoutEvent::operator() (AmSipDialog* dlg)

     dlg->uasTimeout(this);

 }

+

+#if 0

+  AmSipReqTimeoutEvent *req_tout_ev = 

+    dynamic_cast<AmSipReqTimeoutEvent *>(sip_ev);

+  if (req_tout_ev) {

+    CALL_EVENT_H(onSipReqTimeout, req_tout_ev->req);

+    onSipReqTimeout(req_tout_ev->req);

+    return;

+  }

+

+  AmSipRplTimeoutEvent *rpl_tout_ev = 

+    dynamic_cast<AmSipRplTimeoutEvent *>(sip_ev);

+  if (rpl_tout_ev) {

+    CALL_EVENT_H(onSipRplTimeout, rpl_tout_ev->req, rpl_tout_ev->rpl);

+    onSipRplTimeout(rpl_tout_ev->req, rpl_tout_ev->rpl);

+    return;

+  }

+#endif

+

+

 void AmSipRequestEvent::operator() (AmSipDialog* dlg)

 {

     assert(dlg);

@@ -48,6 +48,7 @@ class AmSipEvent: public AmEvent

   virtual void operator() (AmSipDialog* dlg)=0;

 };

+#if 0

 /** \brief UAS reply re-transmission timeout event */

 class AmSipTimeoutEvent: public AmSipEvent

 {

@@ -70,6 +71,34 @@ class AmSipTimeoutEvent: public AmSipEvent

   virtual void operator() (AmSipDialog* dlg);

 };

+#else

+/** \brief UAS reply re-transmission timeout event */

+class AmSipTimeoutEvent: public AmSipEvent

+{

+ public:

+

+  enum EvType {

+    _noEv=0,

+    noACK,

+    noPRACK,

+  };

+

+  EvType       type;

+

+  unsigned int cseq;

+  AmSipRequest req;

+  AmSipReply   rpl;

+

+  AmSipTimeoutEvent(EvType t, unsigned int cseq_num)

+    : AmSipEvent(), type(t)

+   {}

+  AmSipTimeoutEvent(EvType t, AmSipRequest &_req, AmSipReply &_rpl)

+    : AmSipEvent(), req(_req), rpl(_rpl)

+    {}

+

+  virtual void operator() (AmSipDialog* dlg);

+};

+#endif

 /** \brief SIP request event */

 class AmSipRequestEvent: public AmSipEvent

@@ -97,4 +126,37 @@ class AmSipReplyEvent: public AmSipEvent

 };

+#if 0

+// TODO: have a single AmSipT.outEv. class, with type and a _AmSipMsgInDlg

+// ptr: it will save the dynamic_cast efforts later.

+

+class AmSipTimeoutEvent: public AmSipEvent

+{

+  public:

+    AmSipTimeoutEvent(int id = -1) 

+      : AmSipEvent(-1)

+    {}

+};

+

+class AmSipReqTimeoutEvent : public AmSipTimeoutEvent

+{

+  public:

+    AmSipRequest req;

+    AmSipReqTimeoutEvent(AmSipRequest &r):

+      AmSipTimeoutEvent(), req(r)

+    {}

+};

+

+class AmSipRplTimeoutEvent : public AmSipTimeoutEvent

+{

+  public:

+    AmSipRequest req;

+    AmSipReply   rpl;

+    AmSipRplTimeoutEvent(AmSipRequest &_req, AmSipReply &_rpl):

+      AmSipTimeoutEvent(), req(_req), rpl(_rpl)

+    {}

+};

+#endif

+

+

 #endif

@@ -4,23 +4,31 @@

 #define SIP_SCHEME_SIP          "sip"

+#define SIP_METH_INVITE         "INVITE"

+#define SIP_METH_PRACK          "PRACK"

+#define SIP_METH_UPDATE         "UPDATE"

+

 #define SIP_HDR_FROM            "From"

 #define SIP_HDR_TO              "To"

 #define SIP_HDR_ROUTE           "Route"

 #define SIP_HDR_CONTENT_TYPE    "Content-Type"

 #define SIP_HDR_CONTACT         "Contact"

 #define SIP_HDR_SUPPORTED       "Supported"

-#define SIP_HDR_REQUIRED        "Required"

+#define SIP_HDR_REQUIRE         "Require"

 #define SIP_HDR_SERVER          "Server"

 #define SIP_HDR_USER_AGENT      "User-Agent"

 #define SIP_HDR_MAX_FORWARDS    "Max-Forwards"

 #define SIP_HDR_P_ASSERTED_IDENTITY "P-Asserted-Identity"

 #define SIP_HDR_REFER_TO        "Refer-To"

 #define SIP_HDR_EXPIRES         "Expires"

+#define SIP_HDR_RSEQ            "RSeq"

+#define SIP_HDR_RACK            "RAck"

 #define SIP_HDR_COL(_hdr)       _hdr ":"

 #define SIP_HDR_COLSP(_hdr)     SIP_HDR_COL(_hdr) " "

 #define CRLF                    "\r\n"

 #define SIP_HDR_LEN(_hdr)       (sizeof(_hdr) - /*0-term*/1)

+#define SIP_EXT_100REL          "100rel"

+

 #endif /* __AMSIPHEADERS_H__ */

@@ -129,7 +129,7 @@ bool removeHeader(string& hdrs, const string& hdr_name) {

       buf += string(name) + ":" + "[" + member + "]" + ";";	\

   } while (0)

-string AmSipRequest::print()

+string AmSipRequest::print() const

 {

   string buf;

@@ -155,7 +155,7 @@ string AmSipRequest::print()

   return buf;

 }

-string AmSipReply::print()

+string AmSipReply::print() const

 {

   string buf;

@@ -19,15 +19,16 @@ class _AmSipMsgInDlg

   string       hdrs;

   string       body;

   unsigned int cseq;

+  unsigned int rseq;

   string       callid;

   // transaction ticket from sip stack

   trans_ticket tt;

- _AmSipMsgInDlg() : cseq(0) { }

+  _AmSipMsgInDlg() : cseq(0), rseq(0) { }

   virtual ~_AmSipMsgInDlg() { };

-  virtual string print() = 0;

+  virtual string print() const = 0;

 };

 /** \brief represents a SIP reply */

@@ -45,7 +46,7 @@ class AmSipReply : public _AmSipMsgInDlg

  AmSipReply() : code(0), _AmSipMsgInDlg() { }

   ~AmSipReply() { }

-  string print();

+  string print() const;

 };

@@ -67,7 +68,7 @@ class AmSipRequest : public _AmSipMsgInDlg

  AmSipRequest() : _AmSipMsgInDlg() { }

   ~AmSipRequest() { }

-  string print();

+  string print() const;

 };

 string getHeader(const string& hdrs,const string& hdr_name);

@@ -28,12 +28,15 @@