[PATCH] osmo-gsm-manuals[master]: Allow easily disabling GFDL references
Review at https://gerrit.osmocom.org/3736 Allow easily disabling GFDL references All parts referencing GFDL can be easily disabled by removing the 'gfdl-enabled' attribute from the document. Change-Id: I2489726ad2e90301bceadfada926e31ae0f85986 --- M OsmoBSC/osmobsc-usermanual.adoc M OsmoBTS/osmobts-abis.adoc M OsmoBTS/osmobts-usermanual.adoc M OsmoNITB/osmonitb-usermanual.adoc M OsmoPCU/osmopcu-gb.adoc M OsmoPCU/osmopcu-usermanual.adoc M OsmoSGSN/osmosgsn-usermanual.adoc M common/chapters/glossary.adoc M common/chapters/preface.adoc 9 files changed, 33 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/3736/1 diff --git a/OsmoBSC/osmobsc-usermanual.adoc b/OsmoBSC/osmobsc-usermanual.adoc index 9323373..f09a2d4 100644 --- a/OsmoBSC/osmobsc-usermanual.adoc +++ b/OsmoBSC/osmobsc-usermanual.adoc @@ -1,3 +1,5 @@ +:gfdl-enabled: + OsmoBSC User Manual === Harald Welte @@ -35,5 +37,6 @@ include::../common/chapters/glossary.adoc[] +ifdef::gfdl-enabled[] include::../common/chapters/gfdl.adoc[] - +endif::[] diff --git a/OsmoBTS/osmobts-abis.adoc b/OsmoBTS/osmobts-abis.adoc index 930cbfb..cf4ff51 100644 --- a/OsmoBTS/osmobts-abis.adoc +++ b/OsmoBTS/osmobts-abis.adoc @@ -1,3 +1,5 @@ +:gfdl-enabled: + OsmoBTS Abis Protocol Specification === Neels Hofmeyr @@ -87,4 +89,6 @@ include::../common/chapters/glossary.adoc[] +ifdef::gfdl-enabled[] include::../common/chapters/gfdl.adoc[] +endif::[] diff --git a/OsmoBTS/osmobts-usermanual.adoc b/OsmoBTS/osmobts-usermanual.adoc index 4d47b1c..a4e9c9f 100644 --- a/OsmoBTS/osmobts-usermanual.adoc +++ b/OsmoBTS/osmobts-usermanual.adoc @@ -1,3 +1,5 @@ +:gfdl-enabled: + OsmoBTS User Manual === Harald Welte @@ -32,5 +34,6 @@ include::../common/chapters/glossary.adoc[] +ifdef::gfdl-enabled[] include::../common/chapters/gfdl.adoc[] - +endif::[] diff --git a/OsmoNITB/osmonitb-usermanual.adoc b/OsmoNITB/osmonitb-usermanual.adoc index 73166fa..baf4fe9 100644 --- a/OsmoNITB/osmonitb-usermanual.adoc +++ b/OsmoNITB/osmonitb-usermanual.adoc @@ -1,3 +1,5 @@ +:gfdl-enabled: + OsmoNITB User Manual Harald Welte @@ -41,5 +43,6 @@ include::../common/chapters/glossary.adoc[] +ifdef::gfdl-enabled[] include::../common/chapters/gfdl.adoc[] - +endif::[] diff --git a/OsmoPCU/osmopcu-gb.adoc b/OsmoPCU/osmopcu-gb.adoc index fc2ca8f..a978300 100644 --- a/OsmoPCU/osmopcu-gb.adoc +++ b/OsmoPCU/osmopcu-gb.adoc @@ -1,3 +1,5 @@ +:gfdl-enabled: + OsmoPCU Gb Protocol Specification = Harald Welte @@ -90,4 +92,6 @@ include::../common/chapters/glossary.adoc[] +ifdef::gfdl-enabled[] include::../common/chapters/gfdl.adoc[] +endif::[] diff --git a/OsmoPCU/osmopcu-usermanual.adoc b/OsmoPCU/osmopcu-usermanual.adoc index 5d2b09c..f959aaa 100644 --- a/OsmoPCU/osmopcu-usermanual.adoc +++ b/OsmoPCU/osmopcu-usermanual.adoc @@ -1,3 +1,5 @@ +:gfdl-enabled: + OsmoPCU User Manual === Harald Welte @@ -23,4 +25,6 @@ include::../common/chapters/glossary.adoc[] +ifdef::gfdl-enabled[] include::../common/chapters/gfdl.adoc[] +endif::[] diff --git a/OsmoSGSN/osmosgsn-usermanual.adoc b/OsmoSGSN/osmosgsn-usermanual.adoc index 12a7b87..a7a03e6 100644 --- a/OsmoSGSN/osmosgsn-usermanual.adoc +++ b/OsmoSGSN/osmosgsn-usermanual.adoc @@ -1,3 +1,5 @@ +:gfdl-enabled: + OsmoSGSN User Manual Harald Welte @@ -31,4 +33,6 @@ include::../common/chapters/glossary.adoc[] +ifdef::gfdl-enabled[] include::../common/chapters/gfdl.adoc[] +endif::[] diff --git a/common/chapters/glossary.adoc b/common/chapters/glossary.adoc index c39d439..b697a4c 100644 --- a/common/chapters/glossary.adoc +++ b/common/chapters/glossary.adoc @@ -96,8 +96,10 @@ Interface between PCU and SGSN in GPRS/EDGE network; uses NS, BSSGP, LLC GERAN:: GPRS/EDGE Radio Access Network +ifdef::gfdl-enabled[] GFDL:: GNU Free Documentation License; a copyleft-style Documentation License +endif::[] GGSN:: GPRS Gateway Support Node; gateway between GPRS and external (IP) network GMSK:: @@ -309,4 +311,3 @@ Virtual TeletYpe; a textual command-line interface for configuration and introspection, e.g. the OsmoBSC configuration file as well as its telnet link on port 4242 - diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc index 13afec1..abb11db 100644 --- a/common/chapters/preface.adoc +++ b/common/chapters/preface.adoc @@ -83,10 +83,11 @@ This version of the manual is endorsed by Harald Welte as the official version of the manual. +ifdef::gfdl-enabled[] While the GFDL license (see <>) permits anyone to create and distribute modified versions of this manual, such modified versions must remove the above endorsement. - +endif::[] == Preface @@ -221,7 +222,7 @@ Documentation License -Please see <> for further information. +ifdef::gfdl-enabled[Please see <> for
osmo-sip-connector[master]: sdp.c Send octet-align in fmtp
Patch Set 2: > @keith: Thanks for digging into the RFC. Sure! This was meant more by way of a conversation starter. I'm finding a number of things while interfacing AMR enabled nitb to a SIP endpoint. -- To view, visit https://gerrit.osmocom.org/3735 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I938758ac4ec55db9223e3da6c3c277e8fa670055 Gerrit-PatchSet: 2 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-HasComments: No
osmo-gsm-tester[master]: Reserve ARFCN dynamically based on BTS band support
Patch Set 1: (5 comments) https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/bts_osmotrx.py File src/osmo_gsm_tester/bts_osmotrx.py: Line 137: } > (rather first get the defaults and then overlay this dict on top, otherwise All other confs can be taken from self.conf because they come from resources.conf, and cannot be changed at runtime by tests before starting the bts. This variables are not in self.conf because that's a static dict from resources.conf We could do something similar to what we do in nitb.py. At the end of configure(self): self.config = values Then self.config contains a dict with all configs (defaults, statics, dynamics) for that specific object. Then we can use self.config inside conf_for_bsc for everything, instead of using a mix of other object variables and self.conf and defaults. What do you think? https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/bts_sysmo.py File src/osmo_gsm_tester/bts_sysmo.py: Line 154: } > (same) Let's follow the discussion on the other thread. https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/resource.py File src/osmo_gsm_tester/resource.py: Line 527: raise RuntimeError('adding a list of reserved resources to itself?') > I guess this is a fact and not a question :) Copied it from same file, line 367 :) As you seem confident, I'll remove the "?". https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/suite.py File src/osmo_gsm_tester/suite.py: Line 484: arfcn = suite_run._try_reserve_arfcn(supported_bands) > I assumed the arfcn could rather be resolved and picked like any other reso I thought a lot about all pros and cons of doing it one or the other way, and still not entirely happy with the solution. If done the way you mentioned, then it means we always need to pass a ARFCN scenario which matches capabilities of the BTS being requested (which again, is unknown unless we provide too a scenario specifying it), otherwise tests can fail. Same goes for the modem(s) in use. I really don't like this. I think the scenario is useful to select/filter which resources we do want to peek, that support specific functionalities we want to / need for the test, for instance a given cipher, auth, type of BTS, etc. This doesn't mean those scenarios are going to be "configured automatically" during every test using it. That's the job of the objects created from the selection of resources provided by the scenarios, because tuning of all parameters may be more complex that what you can do only combining dictionaries. See for instance the case of BTS passing parameters to BSC. This way we can provide a good "automatic configuration", and still give tests the possibility to configure stuff easily to test some specific case. I'm nowadays starting to think that there are actually 2 type of resources. Static ones (independent, limited amount) like a BTS or a modem, and dynamic ones (more dependent on other resources or specific use of test, or which can be dynamically created and require more logic), such as arfcn or ip_address. I think we should end up moving ip_address to this dynamic way, and do some module/hook to automatically provision new ips if required (eg run in a net namespace and launch a script to create a new virtual iface + ip addr when a new ip_address is requested). The only real cons I find so far with the way I did it is the issue you mention, ie we reserve resources after starting the tests. From user point of view, it's not a big issue as it still shows a NoResourceExn, so not a lot changes here. The only big issue I see with this proposal is that there could be some kind of deadlock while reserving resources if they are not acquired in the same order and there's several tests running in parallel, but I think we can probably solve that too, specially given that only a subset of resources is reserved after the test is started. So, I'm open to improve it, but not sure the way you proposed above is really improving what we have already here. I initially thought about that possibility but I was not convinced. https://gerrit.osmocom.org/#/c/3731/1/suites/register/register_band_1900.py File suites/register/register_band_1900.py: Line 5: arfcn = suite.reserve_arfcn(band='GSM-1900') > this shouldn't be a copy, just the same register test file, except that a * I explained what I think regarding this too on the other comment. Let's continue discussion there. -- To view, visit https://gerrit.osmocom.org/3731 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6fb5d95bed1fa50c3deaf62a7a6df3cb276bc3c9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: neels Gerrit-HasComments: Yes
osmo-sip-connector[master]: sdp.c Send octet-align in fmtp
Patch Set 2: @keith: Thanks for digging into the RFC. It is clear we need to change it but I would prefer to not use 98 (which is a dynamic payload type and could mean anything) but can you check the result of app_media_name() if it returns "AMR"? -- To view, visit https://gerrit.osmocom.org/3735 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I938758ac4ec55db9223e3da6c3c277e8fa670055 Gerrit-PatchSet: 2 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
osmo-sip-connector[master]: sdp.c Send octet-align in fmtp
Patch Set 2: @max; Could you have a look at the build failure? I remember patches from you in regard to to that? -- To view, visit https://gerrit.osmocom.org/3735 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I938758ac4ec55db9223e3da6c3c277e8fa670055 Gerrit-PatchSet: 2 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
osmo-gsm-tester[master]: Add cipher cfg param for modem and bts
Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/3723/2/example/resources.conf File example/resources.conf: Line 16: ciphers: ['a5 0', 'a5 1', 'a5 2', 'a5 3'] > 'a5 2' is a weak "export grade" cipher and globally deprecated. I assume ou De HW supports A5/2. If osmocom stack doesn't support it then I agree we can drop it. https://gerrit.osmocom.org/#/c/3723/2/src/osmo_gsm_tester/schema.py File src/osmo_gsm_tester/schema.py: Line 70: if val in ('a5 0', 'a5 1', 'a5 2', 'a5 3'): > spec wise they go up to 7 Ok I'll add the missing one. -- To view, visit https://gerrit.osmocom.org/3723 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic0e368843a6e58bd3eeef36d2c0a7501296f0f3e Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
[PATCH] osmo-sip-connector[master]: sdp.c Send octet-align in fmtp
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3735 to look at the new patch set (#2). sdp.c Send octet-align in fmtp rfc4867 8.2: octet-align: Permissible values are 0 and 1. If 1, octet-aligned operation SHALL be used. If 0 or if not present, bandwidth-efficient operation is employed. We don't have any support for AMR BE mode, but if we don't send this the other end expects BE mode + can't decode the stream Change-Id: I938758ac4ec55db9223e3da6c3c277e8fa670055 --- M src/sdp.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/35/3735/2 diff --git a/src/sdp.c b/src/sdp.c index ccd000d..caf83bc 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -166,8 +166,13 @@ char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other) { struct in_addr net = { .s_addr = ntohl(other->ip) }; + char *fmtp_str = ""; leg->wanted_codec = app_media_name(other->payload_msg_type); + + if (other->payload_type == 98) + fmtp_str="a=fmtp:98 octet-align=1\r\n"; + return talloc_asprintf(leg, "v=0\r\n" "o=Osmocom 0 0 IN IP4 %s\r\n" @@ -175,9 +180,11 @@ "c=IN IP4 %s\r\n" "t=0 0\r\n" "m=audio %d RTP/AVP %d\r\n" + "%s" "a=rtpmap:%d %s/8000\r\n", inet_ntoa(net), inet_ntoa(net), /* never use diff. addr! */ other->port, other->payload_type, + fmtp_str, other->payload_type, leg->wanted_codec); } -- To view, visit https://gerrit.osmocom.org/3735 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I938758ac4ec55db9223e3da6c3c277e8fa670055 Gerrit-PatchSet: 2 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-sip-connector[master]: sdp.c Send octet-align in ftmp
Review at https://gerrit.osmocom.org/3735 sdp.c Send octet-align in ftmp rfc4867 8.2: octet-align: Permissible values are 0 and 1. If 1, octet-aligned operation SHALL be used. If 0 or if not present, bandwidth-efficient operation is employed. We don't have any support for AMR BE mode, but if we don't send this the other end expects BE mode can't decode the stream Change-Id: I938758ac4ec55db9223e3da6c3c277e8fa670055 --- M src/sdp.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/35/3735/1 diff --git a/src/sdp.c b/src/sdp.c index ccd000d..caf83bc 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -166,8 +166,13 @@ char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other) { struct in_addr net = { .s_addr = ntohl(other->ip) }; + char *fmtp_str = ""; leg->wanted_codec = app_media_name(other->payload_msg_type); + + if (other->payload_type == 98) + fmtp_str="a=fmtp:98 octet-align=1\r\n"; + return talloc_asprintf(leg, "v=0\r\n" "o=Osmocom 0 0 IN IP4 %s\r\n" @@ -175,9 +180,11 @@ "c=IN IP4 %s\r\n" "t=0 0\r\n" "m=audio %d RTP/AVP %d\r\n" + "%s" "a=rtpmap:%d %s/8000\r\n", inet_ntoa(net), inet_ntoa(net), /* never use diff. addr! */ other->port, other->payload_type, + fmtp_str, other->payload_type, leg->wanted_codec); } -- To view, visit https://gerrit.osmocom.org/3735 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I938758ac4ec55db9223e3da6c3c277e8fa670055 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Keith Whyte
[MERGED] osmo-msc[master]: move to osmo-mgw.git: osmo-bsc_mgcp and libmgcp as libosmo-l...
Harald Welte has submitted this change and it was merged. Change subject: move to osmo-mgw.git: osmo-bsc_mgcp and libmgcp as libosmo-legacy-mgcp .. move to osmo-mgw.git: osmo-bsc_mgcp and libmgcp as libosmo-legacy-mgcp Rewire build and includes to libosmo-legacy-mgcp. Drop osmo-bsc_mgcp and related python tests, now found in osmo-mgw.git. libosmo-legacy-mgcp is installed from osmo-mgw, hence add the dependency to jenkins.sh (so far using the pre_release branch). Change-Id: Ic99d681759edce11564da62500c2aac5cf5fffe2 --- M configure.ac M contrib/jenkins.sh M include/openbsc/Makefile.am M include/openbsc/bsc_nat.h M include/openbsc/gsm_data.h D include/openbsc/mgcp.h D include/openbsc/mgcp_internal.h D include/openbsc/mgcp_transcode.h D include/openbsc/mgcpgw_client.h M osmoappdesc.py M src/Makefile.am M src/libfilter/bsc_msg_acc.c D src/libmgcp/Makefile.am D src/libmgcp/g711common.h D src/libmgcp/mgcp_common.c D src/libmgcp/mgcp_network.c D src/libmgcp/mgcp_osmux.c D src/libmgcp/mgcp_protocol.c D src/libmgcp/mgcp_sdp.c D src/libmgcp/mgcp_transcode.c D src/libmgcp/mgcp_vty.c D src/libmgcp/mgcpgw_client.c D src/libmgcp/mgcpgw_client_vty.c M src/libmsc/a_iface.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/osmo-bsc/osmo_bsc_bssap.c D src/osmo-bsc_mgcp/Makefile.am D src/osmo-bsc_mgcp/mgcp_main.c M src/osmo-bsc_nat/Makefile.am M src/osmo-bsc_nat/bsc_mgcp_utils.c M src/osmo-bsc_nat/bsc_nat_ctrl.c M src/osmo-bsc_nat/bsc_nat_vty.c M src/osmo-bsc_nat/bsc_ussd.c M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/Makefile.am M tests/bsc-nat-trie/Makefile.am M tests/bsc-nat/Makefile.am M tests/bsc/Makefile.am D tests/mgcp/Makefile.am D tests/mgcp/mgcp_test.c D tests/mgcp/mgcp_test.ok D tests/mgcp/mgcp_transcoding_test.c D tests/mgcp/mgcp_transcoding_test.ok D tests/mgcp/mgcpgw_client_test.c D tests/mgcp/mgcpgw_client_test.err D tests/mgcp/mgcpgw_client_test.ok M tests/msc_vlr/Makefile.am M tests/sms_queue/Makefile.am M tests/testsuite.at M tests/vty_test_runner.py 52 files changed, 47 insertions(+), 11,424 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/3492 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic99d681759edce11564da62500c2aac5cf5fffe2 Gerrit-PatchSet: 9 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: .gitignore: cosmetic: use globs to ignore test binaries
Harald Welte has submitted this change and it was merged. Change subject: .gitignore: cosmetic: use globs to ignore test binaries .. .gitignore: cosmetic: use globs to ignore test binaries Change-Id: I840e4333a4cad646d751ebafe7e0ef23e7a9c708 --- M .gitignore 1 file changed, 7 insertions(+), 39 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index cf5542d..a9e6b84 100644 --- a/.gitignore +++ b/.gitignore @@ -62,45 +62,13 @@ #tests tests/testsuite.dir -tests/bsc-nat/bsc_nat_test -tests/bsc-nat-trie/bsc_nat_trie_test -tests/channel/channel_test -tests/db/db_test -tests/debug/debug_test -tests/gsm0408/gsm0408_test -tests/mgcp/mgcp_test -tests/sccp/sccp_test -tests/sms/sms_test -tests/timer/timer_test -tests/gprs/gprs_test -tests/gbproxy/gbproxy_test -tests/abis/abis_test -tests/si/si_test -tests/smpp/smpp_test -tests/bsc/bsc_test -tests/trau/trau_test -tests/mgcp/mgcp_transcoding_test -tests/sgsn/sgsn_test -tests/subscr/subscr_test -tests/subscr/bsc_subscr_test -tests/oap/oap_test -tests/gtphub/gtphub_test -tests/mm_auth/mm_auth_test -tests/xid/xid_test -tests/sndcp_xid/sndcp_xid_test -tests/slhc/slhc_test -tests/v42bis/v42bis_test -tests/nanobts_omlattr/nanobts_omlattr_test -tests/oap/oap_client_test -tests/msc_vlr/msc_vlr_test_no_authen -tests/msc_vlr/msc_vlr_test_gsm_authen -tests/msc_vlr/msc_vlr_test_gsm_ciph -tests/msc_vlr/msc_vlr_test_umts_authen -tests/msc_vlr/msc_vlr_test_hlr_reject -tests/msc_vlr/msc_vlr_test_hlr_timeout -tests/msc_vlr/msc_vlr_test_ms_timeout -tests/msc_vlr/msc_vlr_test_reject_concurrency -tests/msc_vlr/msc_vlr_test_rest +tests/*/*_test +# ignore compiled binaries like msc_vlr_test_foo; do not ignore +# msc_vlr_test_foo.{c,ok,err}, but do still ignore the corresponding .o object +# files: +tests/msc_vlr/msc_vlr_test_* +!tests/msc_vlr/msc_vlr_test_*.* +tests/msc_vlr/msc_vlr_test_*.o tests/atconfig -- To view, visit https://gerrit.osmocom.org/3491 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I840e4333a4cad646d751ebafe7e0ef23e7a9c708 Gerrit-PatchSet: 7 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: Implement AoIP, port to M3UA SIGTRAN (large addition and ref...
Harald Welte has submitted this change and it was merged. Change subject: Implement AoIP, port to M3UA SIGTRAN (large addition and refactoring) .. Implement AoIP, port to M3UA SIGTRAN (large addition and refactoring) This was originally a long series of commits converging to the final result seen in this patch. It does not make much sense to review the smaller steps' trial and error, we need to review this entire change as a whole. Implement AoIP in osmo-msc and osmo-bsc. Change over to the new libosmo-sigtran API with support for proper SCCP/M3UA/SCTP stacking, as mandated by 3GPP specifications for the IuCS and IuPS interfaces. >From here on, a separate osmo-stp process is required for SCCP routing between OsmoBSC / OsmoHNBGW <-> OsmoMSC / OsmoSGSN jenkins.sh: build from libosmo-sccp and osmo-iuh master branches now for new M3UA SIGTRAN. Patch-by: pmaier, nhofmeyr, laforge Change-Id: I5ae4e05ee7c57cad341ea5e86af37c1f6b0ffa77 --- M configure.ac M contrib/jenkins.sh M doc/examples/osmo-bsc/osmo-bsc.cfg M include/openbsc/Makefile.am A include/openbsc/a_iface.h A include/openbsc/a_iface_bssap.h A include/openbsc/a_reset.h M include/openbsc/bsc_msc.h M include/openbsc/bsc_msc_data.h M include/openbsc/debug.h M include/openbsc/gsm_04_08.h M include/openbsc/gsm_data.h M include/openbsc/gsm_data_shared.h M include/openbsc/iu.h M include/openbsc/mgcpgw_client.h M include/openbsc/msc_ifaces.h M include/openbsc/osmo_bsc.h A include/openbsc/osmo_bsc_reset.h A include/openbsc/osmo_bsc_sigtran.h M include/openbsc/osmo_msc.h M include/openbsc/transaction.h M src/gprs/Makefile.am M src/gprs/sgsn_main.c M src/libbsc/abis_rsl.c M src/libbsc/bsc_vty.c M src/libbsc/handover_logic.c M src/libcommon-cs/Makefile.am A src/libcommon-cs/a_reset.c M src/libcommon-cs/common_cs.c M src/libcommon/common_vty.c M src/libcommon/debug.c M src/libiu/iu.c M src/libiu/iu_vty.c M src/libmgcp/mgcp_protocol.c M src/libmgcp/mgcpgw_client.c M src/libmgcp/mgcpgw_client_vty.c M src/libmsc/Makefile.am M src/libmsc/a_iface.c A src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_subscriber.c M src/libmsc/iucs.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/subscr_conn.c M src/osmo-bsc/Makefile.am M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_audio.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c A src/osmo-bsc/osmo_bsc_reset.c D src/osmo-bsc/osmo_bsc_sccp.c A src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c M src/osmo-bsc_mgcp/Makefile.am M src/osmo-bsc_nat/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.c M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.c M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.c M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 80 files changed, 4,486 insertions(+), 714 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/3486 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ae4e05ee7c57cad341ea5e86af37c1f6b0ffa77 Gerrit-PatchSet: 6 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter
[MERGED] osmo-msc[master]: libmsc: make pitfall in gsm0408_dispatch() more obvious
Harald Welte has submitted this change and it was merged. Change subject: libmsc: make pitfall in gsm0408_dispatch() more obvious .. libmsc: make pitfall in gsm0408_dispatch() more obvious The function gsm0408_dispatch() accepts a message buffer pointer and accesses the l3h pointer. Even in a properly allocated message buffer, this may lead into a segfault if the user forgets to set the l3h pointer. This commit adds assertions to popup a more expressive error message. Change-Id: I43bd9bd1c170559aaa8dacaef25dba090744bcd5 --- M src/libmsc/gsm_04_08.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 21bc2b8..90a0431 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -3216,13 +3216,17 @@ /* Main entry point for GSM 04.08/44.008 Layer 3 data (e.g. from the BSC). */ int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg) { - struct gsm48_hdr *gh = msgb_l3(msg); - uint8_t pdisc = gsm48_hdr_pdisc(gh); + struct gsm48_hdr *gh; + uint8_t pdisc; int rc = 0; + OSMO_ASSERT(msg->l3h) OSMO_ASSERT(conn); OSMO_ASSERT(msg); + gh = msgb_l3(msg); + pdisc = gsm48_hdr_pdisc(gh); + LOGP(DRLL, LOGL_DEBUG, "Dispatching 04.08 message %s (0x%x:0x%x)\n", gsm48_pdisc_msgtype_name(pdisc, gsm48_hdr_msg_type(gh)), pdisc, gsm48_hdr_msg_type(gh)); -- To view, visit https://gerrit.osmocom.org/3498 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43bd9bd1c170559aaa8dacaef25dba090744bcd5 Gerrit-PatchSet: 9 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter
[MERGED] osmo-msc[master]: rework debian packages support
Harald Welte has submitted this change and it was merged. Change subject: rework debian packages support .. rework debian packages support Remove old leftover from split of osmo-mgw out of openbsc. Change-Id: I77544cb38c31777c3fab52979d19488a63e52de3 --- D debian/autoreconf M debian/changelog M debian/control M debian/copyright D debian/docs D debian/openbsc-dev.install A debian/osmo-msc.install D debian/osmocom-nitb.default D debian/osmocom-nitb.dirs D debian/osmocom-nitb.examples D debian/osmocom-nitb.init D debian/osmocom-nitb.install M debian/rules 13 files changed, 240 insertions(+), 557 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/autoreconf b/debian/autoreconf deleted file mode 100644 index 9a3a67f..000 --- a/debian/autoreconf +++ /dev/null @@ -1 +0,0 @@ -openbsc diff --git a/debian/changelog b/debian/changelog index e9a4212..a1b3dda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,75 +1,5 @@ -openbsc (0.15.1) UNRELEASED; urgency=medium +osmo-msc (0.1.0) UNRELEASED; urgency=low - * Move forward toward a new release. - * Prevent SGSN starting with 'auth-policy remote' when no 'gsup remote-*' are configured. -Note: such configs are broken without extra workarounds anyway. + * Initial release. - -- Holger Hans Peter Freyther Tue, 24 May 2016 23:14:31 +0200 - -openbsc (0.14.0) unstable; urgency=low - - * New upstream tag and additional patches. - - -- Holger Hans Peter Freyther Sat, 14 Mar 2015 20:33:25 +0100 - -openbsc (0.12.0+git26-7) unstable; urgency=low - - * 64bit fix for the MGCP rewriting - - -- Holger Hans Peter Freyther Wed, 07 Nov 2012 11:39:34 +0100 - -openbsc (0.12.0+git26-6) precise; urgency=low - - * Added init script for osmocom-sgsn. - - -- Eric Butler Fri, 24 Aug 2012 21:04:32 -0700 - -openbsc (0.12.0+git26-5) precise; urgency=low - - * Don't enable MNCC sock by default. - * Automatically create important directories. - * Fix init script 'stop' command. - - -- Eric Butler Fri, 24 Aug 2012 20:56:33 -0700 - -openbsc (0.12.0+git26-4) precise; urgency=low - - * Specify HLR path and enable RTP proxy. - - -- Eric Butler Mon, 20 Aug 2012 00:21:07 -0700 - -openbsc (0.12.0+git26-3) precise; urgency=low - - * Fix init script. - - -- Eric Butler Sun, 19 Aug 2012 16:05:44 -0700 - -openbsc (0.12.0+git26-2) precise; urgency=low - - * Fix libdbi package dependency. - - -- Eric Butler Wed, 15 Aug 2012 00:35:37 -0700 - -openbsc (0.12.0+git26-1) precise; urgency=low - - * Fix version issue. - - -- Eric Butler Tue, 14 Aug 2012 21:00:51 -0700 - -openbsc (0.12.0+git26) precise; urgency=low - - * Updated ubuntu package. - - -- Eric Butler Tue, 14 Aug 2012 17:36:51 -0700 - -openbsc (0.9.13.115.eb113-1) natty; urgency=low - - * New upstream release - - -- Harald Welte Wed, 11 May 2011 18:41:24 + - -openbsc (0.9.4-1) unstable; urgency=low - - * Initial release - - -- Harald Welte Tue, 24 Aug 2010 13:34:24 +0200 + -- Alexander Couzens Tue, 08 Aug 2017 01:13:01 + diff --git a/debian/control b/debian/control index 87b6f07..907ec38 100644 --- a/debian/control +++ b/debian/control @@ -1,181 +1,41 @@ -Source: openbsc -Maintainer: Harald Welte +Source: osmo-msc Section: net -Priority: optional -Build-Depends: debhelper (>= 9), - autotools-dev, - autoconf-archive, - pkg-config, - libgtp-dev, - libosmocore-dev, - libosmo-sccp-dev, - libdbi0-dev, +Priority: extra +Maintainer: Alexander Couzens +Build-Depends: debhelper (>=9), dh-autoreconf, - libosmo-abis-dev, - libosmo-netif-dev, - libdbd-sqlite3, - libpcap-dev, + autotools-dev, + autoconf, + automake, + libtool, + pkg-config, + libdbi-dev, + libtalloc-dev, libssl-dev, libc-ares-dev, - libsmpp34-dev + libgtp-dev, + libasn1c-dev, + libc-ares-dev, + libosmocore-dev, + libosmo-sccp-dev, + libosmo-abis-dev, + libosmo-legacy-mgcp-dev, + libosmo-netif-dev, + libosmo-ranap-dev Standards-Version: 3.9.8 -Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git -Vcs-Browser: http://openbsc.osmocom.org/trac/browser -Homepage: https://projects.osmocom.org/projects/openbsc +Vcs-Git: git://git.osmocom.org/osmo-bsc.git +Vcs-Browser: https://git.osmocom.org/osmo-bsc/ +Homepage: https://projects.osmocom.org/projects/osmo-bsc -Package: osmocom-bsc +Package: osmo-msc Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: GSM Base Station Controller - This is the BSC-only version of OpenBSC. It requires a
[MERGED] osmo-msc[master]: MSC, SGSN: use OSMO_GSUP_PORT == 4222 instead of 2222
Harald Welte has submitted this change and it was merged. Change subject: MSC,SGSN: use OSMO_GSUP_PORT == 4222 instead of .. MSC,SGSN: use OSMO_GSUP_PORT == 4222 instead of In SGSN, actually place the port in the SGSN config by default, so that the gsup port may now be omitted in the VTY config (the IP address suffices). Adjust the osmo-sgsn.cfg example. Depends: I4222e21686c823985be8ff1f16b1182be8ad6175 (libosmocore) Change-Id: I50f2040e2eb0baacb43849e93cfed10cbc2fc156 --- M doc/examples/osmo-sgsn/osmo-sgsn.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg index 9703c23..06f035f 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg @@ -11,7 +11,7 @@ ggsn 0 gtp-version 1 auth-policy remote gsup remote-ip 127.0.0.1 - gsup remote-port + gsup remote-port 4222 ! ns timer tns-block 3 -- To view, visit https://gerrit.osmocom.org/3488 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50f2040e2eb0baacb43849e93cfed10cbc2fc156 Gerrit-PatchSet: 5 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: cosmetic: msc_vlr_tests: drop unused var
Harald Welte has submitted this change and it was merged. Change subject: cosmetic: msc_vlr_tests: drop unused var .. cosmetic: msc_vlr_tests: drop unused var Change-Id: I584c0dfffe005597563dbd72fad8a087c554ba3d --- M tests/msc_vlr/msc_vlr_tests.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 3966aac..71f9713 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -454,7 +454,6 @@ int _validate_dtap(struct msgb *msg, enum ran_type to_ran) { - struct gsm48_hdr *gh = (void*)msg->data; btw("DTAP --%s--> MS: %s: %s", ran_type_name(to_ran), msg_type_name(msg), osmo_hexdump_nospc(msg->data, msg->len)); -- To view, visit https://gerrit.osmocom.org/3490 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I584c0dfffe005597563dbd72fad8a087c554ba3d Gerrit-PatchSet: 7 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: gsup client: move not-connected to error loglevel
Harald Welte has submitted this change and it was merged. Change subject: gsup client: move not-connected to error loglevel .. gsup client: move not-connected to error loglevel Change-Id: I8290963aedb7237da89c9ff98adf4cd33beb5031 --- M src/libcommon/gsup_client.c 1 file changed, 2 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libcommon/gsup_client.c b/src/libcommon/gsup_client.c index 258f230..fd65e7b 100644 --- a/src/libcommon/gsup_client.c +++ b/src/libcommon/gsup_client.c @@ -330,18 +330,10 @@ int gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) { - if (!gsupc) { - LOGP(DGPRS, LOGL_NOTICE, "No GSUP client, unable to " - "send %s\n", msgb_hexdump(msg)); + if (!gsupc || !gsupc->is_connected) { + LOGP(DGPRS, LOGL_ERROR, "GSUP not connected, unable to send %s\n", msgb_hexdump(msg)); msgb_free(msg); return -ENOTCONN; - } - - if (!gsupc->is_connected) { - LOGP(DGPRS, LOGL_NOTICE, "GSUP not connected, unable to " - "send %s\n", msgb_hexdump(msg)); - msgb_free(msg); - return -EAGAIN; } client_send(gsupc, IPAC_PROTO_EXT_GSUP, msg); -- To view, visit https://gerrit.osmocom.org/3493 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8290963aedb7237da89c9ff98adf4cd33beb5031 Gerrit-PatchSet: 9 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: add msg type to SMS rx logging
Harald Welte has submitted this change and it was merged. Change subject: add msg type to SMS rx logging .. add msg type to SMS rx logging Change-Id: I73ea4eebe57b2d1008045a27f174072178b9f077 --- M src/libmsc/gsm_04_11.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index c5bcce7..574fe28 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -917,7 +917,9 @@ return -EIO; /* FIXME: send some error message */ - DEBUGP(DLSMS, "receiving data (trans_id=%x)\n", transaction_id); + DEBUGP(DLSMS, "receiving data (trans_id=%x, msg_type=%s)\n", transaction_id, + gsm48_pdisc_msgtype_name(gsm48_hdr_pdisc(gh), gsm48_hdr_msg_type(gh))); + trans = trans_find_by_id(conn, GSM48_PDISC_SMS, transaction_id); /* -- To view, visit https://gerrit.osmocom.org/3496 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73ea4eebe57b2d1008045a27f174072178b9f077 Gerrit-PatchSet: 10 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: split off osmo-msc: remove files, apply build, rename
Harald Welte has submitted this change and it was merged. Change subject: split off osmo-msc: remove files, apply build, rename .. split off osmo-msc: remove files, apply build, rename Change-Id: Icf025e5ea8d180613b3114282951c9afa67af9a7 --- M configure.ac D debian/osmo-gtphub.default D debian/osmo-gtphub.examples D debian/osmo-gtphub.init D debian/osmo-gtphub.install D debian/osmocom-bs11-utils.install D debian/osmocom-bsc-nat.init D debian/osmocom-bsc-nat.install D debian/osmocom-bsc.examples D debian/osmocom-bsc.install D debian/osmocom-gbproxy.init D debian/osmocom-gbproxy.install D debian/osmocom-ipaccess-utils.install D debian/osmocom-sgsn.default D debian/osmocom-sgsn.examples D debian/osmocom-sgsn.init D debian/osmocom-sgsn.install D doc/BS11-OML.txt D doc/channel_release.txt D doc/examples/osmo-bsc/osmo-bsc.cfg D doc/examples/osmo-bsc_mgcp/mgcp.cfg D doc/examples/osmo-bsc_nat/black-list.cfg D doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg D doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg D doc/examples/osmo-gbproxy/osmo-gbproxy.cfg D doc/examples/osmo-gtphub/gtphub-example.txt D doc/examples/osmo-gtphub/osmo-gtphub-1iface.cfg D doc/examples/osmo-gtphub/osmo-gtphub.cfg D doc/examples/osmo-sgsn/osmo-sgsn.cfg D doc/oml-interface.txt M include/Makefile.am D include/compat_af_isdn.h D include/mISDNif.h M include/openbsc/Makefile.am D include/openbsc/bsc_nat.h D include/openbsc/bsc_nat_callstats.h D include/openbsc/bsc_nat_sccp.h D include/openbsc/bsc_subscriber.h D include/openbsc/gb_proxy.h D include/openbsc/gprs_gb_parse.h D include/openbsc/gprs_gmm.h D include/openbsc/gprs_llc.h D include/openbsc/gprs_llc_xid.h D include/openbsc/gprs_sgsn.h D include/openbsc/gprs_sndcp.h D include/openbsc/gprs_sndcp_comp.h D include/openbsc/gprs_sndcp_dcomp.h D include/openbsc/gprs_sndcp_pcomp.h D include/openbsc/gprs_sndcp_xid.h D include/openbsc/gprs_subscriber.h D include/openbsc/gprs_utils.h D include/openbsc/nat_rewrite_trie.h M include/openbsc/paging.h D include/openbsc/pcu_if.h D include/openbsc/pcuif_proto.h D include/openbsc/sgsn.h D include/openbsc/v42bis.h D include/openbsc/v42bis_private.h M osmoappdesc.py M src/Makefile.am D src/gprs/.gitignore D src/gprs/Makefile.am D src/gprs/crc24.c D src/gprs/gb_proxy.c D src/gprs/gb_proxy_main.c D src/gprs/gb_proxy_patch.c D src/gprs/gb_proxy_peer.c D src/gprs/gb_proxy_tlli.c D src/gprs/gb_proxy_vty.c D src/gprs/gprs_gb_parse.c D src/gprs/gprs_gmm.c D src/gprs/gprs_llc.c D src/gprs/gprs_llc_parse.c D src/gprs/gprs_llc_vty.c D src/gprs/gprs_llc_xid.c D src/gprs/gprs_sgsn.c D src/gprs/gprs_sndcp.c D src/gprs/gprs_sndcp_comp.c D src/gprs/gprs_sndcp_dcomp.c D src/gprs/gprs_sndcp_pcomp.c D src/gprs/gprs_sndcp_vty.c D src/gprs/gprs_sndcp_xid.c D src/gprs/gprs_subscriber.c D src/gprs/gprs_utils.c D src/gprs/gtphub.c D src/gprs/gtphub_ares.c D src/gprs/gtphub_main.c D src/gprs/gtphub_sock.c D src/gprs/gtphub_vty.c D src/gprs/osmo_sgsn.cfg D src/gprs/sgsn_ares.c D src/gprs/sgsn_auth.c D src/gprs/sgsn_cdr.c D src/gprs/sgsn_ctrl.c D src/gprs/sgsn_libgtp.c D src/gprs/sgsn_main.c D src/gprs/sgsn_vty.c D src/gprs/slhc.c D src/gprs/v42bis.c D src/ipaccess/Makefile.am D src/ipaccess/abisip-find.c D src/ipaccess/ipaccess-config.c D src/ipaccess/ipaccess-firmware.c D src/ipaccess/ipaccess-proxy.c D src/ipaccess/network_listen.c D src/libbsc/Makefile.am D src/libbsc/abis_nm.c D src/libbsc/abis_nm_ipaccess.c D src/libbsc/abis_nm_vty.c D src/libbsc/abis_om2000.c D src/libbsc/abis_om2000_vty.c D src/libbsc/abis_rsl.c D src/libbsc/arfcn_range_encode.c D src/libbsc/bsc_api.c D src/libbsc/bsc_ctrl_commands.c D src/libbsc/bsc_ctrl_lookup.c D src/libbsc/bsc_dyn_ts.c D src/libbsc/bsc_init.c D src/libbsc/bsc_msc.c D src/libbsc/bsc_rf_ctrl.c D src/libbsc/bsc_rll.c D src/libbsc/bsc_subscriber.c D src/libbsc/bsc_vty.c D src/libbsc/bts_ericsson_rbs2000.c D src/libbsc/bts_init.c D src/libbsc/bts_ipaccess_nanobts.c D src/libbsc/bts_ipaccess_nanobts_omlattr.c D src/libbsc/bts_nokia_site.c D src/libbsc/bts_siemens_bs11.c D src/libbsc/bts_sysmobts.c D src/libbsc/bts_unknown.c D src/libbsc/chan_alloc.c D src/libbsc/e1_config.c D src/libbsc/gsm_04_08_utils.c D src/libbsc/gsm_04_80_utils.c D src/libbsc/handover_decision.c D src/libbsc/handover_logic.c D src/libbsc/meas_proc.c D src/libbsc/meas_rep.c D src/libbsc/net_init.c D src/libbsc/paging.c D src/libbsc/pcu_sock.c D src/libbsc/rest_octets.c D src/libbsc/system_information.c M src/libcommon/common_vty.c D src/libfilter/Makefile.am D src/libfilter/bsc_msg_acc.c D src/libfilter/bsc_msg_filter.c D src/libfilter/bsc_msg_vty.c M src/libmsc/vty_interface_layer3.c D src/libtrau/Makefile.am D src/libtrau/rtp_proxy.c D src/libtrau/trau_mux.c D src/libtrau/trau_upqueue.c M src/libvlr/vlr.c D src/osmo-bsc/Makefile.am D src/osmo-bsc/osmo_bsc_api.c D src/osmo-bsc/osmo_bsc_audio.c D src/osmo-bsc/osmo_bsc_bssap.c D src/osmo-bsc/osmo_bsc_ctrl.c D src/osmo-bsc/osmo_bsc_filter.c D src/osmo-bsc/osmo_bs
[MERGED] osmo-msc[master]: move libiu to osmo-iuh/libosmo-ranap
Harald Welte has submitted this change and it was merged. Change subject: move libiu to osmo-iuh/libosmo-ranap .. move libiu to osmo-iuh/libosmo-ranap Remove libiu here, use the functions from libosmo-ranap instead, by applying the ranap_ / RANAP_ prefix. Corresponding change-id in osmo-iuh.git is I6a3f7ad15be03fb94689b4af6ccfa828c25f45c0 To be able to run the msc_vlr tests for RAN_UTRAN_IU without Iu client headers available, add iu_dummy.h, containing mere function signatures that match iu_dummy.c and a mostly empty struct ranap_ue_conn_ctx. Make sure we can build with and without --enable-iu: include osmo-iuh headers only with --enable-iu. Change-Id: Ib8c4fcdb4766c5e575618b95ce16dce51063206b --- M configure.ac M include/openbsc/Makefile.am M include/openbsc/gprs_sgsn.h M include/openbsc/gsm_data.h D include/openbsc/iu.h A include/openbsc/iu_dummy.h M include/openbsc/iucs.h M include/openbsc/iucs_ranap.h M include/openbsc/sgsn.h M src/Makefile.am M src/gprs/Makefile.am M src/gprs/gprs_gmm.c M src/gprs/gprs_sgsn.c M src/gprs/sgsn_libgtp.c M src/gprs/sgsn_main.c M src/gprs/sgsn_vty.c D src/libiu/Makefile.am D src/libiu/iu.c D src/libiu/iu_vty.c M src/libmsc/Makefile.am M src/libmsc/a_iface_bssap.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_subscriber.c M src/libmsc/iu_dummy.c M src/libmsc/iucs.c M src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c M src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/subscr_conn.c M src/osmo-msc/Makefile.am M src/osmo-msc/msc_main.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_tests.c M tests/sgsn/Makefile.am M tests/sms_queue/Makefile.am 36 files changed, 213 insertions(+), 1,150 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 90a95e6..80f50e8 100644 --- a/configure.ac +++ b/configure.ac @@ -233,7 +233,6 @@ src/libmgcp/Makefile src/libcommon/Makefile src/libfilter/Makefile -src/libiu/Makefile src/libcommon-cs/Makefile src/osmo-msc/Makefile src/osmo-bsc/Makefile diff --git a/include/openbsc/Makefile.am b/include/openbsc/Makefile.am index 25709f1..89e0338 100644 --- a/include/openbsc/Makefile.am +++ b/include/openbsc/Makefile.am @@ -49,9 +49,9 @@ handover.h \ handover_decision.h \ ipaccess.h \ - iu.h \ iucs.h \ iucs_ranap.h \ + iu_dummy.h \ meas_feed.h \ meas_rep.h \ mgcp.h \ diff --git a/include/openbsc/gprs_sgsn.h b/include/openbsc/gprs_sgsn.h index 4e49c08..57995e0 100644 --- a/include/openbsc/gprs_sgsn.h +++ b/include/openbsc/gprs_sgsn.h @@ -117,7 +117,7 @@ uint16_t pdp_status; }; -struct ue_conn_ctx; +struct ranap_ue_conn_ctx; /* According to TS 03.60, Table 5: SGSN MM and PDP Contexts */ /* Extended by 3GPP TS 23.060, Table 6: SGSN MM and PDP Contexts */ @@ -159,7 +159,7 @@ /* CSG Subscription Data */ /* LIPA Allowed */ /* Voice Support Match Indicator */ - struct ue_conn_ctx *ue_ctx; + struct ranap_ue_conn_ctx*ue_ctx; struct service_info service; } iu; /* VLR number */ diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h index 43fc6d3..6079900 100644 --- a/include/openbsc/gsm_data.h +++ b/include/openbsc/gsm_data.h @@ -30,7 +30,7 @@ struct bsc_subscr; struct vlr_instance; struct vlr_subscr; -struct ue_conn_ctx; +struct ranap_ue_conn_ctx; #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] @@ -203,7 +203,7 @@ /* which Iu-CS connection, if any. */ struct { - struct ue_conn_ctx *ue_ctx; + struct ranap_ue_conn_ctx *ue_ctx; uint8_t rab_id; } iu; @@ -493,7 +493,7 @@ struct { /* CS7 instance id number (set via VTY) */ uint32_t cs7_instance; - enum nsap_addr_enc rab_assign_addr_enc; + int rab_assign_addr_enc; struct osmo_sccp_instance *sccp; } iu; diff --git a/include/openbsc/iu.h b/include/openbsc/iu.h deleted file mode 100644 index 08e4cd0..000 --- a/include/openbsc/iu.h +++ /dev/null @@ -1,77 +0,0 @@ -#pragma once - -#include -#include - -#include -#include -#include - -#include - -struct sgsn_pdp_ctx; -struct msgb; -struct gsm_auth_tuple; -struct osmo_sccp_addr; -struct osmo_ss7_instance; - -struct RANAP_RAB_SetupOrModifiedItemIEs_s; -struct RANAP_GlobalRNC_ID; -struct RANAP_Cause; - -/* Debugging switches from asn1c and osmo-iuh */ -extern int asn_debug; -extern int asn1_xer_print; - -struct ue_conn_ctx { - struct llist_head list; - /* TODO: It's not needed to store the full SCCP address for each -* UE. Rather than that, a pointer to the RNC should be far -* sufficient */ - struct osmo_sccp_addr sccp_addr; - ui
[MERGED] osmo-msc[master]: msc_vlr tests: add IMEISV tests
Harald Welte has submitted this change and it was merged. Change subject: msc_vlr tests: add IMEISV tests .. msc_vlr tests: add IMEISV tests Change-Id: I752afef2ae3ce04e813c7e9fea0e883e607c0e14 --- M tests/msc_vlr/msc_vlr_test_gsm_authen.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.c M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 6 files changed, 1,324 insertions(+), 48 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c index 44e4052..70b7614 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c @@ -563,7 +563,7 @@ btw("MS replies with an Identity Response"); expect_bssap_clear(); - ms_sends_msg("0559084a32244332244332"); + ms_sends_msg("0559084a32244332244302"); VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); btw("LU was successful, and the conn has already been closed"); @@ -573,7 +573,7 @@ btw("Subscriber has the IMEI"); vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); OSMO_ASSERT(vsub); - VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423423"), == 0, "%d"); + VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d"); vlr_subscr_put(vsub); BTW("subscriber detaches"); @@ -661,7 +661,7 @@ thwart_rx_non_initial_requests(); btw("MS replies with an Identity Response"); - ms_sends_msg("0559084a32244332244332"); + ms_sends_msg("0559084a32244332244302"); btw("a LU Accept with a new TMSI was sent, waiting for TMSI Realloc Compl"); EXPECT_CONN_COUNT(1); @@ -688,7 +688,7 @@ btw("Subscriber has the IMEI and TMSI"); vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); OSMO_ASSERT(vsub); - VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423423"), == 0, "%d"); + VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d"); VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x"); vlr_subscr_put(vsub); diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index bca64a4..c12eba1 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1250,8 +1250,8 @@ MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + 1 == 2 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423423 -DVLR set IMEI on subscriber; IMSI=90170004620 IMEI=423423423423423 +DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DVLR set IMEI on subscriber; IMSI=90170004620 IMEI=423423423423420 DVLR vlr_lu_fsm(90170004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(90170004620){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK - sending LU Accept for MSISDN:46071 @@ -1289,7 +1289,7 @@ llist_count(&net->subscr_conns) == 0 - Subscriber has the IMEI DREF VLR subscr MSISDN:46071 usage increases to: 2 - strcmp(vsub->imei, "423423423423423") == 0 + strcmp(vsub->imei, "423423423423420") == 0 DREF VLR subscr MSISDN:46071 usage decreases to: 1 --- - subscriber detaches @@ -1469,8 +1469,8 @@ MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP DREF MSISDN:46071: MSC conn use + 1 == 2 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19) -DMM IDENTITY RESPONSE: MI(IMEI)=423423423423423 -DVLR set IMEI on subscriber; IMSI=90170004620 IMEI=423423423423423 +DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420 +DVLR set IMEI on subscriber; IMSI=90170004620 IMEI=423423423423420 DVLR vlr_lu_fsm(90170004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI DVLR lu_compl_vlr_fsm(90170004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK DVLR lu_compl_vlr_fsm(90170004620){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: lu_compl_vlr_new_tmsi() @@ -1538,7 +1538,7 @@ llist_count(&net->subscr_conns) == 0 - Subscriber has the IMEI and TMSI DREF VLR subscr MSISDN:46071 usage increases to: 2 - strcmp(vsub->imei, "423423423423423") == 0 + strcmp(vsub->imei, "423423423423420") == 0 vsub->tmsi == 0x03020100 DREF VLR subscr MSISDN:46071 usage decreases to: 1 --- diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c index 42e7c73..e0bd967 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c @@ -553,7 +553,7 @@ btw("MS replies with an Identity Response"); expect_bssap_clear(); - ms_sends_msg("0559084a32244332244332"); + ms_sends_msg("0559084a32244332244302"); VERBOSE_ASSERT(bssap_clear_
[MERGED] osmo-msc[master]: build: check for -lgsm
Harald Welte has submitted this change and it was merged. Change subject: build: check for -lgsm .. build: check for -lgsm If libosmo-legacy-mgcp is built with --enable-mgcp-transcoding, we need to link -lgsm here as well. This autodetects whether -lgsm is necessary. Todo: how about --with-g729? Todo: osmo-msc is only using the mgcp client and should not actually need transcoding nor -lgsm. Change-Id: Iab55a089ae36017b79e7cbc3cac45ef9fd85dd43 --- M configure.ac 1 file changed, 27 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 9b25ab8..1942614 100644 --- a/configure.ac +++ b/configure.ac @@ -64,17 +64,6 @@ [osmo_ac_mgcp_transcoding="$enableval"],[osmo_ac_mgcp_transcoding="no"]) AC_ARG_WITH([g729], [AS_HELP_STRING([--with-g729], [Enable G.729 encoding/decoding.])], [osmo_ac_with_g729="$withval"],[osmo_ac_with_g729="no"]) -if test "$osmo_ac_mgcp_transcoding" = "yes" ; then -AC_SEARCH_LIBS([gsm_create], [gsm], [LIBRARY_GSM="$LIBS";LIBS=""], [AC_MSG_ERROR([--enable-mgcp-transcoding: cannot find usable libgsm])]) -AC_SUBST(LIBRARY_GSM) -if test "$osmo_ac_with_g729" = "yes" ; then - PKG_CHECK_MODULES(LIBBCG729, libbcg729 >= 0.1, [AC_DEFINE([HAVE_BCG729], [1], [Use bgc729 decoder/encoder])]) -fi -AC_DEFINE(BUILD_MGCP_TRANSCODING, 1, [Define if we want to build the MGCP gateway with transcoding support]) -fi -AM_CONDITIONAL(BUILD_MGCP_TRANSCODING, test "x$osmo_ac_mgcp_transcoding" = "xyes") -AC_SUBST(osmo_ac_mgcp_transcoding) - # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) @@ -138,6 +127,33 @@ AC_SUBST([COVERAGE_LDFLAGS]) fi +AC_DEFUN([CHECK_LIBOSMO_LEGACY_MGCP_NEEDS_LIBGSM], [ + AC_CACHE_CHECK( +[whether libosmo-legacy-mgcp needs -lgsm], +libosmo_cv_legacy_mgcp_needs_libgsm, [ + SAVE_LDFLAGS="${LDFLAGS}" + LDFLAGS="${LIBOSMOLEGACYMGCP_LIBS} ${LIBOSMOVTY_LIBS}" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([ + #include + ], [ + mgcpgw_client_init(0, 0); + ])], + [libosmo_cv_legacy_mgcp_needs_libgsm=no], + [libosmo_cv_legacy_mgcp_needs_libgsm=yes]) + LDFLAGS="${SAVE_LDFLAGS}" + ]) + ]) +CHECK_LIBOSMO_LEGACY_MGCP_NEEDS_LIBGSM +if test "x$libosmo_cv_legacy_mgcp_needs_libgsm" = xyes; then +AC_SEARCH_LIBS([gsm_create], [gsm], [LIBRARY_GSM="$LIBS";LIBS=""], + [AC_MSG_ERROR([libosmo-legacy-mgcp is built with transcoding and needs -lgsm but cannot find usable libgsm])]) +AC_SUBST(LIBRARY_GSM) +if test "$osmo_ac_with_g729" = "yes" ; then + PKG_CHECK_MODULES(LIBBCG729, libbcg729 >= 0.1, [AC_DEFINE([HAVE_BCG729], [1], [Use bgc729 decoder/encoder])]) +fi +fi + AC_DEFUN([CHECK_TM_INCLUDES_TM_GMTOFF], [ AC_CACHE_CHECK( [whether struct tm has tm_gmtoff member], -- To view, visit https://gerrit.osmocom.org/3587 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab55a089ae36017b79e7cbc3cac45ef9fd85dd43 Gerrit-PatchSet: 8 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: mgcp: add VTY Option to force-realloc endpoints
Harald Welte has submitted this change and it was merged. Change subject: mgcp: add VTY Option to force-realloc endpoints .. mgcp: add VTY Option to force-realloc endpoints Currently the force_realloc feature is turnd on and of in a hardcoded way. This patch makes the option available via VTY. Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f --- M src/libmgcp/mgcp_vty.c M src/osmo-bsc_mgcp/mgcp_main.c M src/osmo-bsc_nat/bsc_mgcp_utils.c M src/osmo-bsc_nat/bsc_nat.c 4 files changed, 18 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmgcp/mgcp_vty.c b/src/libmgcp/mgcp_vty.c index 7d4b2da..51889d9 100644 --- a/src/libmgcp/mgcp_vty.c +++ b/src/libmgcp/mgcp_vty.c @@ -591,6 +591,16 @@ return CMD_SUCCESS; } +DEFUN(cfg_mgcp_force_realloc, + cfg_mgcp_force_realloc_cmd, + "force-realloc (0|1)", + "Force endpoint reallocation when the endpoint is still seized\n" + "Don't force reallocation\n" "force reallocation\n") +{ + g_cfg->trunk.force_realloc = atoi(argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_mgcp_number_endp, cfg_mgcp_number_endp_cmd, "number endpoints <0-65534>", @@ -803,9 +813,10 @@ trunk->keepalive_interval, VTY_NEWLINE); else vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE); - vty_out(vty, " loop %d%s", trunk->audio_loop, VTY_NEWLINE); + vty_out(vty, " force-realloc %d%s", + trunk->force_realloc, VTY_NEWLINE); if (trunk->omit_rtcp) vty_out(vty, " rtcp-omit%s", VTY_NEWLINE); else @@ -1379,6 +1390,7 @@ install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd_old); install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd_old); install_element(MGCP_NODE, &cfg_mgcp_loop_cmd); + install_element(MGCP_NODE, &cfg_mgcp_force_realloc_cmd); install_element(MGCP_NODE, &cfg_mgcp_number_endp_cmd); install_element(MGCP_NODE, &cfg_mgcp_omit_rtcp_cmd); install_element(MGCP_NODE, &cfg_mgcp_no_omit_rtcp_cmd); diff --git a/src/osmo-bsc_mgcp/mgcp_main.c b/src/osmo-bsc_mgcp/mgcp_main.c index 4ea0700..6cf9ab7 100644 --- a/src/osmo-bsc_mgcp/mgcp_main.c +++ b/src/osmo-bsc_mgcp/mgcp_main.c @@ -218,6 +218,8 @@ cfg->get_net_downlink_format_cb = &mgcp_transcoding_net_downlink_format; #endif + cfg->trunk.force_realloc = 1; + vty_info.copyright = openbsc_copyright; vty_init(&vty_info); logging_vty_add_cmds(NULL); diff --git a/src/osmo-bsc_nat/bsc_mgcp_utils.c b/src/osmo-bsc_nat/bsc_mgcp_utils.c index 4884786..7df362f 100644 --- a/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -1101,7 +1101,6 @@ /* some more MGCP config handling */ cfg->data = nat; cfg->policy_cb = bsc_mgcp_policy_cb; - cfg->trunk.force_realloc = 1; if (cfg->bts_ip) talloc_free(cfg->bts_ip); diff --git a/src/osmo-bsc_nat/bsc_nat.c b/src/osmo-bsc_nat/bsc_nat.c index daa066d..401288d 100644 --- a/src/osmo-bsc_nat/bsc_nat.c +++ b/src/osmo-bsc_nat/bsc_nat.c @@ -1628,6 +1628,9 @@ rate_ctr_init(tall_bsc_ctx); osmo_stats_init(tall_bsc_ctx); + /* Ensure that forced enpoint allocation is turned on by default */ + nat->mgcp_cfg->trunk.force_realloc = 1; + /* init vty and parse */ if (mgcp_parse_config(config_file, nat->mgcp_cfg, MGCP_BSC_NAT) < 0) { fprintf(stderr, "Failed to parse the config file: '%s'\n", config_file); -- To view, visit https://gerrit.osmocom.org/3487 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f Gerrit-PatchSet: 5 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter
osmo-msc[master]: mgcp: add VTY Option to force-realloc endpoints
Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3487 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic8740512c5ea0766ff6ceb1c28b9c2b3fe46e75f Gerrit-PatchSet: 4 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-HasComments: No
osmo-msc[master]: build: check for -lgsm
Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3587 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iab55a089ae36017b79e7cbc3cac45ef9fd85dd43 Gerrit-PatchSet: 7 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmo-netif[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3707 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I01b0aae741b83a3f17f1caf2b6837cf365a1709b Gerrit-PatchSet: 2 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] libosmo-netif[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: I01b0aae741b83a3f17f1caf2b6837cf365a1709b Related: OS#1861 --- M Makefile.am A TODO-RELEASE M configure.ac 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 9b1c0f1..5dd843b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ EXTRA_DIST = .version README.md +@RELMAKE@ + BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library whatdescription / commit summary line diff --git a/configure.ac b/configure.ac index 175ab63..6c9ba77 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC -- To view, visit https://gerrit.osmocom.org/3707 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01b0aae741b83a3f17f1caf2b6837cf365a1709b Gerrit-PatchSet: 2 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-msc[master]: split off osmo-msc: remove files, apply build, rename
Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3497 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf025e5ea8d180613b3114282951c9afa67af9a7 Gerrit-PatchSet: 8 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-msc[master]: move to osmo-mgw.git: osmo-bsc_mgcp and libmgcp as libosmo-l...
Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3492 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic99d681759edce11564da62500c2aac5cf5fffe2 Gerrit-PatchSet: 8 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-msc[master]: move libiu to osmo-iuh/libosmo-ranap
Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3489 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib8c4fcdb4766c5e575618b95ce16dce51063206b Gerrit-PatchSet: 6 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-iuh[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: I3ccc8202b650268cc9d1721719ba2f205c351a67 Related: OS#1861 --- M Makefile.am A TODO-RELEASE M configure.ac 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 447b148..67445ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ EXTRA_DIST = asn1 .version README.md +@RELMAKE@ + BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library whatdescription / commit summary line diff --git a/configure.ac b/configure.ac index ab7a637..72cbb56 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_MKDIR_P -- To view, visit https://gerrit.osmocom.org/3712 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ccc8202b650268cc9d1721719ba2f205c351a67 Gerrit-PatchSet: 2 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] openbsc[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: I460fd73230facbba3e326214e46c0b98b7491628 Related: OS#1861 --- M openbsc/Makefile.am M openbsc/configure.ac 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am index 31a54ea..dc53929 100644 --- a/openbsc/Makefile.am +++ b/openbsc/Makefile.am @@ -20,6 +20,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version + +@RELMAKE@ + $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: diff --git a/openbsc/configure.ac b/openbsc/configure.ac index b155769..48c5c82 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -12,6 +12,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC -- To view, visit https://gerrit.osmocom.org/3719 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I460fd73230facbba3e326214e46c0b98b7491628 Gerrit-PatchSet: 2 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] osmo-msc[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: I869395d5c9ab5ec1a487aff15418d1517f47e831 Related: OS#1861 --- M Makefile.am M configure.ac 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 4a1f65d..536b3f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen osmoappdesc.py .version + +@RELMAKE@ + $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: diff --git a/configure.ac b/configure.ac index 871f7e5..b0d6b23 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC -- To view, visit https://gerrit.osmocom.org/3714 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I869395d5c9ab5ec1a487aff15418d1517f47e831 Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmo-sccp[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: I39b3bfa8a1ccf376215a3ce220cb3cf7a85471cb Related: OS#1861 --- M Makefile.am A TODO-RELEASE M configure.ac 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 9bb711c..e2c5277 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ EXTRA_DIST = .version doc/examples/osmo-stp.cfg +@RELMAKE@ + BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library whatdescription / commit summary line diff --git a/configure.ac b/configure.ac index 7e3e03e..ed761c3 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC -- To view, visit https://gerrit.osmocom.org/3708 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39b3bfa8a1ccf376215a3ce220cb3cf7a85471cb Gerrit-PatchSet: 3 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter
[MERGED] libosmocore[master]: umts aka: add sqn_ms out-param, print SQN.MS in osmo-auc-gen
Harald Welte has submitted this change and it was merged. Change subject: umts aka: add sqn_ms out-param, print SQN.MS in osmo-auc-gen .. umts aka: add sqn_ms out-param, print SQN.MS in osmo-auc-gen When doing UMTS AKA with AUTS, it can be interesting to know the SQN.MS that was encoded in the AUTS. The only way to know this is to provide it as a separate out-parameter from milenage_gen_vec_auts(), because the SQN.MS from AUTS stored in umts.sqn is immediately modified non-trivially by milenage_gen_vec(). Add sqn_ms to struct osmo_sub_auth_data to retain SQN.MS even after a vector was generated. Use this to print out SQN.MS for 'osmo-auc-gen -3 -A'. Adjust test suite expectations. Related: OS#2464 Change-Id: I9fc05bbf169d06716f40b995154fd42a3f91bef3 --- M include/osmocom/crypt/auth.h M src/gsm/auth_milenage.c M tests/osmo-auc-gen/osmo-auc-gen_test.ok M utils/osmo-auc-gen.c 4 files changed, 14 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/crypt/auth.h b/include/osmocom/crypt/auth.h index 059e734..6d2c783 100644 --- a/include/osmocom/crypt/auth.h +++ b/include/osmocom/crypt/auth.h @@ -39,6 +39,7 @@ int opc_is_op; /*!< is the OPC field OPC (0) or OP (1) ? */ unsigned int ind_bitlen; /*!< nr of bits not in SEQ, only SQN */ unsigned int ind; /*!< which IND slot to use an SQN from */ + uint64_t sqn_ms; /*!< sqn from AUTS (output value only) */ } umts; struct { uint8_t ki[16]; /*!< secret key */ diff --git a/src/gsm/auth_milenage.c b/src/gsm/auth_milenage.c index 6dd4f45..e1a1dfb 100644 --- a/src/gsm/auth_milenage.c +++ b/src/gsm/auth_milenage.c @@ -158,9 +158,10 @@ if (rc < 0) return rc; + aud->u.umts.sqn_ms = osmo_load64be_ext(sqn_out, 6) >> 16; /* Update our "largest used SQN" from the USIM -- milenage_gen_vec() * below will increment SQN. */ - aud->u.umts.sqn = osmo_load64be_ext(sqn_out, 6) >> 16; + aud->u.umts.sqn = aud->u.umts.sqn_ms; return milenage_gen_vec(vec, aud, _rand); } diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.ok b/tests/osmo-auc-gen/osmo-auc-gen_test.ok index 82923f1..2840783 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.ok +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.ok @@ -103,6 +103,7 @@ Kc:059a4f668f6fbe39 SQN: 32 IND: 0 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind 5 @@ -118,6 +119,7 @@ Kc:059a4f668f6fbe39 SQN: 37 IND: 5 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind 23 @@ -133,6 +135,7 @@ Kc:059a4f668f6fbe39 SQN: 55 IND: 23 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind 31 @@ -148,6 +151,7 @@ Kc:059a4f668f6fbe39 SQN: 63 IND: 31 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 0 @@ -163,6 +167,7 @@ Kc:059a4f668f6fbe39 SQN: 24 IND: 0 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 1 @@ -178,6 +183,7 @@ Kc:059a4f668f6fbe39 SQN: 24 IND: 0 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 1 --ind 1 @@ -193,6 +199,7 @@ Kc:059a4f668f6fbe39 SQN: 25 IND: 1 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 8 @@ -208,6 +215,7 @@ Kc:059a4f668f6fbe39 SQN: 256 IND: 0 +SQN.MS:23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 8 --ind 1 @@ -223,6 +231,7 @@ Kc:059a4f668f6fbe39 SQN: 257 IND: 1 +SQN.MS:23 expecting error: diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index d4ae1b9..fee9767 100644 --- a/utils/osmo-auc-gen.c
[MERGED] libosmocore[master]: osmo-auc-gen: umts: print out the IND of the SQN used
Harald Welte has submitted this change and it was merged. Change subject: osmo-auc-gen: umts: print out the IND of the SQN used .. osmo-auc-gen: umts: print out the IND of the SQN used Make ind_mask available in the main(){} scope, in order to print out IND = SQN & ind_mask. Adjust test suite expectations. Related: OS#2465 Change-Id: I91eac53c4af66a58b9372d9baf5781fc9f29b1fc --- M tests/osmo-auc-gen/osmo-auc-gen_test.ok M utils/osmo-auc-gen.c 2 files changed, 22 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.ok b/tests/osmo-auc-gen/osmo-auc-gen_test.ok index f833760..82923f1 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.ok +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.ok @@ -12,6 +12,7 @@ SRES: 057fb997 Kc:60524000cc5e5407 SQN: 0 +IND: 0 > osmo-auc-gen -3 -a milenage -r 6a61050765caa32c90371370e5d6dc2d -k > 1dc4f974325cce611e54f516dc1fec56 -o 2a48162ff3edca4adf0b7b5e527d6c16 -s 1 @@ -26,6 +27,7 @@ SRES: 057fb997 Kc:60524000cc5e5407 SQN: 1 +IND: 1 > osmo-auc-gen -3 -a milenage -r 6a61050765caa32c90371370e5d6dc2d -k > 1dc4f974325cce611e54f516dc1fec56 -o 2a48162ff3edca4adf0b7b5e527d6c16 -s 23 @@ -40,6 +42,7 @@ SRES: 057fb997 Kc:60524000cc5e5407 SQN: 23 +IND: 23 > osmo-auc-gen -3 -a milenage -r 1dc4f974325cce611e54f516dc1fec56 -k > 2a48162ff3edca4adf0b7b5e527d6c16 -o 6a61050765caa32c90371370e5d6dc2d -s 42 @@ -54,6 +57,7 @@ SRES: 4c57defe Kc:169d78081b24c007 SQN: 42 +IND: 10 > osmo-auc-gen -3 -a milenage -r 2a48162ff3edca4adf0b7b5e527d6c16 -k > 6a61050765caa32c90371370e5d6dc2d -o 1dc4f974325cce611e54f516dc1fec56 -s 99 @@ -68,6 +72,7 @@ SRES: 1f89e7e9 Kc:d2d5361395b9b74a SQN: 99 +IND: 3 > osmo-auc-gen -3 -a milenage -r 6a61050765caa32c90371370e5d6dc2d -k > 2a48162ff3edca4adf0b7b5e527d6c16 -o 1dc4f974325cce611e54f516dc1fec56 -s > 281474976710655 @@ -82,6 +87,7 @@ SRES: 1b9297a7 Kc:10687b71e4eb94c5 SQN: 281474976710655 +IND: 31 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c @@ -96,6 +102,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 32 +IND: 0 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind 5 @@ -110,6 +117,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 37 +IND: 5 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind 23 @@ -124,6 +132,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 55 +IND: 23 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind 31 @@ -138,6 +147,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 63 +IND: 31 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 0 @@ -152,6 +162,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 24 +IND: 0 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 1 @@ -166,6 +177,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 24 +IND: 0 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 1 --ind 1 @@ -180,6 +192,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 25 +IND: 1 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 8 @@ -194,6 +207,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 256 +IND: 0 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind-len 8 --ind 1 @@ -208,6 +222,7 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 257 +IND: 1 expecting error: diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index 6e38b52..d4ae1b9 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -105,6 +105,8 @@ int sqn_is_set = 0; int ind_is_set = 0; int fmt_triplets_dat = 0; + uint64_t seq_1; + uint64_t ind_mask; printf("os
[MERGED] openggsn[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: Icdcb388ad22b0c009dac7968408d1e2504c838c1 Related: OS#1861 --- M Makefile.am A TODO-RELEASE M configure.ac M debian/changelog 4 files changed, 16 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 970fbf7..1d7eaba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,3 +11,5 @@ echo $(VERSION) > $(distdir)/.tarball-version EXTRA_DIST = git-version-gen .version README.md README.FreeBSD README.MacOSX README.Solaris + +@RELMAKE@ diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library whatdescription / commit summary line diff --git a/configure.ac b/configure.ac index 63d3117..9d3a8e4 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,10 @@ # FIXME: Replace `main' with a function in `-links': #AC_CHECK_LIB([inks], [main]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl GTP Linux kernel dependencies AC_ARG_ENABLE([gtp-linux], AS_HELP_STRING([--enable-gtp-linux], [Build GTP tunneling Linux kernel]), diff --git a/debian/changelog b/debian/changelog index 17a0a36..357cc01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openggsn (0.94) UNRELEASED; urgency=medium +openggsn (0.94.0) UNRELEASED; urgency=medium [ Holger Hans Peter Freyther ] * Bump version to ease upgrading from Debian SID. -- To view, visit https://gerrit.osmocom.org/3718 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icdcb388ad22b0c009dac7968408d1e2504c838c1 Gerrit-PatchSet: 2 Gerrit-Project: openggsn Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-pcap[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: Iafe5905895a656b7055d58ca8f745fcfa4bd9886 Related: OS#1861 --- M Makefile.am M configure.ac 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 798c092..6caa009 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,9 @@ BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = git-version-gen .version + +@RELMAKE@ + $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: diff --git a/configure.ac b/configure.ac index 4c0a12f..b370e0d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC -- To view, visit https://gerrit.osmocom.org/3715 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafe5905895a656b7055d58ca8f745fcfa4bd9886 Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-gsm-tester[master]: Reserve ARFCN dynamically based on BTS band support
Patch Set 1: Code-Review-1 (7 comments) https://gerrit.osmocom.org/#/c/3731/1//COMMIT_MSG Commit Message: Line 26: "Related: OS#2230" https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/bts_osmotrx.py File src/osmo_gsm_tester/bts_osmotrx.py: Line 137: } (rather first get the defaults and then overlay this dict on top, otherwise the defaults take precedence over the actually chosen value.) But, all other chosen values come from self.conf and are used in the template directly. Can we do this as well here? https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/bts_sysmo.py File src/osmo_gsm_tester/bts_sysmo.py: Line 154: } (same) https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/resource.py File src/osmo_gsm_tester/resource.py: Line 527: raise RuntimeError('adding a list of reserved resources to itself?') I guess this is a fact and not a question :) https://gerrit.osmocom.org/#/c/3731/1/src/osmo_gsm_tester/suite.py File src/osmo_gsm_tester/suite.py: Line 474: (drop blank line) Line 484: arfcn = suite_run._try_reserve_arfcn(supported_bands) I assumed the arfcn could rather be resolved and picked like any other resource. So that the scenario requests an arfcn with a given band, and the resource resolution returns an unused arfcn that matches this band, and everything just falls into place. Is there something keeping us from doing so? It appears that this way starts a test run and only then figures out that there aren't enough arfcns. The idea is that we don't even start to run unless all resources are available. https://gerrit.osmocom.org/#/c/3731/1/suites/register/register_band_1900.py File suites/register/register_band_1900.py: Line 5: arfcn = suite.reserve_arfcn(band='GSM-1900') this shouldn't be a copy, just the same register test file, except that a *scenario* chooses a 1900 band. -- To view, visit https://gerrit.osmocom.org/3731 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6fb5d95bed1fa50c3deaf62a7a6df3cb276bc3c9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels Gerrit-HasComments: Yes
[MERGED] libosmocore[master]: osmo-auc-gen: umts: use default of ind_bitlen = 5 instead of 0
Harald Welte has submitted this change and it was merged. Change subject: osmo-auc-gen: umts: use default of ind_bitlen = 5 instead of 0 .. osmo-auc-gen: umts: use default of ind_bitlen = 5 instead of 0 Most USIM out there seem to use IND-length = 5 bits, so do sysmousim-sjs1. Currently from initialization we are using an IND length of zero in osmo-auc-gen, which produces confusing SQN results after AUTS: Where want SQN to be incremented to the next IND array, usually +32, an IND-len of 0 makes for only +1. As result, the osmo-auc-gen_test.sh produces SQN 32 instead of 24 after receiving SQN.MS = 23 from AUTS: adjust test expectations. Related: OS#2465 Change-Id: I9fcc11fa2b5816302dcc6b72249b1ee40d5a61f5 --- M tests/osmo-auc-gen/osmo-auc-gen_test.ok M utils/osmo-auc-gen.c 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.ok b/tests/osmo-auc-gen/osmo-auc-gen_test.ok index 6a78886..a1d06f0 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.ok +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.ok @@ -89,10 +89,10 @@ This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY RAND: 39fa2f4e3d523d8619a73b4f65c3e14d -AUTN: 8704f5ba55ebd7fc4f7f19cfc180 +AUTN: 8704f5ba55d3541dde77ea5b1d8c IK:27497388b6cb044648f396aa155b95ef CK:f64735036e5871319c679f4742a75ea1 RES: e229c19e791f2e41 SRES: 9b36efdf Kc:059a4f668f6fbe39 -SQN: 24 +SQN: 32 diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index 87960ae..4e07fa7 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -138,6 +138,7 @@ break; case '3': test_aud.type = OSMO_AUTH_TYPE_UMTS; + test_aud.u.umts.ind_bitlen = 5; break; case 'a': rc = osmo_auth_alg_parse(optarg); -- To view, visit https://gerrit.osmocom.org/3699 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9fcc11fa2b5816302dcc6b72249b1ee40d5a61f5 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libsmpp34[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3709 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ief2b4d0400b142e84e7ce005a6da5c880c78a8f5 Gerrit-PatchSet: 2 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] libsmpp34[master]: Use release helper from libosmocore
Harald Welte has submitted this change and it was merged. Change subject: Use release helper from libosmocore .. Use release helper from libosmocore See https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release for details. Change-Id: Ief2b4d0400b142e84e7ce005a6da5c880c78a8f5 Related: OS#1861 --- M Makefile.am A TODO-RELEASE M configure.ac M debian/changelog 4 files changed, 16 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index b274f45..d526301 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,5 +19,7 @@ test_apps/recv_and_unpack.inc \ README.md +@RELMAKE@ + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsmpp34.pc diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library whatdescription / commit summary line diff --git a/configure.ac b/configure.ac index 0354ab9..305cc11 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,10 @@ AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER([aux_config/config.h]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O diff --git a/debian/changelog b/debian/changelog index c0c3948..5a142af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libsmpp34 (1.12) UNRELEASED; urgency=medium +libsmpp34 (1.12.0) UNRELEASED; urgency=medium [ Holger Hans Peter Freyther ] * Move forward towards a new release. -- To view, visit https://gerrit.osmocom.org/3709 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief2b4d0400b142e84e7ce005a6da5c880c78a8f5 Gerrit-PatchSet: 2 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] libosmocore[master]: osmo-auc-gen: umts: add --ind-len arg
Harald Welte has submitted this change and it was merged. Change subject: osmo-auc-gen: umts: add --ind-len arg .. osmo-auc-gen: umts: add --ind-len arg osmo-auc-gen so far does not allow indicating the IND bit length of SQN. A default of 5 serves most practical cases, nevertheless we should allow passing arbitrary IND lengths. Enhance the test suite to test --ind-len. Related: OS#2465 Change-Id: Ia1d8b6a823ffc92290b3e39e4e4665aeff80ccc0 --- M tests/osmo-auc-gen/osmo-auc-gen_test.err M tests/osmo-auc-gen/osmo-auc-gen_test.ok M tests/osmo-auc-gen/osmo-auc-gen_test.sh M utils/osmo-auc-gen.c 4 files changed, 98 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.err b/tests/osmo-auc-gen/osmo-auc-gen_test.err index 46ecf2e..d9b5485 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.err +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.err @@ -7,3 +7,6 @@ expecting error: > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind 42 Requested --ind 42 is too large for IND bitlen of 5 +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 0 --ind 1 +Requested --ind 1 is too large for IND bitlen of 0 diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.ok b/tests/osmo-auc-gen/osmo-auc-gen_test.ok index 278c88f..f833760 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.ok +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.ok @@ -140,6 +140,76 @@ SQN: 63 +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 0 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba55ebd7fc4f7f19cfc180 +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 24 + + +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 1 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba55ebd7fc4f7f19cfc180 +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 24 + + +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 1 --ind 1 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba55eaaab06de3fd6c01af +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 25 + + +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 8 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba54f3cbba2fbba3c5e242 +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 256 + + +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 8 --ind 1 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba54f28f8e14579da5ecbb +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 257 + + expecting error: > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k > EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A > 979498b1f72d3e28c59fa2e72f9c --ind -1 osmo-auc-gen (C) 2011-2012 by Harald Welte @@ -159,3 +229,10 @@ osmo-auc-gen (C) 2011-2012 by Harald Welte This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + + +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB86
[MERGED] libosmocore[master]: osmo-auc-gen: umts: remove erratic SQN.MS printout
Harald Welte has submitted this change and it was merged. Change subject: osmo-auc-gen: umts: remove erratic SQN.MS printout .. osmo-auc-gen: umts: remove erratic SQN.MS printout osmo-auc-gen tries to be helpful by deriving the SQN.MS from the SQN that resulted from AUTS + milenage_gen_vec(), but there is actually no way to derive the actual AUTS SQN.MS from the resulting SQN. Completely drop the printout to prevent confusion. Adjust test suite expectations. Related: OS#2464 Change-Id: Ie2432c6d6a23818f7b3a29b1295dcbb505e2be53 --- M tests/osmo-auc-gen/osmo-auc-gen_test.ok M utils/osmo-auc-gen.c 2 files changed, 0 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.ok b/tests/osmo-auc-gen/osmo-auc-gen_test.ok index fb7998f..6a78886 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.ok +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.ok @@ -96,4 +96,3 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 24 -AUTS success: SQN.MS = 23 diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index 76c4927..fade6ec 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -266,11 +266,5 @@ printf("SQN:\t%" PRIu64 "\n", test_aud.u.umts.sqn); } - /* After recovering SQN.MS from AUTS, milenage_gen_vec_auts() does -* aud->u.umts.sqn++, so to show SQN.MS we need to -1 */ - if (auts_is_set) - printf("AUTS success: SQN.MS = %" PRIu64 "\n", - test_aud.u.umts.sqn - 1); - exit(0); } -- To view, visit https://gerrit.osmocom.org/3697 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2432c6d6a23818f7b3a29b1295dcbb505e2be53 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-msc[master]: Implement AoIP, port to M3UA SIGTRAN (large addition and ref...
Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3486 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5ae4e05ee7c57cad341ea5e86af37c1f6b0ffa77 Gerrit-PatchSet: 5 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-HasComments: No
libosmocore[master]: cosmetic: test for osmo-auc-gen: print error for missing binary
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3696 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I98c23ae6378a16cf3b76c90d4ea0dfcf61ff3033 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] libosmocore[master]: cosmetic: umts aka: tweak comments for sqn and ind
Harald Welte has submitted this change and it was merged. Change subject: cosmetic: umts aka: tweak comments for sqn and ind .. cosmetic: umts aka: tweak comments for sqn and ind Clearly indicate that 'sqn' is an in *and* out-parameter. Clarify the effect of 'ind'. Change-Id: Ia40cd4ddf35f4fbe895b45b8ea59378f5ce9eb1f --- M include/osmocom/crypt/auth.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/crypt/auth.h b/include/osmocom/crypt/auth.h index 2f88a3a..059e734 100644 --- a/include/osmocom/crypt/auth.h +++ b/include/osmocom/crypt/auth.h @@ -35,10 +35,10 @@ uint8_t opc[16]; /*!< operator invariant value */ uint8_t k[16]; /*!< secret key of the subscriber */ uint8_t amf[2]; - uint64_t sqn; /*!< sequence number */ + uint64_t sqn; /*!< sequence number (in: prev sqn; out: used sqn) */ int opc_is_op; /*!< is the OPC field OPC (0) or OP (1) ? */ unsigned int ind_bitlen; /*!< nr of bits not in SEQ, only SQN */ - unsigned int ind; /*!< SQN slot, i.e. (SEQ << ind_bitlen) + ind */ + unsigned int ind; /*!< which IND slot to use an SQN from */ } umts; struct { uint8_t ki[16]; /*!< secret key */ -- To view, visit https://gerrit.osmocom.org/3703 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia40cd4ddf35f4fbe895b45b8ea59378f5ce9eb1f Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmocore[master]: osmo-auc-gen: umts: remove erratic SQN.MS printout
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3697 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie2432c6d6a23818f7b3a29b1295dcbb505e2be53 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] libosmocore[master]: osmo-auc-gen: umts: add --ind arg
Harald Welte has submitted this change and it was merged. Change subject: osmo-auc-gen: umts: add --ind arg .. osmo-auc-gen: umts: add --ind arg During UMTS AKA, the caller typically indicates which IND slot the next used SQN should belong to. Without this option, osmo-auc-gen will always produce SQN from IND-slot 0. Add --ind option. Enhance the osmo-auc-gen_test.sh to expect errors with useful printouts on stderr, and add tests that verify valid --ind ranges. Related: OS#2465 Change-Id: Ib60eec80d58ca9a0a01e7fbd2bcbbd4339b1a6d8 --- M tests/osmo-auc-gen/osmo-auc-gen_test.err M tests/osmo-auc-gen/osmo-auc-gen_test.ok M tests/osmo-auc-gen/osmo-auc-gen_test.sh M utils/osmo-auc-gen.c 4 files changed, 120 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.err b/tests/osmo-auc-gen/osmo-auc-gen_test.err index e69de29..46ecf2e 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.err +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.err @@ -0,0 +1,9 @@ +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind -1 +Requested --ind 4294967295 is too large for IND bitlen of 5 +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 32 +Requested --ind 32 is too large for IND bitlen of 5 +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 42 +Requested --ind 42 is too large for IND bitlen of 5 diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.ok b/tests/osmo-auc-gen/osmo-auc-gen_test.ok index a1d06f0..278c88f 100644 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.ok +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.ok @@ -96,3 +96,66 @@ SRES: 9b36efdf Kc:059a4f668f6fbe39 SQN: 32 + + +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 5 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba55d679267a4b347ad890 +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 37 + + +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 23 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba55c4129ddaa4f5016e25 +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 55 + + +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 31 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + +RAND: 39fa2f4e3d523d8619a73b4f65c3e14d +AUTN: 8704f5ba55cc9d169f5ff89f6087 +IK:27497388b6cb044648f396aa155b95ef +CK:f64735036e5871319c679f4742a75ea1 +RES: e229c19e791f2e41 +SRES: 9b36efdf +Kc:059a4f668f6fbe39 +SQN: 63 + + +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind -1 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + + + +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 32 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + + + +expecting error: +> osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 42 +osmo-auc-gen (C) 2011-2012 by Harald Welte +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY + diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.sh b/tests/osmo-auc-gen/osmo-auc-gen_test.sh index 132d9c3..f7fc87d 100755 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.sh +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.sh @@ -18,6 +18,16 @@ $osmo_auc_gen $@ } +invoke_err() { + echo + echo + echo expe
[MERGED] libosmocore[master]: osmo-auc-gen: umts: properly request --sqn
Harald Welte has submitted this change and it was merged. Change subject: osmo-auc-gen: umts: properly request --sqn .. osmo-auc-gen: umts: properly request --sqn The user supplied an --sqn to generate a vector for, but milenage_gen_vec() performs a nontrivial SQN increment before generating the vector. To end up with the user supplied SQN, we need to reverse this increment beforehand. Do this after all cmdline args have been parsed, in case one of them modifies the IND-bitlen parameter, which affects the SQN calculations. Related: OS#2464 OS#2465 Change-Id: Ic51a8f6333fee9c02b4073ca360991d0aa69c74f --- M utils/osmo-auc-gen.c 1 file changed, 17 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/utils/osmo-auc-gen.c b/utils/osmo-auc-gen.c index fade6ec..87960ae 100644 --- a/utils/osmo-auc-gen.c +++ b/utils/osmo-auc-gen.c @@ -95,9 +95,11 @@ struct osmo_auth_vector _vec; struct osmo_auth_vector *vec = &_vec; uint8_t _rand[16], _auts[14]; + uint64_t sqn; int rc, option_index; int rand_is_set = 0; int auts_is_set = 0; + int sqn_is_set = 0; int fmt_triplets_dat = 0; printf("osmo-auc-gen (C) 2011-2012 by Harald Welte\n"); @@ -196,11 +198,8 @@ fprintf(stderr, "Only UMTS has SQN\n"); exit(2); } - test_aud.u.umts.sqn = strtoull(optarg, 0, 10); - /* Before calculating the UMTS auth vector, -* osmo_auth_gen_vec() increments the SQN. SQN-1 here -* to end up with the SQN the user requested. */ - test_aud.u.umts.sqn--; + sqn = strtoull(optarg, 0, 10); + sqn_is_set = 1; break; case 'r': rc = osmo_hexparse(optarg, _rand, sizeof(_rand)); @@ -246,6 +245,19 @@ memset(vec, 0, sizeof(*vec)); + if (test_aud.type == OSMO_AUTH_TYPE_UMTS) { + uint64_t seq_1 = 1LL << test_aud.u.umts.ind_bitlen; + uint64_t ind_mask = seq_1 - 1; + + if (sqn_is_set) { + /* Before calculating the UMTS auth vector, osmo_auth_gen_vec() increments SEQ. +* To end up with the SQN passed in by the user, we need to pass in SEQ-1, and +* indicate which IND slot to target. */ + test_aud.u.umts.sqn = sqn - seq_1; + test_aud.u.umts.ind = sqn & ind_mask; + } + } + if (!auts_is_set) rc = osmo_auth_gen_vec(vec, &test_aud, _rand); else -- To view, visit https://gerrit.osmocom.org/3698 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic51a8f6333fee9c02b4073ca360991d0aa69c74f Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] libosmocore[master]: cosmetic: test for osmo-auc-gen: print error for missing binary
Harald Welte has submitted this change and it was merged. Change subject: cosmetic: test for osmo-auc-gen: print error for missing binary .. cosmetic: test for osmo-auc-gen: print error for missing binary Change-Id: I98c23ae6378a16cf3b76c90d4ea0dfcf61ff3033 --- M tests/osmo-auc-gen/osmo-auc-gen_test.sh 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/osmo-auc-gen/osmo-auc-gen_test.sh b/tests/osmo-auc-gen/osmo-auc-gen_test.sh index 7842638..132d9c3 100755 --- a/tests/osmo-auc-gen/osmo-auc-gen_test.sh +++ b/tests/osmo-auc-gen/osmo-auc-gen_test.sh @@ -1,6 +1,12 @@ #!/bin/sh osmo_auc_gen="$1" +if [ -z "$osmo_auc_gen" ]; then + echo 'Error: pass a path to the osmo-auc-gen binary as argument:' + echo ' ./osmo-auc-gen_test.sh /path/to/osmo-auc-gen' + exit 1 +fi + set -e # run the osmo-auc-gen binary verbosely without showing its absolute path -- To view, visit https://gerrit.osmocom.org/3696 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98c23ae6378a16cf3b76c90d4ea0dfcf61ff3033 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmocore[master]: osmo-auc-gen: umts: properly request --sqn
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3698 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic51a8f6333fee9c02b4073ca360991d0aa69c74f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: osmo-auc-gen: umts: use default of ind_bitlen = 5 instead of 0
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3699 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9fcc11fa2b5816302dcc6b72249b1ee40d5a61f5 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: osmo-auc-gen: umts: add --ind arg
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3700 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib60eec80d58ca9a0a01e7fbd2bcbbd4339b1a6d8 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: osmo-auc-gen: umts: print out the IND of the SQN used
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3702 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I91eac53c4af66a58b9372d9baf5781fc9f29b1fc Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: osmo-auc-gen: umts: add --ind-len arg
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3701 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia1d8b6a823ffc92290b3e39e4e4665aeff80ccc0 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: cosmetic: umts aka: tweak comments for sqn and ind
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3703 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia40cd4ddf35f4fbe895b45b8ea59378f5ce9eb1f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: umts aka: add sqn_ms out-param, print SQN.MS in osmo-auc-gen
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3704 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9fc05bbf169d06716f40b995154fd42a3f91bef3 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-trx[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3717 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ieb843923d8f534654413be695f2b5f0c87b75520 Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Tom Tsou Gerrit-HasComments: No
openggsn[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3718 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icdcb388ad22b0c009dac7968408d1e2504c838c1 Gerrit-PatchSet: 2 Gerrit-Project: openggsn Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-sgsn[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3716 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73823c568cfc55ad21a08dec76874724b43f419f Gerrit-PatchSet: 2 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-pcap[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3715 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iafe5905895a656b7055d58ca8f745fcfa4bd9886 Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
openbsc[master]: Use release helper from libosmocore
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3719 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I460fd73230facbba3e326214e46c0b98b7491628 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-iuh[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3712 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3ccc8202b650268cc9d1721719ba2f205c351a67 Gerrit-PatchSet: 2 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-mgw[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3713 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0905eeb177185da1e2818a01fdb7265694d9903d Gerrit-PatchSet: 2 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-msc[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3714 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I869395d5c9ab5ec1a487aff15418d1517f47e831 Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
libosmo-sccp[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3708 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I39b3bfa8a1ccf376215a3ce220cb3cf7a85471cb Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-HasComments: No
openbsc[master]: Remove common_cs.h from .deb
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3705 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I22004af84244936ca431f3bf901059f366be8bca Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-bsc[master]: Use release helper from libosmocore
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3710 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I05bf42d638167c779328fa61b01c917da91a88de Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] openbsc[master]: Remove common_cs.h from .deb
Harald Welte has submitted this change and it was merged. Change subject: Remove common_cs.h from .deb .. Remove common_cs.h from .deb It's not required by gsm_data_shared.h anymore. Change-Id: I22004af84244936ca431f3bf901059f366be8bca Related: OS#2272 --- M debian/openbsc-dev.install 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/openbsc-dev.install b/debian/openbsc-dev.install index 0c05545..b669b0f 100644 --- a/debian/openbsc-dev.install +++ b/debian/openbsc-dev.install @@ -1,4 +1,3 @@ openbsc/include/openbsc/gsm_data_shared.h usr/src/osmocom/openbsc/openbsc/include/openbsc/ -openbsc/include/openbsc/common_cs.h usr/src/osmocom/openbsc/openbsc/include/openbsc/ openbsc/src/libcommon/gsm_data_shared.c usr/src/osmocom/openbsc/openbsc/src/libcommon/ usr/lib/*/pkgconfig/openbsc.pc -- To view, visit https://gerrit.osmocom.org/3705 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22004af84244936ca431f3bf901059f366be8bca Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
libosmocore[master]: Add define for supported a5 key length limit
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3706 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8ed0f1dbc31aaff22a685ceb3bd2f8db4d2f34fd Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: Cleanup jenkins build scripts
Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/3132/2/contrib/jenkins-arm.sh File contrib/jenkins-arm.sh: PS2, Line 6: - you are introducing cosmetic changes (all arguments on same line vs. separate lines) with a clean-up, making it much harder to read and thus validate that no unintentional changes are introduced. -- To view, visit https://gerrit.osmocom.org/3132 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I24e500e132f5c8e8133d35548cb7b4e4552331d0 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: blobb Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-HasComments: Yes
osmo-bts[master]: Use git-version-gen from gnulib
Patch Set 3: Code-Review-1 I still don't see why we should introduce yet another build-time ddependency that all of our users need to install. I'm already quite unhappy with the recent new 'bumpversion' dependency. The commit message still doesn't state *why* you are proposing this. What is wrong with the current approach? Which important fixes to git-version-gen have we missed? Where is the advantage to us chceking in a new version of the script in all our repos? -- To view, visit https://gerrit.osmocom.org/3679 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I290acecbbb91f5ee713a035d07e23e7d5c0cf03c Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
openbsc[master]: SI13: drop PBCCH-related bits
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3734 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I319e71a4b0c682361529e9c21377398a826b934b Gerrit-PatchSet: 2 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-gsm-tester[master]: Add cipher cfg param for modem and bts
Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/3723/2/example/resources.conf File example/resources.conf: Line 16: ciphers: ['a5 0', 'a5 1', 'a5 2', 'a5 3'] 'a5 2' is a weak "export grade" cipher and globally deprecated. I assume our osmo-bts code doesn't support it. https://gerrit.osmocom.org/#/c/3723/2/src/osmo_gsm_tester/schema.py File src/osmo_gsm_tester/schema.py: Line 70: if val in ('a5 0', 'a5 1', 'a5 2', 'a5 3'): spec wise they go up to 7 -- To view, visit https://gerrit.osmocom.org/3723 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic0e368843a6e58bd3eeef36d2c0a7501296f0f3e Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
osmo-msc[master]: am: msc_vlr_tests: use AM_LDFLAGS instead of COMMON vars
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3720 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6efae6e192b22de2c1d706edd55385135142532b Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-bts[master]: trx: avoid deactivating lchan on LCHAN_REL_ACT_REACT
Patch Set 5: Code-Review-1 I still don't like this patch - or don't understand it. If there is a bug, then we fix it instead of introducing a hack and a FIXME. I also don't see why there seems to be an assumption that any LCHAN_REL_ACT_REACT is related to SI3 / number of AGCH. The fact that SI3 related code is the only user of LCHAN_REL_ACT_REACT so far doesn't mean that one can make that assumption. Also, our aim should be to make all BTS models as similar as possible, rather than creating short-cuts for some of them. So my preference would clearly be to do a deactivation + re-actiovation as on other BTS models. Nobody will remember the subtle differences so let's avoid introducing any new ones without a really strong argument. -- To view, visit https://gerrit.osmocom.org/3067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I20b89ba1e43d1414180b083cd1e085eeffe5d513 Gerrit-PatchSet: 5 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] libosmo-sccp[master]: cosmetic: aggressively set vty->index to NULL in osmo_ss7_vt...
Harald Welte has submitted this change and it was merged. Change subject: cosmetic: aggressively set vty->index to NULL in osmo_ss7_vty_go_parent() .. cosmetic: aggressively set vty->index to NULL in osmo_ss7_vty_go_parent() Change-Id: I579482f679cd43edfbe796a5806ef360335f1c55 --- M src/osmo_ss7_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 5731326..1fb35a1 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1640,10 +1640,12 @@ break; case L_CS7_SCCPADDR_GT_NODE: vty->node = L_CS7_SCCPADDR_NODE; + vty->index = NULL; break; case L_CS7_NODE: default: vty->node = CONFIG_NODE; + vty->index = NULL; break; } return 0; -- To view, visit https://gerrit.osmocom.org/3732 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I579482f679cd43edfbe796a5806ef360335f1c55 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max
libosmo-sccp[master]: cosmetic: aggressively set vty->index to NULL in osmo_ss7_vt...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3732 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I579482f679cd43edfbe796a5806ef360335f1c55 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
[MERGED] libosmocore[master]: vty: 'ctrl' node: add missing default commands like list, exi...
Harald Welte has submitted this change and it was merged. Change subject: vty: 'ctrl' node: add missing default commands like list,exit,end .. vty: 'ctrl' node: add missing default commands like list,exit,end Change-Id: I72569ed767b6a4d792b2867d02caa65520e27cd3 --- M src/ctrl/control_vty.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ctrl/control_vty.c b/src/ctrl/control_vty.c index a968bc0..97f42de 100644 --- a/src/ctrl/control_vty.c +++ b/src/ctrl/control_vty.c @@ -82,6 +82,7 @@ ctrl_vty_ctx = ctx; install_element(CONFIG_NODE, &cfg_ctrl_cmd); install_node(&ctrl_node, config_write_ctrl); + vty_install_default(L_CTRL_NODE); install_element(L_CTRL_NODE, &cfg_ctrl_bind_addr_cmd); return 0; -- To view, visit https://gerrit.osmocom.org/3733 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72569ed767b6a4d792b2867d02caa65520e27cd3 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmocore[master]: vty: 'ctrl' node: add missing default commands like list, exi...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3733 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I72569ed767b6a4d792b2867d02caa65520e27cd3 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] openbsc[master]: SI13: drop PBCCH-related bits
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3734 to look at the new patch set (#2). SI13: drop PBCCH-related bits According to 3GPP TS 44.018 §1.8 the "network shall never enable PBCCH and PCCCH". Change-Id: I319e71a4b0c682361529e9c21377398a826b934b Related: OS#2400 --- M openbsc/include/openbsc/rest_octets.h M openbsc/src/libbsc/rest_octets.c M openbsc/src/libbsc/system_information.c 3 files changed, 20 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/34/3734/2 diff --git a/openbsc/include/openbsc/rest_octets.h b/openbsc/include/openbsc/rest_octets.h index 49a2312..ca7b57c 100644 --- a/openbsc/include/openbsc/rest_octets.h +++ b/openbsc/include/openbsc/rest_octets.h @@ -62,12 +62,6 @@ /* Generate SI4 Rest Octets (Chapter 10.5.2.35) */ int rest_octets_si4(uint8_t *data, const struct gsm48_si_ro_info *si4, int len); -enum pbcch_carrier_type { - PBCCH_BCCH, - PBCCH_ARFCN, - PBCCH_MAIO -}; - /* TS 03.60 Chapter 6.3.3.1: Network Mode of Operation */ enum gprs_nmo { GPRS_NMO_I = 0,/* CS pagin on GPRS paging or traffic channel */ @@ -112,25 +106,10 @@ struct gprs_power_ctrl_pars pwr_ctrl_pars; uint8_t bcch_change_mark; uint8_t si_change_field; - uint8_t pbcch_present; - - union { - struct { - uint8_t rac; - uint8_t spgc_ccch_sup; - uint8_t net_ctrl_ord; - uint8_t prio_acc_thr; - } no_pbcch; - struct { - uint8_t psi1_rep_per; - uint8_t pb; - uint8_t tsc; - uint8_t tn; - enum pbcch_carrier_type carrier_type; - uint16_t arfcn; - uint8_t maio; - } pbcch; - }; + uint8_t rac; + uint8_t spgc_ccch_sup; + uint8_t net_ctrl_ord; + uint8_t prio_acc_thr; }; /* Generate SI13 Rest Octests (Chapter 10.5.2.37b) */ diff --git a/openbsc/src/libbsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c index fdab70a..78e7413 100644 --- a/openbsc/src/libbsc/rest_octets.c +++ b/openbsc/src/libbsc/rest_octets.c @@ -816,39 +816,16 @@ bitvec_set_uint(&bv, si13->bcch_change_mark, 2); append_gprs_mobile_alloc(&bv); } - if (!si13->pbcch_present) { - /* PBCCH not present in cell */ - bitvec_set_bit(&bv, 0); - bitvec_set_uint(&bv, si13->no_pbcch.rac, 8); - bitvec_set_bit(&bv, si13->no_pbcch.spgc_ccch_sup); - bitvec_set_uint(&bv, si13->no_pbcch.prio_acc_thr, 3); - bitvec_set_uint(&bv, si13->no_pbcch.net_ctrl_ord, 2); - append_gprs_cell_opt(&bv, &si13->cell_opts); - append_gprs_pwr_ctrl_pars(&bv, &si13->pwr_ctrl_pars); - } else { - /* PBCCH present in cell */ - bitvec_set_bit(&bv, 1); - bitvec_set_uint(&bv, si13->pbcch.psi1_rep_per, 4); - /* PBCCH Descripiton */ - bitvec_set_uint(&bv, si13->pbcch.pb, 4); - bitvec_set_uint(&bv, si13->pbcch.tsc, 3); - bitvec_set_uint(&bv, si13->pbcch.tn, 3); - switch (si13->pbcch.carrier_type) { - case PBCCH_BCCH: - bitvec_set_bit(&bv, 0); - bitvec_set_bit(&bv, 0); - break; - case PBCCH_ARFCN: - bitvec_set_bit(&bv, 0); - bitvec_set_bit(&bv, 1); - bitvec_set_uint(&bv, si13->pbcch.arfcn, 10); - break; - case PBCCH_MAIO: - bitvec_set_bit(&bv, 1); - bitvec_set_uint(&bv, si13->pbcch.maio, 6); - break; - } - } + /* PBCCH not present in cell: + it shall never be indicated according to 3GPP TS 44.018 Table 10.5.2.37b.1 */ + bitvec_set_bit(&bv, 0); + bitvec_set_uint(&bv, si13->rac, 8); + bitvec_set_bit(&bv, si13->spgc_ccch_sup); + bitvec_set_uint(&bv, si13->prio_acc_thr, 3); + bitvec_set_uint(&bv, si13->net_ctrl_ord, 2); + append_gprs_cell_opt(&bv, &si13->cell_opts); + append_gprs_pwr_ctrl_pars(&bv, &si13->pwr_ctrl_pars); + /* 3GPP TS 44.018 Release 6 / 10.5.2.37b */ bitvec_set_bit(&bv, H); /* added Release 99 */
[PATCH] openbsc[master]: SI13: check for incorrect configuration
Review at https://gerrit.osmocom.org/3734 SI13: check for incorrect configuration According to 3GPP TS 44.018 §1.8 the "network shall never enable PBCCH and PCCCH". Change-Id: I319e71a4b0c682361529e9c21377398a826b934b Related: OS#2400 --- M openbsc/src/libbsc/rest_octets.c 1 file changed, 14 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/34/3734/1 diff --git a/openbsc/src/libbsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c index fdab70a..96c706d 100644 --- a/openbsc/src/libbsc/rest_octets.c +++ b/openbsc/src/libbsc/rest_octets.c @@ -798,6 +798,11 @@ { struct bitvec bv; + if (si13->pbcch_present) { + LOGP(DRR, LOGL_ERROR, "SI13: attempting to enable PBCCH which should never happen.\n"); + return -EINVAL; + } + memset(&bv, 0, sizeof(bv)); bv.data = data; bv.data_len = 20; @@ -816,39 +821,15 @@ bitvec_set_uint(&bv, si13->bcch_change_mark, 2); append_gprs_mobile_alloc(&bv); } - if (!si13->pbcch_present) { - /* PBCCH not present in cell */ - bitvec_set_bit(&bv, 0); - bitvec_set_uint(&bv, si13->no_pbcch.rac, 8); - bitvec_set_bit(&bv, si13->no_pbcch.spgc_ccch_sup); - bitvec_set_uint(&bv, si13->no_pbcch.prio_acc_thr, 3); - bitvec_set_uint(&bv, si13->no_pbcch.net_ctrl_ord, 2); - append_gprs_cell_opt(&bv, &si13->cell_opts); - append_gprs_pwr_ctrl_pars(&bv, &si13->pwr_ctrl_pars); - } else { - /* PBCCH present in cell */ - bitvec_set_bit(&bv, 1); - bitvec_set_uint(&bv, si13->pbcch.psi1_rep_per, 4); - /* PBCCH Descripiton */ - bitvec_set_uint(&bv, si13->pbcch.pb, 4); - bitvec_set_uint(&bv, si13->pbcch.tsc, 3); - bitvec_set_uint(&bv, si13->pbcch.tn, 3); - switch (si13->pbcch.carrier_type) { - case PBCCH_BCCH: - bitvec_set_bit(&bv, 0); - bitvec_set_bit(&bv, 0); - break; - case PBCCH_ARFCN: - bitvec_set_bit(&bv, 0); - bitvec_set_bit(&bv, 1); - bitvec_set_uint(&bv, si13->pbcch.arfcn, 10); - break; - case PBCCH_MAIO: - bitvec_set_bit(&bv, 1); - bitvec_set_uint(&bv, si13->pbcch.maio, 6); - break; - } - } + /* PBCCH not present in cell */ + bitvec_set_bit(&bv, 0); + bitvec_set_uint(&bv, si13->no_pbcch.rac, 8); + bitvec_set_bit(&bv, si13->no_pbcch.spgc_ccch_sup); + bitvec_set_uint(&bv, si13->no_pbcch.prio_acc_thr, 3); + bitvec_set_uint(&bv, si13->no_pbcch.net_ctrl_ord, 2); + append_gprs_cell_opt(&bv, &si13->cell_opts); + append_gprs_pwr_ctrl_pars(&bv, &si13->pwr_ctrl_pars); + /* 3GPP TS 44.018 Release 6 / 10.5.2.37b */ bitvec_set_bit(&bv, H); /* added Release 99 */ /* claim our SGSN is compatible with Release 99, as EDGE and EGPRS -- To view, visit https://gerrit.osmocom.org/3734 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I319e71a4b0c682361529e9c21377398a826b934b Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max
[PATCH] osmo-bts[master]: trx: avoid deactivating lchan on LCHAN_REL_ACT_REACT
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3067 to look at the new patch set (#5). trx: avoid deactivating lchan on LCHAN_REL_ACT_REACT * do not deactivate lchan when called with LCHAN_REL_ACT_REACT * add fixme comment It's unclear yet if any special steps are required for osmo-bts-trx so let's just make it compatible with setups [1] using BS_AG_BLKS_RES != 1 for now. Background: CCCH is activated very early by OsmoBTS - before we receive SI3, see 4a8582846281322e8d7dfc577b18767cf35c24d1. To accommodate for that we deactivate CCCH in common/rsl.c, which triggers BTS-model specific callback sapi_deactivate_cb() which updates parameters and activates it again. In case of osmo-bts-trx there (seems to be) no need in special interaction with hw to activate channel (no lchan_activate()) hence we can just skip entire deactivate/setup/activate again routine. [1] "channel-descrption bs-ag-blks-res N" in OpenBSC config file. Related: OS#1575 Change-Id: I20b89ba1e43d1414180b083cd1e085eeffe5d513 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/3067/5 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index c629a61..3c11dfd 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -109,6 +109,12 @@ struct phy_instance *pinst = trx_phy_instance(lchan->ts->trx); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; + if (lchan->rel_act_kind == LCHAN_REL_ACT_REACT) { + lchan->rel_act_kind = LCHAN_REL_ACT_RSL; + /* FIXME: perform whatever is needed (if any) to set proper PCH/AGCH allocation according to + 3GPP TS 44.018 Table 10.5.2.11.1 using num_agch(lchan->ts->trx, "TRX L1"); function */ + return 0; + } /* set lchan inactive */ lchan_set_state(lchan, LCHAN_S_NONE); -- To view, visit https://gerrit.osmocom.org/3067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I20b89ba1e43d1414180b083cd1e085eeffe5d513 Gerrit-PatchSet: 5 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Ivan Kluchnikov Gerrit-Reviewer: Jenkins Builder
libosmo-sccp[master]: cosmetic: aggressively set vty->index to NULL in osmo_ss7_vt...
Patch Set 1: Could you clarify why? Other cases seems to not need this. -- To view, visit https://gerrit.osmocom.org/3732 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I579482f679cd43edfbe796a5806ef360335f1c55 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
osmo-msc[master]: am: msc_vlr_tests: use AM_LDFLAGS instead of COMMON vars
Patch Set 2: > since when does gerrit rebuild issues when a commit message was modified? Since the very beginning :) - I don't recall it behaving differently. -- To view, visit https://gerrit.osmocom.org/3720 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6efae6e192b22de2c1d706edd55385135142532b Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-msc[master]: am: msc_vlr_tests: use AM_LDFLAGS instead of COMMON vars
Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3720 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6efae6e192b22de2c1d706edd55385135142532b Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No