@@ -90,7 +90,6 @@ void AorBucket::gbc(RegCacheStorageHandler* h, long int now,

 	      del_it->first.c_str(),binding->alias.c_str(),

 	      binding->reg_expire,now);

-	  if(h) h->onDelete(it->first,del_it->first,binding->alias);

 	  delete binding;

 	  aor_e->erase(del_it);

 	  continue;

@@ -277,46 +277,15 @@ void RegisterDialog::fixUacContactHosts(const AmSipRequest& req,

     if(contact_hiding) {

       uac_contacts[i].uri_user = encodeUsername(uac_contacts[i],

 						req,cp,ctx);

-

-      list<sip_avp*> uri_params;

-      const string& old_params = uac_contacts[i].uri_param;

-      const char* c = old_params.c_str();

-

-      if(parse_gen_params(&uri_params,&c,old_params.length(),0) < 0) {

-

-	DBG("could not parse Contact URI parameters: '%s'",

-	    uac_contacts[i].uri_param.c_str());

-	free_gen_params(&uri_params);

-	continue;

-      }

-

-      // Suppress transport parameter

-      // hack to suppress transport=tcp

-      string new_params;

-      for(list<sip_avp*>::iterator p_it = uri_params.begin();

-	  p_it != uri_params.end(); p_it++) {

-

-	DBG("parsed");

-	if( ((*p_it)->name.len == (sizeof("transport")-1)) &&

-	    !memcmp((*p_it)->name.s,"transport",sizeof("transport")-1) ) {

-	  continue;

-	}

-

-	if(!new_params.empty()) new_params += ";";

-	new_params += c2stlstr((*p_it)->name);

-	if((*p_it)->value.len) {

-	  new_params += "=" + c2stlstr((*p_it)->value);

-	}

-      }

-

-      free_gen_params(&uri_params);

-      uac_contacts[i].uri_param = new_params;

     }

     else if(!reg_caching) {

       cp.fix_reg_contact(ctx,req,uac_contacts[i]);

       continue;

     }

+    // remove 'transport' param from Contact

+    removeTransport(uac_contacts[i]);

+

     // patch host & port

     uac_contacts[i].uri_host = AmConfig::SIP_Ifs[oif].getIP();

@@ -325,11 +294,49 @@ void RegisterDialog::fixUacContactHosts(const AmSipRequest& req,

     else

       uac_contacts[i].uri_port = int2str(AmConfig::SIP_Ifs[oif].LocalPort);

-    DBG("Patching host and port for Contact-HF: host='%s';port='%s'",

+    DBG("Patching host, port and transport for Contact-HF: host='%s';port='%s'",

 	uac_contacts[i].uri_host.c_str(),uac_contacts[i].uri_port.c_str());

   }

 }

+int RegisterDialog::removeTransport(AmUriParser& uri)

+{

+  list<sip_avp*> uri_params;

+  string old_params = uri.uri_param;

+  const char* c = old_params.c_str();

+

+  if(parse_gen_params(&uri_params,&c,old_params.length(),0) < 0) {

+

+    DBG("could not parse Contact URI parameters: '%s'",

+	uri.uri_param.c_str());

+    free_gen_params(&uri_params);

+    return -1;

+  }

+

+  // Suppress transport parameter

+  // hack to suppress transport=tcp

+  string new_params;

+  for(list<sip_avp*>::iterator p_it = uri_params.begin();

+      p_it != uri_params.end(); p_it++) {

+

+    DBG("parsed");

+    if( ((*p_it)->name.len == (sizeof("transport")-1)) &&

+	!memcmp((*p_it)->name.s,"transport",sizeof("transport")-1) ) {

+      continue;

+    }

+

+    if(!new_params.empty()) new_params += ";";

+    new_params += c2stlstr((*p_it)->name);

+    if((*p_it)->value.len) {

+      new_params += "=" + c2stlstr((*p_it)->value);

+    }

+  }

+

+  free_gen_params(&uri_params);

+  uri.uri_param = new_params;

+  return 0;

+}

+

 int RegisterDialog::initAor(const AmSipRequest& req)

 {

   AmUriParser from_parser;

@@ -55,6 +55,9 @@ class RegisterDialog

   // so that getOutboundIf() can be called

   void fixUacContactHosts(const AmSipRequest& req, const SBCCallProfile& cp);

+  // remove the transport parameter from a URI

+  int removeTransport(AmUriParser& uri);

+

 public:

   RegisterDialog(SBCCallProfile &profile, vector<AmDynInvoke*> &cc_modules);

   ~RegisterDialog();

@@ -326,8 +326,10 @@ void AmBasicSipDialog::onRxRequest(const AmSipRequest& req)

     if (remote_uri != req.from_uri) {

       setRemoteUri(req.from_uri);

       if(nat_handling && req.first_hop) {

-	setNextHop(req.remote_ip + ":"

-		   + int2str(req.remote_port));

+	string nh = req.remote_ip + ":"

+	  + int2str(req.remote_port)

+	  + "/" + req.trsp;

+	setNextHop(nh);

 	setNextHop1stReq(false);

       }

     }

@@ -470,11 +472,11 @@ void AmBasicSipDialog::updateDialogTarget(const AmSipReply& reply)

        (reply.cseq_method == SIP_METH_SUBSCRIBE)) ) {

     setRemoteUri(reply.to_uri);

-    if(!getNextHop().empty() && !next_hop_fixed) {

-      DBG("updating next_hop from reply to %s:%u\n",

-	  reply.remote_ip.c_str(), reply.remote_port);

-      setNextHop(reply.remote_ip + ":"

-		 + int2str(reply.remote_port));

+    if(!getNextHop().empty()) {

+      string nh = reply.remote_ip 

+	+ ":" + int2str(reply.remote_port)

+	+ "/" + reply.trsp;

+      setNextHop(nh);

     }

     string ua = getHeader(reply.hdrs,"Server");

@@ -43,6 +43,7 @@

 #include "AmSessionContainer.h"

 #include "Am100rel.h"

 #include "sip/transport.h"

+#include "sip/resolver.h"

 #include "sip/ip_util.h"

 #include "sip/sip_timers.h"

 #include "sip/raw_sender.h"

@@ -91,7 +92,6 @@ bool         AmConfig::ForceSymmetricRtp       = false;

 bool         AmConfig::SipNATHandling          = false;

 bool         AmConfig::UseRawSockets           = false;

 bool         AmConfig::IgnoreNotifyLowerCSeq   = false;

-bool         AmConfig::DisableDNSSRV           = false;

 string       AmConfig::Signature               = "";

 unsigned int AmConfig::MaxForwards             = MAX_FORWARDS;

 bool	     AmConfig::SingleCodecInOK	       = false;

@@ -386,7 +386,7 @@ int AmConfig::readConfiguration()

   }

   if(cfg.hasParameter("disable_dns_srv")) {

-    DisableDNSSRV = (cfg.getParameter("disable_dns_srv") == "yes");

+    _resolver::disable_srv = (cfg.getParameter("disable_dns_srv") == "yes");

   }

@@ -713,6 +713,7 @@ int AmConfig::insert_SIP_interface(const SIP_interface& intf)

 	return -1;

       }

+      //FIXME: what happens now? shouldn't we insert the interface????

     }

   }

@@ -769,6 +770,13 @@ static int readSIPInterface(AmConfigReader& cfg, const string& i_name)

     intf.SigSockOpts = opts;

   }

+  intf.tcp_connect_timeout =

+    cfg.getParameterInt("tcp_connect_timeout" + suffix,

+			DEFAULT_TCP_CONNECT_TIMEOUT);

+

+  intf.tcp_idle_timeout =

+    cfg.getParameterInt("tcp_idle_timeout" + suffix, DEFAULT_TCP_IDLE_TIMEOUT);

+

   if(!i_name.empty())

     intf.name = i_name;

   else

@@ -1171,9 +1179,11 @@ void AmConfig::dump_Ifs()

     SIP_interface& it_ref = SIP_Ifs[i];

     INFO("\t(%i) name='%s'" ";LocalIP='%s'" 

-	 ";LocalPort='%u'" ";PublicIP='%s'",

+	 ";LocalPort='%u'" ";PublicIP='%s';TCP=%u/%u",

 	 i,it_ref.name.c_str(),it_ref.LocalIP.c_str(),

-	 it_ref.LocalPort,it_ref.PublicIP.c_str());

+	 it_ref.LocalPort,it_ref.PublicIP.c_str(),

+	 it_ref.tcp_connect_timeout,

+	 it_ref.tcp_idle_timeout);

   }

   INFO("Signaling address map:");

@@ -110,6 +110,9 @@ struct AmConfig

      */

     unsigned int SigSockOpts;

+    unsigned int tcp_connect_timeout;

+    unsigned int tcp_idle_timeout;

+

     /** RTP interface index */

     int RtpInterface;

@@ -193,8 +196,6 @@ struct AmConfig

   static bool UseRawSockets;

   /** Ignore Low CSeq on NOTIFY  - for RFC 3265 instead of 5057 */

   static bool IgnoreNotifyLowerCSeq;

-  /** skip DNS SRV lookup for resolving destination address*/

-  static bool DisableDNSSRV;

   /** Server/User-Agent header (optional) */

   static string Signature;

   /** Value of Max-Forward header field for new requests */

@@ -38,16 +38,6 @@

 #include <strings.h>

 #endif

-#include <sys/time.h>

-#include <sys/poll.h>

-

-#ifndef MAX_RTP_SESSIONS

-#define MAX_RTP_SESSIONS 2048

-#endif 

-

-#define RTP_POLL_TIMEOUT 50 /*50 ms*/

-

-

 _AmRtpReceiver::_AmRtpReceiver()

 {

   n_receivers = AmConfig::RTPReceiverThreads;

@@ -62,20 +52,20 @@ _AmRtpReceiver::~_AmRtpReceiver()

 AmRtpReceiverThread::AmRtpReceiverThread()

   : stop_requested(false)

 {

-  fds  = new struct pollfd[MAX_RTP_SESSIONS];

-  nfds = 0;

+  // libevent event base

+  ev_base = event_base_new();

 }

 AmRtpReceiverThread::~AmRtpReceiverThread()

 {

-  delete [] (fds);

+  event_base_free(ev_base);

   INFO("RTP receiver has been recycled.\n");

 }

 void AmRtpReceiverThread::on_stop()

 {

   INFO("requesting RTP receiver to stop.\n");

-  stop_requested.set(true);

+  event_base_loopbreak(ev_base);

 }

 void AmRtpReceiverThread::stop_and_wait()

@@ -97,44 +87,43 @@ void _AmRtpReceiver::dispose()

 void AmRtpReceiverThread::run()

 {

-  unsigned int   tmp_nfds = 0;

-  struct pollfd* tmp_fds  = new struct pollfd[MAX_RTP_SESSIONS];

-

-  while(!stop_requested.get()){

-	

-    streams_mut.lock();

-    tmp_nfds = nfds;

-    memcpy(tmp_fds,fds,nfds*sizeof(struct pollfd));

-    streams_mut.unlock();

-

-    int ret = poll(tmp_fds,tmp_nfds,RTP_POLL_TIMEOUT);

-    if(ret < 0 && errno != EINTR)

-      ERROR("AmRtpReceiver: poll: %s\n",strerror(errno));

-

-    if(ret < 1)

-      continue;

-

-    for(unsigned int i=0; i<tmp_nfds; i++) {

+  // fake event to prevent the event loop from exiting

+  int fake_fds[2];

+  pipe(fake_fds);

+  struct event* ev_default =

+    event_new(ev_base,fake_fds[0],

+	      EV_READ|EV_PERSIST,

+	      NULL,NULL);

+  event_add(ev_default,NULL);

+

+  // run the event loop

+  event_base_loop(ev_base,0);

+

+  // clean-up fake fds/event

+  event_free(ev_default);

+  close(fake_fds[0]);

+  close(fake_fds[1]);

+}

-      if(!(tmp_fds[i].revents & POLLIN))

-	continue;

+void AmRtpReceiverThread::_rtp_receiver_read_cb(evutil_socket_t sd, 

+						short what, void* arg)

+{

+  AmRtpReceiverThread::StreamInfo* p_si =

+    static_cast<AmRtpReceiverThread::StreamInfo*>(arg);

-      streams_mut.lock();

-      Streams::iterator it = streams.find(tmp_fds[i].fd);

-      if(it != streams.end()) {

-	it->second.stream->recvPacket(tmp_fds[i].fd);

-      }

-      streams_mut.unlock();      

-    }

+  p_si->thread->streams_mut.lock();

+  if(!p_si->stream) {

+    // we are about to get removed...

+    p_si->thread->streams_mut.unlock();

+    return;

   }

-

-  delete[] (tmp_fds);

+  p_si->stream->recvPacket(sd);

+  p_si->thread->streams_mut.unlock();

 }

 void AmRtpReceiverThread::addStream(int sd, AmRtpStream* stream)

 {

   streams_mut.lock();

-

   if(streams.find(sd) != streams.end()) {

     ERROR("trying to insert existing stream [%p] with sd=%i\n",

 	  stream,sd);

@@ -142,43 +131,50 @@ void AmRtpReceiverThread::addStream(int sd, AmRtpStream* stream)

     return;

   }

-  if(nfds >= MAX_RTP_SESSIONS){

-    streams_mut.unlock();

-    ERROR("maximum number of sessions reached (%i)\n",

-	  MAX_RTP_SESSIONS);

-    throw string("maximum number of sessions reached");

-  }

-

-  fds[nfds].fd      = sd;

-  fds[nfds].events  = POLLIN;

-  fds[nfds].revents = 0;

-

-  streams.insert(std::make_pair(sd,StreamInfo(nfds,stream)));

-  nfds++;

-

+  StreamInfo& si = streams[sd];

+  si.stream = stream;

+  event* ev_read = event_new(ev_base,sd,EV_READ|EV_PERSIST,

+			     AmRtpReceiverThread::_rtp_receiver_read_cb,&si);

+  si.ev_read = ev_read;

+  si.thread = this;

   streams_mut.unlock();

+

+  // This must be done when 

+  // streams_mut is NOT locked

+  event_add(ev_read,NULL);

 }

 void AmRtpReceiverThread::removeStream(int sd)

 {

   streams_mut.lock();

-

   Streams::iterator sit = streams.find(sd);

   if(sit == streams.end()) {

     streams_mut.unlock();

     return;

   }

-  unsigned int i = sit->second.index;

-  if(--nfds && (i < nfds)) {

-    fds[i] = fds[nfds];

-    sit = streams.find(fds[nfds].fd);

-    if(sit != streams.end()) {

-      sit->second.index = i;

-    }

+  StreamInfo& si = sit->second;

+  if(!si.stream || !si.ev_read){

+    streams_mut.unlock();

+    return;

   }

-  streams.erase(sd);

+  si.stream = NULL;

+  event* ev_read = si.ev_read;

+  si.ev_read = NULL;

+

+  streams_mut.unlock();

+

+  // This must be done while

+  // streams_mut is NOT locked

+  event_free(ev_read);

+

+  streams_mut.lock();

+  // this must be done AFTER event_free()

+  // so that the StreamInfo does not get

+  // deleted while in recvPaket()

+  // (see recv callback)

+  streams.erase(sd);

   streams_mut.unlock();

 }

@@ -32,7 +32,7 @@

 #include "atomic_types.h"

 #include "singleton.h"

-#include <sys/select.h>

+#include <event2/event.h>

 #include <map>

 using std::greater;

@@ -47,37 +47,45 @@ class _AmRtpReceiver;

  * that are registered to it. It places the received packets in 

  * the stream's buffer. 

  */

-class AmRtpReceiverThread: public AmThread {

-

-  struct StreamInfo {

-    unsigned int index; // index into fds table

+class AmRtpReceiverThread

+  : public AmThread

+{

+  struct StreamInfo 

+  {

     AmRtpStream* stream;

-

-    StreamInfo(unsigned int i, AmRtpStream* s)

-      : index(i), stream(s) {}

+    struct event* ev_read;

+    AmRtpReceiverThread* thread;

+

+    StreamInfo()

+      : stream(NULL),

+	ev_read(NULL),

+	thread(NULL)

+    {}

   };

-  typedef std::map<int, StreamInfo, greater<int> > Streams;

+  typedef std::map<int, StreamInfo> Streams;

+

+  struct event_base* ev_base;

+  struct event*      ev_default;

   Streams  streams;

   AmMutex  streams_mut;

-  struct pollfd* fds;

-  unsigned int   nfds;

-    

+  AmSharedVar<bool> stop_requested;

+

+  static void _rtp_receiver_read_cb(evutil_socket_t sd, short what, void* arg);

+

+public:    

   AmRtpReceiverThread();

   ~AmRtpReceiverThread();

   void run();

   void on_stop();

-  AmSharedVar<bool> stop_requested;

   void addStream(int sd, AmRtpStream* stream);

   void removeStream(int sd);

   void stop_and_wait();

-

-  friend class _AmRtpReceiver;

 };

 class _AmRtpReceiver

@@ -361,6 +361,7 @@ bool AmSipDialog::onRxReplyStatus(const AmSipReply& reply,

 	  DBG("received 2xx reply without to-tag "

 	      "(callid=%s): sending BYE\n",reply.callid.c_str());

+	  send_200_ack(reply.cseq);

 	  sendRequest(SIP_METH_BYE);

 	}

 	else {

@@ -50,6 +50,7 @@ core: $(OBJS) ../Makefile.defs

 include ../Makefile.defs

 CPPFLAGS += -I$(COREPATH) -fno-strict-aliasing

+LDFLAGS += -levent -levent_pthreads

 ifdef USE_LIBSAMPLERATE

 CPPFLAGS += -DUSE_LIBSAMPLERATE

@@ -46,6 +46,7 @@

 #include "sip/msg_hdrs.h"

 #include "sip/udp_trsp.h"

 #include "sip/ip_util.h"

+#include "sip/tcp_trsp.h"

 #include "log.h"

@@ -60,6 +61,108 @@

 bool _SipCtrlInterface::log_parsed_messages = true;

 int _SipCtrlInterface::udp_rcvbuf = -1;

+int _SipCtrlInterface::alloc_udp_structs()

+{

+    udp_sockets = new udp_trsp_socket*[ AmConfig::SIP_Ifs.size() ];

+    udp_servers = new udp_trsp* [ AmConfig::SIPServerThreads

+				  * AmConfig::SIP_Ifs.size() ];

+

+    if(udp_sockets && udp_servers)

+	return 0;

+

+    return -1;

+}

+

+int _SipCtrlInterface::init_udp_servers(int if_num)

+{

+    udp_trsp_socket* udp_socket = 

+	new udp_trsp_socket(if_num,AmConfig::SIP_Ifs[if_num].SigSockOpts

+			    | (AmConfig::ForceOutboundIf ? 

+			       trsp_socket::force_outbound_if : 0)

+			    | (AmConfig::UseRawSockets ?

+			       trsp_socket::use_raw_sockets : 0),

+			    AmConfig::SIP_Ifs[if_num].NetIfIdx);

+	

+    if(!AmConfig::SIP_Ifs[if_num].PublicIP.empty()) {

+	udp_socket->set_public_ip(AmConfig::SIP_Ifs[if_num].PublicIP);

+    }

+

+    if(udp_socket->bind(AmConfig::SIP_Ifs[if_num].LocalIP,

+			AmConfig::SIP_Ifs[if_num].LocalPort) < 0){

+

+	ERROR("Could not bind SIP/UDP socket to %s:%i",

+	      AmConfig::SIP_Ifs[if_num].LocalIP.c_str(),

+	      AmConfig::SIP_Ifs[if_num].LocalPort);

+

+	delete udp_socket;

+	return -1;

+    }

+

+    if(udp_rcvbuf > 0) {

+	udp_socket->set_recvbuf_size(udp_rcvbuf);

+    }

+

+    trans_layer::instance()->register_transport(udp_socket);

+    udp_sockets[if_num] = udp_socket;

+    inc_ref(udp_socket);

+    nr_udp_sockets++;

+

+    for(int j=0; j<AmConfig::SIPServerThreads;j++){

+	udp_servers[if_num * AmConfig::SIPServerThreads + j] = 

+	    new udp_trsp(udp_socket);

+	nr_udp_servers++;

+    }

+

+    return 0;

+}

+

+int _SipCtrlInterface::alloc_tcp_structs()

+{

+    tcp_sockets = new tcp_server_socket*[ AmConfig::SIP_Ifs.size() ];

+    tcp_servers = new tcp_trsp* [ AmConfig::SIP_Ifs.size() ];

+

+    if(tcp_sockets && tcp_servers)

+	return 0;

+

+    return -1;

+}

+

+int _SipCtrlInterface::init_tcp_servers(int if_num)

+{

+    tcp_server_socket* tcp_socket = new tcp_server_socket(if_num);

+

+    if(!AmConfig::SIP_Ifs[if_num].PublicIP.empty()) {

+     	tcp_socket->set_public_ip(AmConfig::SIP_Ifs[if_num].PublicIP);

+    }

+

+    tcp_socket->set_connect_timeout(AmConfig::SIP_Ifs[if_num].tcp_connect_timeout);

+    tcp_socket->set_idle_timeout(AmConfig::SIP_Ifs[if_num].tcp_idle_timeout);

+

+    if(tcp_socket->bind(AmConfig::SIP_Ifs[if_num].LocalIP,

+			AmConfig::SIP_Ifs[if_num].LocalPort) < 0){

+

+	ERROR("Could not bind SIP/TCP socket to %s:%i",

+	      AmConfig::SIP_Ifs[if_num].LocalIP.c_str(),

+	      AmConfig::SIP_Ifs[if_num].LocalPort);

+

+	delete tcp_socket;

+	return -1;

+    }

+

+    //TODO: add some more threads

+    tcp_socket->add_threads(AmConfig::SIPServerThreads);

+

+    trans_layer::instance()->register_transport(tcp_socket);

+    tcp_sockets[if_num] = tcp_socket;

+    inc_ref(tcp_socket);

+    nr_tcp_sockets++;

+

+    tcp_servers[if_num] = new tcp_trsp(tcp_socket);

+    nr_tcp_servers++;

+

+    return 0;

+}

+

 int _SipCtrlInterface::load()

 {

     if (!AmConfig::OutboundProxy.empty()) {

@@ -119,48 +222,27 @@ int _SipCtrlInterface::load()

 	DBG("assuming SIP default settings.\n");

     }

-    udp_sockets = new udp_trsp_socket*[AmConfig::SIP_Ifs.size()];

-    udp_servers = new udp_trsp*[AmConfig::SIPServerThreads * AmConfig::SIP_Ifs.size()];

+    if(alloc_udp_structs() < 0) {

+	ERROR("no enough memory to alloc UDP structs");

+	return -1;

+    }

-    // Init transport instances

+    // Init UDP transport instances

     for(unsigned int i=0; i<AmConfig::SIP_Ifs.size();i++) {

-

-	udp_trsp_socket* udp_socket = 

-	    new udp_trsp_socket(i,AmConfig::SIP_Ifs[i].SigSockOpts

-				| (AmConfig::ForceOutboundIf ? 

-				   trsp_socket::force_outbound_if : 0)

-				| (AmConfig::UseRawSockets ?

-				   trsp_socket::use_raw_sockets : 0),

-				AmConfig::SIP_Ifs[i].NetIfIdx);

-	

-	if(!AmConfig::SIP_Ifs[i].PublicIP.empty()) {

-	    udp_socket->set_public_ip(AmConfig::SIP_Ifs[i].PublicIP);

-	}

-

-	if(udp_socket->bind(AmConfig::SIP_Ifs[i].LocalIP,

-			    AmConfig::SIP_Ifs[i].LocalPort) < 0){

-

-	    ERROR("Could not bind SIP/UDP socket to %s:%i",

-		  AmConfig::SIP_Ifs[i].LocalIP.c_str(),

-		  AmConfig::SIP_Ifs[i].LocalPort);

-

-	    delete udp_socket;

+	if(init_udp_servers(i) < 0) {

 	    return -1;

 	}

+    }

-	if(udp_rcvbuf > 0) {

-	    udp_socket->set_recvbuf_size(udp_rcvbuf);

-	}

-

-	trans_layer::instance()->register_transport(udp_socket);

-	udp_sockets[i] = udp_socket;

-	inc_ref(udp_socket);

-	nr_udp_sockets++;

+    if(alloc_tcp_structs() < 0) {

+	ERROR("no enough memory to alloc TCP structs");

+	return -1;

+    }

-	for(int j=0; j<AmConfig::SIPServerThreads;j++){

-	    udp_servers[i*AmConfig::SIPServerThreads + j] = 

-		new udp_trsp(udp_socket);

-	    nr_udp_servers++;

+    // Init TCP transport instances

+    for(unsigned int i=0; i<AmConfig::SIP_Ifs.size();i++) {

+	if(init_tcp_servers(i) < 0) {

+	    return -1;

 	}

     }

@@ -168,8 +250,11 @@ int _SipCtrlInterface::load()

 }

 _SipCtrlInterface::_SipCtrlInterface()

-    : stopped(false), udp_servers(NULL), udp_sockets(NULL),

-      nr_udp_sockets(0), nr_udp_servers(0)

+    : stopped(false),

+      udp_servers(NULL), udp_sockets(NULL),

+      nr_udp_sockets(0), nr_udp_servers(0),

+      tcp_servers(NULL), tcp_sockets(NULL),

+      nr_tcp_sockets(0), nr_tcp_servers(0)

 {

     trans_layer::instance()->register_ua(this);

 }

@@ -300,6 +385,12 @@ int _SipCtrlInterface::run()

 	}

     }

+    if (NULL != tcp_servers) {

+	for(int i=0; i<nr_tcp_servers;i++){

+	    tcp_servers[i]->start();

+	}

+    }

+

     while (!stopped.get()) {

         stopped.wait_for();

     }

@@ -329,11 +420,22 @@ void _SipCtrlInterface::cleanup()

 	nr_udp_servers = 0;

     }

+    if (NULL != tcp_servers) {

+	for(int i=0; i<nr_tcp_servers;i++){

+	    tcp_servers[i]->stop();

+	    tcp_servers[i]->join();

+	    delete tcp_servers[i];

+	}

+

+	delete [] tcp_servers;

+	tcp_servers = NULL;

+	nr_tcp_servers = 0;

+    }

+

     trans_layer::instance()->clear_transports();

     if (NULL != udp_sockets) {

 	for(int i=0; i<nr_udp_sockets;i++){

-	    //delete udp_sockets[i];

 	    DBG("dec_ref(%p)",udp_sockets[i]);

 	    dec_ref(udp_sockets[i]);

 	}

@@ -342,6 +444,17 @@ void _SipCtrlInterface::cleanup()

 	udp_sockets = NULL;

 	nr_udp_sockets = 0;

     }

+

+    if (NULL != tcp_sockets) {

+	for(int i=0; i<nr_tcp_sockets;i++){

+	    DBG("dec_ref(%p)",tcp_sockets[i]);

+	    dec_ref(tcp_sockets[i]);

+	}

+

+	delete [] tcp_sockets;

+	tcp_sockets = NULL;

+	nr_tcp_sockets = 0;

+    }

 }

 int _SipCtrlInterface::send(const AmSipReply &rep, const string& dialog_id,

@@ -369,8 +482,6 @@ int _SipCtrlInterface::send(const AmSipReply &rep, const string& dialog_id,

 	}

     }

-    unsigned int hdrs_len = copy_hdrs_len(msg.hdrs);

-

     string body;

     string content_type;

     if(!rep.body.empty()) {

@@ -380,34 +491,18 @@ int _SipCtrlInterface::send(const AmSipReply &rep, const string& dialog_id,

     	    ERROR("Reply does not contain a Content-Type whereby body is not empty\n");

     	    return -1;

     	}

-	hdrs_len += content_type_len(stl2cstr(content_type));

+	msg.body = stl2cstr(body);

+	msg.hdrs.push_back(new sip_header(sip_header::H_CONTENT_TYPE,

+					  SIP_HDR_CONTENT_TYPE,

+					  stl2cstr(content_type)));

     }

-    char* hdrs_buf = NULL;

-    char* c = hdrs_buf;

+    msg.u.reply = new sip_reply(rep.code,stl2cstr(rep.reason));

-    if (hdrs_len) {

-	

-	c = hdrs_buf = new char[hdrs_len];

-	

-	copy_hdrs_wr(&c,msg.hdrs);

-		

-	if(!rep.body.empty()) {

-	    content_type_wr(&c,stl2cstr(content_type));

-	}

-    }

-

-    int ret =

-	trans_layer::instance()->send_reply((trans_ticket*)&rep.tt,

+    return

+	trans_layer::instance()->send_reply(&msg,(trans_ticket*)&rep.tt,

 					    stl2cstr(dialog_id),

-					    rep.code,stl2cstr(rep.reason),

-					    stl2cstr(rep.to_tag),

-					    cstring(hdrs_buf,hdrs_len), 

-					    stl2cstr(body),logger);

-

-    delete [] hdrs_buf;

-

-    return ret;

+					    stl2cstr(rep.to_tag),logger);

 }

@@ -642,6 +737,9 @@ inline bool _SipCtrlInterface::sip_msg2am_reply(sip_msg *msg, AmSipReply &reply)

     reply.local_ip = get_addr_str(&msg->local_ip);

     reply.local_port = am_get_port(&msg->local_ip);

+    if(msg->local_socket)

+	reply.trsp = msg->local_socket->get_transport();

+

     return true;

 }

@@ -48,6 +48,9 @@ class trans_ticket;

 class udp_trsp_socket;

 class udp_trsp;

+class tcp_server_socket;

+class tcp_trsp;

+

 class _SipCtrlInterface:

     public sip_ua

 {

@@ -67,6 +70,18 @@ class _SipCtrlInterface:

     unsigned short    nr_udp_servers;

     udp_trsp**        udp_servers;

+    unsigned short    nr_tcp_sockets;

+    tcp_server_socket** tcp_sockets;

+

+    unsigned short    nr_tcp_servers;

+    tcp_trsp**        tcp_servers;

+

+    int alloc_udp_structs();

+    int init_udp_servers(int if_num);

+

+    int alloc_tcp_structs();

+    int init_tcp_servers(int if_num);

+

 public:

     static string outbound_host;

@@ -53,12 +53,12 @@

 #include <grp.h>

 #include <pwd.h>

-//#include <sys/wait.h>

-//#include <sys/socket.h>

 #include <sys/types.h>

 #include <sys/stat.h>

 #include <fcntl.h>

+#include <event2/thread.h>

+

 #ifdef PROPAGATE_COREDUMP_SETTINGS

 #include <sys/resource.h>

 #include <sys/prctl.h>

@@ -572,11 +572,20 @@ int main(int argc, char* argv[])

   INFO("Starting media processor\n");