Author: rco
Date: 2010-04-16 12:09:02 +0200 (Fri, 16 Apr 2010)
New Revision: 1803
Modified:
trunk/core/SipCtrlInterface.cpp
trunk/core/SipCtrlInterface.h
Log:
cleanup work.
Modified: trunk/core/SipCtrlInterface.cpp
===================================================================
--- trunk/core/SipCtrlInterface.cpp 2010-04-16 10:07:08 UTC (rev 1802)
+++ trunk/core/SipCtrlInterface.cpp 2010-04-16 10:09:02 UTC (rev 1803)
@@ -364,44 +364,6 @@
#define DBG_PARAM(p)\
DBG("%s = <%s>\n",#p,p.c_str());
-void SipCtrlInterface::handleSipMsg(AmSipRequest &req)
-{
- DBG("Received new request\n");
- if (SipCtrlInterface::log_parsed_messages) {
- // DBG_PARAM(req.cmd);
- DBG_PARAM(req.method);
- // DBG_PARAM(req.user);
- // DBG_PARAM(req.domain);
- // DBG_PARAM(req.dstip);
- // DBG_PARAM(req.port);
- DBG_PARAM(req.r_uri);
- DBG_PARAM(req.from_uri);
- DBG_PARAM(req.from);
- DBG_PARAM(req.to);
- DBG_PARAM(req.callid);
- DBG_PARAM(req.from_tag);
- DBG_PARAM(req.to_tag);
- DBG("cseq = <%i>\n",req.cseq);
- DBG_PARAM(req.route);
- DBG_PARAM(req.next_hop);
- DBG("hdrs = <%s>\n",req.hdrs.c_str());
- DBG("body = <%s>\n",req.body.c_str());
- }
-
- AmSipDispatcher::instance()->handleSipMsg(req);
-}
-
-void SipCtrlInterface::handleSipMsg(AmSipReply &rep)
-{
- DBG("Received reply: %i %s\n",rep.code,rep.reason.c_str());
- DBG_PARAM(rep.callid);
- DBG_PARAM(rep.local_tag);
- DBG_PARAM(rep.remote_tag);
- DBG("cseq = <%i>\n",rep.cseq);
-
- AmSipDispatcher::instance()->handleSipMsg(rep);
-}
-
void SipCtrlInterface::handle_sip_request(trans_ticket* tt, sip_msg* msg)
{
assert(msg);
@@ -479,7 +441,29 @@
}
}
- handleSipMsg(req);
+ DBG("Received new request\n");
+ if (SipCtrlInterface::log_parsed_messages) {
+ // DBG_PARAM(req.cmd);
+ DBG_PARAM(req.method);
+ // DBG_PARAM(req.user);
+ // DBG_PARAM(req.domain);
+ // DBG_PARAM(req.dstip);
+ // DBG_PARAM(req.port);
+ DBG_PARAM(req.r_uri);
+ DBG_PARAM(req.from_uri);
+ DBG_PARAM(req.from);
+ DBG_PARAM(req.to);
+ DBG_PARAM(req.callid);
+ DBG_PARAM(req.from_tag);
+ DBG_PARAM(req.to_tag);
+ DBG("cseq = <%i>\n",req.cseq);
+ DBG_PARAM(req.route);
+ DBG_PARAM(req.next_hop);
+ DBG("hdrs = <%s>\n",req.hdrs.c_str());
+ DBG("body = <%s>\n",req.body.c_str());
+ }
+
+ AmSipDispatcher::instance()->handleSipMsg(req);
}
void SipCtrlInterface::handle_sip_reply(sip_msg* msg)
@@ -539,9 +523,17 @@
}
}
- handleSipMsg(reply);
+ DBG("Received reply: %i %s\n",reply.code,reply.reason.c_str());
+ DBG_PARAM(reply.callid);
+ DBG_PARAM(reply.local_tag);
+ DBG_PARAM(reply.remote_tag);
+ DBG("cseq = <%i>\n",reply.cseq);
+
+ AmSipDispatcher::instance()->handleSipMsg(reply);
}
+#undef DBG_PARAM(p)
+
void SipCtrlInterface::prepare_routes_uac(const list<sip_header*>& routes,
string& route_field)
{
if(!routes.empty()){
Modified: trunk/core/SipCtrlInterface.h
===================================================================
--- trunk/core/SipCtrlInterface.h 2010-04-16 10:07:08 UTC (rev 1802)
+++ trunk/core/SipCtrlInterface.h 2010-04-16 10:09:02 UTC (rev 1803)
@@ -46,15 +46,12 @@
class SipCtrlInterface:
public sip_ua
{
-
- //string bind_addr;
- //unsigned short bind_port;
-
void prepare_routes_uac(const list<sip_header*>& routes, string&
route_field);
void prepare_routes_uas(const list<sip_header*>& routes, string&
route_field);
static int cancel(AmSipRequest& req);
friend class udp_trsp;
+
public:
static string outbound_host;
@@ -77,13 +74,6 @@
static int send(AmSipRequest &req);
static int send(const AmSipReply &rep);
-// string getContact(const string &displayName,
-// const string &userName, const string &hostName,
-// const string &uriParams, const string &hdrParams);
-
- void handleSipMsg(AmSipRequest &req);
- void handleSipMsg(AmSipReply &rep);
-
/**
* From sip_ua
*/
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
