kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-27 08:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

res/res_pjsip_t38 ensure t38 requests get rejected quickly

Browse Source 
arm the t38 webhook always, so we can correctly reject a
T38 negotiation request when t38 is disabled on a channel

Change-Id: Ib1ffe35aee145d4e0fe61dd012580be11aae079d
This commit is contained in:
Torrey Searle
2017-06-22 14:47:54 +02:00
parent 27aeca3594
commit d42a9cc9dc
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/res_pjsip_t38.c
View File

@@ -497,16 +497,21 @@ static struct ast_frame *t38_framehook(struct ast_channel *chan, struct ast_fram
return f;
}
if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_T38_PARAMETERS &&
channel->session->endpoint->media.t38.enabled) {
struct t38_parameters_task_data *data = t38_parameters_task_data_alloc(channel->session, f);
if (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_T38_PARAMETERS) {
if (channel->session->endpoint->media.t38.enabled) {
struct t38_parameters_task_data *data = t38_parameters_task_data_alloc(channel->session, f);
if (!data) {
return f;
}
if (!data) {
return f;
}
if (ast_sip_push_task(channel->session->serializer, t38_interpret_parameters, data)) {
ao2_ref(data, -1);
if (ast_sip_push_task(channel->session->serializer, t38_interpret_parameters, data)) {
ao2_ref(data, -1);
}
} else {
struct ast_control_t38_parameters parameters = { .request_response = AST_T38_REFUSED, };
ast_debug(2, "T.38 support not enabled, rejecting T.38 control packet\n");
ast_queue_control_data(chan, AST_CONTROL_T38_PARAMETERS, &parameters, sizeof(parameters));
}
}
@@ -551,10 +556,7 @@ static void t38_attach_framehook(struct ast_sip_session *session)
return;
}
/* Only attach the framehook if t38 is enabled for the endpoint */
if (!session->endpoint->media.t38.enabled) {
return;
}
/* Always attach the framehook so we can quickly reject */
ast_channel_lock(session->channel);