@@ -109,15 +109,15 @@ AmLoggingFacility::AmLoggingFacility(const string& name)

 {

 }

-AmCtrlInterfaceFactory::AmCtrlInterfaceFactory(const string& name) 

-  : AmPluginFactory(name) 

-{

-}

+// AmCtrlInterfaceFactory::AmCtrlInterfaceFactory(const string& name) 

+//   : AmPluginFactory(name) 

+// {

+// }

-AmCtrlInterface::AmCtrlInterface() 

-{

-}

+// AmCtrlInterface::AmCtrlInterface() 

+// {

+// }

-AmCtrlInterface::~AmCtrlInterface() 

-{

-}

+// AmCtrlInterface::~AmCtrlInterface() 

+// {

+// }

@@ -228,47 +228,6 @@ class AmLoggingFacility : public AmPluginFactory

   virtual void log(int level, const char* msg) = 0;

 };

-class AmCtrlInterface: public AmThread

-{

- public:

-  AmCtrlInterface();

-  virtual ~AmCtrlInterface();

-  

-  //@param serKey    [out] An out parameter

-  //@param serKeyLen [out] An out parameter

-  

-  virtual int send(const AmSipRequest &, 

-		   char* serKey, unsigned int& serKeyLen) = 0;

-  

-  virtual int send(const AmSipReply &) = 0;

-  

-  virtual string getContact(const string &displayName, 

-			    const string &userName, const string &hostName, 

-			    const string &uriParams, const string &hdrParams) = 0;

-};

-

-/**

- * \brief Interface for plugins that implement a control interface.

- * 

- * The AmCtrlInterface defines the interface for 

- * SER-SEMS communication interface (unix socket/fifo).

- *

- * For sending messages, appropriate methods are exposed (the send()s).

- * The interface defines a thread that runs, polling on the two listening unix

- * sockets (one for requests, one for replies). After receiving a message,

- * AmSipDispatcher shall be used to dispatch the incomming SIP messages 

- * (that end up either opening/updating a UAC session or posting to some

- * event queue).

- */

-class AmCtrlInterfaceFactory : public AmPluginFactory

-{

-  public:

-    AmCtrlInterfaceFactory(const string& name);

-    virtual ~AmCtrlInterfaceFactory() {}

-

-    virtual AmCtrlInterface* instance() = 0;

-};

-

 #if  __GNUC__ < 3

 #define EXPORT_FACTORY(fctname,class_name,args...) \

             extern "C" void* fctname()\

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

 #include "AmUtils.h"

 #include "AmSdp.h"

 #include "AmSipDispatcher.h"

-#include "AmServer.h"

+//#include "AmServer.h"

 #include "amci/amci.h"

 #include "amci/codecs.h"

@@ -101,8 +101,8 @@ amci_payload_t _payload_tevent = {

 AmPlugIn* AmPlugIn::_instance=0;

 AmPlugIn::AmPlugIn()

-  : dynamic_pl(DYNAMIC_PAYLOAD_TYPE_START),   

-    ctrlIface(NULL)

+  : dynamic_pl(DYNAMIC_PAYLOAD_TYPE_START)

+    //ctrlIface(NULL)

 {

 }

@@ -206,14 +206,14 @@ int AmPlugIn::load(const string& directory, const string& plugins)

   DBG("AmPlugIn: Initializing plugins...\n");

-  if (ctrlIface) {

-    if ((err = ctrlIface->onLoad())) {

-      ERROR("failed to initialize control interface.\n");

-      return err;

-    } else {

-	AmServer::instance()->regIface(ctrlIface->instance());

-    }

-  }

+//   if (ctrlIface) {

+//     if ((err = ctrlIface->onLoad())) {

+//       ERROR("failed to initialize control interface.\n");

+//       return err;

+//     } else {

+// 	AmServer::instance()->regIface(ctrlIface->instance());

+//     }

+//   }

   // initialize base components

   for(std::map<std::string,AmPluginFactory*>::iterator it = name2base.begin();

@@ -348,13 +348,13 @@ int AmPlugIn::loadPlugIn(const string& file)

     has_sym=true;

   }

-  // try load a control plugin

-  if ((fc = (FactoryCreate)dlsym(h_dl,FACTORY_CONTROL_INTERFACE_EXPORT_STR))) {

-    if (loadCtrlFacPlugIn((AmPluginFactory*)fc()))

-      goto error;

-    assert(! has_sym);

-    has_sym = true;

-  }

+//   // try load a control plugin

+//   if ((fc = (FactoryCreate)dlsym(h_dl,FACTORY_CONTROL_INTERFACE_EXPORT_STR))) {

+//     if (loadCtrlFacPlugIn((AmPluginFactory*)fc()))

+//       goto error;

+//     assert(! has_sym);

+//     has_sym = true;

+//   }

   if(!has_sym){

     ERROR("Plugin type could not be detected (%s)(%s)\n",file.c_str(),dlerror());

@@ -669,27 +669,26 @@ int AmPlugIn::loadLogFacPlugIn(AmPluginFactory* f)

   return -1;

 }

-int AmPlugIn::loadCtrlFacPlugIn(AmPluginFactory* f)

-{

-  AmCtrlInterfaceFactory *_ctrlIface = dynamic_cast<AmCtrlInterfaceFactory *>(f);

-  if (! _ctrlIface) {

-    ERROR("invalid control interface plugin.\n");

-    return -1;

-  }

-  if (ctrlIface) {

-    ERROR("one control interface already loaded (`%s'): can not load a "

-      "second one (`%s').\n", (ctrlIface->getName()).c_str(), 

-      (_ctrlIface->getName()).c_str());

-    return -1;

-  }

-  ctrlIface = _ctrlIface;//->instance();

-  if (! ctrlIface) {

-    ERROR("BUG: failed to retrieve a control interface instance.\n");

-    return -1;

-  }

-

-  return 0;

-}

+// int AmPlugIn::loadCtrlFacPlugIn(AmPluginFactory* f)

+// {

+//   AmCtrlInterfaceFactory *_ctrlIface = dynamic_cast<AmCtrlInterfaceFactory *>(f);

+//   if (! _ctrlIface) {

+//     ERROR("invalid control interface plugin.\n");

+//     return -1;

+//   }

+//   if (ctrlIface) {

+//     ERROR("one control interface already loaded (`%s'): can not load a "

+//       "second one (`%s').\n", (ctrlIface->getName()).c_str(), 

+//       (_ctrlIface->getName()).c_str());

+//     return -1;

+//   }

+//   ctrlIface = _ctrlIface;//->instance();

+//   if (! ctrlIface) {

+//     ERROR("BUG: failed to retrieve a control interface instance.\n");

+//     return -1;

+//   }

+//   return 0;

+// }

 int AmPlugIn::addCodec(amci_codec_t* c)

 {

@@ -44,7 +44,7 @@ class AmSessionEventHandlerFactory;

 class AmDynInvokeFactory;

 //class AmSIPEventHandler;

 class AmLoggingFacility;

-class AmCtrlInterfaceFactory;

+//class AmCtrlInterfaceFactory;

 class AmSipRequest;

 struct amci_exports_t;

@@ -103,7 +103,7 @@ class AmPlugIn : public AmPayloadProviderInterface

   std::map<string,AmDynInvokeFactory*>           name2di;

   std::map<string,AmLoggingFacility*>            name2logfac;

-  AmCtrlInterfaceFactory *ctrlIface;

+  //AmCtrlInterfaceFactory *ctrlIface;

   int dynamic_pl; // range: 96->127, see RFC 1890

   std::set<string> excluded_payloads;  // don't load these payloads (named)

@@ -120,7 +120,7 @@ class AmPlugIn : public AmPayloadProviderInterface

   int loadBasePlugIn(AmPluginFactory* cb);

   int loadDiPlugIn(AmPluginFactory* cb);

   int loadLogFacPlugIn(AmPluginFactory* f);

-  int loadCtrlFacPlugIn(AmPluginFactory* f);

+  //int loadCtrlFacPlugIn(AmPluginFactory* f);

  public:

deleted file mode 100644

@@ -1,92 +0,0 @@

-/*

- * $Id$

- *

- * Copyright (C) 2002-2003 Fhg Fokus

- *

- * This file is part of sems, a free SIP media server.

- *

- * sems is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version

- *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

- * sems is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-#include "log.h"

-#include "AmServer.h"

-

-#include <unistd.h>

-

-//

-// AmServer methods

-//

-

-AmServer* AmServer::_instance;

-AmCtrlInterface* AmServer::ctrlIface;

-

-AmServer*  AmServer::instance() 

-{

-  return _instance ? _instance : ((_instance = new AmServer()));

-}

-

-void AmServer::dispose() 

-{

-    if(_instance != NULL) {

-      if(_instance->ctrlIface != NULL) {

-        _instance->ctrlIface->join();

-      }

-      delete _instance;

-      _instance = NULL;

-    }

-}

-

-AmServer::~AmServer()

-{

-  INFO("Signaling Server has been recycled.\n");

-}

-

-void AmServer::run()

-{

-  ctrlIface->start();

-  ctrlIface->join();

-}

-

-void AmServer::regIface(const AmCtrlInterface *i)

-{

-  if (ctrlIface) {

-    ERROR("control interface already registered; aborting second attempt.\n");

-    return;

-  }

-  ctrlIface = const_cast<AmCtrlInterface *>(i);

-}

-

-bool AmServer::sendReply(const AmSipReply &reply) 

-{

-  return ctrlIface->send(reply);

-}

-

-bool AmServer::sendRequest(const AmSipRequest &req, char* serKey, unsigned int& serKeyLen)

-{

-  return ctrlIface->send(req, serKey, serKeyLen);

-}

-

-string AmServer::getContact(const string &displayName, 

-    const string &userName, const string &hostName, 

-    const string &uriParams, const string &hdrParams)

-{

-  return ctrlIface->getContact(displayName, userName, hostName, uriParams,

-      hdrParams);

-}

deleted file mode 100644

@@ -1,84 +0,0 @@

-/*

- * $Id$

- *

- * Copyright (C) 2002-2003 Fhg Fokus

- *

- * This file is part of sems, a free SIP media server.

- *

- * sems is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version

- *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

- * sems is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-/** @file AmServer.h */

-#ifndef _AmServer_h_

-#define _AmServer_h_

-

-#include "AmSipMsg.h"

-#include "AmApi.h"

-

-

-/**

- * \brief singleton, serve requests from ctrl interface

- *

- * The Server polls requests from the control interface and feeds 

- * them to registered handlers.

- */

-class AmServer

-{

-private:

-  /** 

-   * Singleton pointer.

-   * @see instance()

-   */

-  static AmServer* _instance;

-

-  static AmCtrlInterface *ctrlIface;

-

-  /** Avoid external instantiation. @see instance(). */

-  ~AmServer();

-

-public:

-  /** Get a fifo server instance. */

-  static AmServer* instance();

-  static void dispose();

-

-  /** Runs the fifo server. */

-  void run();

-

-  /** 

-   * Register THE interface.

-   * WARNING: only before the server starts up.

-   */

-  void regIface(const AmCtrlInterface *i);

-  bool hasIface() { return ctrlIface != NULL; };

-

-  static bool sendRequest(const AmSipRequest &, char* serKey, unsigned int& serKeyLen);

-  static bool sendReply(const AmSipReply &);

-  static string getContact(const string &displayName, 

-			   const string &userName, const string &hostName, 

-			   const string &uriParams, const string &hdrParams);

-};

-

-#endif

-

-// Local Variables:

-// mode:C++

-// End:

-

-

-

@@ -25,7 +25,7 @@

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

-#include "AmServer.h"

+//#include "AmServer.h"

 #include "AmSession.h"

 #include "AmSdp.h"

 #include "AmConfig.h"

@@ -30,7 +30,7 @@

 #include "AmSession.h"

 #include "AmUtils.h"

 #include "AmSipHeaders.h"

-#include "AmServer.h"

+#include "SipCtrlInterface.h"

 #include "sems.h"

 const char* AmSipDialog::status2str[4]  = { 	

@@ -274,45 +274,20 @@ void AmSipDialog::updateStatus(const AmSipReply& reply, bool do_200_ack)

 string AmSipDialog::getContactHdr()

 {

-  if(!contact_uri.empty())

-    return contact_uri;

+  if(contact_uri.empty()) {

-  string userName;

-  if(user.empty() || !AmConfig::PrefixSep.empty())

-    userName += CONTACT_USER_PREFIX;

-    

-  if(!AmConfig::PrefixSep.empty())

-    userName += AmConfig::PrefixSep;

-    

-  if(!user.empty())

-    userName += user;

-

-  string hostName;

-  if (! sip_ip.empty()) {

-#ifdef SUPPORT_IPV6

-    if(sip_ip.find('.') != string::npos)

-      hostName += sip_ip;

-    else

-      hostName += "[" + sip_ip + "]";

-#else

-    hostName += sip_ip;

-#endif

+    contact_uri = SIP_HDR_COLSP(SIP_HDR_CONTACT) "<sip:";

-    if(! sip_port.empty())

-      hostName += ":" + sip_port;

+    if(!user.empty()) {

+      contact_uri += user + "@";

+    }

+    

+    contact_uri += AmConfig::LocalSIPIP + ":";

+    contact_uri += AmConfig::LocalSIPPort;

+    contact_uri += CRLF;

   }

-  string uri = AmServer::getContact(/*display name*/"", userName, hostName, 

-      /*uri params*/"", /*hdrs params*/"");

-

-  string res = SIP_HDR_COLSP(SIP_HDR_CONTACT) + uri + CRLF;

-

-  // save contact_uri for subsequent contact header

-  // only if sip_ip is known

-  if (!sip_ip.empty())

-    contact_uri  = res;

-

-  return res;

+  return contact_uri;

 }

 int AmSipDialog::reply(const AmSipRequest& req,

@@ -347,13 +322,14 @@ int AmSipDialog::reply(const AmSipRequest& req,

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

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

     reply.contact = getContactHdr();

+

   reply.content_type = content_type;

   reply.body = body;

   if(updateStatusReply(req,code))

     return -1;

-  return AmServer::sendReply(reply);

+  return SipCtrlInterface::send(reply);

 }

 /* static */

@@ -372,7 +348,7 @@ int AmSipDialog::reply_error(const AmSipRequest& req, unsigned int code,

   if (AmConfig::Signature.length())

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

-  return AmServer::sendReply(reply);

+  return SipCtrlInterface::send(reply);

 }

@@ -567,7 +543,7 @@ int AmSipDialog::cancel()

   req.serKey = string(serKey, serKeyLen);

   char empty[MAX_SER_KEY_LEN];

   unsigned int unused = 0;

-  return AmServer::sendRequest(req, empty, unused) ? 0 : -1;

+  return SipCtrlInterface::send(req, empty, unused) ? 0 : -1;

 }

 int AmSipDialog::sendRequest(const string& method, 

@@ -622,7 +598,7 @@ int AmSipDialog::sendRequest(const string& method,

     req.body = body;

   }

-  if (AmServer::sendRequest(req, serKey, serKeyLen))

+  if (SipCtrlInterface::send(req, serKey, serKeyLen))

     return -1;

   uac_trans[cseq] = AmSipTransaction(method,cseq);

@@ -749,7 +725,7 @@ int AmSipDialog::send_200_ack(const AmSipTransaction& t,

     req.body = body;

   }

-  if (AmServer::sendRequest(req, serKey, serKeyLen))

+  if (SipCtrlInterface::send(req, serKey, serKeyLen))

     return -1;

   return 0;

@@ -31,7 +31,7 @@

 #include "AmThread.h"

 #include "AmConfig.h"

 #include "log.h"

-#include "AmServer.h"

+//#include "AmServer.h"

 #include "AmSipMsg.h"

 #include <stdarg.h>

@@ -33,7 +33,6 @@ SET (sems_SRCS

  AmRtpReceiver.cpp

  AmRtpStream.cpp

  AmSdp.cpp

- AmServer.cpp

  AmSession.cpp

  AmSessionContainer.cpp

  AmSessionEventHandler.cpp

@@ -48,6 +47,7 @@ SET (sems_SRCS

  LowcFE.cpp

  log.cpp

  sems.cpp

+ SipCtrlInterface.cpp

 )

 set (audio_files

@@ -2,16 +2,18 @@ NAME=sems

 LIBNAME=sems.so

 PLUGIN_DIR=plug-in

+SIP_STACK_DIR=sip

+

 SRCS=$(filter-out $(NAME).cpp, $(wildcard *.cpp))

 HDRS=$(SRCS:.cpp=.h)

-OBJS=$(SRCS:.cpp=.o) 

+OBJS=$(SRCS:.cpp=.o) sip/sip_stack.a

 DEPS=$(SRCS:.cpp=.d) $(NAME).d

 AUDIO_FILES=$(notdir $(wildcard wav/*.wav))

-

 .PHONY: all

 all: ../Makefile.defs

-	-@$(MAKE) deps    && \

+	-@$(MAKE) sip_stack && \

+	  $(MAKE) deps    && \

 	  $(MAKE) $(NAME) && \

 	  $(MAKE) modules

@@ -22,9 +24,17 @@ clean:

 	rm -f lib/*.so compat/getos compat/getarch

 	$(MAKE) -C $(PLUGIN_DIR) clean

+.PHONY: sip_stack

+sip_stack:

+	-@echo ""

+	-@echo "making SIP stack"

+	-@cd $(SIP_STACK_DIR); $(MAKE) all

+

 .PHONY: modules

 modules:

-	cd $(PLUGIN_DIR); $(MAKE) modules

+	-@echo ""

+	-@echo "making core modules"

+	-@cd $(PLUGIN_DIR); $(MAKE) modules

 .PHONY: deps

 deps: $(DEPS)

@@ -37,15 +47,16 @@ include ../Makefile.defs

 %.o : %.cpp %.d ../Makefile.defs

 	$(CXX) -c -o $@ $< $(CPPFLAGS) $(CXXFLAGS)

-%.d : %.cpp %.h Makefile ../Makefile.defs

+%.d : %.cpp %.h ../Makefile.defs

 	$(CXX) -MM $< $(CPPFLAGS) $(CXXFLAGS) > $@

 $(NAME): $(NAME).o $(OBJS) ../Makefile.defs

+	-@echo ""

+	-@echo "making $(NAME) executable"

 	$(LD) -o $(NAME) $(NAME).o $(OBJS) $(LDFLAGS) $(EXTRA_LDFLAGS)

 install: all mk-install-dirs \

 	install-audio \

-	install-doc \

 	install-modules-cfg \

 	install-cfg \

 	install-bin \

@@ -101,10 +112,6 @@ install-audio: $(DESTDIR)$(audio-prefix)/$(audio-dir)

 		fi ; \

 	done

-install-doc: $(DESTDIR)$(doc-prefix)/$(doc-dir)

-	$(INSTALL-TOUCH) $(DESTDIR)$(doc-prefix)/$(doc-dir)README

-	$(INSTALL-DOC) ../README $(DESTDIR)$(doc-prefix)/$(doc-dir)

-

 dist: tar

 tar: 

similarity index 79%

rename from core/plug-in/sipctrl/SipCtrlInterface.cpp

rename to core/SipCtrlInterface.cpp

@@ -1,5 +1,5 @@

 /*

- * $Id$

+ * $Id: SipCtrlInterface.cpp 1648 2010-03-03 19:35:22Z sayer $

  *

  * Copyright (C) 2007 Raphael Coeffic

  *

@@ -29,24 +29,21 @@

 #include "AmUtils.h"

 #include "AmSipMsg.h"

-#include "trans_layer.h"

-#include "sip_parser.h"

-#include "parse_header.h"

-#include "parse_from_to.h"

-#include "parse_cseq.h"

-#include "hash_table.h"

-#include "sip_trans.h"

-#include "wheeltimer.h"

-#include "msg_hdrs.h"

-

-#include "udp_trsp.h"

+#include "sip/trans_layer.h"

+#include "sip/sip_parser.h"

+#include "sip/parse_header.h"

+#include "sip/parse_from_to.h"

+#include "sip/parse_cseq.h"

+#include "sip/hash_table.h"

+#include "sip/sip_trans.h"

+#include "sip/wheeltimer.h"

+#include "sip/msg_hdrs.h"

+#include "sip/udp_trsp.h"

 #include "log.h"

 #include <assert.h>

-#ifndef _STANDALONE

-

 #include "AmApi.h"

 #include "AmConfigReader.h"

 #include "AmSipDispatcher.h"

@@ -55,30 +52,16 @@

 #define MOD_NAME  "sipctrl"

 #endif

-EXPORT_CONTROL_INTERFACE_FACTORY(SipCtrlInterfaceFactory,MOD_NAME);

-

-string SipCtrlInterfaceFactory::outbound_host = "";

-unsigned int SipCtrlInterfaceFactory::outbound_port = 0;

-bool SipCtrlInterfaceFactory::accept_fr_without_totag = false;

-int SipCtrlInterfaceFactory::log_raw_messages = 3;

-bool SipCtrlInterfaceFactory::log_parsed_messages = true;

-

-AmCtrlInterface* SipCtrlInterfaceFactory::instance()

-{

-    SipCtrlInterface* ctrl = new SipCtrlInterface(bind_addr,bind_port);

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

-

-    return ctrl;

-}

+string SipCtrlInterface::outbound_host = "";

+unsigned int SipCtrlInterface::outbound_port = 0;

+bool SipCtrlInterface::accept_fr_without_totag = false;

+int SipCtrlInterface::log_raw_messages = 3;

+bool SipCtrlInterface::log_parsed_messages = true;

-int SipCtrlInterfaceFactory::onLoad()

+int SipCtrlInterface::load()

 {

-    

-    bind_addr = AmConfig::LocalSIPIP;

-    bind_port = AmConfig::LocalSIPPort;

-  

-    INFO("SIP bind_addr: `%s'.\n", bind_addr.c_str());

-    INFO("SIP bind_port: `%i'.\n", bind_port);

+    INFO("SIP bind_addr: `%s'.\n", AmConfig::LocalSIPIP.c_str());

+    INFO("SIP bind_port: `%i'.\n", AmConfig::LocalSIPPort);

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

 	sip_uri parsed_uri;

@@ -87,20 +70,20 @@ int SipCtrlInterfaceFactory::onLoad()

 	    ERROR("invalid outbound_proxy specified\n");

 	    return -1;

 	}

-	SipCtrlInterfaceFactory::outbound_host = c2stlstr(parsed_uri.host);

+	outbound_host = c2stlstr(parsed_uri.host);

 	if (parsed_uri.port) {

-	    SipCtrlInterfaceFactory::outbound_port = parsed_uri.port;

+	    outbound_port = parsed_uri.port;

 	}

     }

     AmConfigReader cfg;

-    string cfgfile = AmConfig::ModConfigPath + string(MOD_NAME ".conf");

+    string cfgfile = AmConfig::ConfigurationFile.c_str();

     if (file_exists(cfgfile) && !cfg.loadFile(cfgfile)) {

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

 	    accept_fr_without_totag = 

 		cfg.getParameter("accept_fr_without_totag") == "yes";

 	}

-	DBG("sipctrl: accept_fr_without_totag = %s\n", 

+	DBG("accept_fr_without_totag = %s\n", 

 	    accept_fr_without_totag?"yes":"no");

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

@@ -111,13 +94,13 @@ int SipCtrlInterfaceFactory::onLoad()

 	    else if (msglog == "info")  log_raw_messages = 2;

 	    else if (msglog == "debug") log_raw_messages = 3;

 	}

-	DBG("sipctrl: log_raw_messages level = %d\n", 

+	DBG("log_raw_messages level = %d\n", 

 	    log_raw_messages);

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

 	    log_parsed_messages = cfg.getParameter("log_parsed_messages")=="yes";

 	}

-	DBG("sipctrl: log_parsed_messages = %s\n", 

+	DBG("log_parsed_messages = %s\n", 

 	    log_parsed_messages?"yes":"no");

     } else {

@@ -128,12 +111,9 @@ int SipCtrlInterfaceFactory::onLoad()

 }

-#endif // #ifndef _STANDALONE

-

-SipCtrlInterface::SipCtrlInterface(const string& bind_addr, unsigned short bind_port)

-    : bind_addr(bind_addr), bind_port(bind_port)

+SipCtrlInterface::SipCtrlInterface()

 {

-    tl = trans_layer::instance();

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

 }

 int SipCtrlInterface::cancel(const AmSipRequest& req)

@@ -147,61 +127,9 @@ int SipCtrlInterface::cancel(const AmSipRequest& req)

 	return -1;

     }

-    return tl->cancel(get_trans_bucket(h),(sip_trans*)t);

+    return trans_layer::instance()->cancel(get_trans_bucket(h),(sip_trans*)t);

 }

-#ifndef _STANDALONE

-

-string SipCtrlInterface::getContact(const string &displayName, 

-				  const string &userName, const string &hostName, 

-				  const string &uriParams, const string &hdrParams)

-{

-  string localUri;

-

-  if (displayName.length()) {

-      // quoting is safer (the check for quote need doesn't really pay off)

-      if (displayName.c_str()[0] == '"') {

-	  assert(displayName.c_str()[displayName.length() - 1] == '"');

-	  localUri += displayName;

-      } else {

-	  localUri += '"';

-	  localUri += displayName;

-	  localUri += '"';

-      }

-      localUri += " ";

-  }

-

-  // angular brackets not always needed (unless contact)

-  localUri += "<";

-  localUri += "sip:"; //TODO: sips|tel|tels

-  if (userName.length()) {

-    localUri += userName;

-    localUri += "@";

-  }

-  if (hostName.length())

-    localUri += hostName;

-  else {

-

-      localUri += AmConfig::LocalSIPIP;

-      localUri += ":" + int2str(AmConfig::LocalSIPPort);

-  }

-

-  if (uriParams.length()) {

-    if (uriParams.c_str()[0] != ';')

-      localUri += ';';

-    localUri += uriParams;

-  }

-  localUri += ">";

-

-  if (hdrParams.length()) {

-    if (hdrParams.c_str()[0] != ';')

-      localUri += ';';

-    localUri += hdrParams;

-  }

-

-  return localUri;

-}

-#endif

 int SipCtrlInterface::send(const AmSipRequest &req, char* serKey, unsigned int& serKeyLen)

 {

@@ -326,8 +254,8 @@ int SipCtrlInterface::send(const AmSipRequest &req, char* serKey, unsigned int&

 		      req.next_hop.length()) < 0) {

 	    ERROR("invalid next hop URI '%s'\n", req.next_hop.c_str());

 	    ERROR("Using default outbound proxy");

-	    next_hop = SipCtrlInterfaceFactory::outbound_host;

-	    next_port_i = SipCtrlInterfaceFactory::outbound_port;

+	    next_hop = SipCtrlInterface::outbound_host;

+	    next_port_i = SipCtrlInterface::outbound_port;

 	} else {

 	    next_hop = c2stlstr(parsed_uri.host);

 	    if (parsed_uri.port) {

@@ -335,36 +263,34 @@ int SipCtrlInterface::send(const AmSipRequest &req, char* serKey, unsigned int&

 	    next_hop += *(c++);

 	}

     }

-    else if(!SipCtrlInterfaceFactory::outbound_host.empty()){

-	next_hop = SipCtrlInterfaceFactory::outbound_host;

-	next_port_i = SipCtrlInterfaceFactory::outbound_port;

+    else if(!SipCtrlInterface::outbound_host.empty()){

+	next_hop = SipCtrlInterface::outbound_host;

+	next_port_i = SipCtrlInterface::outbound_port;

     }

     cstring c_next_hop = stl2cstr(next_hop);

-    if(tl->set_next_hop(msg->route,msg->u.request->ruri_str,

+    if(trans_layer::instance()->set_next_hop(msg->route,msg->u.request->ruri_str,

 			c_next_hop,(unsigned short)next_port_i,

 			&msg->remote_ip) < 0){

-	// TODO: error handling

+

 	DBG("set_next_hop failed\n");

 	delete msg;

 	return -1;

     }