summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 48a40e98f..164b217a9 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6015,8 +6015,11 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i
return -1;
}
ast_mutex_lock(&iaxsl[callno]);
- if (!iaxs[callno])
+ if (!iaxs[callno]) {
+ if (ast_test_flag(p, IAX_TEMPONLY))
+ destroy_peer(p);
return -1;
+ }
if (ast_test_flag((&globalflags), IAX_RTUPDATE) && (ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS))) {
if (sin->sin_addr.s_addr) {
@@ -6054,8 +6057,11 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i
}
/* Make sure our call still exists, an INVAL at the right point may make it go away */
- if (!iaxs[callno])
+ if (!iaxs[callno]) {
+ if (ast_test_flag(p, IAX_TEMPONLY))
+ destroy_peer(p);
return 0;
+ }
/* Store socket fd */
p->sockfd = fd;
@@ -6140,8 +6146,11 @@ static int registry_authrequest(int callno)
ast_mutex_unlock(&iaxsl[callno]);
p = find_peer(peer_name, 1);
ast_mutex_lock(&iaxsl[callno]);
- if (!iaxs[callno])
+ if (!iaxs[callno]) {
+ if (p && ast_test_flag(p, IAX_TEMPONLY))
+ destroy_peer(p);
return -1;
+ }
if (p) {
memset(&ied, 0, sizeof(ied));
iax_ie_append_short(&ied, IAX_IE_AUTHMETHODS, p->authmethods);
@@ -10551,6 +10560,9 @@ static int function_iaxpeer(struct ast_channel *chan, const char *cmd, char *dat
}
}
+ if (ast_test_flag(peer, IAX_TEMPONLY))
+ destroy_peer(peer);
+
return 0;
}