pespin has uploaded this change for review.

View Change

ss7: Rename internal APIs to avoid exporting them in so file

Change-Id: Ibb22c1dc1ec73fc574cc3d38664874114f681c37
---
M src/osmo_ss7.c
M src/osmo_ss7_vty.c
M src/sccp_user.c
M src/ss7_internal.h
4 files changed, 16 insertions(+), 7 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/27/34327/1
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 440014a..d097fc9 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -1583,7 +1583,7 @@
* afterwards in order to apply the new settings.
* This API is internal, hence doesn't appear in osmo_ss7.h
*/
-bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp)
+bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp)
{
bool changed = false;
/* If no local addr was set */
@@ -2577,7 +2577,7 @@
return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt);
}

-bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs)
+bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs)
{
/* If no local addr was set, or erased after _create(): */
if (!oxs->cfg.local.host_cnt) {
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 44ba780..df4c8fc 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -2071,7 +2071,7 @@
case L_CS7_ASP_NODE:
asp = vty->index;
/* Make sure proper defaults values are set */
- osmo_ss7_asp_set_default_peer_hosts(asp);
+ ss7_asp_set_default_peer_hosts(asp);
osmo_ss7_asp_restart(asp);
vty->node = L_CS7_NODE;
vty->index = asp->inst;
@@ -2089,7 +2089,7 @@
case L_CS7_XUA_NODE:
oxs = vty->index;
/* If no local addr was set, or erased after _create(): */
- osmo_ss7_xua_server_set_default_local_hosts(oxs);
+ ss7_xua_server_set_default_local_hosts(oxs);
if (osmo_ss7_xua_server_bind(oxs) < 0)
vty_out(vty, "%% Unable to bind xUA server to IP(s)%s", VTY_NEWLINE);
vty->node = L_CS7_NODE;
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 382e1fe..94b6d02 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -643,7 +643,7 @@
if (default_remote_ip)
osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1);
/* Make sure proper defaults are applied if app didn't provide specific default values */
- osmo_ss7_asp_set_default_peer_hosts(asp);
+ ss7_asp_set_default_peer_hosts(asp);
asp->simple_client_allocated = true;
}

diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index 712a6ed..f6669e2 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -5,8 +5,8 @@
#include <stdbool.h>
#include <osmocom/sigtran/osmo_ss7.h>

-bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp);
-bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs);
+bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp);
+bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs);

enum ss7_as_ctr {
SS7_AS_CTR_RX_MSU_TOTAL,

To view, visit change 34327. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ibb22c1dc1ec73fc574cc3d38664874114f681c37
Gerrit-Change-Number: 34327
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-MessageType: newchange