- OpenBSC - lists.osmocom.org

libosmocore sylvain/security branch
by Harald Welte 05 Jan '15

05 Jan '15

Hi Sylvain, I was doingwwwww libosmocore 'branch hygiene' and was wondering what's the status of that branch? I would like to see XOR support and randomized padding support included. Is it ready for merge? It is clear that of course osmo-bts / osmocom-bb would subsequently need to be modified to use randomized padding... 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)

2 1

libosmocore daniel/scts-fixes branch
by Harald Welte 01 Jan '15

01 Jan '15

Hi Daniel, I was doing some libosmocore 'branch hygiene' and removed several of your branches that had already been merged. However, there's the scts-fixes branch. Can you please let me know about the status of the branch? Does it still need testing? Is it ready for merge? 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

handover crash
by Holger Hans Peter Freyther 29 Dec '14

29 Dec '14

hi, this is a note. We had a crash with handover. So ho->new_lchan points to a "valid" lchan but ho->new_lchan->conn is NULL. Which means the new lchan failed/was freed/re-used.. but the "ho" entry wasn't killed. I thought I fixed such a bug recently but obviously no. Program terminated with signal 11, Segmentation fault. #0 0x00000000004078a7 in ho_T3103_cb (_ho=<optimized out>) at handover_logic.c:192 192 ho->new_lchan->conn->ho_lchan = NULL; (gdb) p *ho->new_lchan $1 = {ts = 0x7f9c1439d028, nr = 0 '\000', type = GSM_LCHAN_NONE, rsl_cmode = RSL_CMOD_SPD_SPEECH, tch_mode = GSM48_CMODE_SPEECH_V1, csd_mode = LCHAN_CSD_M_NT, state = LCHAN_S_NONE, broken_reason = 0x44c5e3 "", bs_power = 0 '\000', ms_power = 0 '\000', encr = {alg_id = 2 '\002', key_len = 8 '\b', key = "\314]\204\276J6\204\000\000\000\000\000\000\000\000"}, mr_conf = {smod = 0 '\000', spare = 0 '\000', icmi = 0 '\000', nscb = 0 '\000', ver = 0 '\000', m4_75 = 0 '\000', m5_15 = 0 '\000', m5_90 = 0 '\000', m6_70 = 0 '\000', m7_40 = 0 '\000', m7_95 = 0 '\000', m10_2 = 0 '\000', m12_2 = 0 '\000'}, sapis = "\000\000\000\000\000\000\000", sacch_deact = 0, abis_ip = {bound_ip = 3232247317, connect_ip = 3232247297, bound_port = 44336, connect_port = 5011, conn_id = 0, rtp_payload = 3 '\003', rtp_payload2 = 0 '\000', speech_mode = 0 '\000', rtp_socket = 0x0}, rqd_ta = 0 '\000', T3101 = {node = {rb_parent_color = 30560649, rb_right = 0x1e46618, rb_left = 0x1bcaf30}, list = {next = 0x7f9c1439e1c0, prev = 0x7f9c1439e1c0}, timeout = {tv_sec = 1419790405, tv_usec = 573730}, active = 0, cb = 0x41fd10 <t3101_expired>, data = 0x7f9c1439e130}, T3109 = {node = {rb_parent_color = 31559320, rb_right = 0x0, rb_left = 0x0}, list = { next = 0x7f9c1439e210, prev = 0x7f9c1439e210}, timeout = {tv_sec = 1419790684, tv_usec = 182786}, active = 0, cb = 0x41fa20 <t3109_expired>, data = 0x7f9c1439e130}, T3111 = {node = {rb_parent_color = 29138256, rb_right = 0x0, rb_left = 0x0}, list = { next = 0x7f9c1439e260, prev = 0x7f9c1439e260}, timeout = {tv_sec = 1419791140, tv_usec = 812411}, active = 0, cb = 0x41fa70 <t3111_expired>, data = 0x7f9c1439e130}, error_timer = {node = {rb_parent_color = 30539945, rb_right = 0x1bc9470, rb_left = 0x1c75728}, list = {next = 0x7f9c1439e2b0, prev = 0x7f9c1439e2b0}, timeout = { tv_sec = 1419790405, tv_usec = 637282}, active = 0, cb = 0x41d0f0 <error_timeout_cb>, data = 0x7f9c1439e130}, act_timer = {node = {rb_parent_color = 29769248, rb_right = 0x0, rb_left = 0x0}, list = {next = 0x7f9c1439e300, prev = 0x7f9c1439e300}, timeout = { tv_sec = 1419791144, tv_usec = 812427}, active = 0, cb = 0x41bff0 <lchan_deact_tmr_cb>, data = 0x7f9c1439e130}, rel_work = {node = {rb_parent_color = 0, rb_right = 0x0, rb_left = 0x0}, list = {next = 0x0, prev = 0x0}, timeout = {tv_sec = 0, tv_usec = 0}, active = 0, cb = 0, data = 0x0}, error_cause = 0 '\000', neigh_meas = {{arfcn = 0, bsic = 63 '?', rxlev = ",,'&\032\016-.+)", rxlev_cnt = 4376, last_seen_nr = 0 '\000'}, { arfcn = 0, bsic = 63 '?', rxlev = "\031\004$(' \037%*&", rxlev_cnt = 4372, last_seen_nr = 0 '\000'}, {arfcn = 0, bsic = 63 '?', rxlev = "%\017\004''&&&&%", rxlev_cnt = 4313, last_seen_nr = 0 '\000'}, {arfcn = 0, bsic = 63 '?', rxlev = "\027\026\024\031\030\031\033\003\027\025", rxlev_cnt = 3328, last_seen_nr = 0 '\000'}, {arfcn = 0, bsic = 63 '?', rxlev = "\000\002\001\001\001\003\002\000\000", rxlev_cnt = 1177, last_seen_nr = 48 '0'}, {arfcn = 0, bsic = 63 '?', rxlev = "\002\004\002\003\002\005\000\002\005\004", rxlev_cnt = 224, last_seen_nr = 18 '\022'}, {arfcn = 0, bsic = 0 '\000', rxlev = "\000\000\000\000\000\000\000\000\000", rxlev_cnt = 0, last_seen_nr = 0 '\000'}, {arfcn = 0, bsic = 0 '\000', rxlev = "\000\000\000\000\000\000\000\000\000", rxlev_cnt = 0, last_seen_nr = 0 '\000'}, {arfcn = 0, bsic = 0 '\000', rxlev = "\000\000\000\000\000\000\000\000\000", rxlev_cnt = 0, last_seen_nr = 0 '\000'}, {arfcn = 0, bsic = 0 '\000', rxlev = "\000\000\000\000\000\000\000\000\000", rxlev_cnt = 0, ---Type <return> to continue, or q <return> to quit--- last_seen_nr = 0 '\000'}}, meas_rep = {{lchan = 0x7f9c1439e130, nr = 0 '\000', flags = 0, ul = {full = {rx_lev = 3 '\003', rx_qual = 0 '\000'}, sub = { rx_lev = 63 '?', rx_qual = 0 '\000'}}, dl = {full = {rx_lev = 3 '\003', rx_qual = 7 '\a'}, sub = {rx_lev = 7 '\a', rx_qual = 7 '\a'}}, bs_power = 0 '\000', ms_timing_offset = 0 '\000', ms_l1 = {pwr = 30 '\036', ta = 0 '\000'}, num_cell = 3, cell = {{rxlev = 14 '\016', bsic = 63 '?', neigh_idx = 0 '\000', arfcn = 866, flags = 1}, {rxlev = 4 '\004', bsic = 63 '?', neigh_idx = 4 '\004', arfcn = 877, flags = 1}, {rxlev = 4 '\004', bsic = 63 '?', neigh_idx = 1 '\001', arfcn = 868, flags = 1}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}}}, {lchan = 0x7f9c1439e130, nr = 0 '\000', flags = 0, ul = {full = { rx_lev = 35 '#', rx_qual = 0 '\000'}, sub = {rx_lev = 63 '?', rx_qual = 0 '\000'}}, dl = {full = {rx_lev = 44 ',', rx_qual = 0 '\000'}, sub = {rx_lev = 41 ')', rx_qual = 0 '\000'}}, bs_power = 0 '\000', ms_timing_offset = 0 '\000', ms_l1 = { pwr = 22 '\026', ta = 0 '\000'}, num_cell = 5, cell = {{rxlev = 43 '+', bsic = 63 '?', neigh_idx = 1 '\001', arfcn = 868, flags = 1}, {rxlev = 39 '\'', bsic = 63 '?', neigh_idx = 0 '\000', arfcn = 866, flags = 1}, {rxlev = 38 '&', bsic = 63 '?', neigh_idx = 3 '\003', arfcn = 873, flags = 1}, {rxlev = 22 '\026', bsic = 63 '?', neigh_idx = 5 '\005', arfcn = 881, flags = 1}, {rxlev = 2 '\002', bsic = 63 '?', neigh_idx = 2 '\002', arfcn = 871, flags = 1}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}}}, { lchan = 0x7f9c1439e130, nr = 0 '\000', flags = 0, ul = {full = {rx_lev = 45 '-', rx_qual = 0 '\000'}, sub = {rx_lev = 63 '?', rx_qual = 0 '\000'}}, dl = {full = { rx_lev = 42 '*', rx_qual = 0 '\000'}, sub = {rx_lev = 41 ')', rx_qual = 0 '\000'}}, bs_power = 0 '\000', ms_timing_offset = 0 '\000', ms_l1 = {pwr = 30 '\036', ta = 0 '\000'}, num_cell = 5, cell = {{rxlev = 41 ')', bsic = 63 '?', neigh_idx = 1 '\001', arfcn = 868, flags = 1}, {rxlev = 38 '&', bsic = 63 '?', neigh_idx = 3 '\003', arfcn = 873, flags = 1}, {rxlev = 32 ' ', bsic = 63 '?', neigh_idx = 0 '\000', arfcn = 866, flags = 1}, {rxlev = 20 '\024', bsic = 63 '?', neigh_idx = 5 '\005', arfcn = 881, flags = 1}, {rxlev = 1 '\001', bsic = 63 '?', neigh_idx = 2 '\002', arfcn = 871, flags = 1}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}}}, {lchan = 0x7f9c1439e130, nr = 0 '\000', flags = 0, ul = {full = {rx_lev = 37 '%', rx_qual = 0 '\000'}, sub = { rx_lev = 63 '?', rx_qual = 0 '\000'}}, dl = {full = {rx_lev = 44 ',', rx_qual = 0 '\000'}, sub = {rx_lev = 44 ',', rx_qual = 0 '\000'}}, bs_power = 0 '\000', ms_timing_offset = 0 '\000', ms_l1 = {pwr = 14 '\016', ta = 0 '\000'}, num_cell = 5, cell = {{rxlev = 44 ',', bsic = 63 '?', neigh_idx = 1 '\001', arfcn = 868, flags = 1}, {rxlev = 38 '&', bsic = 63 '?', neigh_idx = 3 '\003', arfcn = 873, flags = 1}, {rxlev = 31 '\037', bsic = 63 '?', neigh_idx = 0 '\000', arfcn = 866, flags = 1}, {rxlev = 25 '\031', bsic = 63 '?', neigh_idx = 5 '\005', arfcn = 881, flags = 1}, {rxlev = 1 '\001', bsic = 63 '?', neigh_idx = 2 '\002', arfcn = 871, flags = 1}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}}}, {lchan = 0x7f9c1439e130, nr = 0 '\000', flags = 0, ul = {full = {rx_lev = 23 '\027', rx_qual = 0 '\000'}, sub = { rx_lev = 63 '?', rx_qual = 0 '\000'}}, dl = {full = {rx_lev = 44 ',', ---Type <return> to continue, or q <return> to quit--- rx_qual = 4 '\004'}, sub = {rx_lev = 43 '+', rx_qual = 0 '\000'}}, bs_power = 0 '\000', ms_timing_offset = 0 '\000', ms_l1 = {pwr = 10 '\n', ta = 0 '\000'}, num_cell = 5, cell = {{rxlev = 44 ',', bsic = 63 '?', neigh_idx = 1 '\001', arfcn = 868, flags = 1}, {rxlev = 38 '&', bsic = 63 '?', neigh_idx = 3 '\003', arfcn = 873, flags = 1}, {rxlev = 37 '%', bsic = 63 '?', neigh_idx = 0 '\000', arfcn = 866, flags = 1}, {rxlev = 24 '\030', bsic = 63 '?', neigh_idx = 5 '\005', arfcn = 881, flags = 1}, {rxlev = 1 '\001', bsic = 63 '?', neigh_idx = 2 '\002', arfcn = 871, flags = 1}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}}}, {lchan = 0x7f9c1439e130, nr = 0 '\000', flags = 0, ul = {full = {rx_lev = 30 '\036', rx_qual = 0 '\000'}, sub = { rx_lev = 63 '?', rx_qual = 0 '\000'}}, dl = {full = {rx_lev = 39 '\'', rx_qual = 2 '\002'}, sub = {rx_lev = 38 '&', rx_qual = 0 '\000'}}, bs_power = 0 '\000', ms_timing_offset = 0 '\000', ms_l1 = {pwr = 26 '\032', ta = 0 '\000'}, num_cell = 5, cell = {{rxlev = 42 '*', bsic = 63 '?', neigh_idx = 0 '\000', arfcn = 866, flags = 1}, {rxlev = 39 '\'', bsic = 63 '?', neigh_idx = 1 '\001', arfcn = 868, flags = 1}, {rxlev = 37 '%', bsic = 63 '?', neigh_idx = 3 '\003', arfcn = 873, flags = 1}, {rxlev = 25 '\031', bsic = 63 '?', neigh_idx = 5 '\005', arfcn = 881, flags = 1}, {rxlev = 3 '\003', bsic = 63 '?', neigh_idx = 2 '\002', arfcn = 871, flags = 1}, {rxlev = 0 '\000', bsic = 0 '\000', neigh_idx = 0 '\000', arfcn = 0, flags = 0}}}}, meas_rep_idx = 0, rqd_ref = 0x0, conn = 0x0}

2 1

Re: Set an openBSC with demo BTS
by Lars Rasmusson SICS 22 Dec '14

22 Dec '14

I am also trying to do that. How far have you gotten? I am stuck at bts connect: 'localhost'; waitForBTSReady. This is what I see # gst GNU Smalltalk ready st> PackageLoader fileInPackage: #FakeBTS Loading package OsmoLogging Loading package OsmoCore Loading package Parser Loading package PetitParser Loading package Sockets Loading package OsmoNetwork Loading package OsmoGSM Loading package FakeBTS PackageLoader PackageLoaderts := FakeBTS.BTS new. a BTS st> bts btsId: '1/0/0' a BTS st> bts connect: 'localhost'; waitForBTSReady. Stop Object: nil error: did not understand #+ MessageNotUnderstood(Exception)>>signal (ExcHandling.st:254) UndefinedObject(Object)>>doesNotUnderstand: #+ (SysExcept.st:1407) Sockets.TCPSocketImpl(FileDescriptor)>>nextAvailable:into:startingAt: (FileDescr.st:802) optimized [] in Sockets.StreamSocket>>newReadBuffer: (Sockets.star#VFS.ZipFile/Sockets.st:1323) Sockets.ReadBuffer>>atEnd (Sockets.star#VFS.ZipFile/Buffers.st:129) Sockets.ReadBuffer>>pastEnd (Sockets.star#VFS.ZipFile/Buffers.st:137) Sockets.ReadBuffer(PositionableStream)>>next (PosStream.st:78) Sockets.StreamSocket>>next (Sockets.star#VFS.ZipFile/Sockets.st:1217) Sockets.StreamSocket>>nextByte (OsmoNetwork.star#VFS.ZipFile/core/Extensions.st:125) Sockets.StreamSocket>>nextBytes:signed: (OsmoNetwork.star#VFS.ZipFile/core/Extensions.st:113) Sockets.StreamSocket>>nextUshort (OsmoNetwork.star#VFS.ZipFile/core/Extensions.st:102) Osmo.IPADemuxer>>next (OsmoNetwork.star#VFS.ZipFile/ipa/IPAMuxer.st:39) [] in FakeBTS.BTSOmlConnection(FakeBTS.BTSConnectionBase)>>processOne (FakeBTS.star#VFS.ZipFile/BTSConnection.st:159) BlockClosure>>on:do:on:do: (BlkClosure.st:206) FakeBTS.BTSOmlConnection(FakeBTS.BTSConnectionBase)>>processOne (FakeBTS.star#VFS.ZipFile/BTSConnection.st:172) optimized [] in FakeBTS.BTSConnectionBase>>connect:port: (FakeBTS.star#VFS.ZipFile/BTSConnection.st:145) [] in Process>>onBlock:at:suspend: (Process.st:392) BlockClosure>>on:do: (BlkClosure.st:193) [] in Process>>onBlock:at:suspend: (Process.st:393) BlockClosure>>ensure: (BlkClosure.st:269) [] in Process>>onBlock:at:suspend: (Process.st:370) [] in BlockClosure>>asContext: (BlkClosure.st:179) BlockContext class>>fromClosure:parent: (BlkContext.st:68) *** HERE IT JUST WAITS AND I PRESS CTRL-C *** Object: nil error: interrupted!!! SystemExceptions.UserInterrupt(Exception)>>signal (ExcHandling.st:254) SystemExceptions.UserInterrupt class(Exception class)>>signal (ExcHandling.st:151) UndefinedObject(Object)>>userInterrupt (Object.st:1414) FakeBTS.BTS>>waitForBTSReady (FakeBTS.star#VFS.ZipFile/BTS.st:393) UndefinedObject>>executeStatements (a String:1) nil st> > > > Hi, > I'm trying to set an "OpenBSC network-in-the-box (NITB) mode" using a > BTS demo/simulator, but couldn't find any good instructions guide for > it. > Any help will happily accepted. > I followed this guide: > http://openbsc.osmocom.org/trac/wiki/Building_OpenBSC > and tried to use this simulator instructions: > http://openbsc.osmocom.org/trac/wiki/simulation > Best regards, > Arik

3 2

[PATCH] ipa: Declare all structs used
by Jacob Erlbeck 22 Dec '14

22 Dec '14

A few declarations are missing. This patch adds forward declarations for struct used for pointers only and an include directive (osmocom/core/select.h) to get a full definition of struct osmo_fd. Sponsored-by: On-Waves ehf --- include/osmocom/abis/ipa.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index 19815f6..6f40a40 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -4,8 +4,13 @@ #include <stdint.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/timer.h> +#include <osmocom/core/select.h> #include <osmocom/gsm/ipa.h> +struct e1inp_line; +struct e1inp_ts; +struct msgb; + struct ipa_server_link { struct e1inp_line *line; struct osmo_fd ofd; -- 1.9.1

1 0

[PATCH 1/2] ipa: Add forward declaration of struct osmo_fd
by Jacob Erlbeck 22 Dec '14

22 Dec '14

A pointer to struct osmo_fd is used in a few prototypes declared in gsm/ipa.h, but is neither declared explicitly nor is such a declaration reachable via the given include directives. This patch adds a forward declaration of this type to ensure proper compilation. Sponsored-by: On-Waves ehf --- include/osmocom/gsm/ipa.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h index 2878676..1227ee1 100644 --- a/include/osmocom/gsm/ipa.h +++ b/include/osmocom/gsm/ipa.h @@ -5,6 +5,8 @@ #include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> +struct osmo_fd; + /* internal (host-only) data structure */ struct ipaccess_unit { uint16_t site_id; -- 1.9.1

1 1

[PATCH] ho: Copy the multirate config to the new lchan
by Holger Hans Peter Freyther 18 Dec '14

18 Dec '14

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> The new lchan will be in speech mode already but for AMR we will need to provide a working multirate config in the channel activation, otherwise the channel act might be nacked. Copy the config from the current lchan into the new lchan. The abis code simply added the mrconf if the speech mode was amr. Before this commit the invalidate mrconf with all zeroes was copied/sent. --- openbsc/src/libbsc/handover_logic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index 9284f7e..ff6e993 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -133,6 +133,7 @@ int bsc_handover_start(struct gsm_lchan *old_lchan, struct gsm_bts *bts) new_lchan->bs_power = old_lchan->bs_power; new_lchan->rsl_cmode = old_lchan->rsl_cmode; new_lchan->tch_mode = old_lchan->tch_mode; + new_lchan->mr_conf = old_lchan->mr_conf; new_lchan->conn = old_lchan->conn; new_lchan->conn->ho_lchan = new_lchan; -- 2.1.3

1 0

[PATCH] ho: Make sure the timer is always stopped
by Holger Hans Peter Freyther 17 Dec '14

17 Dec '14

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> In case of a ho_chan_activ_nack (sent due another bug inside both sysmobts and openbsc) the code would not stop the timer but free the datastructure. This can lead to a clear segfault when the timer has expired. Create a "free" function which is responsible to detach the handover structure, stop the timer (which is idempotent) and free the structure. --- openbsc/src/libbsc/handover_logic.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index 22f9883..9284f7e 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -54,6 +54,13 @@ struct bsc_handover { static LLIST_HEAD(bsc_handovers); +static void handover_free(struct bsc_handover *ho) +{ + osmo_timer_del(&ho->T3103); + llist_del(&ho->list); + talloc_free(ho); +} + static struct bsc_handover *bsc_ho_by_new_lchan(struct gsm_lchan *new_lchan) { struct bsc_handover *ho; @@ -169,9 +176,7 @@ void bsc_clear_handover(struct gsm_subscriber_connection *conn, int free_lchan) if (free_lchan) lchan_release(ho->new_lchan, 0, RSL_REL_LOCAL_END); - osmo_timer_del(&ho->T3103); - llist_del(&ho->list); - talloc_free(ho); + handover_free(ho); } /* T3103 expired: Handover has failed without HO COMPLETE or HO FAIL */ @@ -186,8 +191,7 @@ static void ho_T3103_cb(void *_ho) ho->new_lchan->conn->ho_lchan = NULL; ho->new_lchan->conn = NULL; lchan_release(ho->new_lchan, 0, RSL_REL_LOCAL_END); - llist_del(&ho->list); - talloc_free(ho); + handover_free(ho); } /* RSL has acknowledged activation of the new lchan */ @@ -234,8 +238,7 @@ static int ho_chan_activ_nack(struct gsm_lchan *new_lchan) new_lchan->conn->ho_lchan = NULL; new_lchan->conn = NULL; - llist_del(&ho->list); - talloc_free(ho); + handover_free(ho); /* FIXME: maybe we should try to allocate a new LCHAN here? */ @@ -282,9 +285,7 @@ static int ho_gsm48_ho_compl(struct gsm_lchan *new_lchan) rsl_lchan_set_state(ho->old_lchan, LCHAN_S_INACTIVE); lchan_release(ho->old_lchan, 0, RSL_REL_LOCAL_END); - llist_del(&ho->list); - talloc_free(ho); - + handover_free(ho); return 0; } @@ -293,6 +294,7 @@ static int ho_gsm48_ho_fail(struct gsm_lchan *old_lchan) { struct gsm_network *net = old_lchan->ts->trx->bts->network; struct bsc_handover *ho; + struct gsm_lchan *new_lchan; ho = bsc_ho_by_old_lchan(old_lchan); if (!ho) { @@ -302,15 +304,15 @@ static int ho_gsm48_ho_fail(struct gsm_lchan *old_lchan) osmo_counter_inc(net->stats.handover.failed); - osmo_timer_del(&ho->T3103); - llist_del(&ho->list); + new_lchan = ho->new_lchan; /* release the channel and forget about it */ ho->new_lchan->conn->ho_lchan = NULL; ho->new_lchan->conn = NULL; - lchan_release(ho->new_lchan, 0, RSL_REL_LOCAL_END); + handover_free(ho); + + lchan_release(new_lchan, 0, RSL_REL_LOCAL_END); - talloc_free(ho); return 0; } -- 2.1.3

1 0

[PATCH 1/2] bts: Add some simple dependency between different BTS
by Holger Hans Peter Freyther 17 Dec '14

17 Dec '14

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> E.g. for the sysmoBTS2050 we have the requirement that the first board connects before the second due clocking. The easiest point to enforce this is the BSC. Add a simple bitmask based system to allow to express dependencies for IP based systems. --- openbsc/include/openbsc/gsm_data.h | 5 +++ openbsc/include/openbsc/gsm_data_shared.h | 3 ++ openbsc/src/libbsc/bsc_vty.c | 63 +++++++++++++++++++++++++++++++ openbsc/src/libbsc/bts_ipaccess_nanobts.c | 7 ++++ openbsc/src/libcommon/gsm_data.c | 58 ++++++++++++++++++++++++++++ 5 files changed, 136 insertions(+) diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index e237ea2..89db48b 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -436,4 +436,9 @@ extern const struct value_string bts_type_descs[_NUM_GSM_BTS_TYPE+1]; int bsc_base_ctrl_cmds_install(void); int msc_ctrl_cmds_install(void); +/* dependency handling */ +void bts_depend_mark(struct gsm_bts *bts, int dep); +void bts_depend_clear(struct gsm_bts *bts, int dep); +int bts_depend_check(struct gsm_bts *bts); + #endif /* _GSM_DATA_H */ diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index 001a526..5d84969 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -720,6 +720,9 @@ struct gsm_bts { /* supported codecs beside FR */ struct bts_codec_conf codec; + + /* BTS dependencies bit field */ + uint32_t depends_on[256/(8*4)]; #endif /* ROLE_BSC */ void *role; }; diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 08f9a8e..d6d66c6 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -650,6 +650,23 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) vty_out(vty, " %sforce-combined-si%s", bts->force_combined_si ? "" : "no ", VTY_NEWLINE); + for (i = 0; i < ARRAY_SIZE(bts->depends_on); ++i) { + int j; + + if (bts->depends_on[i] == 0) + continue; + + for (j = 0; j < sizeof(bts->depends_on[i]) * 8; ++j) { + int bts_nr; + + if ((bts->depends_on[i] & (1<<j)) == 0) + continue; + + bts_nr = (i * sizeof(bts->depends_on[i]) * 8) + j; + vty_out(vty, " depends-on-bts %d%s", bts_nr, VTY_NEWLINE); + } + } + config_write_bts_model(vty, bts); } @@ -2772,6 +2789,50 @@ DEFUN(cfg_bts_codec4, cfg_bts_codec4_cmd, return CMD_SUCCESS; } +DEFUN(cfg_bts_depends_on, cfg_bts_depends_on_cmd, + "depends-on-bts <0-255>", + "This BTS can only be started if another one is up\n" "BTS Number\n") +{ + struct gsm_bts *bts = vty->index; + struct gsm_bts *other_bts; + int dep = atoi(argv[0]); + + + if (!is_ipaccess_bts(bts)) { + vty_out(vty, "This feature is only available for IP systems.%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + other_bts = gsm_bts_num(bts->network, dep); + if (!other_bts || !is_ipaccess_bts(other_bts)) { + vty_out(vty, "This feature is only available for IP systems.%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + if (dep >= bts->nr) { + vty_out(vty, "%%Need to depend on an already declared unit.%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + bts_depend_mark(bts, dep); + return CMD_SUCCESS; +} + +DEFUN(cfg_bts_no_depends_on, cfg_bts_no_depends_on_cmd, + "depeneds-on-bts <0-255>", + NO_STR "This BTS can only be started if another one is up\n" + "BTS Number\n") +{ + struct gsm_bts *bts = vty->index; + int dep = atoi(argv[0]); + + bts_depend_clear(bts, dep); + return CMD_SUCCESS; +} + #define TRX_TEXT "Radio Transceiver\n" /* per TRX configuration */ @@ -3383,6 +3444,8 @@ int bsc_vty_init(const struct log_info *cat) install_element(BTS_NODE, &cfg_bts_codec2_cmd); install_element(BTS_NODE, &cfg_bts_codec3_cmd); install_element(BTS_NODE, &cfg_bts_codec4_cmd); + install_element(BTS_NODE, &cfg_bts_depends_on_cmd); + install_element(BTS_NODE, &cfg_bts_no_depends_on_cmd); install_element(BTS_NODE, &cfg_trx_cmd); install_node(&trx_node, dummy_config_write); diff --git a/openbsc/src/libbsc/bts_ipaccess_nanobts.c b/openbsc/src/libbsc/bts_ipaccess_nanobts.c index 9fa03bf..825a22e 100644 --- a/openbsc/src/libbsc/bts_ipaccess_nanobts.c +++ b/openbsc/src/libbsc/bts_ipaccess_nanobts.c @@ -590,6 +590,13 @@ ipaccess_sign_link_up(void *unit_data, struct e1inp_line *line, /* remove old OML signal link for this BTS. */ ipaccess_drop_oml(bts); + if (!bts_depend_check(bts)) { + LOGP(DLINP, LOGL_NOTICE, + "Dependency not full-filled for %u/%u/%u\n", + dev->site_id, dev->bts_id, dev->trx_id); + return NULL; + } + /* create new OML link. */ sign_link = bts->oml_link = e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML - 1], diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index 03e9b85..73041fc 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -364,3 +364,61 @@ int gsm_parse_reg(void *ctx, regex_t *reg, char **str, int argc, const char **ar return ret; } +/* Assume there are only 256 possible bts */ +osmo_static_assert(sizeof(((struct gsm_bts *) 0)->nr) == 1, _bts_nr_is_256); +static void depends_calc_index_bit(int bts_nr, int *idx, int *bit) +{ + *idx = bts_nr / (8 * 4); + *bit = bts_nr % (8 * 4); +} + +void bts_depend_mark(struct gsm_bts *bts, int dep) +{ + int idx, bit; + depends_calc_index_bit(dep, &idx, &bit); + + bts->depends_on[idx] |= 1 << bit; +} + +void bts_depend_clear(struct gsm_bts *bts, int dep) +{ + int idx, bit; + depends_calc_index_bit(dep, &idx, &bit); + + bts->depends_on[idx] &= ~(1 << bit); +} + +static int bts_depend_is_depedency(struct gsm_bts *base, struct gsm_bts *other) +{ + int idx, bit; + depends_calc_index_bit(other->nr, &idx, &bit); + + /* Check if there is a depends bit */ + return (base->depends_on[idx] & (1 << bit)) > 0; +} + +static int bts_is_online(struct gsm_bts *bts) +{ + /* TODO: support E1 BTS too */ + if (!is_ipaccess_bts(bts)) + return 1; + + if (!bts->oml_link) + return 0; + + return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; +} + +int bts_depend_check(struct gsm_bts *bts) +{ + struct gsm_bts *other_bts; + + llist_for_each_entry(other_bts, &bts->network->bts_list, list) { + if (!bts_depend_is_depedency(bts, other_bts)) + continue; + if (bts_is_online(other_bts)) + continue; + return 0; + } + return 1; +} -- 2.1.3

1 1

[PATCH] ipa: Set the BSC_FD_WRITE in ipa_client_conn_open
by Holger Hans Peter Freyther 12 Dec '14

12 Dec '14

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> When the link is being created BSC_FD_WRITE and BSC_FD_READ are being ored into the flag. When the socket connects the first time the ipa_client_fd_cb function is called and the link->state is moved from connecting to connect. In case the connection drops and ipa_client_conn_open is called again the BSC_FD_WRITE flag might not be set. This means that after the socket is connected, ipa_client_fd_cb will not be called. This means that the updown_cb will not be called until after the first write or read on the socket. It might even lead to missing some data. When re-connecting set the write flag again. --- src/input/ipa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/input/ipa.c b/src/input/ipa.c index e2da6f4..1ddf802 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -218,6 +218,7 @@ int ipa_client_conn_open(struct ipa_client_conn *link) return ret; } link->ofd->fd = ret; + link->ofd->when |= BSC_FD_WRITE; if (osmo_fd_register(link->ofd) < 0) { close(ret); link->ofd->fd = -1; -- 2.1.3

1 0