From 512bf1418e9062a26574bf57c82b303bc5d2491a Mon Sep 17 00:00:00 2001 From: Bogdan Pintea Date: Tue, 22 Jan 2008 13:51:49 +0000 Subject: [PATCH] - b/f: the sasi if'ace no longer needs sems to reply to cancel requests; this is now done 'automatically' by ser. - b/f: when loading plugins, bail out at 1st raised error (the DI plugins were missed the first time); otherwise, the 'err' var gets overwritten and startup carries on, wrongly git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@613 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/AmPlugIn.cpp | 2 +- core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/AmPlugIn.cpp b/core/AmPlugIn.cpp index 9f5da3cf..4d8b701b 100644 --- a/core/AmPlugIn.cpp +++ b/core/AmPlugIn.cpp @@ -223,7 +223,7 @@ int AmPlugIn::load(const string& directory, const string& plugins) it != name2di.end(); it++){ err = it->second->onLoad(); if(err) - break; + return err; } // load SIPEventHandlers diff --git a/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp b/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp index 3fa6634e..471e9e58 100644 --- a/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp +++ b/core/plug-in/binrpcctrl/BrpcCtrlInterface.cpp @@ -1163,7 +1163,12 @@ int BrpcCtrlInterface::send(const AmSipReply &amRpl) brpc_t *req, *rpl = NULL; brpc_int_t *retcode; brpc_str_t *ser_opaque; - + + + if (amRpl.method == "CANCEL") { + DBG("skipping replying to CANCEL, no longer needed with SER2.\n"); + return 0; + } if (! (req = brpc_req(SER_REPLY, random()))) { ERROR("failed to build RPC context: %s [%d].\n", brpc_strerror(),