OpenBSC

openbsc@lists.osmocom.org

4 participants
4157 discussions

[PATCH] lapd/test: Add test case for RSL EST REQ -> LAPD

by Jacob Erlbeck

This test case processes RSL establish requests for SMS (SAPI 3) on the SDCCH and the SACCH channels. The TX queues are checked after processing each message. Ticket: #225 Sponsored-by: On-Waves ehf --- tests/lapd/lapd_test.c | 120 +++++++++++++++++++++++++++++++++++++++++------ tests/lapd/lapd_test.ok | 7 +++ 2 files changed, 112 insertions(+), 15 deletions(-) diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c index 37c0db8..b4594de 100644 --- a/tests/lapd/lapd_test.c +++ b/tests/lapd/lapd_test.c @@ -80,6 +80,14 @@ static const uint8_t rel_req[] = { 0x02, 0x07, 0x01, 0x0a, 0x02, 0x40, 0x14, 0x01 }; +static const uint8_t est_req_sdcch_sapi3[] = { + 0x02, 0x04, 0x01, 0x20, 0x02, 0x03 +}; + +static const uint8_t est_req_sacch_sapi3[] = { + 0x02, 0x04, 0x01, 0x0b, 0x02, 0x43 +}; + static struct msgb *create_cm_serv_req(void) { struct msgb *msg; @@ -131,6 +139,16 @@ static struct msgb *create_rel_req(void) return msg; } +static struct msgb *create_est_req(const uint8_t *est_req, size_t est_req_size) +{ + struct msgb *msg; + + msg = msgb_from_array(est_req, est_req_size); + msg->l2h = msg->data; + msg->l3h = msg->l2h + sizeof(struct abis_rsl_rll_hdr); + return msg; +} + static int send(struct msgb *in_msg, struct lapdm_channel *chan) { struct osmo_phsap_prim pp; @@ -350,6 +368,52 @@ static void test_lapdm_polling() lapdm_channel_exit(&ms_to_bts_channel); } +static void test_lapdm_contention_resolution() +{ + printf("I test contention resultion by having two mobiles collide and " + "first mobile repeating SABM.\n"); + + int rc; + struct lapdm_polling_state test_state; + struct osmo_phsap_prim pp; + + /* Configure LAPDm on both sides */ + struct lapdm_channel bts_to_ms_channel; + memset(&bts_to_ms_channel, 0, sizeof(bts_to_ms_channel)); + + memset(&test_state, 0, sizeof(test_state)); + test_state.bts = &bts_to_ms_channel; + + /* BTS to MS in polling mode */ + lapdm_channel_init(&bts_to_ms_channel, LAPDM_MODE_BTS); + lapdm_channel_set_flags(&bts_to_ms_channel, LAPDM_ENT_F_POLLING_ONLY); + lapdm_channel_set_l1(&bts_to_ms_channel, NULL, &test_state); + lapdm_channel_set_l3(&bts_to_ms_channel, bts_to_ms_tx_cb, &test_state); + + /* Send SABM MS 1, we must get UA */ + send_sabm(&bts_to_ms_channel, 0); + rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_dcch, &pp); + CHECK_RC(rc); + OSMO_ASSERT(memcmp(pp.oph.msg->l2h, ua, ARRAY_SIZE(ua)) == 0); + + /* Send SABM MS 2, we must get nothing, due to collision */ + send_sabm(&bts_to_ms_channel, 1); + rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_dcch, &pp); + OSMO_ASSERT(rc == -ENODEV); + + /* Send SABM MS 1 again, we must get UA gain */ + send_sabm(&bts_to_ms_channel, 0); + rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_dcch, &pp); + CHECK_RC(rc); + OSMO_ASSERT(memcmp(pp.oph.msg->l2h, ua, ARRAY_SIZE(ua)) == 0); + + /* clean up */ + lapdm_channel_exit(&bts_to_ms_channel); + + /* idempotent */ + lapdm_channel_exit(&bts_to_ms_channel); +} + static void test_lapdm_early_release() { printf("I test RF channel release of an unestablished channel.\n"); @@ -381,14 +445,13 @@ static void test_lapdm_early_release() lapdm_channel_exit(&bts_to_ms_channel); } -static void test_lapdm_contention_resolution() +static void lapdm_establish(const uint8_t *est_req, size_t est_req_size) { - printf("I test contention resultion by having two mobiles collide and " - "first mobile repeating SABM.\n"); - int rc; struct lapdm_polling_state test_state; struct osmo_phsap_prim pp; + struct msgb *msg; + const char *queue_name; /* Configure LAPDm on both sides */ struct lapdm_channel bts_to_ms_channel; @@ -403,22 +466,39 @@ static void test_lapdm_contention_resolution() lapdm_channel_set_l1(&bts_to_ms_channel, NULL, &test_state); lapdm_channel_set_l3(&bts_to_ms_channel, bts_to_ms_tx_cb, &test_state); - /* Send SABM MS 1, we must get UA */ - send_sabm(&bts_to_ms_channel, 0); + /* Send the release request */ + msg = create_est_req(est_req, est_req_size); + rc = lapdm_rslms_recvmsg(msg, &bts_to_ms_channel); + fprintf(stderr, "recvmsg: got rc %d: %s\n", rc, rc <= 0 ? strerror(-rc) : "???"); + OSMO_ASSERT(rc == 0); + + /* Take message from queue */ rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_dcch, &pp); + if (rc >= 0) + queue_name = "DCCH"; + else { + rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_acch, &pp); + if (rc >= 0) + queue_name = "ACCH"; + } + + fprintf(stderr, "dequeue: got rc %d: %s\n", rc, + rc <= 0 ? strerror(-rc) : "-"); CHECK_RC(rc); - OSMO_ASSERT(memcmp(pp.oph.msg->l2h, ua, ARRAY_SIZE(ua)) == 0); - /* Send SABM MS 2, we must get nothing, due to collision */ - send_sabm(&bts_to_ms_channel, 1); - rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_dcch, &pp); - OSMO_ASSERT(rc == -ENODEV); + printf("Took message from %s queue: L2 header size %d, " + "SAP %#x, %d/%d, Link 0x%02x\n", + queue_name, msgb_l2len(pp.oph.msg) - msgb_l3len(pp.oph.msg), + pp.oph.sap, pp.oph.primitive, pp.oph.operation, + pp.u.data.link_id); + printf("Message: %s\n", osmo_hexdump(pp.oph.msg->data, pp.oph.msg->len)); + + OSMO_ASSERT(pp.oph.msg->data == msgb_l2(pp.oph.msg)); - /* Send SABM MS 1 again, we must get UA gain */ - send_sabm(&bts_to_ms_channel, 0); rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_dcch, &pp); - CHECK_RC(rc); - OSMO_ASSERT(memcmp(pp.oph.msg->l2h, ua, ARRAY_SIZE(ua)) == 0); + OSMO_ASSERT(rc < 0); + rc = lapdm_phsap_dequeue_prim(&bts_to_ms_channel.lapdm_acch, &pp); + OSMO_ASSERT(rc < 0); /* clean up */ lapdm_channel_exit(&bts_to_ms_channel); @@ -427,6 +507,15 @@ static void test_lapdm_contention_resolution() lapdm_channel_exit(&bts_to_ms_channel); } +static void test_lapdm_establishment() +{ + printf("I test RF channel establishment.\n"); + printf("Testing SAPI3/SDCCH\n"); + lapdm_establish(est_req_sdcch_sapi3, sizeof(est_req_sdcch_sapi3)); + printf("Testing SAPI3/SACCH\n"); + lapdm_establish(est_req_sacch_sapi3, sizeof(est_req_sacch_sapi3)); +} + int main(int argc, char **argv) { osmo_init_logging(&info); @@ -434,6 +523,7 @@ int main(int argc, char **argv) test_lapdm_polling(); test_lapdm_early_release(); test_lapdm_contention_resolution(); + test_lapdm_establishment(); printf("Success.\n"); return 0; diff --git a/tests/lapd/lapd_test.ok b/tests/lapd/lapd_test.ok index 27389bf..e4b1359 100644 --- a/tests/lapd/lapd_test.ok +++ b/tests/lapd/lapd_test.ok @@ -21,4 +21,11 @@ I test RF channel release of an unestablished channel. I test contention resultion by having two mobiles collide and first mobile repeating SABM. bts_to_ms_tx_cb: MS->BTS(us) message 25 BTS: Verifying CM request. +I test RF channel establishment. +Testing SAPI3/SDCCH +Took message from DCCH queue: L2 header size 3, SAP 0x1000000, 0/0, Link 0x03 +Message: 0f 3f 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +Testing SAPI3/SACCH +Took message from ACCH queue: L2 header size 5, SAP 0x1000000, 0/0, Link 0x43 +Message: 00 00 0f 3f 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Success. -- 1.7.9.5

11 years, 5 months

RE: Re[2]: GPRS, EDGE support

by Ralph A. Schmid, dk5ras

OpenBTS supports GPRS, but at least for me it does not work very reliably, I consider this only a proof of concept. While voice/SMS range is up to 200m, GPRS breaks down after 5m (!) distance, and the connection stalls after a while, requiring a restart of OpenBTS. I am using an USRP1 with WBX board. Ralph. From: openbsc-bounces(a)lists.osmocom.org [mailto:openbsc-bounces@lists.osmocom.org] On Behalf Of Sipos Csaba Sent: Thursday, 23 January, 2014 18:37 To: Don Fanning Cc: openbsc(a)lists.osmocom.org Subject: Re[2]: GPRS, EDGE support Hi Don, Thanks for the answer. THe problem with nanobts that it is unaccessible, and even when it turns up on ebay, it costs a fortune. I'd rather pay that fortune for an USRP or half that fortune for a bladerf, and I will have an SDR which I can use not only as a BTS. So, at the moment GPRS/EDGE is only possible with nanoBTS? What about USRP or BladeRF running OpenBTS? BR, Csaba There has been a working GPRS stack for a while now: http://openbsc.osmocom.org/trac/wiki/OpenBSC_GPRS As for USRP or OpenBTS, I cannot comment upon having never used either platform.

11 years, 5 months

RE: Re[4]: GPRS, EDGE support

by Ralph A. Schmid, dk5ras

Well, at least voice and SMS is not affected and works just great. GPRS uses only an open power control, no closed loop, maybe it has to do with this? At the moment I do not have other hardware for comparison, so digging deeper into this may be not so useful. The issue is discussed on the OpenBTS mailing list, with no clear results at the moment. Ralph. From: Sipos Csaba [mailto:dchardware@gmail.com] Sent: Thursday, 23 January, 2014 22:01 To: Ralph A. Schmid, dk5ras Cc: 'Don Fanning'; openbsc(a)lists.osmocom.org Subject: Re[4]: GPRS, EDGE support Thanks for the info! At least now I know, that the GPRS/EDGE is part of the OpenBTS code, so any hardware is OK for packet data which can run OpenBTS. That is good news. Anyway, it is just an educated guess, but don't you think your problem with GPRS is related to timing? My experience with real life networks clearly shows that even a slight timing related problem or inaccuracy can led to something like that. My other experience is with R&S CMW500, which I used with a little external antenna and encountered the same problem. After a few meters even the voice calls started to drop with -60 RSSI. The reason was obvious: the device lacks any filters on the input chain (it is designed for production mode), and when all the received RF energy hits the receiver from all the bands, it causes problems like that. And the packet data was way more sensitive to this than voice calls. After installing proper filters, the problem is gone. BR, Csaba OpenBTS supports GPRS, but at least for me it does not work very reliably, I consider this only a proof of concept. While voice/SMS range is up to 200m, GPRS breaks down after 5m (!) distance, and the connection stalls after a while, requiring a restart of OpenBTS. I am using an USRP1 with WBX board. Ralph.

11 years, 5 months

Re: Re[4]: GPRS, EDGE support

by Alexander Chemeris

Csaba, We use UmTRX routinely to develop GPRS code for OpenBSC and it works well. I can't say much about other SDR equipment, but we have some timing related bugs with USRP1 based devices of one of our customers. Regarding the official OpenBTS GPRS code - we've never tried to run it, but looking into the code, it lacks quite a few features the OpenBSC implementation has. On Fri, Jan 24, 2014 at 1:01 AM, Sipos Csaba <dchardware(a)gmail.com> wrote: > Thanks for the info! > > > At least now I know, that the GPRS/EDGE is part of the OpenBTS code, so > any hardware is OK for packet data which can run OpenBTS. That is good news. > > > Anyway, it is just an educated guess, but don't you think your problem > with GPRS is related to timing? My experience with real life networks > clearly shows that even a slight timing related problem or inaccuracy can > led to something like that. > > > My other experience is with R&S CMW500, which I used with a little > external antenna and encountered the same problem. After a few meters even > the voice calls started to drop with -60 RSSI. The reason was obvious: the > device lacks any filters on the input chain (it is designed for production > mode), and when all the received RF energy hits the receiver from all the > bands, it causes problems like that. And the packet data was way more > sensitive to this than voice calls. After installing proper filters, the > problem is gone. > > > BR, > > Csaba > > > > OpenBTS supports GPRS, but at least for me it does not work very > reliably, I consider this only a proof of concept. While voice/SMS range is > up to 200m, GPRS breaks down after 5m (!) distance, and the connection > stalls after a while, requiring a restart of OpenBTS. I am using an USRP1 > with WBX board. > > > > Ralph. > -- Regards, Alexander Chemeris. CEO, Fairwaves LLC / ООО УмРадио http://fairwaves.ru

11 years, 5 months

[PATCH] Support of multiple RSL connections for ABIS/ipaccess (BTS side)

by Andreas Eversberg

hi, while re-basing the osmo-bts-trx code with master, i saw that the ABIS code has been replaced by libosmo-abis. libosmo-abis is not capable of handling multiple RSL connections, so the multi-TRX support is broke now. the attached patch will add multiple RSL connection support to libosmo-abis. regards, andreas

11 years, 5 months

Re: Openbsc support for new BTS

by Harald Welte

Hi Jason, On Fri, Nov 08, 2013 at 01:21:46PM +0000, Jason DSouza wrote: > But I'm waiting at Opstart for Obj Class - RADIO_CARRIER to trigger > trx-init() which is never received from BSC. That is where I'm struck > now. All this so far is similar to sysmobts interface, something > similar to bts_model_opstart() function in osmo-bts-sysmo. Please see the following code from bts_ipaccess_nanobts.c: ============== /* 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) { [...] case NM_OC_RADIO_CARRIER: trx = obj; if (new_state->operational == NM_OPSTATE_DISABLED && new_state->availability == NM_AVSTATE_OK) abis_nm_opstart(trx->bts, obj_class, trx->bts->bts_nr, trx->nr, 0xff); break; ============== So the opstrart for the RADIO_CARRIER is sent in response to an incoming NM_MT_STATECHG_EVENT_REP withe the operational state set to DISABLED and the availability set to OK. My guess is that you are not sending such a state event from the BTS to the BSC. I can also not see that in the pcap file you have sent. All OML messages in there relate to the Site MAnager or the BTS object class, but there are no messages related to any other MOs. As indicated, it is best to start from a known-working setup with a supported BTS model, or at least from a protocol trace of an existing supported configuration. Please also make sure to set your 'bts model' to nanobts, I _think_ the 'bts model sysmobts' is still broken. 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)

11 years, 5 months

[PATCH] Support for multiple RSL connections with ABIS/ipaccess (BTS side)

by Andreas Eversberg

In order to support multiple TRX, multiple RSL connections can be establised. e1inp_ipa_bts_rsl_connect() requires an additional parameter to set the TRX number. The ts[] array (member of struct e1inp_line) refers to OML and RSL. ts[0] refers to OML link, ts[1] to RSL link of first TRX, ts[2] to RSL link of second TRX (if exists) and so on. The code was successfully tested with osmobts-trx and UmTRX with two transceivers. The user of e1inp_ipa_bts_rsl_connect() (which is osmo-bts) must be upgraded after applying the patch. src/common/oml.c - rc = e1inp_ipa_bts_rsl_connect(oml_link->ts->line, inet_ntoa(in), port); + rc = e1inp_ipa_bts_rsl_connect(oml_link->ts->line, inet_ntoa(in), port, + trx->nr); --- include/osmocom/abis/e1_input.h | 3 ++- src/input/ipaccess.c | 30 +++++++++++++++++++++++------- tests/e1inp_ipa_bts_test.c | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 9b77893..7fbffe9 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -265,7 +265,8 @@ struct subch_mux *e1inp_get_mux(uint8_t e1_nr, uint8_t ts_nr); /* on an IPA BTS, the BTS needs to establish the RSL connection much * later than the OML connection. */ int e1inp_ipa_bts_rsl_connect(struct e1inp_line *line, - const char *rem_addr, uint16_t rem_port); + const char *rem_addr, uint16_t rem_port, + uint8_t trx_id); void e1inp_sign_link_destroy(struct e1inp_sign_link *link); int e1inp_line_update(struct e1inp_line *line); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 07b47b2..4091d09 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -774,7 +774,7 @@ err_line: #define IPA_STRING_MAX 64 static struct msgb * -ipa_bts_id_resp(struct ipaccess_unit *dev, uint8_t *data, int len) +ipa_bts_id_resp(struct ipaccess_unit *dev, uint8_t *data, int len, int trx_nr) { struct msgb *nmsg; char str[IPA_STRING_MAX]; @@ -795,7 +795,7 @@ ipa_bts_id_resp(struct ipaccess_unit *dev, uint8_t *data, int len) switch (data[1]) { case IPAC_IDTAG_UNIT: snprintf(str, sizeof(str), "%u/%u/%u", - dev->site_id, dev->bts_id, dev->trx_id); + dev->site_id, dev->bts_id, trx_nr); break; case IPAC_IDTAG_MACADDR: snprintf(str, sizeof(str), @@ -895,6 +895,7 @@ static int ipaccess_bts_read_cb(struct ipa_client_conn *link, struct msgb *msg) struct e1inp_sign_link *sign_link; uint8_t *data = msgb_l2(msg); int len = msgb_l2len(msg); + int trx_nr = 0; LOGP(DLINP, LOGL_NOTICE, "received ID get\n"); if (!link->line->ops->sign_link_up) { @@ -904,8 +905,10 @@ static int ipaccess_bts_read_cb(struct ipa_client_conn *link, struct msgb *msg) ret = -EINVAL; goto err; } + if (link->ofd->priv_nr >= E1INP_SIGN_RSL) + trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; rmsg = ipa_bts_id_resp(link->line->ops->cfg.ipa.dev, - data + 1, len - 1); + data + 1, len - 1, trx_nr); ret = ipaccess_send(link->ofd->fd, rmsg->data, rmsg->len); if (ret != rmsg->len) { @@ -942,7 +945,7 @@ static int ipaccess_bts_read_cb(struct ipa_client_conn *link, struct msgb *msg) } else if (link->port == IPA_TCP_PORT_OML) e1i_ts = &link->line->ts[0]; else if (link->port == IPA_TCP_PORT_RSL) - e1i_ts = &link->line->ts[1]; + e1i_ts = &link->line->ts[link->ofd->priv_nr-1]; OSMO_ASSERT(e1i_ts != NULL); @@ -1073,13 +1076,26 @@ static int ipaccess_line_update(struct e1inp_line *line) } int e1inp_ipa_bts_rsl_connect(struct e1inp_line *line, - const char *rem_addr, uint16_t rem_port) + const char *rem_addr, uint16_t rem_port, + uint8_t trx_nr) { struct ipa_client_conn *rsl_link; + if (E1INP_SIGN_RSL+trx_nr-1 >= NUM_E1_TS) { + LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: " + "trx_nr (%d) out of range\n", trx_nr); + return -EINVAL; + } + if (line->ts[E1INP_SIGN_RSL+trx_nr-1].type != E1INP_TS_TYPE_SIGN) { + LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: " + "trx_nr (%d) does not refer to a signalling link\n", + trx_nr); + return -EINVAL; + } + rsl_link = ipa_client_conn_create(tall_ipa_ctx, - &line->ts[E1INP_SIGN_RSL-1], - E1INP_SIGN_RSL, + &line->ts[E1INP_SIGN_RSL+trx_nr-1], + E1INP_SIGN_RSL+trx_nr, rem_addr, rem_port, ipaccess_bts_updown_cb, ipaccess_bts_read_cb, diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 02a4cb3..a43dba3 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -70,7 +70,7 @@ sign_link_up(void *unit, struct e1inp_line *line, enum e1inp_sign_type type) /* Now we can send OML messages to the BSC. */ bts_state = BTS_TEST_OML_SIGN_LINK_UP; } - e1inp_ipa_bts_rsl_connect(line, "127.0.0.1", IPA_TCP_PORT_RSL); + e1inp_ipa_bts_rsl_connect(line, "127.0.0.1", IPA_TCP_PORT_RSL, 0); break; case E1INP_SIGN_RSL: LOGP(DBTSTEST, LOGL_NOTICE, "RSL link up request received.\n"); -- 1.8.1.5 --------------050208090707040108050104--

11 years, 5 months

[PATCH] ABIS: Support for multiple RSL connections

by Andreas Eversberg

--- include/osmo-bts/abis.h | 2 +- src/common/abis.c | 57 ++++++++++++++++++++++++++++++++++------------- src/common/oml.c | 7 +++--- src/osmo-bts-sysmo/main.c | 2 +- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/include/osmo-bts/abis.h b/include/osmo-bts/abis.h index fb0fbd7..ceda736 100644 --- a/include/osmo-bts/abis.h +++ b/include/osmo-bts/abis.h @@ -17,7 +17,7 @@ enum { }; struct e1inp_line *abis_open(struct gsm_bts *bts, const char *dst_host, - const char *model_name); + const char *model_name, int num_trx); int abis_oml_sendmsg(struct msgb *msg); diff --git a/src/common/abis.c b/src/common/abis.c index 37e82f3..4c4699d 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -34,6 +34,7 @@ #include <osmocom/core/timer.h> #include <osmocom/core/msgb.h> #include <osmocom/core/signal.h> +#include <osmocom/core/talloc.h> #include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> #include <osmocom/abis/ipaccess.h> @@ -68,6 +69,8 @@ static struct e1inp_sign_link *sign_link_up(void *unit, struct e1inp_line *line, enum e1inp_sign_type type) { struct e1inp_sign_link *sign_link = NULL; + struct gsm_bts_trx *trx; + uint8_t trx_id; switch (type) { case E1INP_SIGN_OML: @@ -79,17 +82,22 @@ static struct e1inp_sign_link *sign_link_up(void *unit, struct e1inp_line *line, sign_link->trx = g_bts->c0; bts_link_estab(g_bts); break; - case E1INP_SIGN_RSL: - LOGP(DABIS, LOGL_INFO, "RSL Signalling link up\n"); - e1inp_ts_config_sign(&line->ts[E1INP_SIGN_RSL-1], line); - sign_link = g_bts->c0->rsl_link = - e1inp_sign_link_create(&line->ts[E1INP_SIGN_RSL-1], - E1INP_SIGN_RSL, NULL, 0, 0); - /* FIXME: This assumes there is only one TRX! */ - sign_link->trx = g_bts->c0; - trx_link_estab(sign_link->trx); - break; default: + trx_id = type - E1INP_SIGN_RSL; + LOGP(DABIS, LOGL_INFO, "RSL Signalling link for TRX %d up\n", + trx_id); + trx = gsm_bts_trx_num(g_bts, trx_id); + if (!trx) { + LOGP(DABIS, LOGL_ERROR, "TRX ID %d does not exits\n", + trx_id); + break; + } + e1inp_ts_config_sign(&line->ts[type-1], line); + sign_link = trx->rsl_link = + e1inp_sign_link_create(&line->ts[type-1], + E1INP_SIGN_RSL, NULL, 0, 0); + sign_link->trx = trx; + trx_link_estab(trx); break; } @@ -98,12 +106,16 @@ static struct e1inp_sign_link *sign_link_up(void *unit, struct e1inp_line *line, static void sign_link_down(struct e1inp_line *line) { + struct gsm_bts_trx *trx; + LOGP(DABIS, LOGL_ERROR, "Signalling link down\n"); - if (g_bts->c0->rsl_link) { - e1inp_sign_link_destroy(g_bts->c0->rsl_link); - g_bts->c0->rsl_link = NULL; - trx_link_estab(g_bts->c0); + llist_for_each_entry(trx, &g_bts->trx_list, list) { + if (trx->rsl_link) { + e1inp_sign_link_destroy(trx->rsl_link); + trx->rsl_link = NULL; + trx_link_estab(trx); + } } if (g_bts->oml_link) @@ -212,7 +224,6 @@ static struct e1inp_line_ops line_ops = { .cfg = { .ipa = { .role = E1INP_LINE_R_BTS, - .dev = &bts_dev_info, }, }, .sign_link_up = sign_link_up, @@ -224,9 +235,11 @@ static struct e1inp_line_ops line_ops = { * global initialization as well as the actual opening of the A-bis link * */ struct e1inp_line *abis_open(struct gsm_bts *bts, const char *dst_host, - const char *model_name) + const char *model_name, int num_trx) { struct e1inp_line *line; + struct ipaccess_unit *units; + int i; g_bts = bts; @@ -236,6 +249,13 @@ struct e1inp_line *abis_open(struct gsm_bts *bts, const char *dst_host, osmo_signal_register_handler(SS_L_INPUT, &inp_s_cbfn, bts); + /* allocate list of ipaccess dev info (OML and each RSL connection) */ + units = talloc_zero_array(tall_bts_ctx, struct ipaccess_unit, + num_trx+1); + if (!units) + return NULL; + line_ops.cfg.ipa.dev = units; + /* patch in various data from VTY and othe sources */ line_ops.cfg.ipa.addr = dst_host; get_mac_addr("eth0", bts_dev_info.mac_addr); @@ -250,6 +270,11 @@ struct e1inp_line *abis_open(struct gsm_bts *bts, const char *dst_host, if (!line) return NULL; e1inp_line_bind_ops(line, &line_ops); + memcpy(&units[0], &bts_dev_info, sizeof(*units)); + for (i = 0; i < num_trx; i++) { + memcpy(&units[i+1], &bts_dev_info, sizeof(*units)); + units[i+1].trx_id = i; + } /* This is what currently starts both the outbound OML and RSL * connections, which is wrong. diff --git a/src/common/oml.c b/src/common/oml.c index bf174b5..acde230 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1018,10 +1018,11 @@ static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg, } in.s_addr = htonl(ip); - LOGP(DOML, LOGL_INFO, "Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", - inet_ntoa(in), port, stream_id); + LOGP(DOML, LOGL_INFO, "Rx IPA RSL CONNECT TRX=%d IP=%s PORT=%u " + "STREAM=0x%02x\n", trx->nr, inet_ntoa(in), port, stream_id); - rc = e1inp_ipa_bts_rsl_connect(oml_link->ts->line, inet_ntoa(in), port); + rc = e1inp_ipa_bts_rsl_connect(oml_link->ts->line, inet_ntoa(in), port, + trx->nr); if (rc < 0) { LOGP(DOML, LOGL_ERROR, "Error in abis_open(RSL): %d\n", rc); return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 74ee47f..f85748f 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -365,7 +365,7 @@ int main(int argc, char **argv) exit(1); } - line = abis_open(bts, btsb->bsc_oml_host, "sysmoBTS"); + line = abis_open(bts, btsb->bsc_oml_host, "sysmoBTS", 1); if (!line) { fprintf(stderr, "unable to connect to BSC\n"); exit(1); -- 1.8.1.5 --------------030007020209040104000503--

11 years, 5 months

[PATCH] doc/examples: osmo-nitb: Fix no voice when using sysmobts

by Alvaro Neira

From: Álvaro Neira Ayuso <alvaroneay(a)gmail.com> If the default codec is not specified, I get no voice in my calls. This patch adds the parameters default-codec tch-f and tch-h to get the voice working. Signed-off-by: Alvaro Neira Ayuso <alvaroneay(a)gmail.com> --- openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg index 7a44308..0eda9f6 100644 --- a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg +++ b/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg @@ -75,3 +75,6 @@ network phys_chan_config TCH/F timeslot 7 phys_chan_config TCH/F +mncc-int + default-codec tch-f amr + default-codec tch-h amr

11 years, 5 months

[PATCH] openbsc: Fix coverity issues

by Jacob Erlbeck

This patch (hopefully) fixes the new defects reported by coverity. Addresses: ** CID 1156986: Negative array index read (NEGATIVE_RETURNS) /tests/gsm0408/gsm0408_test.c: 419 in test_si_range_helpers() /tests/gsm0408/gsm0408_test.c: 423 in test_si_range_helpers() /tests/gsm0408/gsm0408_test.c: 427 in test_si_range_helpers() ** CID 1156987: Unchecked return value from library (CHECKED_RETURN) /src/libmgcp/mgcp_protocol.c: 1150 in mgcp_keepalive_timer_cb() ** CID 1156988: Unchecked return value from library (CHECKED_RETURN) /src/libmgcp/mgcp_protocol.c: 983 in handle_modify_con() Sponsored-by: On-Waves ehf --- openbsc/src/libmgcp/mgcp_network.c | 19 ++++++++++++++++--- openbsc/tests/gsm0408/gsm0408_test.c | 6 +++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index 0cc2041..b55ac04 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -134,11 +134,24 @@ int mgcp_send_dummy(struct mgcp_endpoint *endp) rc = mgcp_udp_send(endp->net_end.rtp.fd, &endp->net_end.addr, endp->net_end.rtp_port, buf, 1); - if (rc == -1 || endp->tcfg->omit_rtcp) + if (rc == -1) + goto failed; + + if (endp->tcfg->omit_rtcp) + return rc; + + rc = mgcp_udp_send(endp->net_end.rtcp.fd, &endp->net_end.addr, + endp->net_end.rtcp_port, buf, 1); + + if (rc >= 0) return rc; - return mgcp_udp_send(endp->net_end.rtcp.fd, &endp->net_end.addr, - endp->net_end.rtcp_port, buf, 1); +failed: + LOGP(DMGCP, LOGL_ERROR, + "Failed to send dummy packet: %s on: 0x%x to %s\n", + strerror(errno), ENDPOINT_NUMBER(endp), inet_ntoa(endp->net_end.addr)); + + return -1; } static int32_t compute_timestamp_aligment_error(struct mgcp_rtp_stream_state *sstate, diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c index 894eb0f..38c1a6a 100644 --- a/openbsc/tests/gsm0408/gsm0408_test.c +++ b/openbsc/tests/gsm0408/gsm0408_test.c @@ -416,15 +416,15 @@ static void test_si_range_helpers() memset(&ws[0], 0x23, sizeof(ws)); i = range_enc_find_index(1023, freqs1, ARRAY_SIZE(freqs1)); - printf("Element is: %d => freqs[i] = %d\n", i, freqs1[i]); + printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs1[i] : -1); VERIFY(i, ==, 2); i = range_enc_find_index(511, freqs2, ARRAY_SIZE(freqs2)); - printf("Element is: %d => freqs[i] = %d\n", i, freqs2[i]); + printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs2[i] : -1); VERIFY(i, ==, 2); i = range_enc_find_index(511, freqs3, ARRAY_SIZE(freqs3)); - printf("Element is: %d => freqs[i] = %d\n", i, freqs3[i]); + printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs3[i] : -1); VERIFY(i, ==, 0); i = range_enc_arfcns(1023, freqs1, ARRAY_SIZE(freqs1), ws, 0); -- 1.7.9.5

11 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC