msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28865 )

Change subject: SMPP: use default port from libsmpp34 ......................................................................

SMPP: use default port from libsmpp34

Related: OS#5568 Requires: libsmpp34.git I2fcc15ac60b7b6501c9cb1afd0fe6d66d4b76f5f Change-Id: I2140ed57e64f17fb79130014eaf88f58b62d7a00 --- M TODO-RELEASE M src/libsmpputil/smpp_smsc.c M src/utils/smpp_mirror.c 3 files changed, 6 insertions(+), 9 deletions(-)

Approvals: Jenkins Builder: Verified msuraev: Looks good to me, approved

diff --git a/TODO-RELEASE b/TODO-RELEASE index 502fff6..9293b93 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-mgcp-client >1.10.0 mgcp_client_pool_config_write() \ No newline at end of file +libosmo-mgcp-client >1.10.0 mgcp_client_pool_config_write() +libsmpp34 > 1.14.1 Dependency bump required diff --git a/src/libsmpputil/smpp_smsc.c b/src/libsmpputil/smpp_smsc.c index a1f2b2f..059915d 100644 --- a/src/libsmpputil/smpp_smsc.c +++ b/src/libsmpputil/smpp_smsc.c @@ -974,21 +974,17 @@ { int rc;

- /* default port for SMPP */ - if (!port) - port = 2775; - LOGP(DSMPP, LOGL_NOTICE, "SMPP at %s %d\n", - bind_addr? bind_addr : "0.0.0.0", port); + bind_addr ? bind_addr : "0.0.0.0", port ? port : SMPP_PORT);

rc = osmo_sock_init_ofd(&smsc->listen_ofd, AF_UNSPEC, SOCK_STREAM, - IPPROTO_TCP, bind_addr, port, + IPPROTO_TCP, bind_addr, port ? port : SMPP_PORT, OSMO_SOCK_F_BIND); if (rc < 0) return rc;

/* store new address and port */ - rc = smpp_smsc_conf(smsc, bind_addr, port); + rc = smpp_smsc_conf(smsc, bind_addr, port ? port : SMPP_PORT); if (rc) smpp_smsc_stop(smsc); return rc; diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index 552ceee..3356468 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -244,7 +244,7 @@ int rc;

if (port == 0) - port = 2775; + port = SMPP_PORT;

esme->wqueue.bfd.data = esme; esme->wqueue.read_cb = esme_read_cb;