aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-10-12 21:51:08 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-10-12 21:51:08 +0000
commit4146d1296e25c18a7538ee14e255e15ede3143c1 (patch)
tree1e616e979061703ae559056a5bfa5e5903ace500
parent792bc71f008d97648474c8b1c5f1159f9d06ad05 (diff)
Fix MGCP build, SIP should destroy on temponly, not on show peer
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3985 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_mgcp.c4
-rwxr-xr-xchannels/chan_sip.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index b81f8058c..fd4aff6a8 100755
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1951,7 +1951,7 @@ static int transmit_modify_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp
add_header(&resp, "X", sub->txident);
add_header(&resp, "I", sub->cxident);
/*add_header(&resp, "S", "");*/
- ast_rtp_offered_from_local(rtp, 0);
+ ast_rtp_offered_from_local(sub->rtp, 0);
add_sdp(&resp, sub, rtp);
/* SC: fill in new fields */
resp.cmd = MGCP_CMD_MDCX;
@@ -1985,7 +1985,7 @@ static int transmit_connect_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp
/* SC: X header should not be sent. kept for compatibility */
add_header(&resp, "X", sub->txident);
/*add_header(&resp, "S", "");*/
- ast_rtp_offered_from_local(rtp, 1);
+ ast_rtp_offered_from_local(sub->rtp, 1);
add_sdp(&resp, sub, rtp);
/* SC: fill in new fields */
resp.cmd = MGCP_CMD_CRCX;
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 83e885263..4f333694e 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5749,7 +5749,7 @@ static int sip_show_peer(int fd, int argc, char *argv[])
ast_mutex_unlock(&peerl.lock);
- if (peer && peer->dynamic) {
+ if (peer && peer->temponly) {
destroy_peer(peer);
}
return RESULT_SUCCESS;