jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email )
Change subject: ASCI: Add VTY commands to control voice group/broadcast calls
......................................................................
ASCI: Add VTY commands to control voice group/broadcast calls
Related: OS#5364
Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6
---
M src/host/layer23/include/osmocom/bb/mobile/vty.h
M src/host/layer23/src/mobile/vty_interface.c
2 files changed, 248 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/95/34495/1
diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h
b/src/host/layer23/include/osmocom/bb/mobile/vty.h
index 4ac084e..511348b 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/vty.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h
@@ -11,6 +11,8 @@
enum ms_vty_node {
SUPPORT_NODE = _LAST_L23VTY_NODE + 1,
AUDIO_NODE,
+ VGCS_NODE,
+ VBS_NODE,
};
int ms_vty_init(void);
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index feb5f84..2384e04 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -39,6 +39,7 @@
#include <osmocom/bb/mobile/app_mobile.h>
#include <osmocom/bb/mobile/gsm480_ss.h>
#include <osmocom/bb/mobile/gsm411_sms.h>
+#include <osmocom/bb/mobile/gsm44068_gcc_bcc.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/misc.h>
@@ -54,6 +55,18 @@
1
};
+struct cmd_node vgcs_node = {
+ VGCS_NODE,
+ "%s(group-call)# ",
+ 1
+};
+
+struct cmd_node vbs_node = {
+ VBS_NODE,
+ "%s(broadcast-call)# ",
+ 1
+};
+
int vty_check_number(struct vty *vty, const char *number)
{
int i;
@@ -79,6 +92,32 @@
return 0;
}
+int vty_check_callref(struct vty *vty, const char *number)
+{
+ int i, ii = strlen(number);
+
+ /* First check digits, so that a false command result the following
error message. */
+ for (i = 0; i < ii; i++) {
+ if (!(number[i] >= '0' && number[i] <= '9')) {
+ vty_out(vty, "Invalid digit '%c' in callref!%s",
+ number[i], VTY_NEWLINE);
+ return -EINVAL;
+ }
+ }
+
+ if (ii < 1) {
+ vty_out(vty, "Given callref has no digits!%s", VTY_NEWLINE);
+ return -EINVAL;
+ }
+
+ if (ii > 8) {
+ vty_out(vty, "Given callref is too long!%s", VTY_NEWLINE);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static void vty_restart(struct vty *vty, struct osmocom_ms *ms)
{
if (l23_vty_reading)
@@ -334,6 +373,21 @@
return CMD_SUCCESS;
}
+DEFUN(show_asci_calls, show_asci_calls_cmd, "show asci calls MS_NAME",
+ SHOW_STR "Display information about ASCI items\n"
+ "Display ongoing ASCI calls\nName of MS (see \"show ms\")")
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ gsm44068_dump_calls(ms, l23_vty_printf, vty);
+
+ return CMD_SUCCESS;
+}
+
DEFUN(monitor_network, monitor_network_cmd, "monitor network MS_NAME",
"Monitor...\nMonitor network information\nName of MS (see \"show ms\")")
{
@@ -583,6 +637,146 @@
return CMD_SUCCESS;
}
+#define VGCS_STR "Make a voice group call\nName of MS (see \"show ms\")\n"
+#define VGCS_CMDS "(CALLREF|hangup|leave|talk|listen)"
+#define VGCS_CMDS_TXT \
+ "Voice group to call or join\nHangup voice group call\nLeave voice group
call\nBecome talker\nBecome listener"
+
+/* This command enters VGCS call node with given MS. */
+DEFUN(vgcs_enter, vgcs_enter_cmd, "group-call MS_NAME",
+ VGCS_STR)
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ vty->index = ms;
+ vty->node = VGCS_NODE;
+
+ return CMD_SUCCESS;
+}
+
+/* These commands perform VGCS on VGCS node. */
+DEFUN(vgcs, vgcs_cmd, VGCS_CMDS,
+ VGCS_CMDS_TXT)
+{
+ struct osmocom_ms *ms = vty->index;
+ struct gsm_settings *set;
+ const char *command;
+
+ set = &ms->settings;
+
+ if (!set->vgcs) {
+ vty_out(vty, "VGCS not supported by this mobile, please enable
VGCS support%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (set->ch_cap == GSM_CAP_SDCCH) {
+ vty_out(vty, "ASCI call is not supported for SDCCH only
mobile%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ command = (char *)argv[0];
+ if (!strcmp(command, "hangup"))
+ gcc_bcc_hangup(ms);
+ else if (!strcmp(command, "leave"))
+ gcc_leave(ms);
+ else if (!strcmp(command, "talk"))
+ gcc_talk(ms);
+ else if (!strcmp(command, "listen"))
+ gcc_listen(ms);
+ else {
+ if (vty_check_callref(vty, command))
+ return CMD_WARNING;
+ gcc_bcc_call(ms, GSM48_PDISC_GROUP_CC, command);
+ }
+
+ return CMD_SUCCESS;
+}
+
+/* These commands perform VGCS on given MS without entering the VGCS node. */
+DEFUN(vgcs_direct, vgcs_direct_cmd, "group-call MS_NAME " VGCS_CMDS,
+ VGCS_STR VGCS_CMDS_TXT)
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ vty->index = ms;
+ return vgcs(self, vty, argc - 1, argv + 1);
+}
+
+#define VBS_STR "Make a voice broadcast call\nName of MS (see \"show ms\")\n"
+#define VBS_CMDS "(CALLREF|hangup)"
+#define VBS_CMDS_TXT \
+ "Voice broadcast to call or join\nHangup voice broadcast call"
+
+/* This command enters VBS call node with given MS. */
+DEFUN(vbs_enter, vbs_enter_cmd, "broadcast-call MS_NAME",
+ VBS_STR)
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ vty->index = ms;
+ vty->node = VBS_NODE;
+
+ return CMD_SUCCESS;
+}
+
+/* These commands perform VBS on VBS node. */
+DEFUN(vbs, vbs_cmd, VBS_CMDS,
+ VBS_CMDS_TXT)
+{
+ struct osmocom_ms *ms = vty->index;
+ struct gsm_settings *set;
+ const char *command;
+
+ set = &ms->settings;
+
+ if (!set->vbs) {
+ vty_out(vty, "VBS not supported by this mobile, please enable
VBS support%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (set->ch_cap == GSM_CAP_SDCCH) {
+ vty_out(vty, "ASCI call is not supported for SDCCH only
mobile%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ command = (char *)argv[0];
+ if (!strcmp(command, "hangup"))
+ gcc_bcc_hangup(ms);
+ else {
+ if (vty_check_callref(vty, command))
+ return CMD_WARNING;
+ gcc_bcc_call(ms, GSM48_PDISC_BCAST_CC, command);
+ }
+
+ return CMD_SUCCESS;
+}
+
+/* These commands perform VBS on given MS without entering the VBS node. */
+DEFUN(vbs_direct, vbs_direct_cmd, "broadcast-call MS_NAME " VBS_CMDS,
+ VBS_STR VBS_CMDS_TXT)
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ vty->index = ms;
+ return vbs(self, vty, argc - 1, argv + 1);
+}
+
#define TEST_CMD_DESC "Special commands for testing\n"
DEFUN(test_reselection, test_reselection_cmd, "test re-selection NAME",
@@ -1072,11 +1266,14 @@
if (!l23_vty_hide_default || set->skip_max_per_band)
vty_out(vty, " %sskip-max-per-band%s",
(set->skip_max_per_band) ? "" : "no ", VTY_NEWLINE);
+ SUP_WRITE(vgcs, "vgcs");
+ SUP_WRITE(vbs, "vbs");
if (!l23_vty_hide_default || set->any_timeout !=
MOB_C7_DEFLT_ANY_TIMEOUT)
vty_out(vty, " c7-any-timeout %d%s",
set->any_timeout, VTY_NEWLINE);
- SUP_WRITE(vgcs, "vgcs");
- SUP_WRITE(vbs, "vbs");
+ if (!l23_vty_hide_default || !set->uplink_release_local)
+ vty_out(vty, " %suplink-release-local%s",
+ (set->uplink_release_local) ? "no " : "", VTY_NEWLINE);
vty_out(vty, " audio%s", VTY_NEWLINE);
vty_out(vty, " io-handler %s%s",
@@ -1727,6 +1924,26 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_ms_no_uplink_release_local, cfg_ms_no_uplink_release_local_cmd, "no
uplink-release-local",
+ NO_STR "Release L2 on uplink of VGCS channel normally. Release locally
when UPLINK FREE is received.")
+{
+ struct osmocom_ms *ms = vty->index;
+ struct gsm_settings *set = &ms->settings;
+
+ set->uplink_release_local = false;
+ return CMD_SUCCESS;
+}
+
+DEFUN(cfg_ms_uplink_release_local, cfg_ms_uplink_release_local_cmd,
"uplink-release-local",
+ "Release L2 on uplink of VGCS channel locally after receiving UPLINK
FREE.")
+{
+ struct osmocom_ms *ms = vty->index;
+ struct gsm_settings *set = &ms->settings;
+
+ set->uplink_release_local = true;
+ return CMD_SUCCESS;
+}
+
static int config_write_dummy(struct vty *vty)
{
return CMD_SUCCESS;
@@ -2054,14 +2271,14 @@
return CMD_SUCCESS;
}
-SUP_EN(cfg_ms_sup_vbs, cfg_ms_sup_vbs_cmd, vbs, "vbs",
- "Voice Broadcast Service (VBS)", 0);
-SUP_DI(cfg_ms_sup_no_vbs, cfg_ms_sup_no_vbs_cmd, vbs,
- "vbs", "Voice Broadcast Service (VBS)", 0);
SUP_EN(cfg_ms_sup_vgcs, cfg_ms_sup_vgcs_cmd, vgcs, "vgcs",
"Voice Group Call Service (VGCS)", 0);
SUP_DI(cfg_ms_sup_no_vgcs, cfg_ms_sup_no_vgcs_cmd, vgcs,
"vgcs", "Voice Group Call Service (VBS)", 0);
+SUP_EN(cfg_ms_sup_vbs, cfg_ms_sup_vbs_cmd, vbs, "vbs",
+ "Voice Broadcast Service (VBS)", 0);
+SUP_DI(cfg_ms_sup_no_vbs, cfg_ms_sup_no_vbs_cmd, vbs,
+ "vbs", "Voice Broadcast Service (VBS)", 0);
/* per audio config */
DEFUN(cfg_ms_audio, cfg_ms_audio_cmd, "audio",
@@ -2265,6 +2482,7 @@
install_element_ve(&show_ba_cmd);
install_element_ve(&show_forb_la_cmd);
install_element_ve(&show_forb_plmn_cmd);
+ install_element_ve(&show_asci_calls_cmd);
install_element_ve(&monitor_network_cmd);
install_element_ve(&no_monitor_network_cmd);
install_element(ENABLE_NODE, &off_cmd);
@@ -2277,6 +2495,14 @@
install_element(ENABLE_NODE, &call_dtmf_cmd);
install_element(ENABLE_NODE, &sms_cmd);
install_element(ENABLE_NODE, &service_cmd);
+ install_element(ENABLE_NODE, &vgcs_enter_cmd);
+ install_element(ENABLE_NODE, &vgcs_direct_cmd);
+ install_node(&vgcs_node, config_write_dummy);
+ install_element(VGCS_NODE, &vgcs_cmd);
+ install_element(ENABLE_NODE, &vbs_enter_cmd);
+ install_element(ENABLE_NODE, &vbs_direct_cmd);
+ install_node(&vbs_node, config_write_dummy);
+ install_element(VBS_NODE, &vbs_cmd);
install_element(ENABLE_NODE, &test_reselection_cmd);
install_element(ENABLE_NODE, &delete_forbidden_plmn_cmd);
@@ -2335,6 +2561,8 @@
install_element(MS_NODE, &cfg_ms_any_timeout_cmd);
install_element(MS_NODE, &cfg_ms_sms_store_cmd);
install_element(MS_NODE, &cfg_ms_no_sms_store_cmd);
+ install_element(MS_NODE, &cfg_ms_uplink_release_local_cmd);
+ install_element(MS_NODE, &cfg_ms_no_uplink_release_local_cmd);
install_element(MS_NODE, &cfg_ms_support_cmd);
install_node(&support_node, config_write_dummy);
install_element(SUPPORT_NODE, &cfg_ms_sup_dtmf_cmd);
@@ -2391,10 +2619,10 @@
install_element(SUPPORT_NODE, &cfg_ms_sup_dsc_max_cmd);
install_element(SUPPORT_NODE, &cfg_ms_sup_skip_max_per_band_cmd);
install_element(SUPPORT_NODE, &cfg_ms_sup_no_skip_max_per_band_cmd);
- install_element(SUPPORT_NODE, &cfg_ms_sup_vbs_cmd);
- install_element(SUPPORT_NODE, &cfg_ms_sup_no_vbs_cmd);
install_element(SUPPORT_NODE, &cfg_ms_sup_vgcs_cmd);
install_element(SUPPORT_NODE, &cfg_ms_sup_no_vgcs_cmd);
+ install_element(SUPPORT_NODE, &cfg_ms_sup_vbs_cmd);
+ install_element(SUPPORT_NODE, &cfg_ms_sup_no_vbs_cmd);
install_element(MS_NODE, &cfg_ms_script_load_run_cmd);
install_element(MS_NODE, &cfg_ms_no_script_load_run_cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6
Gerrit-Change-Number: 34495
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andr...@eversberg.eu>
Gerrit-MessageType: newchange
