<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24589">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: replace ns2_sns_type with address family<br><br>Reduces the code as the conversion between address family (bind)<br>and ns2_sns_type is not needed anymore.<br><br>Related: OS#5036<br>Change-Id: I1bcdd43af34c926d4b88491d00669422c299bef7<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 23 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/24589/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 0badcee..ec4bd87 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -56,11 +56,6 @@</span><br><span> </span><br><span> #define S(x) (1 << (x))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum ns2_sns_type {</span><br><span style="color: hsl(0, 100%, 40%);">- IPv4,</span><br><span style="color: hsl(0, 100%, 40%);">- IPv6,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum ns2_sns_role {</span><br><span> GPRS_SNS_ROLE_BSS,</span><br><span> GPRS_SNS_ROLE_SGSN,</span><br><span>@@ -132,7 +127,7 @@</span><br><span> struct ns2_sns_state {</span><br><span> struct gprs_ns2_nse *nse;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- enum ns2_sns_type ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ int family;</span><br><span> enum ns2_sns_role role; /* local role: BSS or SGSN */</span><br><span> </span><br><span> /* holds the list of initial SNS endpoints */</span><br><span>@@ -665,14 +660,14 @@</span><br><span> /* Upon receiving an SNS-ADD PDU, if the consequent number of IPv4 endpoints</span><br><span> * exceeds the number of IPv4 endpoints supported by the NSE, the NSE shall send</span><br><span> * an SNS-ACK PDU with a cause code set to "Invalid number of IP4 Endpoints". */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (gss->ip) {</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv4:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gss->family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span> if (gss->remote.num_ip4 >= gss->num_max_ip4_remote)</span><br><span> return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span> /* TODO: log message duplicate */</span><br><span> rc = add_ip4_elem(gss, &gss->remote, ip4);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv6:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span> if (gss->remote.num_ip6 >= gss->num_max_ip6_remote)</span><br><span> return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span> /* TODO: log message duplicate */</span><br><span>@@ -689,8 +684,8 @@</span><br><span> /* Upon receiving an SNS-ADD PDU containing an already configured IP endpoint the</span><br><span> * NSE shall send an SNS-ACK PDU with the cause code "Protocol error -</span><br><span> * unspecified" */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (gss->ip) {</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv4:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gss->family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span> nsvc = nsvc_by_ip4_elem(nse, ip4);</span><br><span> if (nsvc) {</span><br><span> /* the nsvc should be already in sync with the ip4 / ip6 elements */</span><br><span>@@ -700,7 +695,7 @@</span><br><span> /* TODO: failure case */</span><br><span> ns2_nsvc_create_ip4(fi, nse, ip4);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv6:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span> nsvc = nsvc_by_ip6_elem(nse, ip6);</span><br><span> if (nsvc) {</span><br><span> /* the nsvc should be already in sync with the ip4 / ip6 elements */</span><br><span>@@ -751,7 +746,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int ns2_sns_count_num_local_ep(struct osmo_fsm_inst *fi, enum ns2_sns_type stype)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ns2_sns_count_num_local_ep(struct osmo_fsm_inst *fi, int ip_proto)</span><br><span> {</span><br><span> struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> struct ns2_sns_bind *sbind;</span><br><span>@@ -762,12 +757,12 @@</span><br><span> if (!sa)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (stype) {</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv4:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ip_proto) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span> if (sa->u.sas.ss_family == AF_INET)</span><br><span> count++;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv6:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span> if (sa->u.sas.ss_family == AF_INET6)</span><br><span> count++;</span><br><span> break;</span><br><span>@@ -805,8 +800,8 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- switch (gss->ip) {</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv4:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gss->family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span> ip4_elems = talloc_realloc(fi, gss->local.ip4, struct gprs_ns_ie_ip4_elem, count);</span><br><span> if (!ip4_elems)</span><br><span> return;</span><br><span>@@ -840,7 +835,7 @@</span><br><span> gss->local.num_ip4 = count;</span><br><span> gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip4_remote * gss->local.num_ip4, 8);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv6:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span> /* IPv6 */</span><br><span> ip6_elems = talloc_realloc(fi, gss->local.ip6, struct gprs_ns_ie_ip6_elem, count);</span><br><span> if (!ip6_elems)</span><br><span>@@ -959,13 +954,13 @@</span><br><span> gss->N = 0;</span><br><span> </span><br><span> /* Transmit SNS-CONFIG */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (gss->ip) {</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv4:</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gss->family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span> ns2_tx_sns_config(gss->sns_nsvc, true,</span><br><span> gss->local.ip4, gss->local.num_ip4,</span><br><span> NULL, 0);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case IPv6:</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span> ns2_tx_sns_config(gss->sns_nsvc, true,</span><br><span> NULL, 0,</span><br><span> gss->local.ip6, gss->local.num_ip6);</span><br><span>@@ -1108,7 +1103,7 @@</span><br><span> */</span><br><span> </span><br><span> trans_id = *TLVP_VAL(tp, NS_IE_TRANS_ID);</span><br><span style="color: hsl(0, 100%, 40%);">- if (gss->ip == IPv4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->family == AF_INET) {</span><br><span> if (!TLVP_PRESENT(tp, NS_IE_IPv4_LIST)) {</span><br><span> cause = NS_CAUSE_INVAL_NR_IPv4_EP;</span><br><span> ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0, NULL, 0);</span><br><span>@@ -1172,7 +1167,7 @@</span><br><span> * TODO: check if IPv4_LIST/IPv6_LIST and IP_ADDR is present at the same time</span><br><span> */</span><br><span> trans_id = *TLVP_VAL(tp, NS_IE_TRANS_ID);</span><br><span style="color: hsl(0, 100%, 40%);">- if (gss->ip == IPv4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->family == AF_INET) {</span><br><span> if (TLVP_PRESENT(tp, NS_IE_IPv4_LIST)) {</span><br><span> v4_list = (const struct gprs_ns_ie_ip4_elem *) TLVP_VAL(tp, NS_IE_IPv4_LIST);</span><br><span> num_v4 = TLVP_LEN(tp, NS_IE_IPv4_LIST) / sizeof(*v4_list);</span><br><span>@@ -2246,13 +2241,13 @@</span><br><span> if (TLVP_PRES_LEN(tp, NS_IE_IPv6_EP_NR, 2))</span><br><span> gss->num_max_ip6_remote = tlvp_val16be(tp, NS_IE_IPv6_EP_NR);</span><br><span> /* decide if we go for IPv4 or IPv6 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gss->num_max_ip6_remote && ns2_sns_count_num_local_ep(fi, IPv6)) {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->ip = IPv6;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->num_max_ip6_remote && ns2_sns_count_num_local_ep(fi, AF_INET6)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->family = AF_INET6;</span><br><span> ns2_sns_compute_local_ep_from_binds(fi);</span><br><span> num_local_eps = gss->local.num_ip6;</span><br><span> num_remote_eps = gss->num_max_ip6_remote;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (gss->num_max_ip4_remote && ns2_sns_count_num_local_ep(fi, IPv4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->ip = IPv4;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (gss->num_max_ip4_remote && ns2_sns_count_num_local_ep(fi, AF_INET)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->family = AF_INET;</span><br><span> ns2_sns_compute_local_ep_from_binds(fi);</span><br><span> num_local_eps = gss->local.num_ip4;</span><br><span> num_remote_eps = gss->num_max_ip4_remote;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24589">change 24589</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/c/libosmocore/+/24589"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1bcdd43af34c926d4b88491d00669422c299bef7 </div>
<div style="display:none"> Gerrit-Change-Number: 24589 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>