Build failure of network:osmocom:nightly/libosmocore in xUbuntu_17.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_17.04/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 251s] | [ 251s] | This file was extended by libosmocore config.status 0.9.6.20170708, which was [ 251s] | generated by GNU Autoconf 2.69. Invocation command line was [ 251s] | [ 251s] | CONFIG_FILES= [ 251s] | CONFIG_HEADERS = [ 251s] | CONFIG_LINKS= [ 251s] | CONFIG_COMMANDS = [ 251s] | $ ./config.status Doxyfile.core [ 251s] | [ 251s] | on build36 [ 251s] | [ 251s] | config.status:1171: creating Doxyfile.core [ 251s] [ 251s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 251s] make[1]: *** [override_dh_auto_test] Error 1 [ 251s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 251s] debian/rules:15: recipe for target 'build' failed [ 251s] make: *** [build] Error 2 [ 251s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 251s] [ 251s] build36 failed "build libosmocore_0.9.6.20170708.dsc" at Sat Jul 8 19:54:25 UTC 2017. [ 251s] [ 251s] ### VM INTERACTION START ### [ 254s] [ 233.853006] reboot: Power down [ 255s] ### VM INTERACTION END ### [ 255s] [ 255s] build36 failed "build libosmocore_0.9.6.20170708.dsc" at Sat Jul 8 19:54:30 UTC 2017. [ 255s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[MERGED] libosmo-sccp[master]: contrib: Enable -Werror by default
Harald Welte has submitted this change and it was merged. Change subject: contrib: Enable -Werror by default .. contrib: Enable -Werror by default Change-Id: I16a8ca7f0bfabeed6a9b58cda5e60bd58889f74d --- M configure.ac M contrib/jenkins.sh 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 200f55d..7e3e03e 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_SUBST(SYMBOL_VISIBILITY) CFLAGS="$CFLAGS -Wall" -CPPFLAGS="$CFLAGS -Wall" +CPPFLAGS="$CPPFLAGS -Wall" AC_OUTPUT( libosmo-sigtran.pc diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 668a58b..897c464 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -29,7 +29,7 @@ set -x autoreconf --install --force -./configure +./configure CFLAGS="-Werror" CPPFLAGS="-Werror" $MAKE $PARALLEL_MAKE $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/3136 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16a8ca7f0bfabeed6a9b58cda5e60bd58889f74d Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] libosmo-sccp[master]: sccp_scoc: Fix trailing whitespace
Harald Welte has submitted this change and it was merged. Change subject: sccp_scoc: Fix trailing whitespace .. sccp_scoc: Fix trailing whitespace Change-Id: Ia93bb7d59e4e2c31b693e2c3424d34386762d02e --- M src/sccp_scoc.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 628b63b..3a2cb47 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -122,7 +122,7 @@ }; /*** - * various helper functions + * various helper functions ***/ enum sccp_connection_state { @@ -1596,7 +1596,7 @@ } } -/*! \brief Main entrance function for primitives from SCCP User +/*! \brief Main entrance function for primitives from SCCP User * \param[in] scu SCCP User sending us the primitive * \param[in] oph Osmocom primitive sent by the user * \returns 0 on success; negative on error */ -- To view, visit https://gerrit.osmocom.org/3134 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia93bb7d59e4e2c31b693e2c3424d34386762d02e Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmo-sccp[master]: contrib: Enable -Werror by default
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3136 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I16a8ca7f0bfabeed6a9b58cda5e60bd58889f74d Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmo-sccp[master]: sccp_scoc: Fix trailing whitespace
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3134 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia93bb7d59e4e2c31b693e2c3424d34386762d02e Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmo-sccp[master]: configure.ac: Fix C(PP)FLAGS for BSD build
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3133 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I33f6b9de4990de0c4d3a6fc0bd7df632094e79ac Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] openbsc[master]: smpp: fix return cause
Harald Welte has submitted this change and it was merged. Change subject: smpp: fix return cause .. smpp: fix return cause Return cause 38 when default SMPP route is unavailable. This is better than cause 1. Change-Id: If3241d50a78fa611981e55fef6ae4c72b0a2a167 --- M openbsc/src/libmsc/gsm_04_11.c M openbsc/src/libmsc/smpp_openbsc.c M openbsc/src/libmsc/smpp_smsc.c M openbsc/src/libmsc/smpp_smsc.h 4 files changed, 17 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index aa2030f..acf425a 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -294,6 +294,7 @@ if (smpp_first) { rc = smpp_try_deliver(gsms, conn, deferred); if (rc == GSM411_RP_CAUSE_MO_NUM_UNASSIGNED) + /* unknown subscriber, try local */ goto try_local; if (rc < 0) { LOGP(DLSMS, LOGL_ERROR, "%s: SMS delivery error: %d.", diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c index f94968a..f7d1441 100644 --- a/openbsc/src/libmsc/smpp_openbsc.c +++ b/openbsc/src/libmsc/smpp_openbsc.c @@ -702,17 +702,18 @@ { struct osmo_esme *esme; struct osmo_smpp_addr dst; + int rc; memset(, 0, sizeof(dst)); dst.ton = sms->dst.ton; dst.npi = sms->dst.npi; memcpy(dst.addr, sms->dst.addr, sizeof(dst.addr)); - esme = smpp_route(g_smsc, ); - if (!esme) - return GSM411_RP_CAUSE_MO_NUM_UNASSIGNED; + rc = smpp_route(g_smsc, , ); + if (!rc) + rc = deliver_to_esme(esme, sms, conn, deferred); - return deliver_to_esme(esme, sms, conn, deferred); + return rc; } struct smsc *smsc_from_vty(struct vty *v) diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c index 4c2e4aa..04afc49 100644 --- a/openbsc/src/libmsc/smpp_smsc.c +++ b/openbsc/src/libmsc/smpp_smsc.c @@ -270,8 +270,7 @@ } /*! \brief try to find a SMPP route (ESME) for given destination */ -struct osmo_esme * -smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest) +int smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest, struct osmo_esme **pesme) { struct osmo_smpp_route *r; struct osmo_smpp_acl *acl = NULL; @@ -314,15 +313,20 @@ struct osmo_esme *esme; DEBUGP(DSMPP, "ACL even has ESME, we can route to it!\n"); esme = acl->esme; - if (esme->bind_flags & ESME_BIND_RX) - return esme; - else + if (esme->bind_flags & ESME_BIND_RX) { + *pesme = esme; + return 0; + } else LOGP(DSMPP, LOGL_NOTICE, "[%s] is matching route, " "but not bound for Rx, discarding MO SMS\n", esme->system_id); } - return NULL; + *pesme = NULL; + if (acl) + return GSM48_CC_CAUSE_NETWORK_OOO; + else + return GSM48_CC_CAUSE_UNASSIGNED_NR; } diff --git a/openbsc/src/libmsc/smpp_smsc.h b/openbsc/src/libmsc/smpp_smsc.h index d8e82e4..c9209ef 100644 --- a/openbsc/src/libmsc/smpp_smsc.h +++ b/openbsc/src/libmsc/smpp_smsc.h @@ -126,8 +126,7 @@ void smpp_esme_get(struct osmo_esme *esme); void smpp_esme_put(struct osmo_esme *esme); -struct osmo_esme * -smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest); +int smpp_route(const struct smsc *smsc, const struct osmo_smpp_addr *dest, struct osmo_esme **emse); struct osmo_smpp_acl *smpp_acl_alloc(struct smsc *smsc, const char *sys_id); struct osmo_smpp_acl *smpp_acl_by_system_id(struct smsc *smsc, -- To view, visit https://gerrit.osmocom.org/3126 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If3241d50a78fa611981e55fef6ae4c72b0a2a167 Gerrit-PatchSet: 5 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max
openbsc[master]: smpp: fix return cause
Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3126 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If3241d50a78fa611981e55fef6ae4c72b0a2a167 Gerrit-PatchSet: 4 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
[MERGED] osmo-gsm-manuals[master]: Remove currently broken everything logging option
Harald Welte has submitted this change and it was merged. Change subject: Remove currently broken everything logging option .. Remove currently broken everything logging option Change-Id: I52e370d59274e29502cd23690f0d5c73aa3a4cc7 Related: OS#71 --- M common/chapters/vty.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/vty.adoc b/common/chapters/vty.adoc index 931cd1f..d84d5cf 100644 --- a/common/chapters/vty.adoc +++ b/common/chapters/vty.adoc @@ -246,7 +246,7 @@ logging print extended-timestamp (0|1) logging print category (0|1) logging set-log-mask MASK - logging level (all|rll|cc|mm|rr|rsl|nm|mncc|pag|meas|sccp|msc|mgcp|ho|db|ref|gprs|ns|bssgp|llc|sndcp|nat|ctrl|smpp|filter|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats) (everything|debug|info|notice|error|fatal) + logging level (all|rll|cc|mm|rr|rsl|nm|mncc|pag|meas|sccp|msc|mgcp|ho|db|ref|gprs|ns|bssgp|llc|sndcp|nat|ctrl|smpp|filter|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats) (debug|info|notice|error|fatal) show logging vty show alarms show stats -- To view, visit https://gerrit.osmocom.org/3145 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52e370d59274e29502cd23690f0d5c73aa3a4cc7 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-gsm-manuals[master]: Remove currently broken everything logging option
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3145 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I52e370d59274e29502cd23690f0d5c73aa3a4cc7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-bts[master]: Use release helper from libosmocore
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3143 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib8efd2095fcf759276299b516d495219105c1f2b Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-HasComments: No
libosmocore[master]: Add release target to Makefile
Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3130 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I790ceb958195b9f6cbabfe8c977dc30e2bd7414b Gerrit-PatchSet: 7 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: blobb Gerrit-HasComments: No
libosmo-abis[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3131 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifc88e5c942a8b430b2436d429c86560d82984a95 Gerrit-PatchSet: 2 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-HasComments: No
libosmo-netif[master]: configure.ac: Use -Wall in C(PP)FLAGS
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3139 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1d7e99541089a92e6bc17798a94ac756047aeba Gerrit-PatchSet: 1 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmo-netif[master]: contrib: Enable -Werror by default
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3140 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I045536c21d7a0fa2fc23258c727d67bedf176ece Gerrit-PatchSet: 1 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[MERGED] libosmo-netif[master]: configure.ac: Use -Wall in C(PP)FLAGS
Harald Welte has submitted this change and it was merged. Change subject: configure.ac: Use -Wall in C(PP)FLAGS .. configure.ac: Use -Wall in C(PP)FLAGS Change-Id: Ia1d7e99541089a92e6bc17798a94ac756047aeba --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 362d792..175ab63 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,9 @@ AC_CONFIG_MACRO_DIR([m4]) +CFLAGS="$CFLAGS -Wall" +CPPFLAGS="$CPPFLAGS -Wall" + dnl checks for header files AC_HEADER_STDC AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h syslog.h ctype.h) -- To view, visit https://gerrit.osmocom.org/3139 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1d7e99541089a92e6bc17798a94ac756047aeba Gerrit-PatchSet: 2 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmo-abis[master]: configure.ac: Fix C(PP)FLAGS for BSD build
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3137 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id509351104bc7466114d4b9be450814254110f44 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] libosmo-abis[master]: configure.ac: Fix C(PP)FLAGS for BSD build
Harald Welte has submitted this change and it was merged. Change subject: configure.ac: Fix C(PP)FLAGS for BSD build .. configure.ac: Fix C(PP)FLAGS for BSD build Issue first found in libosmocore. It seems the BSD build doesn't use bash which means using += to append to a variable doesn't work correctly. Change-Id: Id509351104bc7466114d4b9be450814254110f44 --- M configure.ac 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 535d1c3..9b62f3e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ AC_CONFIG_MACRO_DIR([m4]) -CFLAGS+=" -Wall" -CPPFLAGS+=" -Wall" +CFLAGS="$CFLAGS -Wall" +CPPFLAGS="$CPPFLAGS -Wall" # The following test is taken from WebKit's webkit.m4 saved_CFLAGS="$CFLAGS" @@ -58,8 +58,8 @@ [sanitize=$enableval], [sanitize="no"]) if test x"$sanitize" = x"yes" then - CFLAGS+=" -fsanitize=address -fsanitize=undefined" - CPPFLAGS+=" -fsanitize=address -fsanitize=undefined" + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" fi _cflags_save=$CFLAGS -- To view, visit https://gerrit.osmocom.org/3137 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id509351104bc7466114d4b9be450814254110f44 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmo-abis[master]: contrib: Enable -Werror by default
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I065b18dd6c4f7616f981aa4273e68e23825a7294 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
libosmocore[master]: Ignore broken everything log level
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3148 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73d5c4f238beb88981ad25caa69f64ad6fb7209f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-HasComments: No
[MERGED] openbsc[master]: smpp_smsc.c: Log on sending deliver_sm message
Harald Welte has submitted this change and it was merged. Change subject: smpp_smsc.c: Log on sending deliver_sm message .. smpp_smsc.c: Log on sending deliver_sm message Change-Id: Ie16294df6d5bc0065f8d2b49320ead61f535f271 --- M openbsc/src/libmsc/smpp_smsc.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/libmsc/smpp_smsc.c b/openbsc/src/libmsc/smpp_smsc.c index 48a1192..4c2e4aa 100644 --- a/openbsc/src/libmsc/smpp_smsc.c +++ b/openbsc/src/libmsc/smpp_smsc.c @@ -654,6 +654,9 @@ { deliver->sequence_number = esme_inc_seq_nr(esme); + LOGP(DSMPP, LOGL_DEBUG, "[%s] Tx DELIVER-SM (from %s)\n", + esme->system_id, deliver->source_addr); + return PACK_AND_SEND(esme, deliver); } -- To view, visit https://gerrit.osmocom.org/3144 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie16294df6d5bc0065f8d2b49320ead61f535f271 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max
[MERGED] libosmocore[master]: Deprecate wrappers around loglevel_strs
Harald Welte has submitted this change and it was merged. Change subject: Deprecate wrappers around loglevel_strs .. Deprecate wrappers around loglevel_strs Add deprecation notice for public API use: it shouldn't be used outside of libosmocore anyway. Change-Id: I792e30dc44f027fd94e1f65af19fe08bac52b95c Related: OS#71 --- M include/osmocom/core/logging.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 68a9c13..e058a57 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -306,8 +306,8 @@ void log_set_log_level(struct log_target *target, int log_level); void log_parse_category_mask(struct log_target *target, const char* mask); const char* log_category_name(int subsys); -int log_parse_level(const char *lvl); -const char *log_level_str(unsigned int lvl); +int log_parse_level(const char *lvl) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; +const char *log_level_str(unsigned int lvl) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; int log_parse_category(const char *category); void log_set_category_filter(struct log_target *target, int category, int enable, int level); -- To view, visit https://gerrit.osmocom.org/3147 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I792e30dc44f027fd94e1f65af19fe08bac52b95c Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
openbsc[master]: smpp_smsc.c: Log on sending deliver_sm message
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3144 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie16294df6d5bc0065f8d2b49320ead61f535f271 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
openbsc[master]: transaction: reject calls from unidentified subscribers
Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/3127/4/openbsc/src/libmsc/transaction.c File openbsc/src/libmsc/transaction.c: Line 75:DEBUGP(DCC, I think this should be INFO or probably even NOTICE level, as it is not something that relates to debugging the software, but a rather serious uncommon event that might require some investigation? -- To view, visit https://gerrit.osmocom.org/3127 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia8739b6e329ab02c0064270d02ad1d6ee245520d Gerrit-PatchSet: 4 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: Yes
libosmocore[master]: Deprecate wrappers around loglevel_strs
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3147 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I792e30dc44f027fd94e1f65af19fe08bac52b95c Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
openbsc[master]: libmsc: Fix VTY output for handover counters.
Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/3159 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9512330f2e91d2f526751c5228e6e8e0fe17d579 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Alexander ChemerisGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-HasComments: No
osmo-gsm-tester[master]: aoip_smpp: Disable check in esme_ms_sms_storeforward due to ...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3146 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I12f8dbe1d6dc9a554438fda1e38b2e5e3245c320 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-pcu[master]: Move DL scheduling and RTS handler to trx level
Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3150 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia176245647c19fa1551fb6f5c8225b2529f73cbf Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-pcu[master]: Remove TBF knowledge from rcv_control*dl_ack_nack
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3154 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3d1b5782001e45617b4a960612fcfc249904b37c Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-pcu[master]: Encapsulate handling of UL ACK timeout
Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3155 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia3f009c52118db95b38a077e08eecda844e7f8d1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-pcu[master]: Move common code into functions
Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3156 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ec3ab8de100f0bc75044f55ac769d1083d52806 Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-pcu[master]: Move DL assignment to TBF-DL
Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3157 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04584103018675a2f35cfb565473bfd81a208d7c Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-pcu[master]: Ignore test binaries using mask
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/3153/1/.gitignore File .gitignore: PS1, Line 44: pcu_emu doesn't match the new pattern, does it? -- To view, visit https://gerrit.osmocom.org/3153 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic7930c6e715447e91572f7ed6b0d2bb2238cf367 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes
[MERGED] libosmocore[master]: gsup: Add encoding/decoding for the pdp charging characteris...
Harald Welte has submitted this change and it was merged. Change subject: gsup: Add encoding/decoding for the pdp charging characteristics .. gsup: Add encoding/decoding for the pdp charging characteristics These fields can be in the ISD and the PDP Context inofmration. Store pointers to this IE in both cases. It needs to be used by the SGSN when opening a PDP context. Change-Id: Iedc7c02adcf77ca5c9545119e19c968dfbbb3e6b --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err 4 files changed, 36 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 886ea5d..890bff3 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -51,6 +51,7 @@ OSMO_GSUP_PDP_TYPE_IE = 0x11, OSMO_GSUP_ACCESS_POINT_NAME_IE = 0x12, OSMO_GSUP_PDP_QOS_IE= 0x13, + OSMO_GSUP_CHARG_CHAR_IE = 0x14, OSMO_GSUP_RAND_IE = 0x20, OSMO_GSUP_SRES_IE = 0x21, OSMO_GSUP_KC_IE = 0x22, @@ -127,6 +128,11 @@ const uint8_t *qos_enc; /*! length (in octets) of qos_enc */ size_t qos_enc_len; + /*! PDP Charging Characteristics, still in encoded form. Can be NULL if no +* PDP Charging Characteristics */ + const uint8_t *pdp_charg_enc; + /*! length (in octets) of pdp_charg_enc */ + size_t pdp_charg_enc_len; }; /*! parsed/decoded GSUP protocol message */ @@ -148,6 +154,8 @@ const uint8_t *auts; const uint8_t *rand; enum osmo_gsup_cn_domaincn_domain; + const uint8_t *pdp_charg_enc; + size_t pdp_charg_enc_len; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 2629eb7..685c91f 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -103,6 +103,11 @@ pdp_info->qos_enc_len = value_len; break; + case OSMO_GSUP_CHARG_CHAR_IE: + pdp_info->pdp_charg_enc = value; + pdp_info->pdp_charg_enc_len = value_len; + break; + default: LOGP(DLGSUP, LOGL_ERROR, "GSUP IE type %d not expected in PDP info\n", iei); @@ -375,6 +380,11 @@ gsup_msg->cn_domain = *value; break; + case OSMO_GSUP_CHARG_CHAR_IE: + gsup_msg->pdp_charg_enc = value; + gsup_msg->pdp_charg_enc_len = value_len; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -413,6 +423,11 @@ if (pdp_info->qos_enc) { msgb_tlv_put(msg, OSMO_GSUP_PDP_QOS_IE, pdp_info->qos_enc_len, pdp_info->qos_enc); + } + + if (pdp_info->pdp_charg_enc) { + msgb_tlv_put(msg, OSMO_GSUP_CHARG_CHAR_IE, + pdp_info->pdp_charg_enc_len, pdp_info->pdp_charg_enc); } /* Update length field */ @@ -540,6 +555,11 @@ uint8_t dn = gsup_msg->cn_domain; msgb_tlv_put(msg, OSMO_GSUP_CN_DOMAIN_IE, 1, ); } + + if (gsup_msg->pdp_charg_enc) { + msgb_tlv_put(msg, OSMO_GSUP_CHARG_CHAR_IE, + gsup_msg->pdp_charg_enc_len, gsup_msg->pdp_charg_enc); + } } /*! @} */ diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index a950ca3..3b360ac 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -69,15 +69,18 @@ 0x09, 0x07, /* HLR-Number of the subscriber */ 0x91, 0x83, 0x52, 0x38, 0x48, 0x83, 0x93, 0x04, 0x00, /* PDP info complete */ - 0x05, 0x15, + 0x05, 0x19, 0x10, 0x01, 0x01, 0x11, 0x02, 0xf1, 0x21, /* IPv4 */ 0x12, 0x09, 0x04, 't', 'e', 's', 't', 0x03, 'a', 'p', 'n', 0x13, 0x01, 0x02, + 0x14, 0x02, 0xFF, 0x23, 0x05, 0x11, 0x10, 0x01, 0x02, 0x11, 0x02, 0xf1, 0x21, /* IPv4 */ 0x12, 0x08, 0x03, 'f', 'o', 'o', 0x03, 'a', 'p', 'n', + 0x14, 0x02, + 0xAE, 0xFF }; static const uint8_t
[MERGED] osmo-gsm-manuals[master]: sgsn: Add charging characteristics to GSUP
Harald Welte has submitted this change and it was merged. Change subject: sgsn: Add charging characteristics to GSUP .. sgsn: Add charging characteristics to GSUP Reserve a new IE for the charging characteristics. We need to handle them as a GGSN might otherwise reject the PDP context creation. For the SGSN it is enough to send the two octets as it. Pick the 0x1X range for the IEs as it is used with the PDP contexts. Change-Id: I1d7423582e154728a240cf15c32772a06822f4ad --- M OsmoSGSN/chapters/gsup.adoc 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSGSN/chapters/gsup.adoc b/OsmoSGSN/chapters/gsup.adoc index 9110f08..733b60e 100644 --- a/OsmoSGSN/chapters/gsup.adoc +++ b/OsmoSGSN/chapters/gsup.adoc @@ -390,6 +390,7 @@ |09|HLR Number|<>|O|TLV|0-9 |04|PDP info complete|<>|M|TLV|2 |05|PDP info|<>|0-10|TLV| +|14|PDP-Charging Characteristics|<>|O|TLV|4 |=== If the PDP info complete IE is present, the old PDP info list shall be cleared. @@ -503,6 +504,7 @@ |11|PDP Type|<>|C|TLV|4 |12|Access Point Name|<>|C|TLV|3-102 |13|Quality of Service|<>|O|TLV|1-20 +|14|PDP-Charging Characteristics|<>|O|TLV|4 |=== The conditional IE are mandantory unless mentioned otherwise. @@ -692,6 +694,7 @@ |0x11|PDP Type|<> |0x12|Access Point Name|<> |0x13|QoS|<> +|0x14|PDP-Charging Characteristics|<> |0x20|RAND|<> |0x21|SRES|<> |0x22|Kc|<> @@ -802,6 +805,27 @@ } + +[[gsup-ie-charging]] + PDP-Charging Characteristics + +This encodes the ChargingCharacteristics of 3GPP TS 32.215. A HLR may +send this as part of the InsertSubscriberData or within a single PDP +context definition. If the HLR supplies this information it must be +used by the SGSN when activating a PDP context. + +[packetdiag] + +{ + colwidth = 8 + node_height = 24 + + 0-3:Profile Index + 4-15: Behavior +} + + + [[gsup-ie-hlr]] HLR Number encoded as 3GPP TS 09.02 ISDN-AddressString -- To view, visit https://gerrit.osmocom.org/3152 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d7423582e154728a240cf15c32772a06822f4ad Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Holger FreytherGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-gsm-manuals[master]: sgsn: Fix numbering of QoS and add basic description for APN
Harald Welte has submitted this change and it was merged. Change subject: sgsn: Fix numbering of QoS and add basic description for APN .. sgsn: Fix numbering of QoS and add basic description for APN QoS was supposed to be 13 as 12 has been used for the APN. Fix that and document the APN. Change-Id: Ib6113aa7c59841aada424e2cafd94ed88c7badc7 --- M OsmoSGSN/chapters/gsup.adoc 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoSGSN/chapters/gsup.adoc b/OsmoSGSN/chapters/gsup.adoc index f496b84..9110f08 100644 --- a/OsmoSGSN/chapters/gsup.adoc +++ b/OsmoSGSN/chapters/gsup.adoc @@ -501,7 +501,7 @@ | |Length of PDP Info IE||M|V|1 |10|PDP Context ID|<>|C|TLV|3 |11|PDP Type|<>|C|TLV|4 -|12|Access Point Name|3GPP TS 04.08, Ch. 10.5.6.1|C|TLV|3-102 +|12|Access Point Name|<>|C|TLV|3-102 |13|Quality of Service|<>|O|TLV|1-20 |=== @@ -690,7 +690,8 @@ |0x09|HLR Number|<> |0x10|PDP Context ID|<> |0x11|PDP Type|<> -|0x12|QoS|<> +|0x12|Access Point Name|<> +|0x13|QoS|<> |0x20|RAND|<> |0x21|SRES|<> |0x22|Kc|<> @@ -772,6 +773,12 @@ } +[[gsup-ie-apn]] + Access Point Name + +This encodes the Access Point Name of a PDP Context. The encoding +is defined in 3GPP TS 23.003. + [[gsup-ie-qos]] Quality of Service Subscribed Service -- To view, visit https://gerrit.osmocom.org/3151 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6113aa7c59841aada424e2cafd94ed88c7badc7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Holger FreytherGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-gsm-manuals[master]: sgsn: Fix numbering of QoS and add basic description for APN
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3151 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib6113aa7c59841aada424e2cafd94ed88c7badc7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Holger FreytherGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-gsm-manuals[master]: sgsn: Add charging characteristics to GSUP
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3152 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1d7423582e154728a240cf15c32772a06822f4ad Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Holger FreytherGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmo-sccp[master]: vty: Check returncode of osmo_ss7_pointcode_parse()
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3102 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iae6d92b1d135063dfd0a26bc23a89802cb3b1a78 Gerrit-PatchSet: 3 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] libosmo-sccp[master]: vty: Check returncode of osmo_ss7_pointcode_parse()
Harald Welte has submitted this change and it was merged. Change subject: vty: Check returncode of osmo_ss7_pointcode_parse() .. vty: Check returncode of osmo_ss7_pointcode_parse() The result of osmo_ss7_pointcode_parse() is currently not checked. This means that -EINVAL could end up as value in the pointcode configuration. Check the return code of osmo_ss7_pointcode_parse() and exit the VTY command with CMD_WARNING if the returned pointcode is < 0 Change-Id: Iae6d92b1d135063dfd0a26bc23a89802cb3b1a78 --- M src/osmo_ss7_vty.c 1 file changed, 51 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 8e40474..b06f554 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -165,7 +165,11 @@ "Point Code\n") { struct osmo_ss7_instance *inst = vty->index; - uint32_t pc = osmo_ss7_pointcode_parse(inst, argv[0]); + int pc = osmo_ss7_pointcode_parse(inst, argv[0]); + if (pc < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } inst->cfg.primary_pc = pc; return CMD_SUCCESS; @@ -271,10 +275,20 @@ { struct osmo_ss7_route_table *rtable = vty->index; struct osmo_ss7_route *rt; - uint32_t dpc = osmo_ss7_pointcode_parse(rtable->inst, argv[0]); - uint32_t mask = osmo_ss7_pointcode_parse_mask_or_len(rtable->inst, argv[1]); + int dpc = osmo_ss7_pointcode_parse(rtable->inst, argv[0]); + int mask = osmo_ss7_pointcode_parse_mask_or_len(rtable->inst, argv[1]); const char *ls_name = argv[2]; unsigned int argind; + + if (dpc < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + if (mask < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } rt = osmo_ss7_route_create(rtable, dpc, mask, ls_name); if (!rt) { @@ -307,8 +321,18 @@ { struct osmo_ss7_route_table *rtable = vty->index; struct osmo_ss7_route *rt; - uint32_t dpc = osmo_ss7_pointcode_parse(rtable->inst, argv[0]); - uint32_t mask = osmo_ss7_pointcode_parse_mask_or_len(rtable->inst, argv[1]); + int dpc = osmo_ss7_pointcode_parse(rtable->inst, argv[0]); + int mask = osmo_ss7_pointcode_parse_mask_or_len(rtable->inst, argv[1]); + + if (dpc < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + if (mask < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } rt = osmo_ss7_route_find_dpc_mask(rtable, dpc, mask); if (!rt) { @@ -770,9 +794,16 @@ struct osmo_ss7_as *as = vty->index; struct osmo_ss7_routing_key *rkey = >cfg.routing_key; int argind; + int pc; + pc = osmo_ss7_pointcode_parse(as->inst, argv[1]); + if (pc < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + + rkey->pc = pc; rkey->context = atoi(argv[0]); - rkey->pc = osmo_ss7_pointcode_parse(as->inst, argv[1]); argind = 2; if (argind < argc && !strcmp(argv[argind], "si")) { @@ -799,7 +830,11 @@ "New Point Code\n") { struct osmo_ss7_as *as = vty->index; - uint32_t pc = osmo_ss7_pointcode_parse(as->inst, argv[0]); + int pc = osmo_ss7_pointcode_parse(as->inst, argv[0]); + if (pc < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) { vty_out(vty, "Only IPA type AS support point-code override. " @@ -1208,11 +1243,19 @@ DEFUN(cs7_sccpaddr_pc, cs7_sccpaddr_pc_cmd, "point-code POINT_CODE", "Add point-code Number\n" "PC\n") { + int pc; struct osmo_sccp_addr_entry *entry = (struct osmo_sccp_addr_entry *)vty->index; OSMO_ASSERT(entry); + + pc = osmo_ss7_pointcode_parse(entry->inst, argv[0]); + if (pc < 0) { + vty_out(vty, "Invalid point code (%s)%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + entry->addr.presence |= OSMO_SCCP_ADDR_T_PC; - entry->addr.pc = osmo_ss7_pointcode_parse(entry->inst, argv[0]); + entry->addr.pc = pc; return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/3102 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae6d92b1d135063dfd0a26bc23a89802cb3b1a78 Gerrit-PatchSet: 3
openbsc[master]: 04.08: find a portable way to obtain the timezone offset
Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3128 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I673f17af2550c9708c4771e4ea4eafbbfafbb824 Gerrit-PatchSet: 4 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
libosmocore[master]: gsup: Add encoding/decoding for the pdp charging characteris...
Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3158 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iedc7c02adcf77ca5c9545119e19c968dfbbb3e6b Gerrit-PatchSet: 5 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Holger FreytherGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
openbsc[master]: libmsc: Fix VTY output for handover counters.
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3159 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9512330f2e91d2f526751c5228e6e8e0fe17d579 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Alexander ChemerisGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-HasComments: No
openbsc[master]: libmsc: Fix VTY output for handover counters.
Patch Set 1: I'm not sure I read Jenkins correctly, but it looks like the build failure is not related to my patch? -- To view, visit https://gerrit.osmocom.org/3159 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9512330f2e91d2f526751c5228e6e8e0fe17d579 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Alexander ChemerisGerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-HasComments: No
[PATCH] openbsc[master]: libmsc: Fix VTY output for handover counters.
Review at https://gerrit.osmocom.org/3159 libmsc: Fix VTY output for handover counters. Handover countrs belong to BSC, but we mistakenly take values from MSC counters. Change-Id: I9512330f2e91d2f526751c5228e6e8e0fe17d579 --- M openbsc/src/libmsc/vty_interface_layer3.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/59/3159/1 diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index e503291..042da9c 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -833,11 +833,11 @@ VTY_NEWLINE); vty_out(vty, "Handover: %lu attempted, %lu no_channel, %lu timeout, " "%lu completed, %lu failed%s", - net->msc_ctrs->ctr[BSC_CTR_HANDOVER_ATTEMPTED].current, - net->msc_ctrs->ctr[BSC_CTR_HANDOVER_NO_CHANNEL].current, - net->msc_ctrs->ctr[BSC_CTR_HANDOVER_TIMEOUT].current, - net->msc_ctrs->ctr[BSC_CTR_HANDOVER_COMPLETED].current, - net->msc_ctrs->ctr[BSC_CTR_HANDOVER_FAILED].current, + net->bsc_ctrs->ctr[BSC_CTR_HANDOVER_ATTEMPTED].current, + net->bsc_ctrs->ctr[BSC_CTR_HANDOVER_NO_CHANNEL].current, + net->bsc_ctrs->ctr[BSC_CTR_HANDOVER_TIMEOUT].current, + net->bsc_ctrs->ctr[BSC_CTR_HANDOVER_COMPLETED].current, + net->bsc_ctrs->ctr[BSC_CTR_HANDOVER_FAILED].current, VTY_NEWLINE); vty_out(vty, "SMS MO : %lu submitted, %lu no receiver%s", net->msc_ctrs->ctr[MSC_CTR_SMS_SUBMITTED].current, -- To view, visit https://gerrit.osmocom.org/3159 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9512330f2e91d2f526751c5228e6e8e0fe17d579 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Alexander Chemeris