Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] - [ 228s] -[+] Testing: gsm0503_mcs9 [ 228s] -[.] Input length : ret = 606 exp = 606 -> OK [ 228s] -[.] Output length : ret = 1836 exp = 1836 -> OK [ 228s] -[.] Random vector checks: [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] - [ 228s] ./testsuite.at:57: exit code was 132, expected 0 [ 228s] 9. testsuite.at:54: 9. conv_gsm0503 (testsuite.at:54): FAILED (testsuite.at:57) [ 228s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 228s] make[1]: *** [override_dh_auto_test] Error 1 [ 228s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 228s] debian/rules:15: recipe for target 'build' failed [ 228s] make: *** [build] Error 2 [ 228s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 228s] [ 228s] build32 failed "build libosmocore_0.9.6.20170807.dsc" at Mon Aug 7 19:53:49 UTC 2017. [ 228s] [ 228s] ### VM INTERACTION START ### [ 231s] [ 212.937616] reboot: Power down [ 233s] ### VM INTERACTION END ### [ 233s] [ 233s] build32 failed "build libosmocore_0.9.6.20170807.dsc" at Mon Aug 7 19:53:55 UTC 2017. [ 233s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] - [ 228s] -[+] Testing: gsm0503_mcs9 [ 228s] -[.] Input length : ret = 606 exp = 606 -> OK [ 228s] -[.] Output length : ret = 1836 exp = 1836 -> OK [ 228s] -[.] Random vector checks: [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] -[..] Encoding / Decoding cycle : OK [ 228s] - [ 228s] ./testsuite.at:57: exit code was 132, expected 0 [ 228s] 9. testsuite.at:54: 9. conv_gsm0503 (testsuite.at:54): FAILED (testsuite.at:57) [ 228s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 228s] make[1]: *** [override_dh_auto_test] Error 1 [ 228s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 228s] debian/rules:15: recipe for target 'build' failed [ 228s] make: *** [build] Error 2 [ 228s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 228s] [ 228s] build32 failed "build libosmocore_0.9.6.20170807.dsc" at Mon Aug 7 19:53:49 UTC 2017. [ 228s] [ 228s] ### VM INTERACTION START ### [ 231s] [ 212.937616] reboot: Power down [ 233s] ### VM INTERACTION END ### [ 233s] [ 233s] build32 failed "build libosmocore_0.9.6.20170807.dsc" at Mon Aug 7 19:53:55 UTC 2017. [ 233s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[PATCH] osmo-iuh[master]: make point codes configurable by SCCP address book
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3394 to look at the new patch set (#2). make point codes configurable by SCCP address book In the vty config, use the SCCP address book to configure the local and remote SCCP addresses. Add VTY commands to set the remote SCCP addresses by name, derive the ss7 instance from these addresses: cs7 instance 1 point-code 0.23.0 sccp-address msc point-code 0.0.1 sccp-address sgsn point-code 0.0.2 hnbgw iucs remote-addr msc iups remote-addr sgsn Enforce that both IuCS and IuPS use the same ss7 instance. In the future, we may add the feature to use two separate instances. Depends: libosmo-sccp I75c67d289693f1c2a049ac61cf2b2097d6e5687d, Ie1aedd7894acd69ddc887cd65a8a0df4b38c, I85b46269dbe7909e52873ace3f720f6292a4516c Change-Id: I33a7ba11eb7c2d9a5dc74d10fb0cf04bf664477b --- M include/osmocom/iuh/hnbgw.h M include/osmocom/iuh/hnbgw_cn.h M src/hnbgw.c M src/hnbgw_cn.c M src/hnbgw_rua.c M src/hnbgw_vty.c 6 files changed, 120 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/94/3394/2 diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h index db22d97..58bdab4 100644 --- a/include/osmocom/iuh/hnbgw.h +++ b/include/osmocom/iuh/hnbgw.h @@ -116,10 +116,8 @@ /*! The UDP port where we receive multiplexed CS user * plane traffic from HNBs */ uint16_t iuh_cs_mux_port; - const char *iucs_remote_ip; - uint16_t iucs_remote_port; - const char *iups_remote_ip; - uint16_t iups_remote_port; + const char *iucs_remote_addr_name; + const char *iups_remote_addr_name; uint16_t rnc_id; bool hnbap_allow_tmsi; } config; @@ -134,11 +132,11 @@ /* currently active CN links for CS and PS */ struct { - struct osmo_sccp_instance *instance; + struct osmo_sccp_instance *client; struct hnbgw_cnlink *cnlink; struct osmo_sccp_addr local_addr; - struct osmo_sccp_addr remote_addr_cs; - struct osmo_sccp_addr remote_addr_ps; + struct osmo_sccp_addr iucs_remote_addr; + struct osmo_sccp_addr iups_remote_addr; } sccp; }; diff --git a/include/osmocom/iuh/hnbgw_cn.h b/include/osmocom/iuh/hnbgw_cn.h index 93123f2..2e61d82 100644 --- a/include/osmocom/iuh/hnbgw_cn.h +++ b/include/osmocom/iuh/hnbgw_cn.h @@ -2,5 +2,4 @@ #include -int hnbgw_cnlink_init(struct hnb_gw *gw, const char *stp_host, uint16_t stp_port, - const char *local_ip, uint32_t local_pc); +int hnbgw_cnlink_init(struct hnb_gw *gw, const char *stp_host, uint16_t stp_port, const char *local_ip); diff --git a/src/hnbgw.c b/src/hnbgw.c index 5d9f87b..409110f 100644 --- a/src/hnbgw.c +++ b/src/hnbgw.c @@ -79,14 +79,6 @@ gw->config.iuh_local_ip = talloc_strdup(gw, HNBGW_LOCAL_IP_DEFAULT); gw->config.iuh_local_port = IUH_DEFAULT_SCTP_PORT; - gw->config.iucs_remote_ip = talloc_strdup(gw, - HNBGW_IUCS_REMOTE_IP_DEFAULT); - gw->config.iucs_remote_port = M3UA_PORT; - - gw->config.iups_remote_ip = talloc_strdup(gw, - HNBGW_IUPS_REMOTE_IP_DEFAULT); - gw->config.iups_remote_port = M3UA_PORT; - gw->next_ue_ctx_id = 23; INIT_LLIST_HEAD(>hnb_list); INIT_LLIST_HEAD(>ue_list); @@ -465,6 +457,7 @@ vty_info.copyright = osmo_hnbgw_copyright; vty_init(_info); + osmo_ss7_vty_init_asp(); hnbgw_vty_init(g_hnb_gw, tall_hnb_ctx); logging_vty_add_cmds(_log_info); @@ -501,23 +494,12 @@ ranap_set_log_area(DRANAP); - OSMO_ASSERT(g_hnb_gw->config.iucs_remote_ip); rc = hnbgw_cnlink_init(g_hnb_gw, - g_hnb_gw->config.iucs_remote_ip, - g_hnb_gw->config.iucs_remote_port, - "127.0.0.5" /* FIXME: configurable */, - 23 /* FIXME: configurable */); + "127.0.0.1", M3UA_PORT, "127.0.0.5" /* FIXME: configurable */); if (rc < 0) { LOGP(DMAIN, LOGL_ERROR, "Failed to initialize SCCP link to CN\n"); exit(1); } - - osmo_sccp_make_addr_pc_ssn(_hnb_gw->sccp.remote_addr_cs, - 1 /* FIXME: configurable */, - OSMO_SCCP_SSN_RANAP); - osmo_sccp_make_addr_pc_ssn(_hnb_gw->sccp.remote_addr_ps, - 2 /* FIXME: configurable */, - OSMO_SCCP_SSN_RANAP); OSMO_ASSERT(g_hnb_gw->config.iuh_local_ip); LOGP(DMAIN,
[PATCH] osmo-msc[master]: vlr: LU FSM: enable Retrieve_IMEISV_If_Required
Review at https://gerrit.osmocom.org/3417 vlr: LU FSM: enable Retrieve_IMEISV_If_Required Change-Id: I121b95ad6d5ecb7603815eece2b43008de487a8a --- M include/openbsc/vlr.h M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_lu_fsm.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.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 14 files changed, 123 insertions(+), 111 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/3417/1 diff --git a/include/openbsc/vlr.h b/include/openbsc/vlr.h index 17cb2ae..09e2ff4 100644 --- a/include/openbsc/vlr.h +++ b/include/openbsc/vlr.h @@ -211,7 +211,8 @@ struct gsup_client *gsup_client; struct vlr_ops ops; struct { - bool retrieve_imeisv; + bool retrieve_imeisv_early; + bool retrieve_imeisv_ciphered; bool assign_tmsi; bool check_imei_rqd; int auth_tuple_max_use_count; diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 15f84b7..67fba56 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -286,7 +286,7 @@ if (vlr_set_ciph_mode(vsub->vlr, fi, par->msc_conn_ref, par->ciphering_required, - vsub->vlr->cfg.retrieve_imeisv)) { + vsub->vlr->cfg.retrieve_imeisv_ciphered)) { LOGPFSML(fi, LOGL_ERROR, "Failed to send Ciphering Mode Command\n"); proc_arq_fsm_done(fi, VLR_PR_ARQ_RES_SYSTEM_FAILURE); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index f9ccbdf..ae671c1 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -814,7 +814,7 @@ if (vlr_set_ciph_mode(vsub->vlr, fi, lfp->msc_conn_ref, lfp->ciphering_required, - vsub->vlr->cfg.retrieve_imeisv)) { + vsub->vlr->cfg.retrieve_imeisv_ciphered)) { LOGPFSML(fi, LOGL_ERROR, "Failed to send Ciphering Mode Command\n"); vlr_lu_compl_fsm_failure(fi, GSM48_REJECT_NETWORK_FAILURE); @@ -896,13 +896,62 @@ return buf; } +static int _lu_fsm_associate_vsub(struct osmo_fsm_inst *fi) +{ + struct lu_fsm_priv *lfp = fi->priv; + struct vlr_instance *vlr = lfp->vlr; + struct vlr_subscr *vsub = NULL; + + if (!lfp->imsi[0]) { + /* TMSI was used */ + lfp->lu_by_tmsi = true; + /* TMSI clash: if a different subscriber already has this TMSI, +* we will find that other subscriber in the VLR. So the IMSIs +* would mismatch, but we don't know about it. Theoretically, +* an authentication process would thwart any attempt to use +* someone else's TMSI. +* TODO: Otherwise we can ask for the IMSI and verify that it +* matches the IMSI on record. */ + vsub = vlr_subscr_find_or_create_by_tmsi(vlr, lfp->tmsi, NULL); + + if (!vsub) { + LOGPFSML(fi, LOGL_ERROR, "VLR subscriber allocation failed\n"); + lu_fsm_failure(fi, GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER); + return -1; + } + + vsub->sub_dataconf_by_hlr_ind = false; + if (assoc_lfp_with_sub(fi, vsub)) { + vlr_subscr_put(vsub); + return -1; /* error, fsm failure invoked in assoc_lfp_with_sub() */ + } + vlr_subscr_put(vsub); + } else { + /* IMSI was used */ + vsub = vlr_subscr_find_or_create_by_imsi(vlr, lfp->imsi, NULL); + + if (!vsub) { + LOGPFSML(fi, LOGL_ERROR, "VLR subscriber allocation failed\n"); + lu_fsm_failure(fi, GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER); + vlr_subscr_put(vsub); + return -1; + } + + vsub->sub_dataconf_by_hlr_ind = false; + if (assoc_lfp_with_sub(fi, vsub)) { + vlr_subscr_put(vsub); + return -1; /* error, fsm failure invoked in assoc_lfp_with_sub() */ + } + vlr_subscr_put(vsub); + } + return 0; +} + /* 4.1.2.1: Subscriber (via MSC/SGSN) requests location update */ static void _start_lu_main(struct osmo_fsm_inst *fi) { struct lu_fsm_priv *lfp =
[PATCH] osmo-msc[master]: vlr: place comments on if (0) cases
Review at https://gerrit.osmocom.org/3416 vlr: place comments on if (0) cases Change-Id: I56c1e61dedeac01a4e24452feee6616782783d8f --- M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_lu_fsm.c 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/16/3416/1 diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 279e3d4..15f84b7 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -172,6 +172,7 @@ LOGPFSM(fi, "%s()\n", __func__); + /* See 3GPP TS 29.002 Proc_Acc_Req_VLR3. */ /* TODO: Identity := IMSI */ if (0 /* TODO: TMSI reallocation at access: vlr->cfg.alloc_tmsi_arq */) { vlr_subscr_alloc_tmsi(vsub); @@ -194,6 +195,7 @@ LOGPFSM(fi, "%s()\n", __func__); /* Node 3 */ + /* See 3GPP TS 29.002 Proc_Acc_Req_VLR3. */ if (0 /* IMEI check required */) { /* Chck_IMEI_VLR */ vlr->ops.tx_id_req(par->msc_conn_ref, GSM_MI_TYPE_IMEI); @@ -207,6 +209,7 @@ static void _proc_arq_vlr_post_pres(struct osmo_fsm_inst *fi) { LOGPFSM(fi, "%s()\n", __func__); + /* See 3GPP TS 29.002 Proc_Acc_Req_VLR3. */ if (0 /* TODO: tracing required */) { /* TODO: Trace_Subscriber_Activity_VLR */ osmo_fsm_inst_state_chg(fi, PR_ARQ_S_WAIT_TRACE_SUB, 0, 0); @@ -227,6 +230,7 @@ proc_arq_fsm_done(fi, VLR_PR_ARQ_RES_UNIDENT_SUBSCR); return; } + /* We don't feature location area specific blocking (yet). */ if (0 /* roaming not allowed in LA */) { /* Set User Error: Roaming not allowed in this LA */ proc_arq_fsm_done(fi, VLR_PR_ARQ_RES_ROAMING_NOTALLOWED); diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index d32659f..f9ccbdf 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -760,7 +760,9 @@ { LOGPFSM(fi, "%s()\n", __func__); - /* FIXME */ + /* OsmoHLR does not support PgA, neither stores the IMEISV, so we have no need to update the HLR +* with either. TODO: depend on actual HLR configuration. See 3GPP TS 23.012 Release 14, process +* Update_Location_Area_VLR (ULA_VLR2). */ if (0) { /* IMEISV or PgA to send */ vlr_loc_upd_node_4(fi); } else { @@ -1149,6 +1151,7 @@ /* unsuccessful case */ enum gsm48_gmm_cause cause = *(enum gsm48_gmm_cause *)data; + /* Ignoring standalone mode for now. */ if (0 /* procedure_error && vlr->cfg.standalone_mode */) { osmo_fsm_inst_state_chg(fi, VLR_ULA_S_WAIT_LU_COMPL_STANDALONE, -- To view, visit https://gerrit.osmocom.org/3416 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56c1e61dedeac01a4e24452feee6616782783d8f Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[PATCH] osmo-msc[master]: examples/sgsn: Use osmo-hlr with auth-policy remote by default
Review at https://gerrit.osmocom.org/3421 examples/sgsn: Use osmo-hlr with auth-policy remote by default Change-Id: Ie3b2013198d3e2b780a4e31c36b89b58129dcacd --- M doc/examples/osmo-sgsn/osmo-sgsn.cfg 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/3421/1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg index 530fb8c..01be513 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg @@ -9,6 +9,9 @@ gtp local-ip 10.23.24.1 ggsn 0 remote-ip 10.23.24.2 ggsn 0 gtp-version 1 + auth-policy remote + gsup remote-ip 127.0.0.1 + gsup remote-port ! ns timer tns-block 3 -- To view, visit https://gerrit.osmocom.org/3421 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3b2013198d3e2b780a4e31c36b89b58129dcacd Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: daniel
[PATCH] osmo-msc[master]: contrib: Add osmo-msc service file
Review at https://gerrit.osmocom.org/3418 contrib: Add osmo-msc service file Change-Id: Ifdaf4107167c84af8a616f4ee792d5a34495564b --- A contrib/systemd/osmo-msc.service 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/18/3418/1 diff --git a/contrib/systemd/osmo-msc.service b/contrib/systemd/osmo-msc.service new file mode 100644 index 000..2c81eba --- /dev/null +++ b/contrib/systemd/osmo-msc.service @@ -0,0 +1,13 @@ +[Unit] +Description=Osmocom Mobile Switching Center (MSC) +Wants=osmo-hlr +After=osmo-hlr + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/3418 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifdaf4107167c84af8a616f4ee792d5a34495564b Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: daniel
[PATCH] osmo-msc[master]: examples: Change IP address of config files
Review at https://gerrit.osmocom.org/3419 examples: Change IP address of config files This helps in providing 3G software packages for the sysmoNITB hardware. Change-Id: Ie3a25f6771ed6e620cb2b315638c622a9a24e530 --- M doc/examples/osmo-bsc_mgcp/mgcp.cfg M doc/examples/osmo-msc/osmo-msc.cfg M doc/examples/osmo-sgsn/osmo-sgsn.cfg 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/19/3419/1 diff --git a/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/doc/examples/osmo-bsc_mgcp/mgcp.cfg index 2622d23..3c43f1f 100644 --- a/doc/examples/osmo-bsc_mgcp/mgcp.cfg +++ b/doc/examples/osmo-bsc_mgcp/mgcp.cfg @@ -7,9 +7,9 @@ no login ! mgcp - !local ip 192.168.0.132 - !bts ip 192.168.0.124 - !bind ip 192.168.0.132 + !local ip 10.23.24.2 + !bts ip 10.24.24.1 + !bind ip 10.23.24.1 bind port 2427 rtp base 4000 rtp force-ptime 20 diff --git a/doc/examples/osmo-msc/osmo-msc.cfg b/doc/examples/osmo-msc/osmo-msc.cfg index 6cb9e4e..1b1d192 100644 --- a/doc/examples/osmo-msc/osmo-msc.cfg +++ b/doc/examples/osmo-msc/osmo-msc.cfg @@ -15,5 +15,5 @@ rrlp mode none mm info 1 msc - mgcpgw remote-ip 192.168.0.132 + mgcpgw remote-ip 10.23.24.1 assign-tmsi diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg index 4955983..530fb8c 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg @@ -6,8 +6,8 @@ no login ! sgsn - gtp local-ip 127.0.0.1 - ggsn 0 remote-ip 127.0.0.1 + gtp local-ip 10.23.24.1 + ggsn 0 remote-ip 10.23.24.2 ggsn 0 gtp-version 1 ! ns @@ -18,7 +18,7 @@ timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 + encapsulation udp local-ip 10.23.24.1 encapsulation udp local-port 23000 encapsulation framerelay-gre enabled 0 ! -- To view, visit https://gerrit.osmocom.org/3419 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3a25f6771ed6e620cb2b315638c622a9a24e530 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: daniel
[PATCH] osmo-msc[master]: contrib: Change systemd requirements so the services connect...
Review at https://gerrit.osmocom.org/3420 contrib: Change systemd requirements so the services connect properly Change-Id: Ib1b3c640ddd81927a60ee307c4b0cb90fd83eebe --- M contrib/systemd/osmo-msc.service M contrib/systemd/osmo-sgsn.service 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/3420/1 diff --git a/contrib/systemd/osmo-msc.service b/contrib/systemd/osmo-msc.service index 2c81eba..7cebb14 100644 --- a/contrib/systemd/osmo-msc.service +++ b/contrib/systemd/osmo-msc.service @@ -1,7 +1,8 @@ [Unit] Description=Osmocom Mobile Switching Center (MSC) -Wants=osmo-hlr -After=osmo-hlr +Wants=osmo-hlr.service +After=osmo-hlr.service +After=osmo-hnbgw.service [Service] Type=simple diff --git a/contrib/systemd/osmo-sgsn.service b/contrib/systemd/osmo-sgsn.service index 674d786..bf6a8e0 100644 --- a/contrib/systemd/osmo-sgsn.service +++ b/contrib/systemd/osmo-sgsn.service @@ -1,5 +1,8 @@ [Unit] Description=OpenBSC SGSN +Wants=osmo-hlr.service +After=osmo-hlr.service +After=osmo-hnbgw.service [Service] Type=simple -- To view, visit https://gerrit.osmocom.org/3420 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1b3c640ddd81927a60ee307c4b0cb90fd83eebe Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: daniel
[PATCH] osmo-msc[master]: Implement IuCS (large refactoring and addition)
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3347 to look at the new patch set (#5). Implement IuCS (large refactoring and addition) osmo-nitb becomes osmo-msc add DIUCS debug log constant add iucs.[hc] add msc vty, remove nitb vty add libiudummy, to avoid linking Iu deps in tests Use new msc_tx_dtap() instead of gsm0808_submit_dtap() libmgcp: add mgcpgw client API bridge calls via mgcpgw Enable MSC specific CTRL commands, bsc_base_ctrl_cmds_install() still needs to be split up. Change-Id: I5b5b6a9678b458affa86800afb1ec726e66eed88 --- M .gitignore M configure.ac M doc/examples/osmo-bsc_mgcp/mgcp.cfg A doc/examples/osmo-msc/osmo-msc.cfg D doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg D doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg D doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg D doc/examples/osmo-nitb/bs11/openbsc.cfg D doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg D doc/examples/osmo-nitb/nanobts/openbsc.cfg D doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg D doc/examples/osmo-nitb/rbs2308/openbsc.cfg D doc/examples/osmo-nitb/sysmobts/openbsc.cfg M include/openbsc/Makefile.am A include/openbsc/common.h M include/openbsc/debug.h M include/openbsc/gprs_gmm.h M include/openbsc/gsm_data.h M include/openbsc/gsm_subscriber.h M include/openbsc/iu.h A include/openbsc/iucs.h A include/openbsc/iucs_ranap.h M include/openbsc/mgcp.h M include/openbsc/mgcp_internal.h A include/openbsc/mgcpgw_client.h M include/openbsc/msc_ifaces.h M include/openbsc/osmo_msc.h M include/openbsc/sgsn.h M include/openbsc/transaction.h M include/openbsc/vlr.h M include/openbsc/vty.h M osmoappdesc.py M src/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 M src/libbsc/bsc_init.c M src/libbsc/paging.c M src/libcommon/debug.c M src/libcommon/gsm_data.c M src/libiu/iu.c M src/libiu/iu_vty.c M src/libmgcp/Makefile.am A src/libmgcp/mgcp_common.c M src/libmgcp/mgcp_network.c M src/libmgcp/mgcp_protocol.c A src/libmgcp/mgcpgw_client.c A src/libmgcp/mgcpgw_client_vty.c M src/libmsc/Makefile.am M src/libmsc/a_iface.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_80.c M src/libmsc/gsm_subscriber.c A src/libmsc/iu_dummy.c A src/libmsc/iucs.c A src/libmsc/iucs_ranap.c M src/libmsc/msc_ifaces.c A src/libmsc/msc_vty.c M src/libmsc/osmo_msc.c M src/libmsc/silent_call.c M src/libmsc/subscr_conn.c M src/libmsc/transaction.c M src/libmsc/vty_interface_layer3.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_lu_fsm.c M src/osmo-bsc/osmo_bsc_api.c R src/osmo-msc/Makefile.am A src/osmo-msc/msc_main.c D src/osmo-nitb/bsc_hack.c M tests/ctrl_test_runner.py M tests/db/Makefile.am M tests/db/db_test.c M tests/mgcp/Makefile.am A tests/mgcp/mgcpgw_client_test.c A tests/mgcp/mgcpgw_client_test.err A tests/mgcp/mgcpgw_client_test.ok M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err 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.err 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 M tests/smpp_test_runner.py M tests/sms_queue/Makefile.am M tests/testsuite.at M tests/vty_test_runner.py 98 files changed, 5,032 insertions(+), 3,347 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/47/3347/5 -- To view, visit https://gerrit.osmocom.org/3347 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5b5b6a9678b458affa86800afb1ec726e66eed88 Gerrit-PatchSet: 5 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder
[PATCH] libosmo-sccp[master]: introduce OSMO_SCCP_RI_NONE to indicate unset RI
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3362 to look at the new patch set (#2). introduce OSMO_SCCP_RI_NONE to indicate unset RI Allows to automatically set an RI in future change I75c67d289693f1c2a049ac61cf2b2097d6e5687d "sccp-addr vty: set RI to SSN_PC when setting a point-code" Change-Id: I6e2f31b023b08cba2f2ee8234e6108efcaca41c0 --- M include/osmocom/sigtran/sccp_sap.h M src/osmo_ss7_vty.c 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/62/3362/2 diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index 732df2a..ff4c674 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -54,6 +54,7 @@ /* Q.713 3.4.1 + RFC 3868 3.10.2.3 */ enum osmo_sccp_routing_ind { + OSMO_SCCP_RI_NONE, OSMO_SCCP_RI_GT, OSMO_SCCP_RI_SSN_PC, OSMO_SCCP_RI_SSN_IP, diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index fab27b4..f60eef4 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1049,6 +1049,11 @@ case OSMO_SCCP_RI_SSN_IP: vty_out(vty, " routing-indicator IP%s", VTY_NEWLINE); break; + case OSMO_SCCP_RI_NONE: + break; + default: + vty_out(vty, " ! invalid routing-indicator value: %u%s", entry->addr.ri, VTY_NEWLINE); + break; } if (entry->addr.presence & OSMO_SCCP_ADDR_T_PC) vty_out(vty, " point-code %s%s", -- To view, visit https://gerrit.osmocom.org/3362 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6e2f31b023b08cba2f2ee8234e6108efcaca41c0 Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder
[MERGED] osmo-gsm-tester[master]: aoip: add newly needed osmo-msc point-code config
Neels Hofmeyr has submitted this change and it was merged. Change subject: aoip: add newly needed osmo-msc point-code config .. aoip: add newly needed osmo-msc point-code config OsmoMSC no longer has a hard-coded point-code of 0.0.1. Configure it. Change-Id: I54be984415445e695c583f35c419aed559ac5c84 --- M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 89982e0..314450b 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -16,9 +16,13 @@ auth policy ${msc.net.auth_policy} location updating reject cause 13 encryption ${msc.net.encryption} +cs7 instance 0 + point-code 0.0.1 msc mgcpgw remote-ip ${mgcpgw.ip_address.addr} assign-tmsi + cs7-instance-iu 0 + cs7-instance-a 0 ctrl bind ${msc.ip_address.addr} smpp -- To view, visit https://gerrit.osmocom.org/3414 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54be984415445e695c583f35c419aed559ac5c84 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] osmo-gsm-tester[master]: cosmetic: osmo-msc.cfg.tmpl: fix indent
Neels Hofmeyr has submitted this change and it was merged. Change subject: cosmetic: osmo-msc.cfg.tmpl: fix indent .. cosmetic: osmo-msc.cfg.tmpl: fix indent Change-Id: Iefc3b06338cff4f5e51b7b03d9a5f92de18ca86a --- M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 314450b..1abaf20 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -19,8 +19,8 @@ cs7 instance 0 point-code 0.0.1 msc - mgcpgw remote-ip ${mgcpgw.ip_address.addr} - assign-tmsi + mgcpgw remote-ip ${mgcpgw.ip_address.addr} + assign-tmsi cs7-instance-iu 0 cs7-instance-a 0 ctrl -- To view, visit https://gerrit.osmocom.org/3415 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefc3b06338cff4f5e51b7b03d9a5f92de18ca86a Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
osmo-gsm-tester[master]: aoip: add newly needed osmo-msc point-code config
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3414 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I54be984415445e695c583f35c419aed559ac5c84 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-gsm-tester[master]: cosmetic: osmo-msc.cfg.tmpl: fix indent
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3415 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iefc3b06338cff4f5e51b7b03d9a5f92de18ca86a Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] osmo-iuh[master]: move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client
Neels Hofmeyr has submitted this change and it was merged. Change subject: move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client .. move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client To help split openbsc.git to separate MSC and SGSN repositories, place the common Iu interface related code here in libosmo-ranap. Also apply various improvements while moving (from intermittent code review). The code depends on libosmo-ranap tightly. One reason to want this separate from libosmo-ranap could be that it uses libosmo-sigtran, accepting an sccp instance. However, including in libosmo-ranap is the simplest way to go. The osmo-iuh build depends on libosmo-sigtran anyway because of OsmoHNBGW, and all current users of libosmo-ranap also naturally link libosmo-sigtran already. Apply prefix ranap_iu_ and RANAP_IU_ to allow smooth transition from the openbsc.git iu_ to the libranap ranap_iu_ implementations. Prune unneeded #include statements. Instead of sccp_addr, store an rnc pointer in the ue_conn_ctx. To facilitate, also: - Move iu_rnc struct to iu_client.h (as ranap_iu_rnc). - Instead of sccp_addr, pass rnc to ue_conn_ctx_alloc(). - Pass a local struct new_ue_conn_ctx containing the sccp_addr and conn_id up the RANAP handling stack in case of an InitialUE message. - Separate the InitialUE message handling from cn_ranap_handle_co(), by moving to new and separate cn_ranap_handle_co_initial(), so we can still pass a looked-up ue_conn_ctx to all other cn_ranap_handle_co() code paths. - Allocate the ue_conn_ctx only in ranap_handle_co_initial_ue(), not as early as before. Note that we are not actually ever using the rnc pointer now present in ue_conn_ctx. It could be used for more concise paging, to first page only the RNC where we last saw the subscriber. So far we page all matching LAC/RACs. Tweak error logging: use __func__ instead of writing the function names as string constants. In iu_client_vty.c: - Move the asn.1 debug commands from logging over to the iu node. They are not specific to the logging target. They could qualify for an entirely separate 'asn1' root node, but for simplicity place under 'iu'. - Add the 'asn1' commands to ranap_iu_vty_config_write(), so far missing. - remove the legacy "net." from a VTY error message, it is not known which name the parent node of 'iu' has. Depends: libosmo-sccp I85b46269dbe7909e52873ace3f720f6292a4516c, libosmo-sccp Ie1aedd7894acd69ddc887cd65a8a0df4b38c Change-Id: I6a3f7ad15be03fb94689b4af6ccfa828c25f45c0 --- M include/osmocom/ranap/Makefile.am A include/osmocom/ranap/iu_client.h M src/Makefile.am A src/iu_client.c A src/iu_client_vty.c 5 files changed, 999 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am index 0f83e03..1606928 100644 --- a/include/osmocom/ranap/Makefile.am +++ b/include/osmocom/ranap/Makefile.am @@ -12,6 +12,7 @@ ranap_common_cn.h \ ranap_msg_factory.h \ iu_helpers.h \ + iu_client.h \ RANAP_AccuracyFulfilmentIndicator.h \ RANAP_AllocationOrRetentionPriority.h \ RANAP_AlternativeRABConfigurationRequest.h \ diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h new file mode 100644 index 000..873b2d2 --- /dev/null +++ b/include/osmocom/ranap/iu_client.h @@ -0,0 +1,74 @@ +#pragma once + +#include + +#include +#include +#include + +struct msgb; +struct osmo_auth_vector; + +struct RANAP_RAB_SetupOrModifiedItemIEs_s; +struct RANAP_Cause; + +struct ranap_iu_rnc; + +/* Debugging switches from asn1c and osmo-iuh */ +extern int asn_debug; +extern int asn1_xer_print; + +enum ranap_nsap_addr_enc { + RANAP_NSAP_ADDR_ENC_X213, + RANAP_NSAP_ADDR_ENC_V4RAW, +}; + +struct ranap_ue_conn_ctx { + struct llist_head list; + struct ranap_iu_rnc *rnc; + uint32_t conn_id; + int integrity_active; + struct gprs_ra_id ra_id; + enum ranap_nsap_addr_enc rab_assign_addr_enc; +}; + +enum ranap_iu_event_type { + RANAP_IU_EVENT_RAB_ASSIGN, + RANAP_IU_EVENT_SECURITY_MODE_COMPLETE, + RANAP_IU_EVENT_IU_RELEASE, /* An actual Iu Release message was received */ + RANAP_IU_EVENT_LINK_INVALIDATED, /* A SUA link was lost or closed down */ +}; + +extern const struct value_string ranap_iu_event_type_names[]; +static inline const char *ranap_iu_event_type_str(enum ranap_iu_event_type e) +{ + return get_value_string(ranap_iu_event_type_names, e); +} + +/* Implementations of iu_recv_cb_t shall find the ranap_ue_conn_ctx in msg->dst. */ +typedef int (* ranap_iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id, + uint16_t *sai); + +typedef int (* ranap_iu_event_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, +
[MERGED] osmo-iuh[master]: ranap_common.h: fix include of asn1c/asn_application.h
Neels Hofmeyr has submitted this change and it was merged. Change subject: ranap_common.h: fix include of asn1c/asn_application.h .. ranap_common.h: fix include of asn1c/asn_application.h Change-Id: I152377813cdcfef73e2c4309b0f8c97807d7d4f8 --- M include/osmocom/ranap/ranap_common.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/ranap/ranap_common.h b/include/osmocom/ranap/ranap_common.h index 66b8c3e..8899bd5 100644 --- a/include/osmocom/ranap/ranap_common.h +++ b/include/osmocom/ranap/ranap_common.h @@ -1,6 +1,6 @@ #pragma once -#include +#include /* for f in ranap/RANAP_*.h; printf "#include \"$f\"\n" */ #include -- To view, visit https://gerrit.osmocom.org/3352 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I152377813cdcfef73e2c4309b0f8c97807d7d4f8 Gerrit-PatchSet: 2 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[PATCH] osmo-gsm-tester[master]: aoip: add newly needed osmo-msc point-code config
Review at https://gerrit.osmocom.org/3414 aoip: add newly needed osmo-msc point-code config OsmoMSC no longer has a hard-coded point-code of 0.0.1. Configure it. Change-Id: I54be984415445e695c583f35c419aed559ac5c84 --- M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/14/3414/1 diff --git a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl index 89982e0..314450b 100644 --- a/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl @@ -16,9 +16,13 @@ auth policy ${msc.net.auth_policy} location updating reject cause 13 encryption ${msc.net.encryption} +cs7 instance 0 + point-code 0.0.1 msc mgcpgw remote-ip ${mgcpgw.ip_address.addr} assign-tmsi + cs7-instance-iu 0 + cs7-instance-a 0 ctrl bind ${msc.ip_address.addr} smpp -- To view, visit https://gerrit.osmocom.org/3414 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54be984415445e695c583f35c419aed559ac5c84 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[MERGED] osmo-gsm-tester[master]: osmo-bsc.cfg.tmpl: add point code addresses
Neels Hofmeyr has submitted this change and it was merged. Change subject: osmo-bsc.cfg.tmpl: add point code addresses .. osmo-bsc.cfg.tmpl: add point code addresses osmo-bsc requires atm to have point code addresses given for msc + bsc Change-Id: I94f8a6892ad7e10001322cbc5a46687c0d532cb2 --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 514514f..0e2f759 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -13,6 +13,14 @@ e1_input e1_line 0 driver ipa ipa bind ${bsc.ip_address.addr} +cs7 instance 1 + point-code 0.0.2 + sccp-address bsc_local + point-code 0.0.2 + routing-indicator PC + sccp-address msc_remote + point-code 0.0.1 + routing-indicator PC network network country code ${bsc.net.mcc} mobile network code ${bsc.net.mnc} @@ -79,3 +87,5 @@ amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden + msc-addr msc_remote + bsc-addr bsc_local -- To view, visit https://gerrit.osmocom.org/3413 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I94f8a6892ad7e10001322cbc5a46687c0d532cb2 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus
osmo-gsm-tester[master]: osmo-bsc.cfg.tmpl: add point code addresses
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3413 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I94f8a6892ad7e10001322cbc5a46687c0d532cb2 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
[PATCH] osmo-gsm-tester[master]: osmo-bsc.cfg.tmpl: add point code addresses
Review at https://gerrit.osmocom.org/3413 osmo-bsc.cfg.tmpl: add point code addresses osmo-bsc requires atm to have point code addresses given for msc + bsc Change-Id: I94f8a6892ad7e10001322cbc5a46687c0d532cb2 --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/13/3413/1 diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 514514f..0e2f759 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -13,6 +13,14 @@ e1_input e1_line 0 driver ipa ipa bind ${bsc.ip_address.addr} +cs7 instance 1 + point-code 0.0.2 + sccp-address bsc_local + point-code 0.0.2 + routing-indicator PC + sccp-address msc_remote + point-code 0.0.1 + routing-indicator PC network network country code ${bsc.net.mcc} mobile network code ${bsc.net.mnc} @@ -79,3 +87,5 @@ amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden + msc-addr msc_remote + bsc-addr bsc_local -- To view, visit https://gerrit.osmocom.org/3413 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94f8a6892ad7e10001322cbc5a46687c0d532cb2 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: lynxis lazus
[PATCH] osmo-bts[master]: lc15bts-mgr.service: Prepare dirs and sysctls for the process
Review at https://gerrit.osmocom.org/3412 lc15bts-mgr.service: Prepare dirs and sysctls for the process Change-Id: I0a0a10ca9498318c48c81fa94faceb2ad4ac1de6 --- M contrib/lc15bts-mgr.service 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/12/3412/1 diff --git a/contrib/lc15bts-mgr.service b/contrib/lc15bts-mgr.service index 5790abe..bf788e6 100644 --- a/contrib/lc15bts-mgr.service +++ b/contrib/lc15bts-mgr.service @@ -1,12 +1,29 @@ [Unit] Description=osmo-bts manager for LC15 / sysmoBTS 2100 +After=lc15-sysdev-remap.service +Wants=lc15-sysdev-remap.service [Service] Type=simple -ExecStart=/usr/bin/lc15bts-mgr -s -c /etc/osmocom/lc15bts-mgr.cfg +NotifyAccess=all +WatchdogSec=21780s Restart=always RestartSec=2 +# Make sure directories and symbolic link exist +ExecStartPre=/bin/sh -c 'test -d /mnt/storage/var/run/lc15bts-mgr || mkdir -p /mnt/storage/var/run/lc15bts-mgr ; test -d /var/run/lc15bts-mgr || ln -sf /mnt/storage/var/run/lc15bts-mgr/ /var/run' +# Make sure BTS operation hour exist +ExecStartPre=/bin/sh -c 'test -f /mnt/storage/var/run/lc15bts-mgr/hours-running || echo 0 > /mnt/storage/var/run/lc15bts-mgr/hours-running' +# Shutdown all PA correctly +ExecStartPre=/bin/sh -c 'echo disabled > /var/lc15/pa-state/pa0/state; echo disabled > /var/lc15/pa-state/pa1/state' +ExecStartPre=/bin/sh -c 'echo 0 > /var/lc15/pa-supply/max_microvolts; echo 0 > /var/lc15/pa-supply/min_microvolts' + +ExecStart=/usr/bin/lc15bts-mgr -s -c /etc/osmocom/lc15bts-mgr.cfg + +# Shutdown all PA correctly +ExecStopPost=/bin/sh -c 'echo disabled > /var/lc15/pa-state/pa0/state; echo disabled > /var/lc15/pa-state/pa1/state' +ExecStopPost=/bin/sh -c 'echo 0 > /var/lc15/pa-supply/max_microvolts; echo 0 > /var/lc15/pa-supply/min_microvolts' + [Install] WantedBy=multi-user.target Alias=osmo-bts-mgr.service -- To view, visit https://gerrit.osmocom.org/3412 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a0a10ca9498318c48c81fa94faceb2ad4ac1de6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol