OpenBSC August 2013

openbsc@lists.osmocom.org

26 participants
49 discussions

[PATCH] nanobts: Fix initialization of two concurrent BTS.

by Holger Hans Peter Freyther

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> It was possible that the wrong NSEI information was sent to the BTS. This is because patch_nm_tables is not called before sending the data to the BTS. This will break when two BTS connect more or less at the same time. Stop using the arrays directly and instead introduce a method that will patch the table and return the data and length. This makes sure that all users patch the table before we send the data to the BTS. --- openbsc/src/libbsc/bts_ipaccess_nanobts.c | 66 ++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index c8b235d..dfc8d16 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -265,6 +265,40 @@ static void patch_nm_tables(struct gsm_bts *bts) } } +static uint8_t *nanobts_attr_bts_get(struct gsm_bts *bts, size_t *data_len) +{ + patch_nm_tables(bts); + *data_len = sizeof(nanobts_attr_bts); + return nanobts_attr_bts; +} + +static uint8_t *nanobts_attr_nse_get(struct gsm_bts *bts, size_t *data_len) +{ + patch_nm_tables(bts); + *data_len = sizeof(nanobts_attr_nse); + return nanobts_attr_nse; +} + +static uint8_t *nanobts_attr_cell_get(struct gsm_bts *bts, size_t *data_len) +{ + patch_nm_tables(bts); + *data_len = sizeof(nanobts_attr_cell); + return nanobts_attr_cell; +} + +static uint8_t *nanobts_attr_nscv_get(struct gsm_bts *bts, size_t *data_len) +{ + patch_nm_tables(bts); + *data_len = sizeof(nanobts_attr_nsvc0); + return nanobts_attr_nsvc0; +} + +static uint8_t *nanobts_attr_radio_get(struct gsm_bts *bts, size_t *data_len) +{ + patch_nm_tables(bts); + *data_len = sizeof(nanobts_attr_radio); + return nanobts_attr_radio; +} /* Callback function to be called whenever we get a GSM 12.21 state change event */ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) @@ -278,6 +312,9 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) struct gsm_bts_trx_ts *ts; struct gsm_bts_gprs_nsvc *nsvc; + uint8_t *data; + size_t data_len; + if (!is_ipaccess_bts(nsd->bts)) return 0; @@ -300,9 +337,8 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) case NM_OC_BTS: bts = obj; if (new_state->availability == NM_AVSTATE_DEPENDENCY) { - patch_nm_tables(bts); - abis_nm_set_bts_attr(bts, nanobts_attr_bts, - sizeof(nanobts_attr_bts)); + data = nanobts_attr_bts_get(bts, &data_len); + abis_nm_set_bts_attr(bts, data, data_len); abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr, 0xff, 0xff, NM_STATE_UNLOCKED); @@ -315,7 +351,6 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) trx = ts->trx; if (new_state->operational == NM_OPSTATE_DISABLED && new_state->availability == NM_AVSTATE_DEPENDENCY) { - patch_nm_tables(trx->bts); enum abis_nm_chan_comb ccomb = abis_nm_chcomb4pchan(ts->pchan); abis_nm_set_channel_attr(ts, ccomb); @@ -338,9 +373,9 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) if (bts->gprs.mode == BTS_GPRS_NONE) break; if (new_state->availability == NM_AVSTATE_DEPENDENCY) { + data = nanobts_attr_nse_get(bts, &data_len); abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr, - 0xff, 0xff, nanobts_attr_nse, - sizeof(nanobts_attr_nse)); + 0xff, 0xff, data, data_len); abis_nm_opstart(bts, obj_class, bts->bts_nr, 0xff, 0xff); } @@ -350,9 +385,9 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) if (bts->gprs.mode == BTS_GPRS_NONE) break; if (new_state->availability == NM_AVSTATE_DEPENDENCY) { + data = nanobts_attr_cell_get(bts, &data_len); abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr, - 0, 0xff, nanobts_attr_cell, - sizeof(nanobts_attr_cell)); + 0, 0xff, data, data_len); abis_nm_opstart(bts, obj_class, bts->bts_nr, 0, 0xff); abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr, @@ -371,10 +406,10 @@ static int nm_statechg_event(int evt, struct nm_statechg_signal_data *nsd) break; if ((new_state->availability == NM_AVSTATE_OFF_LINE) || (new_state->availability == NM_AVSTATE_DEPENDENCY)) { + data = nanobts_attr_nscv_get(bts, &data_len); abis_nm_ipaccess_set_attr(bts, obj_class, bts->bts_nr, nsvc->id, 0xff, - nanobts_attr_nsvc0, - sizeof(nanobts_attr_nsvc0)); + data, data_len); abis_nm_opstart(bts, obj_class, bts->bts_nr, nsvc->id, 0xff); abis_nm_chg_adm_state(bts, obj_class, bts->bts_nr, @@ -424,11 +459,12 @@ static int sw_activ_rep(struct msgb *mb) */ int rc_state = trx->mo.nm_state.administrative; /* Patch ARFCN into radio attribute */ - nanobts_attr_radio[5] &= 0xf0; - nanobts_attr_radio[5] |= trx->arfcn >> 8; - nanobts_attr_radio[6] = trx->arfcn & 0xff; - abis_nm_set_radio_attr(trx, nanobts_attr_radio, - sizeof(nanobts_attr_radio)); + size_t data_len; + uint8_t *data = nanobts_attr_radio_get(trx->bts, &data_len); + data[5] &= 0xf0; + data[5] |= trx->arfcn >> 8; + data[6] = trx->arfcn & 0xff; + abis_nm_set_radio_attr(trx, data, data_len); abis_nm_chg_adm_state(trx->bts, foh->obj_class, trx->bts->bts_nr, trx->nr, 0xff, rc_state); -- 1.8.3.2

11 years, 11 months

Newbie question on BS-11 firmware for first boot

by J.P. van Wyk

Good day list We acquired a BS-11 microBTS a while ago and in the preliminary stages of setting up the equipment came upon the following: background - 1. we installed OpenBSC as per the OpenBSC wiki. 2. we manufactured a serial cable to interact with the BS-11. 3. using bs11_config as per the bs11_config wiki page we started the BS-11 and got the following: $ ./bs11_config -p /dev/ttyUSB0 bs11_config (C) 2009 by Harald Welte and Dieter Spaar This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY LMT LOGON: ACK PHASE: 1 Warm Up Abis-link: Down PHASE: 1 Warm Up Abis-link: Down PHASE: 1 Warm Up Abis-link: Down . . PHASE: 1 Warm Up Abis-link: Down PHASE: 1 Software required Abis-link: Down No valid safety Load file "BTSBMC76.SWI" After this nothing further happens. From the wiki page I conclude that the file in question is the SMU safety load that is needed to create the minimal configuration to get the BS-11 to boot. There seem to be another firmware image needed for the BS-11 namely the HS011106.SWL Am I correct in my assumption that the BS-11 was not preloaded with this software? Where do I get these firmware images as the wiki page states that the project can't provide any of the firmware due to copyright constraints. Regards -- Paul van Wyk _____________________________________________________ TruTeq Wireless (Pty) Ltd. Tel +27 12 667 1530 http://www.truteq.com Fax +27 12 667 1531 Copyright & Legal: http://truteq.com/legal_notice.pdf

11 years, 11 months

[PATCH 1/2] bsc/ussd: Optionally send USSD message on MSC disconnection

by Jacob Erlbeck

Send an USSD message on each MS connection if the connection to the MSC has been lost. Add a vty config command 'bsc-msc-loss-txt' in 'config-msc' to set the notification string and to enable the feature. Ticket: OW#957 --- openbsc/include/openbsc/osmo_msc_data.h | 3 +++ openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 30 ++++++++++++++++++++++---- openbsc/src/osmo-bsc/osmo_bsc_vty.c | 36 +++++++++++++++++++++++++++++++ openbsc/tests/vty_test_runner.py | 34 +++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 4 deletions(-) diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h index ba93a08..86b4a84 100644 --- a/openbsc/include/openbsc/osmo_msc_data.h +++ b/openbsc/include/openbsc/osmo_msc_data.h @@ -83,6 +83,9 @@ struct osmo_msc_data { struct osmo_wqueue mgcp_agent; int nr; + + /* ussd msc connection lost text */ + char *ussd_msc_lost_txt; }; /* diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c index 3533d6d..ad554e8 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c @@ -262,13 +262,35 @@ int bsc_delete_connection(struct osmo_bsc_sccp_con *sccp) return 0; } -static void bsc_close_connections(struct bsc_msc_connection *msc_con) +static void bsc_notify_msc_lost(struct osmo_bsc_sccp_con *con) +{ + struct gsm_subscriber_connection *conn = con->conn; + + /* send USSD notification if string configured and con->data is set */ + if (!conn) + return; + + /* check for config string */ + if (!con->msc->ussd_msc_lost_txt) + return; + if (con->msc->ussd_msc_lost_txt[0] == '\0') + return; + + /* send USSD notification */ + gsm0480_send_ussdNotify(conn, 1, conn->sccp_con->msc->ussd_welcome_txt); + gsm0480_send_releaseComplete(conn); +} + +static void bsc_notify_and_close_conns(struct bsc_msc_connection *msc_con) { struct osmo_bsc_sccp_con *con, *tmp; llist_for_each_entry_safe(con, tmp, &active_connections, entry) { - if (con->msc->msc_con == msc_con) - bsc_sccp_force_free(con); + if (con->msc->msc_con != msc_con) + continue; + + bsc_notify_msc_lost(con); + bsc_sccp_force_free(con); } } @@ -282,7 +304,7 @@ static int handle_msc_signal(unsigned int subsys, unsigned int signal, msc = signal_data; if (signal == S_MSC_LOST) - bsc_close_connections(msc->data->msc_con); + bsc_notify_and_close_conns(msc->data->msc_con); return 0; } diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c index 49ae665..b715101 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c @@ -114,6 +114,11 @@ static void write_msc(struct vty *vty, struct osmo_msc_data *msc) if (msc->ussd_welcome_txt) vty_out(vty, " bsc-welcome-text %s%s", msc->ussd_welcome_txt, VTY_NEWLINE); + if (msc->ussd_msc_lost_txt && msc->ussd_msc_lost_txt[0]) + vty_out(vty, " bsc-msc-lost-text %s%s", msc->ussd_msc_lost_txt, VTY_NEWLINE); + else + vty_out(vty, " no bsc-msc-lost-text%s", VTY_NEWLINE); + if (msc->audio_length != 0) { int i; @@ -368,6 +373,35 @@ DEFUN(cfg_net_msc_welcome_ussd, return CMD_SUCCESS; } +DEFUN(cfg_net_msc_lost_ussd, + cfg_net_msc_lost_ussd_cmd, + "bsc-msc-lost-text .TEXT", + "Set the USSD notification to be sent on MSC connection loss\n" "Text to be sent\n") +{ + struct osmo_msc_data *data = osmo_msc_data(vty); + char *str = argv_concat(argv, argc, 0); + if (!str) + return CMD_WARNING; + + bsc_replace_string(osmo_bsc_data(vty), &data->ussd_msc_lost_txt, str); + talloc_free(str); + return CMD_SUCCESS; +} + +DEFUN(cfg_net_msc_no_lost_ussd, + cfg_net_msc_no_lost_ussd_cmd, + "no bsc-msc-lost-text", + NO_STR "Clear the USSD notification to be sent on MSC connection loss\n") +{ + struct osmo_msc_data *data = osmo_msc_data(vty); + + if (data->ussd_msc_lost_txt) { + talloc_free(data->ussd_msc_lost_txt); + data->ussd_msc_lost_txt = 0; + } + return CMD_SUCCESS; +} + DEFUN(cfg_net_msc_type, cfg_net_msc_type_cmd, "type (normal|local)", @@ -579,6 +613,8 @@ int bsc_vty_init_extra(void) install_element(MSC_NODE, &cfg_net_msc_ping_time_cmd); install_element(MSC_NODE, &cfg_net_msc_pong_time_cmd); install_element(MSC_NODE, &cfg_net_msc_welcome_ussd_cmd); + install_element(MSC_NODE, &cfg_net_msc_lost_ussd_cmd); + install_element(MSC_NODE, &cfg_net_msc_no_lost_ussd_cmd); install_element(MSC_NODE, &cfg_net_msc_type_cmd); install_element(MSC_NODE, &cfg_net_msc_emerg_cmd); install_element(MSC_NODE, &cfg_net_msc_local_prefix_cmd); diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py index a7a7b3f..1285474 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -88,6 +88,39 @@ class TestVTYNITB(TestVTYBase): self.assertEquals(res.find('periodic location update 60'), -1) self.assert_(res.find('no periodic location update') > 0) +class TestVTYBSC(TestVTYBase): + + def vty_command(self): + return ["./src/osmo-bsc/osmo-bsc", "-c", + "doc/examples/osmo-bsc/osmo-bsc.cfg"] + + def vty_app(self): + return (4242, "./src/osmo-bsc/osmo-bsc", "OsmoBSC", "bsc") + + def testUssdNotifications(self): + self.vty.enable() + self.vty.command("configure terminal") + self.vty.command("msc") + + # Test invalid input + self.vty.verify("bsc-msc-lost-text", ['% Command incomplete.']) + + # Enable USSD notifications + self.vty.verify("bsc-msc-lost-text MSC disconnected", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assert_(res.find('bsc-msc-lost-text MSC disconnected') > 0) + self.assertEquals(res.find('no bsc-msc-lost-text'), -1) + + # Now disable it.. + self.vty.verify("no bsc-msc-lost-text", ['']) + + # Verify settings + res = self.vty.command("write terminal") + self.assertEquals(res.find('bsc-msc-lost-text MSC disconnected'), -1) + self.assert_(res.find('no bsc-msc-lost-text') > 0) + class TestVTYNAT(TestVTYBase): def vty_command(self): @@ -219,6 +252,7 @@ if __name__ == '__main__': print "Running tests for specific VTY commands" suite = unittest.TestSuite() suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYNITB)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestVTYBSC)) add_nat_test(suite, workdir) res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) sys.exit(len(res.errors) + len(res.failures)) -- 1.7.9.5

11 years, 12 months

OpenBSC + USSD Application

by Maicon Kist

Hi list, Is there a tutorial in how to make a USSD application work in a OpenBSC network? Firstly I'm want to implement a simple "Hello World" application. eg. the client enter with a valid USSD number (*something) and the "Hello World" application executes. Best Regards,

11 years, 12 months

external app inserting an SMS in to sql table - how to?

by Adam B

Hi Everyone. On the OpenBSC wiki it states: "Sending of SMS from external applications by writing to the SQL table"s .... I was wondering if anyone could fill me in how this happens and if the SMSC automatically sends the inserted SMS. Is it as simple as inserting in to the hlr.sqlite db as follows? INSERT INTO SMS (created, sender_id, receiver_id, reply_path_req, status_rep_req, protocol_id, data_coding_scheme, ud_hdr_ind, text) VALUES (date, 1, 123, 0, 0, 0, 0, 0, helloworld) My end goal would be to insert a the a binary data SMS that has UDH header in the data payload I was wondering if anyone has tried this and if it will work?. Regards Adam

12 years

OpenBSC + USRP

by Maicon Kist

Hi list, I'm trying to install the OpenBSC and made it work with a USRP N210 device. I'm having trouble installing the OsmoBTS (following this tutorial: http://openbsc.osmocom.org/trac/wiki/network_from_scratch). However, if I understood correctly, this tutorial is to use the with a UmTx device, right? Is there a tutorial to configure all the environment for a USRP device ? Btw, I having the following compile error when compiling the OsmoBTS with the --with-trx option: In file included from sysmobts_test.c:22:0: ../../src/osmo-bts-sysmo/femtobts.h:7:42: fatal error: sysmocom/femtobts/superfemto.h: No such file or directory Best Regards,

12 years

[PATCH] fix tests for sysmobts (jolly/trx)

by Martin Hauke

--- tests/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d233df9..e5f1e64 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = paging cipher sysmobts bursts handover +SUBDIRS = paging cipher bursts handover + +if ENABLE_SYSMOBTS +SUBDIRS += sysmobts +endif # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac -- 1.8.1.4 --------------080007040108030009010404--

12 years

[PATCH] fix tests for sysmobts

by Martin Hauke

--- tests/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5fb128f..4283a24 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = paging cipher sysmobts +SUBDIRS = paging cipher + +if ENABLE_SYSMOBTS +SUBDIRS += sysmobts +endif # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac -- 1.8.1.4 --------------080007040108030009010404 Content-Type: text/x-patch; name="0001-fix-tests-for-sysmobts-jolly-trx.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-fix-tests-for-sysmobts-jolly-trx.patch"

12 years

Re: OpenBSC GPRS Question

by Sergey V. Efimov

Hello, Tried port and got message: <0010> gprs_nc.c:627 NSEI=101 Rx NS STATUS cause=PDU not compatible with protocol state <0010> gprs_nc.c:489 NSEI=101 Tns-alive expired more than 10 times, blocking NS-VC And nothing has changed, still get Rejecting PDU for unknown BVCI. Could you please provide me your config files which are working? Regards, Sergey. On Aug 14, 2013, at 10:03 PM, altaf sk wrote: > Hey > > Try using > gprs nsvc 0 remote udp port 5948 > > It worked for me > > Let me know what happens > > Regards > > Altaf > > On Aug 14, 2013 7:52 PM, "Sergey V. Efimov" <risky(a)mail.ru> wrote: > Hello, > > I used step-by-step instruction from the osmocom.org site. > > Here is my openbsc config: > > ==== > e1_input > e1_line 0 driver ipa > network > network country code 250 > mobile network code 77 > short name ABC > long name ABC > auth policy accept-all > location updating reject cause 13 > encryption a5 0 > neci 1 > rrlp mode none > mm info 1 > handover 0 > handover window rxlev averaging 10 > handover window rxqual averaging 1 > handover window rxlev neighbor averaging 10 > handover power budget interval 6 > handover power budget hysteresis 3 > handover maximum distance 9999 > timer t3101 10 > timer t3103 0 > timer t3105 0 > timer t3107 0 > timer t3109 4 > timer t3111 0 > timer t3113 60 > timer t3115 0 > timer t3117 0 > timer t3119 0 > timer t3141 0 > bts 0 > type nanobts > band DCS1800 > cell_identity 0 > location_area_code 1 > training_sequence_code 7 > base_station_id_code 63 > ms max power 15 > cell reselection hysteresis 4 > rxlev access min 0 > channel allocator ascending > rach tx integer 9 > rach max transmission 7 > ip.access unit_id 1234 0 > oml ip.access stream_id 255 line 0 > gprs mode gprs > gprs routing area 0 > gprs cell bvci 2 > gprs nsei 101 > gprs nsvc 0 nsvci 101 > gprs nsvc 0 local udp port 23000 > gprs nsvc 0 remote udp port 23000 > gprs nsvc 0 remote ip 192.168.168.98 > trx 0 > rf_locked 0 > arfcn 666 > nominal power 23 > max_power_red 20 > rsl e1 tei 0 > timeslot 0 > phys_chan_config CCCH+SDCCH4 > timeslot 1 > phys_chan_config PDCH > timeslot 2 > phys_chan_config PDCH > timeslot 3 > phys_chan_config TCH/F > timeslot 4 > phys_chan_config TCH/F > timeslot 5 > phys_chan_config TCH/F > timeslot 6 > phys_chan_config TCH/F > timeslot 7 > phys_chan_config TCH/F > ==== > > Here is my osmo-sgsn.cfg > > ==== > sgsn > gtp local-ip 192.168.168.98 > ggsn 0 remote-ip 192.168.168.230 > ggsn 0 gtp-version 1 > ! > ns > timer tns-block 3 > timer tns-block-retries 3 > timer tns-reset 3 > timer tns-reset-retries 3 > timer tns-test 30 > timer tns-alive 3 > timer tns-alive-retries 10 > encapsulation udp local-ip 192.168.168.98 > encapsulation udp local-port 23000 > encapsulation framerelay-gre enabled 0 > > ==== > > Here is my ggsn.cfg > > === > listen 192.168.168.230 > net 192.168.168.0/24 > dynip 192.168.168.240/30 > === > > Here is my open-bts.cfg > > === > bts 0 > band 1800 > ipa unit-id 1234 0 > oml remote-ip 192.168.168.98 > === > > Regards, > Sergey. > > On Aug 14, 2013, at 8:17 PM, Holger Hans Peter Freyther wrote: > > > On Wed, Aug 14, 2013 at 07:42:30PM +0400, Sergey V. Efimov wrote: > >> Hello All, > >> > >> <0011> gprs_bssgp.c:1000 NSEI=101/BVCI=2 Rejecting PDU type 1 for unknown BVCI > >> <0011> gprs_bssgp_util.c:103 BSSGP BVCI=0 Tx STATUS, cause=Unknown BVCI > >> <0011> gprs_bssgp.c:1000 NSEI=101/BVCI=2 Rejecting PDU type 1 for unknown BVCI > >> <0011> gprs_bssgp_util.c:103 BSSGP BVCI=0 Tx STATUS, cause=Unknown BVCI > > > > without your NITB/BSC config it is difficult to judge. What doesn't work for > > sure is to restart the SGSN once the PCU has exchanged some messages with it. > > > > > > holger > > > > > >

12 years

[PATCH] core: Remove defined() check for OSMO_DEPRECATE

by Jacob Erlbeck

This reverts commit bf991bc0f3006eddf45d494ee7e476a75dbaf36e and fixes the bug instead. It's just sufficient to remove the defined() test, since identifiers that aren't macros are just considered as 0 when used with #if. (see cpp info page, section 4.2.2 'If' in cpp-4.6.info) --- include/osmocom/core/defs.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/include/osmocom/core/defs.h b/include/osmocom/core/defs.h index ca12a80..5ffee04 100644 --- a/include/osmocom/core/defs.h +++ b/include/osmocom/core/defs.h @@ -27,22 +27,16 @@ /*! \brief Set the deprecated attribute with a message. */ #if defined(__clang__) -# if __has_attribute(deprecated) -# define _OSMO_HAS_ATTRIBUTE_DEPRECATED 1 -# endif -# if __has_extension(attribute_deprecated_with_message) -# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE 1 -# endif +# define _OSMO_HAS_ATTRIBUTE_DEPRECATED __has_attribute(deprecated) +# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE __has_extension(attribute_deprecated_with_message) #elif defined(__GNUC__) # define _OSMO_HAS_ATTRIBUTE_DEPRECATED 1 -# if OSMO_GNUC_PREREQ(4,5) -# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE 1 -# endif +# define _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE OSMO_GNUC_PREREQ(4,5) #endif -#if defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE) +#if _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE # define OSMO_DEPRECATED(text) __attribute__((__deprecated__(text))) -#elif defined(_OSMO_HAS_ATTRIBUTE_DEPRECATED) +#elif _OSMO_HAS_ATTRIBUTE_DEPRECATED # define OSMO_DEPRECATED(text) __attribute__((__deprecated__)) #else # define OSMO_DEPRECATED(text) -- 1.7.9.5

12 years

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC August 2013