From cf0f7ca1538384c5af8acf9aef65c280a10e5b32 Mon Sep 17 00:00:00 2001
From: Grzegorz Sluja <grzegorz.sluja@sigma.se>
Date: Tue, 31 Jan 2023 11:16:21 +0100
Subject: [PATCH] Revert "Restore wrongly removed signal VOICE_SIG_ANSWER"
This reverts commit 25cc8f09afefd4da787a34018206b6d3109d010c.
---
libvoice/common.c | 1 -
libvoice/libvoice.h | 1 -
main.c | 2 +-
ubus.c | 2 +-
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/libvoice/common.c b/libvoice/common.c
index 0b8a841..1a521e7 100644
--- a/libvoice/common.c
+++ b/libvoice/common.c
@@ -72,7 +72,6 @@ const struct voice_signal_t signal_map[] = { // List of signals requested by Ast
{ .name = "dtmfC", .signal = VOICE_SIG_DTMFC },
{ .name = "dtmfD", .signal = VOICE_SIG_DTMFD },
{ .name = "keypad", .signal = VOICE_SIG_INGRESS_DTMF },
- { .name = "answer", .signal = VOICE_SIG_ANSWER },
{ .name = "", .signal = VOICE_SIG_LAST },
};
diff --git a/libvoice/libvoice.h b/libvoice/libvoice.h
index 6e3a7b9..c51bac8 100644
--- a/libvoice/libvoice.h
+++ b/libvoice/libvoice.h
@@ -89,7 +89,6 @@ enum VOICE_SIGNAL {
VOICE_SIG_DTMFC,
VOICE_SIG_DTMFD,
VOICE_SIG_INGRESS_DTMF, // Simulate phone keypad button pressing
- VOICE_SIG_ANSWER,
VOICE_SIG_LAST
};
diff --git a/main.c b/main.c
index ecf127b..44dae8e 100644
--- a/main.c
+++ b/main.c
@@ -41,7 +41,7 @@ void send_media_to_voice_engine(pe_packet_t *p) {
conIdx = voice_connection_find(packet->line, packet->connection_id);
if (conIdx == -1 || (packet->rtp[0] != 0x80 && packet->rtp[0] != 0x81) || !packet->rtp_size) {
- ENDPT_DBG("%s: bad packet: conIdx=%d, packet->rtp_size=%d, packet->rtp[0]=0x%02X\n", __func__, conIdx, packet->rtp_size, packet->rtp[0]);
+ ENDPT_DBG("%s: bad packet\n", __func__);
return;
}
diff --git a/ubus.c b/ubus.c
index 53278b7..b464ba1 100644
--- a/ubus.c
+++ b/ubus.c
@@ -710,7 +710,7 @@ static int ubus_request_rtp_stats(struct ubus_context *uctx, struct ubus_object
for(conIdx = 0; conIdx < max_num_connections && connections[conIdx].line != line; conIdx++)
continue;
if (conIdx >= max_num_connections) {
- ENDPT_DBG("%s: Error: out of connection memory %d\n", __func__);
+ ENDPT_DBG("Error: out of connection memory %d\n", line);
return UBUS_STATUS_UNKNOWN_ERROR;
}
--
GitLab