OpenBSC

openbsc@lists.osmocom.org

4315 discussions

[PATCH] debian: fix build errors with libosmogsm and libosmoctrl
by Ciaby 31 Aug '14

31 Aug '14

libosmogsm: the transition from 5 to 6 wasn't done properly. Fixed version number. libosmoctrl: missing definition in debian/control and also missing libosmoctrl0.install. --- debian/control | 6 ++++++ debian/libosmoctrl0.install | 1 + .../{libosmogsm5.install => libosmogsm6.install} | 0 src/gsm/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 debian/libosmoctrl0.install rename debian/{libosmogsm5.install => libosmogsm6.install} (100%) diff --git a/debian/control b/debian/control index 3204f0f..e81f7cf 100644 --- a/debian/control +++ b/debian/control @@ -44,6 +44,12 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Osmo VTY library +Package: libosmoctrl0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Osmo control library + Package: libosmocore-dev Section: libdevel Architecture: any diff --git a/debian/libosmoctrl0.install b/debian/libosmoctrl0.install new file mode 100644 index 0000000..6b23be8 --- /dev/null +++ b/debian/libosmoctrl0.install @@ -0,0 +1 @@ +usr/lib/libosmoctrl*.so.* diff --git a/debian/libosmogsm5.install b/debian/libosmogsm6.install similarity index 100% rename from debian/libosmogsm5.install rename to debian/libosmogsm6.install diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 4207959..1e2d893 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=6:0:1 +LIBVERSION=6:0:0 AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} $(all_includes) -I$(top_srcdir)/include -- 1.7.9.5 --------------080008040908010200020003 Content-Type: application/octet-stream; name="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.patch.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-debian-fix-build-errors-with-libosmogsm-and-libosmoc.pa"; filename*1="tch.sig" iF4EABEKAAYFAlQGBL8ACgkQC30ZhxNccpFrWQD/ZM1qKhGG0XYqxdU6adl3sub3NOTZk6XE DeprqaFLzGgA/R0FmlHzefNHPxRgZo0NnUNVamw65cfmhB1jGbnMMjH2 --------------080008040908010200020003--

1 0

[PATCH 1/8] l1sap: Port code to new ciphering handling
by Harald Welte 27 Aug '14

27 Aug '14

... introduced in 2cc37035d73191b71b9ba9c0d559a0da6a5f35e5 --- include/osmo-bts/l1sap.h | 2 ++ src/common/l1sap.c | 45 ++++++++++++++++++++++++++++++++---------- src/osmo-bts-sysmo/l1_if.c | 32 ------------------------------ src/osmo-bts-sysmo/l1_if.h | 3 --- tests/sysmobts/sysmobts_test.c | 10 +++++++--- 5 files changed, 44 insertions(+), 48 deletions(-) diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index dee430f..e76aca6 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -68,4 +68,6 @@ extern uint8_t gsmtap_sapi_acch; #define msgb_l1sap_prim(msg) ((struct osmo_phsap_prim *)(msg)->l1h) +int bts_check_for_first_ciphrd(struct gsm_lchan *lchan, + uint8_t *data, int len); #endif /* L1SAP_H */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 14dbde9..9c7a9c6 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -481,6 +481,39 @@ static void radio_link_timeout(struct gsm_lchan *lchan, int bad_frame) } } +static inline int check_for_first_ciphrd(struct gsm_lchan *lchan, + uint8_t *data, int len) +{ + uint8_t n_s; + + /* if this is the first valid message after enabling Rx + * decryption, we have to enable Tx encryption */ + if (lchan->ciph_state != LCHAN_CIPH_RX_CONF) + return 0; + + /* HACK: check if it's an I frame, in order to + * ignore some still buffered/queued UI frames received + * before decryption was enabled */ + if (data[0] != 0x01) + return 0; + + if ((data[1] & 0x01) != 0) + return 0; + + n_s = data[1] >> 5; + if (lchan->ciph_ns != n_s) + return 0; + + return 1; +} + +/* public helper for the test */ +int bts_check_for_first_ciphrd(struct gsm_lchan *lchan, + uint8_t *data, int len) +{ + return check_for_first_ciphrd(lchan, data, len); +} + /* DATA received from bts model */ static int l1sap_ph_data_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct ph_data_param *data_ind) @@ -557,16 +590,8 @@ static int l1sap_ph_data_ind(struct gsm_bts_trx *trx, } else le = &lchan->lapdm_ch.lapdm_dcch; - /* if this is the first valid message after enabling Rx - * decryption, we have to enable Tx encryption */ - if (lchan->ciph_state == LCHAN_CIPH_RX_CONF) { - /* HACK: check if it's an I frame, in order to - * ignore some still buffered/queued UI frames received - * before decryption was enabled */ - if (data[0] == 0x01 && (data[1] & 0x01) == 0) { - l1sap_tx_ciph_req(trx, chan_nr, 1, 0); - } - } + if (check_for_first_ciphrd(lchan, data, len)) + l1sap_tx_ciph_req(lchan->ts->trx, chan_nr, 1, 0); /* SDCCH, SACCH and FACCH all go to LAPDm */ msgb_pull(msg, (msg->l2h - msg->data)); diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index b62a2a3..14efc2c 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -356,31 +356,6 @@ static int check_for_ciph_cmd(struct femtol1_hdl *fl1h, return 1; } -static inline void check_for_first_ciphrd(struct femtol1_hdl *fl1h, - GsmL1_MsgUnitParam_t *msgUnitParam, - struct gsm_lchan *lchan) -{ - uint8_t n_s; - - /* if this is the first valid message after enabling Rx - * decryption, we have to enable Tx encryption */ - if (lchan->ciph_state != LCHAN_CIPH_RX_CONF) - return; - - /* HACK: check if it's an I frame, in order to - * ignore some still buffered/queued UI frames received - * before decryption was enabled */ - if (msgUnitParam->u8Buffer[0] != 0x01) - return; - if ((msgUnitParam->u8Buffer[1] & 0x01) != 0) - return; - n_s = msgUnitParam->u8Buffer[1] >> 5; - if (lchan->ciph_ns != n_s) - return; - lchan->ciph_state = LCHAN_CIPH_TXRX_REQ; - l1if_set_ciphering(fl1h, lchan, 1); -} - /* public helpers for the test */ int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h, struct msgb *msg, struct gsm_lchan *lchan) @@ -388,13 +363,6 @@ int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h, return check_for_ciph_cmd(fl1h, msg, lchan); } -void bts_check_for_first_ciphrd(struct femtol1_hdl *fl1h, - GsmL1_MsgUnitParam_t *msgUnitParam, - struct gsm_lchan *lchan) -{ - return check_for_first_ciphrd(fl1h, msgUnitParam, lchan); -} - static const uint8_t fill_frame[GSM_MACBLOCK_LEN] = { 0x03, 0x03, 0x01, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, 0x2B, diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index 6f58e95..a425776 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -138,7 +138,4 @@ int l1if_rf_clock_info_correct(struct femtol1_hdl *fl1h); /* public helpers for test */ int bts_check_for_ciph_cmd(struct femtol1_hdl *fl1h, struct msgb *msg, struct gsm_lchan *lchan); -void bts_check_for_first_ciphrd(struct femtol1_hdl *fl1h, - GsmL1_MsgUnitParam_t *msgUnitParam, - struct gsm_lchan *lchan); #endif /* _FEMTO_L1_H */ diff --git a/tests/sysmobts/sysmobts_test.c b/tests/sysmobts/sysmobts_test.c index acbc09c..3ed78fd 100644 --- a/tests/sysmobts/sysmobts_test.c +++ b/tests/sysmobts/sysmobts_test.c @@ -18,6 +18,7 @@ */ #include <osmo-bts/bts.h> +#include <osmo-bts/l1sap.h> #include "femtobts.h" #include "l1_if.h" @@ -169,14 +170,17 @@ static void test_sysmobts_cipher(void) /* Handle message sent before ciphering was received */ memcpy(&unit.u8Buffer[0], too_early_classmark, ARRAY_SIZE(too_early_classmark)); unit.u8Size = ARRAY_SIZE(too_early_classmark); - bts_check_for_first_ciphrd(&fl1h, &unit, &lchan); + rc = bts_check_for_first_ciphrd(&lchan, unit.u8Buffer, unit.u8Size); + OSMO_ASSERT(rc == 0); OSMO_ASSERT(lchan.ciph_state == LCHAN_CIPH_RX_CONF); /* Now send the first ciphered message */ memcpy(&unit.u8Buffer[0], first_ciphered_cipher_cmpl, ARRAY_SIZE(first_ciphered_cipher_cmpl)); unit.u8Size = ARRAY_SIZE(first_ciphered_cipher_cmpl); - bts_check_for_first_ciphrd(&fl1h, &unit, &lchan); - OSMO_ASSERT(lchan.ciph_state == LCHAN_CIPH_TXRX_REQ); + rc = bts_check_for_first_ciphrd(&lchan, unit.u8Buffer, unit.u8Size); + OSMO_ASSERT(rc == 1); + /* we cannot test for lchan.ciph_state == * LCHAN_CIPH_RX_CONF_TX_REQ, as + * this happens asynchronously on the other side of the l1sap queue */ } int main(int argc, char **argv) -- 2.1.0 --PMULwz+zIGJzpDN9 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-Add-MEAS-MPH_INFO-IND-message-to-PH-MPH-TCH-SAP-inte.patch"

1 0

(no subject)
by Snehasish Kar (Vehere) 26 Aug '14

26 Aug '14

Dear Groupmembers Please help me with this case. I have successfully sent rrlp request to the mobile and the mobile automatically turns its gps on as a response to it. But it doesn't provide me its location or request for any kind of assistance data. So please let me know what i am missing and what i have to do. Thanks & Regards Snehasish

1 0

libosmocore/libosmo-abis changes + fallout
by Harald Welte 20 Aug '14

20 Aug '14

In preparation of the libctrl move to libosmocore[*], I had to move some IPA related functionality from libosmo-abis to libosmocore. This is required as libctrl needs IPA functions, but we cannot make a cyclic library (build) dependency between libosmocore and libosmo-abis. I took the decision to rename some of the sysmbols for consistency. This is always ugly and creates fall-out, so there never is a good time for it. I thought now it makes sense as things are undergoing modifications anyway. I was able to do 'make check / make distcheck' of libosmocore / libosmo-abis / osmo-pcu / osmo-bts and openbsc master branches with the recent commits. If I missed something, please let me know by private mail and I'm happy o clean up further. Regards, Harald [*] required to add a control interface to osmo-bts, which is required for things like managing/triggering clock recalibration on sysmobts from external programs. -- - 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

Request for the Network Measurement Report info
by Ravi Shankar 20 Aug '14

20 Aug '14

Dear Sir Is it possible to get the Network Measurement Reports (NMRs) (This report comprises of Serving and neighboring cell-id , received signal strengths, timing advance, time of arrival values etc) of a particular Number/IMSI using OpenBSC. I am aware that we get these fields from the normal BSC. Regards. Ravi

2 1

[PATCH 1/5] libctrl: Remove reference to 'DNAT' in favor of 'DCTRL'
by Harald Welte 20 Aug '14

20 Aug '14

--- src/ctrl/control_if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index ca59d8c..156a24f 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -248,7 +248,7 @@ static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what) on = 1; ret = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); if (ret != 0) { - LOGP(DNAT, LOGL_ERROR, "Failed to set TCP_NODELAY: %s\n", strerror(errno)); + LOGP(DCTRL, LOGL_ERROR, "Failed to set TCP_NODELAY: %s\n", strerror(errno)); close(fd); return ret; } -- 2.1.0.rc1

1 4

Moving libctrl to libosmocore
by Harald Welte 20 Aug '14

20 Aug '14

Hi Daniel, I am currently working on moving the control interface to libosmocore, you can find the status in the 'laforge/libctrl' branch. The reason behind this is that I will be adding a control interface to osmo-bts soon. The first dozens of commits is basically a filtered list of commits from the openbsc repository. The last few commits are towards making it build outside libosmocore. Most of the commits are pretty simple and uninteresting. However, there is one change that I would like to ask you to review: adf2530fc3c9d45dd1d528cd6d92d462702e3f19 where I'm trying to avoid using the openbsc-global 'tall_bsc_ctx' and introduce a more hierarchical inheritance of allocations. As this is the first time I've looked at the control interface, I might have made some wrong decisions there. The remaining steps are: * remove 'struct gsm_network' as reference and replace with a 'void * data' or 'void *priv' field * possibly rename/prefix the function names, so we end up with osmoctrl_* for the symbol names. 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] gbproxy: Add gbprox_clear_patch_filter() (Coverity)
by Jacob Erlbeck 14 Aug '14

14 Aug '14

Add a separate function to clear the IMSI filter to be used instead of gbprox_set_patch_filter(cfg, NULL, ...). Albeit it fixes a Coverity issue (Unchecked return value), it is a false positive, since the return value is always 0 in these cases. Nevertheless it is more obvious what happens when an explicit clear function is called. Using NULL as filter argument of gbprox_set_patch_filter still clears the filter. Fixes: Coverity CID 1231255 Sponsored-by: On-Waves ehf --- openbsc/include/openbsc/gb_proxy.h | 1 + openbsc/src/gprs/gb_proxy.c | 13 +++++++++---- openbsc/src/gprs/gb_proxy_vty.c | 4 ++-- openbsc/tests/gbproxy/gbproxy_test.c | 6 ++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/openbsc/include/openbsc/gb_proxy.h b/openbsc/include/openbsc/gb_proxy.h index 039a9a1..d6dde10 100644 --- a/openbsc/include/openbsc/gb_proxy.h +++ b/openbsc/include/openbsc/gb_proxy.h @@ -115,6 +115,7 @@ void gbprox_reset(struct gbproxy_config *cfg); int gbprox_set_patch_filter(struct gbproxy_config *cfg, const char *filter, const char **err_msg); +void gbprox_clear_patch_filter(struct gbproxy_config *cfg); void gbprox_delete_tlli(struct gbproxy_peer *peer, struct gbproxy_tlli_info *tlli_info); diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index a8ce3cc..64fb55b 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -481,16 +481,21 @@ static void gbprox_delete_tllis(struct gbproxy_peer *peer) OSMO_ASSERT(llist_empty(&state->enabled_tllis)); } +void gbprox_clear_patch_filter(struct gbproxy_config *cfg) +{ + if (cfg->check_imsi) { + regfree(&cfg->imsi_re_comp); + cfg->check_imsi = 0; + } +} + int gbprox_set_patch_filter(struct gbproxy_config *cfg, const char *filter, const char **err_msg) { static char err_buf[300]; int rc; - if (cfg->check_imsi) { - regfree(&cfg->imsi_re_comp); - cfg->check_imsi = 0; - } + gbprox_clear_patch_filter(cfg); if (!filter) return 0; diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/openbsc/src/gprs/gb_proxy_vty.c index ec73ae6..9574a45 100644 --- a/openbsc/src/gprs/gb_proxy_vty.c +++ b/openbsc/src/gprs/gb_proxy_vty.c @@ -193,7 +193,7 @@ static int set_core_apn(struct vty *vty, const char *apn, const char *filter) talloc_free(g_cfg->core_apn); g_cfg->core_apn = NULL; g_cfg->core_apn_size = 0; - gbprox_set_patch_filter(g_cfg, NULL, NULL); + gbprox_clear_patch_filter(g_cfg); return CMD_SUCCESS; } @@ -206,7 +206,7 @@ static int set_core_apn(struct vty *vty, const char *apn, const char *filter) } if (!filter) { - gbprox_set_patch_filter(g_cfg, NULL, NULL); + gbprox_clear_patch_filter(g_cfg); } else if (gbprox_set_patch_filter(g_cfg, filter, &err_msg) != 0) { vty_out(vty, "Match expression invalid: %s%s", err_msg, VTY_NEWLINE); diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/openbsc/tests/gbproxy/gbproxy_test.c index 964c6da..5363749 100644 --- a/openbsc/tests/gbproxy/gbproxy_test.c +++ b/openbsc/tests/gbproxy/gbproxy_test.c @@ -1571,6 +1571,12 @@ static void test_gbproxy_imsi_matching(void) OSMO_ASSERT(gbprox_set_patch_filter(&cfg, NULL, &err_msg) == 0); OSMO_ASSERT(cfg.check_imsi == 0); + OSMO_ASSERT(gbprox_set_patch_filter(&cfg, filter_re2, &err_msg) == 0); + OSMO_ASSERT(cfg.check_imsi == 1); + + gbprox_clear_patch_filter(&cfg); + OSMO_ASSERT(cfg.check_imsi == 0); + peer = gbproxy_peer_alloc(&cfg, 20); OSMO_ASSERT(gbprox_set_patch_filter(&cfg, filter_re2, &err_msg) == 0); -- 1.9.1

1 0

Re: [PATCH] sysmobts: Deal with ciphering when we have a transport clash
by Harald Welte 11 Aug '14

11 Aug '14

Hi Holger, the patches look fine to me, although it hurts that such a hack and layering violations is actually needed. I'm wondering if the spec designers didn't come up with a more elegant method. In OpenBSC we could of course disable early classmark sending, but we cannot exclude osmo-bts / sysmobts from being used with other implementations either. What about OpenBSC waiting for the classmark change to arrive _if_ early classmark sending is enabled? At least, if A5/4 is ever used, this is the only way to support it anyway, as A5/4 is indicated only in CM3, and CM3 is only part of CLASSMARK CHANGE, but not part of the CM SERVICE REQUEST or PAGING RESPONSE. However, as we are probably all quite sure that the GSM industry is not capable of rolling out a 'new' cipher in less than 10 years, I'm not sure if we should worry about this here. -- - 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

[osmo-pcu 1/5] bts: Ensure tbf direction with OSMO_ASSERT()
by Daniel Willmann 07 Aug '14

07 Aug '14

In the lookup functions make sure that we are actually returning tbfs with the expected direction. Ticket: SYS#389 Sponsored-by: On-Waves ehf --- src/bts.cpp | 22 ++++++++++++++++------ src/bts.h | 3 ++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 08baee0..f614dab 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -234,12 +234,14 @@ gprs_rlcmac_tbf *BTS::tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction struct gprs_rlcmac_tbf *tbf; if (dir == GPRS_RLCMAC_UL_TBF) { llist_for_each_entry(tbf, &m_bts.ul_tbfs, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->tlli() == tlli && tbf->is_tlli_valid()) return tbf; } } else { llist_for_each_entry(tbf, &m_bts.dl_tbfs, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->tlli() == tlli) return tbf; @@ -258,8 +260,10 @@ gprs_rlcmac_tbf *BTS::dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED && tbf->poll_fn == fn && tbf->trx->trx_no == trx - && tbf->control_ts == ts) + && tbf->control_ts == ts) { + OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_DL_TBF); return tbf; + } } return NULL; } @@ -273,8 +277,10 @@ gprs_rlcmac_tbf *BTS::ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED && tbf->poll_fn == fn && tbf->trx->trx_no == trx - && tbf->control_ts == ts) + && tbf->control_ts == ts) { + OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_UL_TBF); return tbf; + } } return NULL; } @@ -307,8 +313,10 @@ gprs_rlcmac_tbf *BTS::tbf_by_tfi(uint8_t tfi, uint8_t trx, if (!tbf) return NULL; - if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)) + if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)) { + OSMO_ASSERT(tbf->direction == dir); return tbf; + } return NULL; } @@ -1023,11 +1031,13 @@ int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, int8_t return rc; } -gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi) +gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi, + enum gprs_rlcmac_tbf_direction dir) { gprs_rlcmac_tbf *tbf; llist_for_each_entry(tbf, tbf_list, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->tfi() != tfi) continue; if (!tbf->pdch[ts_no]) @@ -1039,10 +1049,10 @@ gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_l gprs_rlcmac_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi); + return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi, GPRS_RLCMAC_UL_TBF); } gprs_rlcmac_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi); + return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi, GPRS_RLCMAC_DL_TBF); } diff --git a/src/bts.h b/src/bts.h index 621bcba..a0b808e 100644 --- a/src/bts.h +++ b/src/bts.h @@ -87,7 +87,8 @@ private: void rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *, uint32_t fn); void rcv_resource_request(Packet_Resource_Request_t *t, uint32_t fn); void rcv_measurement_report(Packet_Measurement_Report_t *t, uint32_t fn); - gprs_rlcmac_tbf *tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi); + gprs_rlcmac_tbf *tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi, + enum gprs_rlcmac_tbf_direction dir); #endif }; -- 1.8.4.2

2 8

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC