r2815 - trunk/libmsip/source
erik at minisip.org
erik at minisip.org
Wed Oct 4 14:58:43 CEST 2006
Author: erik
Date: 2006-10-04 14:58:41 +0200 (Wed, 04 Oct 2006)
New Revision: 2815
Modified:
trunk/libmsip/source/SipStack.cxx
Log:
* Removed a heap of obsolete code from SipStack.cxx
Modified: trunk/libmsip/source/SipStack.cxx
===================================================================
--- trunk/libmsip/source/SipStack.cxx 2006-10-03 14:54:14 UTC (rev 2814)
+++ trunk/libmsip/source/SipStack.cxx 2006-10-04 12:58:41 UTC (rev 2815)
@@ -191,174 +191,3 @@
}
-
-#if 0
-
-SipStack::SipStack( MRef<SipCommonConfig *> stackConfig,
- MRef<certificate_chain *> cert_chain,
- MRef<ca_db *> cert_db
- )
-{
- timers = new SipTimers;
- this->config = stackConfig;
-
- timeoutProvider = new TimeoutProvider<string, MRef<StateMachine<SipSMCommand,string>*> >;
-
- SipHeader::headerFactories.addFactory("Accept", sipHeaderAcceptFactory);
- SipHeader::headerFactories.addFactory("Accept-Contact", sipHeaderAcceptContactFactory);
- SipHeader::headerFactories.addFactory("Authorization", sipHeaderAuthorizationFactory);
- SipHeader::headerFactories.addFactory("Call-ID", sipHeaderCallIdFactory);
- SipHeader::headerFactories.addFactory("i", sipHeaderCallIdFactory);
- SipHeader::headerFactories.addFactory("Contact", sipHeaderContactFactory);
- SipHeader::headerFactories.addFactory("m", sipHeaderContactFactory);
- SipHeader::headerFactories.addFactory("Content-Length", sipHeaderContentLengthFactory);
- SipHeader::headerFactories.addFactory("l", sipHeaderContentLengthFactory);
- SipHeader::headerFactories.addFactory("Content-Type", sipHeaderContentTypeFactory);
- SipHeader::headerFactories.addFactory("c", sipHeaderContentTypeFactory);
- SipHeader::headerFactories.addFactory("CSeq", sipHeaderCSeqFactory);
- SipHeader::headerFactories.addFactory("Event", sipHeaderEventFactory);
- SipHeader::headerFactories.addFactory("Expires", sipHeaderEventFactory);
- SipHeader::headerFactories.addFactory("From", sipHeaderFromFactory);
- SipHeader::headerFactories.addFactory("f", sipHeaderFromFactory);
- SipHeader::headerFactories.addFactory("Max-Forwards", sipHeaderMaxForwardsFactory);
- SipHeader::headerFactories.addFactory("Proxy-Authenticate", sipHeaderProxyAuthenticateFactory);
- SipHeader::headerFactories.addFactory("Proxy-Authorization", sipHeaderProxyAuthorizationFactory);
- SipHeader::headerFactories.addFactory("RAck", sipHeaderRAckFactory);
- SipHeader::headerFactories.addFactory("RSeq", sipHeaderRSeqFactory);
- SipHeader::headerFactories.addFactory("Record-Route", sipHeaderRecordRouteFactory);
- SipHeader::headerFactories.addFactory("Require", sipHeaderRequireFactory);
- SipHeader::headerFactories.addFactory("Refer-To", sipHeaderReferToFactory);
- SipHeader::headerFactories.addFactory("Route", sipHeaderRouteFactory);
- SipHeader::headerFactories.addFactory("Subject", sipHeaderSubjectFactory);
- SipHeader::headerFactories.addFactory("s", sipHeaderSubjectFactory);
- SipHeader::headerFactories.addFactory("Supported", sipHeaderSupportedFactory);
- SipHeader::headerFactories.addFactory("k", sipHeaderSupportedFactory);
- SipHeader::headerFactories.addFactory("To", sipHeaderToFactory);
- SipHeader::headerFactories.addFactory("t", sipHeaderToFactory);
- SipHeader::headerFactories.addFactory("Unsupported", sipHeaderUnsupportedFactory);
- SipHeader::headerFactories.addFactory("User-Agent", sipHeaderUserAgentFactory);
- SipHeader::headerFactories.addFactory("Via", sipHeaderViaFactory);
- SipHeader::headerFactories.addFactory("v", sipHeaderViaFactory);
- SipHeader::headerFactories.addFactory("Warning", sipHeaderWarningFactory);
- SipHeader::headerFactories.addFactory("WWW-Authenticate", sipHeaderWWWAuthenticateFactory);
-
- addSupportedExtension("100rel");
-
- MRef<SipLayerTransport*> transp = MRef<SipLayerTransport*>(new
- SipLayerTransport(
- stackConfig->localIpString,
- stackConfig->externalContactIP,
- stackConfig->externalContactUdpPort,
- stackConfig->localUdpPort,
- stackConfig->localTcpPort,
- stackConfig->localTlsPort,
- cert_chain,
- cert_db
- )
- );
-
- // Here we need to really know what we are doing since
- // we are "breaking the law" of not passing this
- // as argument in the constructor.
- //
- // Here it's ok since the dispatcher will keep
- // a reference to the SipStack thus we won't be
- // freed (crash) when this line executes.
- dispatcher = new SipCommandDispatcher(this,transp);
-
- SipMessage::contentFactories.addFactory("text/plain", sipIMMessageContentFactory);
- SipMessage::contentFactories.addFactory("multipart/mixed", SipMIMEContentFactory);
- SipMessage::contentFactories.addFactory("multipart/alternative", SipMIMEContentFactory);
- SipMessage::contentFactories.addFactory("multipart/parallel", SipMIMEContentFactory);
- SipMessage::contentFactories.addFactory("message/sipfrag", sipSipMessageContentFactory);
-
-}
-
-MRef<SipCommandDispatcher*> SipStack::getDispatcher(){
- return dispatcher;
-}
-
-void SipStack::setDefaultDialogCommandHandler(MRef<SipSMCommandReceiver*> cb){
- dispatcher->getLayerDialog()->setDefaultDialogCommandHandler(cb);
-}
-
-void SipStack::setTransactionHandlesAck(bool transHandleAck){
- dispatcher->getLayerTransaction()->doHandleAck(transHandleAck);
-}
-
-
-void SipStack::setCallback(MRef<CommandReceiver*> callback){
- this->callback = callback;
- dispatcher->setCallback(callback);
-}
-
-MRef<CommandReceiver*> SipStack::getCallback(){
- return callback;
-}
-
-void SipStack::setConfCallback(MRef<CommandReceiver*> callback){
- this->confCallback = callback;
-}
-
-MRef<CommandReceiver*> SipStack::getConfCallback(){
- return confCallback;
-}
-
-void SipStack::run(){
- dispatcher->run();
-}
-
-bool SipStack::handleCommand(const SipSMCommand &command){
- dispatcher->enqueueCommand(command, LOW_PRIO_QUEUE);
- return true;
-}
-
-bool SipStack::handleCommand(const CommandString &cmd){
- //Commands from the gui etc is always sent to the
- //TU layer
- SipSMCommand c(cmd, SipSMCommand::dialog_layer, SipSMCommand::dialog_layer);
- return handleCommand(c);
-}
-
-void SipStack::addDialog(MRef<SipDialog*> d){
- dispatcher->addDialog(d);
-}
-
-
-MRef<TimeoutProvider<string, MRef<StateMachine<SipSMCommand,string>*> > *> SipStack::getTimeoutProvider(){
- return timeoutProvider;
-}
-
-MRef<SipTimers*> SipStack::getTimers(){
- return timers;
-}
-
-void SipStack::addSupportedExtension(string ext){
- sipExtensions.push_back(ext);
-}
-
-bool SipStack::supports(string ext){
- list<string>::iterator i;
- for (i=sipExtensions.begin(); i!= sipExtensions.end(); i++){
- if (*i == ext)
- return true;
- }
- return false;
-}
-
-string SipStack::getAllSupportedExtensionsStr(){
- string ret;
- bool first=true;
- list<string>::iterator i;
- for (i=sipExtensions.begin(); i!=sipExtensions.end();i++){
- if (!first){
- ret = ret+",";
- first=false;
- }
- ret = ret+(*i);
- }
- return ret;
-}
-
-#endif
-
More information about the Minisip-devel
mailing list