October 2023 - gerrit-log - lists.osmocom.org

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
by laforge 30 Oct '23

30 Oct '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:39:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-hnodeb[master]: tests: enable commented-out 'python-tests' target
by fixeria 30 Oct '23

30 Oct '23

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/32146?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: tests: enable commented-out 'python-tests' target ...................................................................... tests: enable commented-out 'python-tests' target Change-Id: I76e24184aecafa8460d1da9419a424d9990730c5 Related: OS#5989 --- M tests/Makefile.am 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/46/32146/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/32146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I76e24184aecafa8460d1da9419a424d9990730c5 Gerrit-Change-Number: 32146 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-hnodeb[master]: vty: fix incomplete docs for 'asn-debug' command
by fixeria 30 Oct '23

30 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/34918?usp=email ) Change subject: vty: fix incomplete docs for 'asn-debug' command ...................................................................... vty: fix incomplete docs for 'asn-debug' command Change-Id: I7174e1833be206a62afd95ddc27e9d912a7efcfc Related: OS#5989 --- M src/osmo-hnodeb/vty.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/18/34918/1 diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index 898c326..5b55613 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -343,7 +343,10 @@ DEFUN(asn_dbg, asn_dbg_cmd, - "asn-debug (1|0)", "Enable or disable libasn1c debugging") + "asn-debug (1|0)", + "Enable or disable libasn1c debugging\n" + "Enable libasn1c debugging\n" + "Disable libasn1c debugging\n") { asn_debug = atoi(argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/34918?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I7174e1833be206a62afd95ddc27e9d912a7efcfc Gerrit-Change-Number: 34918 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants
by laforge 30 Oct '23

30 Oct '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email ) Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:38:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
by fixeria 30 Oct '23

30 Oct '23

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, jolly, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: mobile: add support for Circuit Switched Data calls ...................................................................... mobile: add support for Circuit Switched Data calls This patch implements the signalling part for mobile originating and mobile terminating CSD calls. The user plane interface is to be implemented in follow-up patches. Change-Id: I1995fa0a7a68d9b980852b664d472d4633777ac6 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/common/support.h M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/support.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 8 files changed, 534 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/34762/6 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?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: I1995fa0a7a68d9b980852b664d472d4633777ac6 Gerrit-Change-Number: 34762 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
by fixeria 30 Oct '23

30 Oct '23

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34762?usp=email ) Change subject: mobile: add support for Circuit Switched Data calls ...................................................................... Patch Set 5: (1 comment) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34762/comment/f555d4e3_c3fb0849 PS4, Line 634: trans-cap (udi|3100khz-audio|facsimile) > The transfer capability must be defined (generated) while doing the outgoing call (speech/fax/data), […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?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: I1995fa0a7a68d9b980852b664d472d4633777ac6 Gerrit-Change-Number: 34762 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:14:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: comment

1 0

[L] Change in osmocom-bb[master]: mobile: add support for Circuit Switched Data calls
by fixeria 30 Oct '23

30 Oct '23

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34762?usp=email ) Change subject: mobile: add support for Circuit Switched Data calls ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34762?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: I1995fa0a7a68d9b980852b664d472d4633777ac6 Gerrit-Change-Number: 34762 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 30 Oct 2023 08:14:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: mobile: gsm_settings_init(): set TCH frame format explicitly
by fixeria 30 Oct '23

30 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34914?usp=email ) Change subject: mobile: gsm_settings_init(): set TCH frame format explicitly ...................................................................... mobile: gsm_settings_init(): set TCH frame format explicitly Change-Id: I4660b07977b6701ad5dc4bf25f12cba374101f8b Related: OS#4396 --- M src/host/layer23/src/common/settings.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/34914/1 diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 348986b..bfca1d5 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -48,6 +48,8 @@ snprintf(set->mncc_socket_path, sizeof(set->mncc_socket_path) - 1, "%s_%s", mncc_socket_path, ms->name); + /* TCH frame format: the one used by trxcon and virtphy */ + set->tch.frame_format = TCH_IOFF_OSMO; /* TCH voice: drop frames by default */ set->tch.voice_handler = TCH_VOICE_IOH_NONE; OSMO_STRLCPY_ARRAY(set->tch.alsa_output_dev, alsa_dev_default); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34914?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: I4660b07977b6701ad5dc4bf25f12cba374101f8b Gerrit-Change-Number: 34914 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}()
by fixeria 30 Oct '23

30 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34916?usp=email ) Change subject: mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}() ...................................................................... mobile: cosmetic: rename gsm48_rr_tx_{voice->traffic}() Not only this function can be used to transmit a voice frame, but also a data frame during a CSD call. Change-Id: I920300ae477e3c3d7c413cd1a35f2bc385266960 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/voice.c 3 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/34916/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index 16f7fb3..112e85a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h @@ -251,7 +251,7 @@ int gsm48_rr_start_monitor(struct osmocom_ms *ms); int gsm48_rr_stop_monitor(struct osmocom_ms *ms); int gsm48_rr_alter_delay(struct osmocom_ms *ms); -int gsm48_rr_tx_voice(struct osmocom_ms *ms, struct msgb *msg); +int gsm48_rr_tx_traffic(struct osmocom_ms *ms, struct msgb *msg); int gsm48_rr_audio_mode(struct osmocom_ms *ms, uint8_t mode); #endif /* _GSM48_RR_H */ diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index b4eac3c..cb317b9 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -7123,7 +7123,7 @@ #endif -int gsm48_rr_tx_voice(struct osmocom_ms *ms, struct msgb *msg) +int gsm48_rr_tx_traffic(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_rrlayer *rr = &ms->rrlayer; uint8_t ch_type, ch_subch, ch_ts; diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index b838576..b80d6a4 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -106,7 +106,7 @@ int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) { /* Forward to RR */ - return gsm48_rr_tx_voice(ms, msg); + return gsm48_rr_tx_traffic(ms, msg); } /* gsm_send_voice_msg() wrapper accepting an MNCC structure */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34916?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: I920300ae477e3c3d7c413cd1a35f2bc385266960 Gerrit-Change-Number: 34916 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: mobile: add params and VTY commands for data calls
by fixeria 30 Oct '23

30 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34915?usp=email ) Change subject: mobile: add params and VTY commands for data calls ...................................................................... mobile: add params and VTY commands for data calls Change-Id: If52fa70cb202f0736a17fe8eb63d226186637f62 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 115 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/34915/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 6cec54b..13b1e2b 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -44,6 +44,20 @@ static inline const char *tch_voice_io_handler_name(enum tch_voice_io_handler val) { return get_value_string(tch_voice_io_handler_names, val); } +/* TCH I/O handler for data calls */ +enum tch_data_io_handler { + /* No handler, drop frames */ + TCH_DATA_IOH_NONE = 0, + /* UNIX socket */ + TCH_DATA_IOH_UNIX_SOCK, + /* Return to sender */ + TCH_DATA_IOH_LOOPBACK, +}; + +extern const struct value_string tch_data_io_handler_names[]; +static inline const char *tch_data_io_handler_name(enum tch_data_io_handler val) +{ return get_value_string(tch_data_io_handler_names, val); } + /* TCH I/O frame format */ enum tch_io_frame_format { /* RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR, packed bits for data */ @@ -58,9 +72,15 @@ struct tch_settings { enum tch_voice_io_handler voice_handler; + enum tch_data_io_handler data_handler; enum tch_io_frame_format frame_format; + + /* voice related parameters */ char alsa_output_dev[128]; char alsa_input_dev[128]; + + /* data related parameters */ + char data_socket_path[128]; }; struct test_sim_settings { diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index bfca1d5..9d1fd78 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -34,6 +34,7 @@ static char *sap_socket_path = "/tmp/osmocom_sap"; static char *mncc_socket_path = "/tmp/ms_mncc"; +static char *data_socket_path = "/tmp/ms_data"; static char *alsa_dev_default = "default"; int gsm_settings_init(struct osmocom_ms *ms) @@ -52,8 +53,13 @@ set->tch.frame_format = TCH_IOFF_OSMO; /* TCH voice: drop frames by default */ set->tch.voice_handler = TCH_VOICE_IOH_NONE; + /* TCH data: drop frames by default */ + set->tch.data_handler = TCH_DATA_IOH_NONE; OSMO_STRLCPY_ARRAY(set->tch.alsa_output_dev, alsa_dev_default); OSMO_STRLCPY_ARRAY(set->tch.alsa_input_dev, alsa_dev_default); + /* Compose data (CSD) socket path using MS name */ + snprintf(set->tch.data_socket_path, sizeof(set->tch.data_socket_path) - 1, + "%s_%s", data_socket_path, ms->name); /* Built-in MNCC handler */ set->mncc_handler = MNCC_HANDLER_INTERNAL; @@ -237,6 +243,13 @@ { 0, NULL } }; +const struct value_string tch_data_io_handler_names[] = { + { TCH_DATA_IOH_NONE, "none" }, + { TCH_DATA_IOH_UNIX_SOCK, "unix-sock" }, + { TCH_DATA_IOH_LOOPBACK, "loopback" }, + { 0, NULL } +}; + const struct value_string tch_io_frame_format_names[] = { { TCH_IOFF_OSMO, "osmo" }, { TCH_IOFF_OSMO, "rtp" }, /* for compatibility */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 8acc148..3cc3586 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1478,14 +1478,20 @@ vty_out(vty, " tch%s", VTY_NEWLINE); vty_out(vty, " voice-io-handler %s%s", tch_voice_io_handler_name(set->tch.voice_handler), VTY_NEWLINE); + vty_out(vty, " data-io-handler %s%s", + tch_data_io_handler_name(set->tch.data_handler), VTY_NEWLINE); + vty_out(vty, " io-tch-format %s%s", + tch_io_frame_format_name(set->tch.frame_format), VTY_NEWLINE); if (set->tch.voice_handler == TCH_VOICE_IOH_GAPK) { - vty_out(vty, " io-tch-format %s%s", - tch_io_frame_format_name(set->tch.frame_format), VTY_NEWLINE); vty_out(vty, " alsa-output-dev %s%s", set->tch.alsa_output_dev, VTY_NEWLINE); vty_out(vty, " alsa-input-dev %s%s", set->tch.alsa_input_dev, VTY_NEWLINE); } + if (set->tch.data_handler == TCH_DATA_IOH_UNIX_SOCK) { + vty_out(vty, " data-unix-socket %s%s", + set->tch.data_socket_path, VTY_NEWLINE); + } if (ms->lua_script) vty_out(vty, " lua-script %s%s", ms->lua_script, VTY_NEWLINE); @@ -2508,6 +2514,22 @@ return CMD_SUCCESS; } +static int set_data_io_handler(struct vty *vty, enum tch_data_io_handler val) +{ + struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; + struct gsm_settings *set = &ms->settings; + + /* Don't restart on unchanged value */ + if (val == set->tch.data_handler) + return CMD_SUCCESS; + set->tch.data_handler = val; + + /* Restart required */ + vty_restart_if_started(vty, ms); + + return CMD_SUCCESS; +} + #define TCH_VOICE_IOH_SEL \ "(none|gapk|l1phy|mncc-sock|loopback)" #define TCH_VOICE_IOH_SEL_DESC \ @@ -2517,6 +2539,13 @@ "External MNCC application (e.g. LCR) via MNCC socket\n" \ "Return TCH frame payload back to sender\n" +#define TCH_DATA_IOH_SEL \ + "(none|unix-sock|loopback)" +#define TCH_DATA_IOH_SEL_DESC \ + "No handler, drop TCH frames (default)\n" \ + "UNIX socket (path set by 'data-unix-socket')\n" \ + "Return TCH frame payload back to sender\n" + DEFUN(cfg_ms_tch_voice_io_handler, cfg_ms_tch_voice_io_handler_cmd, "voice-io-handler " TCH_VOICE_IOH_SEL, @@ -2544,10 +2573,16 @@ return set_voice_io_handler(vty, val); } -ALIAS_DEPRECATED(cfg_ms_tch_voice_io_handler, - cfg_ms_tch_io_handler_cmd, - "io-handler " TCH_VOICE_IOH_SEL, - "Set TCH I/O handler for voice calls\n" TCH_VOICE_IOH_SEL_DESC); +DEFUN(cfg_ms_tch_data_io_handler, + cfg_ms_tch_data_io_handler_cmd, + "data-io-handler " TCH_DATA_IOH_SEL, + "Set TCH I/O handler for data calls\n" + TCH_DATA_IOH_SEL_DESC) +{ + int val = get_string_value(tch_data_io_handler_names, argv[0]); + + return set_data_io_handler(vty, val); +} DEFUN(cfg_ms_tch_no_voice_io_handler, cfg_ms_tch_no_voice_io_handler_cmd, @@ -2557,6 +2592,19 @@ return set_voice_io_handler(vty, TCH_VOICE_IOH_NONE); } +DEFUN(cfg_ms_tch_no_data_io_handler, + cfg_ms_tch_no_data_io_handler_cmd, + "no data-io-handler", + NO_STR "Disable TCH I/O handling for data calls\n") +{ + return set_data_io_handler(vty, TCH_DATA_IOH_NONE); +} + +ALIAS_DEPRECATED(cfg_ms_tch_voice_io_handler, + cfg_ms_tch_io_handler_cmd, + "io-handler " TCH_VOICE_IOH_SEL, + "Set TCH I/O handler for voice calls\n" TCH_VOICE_IOH_SEL_DESC); + ALIAS_DEPRECATED(cfg_ms_tch_no_voice_io_handler, cfg_ms_tch_no_io_handler_cmd, "no io-handler", @@ -2564,7 +2612,7 @@ DEFUN(cfg_ms_tch_io_tch_format, cfg_ms_tch_io_tch_format_cmd, "io-tch-format (osmo|rtp|ti)", - "Set TCH I/O frame format used by the L1 PHY (for GAPK only)\n" + "Set TCH I/O frame format used by the L1 PHY\n" "Osmocom format (RFC3551 for FR/EFR, RFC5993 for HR, RFC4867 for AMR)\n" "(same as 'osmo', kept for backwards-compatibility)\n" "Texas Instruments format, used by Calypso based phones (e.g. Motorola C1xx)\n") @@ -2573,11 +2621,6 @@ struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; struct gsm_settings *set = &ms->settings; - if (set->tch.voice_handler != TCH_VOICE_IOH_GAPK) { - vty_out(vty, "This parameter is only valid for GAPK%s", VTY_NEWLINE); - return CMD_WARNING; - } - OSMO_ASSERT(val >= 0); set->tch.frame_format = val; @@ -2612,6 +2655,20 @@ return CMD_SUCCESS; } +DEFUN(cfg_ms_tch_data_sock, + cfg_ms_tch_data_sock_cmd, + "data-unix-socket PATH", + "Define UNIX socket path (for 'data-io-handler unix-sock')\n" + "UNIX socket path (default '/tmp/ms_data_' + MS_NAME)\n") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + OSMO_STRLCPY_ARRAY(set->tch.data_socket_path, argv[0]); + + return CMD_SUCCESS; +} + DEFUN(cfg_ms_script_load_run, cfg_ms_script_load_run_cmd, "lua-script FILENAME", "Load and execute a LUA script\nFilename for lua script") { @@ -2871,12 +2928,15 @@ install_node(&tch_node, config_write_dummy); install_element(TCH_NODE, &cfg_ms_tch_voice_io_handler_cmd); + install_element(TCH_NODE, &cfg_ms_tch_data_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_no_voice_io_handler_cmd); + install_element(TCH_NODE, &cfg_ms_tch_no_data_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_no_io_handler_cmd); install_element(TCH_NODE, &cfg_ms_tch_io_tch_format_cmd); install_element(TCH_NODE, &cfg_ms_tch_alsa_out_dev_cmd); install_element(TCH_NODE, &cfg_ms_tch_alsa_in_dev_cmd); + install_element(TCH_NODE, &cfg_ms_tch_data_sock_cmd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34915?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: If52fa70cb202f0736a17fe8eb63d226186637f62 Gerrit-Change-Number: 34915 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0