<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20511">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2: make struct osmo_sockaddr pointers const<br><br>Using the 'const' qualifier allows the compiler to spot some<br>programming errors and further optimize the code. Apparently,<br>the author(s) of the new NS2 library are not aware about that.<br><br>Change-Id: I0df6a00ac1830bd64a10b9336b827e113fa772bb<br>---<br>M include/osmocom/gprs/gprs_ns2.h<br>M src/gb/gprs_ns2.c<br>M src/gb/gprs_ns2_frgre.c<br>M src/gb/gprs_ns2_internal.h<br>M src/gb/gprs_ns2_sns.c<br>M src/gb/gprs_ns2_udp.c<br>M src/gb/gprs_ns2_vty.c<br>7 files changed, 26 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/20511/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h</span><br><span>index 5cebf27..dc27c96 100644</span><br><span>--- a/include/osmocom/gprs/gprs_ns2.h</span><br><span>+++ b/include/osmocom/gprs/gprs_ns2.h</span><br><span>@@ -107,23 +107,23 @@</span><br><span> </span><br><span> /* IP VL driver */</span><br><span> int gprs_ns2_ip_bind(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *local,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *local,</span><br><span> int dscp,</span><br><span> struct gprs_ns2_vc_bind **result);</span><br><span> void gprs_ns2_bind_set_mode(struct gprs_ns2_vc_bind *bind, enum gprs_ns2_vc_mode mode);</span><br><span> </span><br><span> /* create a VC connection */</span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_connect(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span> uint16_t nsvci);</span><br><span> </span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_connect2(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> uint16_t nsei,</span><br><span> uint16_t nsvci);</span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_connect_inactive(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span> uint16_t nsvci);</span><br><span> </span><br><span>@@ -131,7 +131,7 @@</span><br><span> </span><br><span> /* create a VC SNS connection */</span><br><span> int gprs_ns2_ip_connect_sns(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> uint16_t nsei);</span><br><span> </span><br><span> struct osmo_sockaddr *gprs_ns2_ip_vc_sockaddr(struct gprs_ns2_vc *nsvc);</span><br><span>@@ -140,17 +140,17 @@</span><br><span> int gprs_ns2_ip_bind_set_dscp(struct gprs_ns2_vc_bind *bind, int dscp);</span><br><span> struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(</span><br><span> struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *saddr);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *saddr);</span><br><span> </span><br><span> int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *local,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *local,</span><br><span> int dscp,</span><br><span> struct gprs_ns2_vc_bind **result);</span><br><span> int gprs_ns2_is_frgre_bind(struct gprs_ns2_vc_bind *bind);</span><br><span> </span><br><span> struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_nse(</span><br><span> struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *sockaddr);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *sockaddr);</span><br><span> void gprs_ns2_start_alive_all_nsvcs(struct gprs_ns2_nse *nse);</span><br><span> const char *gprs_ns2_cause_str(int cause);</span><br><span> const char *gprs_ns2_ll_str(struct gprs_ns2_vc *nsvc);</span><br><span>@@ -158,7 +158,8 @@</span><br><span> char *gprs_ns2_ll_str_c(const void *ctx, struct gprs_ns2_vc *nsvc);</span><br><span> </span><br><span> /* vty */</span><br><span style="color: hsl(0, 100%, 40%);">-int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi, struct osmo_sockaddr_str *default_bind);</span><br><span style="color: hsl(120, 100%, 40%);">+int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *default_bind);</span><br><span> int gprs_ns2_vty_create();</span><br><span> void gprs_ns2_vty_force_vc_mode(bool force, enum gprs_ns2_vc_mode mode, const char *reason);</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c</span><br><span>index aca8994..7acb8e3 100644</span><br><span>--- a/src/gb/gprs_ns2.c</span><br><span>+++ b/src/gb/gprs_ns2.c</span><br><span>@@ -729,7 +729,7 @@</span><br><span> * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET</span><br><span> * \return pointer to newly-allocated, connected and inactive NS-VC; NULL on error */</span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_connect_inactive(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span> uint16_t nsvci)</span><br><span> {</span><br><span>@@ -754,7 +754,7 @@</span><br><span> * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET</span><br><span> * \return pointer to newly-allocated, connected and activated NS-VC; NULL on error */</span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_connect(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span> uint16_t nsvci)</span><br><span> {</span><br><span>@@ -775,7 +775,7 @@</span><br><span> * \param[in] nsvci is only required when bind->vc_mode == NS2_VC_MODE_BLOCKRESET</span><br><span> * \return pointer to newly-allocated, connected and activated NS-VC; NULL on error */</span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_connect2(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> uint16_t nsei,</span><br><span> uint16_t nsvci)</span><br><span> {</span><br><span>@@ -796,7 +796,7 @@</span><br><span> * \param[in] nsei NSEI of the NS Entity in which the NS-VC is to be created</span><br><span> * \return 0 on success; negative on error */</span><br><span> int gprs_ns2_ip_connect_sns(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote,</span><br><span> uint16_t nsei)</span><br><span> {</span><br><span> struct gprs_ns2_nse *nse = gprs_ns2_nse_by_nsei(bind->nsi, nsei);</span><br><span>@@ -826,7 +826,7 @@</span><br><span> * \param[in] sockaddr socket address to search for</span><br><span> * \return NS-VC matching sockaddr; NULL if none found */</span><br><span> struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_nse(struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *sockaddr)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *sockaddr)</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct osmo_sockaddr *remote;</span><br><span>diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c</span><br><span>index e0797b6..cd478d6 100644</span><br><span>--- a/src/gb/gprs_ns2_frgre.c</span><br><span>+++ b/src/gb/gprs_ns2_frgre.c</span><br><span>@@ -538,7 +538,7 @@</span><br><span> * \param[out] result pointer to created bind</span><br><span> * \return 0 on success; negative on error */</span><br><span> int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *local,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *local,</span><br><span> int dscp,</span><br><span> struct gprs_ns2_vc_bind **result)</span><br><span> {</span><br><span>diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h</span><br><span>index f5d9ed5..b480391 100644</span><br><span>--- a/src/gb/gprs_ns2_internal.h</span><br><span>+++ b/src/gb/gprs_ns2_internal.h</span><br><span>@@ -271,14 +271,14 @@</span><br><span> /* driver */</span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_bind_connect(struct gprs_ns2_vc_bind *bind,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote);</span><br><span> </span><br><span> /* sns */</span><br><span> int gprs_ns2_sns_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp);</span><br><span> struct osmo_fsm_inst *ns2_sns_bss_fsm_alloc(struct gprs_ns2_nse *nse,</span><br><span> const char *id);</span><br><span> int ns2_sns_bss_fsm_start(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote);</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote);</span><br><span> void ns2_sns_free_nsvc(struct gprs_ns2_vc *nsvc);</span><br><span> </span><br><span> /* vc */</span><br><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index 9ffb152..ec6f31f 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -1230,7 +1230,8 @@</span><br><span> * \param[in] nsvc Initial NS-VC</span><br><span> * \param[in] remote remote (SGSN) address</span><br><span> * \returns 0 on success; negative on error */</span><br><span style="color: hsl(0, 100%, 40%);">-int ns2_sns_bss_fsm_start(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc, struct osmo_sockaddr *remote)</span><br><span style="color: hsl(120, 100%, 40%);">+int ns2_sns_bss_fsm_start(struct gprs_ns2_nse *nse, struct gprs_ns2_vc *nsvc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote)</span><br><span> {</span><br><span> struct osmo_fsm_inst *fi = nse->bss_sns_fi;</span><br><span> struct ns2_sns_state *gss = (struct ns2_sns_state *) nse->bss_sns_fi->priv;</span><br><span>diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c</span><br><span>index 207febf..815e516 100644</span><br><span>--- a/src/gb/gprs_ns2_udp.c</span><br><span>+++ b/src/gb/gprs_ns2_udp.c</span><br><span>@@ -110,7 +110,8 @@</span><br><span> * \param[in] bind in which to search</span><br><span> * \param[in] saddr remote peer socket adddress to search</span><br><span> * \returns NS-VC matching sockaddr; NULL if none found */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr)</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(struct gprs_ns2_vc_bind *bind,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *saddr)</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct priv_vc *vcpriv;</span><br><span>@@ -271,7 +272,7 @@</span><br><span> * \param[out] result if set, returns the bind object</span><br><span> * \return 0 on success; negative in case of error */</span><br><span> int gprs_ns2_ip_bind(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *local,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *local,</span><br><span> int dscp,</span><br><span> struct gprs_ns2_vc_bind **result)</span><br><span> {</span><br><span>@@ -339,7 +340,7 @@</span><br><span> * \return pointer to newly-allocated and connected NS-VC; NULL on error */</span><br><span> struct gprs_ns2_vc *gprs_ns2_ip_bind_connect(struct gprs_ns2_vc_bind *bind,</span><br><span> struct gprs_ns2_nse *nse,</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr *remote)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr *remote)</span><br><span> {</span><br><span> struct gprs_ns2_vc *nsvc;</span><br><span> struct priv_vc *priv;</span><br><span>diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c</span><br><span>index c6c4b02..55e87ae 100644</span><br><span>--- a/src/gb/gprs_ns2_vty.c</span><br><span>+++ b/src/gb/gprs_ns2_vty.c</span><br><span>@@ -707,7 +707,8 @@</span><br><span> * \param[in] default_bind set the default address to bind to. Can be NULL.</span><br><span> * \return 0 on success</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi, struct osmo_sockaddr_str *default_bind)</span><br><span style="color: hsl(120, 100%, 40%);">+int gprs_ns2_vty_init(struct gprs_ns2_inst *nsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_sockaddr_str *default_bind)</span><br><span> {</span><br><span> static bool vty_elements_installed = false;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20511">change 20511</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/+/20511"/><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: I0df6a00ac1830bd64a10b9336b827e113fa772bb </div>
<div style="display:none"> Gerrit-Change-Number: 20511 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>