added dtmfio module

4 files changed, 161 insertions, 3 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index c205a6b..db0a5a0 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -347,3 +347,9 @@ endif
 ifneq ($(USE_X11),)
 MODULES   += x11 x11grab
 endif
+
+ifeq ($(OS),linux)
+MODULES   += dtmfio
+endif
+
+
diff --git a/modules/dtmfio/dtmfio.c b/modules/dtmfio/dtmfio.c
new file mode 100644
index 0000000..a76a486
--- /dev/null
+++ b/modules/dtmfio/dtmfio.c
@@ -0,0 +1,135 @@
+/*************************************************************************/
+/* Copyright (c) 2014, Aaron Herting 'qwertos' <aaron@herting.cc>        */
+/* Based upon code licensed under the same license by Creytiv.com        */
+/*                                                                       */
+/* All rights reserved.                                                  */
+/*                                                                       */
+/* Redistribution and use in source and binary forms, with or without    */
+/* modification, are permitted provided that the following conditions    */
+/* are met:                                                              */
+/*                                                                       */
+/* 1. Redistributions of source code must retain the above copyright     */
+/* notice, this list of conditions and the following disclaimer.         */
+/*                                                                       */
+/* 2. Redistributions in binary form must reproduce the above copyright  */
+/* notice, this list of conditions and the following disclaimer in the   */
+/* documentation and/or other materials provided with the distribution.  */
+/*                                                                       */
+/* 3. Neither the name of the copyright holder nor the names of its      */
+/* contributors may be used to endorse or promote products derived from  */
+/* this software without specific prior written permission.              */
+/*                                                                       */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   */
+/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     */
+/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR */
+/* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  */
+/* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,            */
+/* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,  */
+/* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS */
+/* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED    */
+/* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT           */
+/* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY */
+/* WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE           */
+/* POSSIBILITY OF SUCH DAMAGE.                                           */
+/*************************************************************************/
+
+
+/*
+ * # DTMFIO Module
+ *
+ * ## Description
+ *
+ * Writes received dtmf button presses to a FIFO located at /tmp/dtmf.out.
+ *
+ * Also, will write an 'E' when a call is established and an 'F' when the
+ * call is finished.
+ *
+ * ## To Do
+ *
+ * +   Proper error handling
+ * +   Using a dtmf.in file, be able to send DTMF signals
+ * +   Use a filename specified by the user in the config file
+ * +   Clean up build output so there aren't errors regarding unused vars
+ */
+
+
+
+#include <stdio.h>
+#include <re.h>
+#include <baresip.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+
+static FILE *fd;
+static const char *DTMF_OUT = "/tmp/dtmf.out";
+
+
+
+static int dtmf_handler(const struct call *call, int key, void *arg){
+	if( key != 0 ) {
+		fprintf(fd, "%c", key);
+		fflush(fd);
+	}
+	
+	return 0;
+}
+
+static void ua_event_handler(struct ua *ua,
+                             enum ua_event ev,
+                             struct call *call,
+														 const char *prm,
+														 void *arg ) {
+
+
+	if ( ev == UA_EVENT_CALL_ESTABLISHED ) {
+		fprintf(fd, "E");
+		fflush(fd);
+		call_set_handlers( call, NULL, (call_dtmf_h*) dtmf_handler, NULL);
+	}
+
+	if (ev == UA_EVENT_CALL_CLOSED ) {
+		fprintf(fd, "F");
+		fflush(fd);
+	}
+
+	return;
+}
+
+
+
+static int module_init(void){
+	
+	uag_event_register( ua_event_handler, NULL );
+	
+	if( mkfifo( DTMF_OUT, S_IWUSR | S_IRUSR ) ) {
+		error("Cration of the FIFO errored. This might cause issues.\n");
+	}
+
+	fd = fopen( DTMF_OUT , "w+" );
+
+	if( fd == 0 ){
+		error("Opening of the FIFO errored. This might cause issues.\n");
+	}
+
+	return 0;
+}
+
+
+static int module_close(void){
+	
+	fclose(fd);
+
+	unlink(DTMF_OUT);
+
+	return 0;
+}
+
+
+const struct mod_export DECL_EXPORTS(dtmfio) = {
+	"dtmfio",
+	"application",
+	module_init,
+	module_close
+};
+
diff --git a/modules/dtmfio/module.mk b/modules/dtmfio/module.mk
new file mode 100644
index 0000000..cb1264b
--- /dev/null
+++ b/modules/dtmfio/module.mk
@@ -0,0 +1,12 @@
+#
+# module.mk
+#
+# Copyright (C) 2010 Creytiv.com
+# Modified by Aaron Herting <aaron@herting.cc>
+#
+
+MOD		:= dtmfio
+$(MOD)_SRCS	+= dtmfio.c
+$(MOD)_LFLAGS	+=
+
+include mk/mod.mk
diff --git a/src/call.c b/src/call.c
index dc3edb5..3114830 100644
--- a/src/call.c
+++ b/src/call.c
@@ -1553,7 +1553,12 @@ void call_set_handlers(struct call *call, call_event_h *eh,
 	if (!call)
 		return;
 
-	call->eh    = eh;
-	call->dtmfh = dtmfh;
-	call->arg   = arg;
+	if (eh)
+		call->eh    = eh;
+
+	if (dtmfh)
+		call->dtmfh = dtmfh;
+
+	if (arg)
+		call->arg   = arg;
 }