Add support for sending DTMF events via protocol NG TCP.

daemon/dtmf.c

@@ -20,6 +20,47 @@ void dtmf_init(void) {
 	}
 }
 
+static void dtmf_bencode_and_notify(struct media_packet *mp,
+		struct telephone_event_payload *dtmf, int clockrate)
+{
+	bencode_buffer_t bencbuf;
+	bencode_item_t *notify, *data, *tags;
+	str encoded_data;
+	int ret = bencode_buffer_init(&bencbuf);
+	assert(ret == 0);
+
+	if (!dtmf->end)
+		return;
+
+	if (!clockrate)
+		clockrate = 8000;
+
+	notify = bencode_dictionary(&bencbuf);
+	bencode_dictionary_add_string(notify, "notify", "onDTMF");
+	data = bencode_dictionary_add_dictionary(notify, "data");
+	tags = bencode_dictionary_add_list(data, "tags");
+
+	bencode_dictionary_add_string_len(data, "callid", mp->call->callid.s, mp->call->callid.len);
+	bencode_dictionary_add_string_len(data, "source_tag", mp->media->monologue->tag.s, mp->media->monologue->tag.len);
+
+	GList *tag_values = g_hash_table_get_values(mp->call->tags);
+	for (GList *tag_it = tag_values; tag_it; tag_it = tag_it->next) {
+		struct call_monologue *ml = tag_it->data;
+		bencode_list_add_str(tags, &ml->tag);
+	}
+	g_list_free(tag_values);
+
+	bencode_dictionary_add_string(data, "type", "DTMF");
+	bencode_dictionary_add_string(data, "source_ip", sockaddr_print_buf(&mp->fsin.address));
+	bencode_dictionary_add_integer(data, "timestamp", rtpe_now.tv_sec);
+	bencode_dictionary_add_integer(data, "event", dtmf->event);
+	bencode_dictionary_add_integer(data, "duration", (ntohs(dtmf->duration) * (1000000 / clockrate)) / 1000);
+	bencode_dictionary_add_integer(data, "volume", dtmf->volume);
+
+	bencode_collapse_str(notify, &encoded_data);
+	bencode_buffer_free(&bencbuf);
+	notify_ng_tcp_clients(&encoded_data);
+}
 
 static GString *dtmf_json_print(struct media_packet *mp,
 		struct telephone_event_payload *dtmf, int clockrate)
@@ -64,7 +105,7 @@ static GString *dtmf_json_print(struct media_packet *mp,
 }
 
 int dtmf_do_logging(void) {
-	if (_log_facility_dtmf || dtmf_log_sock.family)
+	if (_log_facility_dtmf || dtmf_log_sock.family || rtpe_config.dtmf_via_ng)
 		return 1;
 	return 0;
 }
@@ -92,6 +133,8 @@ int dtmf_event(struct media_packet *mp, str *payload, int clockrate) {
 			dtmflog(buf);
 		if (dtmf_log_sock.family)
 			send(dtmf_log_sock.fd, buf->str, buf->len, 0);
+		if (rtpe_config.dtmf_via_ng)
+			dtmf_bencode_and_notify(mp, dtmf, clockrate);
 		g_string_free(buf, TRUE);
 
 		ret = 1; // END event

daemon/main.c

@@ -379,6 +379,7 @@ static void options(int *argc, char ***argv) {
 	AUTO_CLEANUP_GBUF(log_facility_dtmf_s);
 	AUTO_CLEANUP_GBUF(log_format);
 	int sip_source = 0;
+	int log_dtmf_via_ng = 0;
 	AUTO_CLEANUP_GBUF(homerp);
 	AUTO_CLEANUP_GBUF(homerproto);
 	char *endptr;
@@ -431,6 +432,7 @@ static void options(int *argc, char ***argv) {
 #ifdef WITH_TRANSCODING
 		{ "log-facility-dtmf",0,  0, G_OPTION_ARG_STRING, &log_facility_dtmf_s, "Syslog facility to use for logging DTMF", "daemon|local0|...|local7"},
 		{ "dtmf-log-dest", 0,0,	G_OPTION_ARG_STRING,	&dtmf_udp_ep,	"Destination address for DTMF logging via UDP",	"IP46|HOSTNAME:PORT"	},
+		{ "dtmf-log-ng-tcp", 0,0,	G_OPTION_ARG_NONE,	&log_dtmf_via_ng,	"DTMF logging via TCP NG protocol",	NULL },
 #endif
 		{ "log-format",	0, 0,	G_OPTION_ARG_STRING,	&log_format,	"Log prefix format",		"default|parsable"},
 		{ "xmlrpc-format",'x', 0, G_OPTION_ARG_INT,	&rtpe_config.fmt,	"XMLRPC timeout request format to use. 0: SEMS DI, 1: call-id only, 2: Kamailio",	"INT"	},
@@ -655,6 +657,9 @@ static void options(int *argc, char ***argv) {
 	if (!sip_source)
 		trust_address_def = 1;
 
+	if (log_dtmf_via_ng)
+		rtpe_config.dtmf_via_ng = 1;
+
 	rtpe_config.cpu_limit = max_cpu * 100;
 	rtpe_config.load_limit = max_load * 100;
 

include/main.h

@@ -96,6 +96,7 @@ struct rtpengine_config {
 	char			*mysql_pass;
 	char			*mysql_query;
 	endpoint_t		dtmf_udp_ep;
+	int			dtmf_via_ng;
 	enum endpoint_learning	endpoint_learning;
 	int                     jb_length;
 	int                     jb_clock_drift;