OpenBSC May 2016

openbsc@lists.osmocom.org

25 participants
166 discussions

[PATCH] openbsc[master]: debian: Make upgrading from debian SID easier
by Holger Freyther 25 May '16

25 May '16

Review at https://gerrit.osmocom.org/113 debian: Make upgrading from debian SID easier Make sure the version number of this sourcepackage is higher than the one found in Debian SID. Change-Id: I838632e9e90378a03235c2aebd5bc9ed06627ec8 --- M debian/changelog 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/13/113/1 diff --git a/debian/changelog b/debian/changelog index 5f00a30..6a0362a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -openbsc (0.14.0) UNRELEASED; urgency=low +openbsc (0.15.1) UNRELEASED; urgency=medium + + * Move forward toward a new release. + + -- Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Tue, 24 May 2016 23:14:31 +0200 + +openbsc (0.14.0) unstable; urgency=low * New upstream tag and additional patches. -- To view, visit https://gerrit.osmocom.org/113 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I838632e9e90378a03235c2aebd5bc9ed06627ec8 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

1 2

[PATCH] libosmo-abis[master]: debian: Make upgrading from debian SID easier
by Holger Freyther 25 May '16

25 May '16

Review at https://gerrit.osmocom.org/110 debian: Make upgrading from debian SID easier Make sure the version number of this sourcepackage is higher than the one found in Debian SID. Change-Id: I393ef6624f112794e15b81a0cc9dbd8b0a871b07 --- M debian/changelog 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/10/110/1 diff --git a/debian/changelog b/debian/changelog index f1842fa..b2cf0e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -libosmo-abis (0.3.2) UNRELEASED; urgency=medium +libosmo-abis (0.3.3) UNRELEASED; urgency=medium + + * Move forward towards a new release. + + -- Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Tue, 24 May 2016 23:02:47 +0200 + +libosmo-abis (0.3.2) unstable; urgency=medium * Bump so version to re-link libosmovty -- To view, visit https://gerrit.osmocom.org/110 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I393ef6624f112794e15b81a0cc9dbd8b0a871b07 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

1 2

[PATCH] libosmo-sccp[master]: debian: Make upgrading from debian SID easier
by Holger Freyther 25 May '16

25 May '16

Review at https://gerrit.osmocom.org/109 debian: Make upgrading from debian SID easier Make sure the version number of this sourcepackage is higher than the one found in Debian SID. Change-Id: I87534954c1f4b499e27452382df412454ea16b64 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/09/109/1 diff --git a/debian/changelog b/debian/changelog index 9e5884e..b7a0c97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libosmo-sccp (0.7.1) UNRELEASED; urgency=medium + + * Move forward towards a new release. + + -- Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Tue, 24 May 2016 22:57:59 +0200 + libosmo-sccp (0.7.0) unstable; urgency=medium * New release. -- To view, visit https://gerrit.osmocom.org/109 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87534954c1f4b499e27452382df412454ea16b64 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Holger Freyther <holger(a)freyther.de>

1 2

[PATCH] openbsc[master]: rtp_proxy.c: Ensure msgb_alloc is large enough for largest A...
by Neels Hofmeyr 25 May '16

25 May '16

Review at https://gerrit.osmocom.org/91 rtp_proxy.c: Ensure msgb_alloc is large enough for largest AMR frame In AMR 12.2 (mode 7), the actual RTP payload is 33 bytes. Howeerver, as we store the length of the (dynamically-sized) AMR payload in the first byte, our buffer needs at least 33+1 byte in size. Change-Id: If1ad5d2d68c85733306c75ea62f67fe8fbc143b3 --- M openbsc/src/libtrau/rtp_proxy.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/91/91/1 diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c index 8c982c9..6c04610 100644 --- a/openbsc/src/libtrau/rtp_proxy.c +++ b/openbsc/src/libtrau/rtp_proxy.c @@ -172,7 +172,7 @@ /* always allocate for the maximum possible size to avoid * fragmentation */ new_msg = msgb_alloc(sizeof(struct gsm_data_frame) + - MAX_RTP_PAYLOAD_LEN, "GSM-DATA (TCH)"); + MAX_RTP_PAYLOAD_LEN+1, "GSM-DATA (TCH)"); if (!new_msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/91 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1ad5d2d68c85733306c75ea62f67fe8fbc143b3 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge(a)gnumonks.org>

3 3

[PATCH] osmo-pcu[master]: bts/counter: replace '_' with '-' in counter names
by lynxis lazus 24 May '16

24 May '16

Review at https://gerrit.osmocom.org/103 bts/counter: replace '_' with '-' in counter names Conform to the convention. Change-Id: I6162694aae8d354aba318cc1acfdac108239fef0 --- M src/bts.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/03/103/1 diff --git a/src/bts.cpp b/src/bts.cpp index fdae1f0..03b0401 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -71,8 +71,8 @@ { "rlc.ack.failed", "RLC Ack Failed "}, { "rlc.rel.timedout", "RLC Release Timeout "}, { "rlc.late-block", "RLC Late Block "}, - { "rlc.sent_dummy", "RLC Sent Dummy "}, - { "rlc.sent_control", "RLC Sent Control "}, + { "rlc.sent-dummy", "RLC Sent Dummy "}, + { "rlc.sent-control", "RLC Sent Control "}, { "decode.errors", "Decode Errors "}, { "sba.allocated", "SBA Allocated "}, { "sba.freed", "SBA Freed "}, -- To view, visit https://gerrit.osmocom.org/103 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6162694aae8d354aba318cc1acfdac108239fef0 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

2 2

do_lchan_free() timer
by Neels Hofmeyr 24 May '16

24 May '16

On openbsc master, in do_lchan_free(), a T3111 timer is started in case the lchan is in an error state. Why? 3GPP TS 04.08: The sole purpose of timer T3111 is to let some time [pass] to acknowledge the disconnection and to protect the channel in case of loss of the acknowledge frame. I'm asking because for dyn PDCH, I'm looking at jolly's branch, which adds channel defragmentation: when a channel is released, do_pdch_defrag() closes gaps in the assignments by swapping active channels into empty slots. It appears that the defragmentation code doesn't want to wait for T3111 ... and prefers to run through channel reallocations more quickly, if that makes any sense? Also, I'm not sure whether we want the defragmentation feature at this time. It seems to be orthogonal, not related to dynamic reassignment of TCH <-> PDCH per se. Thanks for any opinions or hints! For details, take a look at a6c1c652e5f9cd7f2e456af39a54b8fafdc5b344 openbsc/src/libbsc/abis_rsl.c:69:do_lchan_free() (branch users/neels/dyn_pdch) ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

2 2

Change in libosmo-sccp[master]: Add selector for ANSI or ITU variant
by gerrit-no-reply＠lists.osmocom.org 24 May '16

24 May '16

>From Arran Cudbard-bell <a.cudbardb(a)freeradius.org>: Arran Cudbard-bell has uploaded a new change for review. https://gerrit.osmocom.org/73 Change subject: Add selector for ANSI or ITU variant ...................................................................... Add selector for ANSI or ITU variant Change-Id: Ia17eef8c9b7d8e1092c587f469b4a68aa9702651 --- M include/sccp/sccp.h M include/sccp/sccp_types.h M src/sccp.c 3 files changed, 124 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/73/73/1 diff --git a/include/sccp/sccp.h b/include/sccp/sccp.h index 36b424f..665422e 100644 --- a/include/sccp/sccp.h +++ b/include/sccp/sccp.h @@ -46,11 +46,24 @@ SCCP_CONNECTION_STATE_SETUP_ERROR, }; +struct sccp_variant { + uint8_t ai_nb; /* National or reserved bit */ + uint8_t ai_gti; /* GTI mask */ + uint8_t ai_pc_ind; /* Point code indicator mask */ + uint8_t ai_ssn_ind; /* SSN indicator mask */ + uint8_t ai_route; /* Route type mask */ + uint8_t pc_len; /* Point code length */ + uint8_t pc_first; /* whether the pointcode comes before the SSN */ +}; + struct sockaddr_sccp { - sa_family_t sccp_family; /* AF_SCCP in the future??? */ + sa_family_t sccp_family; /* AF_SCCP in the future??? */ + + int use_ssn; uint8_t sccp_ssn; /* subssystem number for routing */ - /* TODO fill in address indicator... if that is ever needed */ + int nb; /* National bit (8) */ + int route_on_ssn; /* Force routing on SSN instead of GTI */ /* optional gti information */ uint8_t *gti; @@ -60,7 +73,7 @@ uint8_t gti_ind; int use_poi; - uint8_t poi[2]; + uint8_t poi[3]; /* Allows ITU 14bit and ANSI 24bit */ /* not sure about these */ /* uint8_t sccp_class; */ @@ -70,9 +83,8 @@ * parsed structure of an address */ struct sccp_address { - struct sccp_called_party_address address; uint8_t ssn; - uint8_t poi[2]; + uint8_t poi[3]; /* Allows ITU 14bit and ANSI 24bit */ uint8_t *gti_data; int gti_len; @@ -103,6 +115,8 @@ int incoming; }; +extern struct sccp_variant sccp_variant[]; + /** * system functionality to implement on top of any other transport layer: * call sccp_system_incoming for incoming data (from the network) @@ -122,7 +136,7 @@ int sccp_connection_free(struct sccp_connection *connection); /** - * internal.. + * internal.. */ int sccp_connection_force_free(struct sccp_connection *conn); @@ -157,6 +171,7 @@ int sccp_set_read(const struct sockaddr_sccp *sock, int (*read_cb)(struct msgb *msgb, unsigned int, void *user_data), void *user_data); +void sccp_set_variant(int variant); /* generic sock addresses */ extern const struct sockaddr_sccp sccp_ssn_bssap; diff --git a/include/sccp/sccp_types.h b/include/sccp/sccp_types.h index 986de0d..cd60c25 100644 --- a/include/sccp/sccp_types.h +++ b/include/sccp/sccp_types.h @@ -26,6 +26,12 @@ #include <osmocom/core/endian.h> +/* Which variant of SCCP we're using */ +enum { + SCCP_VARIANT_ITU, + SCCP_VARIANT_ANSI +}; + /* Table 1/Q.713 - SCCP message types */ enum sccp_message_types { SCCP_MSG_TYPE_CR = 1, diff --git a/src/sccp.c b/src/sccp.c index e6c538d..a3cda90 100644 --- a/src/sccp.c +++ b/src/sccp.c @@ -46,16 +46,40 @@ .sccp_ssn = SCCP_SSN_BSSAP, }; +struct sccp_variant sccp_variant[] = { + [SCCP_VARIANT_ITU] = { + .ai_nb = 0x80, + .ai_gti = 0x3c, + .ai_pc_ind = 0x01, + .ai_ssn_ind = 0x02, + .ai_route = 0x40, + .pc_len = 2, + .pc_first = 1 + }, + [SCCP_VARIANT_ANSI] = { + .ai_nb = 0x80, + .ai_gti = 0x3c, + .ai_pc_ind = 0x02, + .ai_ssn_ind = 0x01, + .ai_route = 0x40, + .pc_len = 3, + .pc_first = 0, + } +}; + struct sccp_system { /* layer3 -> layer2 */ void (*write_data)(struct sccp_connection *conn, struct msgb *data, void *gctx, void *ctx); void *write_context; + + int variant; }; static struct sccp_system sccp_system = { .write_data = NULL, + .variant = SCCP_VARIANT_ITU }; struct sccp_data_callback { @@ -105,11 +129,13 @@ */ static int copy_address(struct sccp_address *addr, uint8_t offset, struct msgb *msgb) { - struct sccp_called_party_address *party; - int room = msgb_l2len(msgb) - offset; - uint8_t read = 0; + + uint8_t *data; + uint8_t read = 1; uint8_t length; + uint8_t ai; + uint8_t pc_len = sccp_variant[sccp_system.variant].pc_len; if (room <= 0) { LOGP(DSCCP, LOGL_ERROR, "Not enough room for an address: %u\n", room); @@ -122,36 +148,48 @@ return -1; } + data = msgb->l2h + offset + 1; + ai = data[0]; + data++; - party = (struct sccp_called_party_address *)(msgb->l2h + offset + 1); - if (party->point_code_indicator) { - if (length <= read + 2) { - LOGP(DSCCP, LOGL_ERROR, "POI does not fit %u\n", length); - return -1; - } +#define PARSE_POI \ + do { \ + if (ai & sccp_variant[sccp_system.variant].ai_pc_ind) { \ + if (length <= read + pc_len) { \ + LOGP(DSCCP, LOGL_ERROR, "POI does not fit %u\n", length); \ + return -1; \ + } \ + memcpy(&addr->poi, &data[read], pc_len); \ + read += pc_len; \ + } \ + } while (0) +#define PARSE_SSN \ + do { \ + if (ai & sccp_variant[sccp_system.variant].ai_ssn_ind) { \ + if (length <= read + 1) { \ + LOGP(DSCCP, LOGL_ERROR, "SSN does not fit %u\n", length); \ + return -1; \ + } \ + addr->ssn = data[read]; \ + read += 1; \ + } \ + } while (0) - memcpy(&addr->poi, &party->data[read], 2); - read += 2; - } - - if (party->ssn_indicator) { - if (length <= read + 1) { - LOGP(DSCCP, LOGL_ERROR, "SSN does not fit %u\n", length); - return -1; - } - - addr->ssn = party->data[read]; - read += 1; + if (sccp_variant[sccp_system.variant].pc_first) { + PARSE_POI; + PARSE_SSN; + } else { + PARSE_SSN; + PARSE_POI; } /* copy the GTI over */ - if (party->global_title_indicator) { - addr->gti_len = length - read - 1; - addr->gti_data = &party->data[read]; + if (ai & sccp_variant[sccp_system.variant].ai_gti) { + addr->gti_len = length - read; + addr->gti_data = &data[read]; } - addr->address = *party; return 0; } @@ -173,7 +211,6 @@ uint8_t length = msgb->l2h[offset + read + 1]; read += 2 + length; - if (room <= read) { LOGP(DSCCP, LOGL_ERROR, @@ -486,28 +523,43 @@ int sccp_create_sccp_addr(struct msgb *msg, const struct sockaddr_sccp *sock) { uint8_t *len, *ai, *gti; + uint8_t *poi; + uint8_t pc_len = sccp_variant[sccp_system.variant].pc_len; len = msgb_put(msg, 1); ai = msgb_put(msg, 1); + if (sock->gti) ai[0] = (sock->gti_ind & 0x0f) << 2; + if (sock->route_on_ssn || !sock->gti) ai[0] |= sccp_variant[sccp_system.variant].ai_route; - if (sock->gti) - ai[0] = 0 << 6 | (sock->gti_ind & 0x0f) << 2 | 1 << 1; - else - ai[0] = 1 << 6 | 1 << 1; + /* National/reserved bit */ + if (sock->nb) ai[0] |= sccp_variant[sccp_system.variant].ai_nb; - /* store a point code */ - if (sock->use_poi) { - uint8_t *poi; + /* Pointcode ind */ + if (sock->use_poi) ai[0] |= sccp_variant[sccp_system.variant].ai_pc_ind; - ai[0] |= 0x01; - poi = msgb_put(msg, 2); - poi[0] = sock->poi[0]; - poi[1] = sock->poi[1]; + /* SSN ind */ + ai[0] |= sccp_variant[sccp_system.variant].ai_ssn_ind; + +#define ADD_POI \ + do { \ + if (sock->use_poi) { \ + poi = msgb_put(msg, pc_len); \ + if (!poi) return -1; \ + memcpy(poi, &sock->poi[0], pc_len); \ + } \ + } while (0) + +#define ADD_SSN \ + msgb_v_put(msg, sock->sccp_ssn) + + if (sccp_variant[sccp_system.variant].pc_first) { + ADD_POI; + ADD_SSN; + } else { + ADD_SSN; + ADD_POI; } - - /* copy the SSN */ - msgb_v_put(msg, sock->sccp_ssn); /* copy the gti if it is present */ gti = msgb_put(msg, sock->gti_len); @@ -1225,6 +1277,11 @@ return 0; } +void sccp_set_variant(int variant) +{ + sccp_system.variant = variant; +} + /* oh my god a real SCCP packet. need to dispatch it now */ int sccp_system_incoming(struct msgb *msgb) { -- To view, visit https://gerrit.osmocom.org/73 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia17eef8c9b7d8e1092c587f469b4a68aa9702651 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Arran Cudbard-bell <a.cudbardb(a)freeradius.org>

2 8

Change in libosmo-sccp[master]: Ignore more build/libtool products
by gerrit-no-reply＠lists.osmocom.org 23 May '16

23 May '16

>From Arran Cudbard-bell <a.cudbardb(a)freeradius.org>: Arran Cudbard-bell has uploaded a new change for review. https://gerrit.osmocom.org/72 Change subject: Ignore more build/libtool products ...................................................................... Ignore more build/libtool products Change-Id: I7b0825112afcb630f40b2d2670952e0beea0a436 --- M .gitignore 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/72/72/1 diff --git a/.gitignore b/.gitignore index 48b2e76..06a39f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.o *.a +*.lo +*.la .deps Makefile Makefile.in @@ -25,10 +27,14 @@ missing stamp-h1 +# libtool +ltmain.sh +libtool +src/.libs + # git-version-gen magic .tarball-version .version - # apps and app data hlr.sqlite3 @@ -52,12 +58,14 @@ tests/sccp/sccp_test tests/sms/sms_test tests/timer/timer_test +tests/sigtran/sua_server_test +tests/sigtran/sua_client_test +tests/sigtran/.libs tests/atconfig tests/package.m4 tests/testsuite tests/testsuite.log - *.pc config.* -- To view, visit https://gerrit.osmocom.org/72 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b0825112afcb630f40b2d2670952e0beea0a436 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Arran Cudbard-bell <a.cudbardb(a)freeradius.org>

3 5

[PATCH] openbsc[master]: gsm04_08_clear_request(): release loc with arg release=0
by Neels Hofmeyr 23 May '16

23 May '16

Review at https://gerrit.osmocom.org/93 gsm04_08_clear_request(): release loc with arg release=0 In gsm04_08_clear_request(), in_release == 1 anyway and msc_release_connection() would exit immediately without any effect. Don't confuse the reader by passing release=1 arg. Change-Id: I5bf9eb4889d32ad5e42ac7d096bf62fa3a493e20 --- M openbsc/src/libmsc/gsm_04_08.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/93/93/1 diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index f02f784..f1b95c1 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -384,7 +384,7 @@ * Cancel any outstanding location updating request * operation taking place on the subscriber connection. */ - release_loc_updating_req(conn, 1); + release_loc_updating_req(conn, 0); /* We might need to cancel the paging response or such. */ if (conn->sec_operation && conn->sec_operation->cb) { -- To view, visit https://gerrit.osmocom.org/93 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bf9eb4889d32ad5e42ac7d096bf62fa3a493e20 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr(a)sysmocom.de>

2 4

Re: openbsc.git branch sysmocom/iu updated. 0.15.0-442-gf3bcdd2
by Holger Freyther 23 May '16

23 May '16

> On 04 May 2016, at 14:01, gitosis(a)osmocom.org wrote: Hi > msc subscr: add paging timeout > > In NITB, the paging timeout would be handled from the BSC side. In IuCS, we > need to invalidate the paging request from libmsc alone, so add a paging timer > to gsm_subscriber. > > Possibly, the HNB-GW should respond with a paging failure and libmsc could > trigger on that, nevertheless libmsc should not rely on a failure message to > expire pending pagings. I don't think this belongs into the gsm_subscriber. If you compare this with the architectural change that removed the "subscriber queue" we are going to repeat the same mistake again. The timeout belongs into the logical "operation" and not the subscriber (the object of the logical operation). cheers holger

2 6

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC May 2016