OpenBSC

openbsc@lists.osmocom.org

14 participants
4279 discussions

libosmocore: patch for big-endian architectures
by Ruben Undheim 31 May '16

31 May '16

Hi, One test case fails for openbsc on big-endian architectures. This was traced back to struct erros in libosmocore. Please see patch below: commit fb3d353ab238a2d14cb8e9704995f14a2acd6c1b Author: Ruben Undheim <ruben.undheim(a)gmail.com> Date: Mon Dec 7 19:34:28 2015 +0100 Patched structs for big-endian architectures diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 4800b48..0c2fcf2 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -4,6 +4,8 @@ #include <stdbool.h> #include <osmocom/core/utils.h> +#include <osmocom/core/endian.h> + /* GSM TS 04.08 definitions */ struct gsm_lchan; @@ -42,6 +44,7 @@ struct gsm48_classmark2 { } __attribute__ ((packed)); /* Chapter 10.5.2.1b.3 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_1024 { uint8_t w1_hi:2, f0:1, @@ -75,8 +78,44 @@ struct gsm48_range_1024 { uint8_t w16:6, w15_lo:2; } __attribute__ ((packed)); +#else +struct gsm48_range_1024 { + uint8_t form_id:5, + f0:1, + w1_hi:2; + uint8_t w1_lo; + uint8_t w2_hi; + uint8_t w2_lo:1, + w3_hi:7; + uint8_t w3_lo:2, + w4_hi:6; + uint8_t w4_lo:2, + w5_hi:6; + uint8_t w5_lo:2, + w6_hi:6; + uint8_t w6_lo:2, + w7_hi:6; + uint8_t w7_lo:2, + w8_hi:6; + uint8_t w8_lo:1, + w9:7; + uint8_t w10:7, + w11_hi:1; + uint8_t w11_lo:6, + w12_hi:2; + uint8_t w12_lo:5, + w13_hi:3; + uint8_t w13_lo:4, + w14_hi:4; + uint8_t w14_lo:3, + w15_hi:5; + uint8_t w15_lo:2, + w16:6; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.4 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_512 { uint8_t orig_arfcn_hi:1, form_id:7; @@ -110,8 +149,44 @@ struct gsm48_range_512 { uint8_t w17:5, w16_lo:3; } __attribute__ ((packed)); +#else +struct gsm48_range_512 { + uint8_t form_id:7, + orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, + w1_hi:7; + uint8_t w1_lo:2, + w2_hi:6; + uint8_t w2_lo:2, + w3_hi:6; + uint8_t w3_lo:2, + w4_hi:6; + uint8_t w4_lo:1, + w5:7; + uint8_t w6:7, + w7_hi:1; + uint8_t w7_lo:6, + w8_hi:2; + uint8_t w8_lo:4, + w9_hi:4; + uint8_t w9_lo:2, + w10:6; + uint8_t w11:6, + w12_hi:2; + uint8_t w12_lo:4, + w13_hi:4; + uint8_t w13_lo:2, + w14:6; + uint8_t w15:6, + w16_hi:2; + uint8_t w16_lo:3, + w17:5; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.5 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_256 { uint8_t orig_arfcn_hi:1, form_id:7; @@ -151,8 +226,50 @@ struct gsm48_range_256 { w21:4, w20_lo:3; } __attribute__ ((packed)); +#else +struct gsm48_range_256 { + uint8_t form_id:7, + orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, + w1_hi:7; + uint8_t w1_lo:1, + w2:7; + uint8_t w3:7, + w4_hi:1; + uint8_t w4_lo:5, + w5_hi:3; + uint8_t w5_lo:3, + w6_hi:5; + uint8_t w6_lo:1, + w7:6, + w8_hi:1; + uint8_t w8_lo:4, + w9_hi:4; + uint8_t w9_lo:1, + w10:5, + w11_hi:2; + uint8_t w11_lo:3, + w12:5; + uint8_t w13:5, + w14_hi:3; + uint8_t w14_lo:2, + w15:5, + w16_hi:1; + uint8_t w16_lo:3, + w17:4, + w18_hi:1; + uint8_t w18_lo:3, + w19:4, + w20_hi:1; + uint8_t w20_lo:3, + w21:4, + spare:1; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.6 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_128 { uint8_t orig_arfcn_hi:1, form_id:7; @@ -194,6 +311,49 @@ struct gsm48_range_128 { w27:3, w26_lo:1; } __attribute__ ((packed)); +#else +struct gsm48_range_128 { + uint8_t form_id:7, + orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, + w1:7; + uint8_t w2:6, + w3_hi:2; + uint8_t w3_lo:4, + w4_hi:4; + uint8_t w4_lo:1, + w5:5, + w6_hi:2; + uint8_t w6_lo:3, + w7:5; + uint8_t w8:4, + w9:4; + uint8_t w10:4, + w11:4; + uint8_t w12:4, + w13:4; + uint8_t w14:4, + w15:4; + uint8_t w16:3, + w17:3, + w18_hi:2; + uint8_t w18_lo:1, + w19:3, + w20:3, + w21_hi:1; + uint8_t w21_lo:2, + w22:3, + w23:3; + uint8_t w24:3, + w25:3, + w26_hi:2; + uint8_t w26_lo:1, + w27:3, + w28:3, + spare:1; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.7 */ struct gsm48_var_bit { I tried 30 seconds to figure out how to use Gerrit, but I couldn't figure out how to login, so I rather just post here. Best regards, Ruben

3 14

[PATCH] osmo-bts[master]: octphy: Update outdated config param name in error message.
by lazlo 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/129 octphy: Update outdated config param name in error message. Change-Id: I45b8bc09c9aabacc5b908450fe574b5802b88be8 --- M src/osmo-bts-octphy/l1_if.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/29/129/1 diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index ec61d6b..c8ed216 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -1618,7 +1618,7 @@ fl1h->phy_link = plink; if (!phy_dev) { - LOGP(DL1C, LOGL_ERROR, "You have to specify a phy-netdev\n"); + LOGP(DL1C, LOGL_ERROR, "You have to specify a octphy net-device\n"); talloc_free(fl1h); return NULL; } -- To view, visit https://gerrit.osmocom.org/129 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45b8bc09c9aabacc5b908450fe574b5802b88be8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: lazlo <dlsitzer(a)gmail.com>

3 3

[PATCH] openbsc[master]: Make si2q scheduling optional
by Max 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/81 Make si2q scheduling optional Previously si2quater SI messages were always scheduled. Check for neighbor configuration and only schedule si2q when necessary. Change-Id: Ibe997803ffb894133fd4d838410fe735791d414f Fixes: OS#1727 --- M openbsc/src/libbsc/system_information.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/81/81/1 diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index 1f1d81e..8e59817 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -648,7 +648,7 @@ static int generate_si2quater(uint8_t *output, struct gsm_bts *bts) { - int rc; + int rc, i; struct gsm48_system_information_type_2quater *si2q = (struct gsm48_system_information_type_2quater *) output; @@ -667,6 +667,13 @@ if (rc < 0) return rc; + for (i = 0; i < MAX_EARFCN_LIST; i++) + if (bts->si_common.si2quater_neigh_list.arfcn[i] != + OSMO_EARFCN_INVALID) + break; + if (!bts->si_common.uarfcn_length && i == MAX_EARFCN_LIST) + bts->si_valid &= ~(1 << SYSINFO_TYPE_2quater); + return sizeof(*si2q) + rc; } -- To view, visit https://gerrit.osmocom.org/81 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe997803ffb894133fd4d838410fe735791d414f Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

2 8

Change in openbsc[master]: bsc: Create minimal SI6 rest octets
by gerrit-no-reply＠lists.osmocom.org 31 May '16

31 May '16

>From Holger Freyther <holger(a)freyther.de>: Holger Freyther has uploaded a new change for review. https://gerrit.osmocom.org/71 Change subject: bsc: Create minimal SI6 rest octets ...................................................................... bsc: Create minimal SI6 rest octets In GSM R99 SI6 has mandatory SI6 rest octets and so far we did not include them. Add minimal support to generate the right band indicator. Change-Id: I417a40eb91f42a3416b4e07bb9fb4d7a01aaa36b Fixes: OS#1698 Related: OS#1725 --- M openbsc/include/openbsc/rest_octets.h M openbsc/src/libbsc/rest_octets.c M openbsc/src/libbsc/system_information.c 3 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/71/71/1 diff --git a/openbsc/include/openbsc/rest_octets.h b/openbsc/include/openbsc/rest_octets.h index 32b9963..8d17ddb 100644 --- a/openbsc/include/openbsc/rest_octets.h +++ b/openbsc/include/openbsc/rest_octets.h @@ -12,6 +12,7 @@ int rest_octets_si1(uint8_t *data, uint8_t *nch_pos, int is1800_net); int rest_octets_si2quater(uint8_t *data, const struct osmo_earfcn_si2q *e, const uint16_t *u, const uint16_t *sc, size_t u_len); +int rest_octets_si6(uint8_t *data, int is1800_net); struct gsm48_si_selection_params { uint16_t penalty_time:5, diff --git a/openbsc/src/libbsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c index aa286e5..229c4ab 100644 --- a/openbsc/src/libbsc/rest_octets.c +++ b/openbsc/src/libbsc/rest_octets.c @@ -450,6 +450,45 @@ return bv.data_len; } + +/* GSM 04.18 ETSI TS 101 503 V8.27.0 (2006-05) + +<SI6 rest octets> ::= +{L | H <PCH and NCH info>} +{L | H <VBS/VGCS options : bit(2)>} +{ < DTM_support : bit == L > I < DTM_support : bit == H > +< RAC : bit (8) > +< MAX_LAPDm : bit (3) > } +< Band indicator > +{ L | H < GPRS_MS_TXPWR_MAX_CCH : bit (5) > } +<implicit spare >; +*/ +int rest_octets_si6(uint8_t *data, int is1800_net) +{ + struct bitvec bv; + + memset(&bv, 0, sizeof(bv)); + bv.data = data; + bv.data_len = 1; + + /* no PCH/NCH info */ + bitvec_set_bit(&bv, L); + /* no VBS/VGCS options */ + bitvec_set_bit(&bv, L); + /* no DTM_support */ + bitvec_set_bit(&bv, L); + /* band indicator */ + if (is1800_net) + bitvec_set_bit(&bv, L); + else + bitvec_set_bit(&bv, H); + /* no GPRS_MS_TXPWR_MAX_CCH */ + bitvec_set_bit(&bv, L); + + bitvec_spare_padding(&bv, 3); + return bv.data_len; +} + /* GPRS Mobile Allocation as per TS 04.60 Chapter 12.10a: < GPRS Mobile Allocation IE > ::= < HSN : bit (6) > diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index 1f1d81e..8f9fb9b 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -905,6 +905,7 @@ { struct gsm48_system_information_type_6 *si6; int l2_plen = 11; + int rc; memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); @@ -935,8 +936,9 @@ gsm48_set_dtx(&si6->cell_options, bts->dtxu, bts->dtxu, true); /* SI6 Rest Octets: 10.5.2.35a: PCH / NCH info, VBS/VGCS options */ + rc = rest_octets_si6(si6->rest_octets, is_dcs_net(bts)); - return l2_plen; + return l2_plen + rc; } static struct gsm48_si13_info si13_default = { -- To view, visit https://gerrit.osmocom.org/71 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I417a40eb91f42a3416b4e07bb9fb4d7a01aaa36b Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

3 5

[PATCH] libosmocore[master]: Add strings with PH primitive names
by Max 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/117 Add strings with PH primitive names It's useful debugging helper while troubleshooting L1-related issues. Change-Id: Id7a6d478fd725c51f54ad746bdf9b9095579ff77 --- M include/osmocom/gsm/l1sap.h M src/gsm/lapdm.c M src/gsm/libosmogsm.map 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/117/1 diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h index 1af8ba8..ad942ea 100644 --- a/include/osmocom/gsm/l1sap.h +++ b/include/osmocom/gsm/l1sap.h @@ -14,6 +14,8 @@ PRIM_TCH_RTS, /*!< \brief TCH */ }; +extern const struct value_string osmo_ph_prim_names[]; + /*! \brief PH-SAP related primitives (L1<->L2 SAP) */ enum osmo_mph_info_type { PRIM_INFO_TIME, /*!< \brief Current GSM time */ diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index d44335f..36a97f4 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -111,6 +111,17 @@ LAPDm_FMT_B4, }; +const struct value_string osmo_ph_prim_names[] = { + { PRIM_PH_DATA, "PH-DATA" }, + { PRIM_PH_RACH, "PH-RANDOM_ACCESS" }, + { PRIM_PH_CONN, "PH-CONNECT" }, + { PRIM_PH_EMPTY_FRAME, "PH-EMPTY_FRAME" }, + { PRIM_PH_RTS, "PH-RTS" }, + { PRIM_MPH_INFO, "MPH-INFO" }, + { PRIM_TCH, "TCH" }, + { PRIM_TCH_RTS, "TCH-RTS" }, +}; + static int lapdm_send_ph_data_req(struct lapd_msg_ctx *lctx, struct msgb *msg); static int send_rslms_dlsap(struct osmo_dlsap_prim *dp, struct lapd_msg_ctx *lctx); diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 1e2d323..301f5aa 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -223,6 +223,8 @@ lapdm_phsap_up; lapdm_rslms_recvmsg; +osmo_ph_prim_names; + milenage_auts; milenage_check; milenage_f1; -- To view, visit https://gerrit.osmocom.org/117 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7a6d478fd725c51f54ad746bdf9b9095579ff77 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

2 6

[PATCH] osmo-sip-connector[master]: ifirst reandom change
by Holger Freyther 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/126 ifirst reandom change Change-Id: I2b2beffdefd46876ad612ae0ad1f7c6057157392 --- M README.asciidoc 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/26/126/1 diff --git a/README.asciidoc b/README.asciidoc index acd491b..5b6b6df 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -32,3 +32,7 @@ * AMR SDP file doesn't include the mode-set params and allowed codec modes. This needs to be configured in some way. + + + +RANDOM change.. -- To view, visit https://gerrit.osmocom.org/126 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b2beffdefd46876ad612ae0ad1f7c6057157392 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

1 2

[PATCH] osmo-sip-connector[master]: Second random change
by Holger Freyther 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/127 Second random change Change-Id: I01e9ce184d0b98f89e3ccdfabe2d3c95a0a8d939 --- M doc/examples/osmo-sip-connector.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/27/127/1 diff --git a/doc/examples/osmo-sip-connector.cfg b/doc/examples/osmo-sip-connector.cfg index ad42969..df71332 100644 --- a/doc/examples/osmo-sip-connector.cfg +++ b/doc/examples/osmo-sip-connector.cfg @@ -2,5 +2,6 @@ mncc socket-path /tmp/bsc_mncc sip +! color of .. local 0.0.0.0 5060 remote pbx 5060 -- To view, visit https://gerrit.osmocom.org/127 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01e9ce184d0b98f89e3ccdfabe2d3c95a0a8d939 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

1 2

Closing the gap between official debian and our nightly builds
by Holger Freyther 31 May '16

31 May '16

Dear Ruben, I wonder if you could give us/me a hand in closing the gap between the official packages. In general we are willing to drop backwards compatibility with our install base to reach Debian standards. Ideally a user can easily upgrade from a Debian version to our nightly builds and you and other debian developers can hopefully easily take our source packages and move them forward as well. Do you have experience with upstream making their own debian packages and a proper package being included in debian as well? Shall I create tickets in our osmocom.org redmine to coordinate synchronization? Are you aware of different sysv init script names, paths for config/hlr files, package names? From a very brief look: + We never handled the .copyright files correctly you do + debian/control you have nice short and long terms descriptions we should have + You have patches for typos and other parts (i have pushed the ggsn one and will go through the patches later) + Your have manpages and we never bothered with it. I think it is a really good debian rule (and good Unix legacy to force a manpage for binaries in /usr!) - At least for OpenBSC you do not seem to package the -dbg symbols. As a developer I am always annoyed (e.g. with sofia sip) when I can't install the debug symbols. - You seem to not include sysvinit (and systemd) service files? Do you have a proposal on how we could move forward? How do you manage/maintain the extra debian/ directory? kind regards holger

2 8

osmo-sip-connector
by Max 30 May '16

30 May '16

Hi. Anyone used $subj? If so, with which SIP servers? Could you share respective sip server configuration samples? -- Max Suraev <msuraev(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Directors: Holger Freyther, Harald Welte

2 1

Re: [osmocom/libosmocore] Fixing build on Mac OSX (#3)
by Neels Hofmeyr 30 May '16

30 May '16

On Sun, May 29, 2016 at 09:23:21PM -0700, tsaitgaist wrote: > GitHub is only used to mirror [osmocom projects](http://git.osmocom.org/). Please use the [mailing lists](https://lists.osmocom.org/mailman/listinfo) to [submit patches](http://projects.osmocom.org/projects/cellular-infrastructure/wiki/…. We could reword this to avoid mentioning the ML by being generic in the wording (in case we want to switch to other systems in the future), and to be more encouraging: "Thank you for your patch submission! Unfortunately GitHub is only used to mirror [osmocom projects](http://git.osmocom.org/). Please follow [these instructions](http://projects.osmocom.org/projects/cellular-infrastructure/… to submit patches instead. Thanks!" ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC