Merge pull request #147 from kmatzen/fix/issue-95-dtmf-during-call

feat(#95): Send DTMF to Baresip during active call

Author: kmatzen

host/baresip_interface.c

@@ -127,6 +127,10 @@ struct ua *baresip_call_get_ua(struct call *call) {
     return call_get_ua(call);
 }
 
+int baresip_call_send_digit(struct call *call, char key) {
+    return call_send_digit(call, key);
+}
+
 /* Event functions - thunk to bridge enum baresip_ua_event <-> enum ua_event */
 static baresip_ua_event_handler_t g_bevent_handler;
 static void *g_bevent_arg;

host/baresip_interface.h

@@ -102,6 +102,7 @@ int baresip_account_uri_complete_strdup(struct account *account, char **uri, con
 
 /* Call functions */
 struct ua *baresip_call_get_ua(struct call *call);
+int baresip_call_send_digit(struct call *call, char key);
 
 /* Event functions */
 void baresip_bevent_register(baresip_ua_event_handler_t handler, void *arg);

host/daemon.c

@@ -447,6 +447,9 @@ void handle_keypad_event(keypad_event_t *keypad_event) {
     VALIDATE_BASICS();
 
     char key = keypad_event_get_key(keypad_event);
+    int in_call = (daemon_state->current_state == DAEMON_STATE_CALL_ACTIVE ||
+                   daemon_state->current_state == DAEMON_STATE_CALL_INCOMING);
+    
     if (isdigit(key)) {
         pthread_mutex_lock(&daemon_state_mutex);
 
@@ -462,10 +465,12 @@ void handle_keypad_event(keypad_event_t *keypad_event) {
         }
         pthread_mutex_unlock(&daemon_state_mutex);
 
-        /* Let active plugin handle the keypad event */
-        if (isdigit(key)) {
-            plugins_handle_keypad(key);
-        }
+        plugins_handle_keypad(key);
+        daemon_broadcast_state("keypad");
+    } else if (in_call && (key == '*' || key == '#')) {
+        /* #95: Pass * and # to plugin for DTMF during call */
+        metrics_increment_counter("keypad_presses", 1);
+        plugins_handle_keypad(key);
         daemon_broadcast_state("keypad");
     }
 }

host/millennium_sdk.c

@@ -519,6 +519,13 @@ void millennium_client_hangup(struct millennium_client *client) {
     logger_info_with_category("SDK", "Call terminated.");
 }
 
+int millennium_client_send_dtmf(struct millennium_client *client, char key) {
+    if (!client || !client->ua) return -1;
+    struct call *call = baresip_ua_call((struct ua *)client->ua);
+    if (!call) return -1;
+    return baresip_call_send_digit(call, key);
+}
+
 void millennium_client_serial_activity(struct millennium_client *client) {
     if (!client) return;
     clock_gettime(CLOCK_MONOTONIC, &client->last_serial_activity);

host/millennium_sdk.h

@@ -84,6 +84,7 @@ void *millennium_client_next_event(struct millennium_client *client);
 void millennium_client_call(struct millennium_client *client, const char *number);
 void millennium_client_answer_call(struct millennium_client *client);
 void millennium_client_hangup(struct millennium_client *client);
+int millennium_client_send_dtmf(struct millennium_client *client, char key);
 void millennium_client_set_ua(struct millennium_client *client, void *ua);
 
 /* Internal functions */

host/plugins/classic_phone.c

@@ -72,7 +72,12 @@ static int classic_phone_handle_coin(int coin_value, const char *coin_code) {
 
 static int classic_phone_handle_keypad(char key) {
     if (classic_phone_data.is_in_call) {
-        /* In call - could handle DTMF here */
+        /* #95: Send DTMF to Baresip for IVR/voicemail navigation */
+        if (client && (isdigit((unsigned char)key) || key == '*' || key == '#')) {
+            if (millennium_client_send_dtmf(client, key) == 0) {
+                audio_tones_play_dtmf(key);  /* Local feedback */
+            }
+        }
         return 0;
     }
 

host/simulator.c

@@ -191,6 +191,12 @@ void millennium_client_hangup(millennium_client_t *c) {
     sim_hangup_called = 1;
 }
 
+int millennium_client_send_dtmf(millennium_client_t *c, char key) {
+    (void)c;
+    if (sim_call_active) fprintf(stderr, "[DTMF] %c\n", key);
+    return sim_call_active ? 0 : -1;
+}
+
 void millennium_client_set_ua(millennium_client_t *c, void *ua) {
     (void)c; (void)ua;
 }
@@ -327,8 +333,11 @@ static void sim_handle_hook(hook_state_change_event_t *ev) {
 
 static void sim_handle_keypad(keypad_event_t *ev) {
     char key;
+    int in_call;
     if (!ev || !daemon_state) return;
     key = keypad_event_get_key(ev);
+    in_call = (daemon_state->current_state == DAEMON_STATE_CALL_ACTIVE ||
+               daemon_state->current_state == DAEMON_STATE_CALL_INCOMING);
 
     if (isdigit(key) &&
         daemon_state->current_state == DAEMON_STATE_IDLE_UP &&
@@ -337,6 +346,9 @@ static void sim_handle_keypad(keypad_event_t *ev) {
         daemon_state_add_key(daemon_state, key);
         daemon_state_update_activity(daemon_state);
         plugins_handle_keypad(key);
+    } else if (in_call && (isdigit(key) || key == '*' || key == '#')) {
+        /* #95: Pass keys to plugin for DTMF during call */
+        plugins_handle_keypad(key);
     }
 }
 

host/tests/test_dtmf_during_call.scenario

@@ -0,0 +1,13 @@
+# Test: #95 DTMF during call - keys sent to Baresip for IVR/voicemail
+# When in CALL_ACTIVE, keypresses should send DTMF (simulator logs [DTMF] X)
+
+hook_up
+coin 25
+coin 25
+keys 5551234567
+call_active
+
+# Press keys during call - should trigger DTMF (no assertion; stderr shows [DTMF] 1, [DTMF] 2)
+keys 12
+
+hook_down

host/tests/unit_tests.c

@@ -24,6 +24,7 @@ void millennium_client_set_display(millennium_client_t *c, const char *m) { (voi
 void millennium_client_call(millennium_client_t *c, const char *n) { (void)c; (void)n; }
 void millennium_client_answer_call(millennium_client_t *c) { (void)c; }
 void millennium_client_hangup(millennium_client_t *c) { (void)c; }
+int millennium_client_send_dtmf(millennium_client_t *c, char key) { (void)c; (void)key; return 0; }
 void millennium_client_update(millennium_client_t *c) { (void)c; }
 void *millennium_client_next_event(millennium_client_t *c) { (void)c; return NULL; }
 void millennium_client_write_to_display(millennium_client_t *c, const char *m) { (void)c; (void)m; }