OpenBSC May 2016

openbsc@lists.osmocom.org

25 participants
165 discussions

Change in openbsc[master]: db.c: implemented incremental migration

by gerrit-no-reply＠lists.osmocom.org

>From Vadim Yanitskiy <axilirator(a)gmail.com>: Vadim Yanitskiy has uploaded a new change for review. https://gerrit.osmocom.org/62 Change subject: db.c: implemented incremental migration ...................................................................... db.c: implemented incremental migration In the past, normal migration was possible only if the actual schema version differed from the version used in DB by 1. For example, if DB uses an old version 3 and you need to use it with the code written for version 5, the check_db_revision() will convert it to 4 and DB will still use incompatible schema version during Osmo-NITB running time. After next run it will be converted to version 5. This patch replaces a set of 'else-if' checks by a 'switch' without 'break' statements between 'case' labels (waterfall). It makes you able to migrate from current version to the latest despite any difference between them. Change-Id: Ia9c2aa86f96b88ad8a710d0a23879ce219bc82dc --- M openbsc/src/libmsc/db.c 1 file changed, 35 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/62/62/1 diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index e5017ae..b3235bb 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -374,9 +374,13 @@ { dbi_result result; const char *rev_s; + int db_rev = 0; + /* Make a query */ result = dbi_conn_query(conn, - "SELECT value FROM Meta WHERE key='revision'"); + "SELECT value FROM Meta " + "WHERE key = 'revision'"); + if (!result) return -EINVAL; @@ -384,33 +388,46 @@ dbi_result_free(result); return -EINVAL; } + + /* Fetch the DB schema revision */ rev_s = dbi_result_get_string(result, "value"); if (!rev_s) { dbi_result_free(result); return -EINVAL; } - if (!strcmp(rev_s, "2")) { - if (update_db_revision_2()) { - LOGP(DDB, LOGL_FATAL, "Failed to update database from schema revision '%s'.\n", rev_s); - dbi_result_free(result); - return -EINVAL; - } - } else if (!strcmp(rev_s, "3")) { - if (update_db_revision_3()) { - LOGP(DDB, LOGL_FATAL, "Failed to update database from schema revision '%s'.\n", rev_s); - dbi_result_free(result); - return -EINVAL; - } - } else if (!strcmp(rev_s, SCHEMA_REVISION)) { - /* everything is fine */ - } else { - LOGP(DDB, LOGL_FATAL, "Invalid database schema revision '%s'.\n", rev_s); + + if (!strcmp(rev_s, SCHEMA_REVISION)) { + /* Everything is fine */ dbi_result_free(result); + return 0; + } + + db_rev = atoi(rev_s); + dbi_result_free(result); + + /* Incremental migration waterfall */ + switch (db_rev) { + case 2: + if (update_db_revision_2()) + goto error; + case 3: + if (update_db_revision_3()) + goto error; + + /* The end of waterfall */ + break; + default: + LOGP(DDB, LOGL_FATAL, + "Invalid database schema revision '%d'.\n", db_rev); return -EINVAL; } - dbi_result_free(result); return 0; + +error: + LOGP(DDB, LOGL_FATAL, "Failed to update database " + "from schema revision '%d'.\n", db_rev); + return -EINVAL; } static int db_configure(void) -- To view, visit https://gerrit.osmocom.org/62 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9c2aa86f96b88ad8a710d0a23879ce219bc82dc Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy <axilirator(a)gmail.com>

9 years, 3 months

Patch for osmo-iuh master

by Alexander Huemer

This is a patch for osmo-iuh

9 years, 3 months

Change in libosmo-netif[master]: misc: Drop oRTP dependency as there is nothing using it

by gerrit-no-reply＠lists.osmocom.org

>From Holger Freyther <holger(a)freyther.de>: Holger Freyther has uploaded a new change for review. https://gerrit.osmocom.org/64 Change subject: misc: Drop oRTP dependency as there is nothing using it ...................................................................... misc: Drop oRTP dependency as there is nothing using it This seems to be a copy of paste of libsomo-abis. Let us just drop it here and be done with it. Change-Id: Ia5cb2b572fb5597605284d1c3f657d548aa790f2 --- M configure.ac M debian/control 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/64/64/1 diff --git a/configure.ac b/configure.ac index 19f7d18..64a7a1e 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,6 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0) dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7) -PKG_CHECK_MODULES(ORTP, ortp >= 0.15.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/control b/debian/control index c5bcb43..3953414 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> -Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev, libosmo-abis-dev, pkg-config, libortp-dev, libsctp-dev +Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev, libosmo-abis-dev, pkg-config, libsctp-dev Standards-Version: 3.9.6 Vcs-Git: git://git.osmocom.org/libosmo-netif.git Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-netif.git;a=summary -- To view, visit https://gerrit.osmocom.org/64 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5cb2b572fb5597605284d1c3f657d548aa790f2 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

9 years, 3 months

BTS power control

by robert

Hi, In a talk presented by Chris Paget [1] he states that the BTS can tell the MS to add a certain power amount to the signal that it has measured. Is this feature implemented in OpenBSC ? [1]: https://www.google.com.lb/url?sa=t&rct=j&q=&esrc=s&source=web&cd=3&cad=rja&… Best regards, Robert Steve,

9 years, 3 months

Change in libosmocore[master]: Set DTX in Cell Options

by gerrit-no-reply＠lists.osmocom.org

>From Max <msuraev(a)sysmocom.de>: Max has uploaded a new change for review. https://gerrit.osmocom.org/39 Change subject: Set DTX in Cell Options ...................................................................... Set DTX in Cell Options * rename field of struct gsm48_cell_options to better match the spec * add comments with spec references * add function for setting DTX in cell options struct * add necessary enum type Change-Id: I5a8924f57669c951b2e51b663d95f1d360062a54 --- M include/osmocom/gsm/protocol/gsm_04_08.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map 3 files changed, 61 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/39/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 3282bc1..5ee387b 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1,6 +1,7 @@ #pragma once #include <stdint.h> +#include <stdbool.h> #include <osmocom/core/utils.h> @@ -469,11 +470,20 @@ uint8_t t3212; } __attribute__ ((packed)); +enum gsm48_dtx_mode { + GSM48_MAY_USE, + GSM48_SHALL_USE, + GSM48_SHALL_NOT +}; + +/* Cell Options for SI6, SACCH (10.5.2.3a.2) or SI3, BCCH (Table 10.5.2.3.1), + 3GPP TS 44.018 */ struct gsm48_cell_options { uint8_t radio_link_timeout:4, dtx:2, pwrc:1, - spare:1; + /* either DN-IND or top bit of DTX IND */ + d:1; } __attribute__ ((packed)); /* Section 9.2.9 CM service request */ @@ -827,6 +837,9 @@ } } +void gsm48_set_dtx(struct gsm48_cell_options *op, enum gsm48_dtx_mode full, + enum gsm48_dtx_mode half, bool is_bcch); + #define gsm48_hdr_msg_type gsm48_hdr_msg_type_r99 /* Section 10.4 */ diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index ab62605..2a30b3c 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -25,7 +25,7 @@ #include <stdint.h> #include <stdio.h> #include <string.h> - +#include <stdbool.h> #include <arpa/inet.h> #include <osmocom/core/utils.h> @@ -358,6 +358,50 @@ return 0; } +/*! \brief Set DTX mode in Cell Options IE (3GPP TS 44.018) + * \param[in] op Cell Options structure in which DTX parameters will be set + * \param[in] full Mode for full-rate channels + * \param[in] half Mode for half-rate channels + * \param[in] is_bcch Indicates if we should use 10.5.2.3.1 instead of + * 10.5.2.3a.2 + * + * There is no space for separate DTX settings for Full and Half rate channels + * in BCCH - in this case full setting is used for both and half parameter is + * ignored. + */ +void gsm48_set_dtx(struct gsm48_cell_options *op, enum gsm48_dtx_mode full, + enum gsm48_dtx_mode half, bool is_bcch) +{ + if (is_bcch) { + switch (full) { + case GSM48_MAY_USE: + op->dtx = 0; + return; + case GSM48_SHALL_USE: + op->dtx = 1; + return; + case GSM48_SHALL_NOT: + op->dtx = 2; + return; + } + } else { + switch (full) { + case GSM48_MAY_USE: + op->dtx = (half == GSM48_SHALL_USE) ? 3 : 0; + op->d = (half == GSM48_SHALL_NOT) ? 0 : 1; + return; + case GSM48_SHALL_USE: + op->dtx = (half == GSM48_MAY_USE) ? 3 : 1; + op->d = (half == GSM48_SHALL_USE) ? 1 : 0; + return; + case GSM48_SHALL_NOT: + op->dtx = 2; + op->d = (half == GSM48_SHALL_USE) ? 1 : 0; + return; + } + } +} + int gsm48_generate_mid_from_tmsi(uint8_t *buf, uint32_t tmsi) { uint32_t tmsi_be = htonl(tmsi); diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index e0d9dcb..834e5d6 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -162,6 +162,8 @@ gsm48_number_of_paging_subchannels; gsm48_parse_ra; gsm48_rr_att_tlvdef; +gsm48_set_dtx; +gsm48_dtx_mode; gsm48_mi_type_name; gsm48_mcc_mnc_to_bcd; gsm48_mcc_mnc_from_bcd; -- To view, visit https://gerrit.osmocom.org/39 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a8924f57669c951b2e51b663d95f1d360062a54 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

9 years, 3 months

Change in openbsc[master]: Ignore extended test leftovers

by gerrit-no-reply＠lists.osmocom.org

>From Max <msuraev(a)sysmocom.de>: Max has uploaded a new change for review. https://gerrit.osmocom.org/41 Change subject: Ignore extended test leftovers ...................................................................... Ignore extended test leftovers Change-Id: If9e3522d934611f631cbfde6e6db52251babc37f --- M openbsc/.gitignore 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/41/41/1 diff --git a/openbsc/.gitignore b/openbsc/.gitignore index bae3b65..0a2965d 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -88,7 +88,7 @@ tests/testsuite tests/testsuite.log - +gsn_restart src/openbsc.cfg* writtenconfig/ gtphub_restart_count -- To view, visit https://gerrit.osmocom.org/41 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9e3522d934611f631cbfde6e6db52251babc37f Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

9 years, 3 months

Change in openbsc[master]: Ignore extended test leftovers

by gerrit-no-reply＠lists.osmocom.org

>From Holger Freyther <holger(a)freyther.de>: Holger Freyther has abandoned this change. Change subject: Ignore extended test leftovers ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/46 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic2a5c3ce863f87c8efe22b7773b9661d7a02b24e Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de> Gerrit-Reviewer: Max <msuraev(a)sysmocom.de>

9 years, 3 months

Change in openbsc[master]: Ignore extended test leftovers

by gerrit-no-reply＠lists.osmocom.org

>From Holger Freyther <holger(a)freyther.de>: Hello Neels Hofmeyr, Harald Welte, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/56 to review the following change. Change subject: Ignore extended test leftovers ...................................................................... Ignore extended test leftovers Change-Id: If9e3522d934611f631cbfde6e6db52251babc37f Reviewed-on: https://gerrit.osmocom.org/41 Reviewed-by: Harald Welte <laforge(a)gnumonks.org> Reviewed-by: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Tested-by: Holger Freyther <holger(a)freyther.de> --- M openbsc/.gitignore 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/56/56/1 diff --git a/openbsc/.gitignore b/openbsc/.gitignore index bae3b65..0a2965d 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -88,7 +88,7 @@ tests/testsuite tests/testsuite.log - +gsn_restart src/openbsc.cfg* writtenconfig/ gtphub_restart_count -- To view, visit https://gerrit.osmocom.org/56 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9e3522d934611f631cbfde6e6db52251babc37f Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de> Gerrit-Reviewer: Harald Welte <laforge(a)gnumonks.org> Gerrit-Reviewer: Max <msuraev(a)sysmocom.de> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

9 years, 3 months

Change in openbsc[master]: test.. please ignore

by gerrit-no-reply＠lists.osmocom.org

>From Holger Freyther <holger(a)freyther.de>: Holger Freyther has uploaded a new change for review. https://gerrit.osmocom.org/55 Change subject: test.. please ignore ...................................................................... test.. please ignore Change-Id: I3458f8f6596ff5446261e7e4c3ef8923cc21db06 --- M openbsc/README 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/55/55/1 diff --git a/openbsc/README b/openbsc/README index 88ea328..c42c207 100644 --- a/openbsc/README +++ b/openbsc/README @@ -37,3 +37,6 @@ http://openbsc.osmocom.org/ Harald Welte <laforge(a)gnumonks.org> + + +Test please ignore -- To view, visit https://gerrit.osmocom.org/55 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3458f8f6596ff5446261e7e4c3ef8923cc21db06 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

9 years, 3 months

Change in osmo-pcap[master]: todo: Add another of my wishlist items

by gerrit-no-reply＠lists.osmocom.org

>From Holger Freyther <holger(a)freyther.de>: Holger Freyther has submitted this change and it was merged. Change subject: todo: Add another of my wishlist items ...................................................................... todo: Add another of my wishlist items Change-Id: I5a6c473a97d04aecae8101a024edb734bbe24401 Reviewed-on: https://gerrit.osmocom.org/27 Tested-by: Jenkins Builder Reviewed-by: Harald Welte <laforge(a)gnumonks.org> --- M TODO 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO b/TODO index 6e39bc9..83f81ae 100644 --- a/TODO +++ b/TODO @@ -19,4 +19,6 @@ * Make the max size and rotate file configurable +* Add a streaming option so one can pipe each packet into tshark + or a similar utility. -- To view, visit https://gerrit.osmocom.org/27 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a6c473a97d04aecae8101a024edb734bbe24401 Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de> Gerrit-Reviewer: Harald Welte <laforge(a)gnumonks.org> Gerrit-Reviewer: Holger Freyther <holger(a)freyther.de> Gerrit-Reviewer: Jenkins Builder

9 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC May 2016