From 03004bcfdcb62f737aae9101108e704c416f9b32 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Tue, 24 Apr 2012 11:04:29 +0930
Subject: [PATCH] added vomp dtmf command line interface to inject DTMF
 characters into a call.  This will be the initial codec/audio xfer app.

---
 commandline.c |  2 ++
 serval.h      |  2 +-
 vomp.c        | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/commandline.c b/commandline.c
index 923a82db..44dea777 100644
--- a/commandline.c
+++ b/commandline.c
@@ -1108,6 +1108,8 @@ command_line_option command_line_options[]={
    "Accept specified call (use vomp status to get list of calls)"},
   {app_vomp_hangup,{"vomp","hangup","<call>",NULL},0,
    "End specified call (use vomp status to get list of calls)"},
+  {app_vomp_dtmf,{"vomp","dtmf","<call>","<digits>",NULL},0,
+   "Send DTMF digits over specified call"},
   {app_vomp_dial,{"vomp","dial","<sid>","<did>","[<callerid>]",NULL},0,
    "Attempt to dial the specified sid and did. Optionally supply the calling number"},
 #ifdef HAVE_VOIPTEST
diff --git a/serval.h b/serval.h
index ff33a098..0bbf5c34 100644
--- a/serval.h
+++ b/serval.h
@@ -1165,6 +1165,7 @@ typedef struct overlay_mdp_vompevent {
 #define VOMPEVENT_CALLCREATED (1<<9)
 #define VOMPEVENT_PICKUP (1<<10)
 #define VOMPEVENT_CALLINFO (1<<11)
+#define VOMPEVENT_AUDIOPACKET (1<<12)
   unsigned int flags;
   unsigned short audio_sample_bytes;
   unsigned char audio_sample_codec;  
@@ -1327,4 +1328,3 @@ int app_vomp_monitor(int argc, const char *const *argv, struct command_line_opti
 #ifdef HAVE_VOIPTEST
 int app_pa_phone(int argc, const char *const *argv, struct command_line_option *o);
 #endif
-
diff --git a/vomp.c b/vomp.c
index ea70ffa4..560ae433 100644
--- a/vomp.c
+++ b/vomp.c
@@ -1052,6 +1052,66 @@ int app_vomp_dial(int argc, const char *const *argv, struct command_line_option
   return overlay_mdp_client_done();
 } 
 
+int vomp_parse_dtmf_digit(char c)
+{
+  if (c>='0'&&c<='9') return c-0x30;
+  switch (c) {
+  case 'a': case 'A': return 0xa;
+  case 'b': case 'B': return 0xb;
+  case 'c': case 'C': return 0xc;
+  case 'd': case 'D': return 0xd;
+  case '*': return 0xe;
+  case '#': return 0xf;
+  }
+  return -1;
+}
+
+char vomp_dtmf_digit_to_char(int digit)
+{
+  if (digit<0) return '?';
+  if (digit<10) return '0'+digit;
+  if (digit<0xe) return 'A'+digit-0xa;
+  if (digit==0xe) return '*';
+  if (digit==0xf) return '#';
+  return '?';
+}
+
+int app_vomp_dtmf(int argc, char **argv, struct command_line_option *o)
+{
+  char *call_token;
+  char *digits;
+  cli_arg(argc, argv, o, "call", &call_token, NULL, "");
+  cli_arg(argc, argv, o, "digits", &digits,NULL,"");
+
+  overlay_mdp_frame mdp;
+  bzero(&mdp,sizeof(mdp));
+
+  mdp.packetTypeAndFlags=MDP_VOMPEVENT;
+  mdp.vompevent.flags=VOMPEVENT_AUDIOPACKET;
+  mdp.vompevent.call_session_token=strtol(call_token,NULL,16);
+
+  mdp.vompevent.audio_sample_codec=VOMP_CODEC_DTMF;
+  int i;
+  for(i=0;i<strlen(digits);i++) {
+    int digit=vomp_parse_dtmf_digit(digits[i]);
+    if (digit<0) return WHYF("'%c' is not a DTMF digit.",digits[i]);    
+    mdp.vompevent.audio_bytes[mdp.vompevent.audio_sample_bytes++]
+      =(digit<<4)+7; /* 70ms standard tone duration */
+  }
+
+  if (overlay_mdp_send(&mdp,MDP_AWAITREPLY,5000))
+    {
+      WHY("Send DTMF failed.");
+    }
+  if (mdp.packetTypeAndFlags==MDP_ERROR&&mdp.error.error)
+    fprintf(stderr,"Send DTMF failed: error=%d, message='%s'\n",
+	    mdp.error.error,mdp.error.message);
+  else
+    printf("Send DTMF accepted.\n");
+  
+  return overlay_mdp_client_done();
+} 
+
 
 int app_vomp_pickup(int argc, const char *const *argv, struct command_line_option *o)
 {