sipwise
/
sems
mirror of https://github.com/sipwise/sems.git
1
0
Fork 0
Code Issues Releases Wiki Activity

removed "#if 0" dead code

Browse Source 
removed code disabled during development of 100rel extension
sayer/1.4-spce2.6
bpintea 16 years ago
parent cf3c93492a
commit d074c0c0cd
11 changed files with 0 additions and 207 deletions
Show Stats Download Patch File Download Diff File

5
apps/registrar_client/SIPRegistrarClient.h
Unescape View File

@ -127,13 +127,8 @@ class SIPRegistration : public AmSipDialogEventHandler,
void onSipReply(const AmSipReply& reply, int old_dlg_status);
void onSipRequest(const AmSipRequest& req) {}
void onInvite2xx(const AmSipReply&) {}
#if 0
void onNo2xxACK(unsigned int) {}
void onNoErrorACK(unsigned int) {}
#else
void onNoAck(unsigned int) {}
void onNoPrack(const AmSipRequest &, const AmSipReply &) {}
#endif
/** is this registration registered? */
bool active;

14
core/AmSession.cpp
Unescape View File

@ -906,18 +906,6 @@ void AmSession::onInvite2xx(const AmSipReply& reply)
if(t) dlg.send_200_ack(*t);
}
#if 0
void AmSession::onNo2xxACK(unsigned int cseq)
{
dlg.bye();
setStopped();
}
void AmSession::onNoErrorACK(unsigned int cseq)
{
setStopped();
}
#else
void AmSession::onNoAck(unsigned int cseq)
{
if (dlg.getStatus() == AmSipDialog::Connected)
@ -939,8 +927,6 @@ void AmSession::onNoPrack(const AmSipRequest &req, const AmSipReply &rpl)
}
}
#endif
void AmSession::onAudioEvent(AmAudioEvent* audio_ev)
{
if (audio_ev->event_id == AmAudioEvent::cleared)

6
core/AmSession.h
Unescape View File

@ -498,12 +498,6 @@ public:
virtual void onSipRequest(const AmSipRequest& req);
/** Entry point for SIP Replies */
virtual void onSipReply(const AmSipReply& reply, int old_dlg_status);
#if 0
/** There was a timeout receiving a reply for the given SIP request */
virtual void onSipReqTimeout(const AmSipRequest &req);
/** There was a timeout receiving a request (PR-/ACK) for given SIP reply */
virtual void onSipRplTimeout(const AmSipRequest &req, const AmSipReply &rpl);
#endif
/** 2xx reply has been received for an INVITE transaction */
virtual void onInvite2xx(const AmSipReply& reply);

12
core/AmSipDialog.cpp
Unescape View File

@ -307,22 +307,10 @@ void AmSipDialog::uasTimeout(AmSipTimeoutEvent* to_ev)
assert(to_ev);
switch(to_ev->type){
#if 0
case AmSipTimeoutEvent::no2xxACK:
DBG("Timeout: missing 2xx-ACK\n");
if(hdl) hdl->onNo2xxACK(to_ev->cseq);
break;
case AmSipTimeoutEvent::noErrorACK:
DBG("Timeout: missing non-2xx-ACK\n");
if(hdl) hdl->onNoErrorACK(to_ev->cseq);
break;
#else
case AmSipTimeoutEvent::noACK:
DBG("Timeout: missing ACK\n");
if(hdl) hdl->onNoAck(to_ev->cseq);
break;
#endif
case AmSipTimeoutEvent::noPRACK:
DBG("Timeout: missing PRACK\n");

8
core/AmSipDialog.h
Unescape View File

@ -96,19 +96,11 @@ class AmSipDialogEventHandler
/** Hook called when a local INVITE request has been replied with 2xx */
virtual void onInvite2xx(const AmSipReply& reply)=0;
#if 0
/** Hook called when a UAS INVITE transaction did not receive a 2xx-ACK */
virtual void onNo2xxACK(unsigned int cseq)=0;
/** Hook called when a UAS INVITE transaction did not receive a non-2xx-ACK */
virtual void onNoErrorACK(unsigned int cseq)=0;
#else
/** Hook called when a UAS INVITE transaction did not receive the ACK */
virtual void onNoAck(unsigned int)=0;
/** Hook called when a UAS INVITE transaction did not receive the PRACK */
virtual void onNoPrack(const AmSipRequest &, const AmSipReply &)=0;
#endif
virtual ~AmSipDialogEventHandler() {};
};

20
core/AmSipEvent.cpp
Unescape View File

@ -7,26 +7,6 @@ void AmSipTimeoutEvent::operator() (AmSipDialog* dlg)
dlg->uasTimeout(this);
}
#if 0
AmSipReqTimeoutEvent *req_tout_ev =
dynamic_cast<AmSipReqTimeoutEvent *>(sip_ev);
if (req_tout_ev) {
CALL_EVENT_H(onSipReqTimeout, req_tout_ev->req);
onSipReqTimeout(req_tout_ev->req);
return;
}
AmSipRplTimeoutEvent *rpl_tout_ev =
dynamic_cast<AmSipRplTimeoutEvent *>(sip_ev);
if (rpl_tout_ev) {
CALL_EVENT_H(onSipRplTimeout, rpl_tout_ev->req, rpl_tout_ev->rpl);
onSipRplTimeout(rpl_tout_ev->req, rpl_tout_ev->rpl);
return;
}
#endif
void AmSipRequestEvent::operator() (AmSipDialog* dlg)
{
assert(dlg);

57
core/AmSipEvent.h
Unescape View File

@ -48,30 +48,6 @@ class AmSipEvent: public AmEvent
virtual void operator() (AmSipDialog* dlg)=0;
};
#if 0
/** \brief UAS reply re-transmission timeout event */
class AmSipTimeoutEvent: public AmSipEvent
{
public:
enum EvType {
_noEv=0,
no2xxACK,
noErrorACK,
noPRACK
};
EvType type;
unsigned int cseq;
AmSipTimeoutEvent(EvType t, unsigned int cseq_num)
: AmSipEvent(), type(t)
{}
virtual void operator() (AmSipDialog* dlg);
};
#else
/** \brief UAS reply re-transmission timeout event */
class AmSipTimeoutEvent: public AmSipEvent
{
@ -98,7 +74,6 @@ class AmSipTimeoutEvent: public AmSipEvent
virtual void operator() (AmSipDialog* dlg);
};
#endif
/** \brief SIP request event */
class AmSipRequestEvent: public AmSipEvent
@ -126,37 +101,5 @@ class AmSipReplyEvent: public AmSipEvent
};
#if 0
// TODO: have a single AmSipT.outEv. class, with type and a _AmSipMsgInDlg
// ptr: it will save the dynamic_cast efforts later.
class AmSipTimeoutEvent: public AmSipEvent
{
public:
AmSipTimeoutEvent(int id = -1)
: AmSipEvent(-1)
{}
};
class AmSipReqTimeoutEvent : public AmSipTimeoutEvent
{
public:
AmSipRequest req;
AmSipReqTimeoutEvent(AmSipRequest &r):
AmSipTimeoutEvent(), req(r)
{}
};
class AmSipRplTimeoutEvent : public AmSipTimeoutEvent
{
public:
AmSipRequest req;
AmSipReply rpl;
AmSipRplTimeoutEvent(AmSipRequest &_req, AmSipReply &_rpl):
AmSipTimeoutEvent(), req(_req), rpl(_rpl)
{}
};
#endif
#endif

51
core/SipCtrlInterface.cpp
Unescape View File

@ -571,57 +571,6 @@ void SipCtrlInterface::handle_sip_reply(sip_msg* msg)
AmSipDispatcher::instance()->handleSipMsg(reply);
}
#if 0
void SipCtrlInterface::timer_expired(sip_trans* trans, sip_timer_type tt)
{
assert(trans);
assert(trans->type == TT_UAS);
AmSipTimeoutEvent::EvType ev = AmSipTimeoutEvent::_noEv;
DBG("tt=%i;state=%i\n",tt,trans->state);
//TODO: send an event to the SIP Dialog
switch(tt){
case STIMER_H:
switch(trans->state){
case TS_TERMINATED_200: // missing 200-ACK
ev = AmSipTimeoutEvent::no2xxACK;
break;
case TS_COMPLETED: // missing error-ACK
ev = AmSipTimeoutEvent::noErrorACK;
break;
// TODO: missing PRACK
//case TS_???:
default:
ERROR("timer H expired / transaction in undefined state\n");
return;
}
break;
default:
return;
}
assert(trans->msg);
assert(trans->to_tag.len);
assert(trans->msg->cseq && trans->msg->cseq->p);
sip_cseq* cseq = dynamic_cast<sip_cseq*>(trans->msg->cseq->p);
if(!cseq){
ERROR("missing CSeq\n");
return;
}
AmEventDispatcher::instance()->post(c2stlstr(trans->to_tag),
new AmSipTimeoutEvent(ev, cseq->num));
}
#endif
void SipCtrlInterface::handle_reply_timeout(AmSipTimeoutEvent::EvType evt,
sip_trans *tr, trans_bucket *buk)
{

3
core/SipCtrlInterface.h
Unescape View File

@ -109,9 +109,6 @@ public:
void handle_sip_reply(sip_msg* msg);
void handle_reply_timeout(AmSipTimeoutEvent::EvType evt,
sip_trans *tr, trans_bucket *buk=0);
#if 0
void timer_expired(sip_trans* trans, sip_timer_type tt);
#endif
};

5
core/sip/sip_ua.h
Unescape View File

@ -44,11 +44,6 @@ public:
//virtual void handle_request_timeout(const sip_msg *msg)=0;
virtual void handle_reply_timeout(AmSipTimeoutEvent::EvType evt,
sip_trans *tr, trans_bucket *buk=0)=0;
#if 0
// UAS timer expired (UAC timers generate a local 408)
virtual void timer_expired(sip_trans* trans, sip_timer_type tt)=0;
#endif
};
#endif

26
core/sip/trans_layer.cpp
Unescape View File

@ -1072,31 +1072,6 @@ void trans_layer::received_msg(sip_msg* msg)
}
}
else {
#if 0
string t_id;
if(msg->u.request->method == sip_request::ACK){
// non-2xx ACK??? drop!
break;
}
else {
// New transaction
t = bucket->add_trans(msg, TT_UAS);
bucket->unlock();
// let's pass the request to
// the UA.
assert(ua);
ua->handle_sip_request(trans_ticket(t,bucket),msg);
// forget the msg: it will be
// owned by the new transaction
return;
}
#else
unsigned inv_h;
trans_bucket* inv_bucket;
sip_trans* inv_t;
@ -1137,7 +1112,6 @@ void trans_layer::received_msg(sip_msg* msg)
// owned by the new transaction
return;
}
#endif
}
break;

Write Preview
Loading…
Cancel
Save