res_pjsip_dtmf_info: Hook flash

Adds hook flash recognition support for application/hook-flash. ASTERISK-29460 Change-Id: I1d060fa89a7cf41244c98f892fff44eb1c9738ea
asterisk · Jun 8, 2021 · 1b38e89 · 1b38e89
1 parent 5f8cabc
commit 1b38e89
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/doc/CHANGES-staging/res_pjsip_dtmf.txt b/doc/CHANGES-staging/res_pjsip_dtmf.txt
@@ -0,0 +1,5 @@
+res_pjsip_dtmf_info: Hook flash
+
+Adds recognition for application/
+hook-flash as a hook flash event.
+
diff --git a/res/res_pjsip_dtmf_info.c b/res/res_pjsip_dtmf_info.c
@@ -87,16 +87,18 @@ static int dtmf_info_incoming_request(struct ast_sip_session *session, struct pj
 	char *line;
 	char event = '\0';
 	unsigned int duration = 100;
-	char is_dtmf;
+	char is_dtmf, is_dtmf_relay, is_flash;
 	int res;
 
 	if (!session->channel) {
 		return 0;
 	}
 
 	is_dtmf = is_media_type(rdata, "dtmf");
+	is_dtmf_relay = is_media_type(rdata, "dtmf-relay");
+	is_flash = is_media_type(rdata, "hook-flash");
 
-	if (!is_dtmf && !is_media_type(rdata, "dtmf-relay")) {
+	if (!is_flash && !is_dtmf && !is_dtmf_relay) {
 		return 0;
 	}
 
@@ -116,7 +118,7 @@ static int dtmf_info_incoming_request(struct ast_sip_session *session, struct pj
 	if (is_dtmf) {
 		/* directly use what is in the message body */
 		event = get_event(cur);
-	} else { /* content type = application/dtmf-relay */
+	} else if (is_dtmf_relay) { /* content type = application/dtmf-relay */
 		while ((line = strsep(&cur, "\r\n"))) {
 			char *c;
 
@@ -137,7 +139,7 @@ static int dtmf_info_incoming_request(struct ast_sip_session *session, struct pj
 		}
 	}
 
-	if (event == '!') {
+	if (event == '!' || is_flash) {
 		struct ast_frame f = { AST_FRAME_CONTROL, { AST_CONTROL_FLASH, } };
 		ast_queue_frame(session->channel, &f);
 	} else if (event != '\0') {