kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 21:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_t38.c: Back out part of an earlier fix attempt." into 13

Browse Source
This commit is contained in:
zuul
2016-02-29 18:09:55 -06:00
committed by Gerrit Code Review
parent 5393a4963a 263a39f2cc
commit 84d1036205
1 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
res/res_pjsip_t38.c
View File

@@ -570,41 +570,6 @@ static struct ast_sip_session_supplement t38_supplement = {
.outgoing_request = t38_outgoing_invite_request, .outgoing_request = t38_outgoing_invite_request,
}; };
static int t38_incoming_bye_request(struct ast_sip_session *session, struct pjsip_rx_data *rdata)
{
struct ast_datastore *datastore;
struct ast_sip_session_media *session_media;
if (!session->channel) {
return 0;
}
datastore = ast_sip_session_get_datastore(session, "t38");
if (!datastore) {
return 0;
}
session_media = ao2_find(session->media, "image", OBJ_KEY);
if (!session_media) {
ao2_ref(datastore, -1);
return 0;
}
t38_change_state(session, session_media, datastore->data, T38_REJECTED);
ao2_ref(datastore, -1);
ao2_ref(session_media, -1);
return 0;
}
/*! \brief Supplement for handling a remote termination of T.38 state */
static struct ast_sip_session_supplement t38_bye_supplement = {
.method = "BYE",
.priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL + 1,
.incoming_request = t38_incoming_bye_request,
};
/*! \brief Parse a T.38 image stream and store the attribute information */ /*! \brief Parse a T.38 image stream and store the attribute information */
static void t38_interpret_sdp(struct t38_state *state, struct ast_sip_session *session, struct ast_sip_session_media *session_media, static void t38_interpret_sdp(struct t38_state *state, struct ast_sip_session *session, struct ast_sip_session_media *session_media,
const struct pjmedia_sdp_media *stream) const struct pjmedia_sdp_media *stream)
@@ -935,7 +900,6 @@ static int unload_module(void)
{ {
ast_sip_session_unregister_sdp_handler(&image_sdp_handler, "image"); ast_sip_session_unregister_sdp_handler(&image_sdp_handler, "image");
ast_sip_session_unregister_supplement(&t38_supplement); ast_sip_session_unregister_supplement(&t38_supplement);
ast_sip_session_unregister_supplement(&t38_bye_supplement);
return 0; return 0;
} }
@@ -962,11 +926,6 @@ static int load_module(void)
goto end; goto end;
} }
if (ast_sip_session_register_supplement(&t38_bye_supplement)) {
ast_log(LOG_ERROR, "Unable to register T.38 BYE session supplement\n");
goto end;
}
if (ast_sip_session_register_sdp_handler(&image_sdp_handler, "image")) { if (ast_sip_session_register_sdp_handler(&image_sdp_handler, "image")) {
ast_log(LOG_ERROR, "Unable to register SDP handler for image stream type\n"); ast_log(LOG_ERROR, "Unable to register SDP handler for image stream type\n");
goto end; goto end;