summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2006-04-18 14:41:57 +0000
committerOlle Johansson <oej@edvina.net>2006-04-18 14:41:57 +0000
commit910c44b1b63f0ebef7464c9a6d39aff16d515dd9 (patch)
treeb5616467d020dc8c20a8d2b9c11b8a98435ff95e /channels
parent60d91caa2305781ca4c707b022e7773f07c49fcc (diff)
Clean up handle_response_peerpoke
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d5fa7a549..7ddc5a565 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1107,6 +1107,7 @@ static int handle_request_options(struct sip_pvt *p, struct sip_request *req);
/*------Response handling functions */
static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, struct sip_request *req, int seqno);
static void handle_response_refer(struct sip_pvt *p, int resp, char *rest, struct sip_request *req, int seqno);
+static int handle_response_peerpoke(struct sip_pvt *p, int resp, struct sip_request *req);
/*----- RTP interface functions */
static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struct ast_rtp *vrtp, int codecs, int nat_active);
@@ -10155,7 +10156,7 @@ static int handle_response_register(struct sip_pvt *p, int resp, char *rest, str
}
/*! \brief Handle qualification responses (OPTIONS) */
-static int handle_response_peerpoke(struct sip_pvt *p, int resp, char *rest, struct sip_request *req, int ignore, int seqno, int sipmethod)
+static int handle_response_peerpoke(struct sip_pvt *p, int resp, struct sip_request *req)
{
struct sip_peer *peer;
int pingtime;
@@ -10197,8 +10198,6 @@ static int handle_response_peerpoke(struct sip_pvt *p, int resp, char *rest, str
if (peer->pokeexpire > -1)
ast_sched_del(sched, peer->pokeexpire);
- if (sipmethod == SIP_INVITE) /* Does this really happen? */
- transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, 0);
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
/* Try again eventually */
@@ -10249,7 +10248,7 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
Well, as long as it's not a 100 response... since we might
need to hang around for something more "definitive" */
- res = handle_response_peerpoke(p, resp, rest, req, ignore, seqno, sipmethod);
+ res = handle_response_peerpoke(p, resp, req);
} else if (ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
switch(resp) {
case 100: /* 100 Trying */