kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_t38: Decline T.38 stream on failure case."

Browse Source
This commit is contained in:
Joshua Colp
2018-07-09 05:32:58 -05:00
committed by Gerrit Code Review
parent 8f42447c68 c9f8e068ed
commit ad20736626
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_pjsip_t38.c
View File

@@ -749,17 +749,17 @@ static int negotiate_incoming_sdp_stream(struct ast_sip_session *session,
if (!session->endpoint->media.t38.enabled) {
ast_debug(3, "Declining; T.38 not enabled on session\n");
return -1;
return 0;
}
if (!(state = t38_state_get_or_alloc(session))) {
return -1;
return 0;
}
if ((session->t38state == T38_REJECTED) || (session->t38state == T38_DISABLED)) {
ast_debug(3, "Declining; T.38 state is rejected or declined\n");
t38_change_state(session, session_media, state, T38_DISABLED);
return -1;
return 0;
}
ast_copy_pj_str(host, stream->conn ? &stream->conn->addr : &sdp->conn->addr, sizeof(host));
@@ -768,7 +768,7 @@ static int negotiate_incoming_sdp_stream(struct ast_sip_session *session,
if (ast_sockaddr_resolve(&addrs, host, PARSE_PORT_FORBID, AST_AF_INET) <= 0) {
/* The provided host was actually invalid so we error out this negotiation */
ast_debug(3, "Declining; provided host is invalid\n");
return -1;
return 0;
}
/* Check the address family to make sure it matches configured */
@@ -776,7 +776,7 @@ static int negotiate_incoming_sdp_stream(struct ast_sip_session *session,
(ast_sockaddr_is_ipv4(addrs) && session->endpoint->media.t38.ipv6)) {
/* The address does not match configured */
ast_debug(3, "Declining, provided host does not match configured address family\n");
return -1;
return 0;
}
return 1;