<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13925">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bssap: Parse Osmux CID on ASSIG REQ recv<br><br>Change-Id: I86e7e13fc7921e3209fb764c0e7797e7ec09b79e<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>2 files changed, 31 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/25/13925/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index dc686c3..68c95e1 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -33,6 +33,7 @@</span><br><span> #include <osmocom/bsc/bsc_msg_filter.h></span><br><span> #include <osmocom/bsc/acc_ramp.h></span><br><span> #include <osmocom/bsc/neighbor_ident.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/osmux.h></span><br><span> </span><br><span> #define GSM_T3122_DEFAULT 10</span><br><span> </span><br><span>@@ -120,6 +121,8 @@</span><br><span> </span><br><span> char msc_rtp_addr[INET_ADDRSTRLEN];</span><br><span> uint16_t msc_rtp_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool use_osmux;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t osmux_cid;</span><br><span> </span><br><span> /* Rate/codec setting in preference order (need at least 1 !) */</span><br><span> int n_ch_mode_rate;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 014a9b8..9bbd5e4 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -780,6 +780,8 @@</span><br><span> struct tlv_parsed tp;</span><br><span> uint16_t cic = 0;</span><br><span> bool aoip = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool use_osmux = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t osmux_cid = 0;</span><br><span> struct sockaddr_storage rtp_addr;</span><br><span> struct gsm0808_channel_type ct;</span><br><span> uint8_t cause;</span><br><span>@@ -857,6 +859,30 @@</span><br><span> goto reject;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRESENT(&tp, GSM0808_IE_OSMO_OSMUX_CID)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->sccp.msc->use_osmux == OSMUX_USAGE_OFF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "MSC using Osmux but we have it disabled.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ cause = GSM0808_CAUSE_INCORRECT_VALUE;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto reject;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ use_osmux = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm0808_dec_osmux_cid(&osmux_cid,</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_VAL(&tp, GSM0808_IE_OSMO_OSMUX_CID),</span><br><span style="color: hsl(120, 100%, 40%);">+ TLVP_LEN(&tp, GSM0808_IE_OSMO_OSMUX_CID));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Unable to decode Osmux CID.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ cause = GSM0808_CAUSE_INCORRECT_VALUE;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto reject;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->sccp.msc->use_osmux == OSMUX_USAGE_ONLY) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "MSC not using Osmux but we are forced to use it.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ cause = GSM0808_CAUSE_INCORRECT_VALUE;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto reject;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (conn->sccp.msc->use_osmux == OSMUX_USAGE_ON)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_NOTICE, "MSC not using Osmux but we have Osmux enabled.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Decode speech codec list. First set len = 0. */</span><br><span> conn->codec_list = (struct gsm0808_speech_codec_list){};</span><br><span> /* Check for speech codec list element */</span><br><span>@@ -882,6 +908,8 @@</span><br><span> req = (struct assignment_request){</span><br><span> .aoip = aoip,</span><br><span> .msc_assigned_cic = cic,</span><br><span style="color: hsl(120, 100%, 40%);">+ .use_osmux = use_osmux,</span><br><span style="color: hsl(120, 100%, 40%);">+ .osmux_cid = osmux_cid,</span><br><span> };</span><br><span> </span><br><span> /* Match codec information from the assignment command against the</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13925">change 13925</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/13925"/><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: I86e7e13fc7921e3209fb764c0e7797e7ec09b79e </div>
<div style="display:none"> Gerrit-Change-Number: 13925 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>