cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

nat: Add jitter buffer on the uplink receiver 

Default usage values are defined in mgcp node, and can be per-BSC
overriden on each bsc node.

This commit is a forward-port of openbsc.git Change-Id
Ibf3932adc07442fb5e9c7a06404853f9d0a20959.

Depends on osmo-mgw.git Change-Id Ie19a64ac09f9d51f2434ad0d7925610fc919a90e.

Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93
This commit is contained in:
Pau Espin 2018-05-16 14:06:46 +02:00 committed by Harald Welte
parent 7926d98509
commit 20388b781d
3 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/osmocom/bsc/bsc_nat.h
View File

@ -175,6 +175,16 @@ struct bsc_config {
/* Osmux is enabled/disabled per BSC */
int osmux;
/* Use a jitterbuffer on the bts-side receiver */
bool bts_use_jibuf;
/* Minimum and maximum buffer size for the jitter buffer, in ms */
uint32_t bts_jitter_delay_min;
uint32_t bts_jitter_delay_max;
/* Enabled if explicitly configured through VTY: */
bool bts_use_jibuf_override;
bool bts_jitter_delay_min_override;
bool bts_jitter_delay_max_override;
};
struct bsc_lac_entry {

11
src/osmo-bsc_nat/bsc_mgcp_utils.c
View File

@ -585,6 +585,17 @@ static int bsc_mgcp_policy_cb(struct mgcp_trunk_config *tcfg, int endpoint, int
if (state == MGCP_ENDP_CRCX) {
struct sockaddr_in sock;
/* set up jitter buffer parameters */
if (bsc_endp->bsc->cfg->bts_use_jibuf_override)
mgcp_endp->bts_use_jibuf = bsc_endp->bsc->cfg->bts_use_jibuf;
if (bsc_endp->bsc->cfg->bts_jitter_delay_min_override)
mgcp_endp->bts_jitter_delay_min = bsc_endp->bsc->cfg->bts_jitter_delay_min;
if (bsc_endp->bsc->cfg->bts_jitter_delay_max_override)
mgcp_endp->bts_jitter_delay_max = bsc_endp->bsc->cfg->bts_jitter_delay_max;
/* Annotate the allocated Osmux CID until the bsc confirms that
* it agrees to use Osmux for this voice flow.
*/

75
src/osmo-bsc_nat/bsc_nat_vty.c
View File

@ -173,6 +173,12 @@ static void config_write_bsc_single(struct vty *vty, struct bsc_config *bsc)
vty_out(vty, " osmux only%s", VTY_NEWLINE);
break;
}
if (bsc->bts_use_jibuf_override)
vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE);
if (bsc->bts_jitter_delay_min_override)
vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE);
if (bsc->bts_jitter_delay_max_override)
vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE);
}
static int config_write_bsc(struct vty *vty)
@ -1231,6 +1237,71 @@ DEFUN(cfg_bsc_osmux,
return CMD_SUCCESS;
}
#define DEJITTER_STR "Uplink Jitter Buffer"
DEFUN(cfg_bsc_bts_use_jibuf,
cfg_bsc_bts_use_jibuf_cmd,
"bts-jitter-buffer",
DEJITTER_STR "\n")
{
struct bsc_config *conf = vty->index;
conf->bts_use_jibuf = true;
conf->bts_use_jibuf_override = true;
return CMD_SUCCESS;
}
DEFUN(cfg_bsc_no_bts_use_jibuf,
cfg_bsc_no_bts_use_jibuf_cmd,
"no bts-jitter-buffer",
NO_STR DEJITTER_STR "\n")
{
struct bsc_config *conf = vty->index;
conf->bts_use_jibuf = false;
conf->bts_use_jibuf_override = true;
return CMD_SUCCESS;
}
DEFUN(cfg_bsc_bts_jitter_delay_min,
cfg_bsc_bts_jitter_delay_min_cmd,
"bts-jitter-buffer-delay-min <1-65535>",
DEJITTER_STR " Minimum Delay in ms\n" "Minimum Delay in ms\n")
{
struct bsc_config *conf = vty->index;
conf->bts_jitter_delay_min = atoi(argv[0]);
if (!conf->bts_jitter_delay_min) {
vty_out(vty, "bts-jitter-buffer-delay-min cannot be zero.%s", VTY_NEWLINE);
return CMD_WARNING;
}
if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max &&
conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) {
vty_out(vty, "bts-jitter-buffer-delay-min cannot be bigger than " \
"bts-jitter-buffer-delay-max.%s", VTY_NEWLINE);
return CMD_WARNING;
}
conf->bts_jitter_delay_min_override = true;
return CMD_SUCCESS;
}
DEFUN(cfg_bsc_bts_jitter_delay_max,
cfg_bsc_bts_jitter_delay_max_cmd,
"bts-jitter-buffer-delay-max <1-65535>",
DEJITTER_STR " Maximum Delay in ms\n" "Maximum Delay in ms\n")
{
struct bsc_config *conf = vty->index;
conf->bts_jitter_delay_max = atoi(argv[0]);
if (!conf->bts_jitter_delay_max) {
vty_out(vty, "bts-jitter-buffer-delay-max cannot be zero.%s", VTY_NEWLINE);
return CMD_WARNING;
}
if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max &&
conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) {
vty_out(vty, "bts-jitter-buffer-delay-max cannot be smaller than " \
"bts-jitter-buffer-delay-min.%s", VTY_NEWLINE);
return CMD_WARNING;
}
conf->bts_jitter_delay_max_override = true;
return CMD_SUCCESS;
}
int bsc_nat_vty_init(struct bsc_nat *nat)
{
_nat = nat;
@ -1318,6 +1389,10 @@ int bsc_nat_vty_init(struct bsc_nat *nat)
install_element(NAT_BSC_NODE, &cfg_bsc_paging_grp_cmd);
install_element(NAT_BSC_NODE, &cfg_bsc_no_paging_grp_cmd);
install_element(NAT_BSC_NODE, &cfg_bsc_osmux_cmd);
install_element(NAT_BSC_NODE, &cfg_bsc_bts_use_jibuf_cmd);
install_element(NAT_BSC_NODE, &cfg_bsc_no_bts_use_jibuf_cmd);
install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_min_cmd);
install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_max_cmd);
mgcp_vty_init();