OpenBSC September 2015

openbsc@lists.osmocom.org

15 participants
29 discussions

[PATCH] ipa, gsup: file rename to prepare for refactoring
by Neels Hofmeyr 29 Sep '15

29 Sep '15

Rename gprs_gsup_client.* to ipa_client.*. To ease diff reading for the upcoming commit, this commit performs a file rename only. Background: currently, GSUP is the only protocol spoken on the IPA wire. We will now add OAP, a new protocol to register the SGSN with a MAP proxy. What has been only the GSUP client will mostly become the general IPA client. Sponsored-by: On-Waves ehf --- openbsc/include/openbsc/Makefile.am | 2 +- openbsc/include/openbsc/{gprs_gsup_client.h => ipa_client.h} | 0 openbsc/src/gprs/Makefile.am | 2 +- openbsc/src/gprs/gprs_subscriber.c | 2 +- openbsc/src/gprs/{gprs_gsup_client.c => ipa_client.c} | 2 +- openbsc/src/gprs/sgsn_vty.c | 2 +- openbsc/tests/sgsn/Makefile.am | 2 +- openbsc/tests/sgsn/sgsn_test.c | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename openbsc/include/openbsc/{gprs_gsup_client.h => ipa_client.h} (100%) rename openbsc/src/gprs/{gprs_gsup_client.c => ipa_client.c} (99%) diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index 254f43d..7bc9d95 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \ arfcn_range_encode.h nat_rewrite_trie.h bsc_nat_callstats.h \ osmux.h mgcp_transcode.h gprs_utils.h \ gprs_gb_parse.h smpp.h meas_feed.h gprs_gsup_messages.h \ - gprs_gsup_client.h bsc_msg_filter.h + ipa_client.h bsc_msg_filter.h openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h openbscdir = $(includedir)/openbsc diff --git a/openbsc/include/openbsc/gprs_gsup_client.h b/openbsc/include/openbsc/ipa_client.h similarity index 100% rename from openbsc/include/openbsc/gprs_gsup_client.h rename to openbsc/include/openbsc/ipa_client.h diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index f46a402..b9c3070 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -26,7 +26,7 @@ osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \ sgsn_main.c sgsn_vty.c sgsn_libgtp.c \ gprs_llc.c gprs_llc_parse.c gprs_llc_vty.c crc24.c \ sgsn_ctrl.c sgsn_auth.c gprs_subscriber.c \ - gprs_gsup_messages.c gprs_utils.c gprs_gsup_client.c \ + gprs_gsup_messages.c gprs_utils.c ipa_client.c \ gsm_04_08_gprs.c sgsn_cdr.c sgsn_ares.c osmo_sgsn_LDADD = \ $(top_builddir)/src/libcommon/libcommon.a \ diff --git a/openbsc/src/gprs/gprs_subscriber.c b/openbsc/src/gprs/gprs_subscriber.c index 8231e8c..0a3fe19 100644 --- a/openbsc/src/gprs/gprs_subscriber.c +++ b/openbsc/src/gprs/gprs_subscriber.c @@ -21,7 +21,7 @@ */ #include <openbsc/gsm_subscriber.h> -#include <openbsc/gprs_gsup_client.h> +#include <openbsc/ipa_client.h> #include <openbsc/sgsn.h> #include <openbsc/gprs_sgsn.h> diff --git a/openbsc/src/gprs/gprs_gsup_client.c b/openbsc/src/gprs/ipa_client.c similarity index 99% rename from openbsc/src/gprs/gprs_gsup_client.c rename to openbsc/src/gprs/ipa_client.c index 807b0c1..bec33c4 100644 --- a/openbsc/src/gprs/gprs_gsup_client.c +++ b/openbsc/src/gprs/ipa_client.c @@ -20,7 +20,7 @@ * */ -#include <openbsc/gprs_gsup_client.h> +#include <openbsc/ipa_client.h> #include <osmocom/abis/ipa.h> #include <osmocom/gsm/protocol/ipaccess.h> diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c index b74d01a..00a930f 100644 --- a/openbsc/src/gprs/sgsn_vty.c +++ b/openbsc/src/gprs/sgsn_vty.c @@ -34,7 +34,7 @@ #include <openbsc/gprs_sgsn.h> #include <openbsc/vty.h> #include <openbsc/gsm_04_08_gprs.h> -#include <openbsc/gprs_gsup_client.h> +#include <openbsc/ipa_client.h> #include <osmocom/vty/command.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/tests/sgsn/Makefile.am b/openbsc/tests/sgsn/Makefile.am index 3c202dd..ea29fce 100644 --- a/openbsc/tests/sgsn/Makefile.am +++ b/openbsc/tests/sgsn/Makefile.am @@ -24,7 +24,7 @@ sgsn_test_LDADD = \ $(top_builddir)/src/gprs/sgsn_auth.o \ $(top_builddir)/src/gprs/sgsn_ares.o \ $(top_builddir)/src/gprs/gprs_gsup_messages.o \ - $(top_builddir)/src/gprs/gprs_gsup_client.o \ + $(top_builddir)/src/gprs/ipa_client.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(top_builddir)/src/gprs/gprs_subscriber.o \ $(top_builddir)/src/gprs/gsm_04_08_gprs.o \ diff --git a/openbsc/tests/sgsn/sgsn_test.c b/openbsc/tests/sgsn/sgsn_test.c index 7e5ab1a..251772e 100644 --- a/openbsc/tests/sgsn/sgsn_test.c +++ b/openbsc/tests/sgsn/sgsn_test.c @@ -25,7 +25,7 @@ #include <openbsc/debug.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/gprs_gsup_messages.h> -#include <openbsc/gprs_gsup_client.h> +#include <openbsc/ipa_client.h> #include <openbsc/gprs_utils.h> #include <osmocom/gprs/gprs_bssgp.h> -- 2.1.4

1 0

KCM to parse / de-multiplex IPA in kernel?
by Harald Welte 28 Sep '15

28 Sep '15

Hi all, it seems like there is some work in the kernel network stack to have a generic multiplexor/demultiplexor for protocols that implement message-based semantics over TCP: http://thread.gmane.org/gmane.linux.network/378365 They don't implement a specific messaging protocol, but the userspace program can BPF to let the kernel muxer know how to find the length of the message. This seems like conceptually it is suitable for actually implementing an IPA multiplex inside the kernel and then get e.g. Abis OML and RSL on different sockets. Not that we urgently need anything like this, but I just wanted to point it out, in case somebody is interestd in it. -- - Harald Welte <laforge(a)gnumonks.org> ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

2 1

[PATCH] amr: Attempt to unbreak the AMR support in the BSC
by Holger Hans Peter Freyther 24 Sep '15

24 Sep '15

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> The signature of mr_config and the BSC implementation didn't match and the compiler was warning about it: osmo_bsc_api.c:530:2: warning: initialization from incompatible pointer type .mr_config = bsc_mr_config, ^ osmo_bsc_api.c:530:2: warning: (near initialization for ‘bsc_handler.mr_config’) Change the mr_config again and provide an implementation that will set the ms and bts data structure. It would be better to put the size outside of the IE but I am not going to change it right now. It would also be nice to either move the AMR setting into the "nitb" structure or have the msc data be used _after_ the bts settings. This needs to be cleaned up in the next step. Manually verified by placing a MO call and checking that both the channel mode modify and the mode modify request contain the multi rate config with the rate mr config (length two bytes, version 1, icmi==1, no start mode being set). --- openbsc/include/openbsc/bsc_api.h | 2 +- openbsc/src/libbsc/bsc_api.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_api.c | 36 +++++++++++++++++++++++++----------- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/openbsc/include/openbsc/bsc_api.h b/openbsc/include/openbsc/bsc_api.h index a70d765..a3d12f2 100644 --- a/openbsc/include/openbsc/bsc_api.h +++ b/openbsc/include/openbsc/bsc_api.h @@ -40,7 +40,7 @@ struct bsc_api { * not implemented AMR5.9 will be used. */ void (*mr_config)(struct gsm_subscriber_connection *conn, - uint8_t *mr_ms_lv, uint8_t *mr_bts_lv); + struct gsm_lchan *lchan, int full_rate); }; int bsc_api_init(struct gsm_network *network, struct bsc_api *api); diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index e157eb9..504f044 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -163,7 +163,7 @@ static void handle_mr_config(struct gsm_subscriber_connection *conn, struct gsm48_multi_rate_conf *mr_conf; if (api->mr_config) - return api->mr_config(conn, lchan->mr_ms_lv, lchan->mr_bts_lv); + return api->mr_config(conn, lchan, full_rate); if (full_rate) mr = &lchan->ts->trx->bts->mr_full; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_api.c b/openbsc/src/osmo-bsc/osmo_bsc_api.c index 00a10b3..fbeed77 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_api.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_api.c @@ -491,9 +491,10 @@ static void bsc_cm_update(struct gsm_subscriber_connection *conn, } static void bsc_mr_config(struct gsm_subscriber_connection *conn, - struct gsm48_multi_rate_conf *conf) + struct gsm_lchan *lchan, int full_rate) { struct osmo_msc_data *msc; + struct gsm48_multi_rate_conf *ms_conf, *bts_conf; if (!conn->sccp_con) { LOGP(DMSC, LOGL_ERROR, @@ -504,18 +505,31 @@ static void bsc_mr_config(struct gsm_subscriber_connection *conn, msc = conn->sccp_con->msc; - conf->ver = 1; - conf->icmi = 1; + /* initialize the data structure */ + lchan->mr_ms_lv[0] = sizeof(*ms_conf); + lchan->mr_bts_lv[0] = sizeof(*bts_conf); + ms_conf = (struct gsm48_multi_rate_conf *) &lchan->mr_ms_lv[1]; + bts_conf = (struct gsm48_multi_rate_conf *) &lchan->mr_bts_lv[1]; + memset(ms_conf, 0, sizeof(*ms_conf)); + memset(bts_conf, 0, sizeof(*bts_conf)); + + bts_conf->ver = ms_conf->ver = 1; + bts_conf->icmi = ms_conf->icmi = 1; /* maybe gcc see's it is copy of _one_ byte */ - conf->m4_75 = msc->amr_conf.m4_75; - conf->m5_15 = msc->amr_conf.m5_15; - conf->m5_90 = msc->amr_conf.m5_90; - conf->m6_70 = msc->amr_conf.m6_70; - conf->m7_40 = msc->amr_conf.m7_40; - conf->m7_95 = msc->amr_conf.m7_95; - conf->m10_2 = msc->amr_conf.m10_2; - conf->m12_2 = msc->amr_conf.m12_2; + bts_conf->m4_75 = ms_conf->m4_75 = msc->amr_conf.m4_75; + bts_conf->m5_15 = ms_conf->m5_15 = msc->amr_conf.m5_15; + bts_conf->m5_90 = ms_conf->m5_90 = msc->amr_conf.m5_90; + bts_conf->m6_70 = ms_conf->m6_70 = msc->amr_conf.m6_70; + bts_conf->m7_40 = ms_conf->m7_40 = msc->amr_conf.m7_40; + bts_conf->m7_95 = ms_conf->m7_95 = msc->amr_conf.m7_95; + if (full_rate) { + bts_conf->m10_2 = ms_conf->m10_2 = msc->amr_conf.m10_2; + bts_conf->m12_2 = ms_conf->m12_2 = msc->amr_conf.m12_2; + } + + /* now copy this into the bts structure */ + memcpy(lchan->mr_bts_lv, lchan->mr_ms_lv, sizeof(lchan->mr_ms_lv)); } static struct bsc_api bsc_handler = { -- 2.3.5

1 0

[PATCH 1/3] amr: Remove some code duplication in preparation
by Holger Hans Peter Freyther 24 Sep '15

24 Sep '15

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Merge two copies into a local static helper function. The format of the message will change and then it is easier to modify it in one place than in two. Sadly the original patch was merged before this clean-up so do the clean-up as second step. Conflicts: openbsc/src/libbsc/abis_rsl.c openbsc/src/libbsc/gsm_04_08_utils.c --- openbsc/src/libbsc/abis_rsl.c | 18 +++++++++--------- openbsc/src/libbsc/gsm_04_08_utils.c | 15 +++++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index 526b977..8e9258c 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -442,6 +442,13 @@ static int channel_mode_from_lchan(struct rsl_ie_chan_mode *cm, return 0; } +static void mr_config_for_bts(struct gsm_lchan *lchan, struct msgb *msg) +{ + if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) + msgb_tlv_put(msg, RSL_IE_MR_CONFIG, lchan->mr_bts_lv[0], + lchan->mr_bts_lv + 1); +} + /* Chapter 8.4.1 */ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref) @@ -518,10 +525,7 @@ int rsl_chan_activate_lchan(struct gsm_lchan *lchan, uint8_t act_type, msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->bs_power); msgb_tv_put(msg, RSL_IE_MS_POWER, lchan->ms_power); msgb_tv_put(msg, RSL_IE_TIMING_ADVANCE, ta); - - if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) - msgb_tlv_put(msg, RSL_IE_MR_CONFIG, lchan->mr_bts_lv[0], - lchan->mr_bts_lv + 1); + mr_config_for_bts(lchan, msg); msg->dst = lchan->ts->trx->rsl_link; @@ -557,11 +561,7 @@ int rsl_chan_mode_modify_req(struct gsm_lchan *lchan) msgb_tlv_put(msg, RSL_IE_ENCR_INFO, rc, encr_info); } - if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) -{ - msgb_tlv_put(msg, RSL_IE_MR_CONFIG, lchan->mr_bts_lv[0], - lchan->mr_bts_lv + 1); -} + mr_config_for_bts(lchan, msg); msg->dst = lchan->ts->trx->rsl_link; diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index ef82555..24a1cfd 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -214,6 +214,13 @@ int get_reason_by_chreq(uint8_t ra, int neci) return GSM_CHREQ_REASON_OTHER; } +static void mr_config_for_ms(struct gsm_lchan *lchan, struct msgb *msg) +{ + if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) + msgb_tlv_put(msg, GSM48_IE_MUL_RATE_CFG, lchan->mr_ms_lv[0], + lchan->mr_ms_lv + 1); +} + /* 7.1.7 and 9.1.7: RR CHANnel RELease */ int gsm48_send_rr_release(struct gsm_lchan *lchan) { @@ -489,9 +496,7 @@ int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, } /* in case of multi rate we need to attach a config */ - if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) - msgb_tlv_put(msg, GSM48_IE_MUL_RATE_CFG, lchan->mr_ms_lv[0], - lchan->mr_ms_lv + 1); + mr_config_for_ms(lchan, msg); return gsm48_sendmsg(msg); } @@ -517,9 +522,7 @@ int gsm48_tx_chan_mode_modify(struct gsm_lchan *lchan, uint8_t mode) cmm->mode = mode; /* in case of multi rate we need to attach a config */ - if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR) - msgb_tlv_put(msg, GSM48_IE_MUL_RATE_CFG, lchan->mr_ms_lv[0], - lchan->mr_ms_lv + 1); + mr_config_for_ms(lchan, msg); return gsm48_sendmsg(msg); } -- 2.3.5

2 3

Osmo TRX Make Issue
by Turi, Benjamin Thomas 23 Sep '15

23 Sep '15

Greetings! I'm not sure if I am emailing the right list, but I got stuck with an error with making Osmo-TRX and need some help. To give you some background, I am doing a project with OpenBTS and GSM. My project is being built on the small, yet powerful Beaglebone Black. As you might now, Osmo TRX is one of the few ARM-friendly transceivers for OpenBTS. I was following the instructions as provided on the main website for install it and when it came time to make the project, I ran across an error: Make: ***No rule to make target '/Makefile.common', needed by 'Makefile.in'. Stop. I am using the code from the github site. Unfortunately, I could not diagnose the bug and the error. Would anyone be able to assist me? Thank you so much for your help, I really do appreciate it! As an added note: Another error that I ran into that you might want to know about is when I ran "autoreconf -i", I got an error saying: C objects in subdir but 'AM_PROG_CC_C_0' not in 'configure.ac' Which caused automake to fail with exit status 1. However, simply adding 'AM_PROG_CC_C_0' to the file configure.ac seemed to fix the problem. Thanks again! :)

1 0

L1SAP and TRX rebase, the last one (TM)
by Harald Welte 22 Sep '15

22 Sep '15

Dear all, after my futile attempt in September last year to finally merge l1sap (see the 201409-l1sap branch), I'm making one final attempt. The following branches have been created + pushed: * 201509-l1sap: The core l1sap change that I intend to merge This is most of the heavy lifting by introducing L1SAP between the sysmobts l1 and the common code. Hasn't been modified much. * 201509-trx-rebase: osmo-bts-trx support that I intend to merge This is what I can merge without too much review, as it does not touch the common code, except some minor l1sap fixes, and * the AMR multirate change, requiring a matching patch on openbsc.git * bts_model_abis_close() which should be fine * ability to configue multiple TRX from VTY * 201509-fairwaves-rebase Stuff I cannot merge in its current form * the abis/e1inp multi-trx and reconnect changes require in-depth review and testing. Part of it is marked as HACK even by Andreas. * a so-called 'fix for use after free' that is actually a patch that introduces another copy for every primitive and is only required for the loopback mode * copying gsm_data_common.[ch] into the repo for debian packaging [let's not discuss further work on this before l1sap and trx-rebase are merged] I recommend everyone with a stake in this to review or test the code in 201509-l1sap and 201509-trx-rebase now. My schedule is to merge at some point next week, unless someone raises some serious objections. What needs to be done after the merge is to unify the src/common/power_control.c code from Holger originating in master with src/common/loops.c from Andreas originating from the osmo-trx branch. There is no doubt that the power control and timing advance loops should be part of common, as this is required in virtually any BTS hardware. However, we can safely merge/unify this after the merging of the above branches. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

4 13

DL TBF abnormal release
by Sipos Csaba 21 Sep '15

21 Sep '15

Dear Jacob, Finally I managed to get everything in a working order, so I can finally start testing the GPRS part of OpenBSC/Osmo-PCU with an USRP B200. I am using a Cat 12 device with a 4 PDCH configuration. In the past I wrote a little script to test the PRACH stability of OpenBTS, which sends a single ping to the gateway address, waits until the session goes into idle, and then tries again. The goal is to generate as many PRACH as possible and check if there is a response. I used this script and it turns out that around 1 out of every 20 requests the ping is not reaching the gateway, and the UE indicates an abnormal DL TBF release. I attached the UE side log, so you can take a look. During this issue there is no reasonable frequency nor timing variation indicated on the UE side. What I noticed is the very high number of RLC resent and RLC restarted. After a few minutes of pinging, this is the result from the PCU: RLC Sent : 18015 (0/s 0/m 0/h 0/d) RLC Resent : 17596 (0/s 0/m 0/h 0/d) RLC Restarted : 15669 (0/s 0/m 0/h 0/d) RLC Stalled : 0 (0/s 0/m 0/h 0/d) Please note that the ARFCN I use is completely clean, I filter the uplink with proper duplexer and the TRX is not complaining about anything. Also interesting that during constant pinging (the system does not need to do PRACH), this problem is not popping up. Will update my UHD stack from 3.8.0 to 3.9.0 just to test with the latest, but I don't think itt will change anything about this issue. And to be hones, we've seen similar PRACH related issues with OpenBTS GPRS too. If you need any more logs or you have an idea what to try, I am happy to do that. :-) Regards, Csaba

3 4

Motorola Horizon macro BTS available for free
by Harald Welte 20 Sep '15

20 Sep '15

Hi all, I am getting rid of some old hardware to make space for new stuff. The most bulky item in my collection is a Motorola Horizon macro BTS. If you don't know it, check out http://openbsc.osmocom.org/trac/wiki/Motorola_Horizon_macro in the OpenBSC wiki. IMPORTANT: Due to the large deviations of Motorola from standard GSM, this BTS does not have an Abis interface and thus is not compatible with OpenBSC! Still, it contains some interesting electronics, including the 40W PAs and hybrid combiner/duplexers. The unit comes with three TRX (as on the pictures linked above), as well as my custom-made serial cable to access the console port of all three main processors, see http://openbsc.osmocom.org/trac/wiki/Motorola_Horizon_macro/MCUF_Console You can have it free of charge if you take care of shipping. Please contact me privately if you are interested. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

1 0

Last two Siemens BS-11 available
by Harald Welte 20 Sep '15

20 Sep '15

Hi all, the history of OpenBSC (and thus the Osmocom umbrella project) started with the Siemens BS-11 microBTS. I still have three of those BTS, and think that one is enough, i.e. two BS-11 are available. If you are an active contributor to OpenBSC or represent a public research organization, I will provide them free of charge, you only have to pay for shipping. For all other interested parties, I would like 200 EUR per unit (excl. shipping), which still makes it one of the cheapest options for running your own network with OpenBSC. If you're not familiar with the BS-11 and its technical data, please check http://openbsc.osmocom.org/trac/wiki/BS11 and related pages i nthe wiki. They units I have available are with 230V power supply and operate in the GSM900 band. I also have one compatible HFC-E1 PCI E1 adapter (supported by mISDN + OpenBSC) available. Please contact me privately if you are interested. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

1 0

[PATCH] build: have a disable-static build succeed
by Jan Engelhardt 16 Sep '15

16 Sep '15

When using configure --disable-static, no libosmogsm.a will be created, and the tests fail to link because symbols like _a5_3 and _a5_4 are not exported through the only remaining libosmogsm.so. A method to overcome this is an intermediate private non-distributed library, examples of which are present in e.g. libabc, kmod and systemd. With this, disable-static can now be the default and practical compile time be halved. --- * This is for libosmocore. * configure.ac | 2 +- src/gsm/Makefile.am | 8 ++++++-- tests/Makefile.am | 6 ++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index c492277..9a744b1 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AC_PROG_MAKE_SET AC_PROG_MKDIR_P AC_PROG_CC AC_PROG_INSTALL -LT_INIT([pic-only]) +LT_INIT([pic-only disable-static]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index d8aff4a..1878050 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -10,9 +10,10 @@ noinst_HEADERS = milenage/aes.h milenage/aes_i.h milenage/aes_wrap.h \ milenage/common.h milenage/crypto.h milenage/includes.h \ milenage/milenage.h +noinst_LTLIBRARIES = libgsmint.la lib_LTLIBRARIES = libosmogsm.la -libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ +libgsmint_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ gsm_utils.c rsl.c gsm48.c gsm48_ie.c gsm0808.c sysinfo.c \ gprs_cipher_core.c gsm0480.c abis_nm.c gsm0502.c \ gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c \ @@ -21,8 +22,11 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ auth_milenage.c milenage/aes-encblock.c \ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c +libgsmint_la_LDFLAGS = -no-undefined +libgsmint_la_LIBADD = ../libosmocore.la +libosmogsm_la_SOURCES = libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined -libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la +libosmogsm_la_LIBADD = libgsmint.la EXTRA_DIST = libosmogsm.map diff --git a/tests/Makefile.am b/tests/Makefile.am index 8e31f66..cf0977d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,12 +19,10 @@ utils_utils_test_SOURCES = utils/utils_test.c utils_utils_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la a5_a5_test_SOURCES = a5/a5_test.c -a5_a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la -a5_a5_test_LDFLAGS = -static +a5_a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libgsmint.la kasumi_kasumi_test_SOURCES = kasumi/kasumi_test.c -kasumi_kasumi_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la -kasumi_kasumi_test_LDFLAGS = -static +kasumi_kasumi_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libgsmint.la comp128_comp128_test_SOURCES = comp128/comp128_test.c comp128_comp128_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la -- 2.4.3

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC September 2015