<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9214">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nat: Add jitter buffer on the uplink receiver<br><br>Default usage values are defined in mgcp node, and can be per-BSC<br>overriden on each bsc node.<br><br>This commit is a forward-port of openbsc.git Change-Id<br>Ibf3932adc07442fb5e9c7a06404853f9d0a20959.<br><br>Depends on osmo-mgw.git Change-Id Ie19a64ac09f9d51f2434ad0d7925610fc919a90e.<br><br>Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93<br>---<br>M include/osmocom/bsc/bsc_nat.h<br>M src/osmo-bsc_nat/bsc_mgcp_utils.c<br>M src/osmo-bsc_nat/bsc_nat_vty.c<br>3 files changed, 96 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/9214/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_nat.h b/include/osmocom/bsc/bsc_nat.h</span><br><span>index 6146c00..bd78b9d 100644</span><br><span>--- a/include/osmocom/bsc/bsc_nat.h</span><br><span>+++ b/include/osmocom/bsc/bsc_nat.h</span><br><span>@@ -175,6 +175,16 @@</span><br><span> </span><br><span> /* Osmux is enabled/disabled per BSC */</span><br><span> int osmux;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Use a jitterbuffer on the bts-side receiver */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool bts_use_jibuf;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Minimum and maximum buffer size for the jitter buffer, in ms */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t bts_jitter_delay_min;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t bts_jitter_delay_max;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Enabled if explicitly configured through VTY: */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool bts_use_jibuf_override;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool bts_jitter_delay_min_override;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool bts_jitter_delay_max_override;</span><br><span> };</span><br><span> </span><br><span> struct bsc_lac_entry {</span><br><span>diff --git a/src/osmo-bsc_nat/bsc_mgcp_utils.c b/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>index bf6d0ad..ab06a5e 100644</span><br><span>--- a/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>+++ b/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>@@ -585,6 +585,17 @@</span><br><span> if (state == MGCP_ENDP_CRCX) {</span><br><span> struct sockaddr_in sock;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* set up jitter buffer parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc_endp->bsc->cfg->bts_use_jibuf_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp->bts_use_jibuf = bsc_endp->bsc->cfg->bts_use_jibuf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc_endp->bsc->cfg->bts_jitter_delay_min_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp->bts_jitter_delay_min = bsc_endp->bsc->cfg->bts_jitter_delay_min;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc_endp->bsc->cfg->bts_jitter_delay_max_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp->bts_jitter_delay_max = bsc_endp->bsc->cfg->bts_jitter_delay_max;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Annotate the allocated Osmux CID until the bsc confirms that</span><br><span> * it agrees to use Osmux for this voice flow.</span><br><span> */</span><br><span>diff --git a/src/osmo-bsc_nat/bsc_nat_vty.c b/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>index 64608bd..5d8d0c7 100644</span><br><span>--- a/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>+++ b/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>@@ -173,6 +173,12 @@</span><br><span> vty_out(vty, " osmux only%s", VTY_NEWLINE);</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->bts_use_jibuf_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->bts_jitter_delay_min_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->bts_jitter_delay_max_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> static int config_write_bsc(struct vty *vty)</span><br><span>@@ -1231,6 +1237,71 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define DEJITTER_STR "Uplink Jitter Buffer"</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bsc_bts_use_jibuf,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bsc_bts_use_jibuf_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts-jitter-buffer",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEJITTER_STR "\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_config *conf = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_use_jibuf = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_use_jibuf_override = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bsc_no_bts_use_jibuf,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bsc_no_bts_use_jibuf_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no bts-jitter-buffer",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR DEJITTER_STR "\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_config *conf = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_use_jibuf = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_use_jibuf_override = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bsc_bts_jitter_delay_min,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bsc_bts_jitter_delay_min_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts-jitter-buffer-delay-min <1-65535>",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEJITTER_STR " Minimum Delay in ms\n" "Minimum Delay in ms\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_config *conf = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_jitter_delay_min = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conf->bts_jitter_delay_min) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "bts-jitter-buffer-delay-min cannot be zero.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max &&</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "bts-jitter-buffer-delay-min cannot be bigger than " \</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts-jitter-buffer-delay-max.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_jitter_delay_min_override = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_bsc_bts_jitter_delay_max,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bsc_bts_jitter_delay_max_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts-jitter-buffer-delay-max <1-65535>",</span><br><span style="color: hsl(120, 100%, 40%);">+ DEJITTER_STR " Maximum Delay in ms\n" "Maximum Delay in ms\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_config *conf = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_jitter_delay_max = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conf->bts_jitter_delay_max) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "bts-jitter-buffer-delay-max cannot be zero.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max &&</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "bts-jitter-buffer-delay-max cannot be smaller than " \</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts-jitter-buffer-delay-min.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ conf->bts_jitter_delay_max_override = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int bsc_nat_vty_init(struct bsc_nat *nat)</span><br><span> {</span><br><span> _nat = nat;</span><br><span>@@ -1318,6 +1389,10 @@</span><br><span> install_element(NAT_BSC_NODE, &cfg_bsc_paging_grp_cmd);</span><br><span> install_element(NAT_BSC_NODE, &cfg_bsc_no_paging_grp_cmd);</span><br><span> install_element(NAT_BSC_NODE, &cfg_bsc_osmux_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(NAT_BSC_NODE, &cfg_bsc_bts_use_jibuf_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(NAT_BSC_NODE, &cfg_bsc_no_bts_use_jibuf_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_min_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_max_cmd);</span><br><span> </span><br><span> mgcp_vty_init();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9214">change 9214</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9214"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 </div>
<div style="display:none"> Gerrit-Change-Number: 9214 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>