Change in libosmocore[master]: gsm0808: implement BSSMAP Classmark Request

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/10911


Change subject: gsm0808: implement BSSMAP Classmark Request
..

gsm0808: implement BSSMAP Classmark Request

Related: OS#3043
Change-Id: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7
---
M include/osmocom/gsm/gsm0808.h
M src/gsm/gsm0808.c
M src/gsm/libosmogsm.map
3 files changed, 15 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/10911/1

diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h
index 5ae0af8..f4fc7c4 100644
--- a/include/osmocom/gsm/gsm0808.h
+++ b/include/osmocom/gsm/gsm0808.h
@@ -51,6 +51,7 @@
   const uint8_t *cipher_response_mode);
 struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t 
alg_id);
 struct msgb *gsm0808_create_cipher_reject(uint8_t cause);
+struct msgb *gsm0808_create_classmark_request();
 struct msgb *gsm0808_create_classmark_update(const uint8_t *cm2, uint8_t 
cm2_len,
 const uint8_t *cm3, uint8_t 
cm3_len);
 struct msgb *gsm0808_create_sapi_reject(uint8_t link_id);
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index e3b10d0..9a9f70e 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -341,6 +341,19 @@
return msg;
 }

+/*! Create BSSMAP Classmark Request message
+ *  \returns callee-allocated msgb with BSSMAP Classmark Request message */
+struct msgb *gsm0808_create_classmark_request()
+{
+   struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, 
BSSMAP_MSG_HEADROOM,
+  "classmark-request");
+   if (!msg)
+   return NULL;
+
+   msgb_v_put(msg, BSS_MAP_MSG_CLASSMARK_RQST);
+   msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, 
msgb_length(msg));
+   return msg;
+}

 /*! Create BSSMAP Classmark Update message
  *  \param[in] cm2 Classmark 2
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index 60d6ed8..0c40c88 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -156,6 +156,7 @@
 gsm0808_create_cipher;
 gsm0808_create_cipher_complete;
 gsm0808_create_cipher_reject;
+gsm0808_create_classmark_request;
 gsm0808_create_classmark_update;
 gsm0808_create_clear_command;
 gsm0808_create_clear_complete;

--
To view, visit https://gerrit.osmocom.org/10911
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a2e1d3923e33912579c4180aa1ff8e8f5abb7e7
Gerrit-Change-Number: 10911
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Change in osmo-bsc[master]: Implement RR Classmark Enquiry

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/10910


Change subject: Implement RR Classmark Enquiry
..

Implement RR Classmark Enquiry

If the MSC sends a BSSMAP Classmark Request, send an RR Classmark Enquiry to
the MS.

(The reverse direction, i.e. sending a BSSMAP Classmark Update back to the MSC,
is already implemented.)

Related: OS#3043 (A5/3 encryption)
Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
---
M include/osmocom/bsc/gsm_04_08_rr.h
M src/osmo-bsc/gsm_04_08_rr.c
M src/osmo-bsc/osmo_bsc_bssap.c
3 files changed, 19 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/10910/1

diff --git a/include/osmocom/bsc/gsm_04_08_rr.h 
b/include/osmocom/bsc/gsm_04_08_rr.h
index 7b7a62f..e2e861d 100644
--- a/include/osmocom/bsc/gsm_04_08_rr.h
+++ b/include/osmocom/bsc/gsm_04_08_rr.h
@@ -21,6 +21,7 @@
   uint8_t *classmark2_lv);
 int gsm48_handle_paging_resp(struct gsm_subscriber_connection *conn,
 struct msgb *msg, struct bsc_subscr *bsub);
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan);
 int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv);
 int gsm48_multirate_config(uint8_t *lv, const struct amr_multirate_conf *mr, 
const struct amr_mode *modes);
 struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t 
power_command, uint8_t ho_ref);
diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index 2b4a1ba..35044a3 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -273,6 +273,21 @@
return rsl_siemens_mrpci(lchan, );
 }

+/* 3GPP 44.018 9.1.12 Classmark Enquiry */
+int gsm48_send_rr_classmark_enquiry(struct gsm_lchan *lchan)
+{
+   struct msgb *msg = gsm48_msgb_alloc_name("GSM 44.018 Classmark 
Enquiry");
+   struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
+
+   msg->lchan = lchan;
+   gh->proto_discr = GSM48_PDISC_RR;
+   gh->msg_type = GSM48_MT_RR_CLSM_ENQ;
+
+   DEBUGP(DRR, "%s TX CLASSMARK ENQUIRY %u\n", gsm_lchan_name(lchan), 
msgb_length(msg));
+
+   return gsm48_sendmsg(msg);
+}
+
 /* Chapter 9.1.9: Ciphering Mode Command */
 int gsm48_send_rr_ciph_mode(struct gsm_lchan *lchan, int want_imeisv)
 {
diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c
index d6b0b6d..97daa5c 100644
--- a/src/osmo-bsc/osmo_bsc_bssap.c
+++ b/src/osmo-bsc/osmo_bsc_bssap.c
@@ -870,6 +870,9 @@
case BSS_MAP_MSG_HANDOVER_CMD:
ret = bssmap_handle_handover_cmd(conn, msg, length);
break;
+   case BSS_MAP_MSG_CLASSMARK_RQST:
+   ret = gsm48_send_rr_classmark_enquiry(conn->lchan);
+   break;
default:
LOGP(DMSC, LOGL_NOTICE, "Unimplemented msg type: %s\n",
gsm0808_bssmap_name(msg->l4h[0]));

--
To view, visit https://gerrit.osmocom.org/10910
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5db638fd6e8d9c2ef9e139e99f0fabe1ef16ddf
Gerrit-Change-Number: 10910
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/armv7l

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/armv7l

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/armv7l

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  372s] No package 'libpcsclite' found
[  372s] simtrace2-remsim.o: In function `main':
[  372s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  372s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  372s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:772: undefined 
reference to `osim_uicc_sim_cic_profile'
[  372s] apdu_dispatch.o: In function `apdu_segment_in':
[  372s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  372s] /usr/src/packages/BUILD/host/apdu_dispatch.c:173: undefined reference 
to `osim_uicc_sim_cic_profile'
[  372s] collect2: error: ld returned 1 exit status
[  372s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  372s] make[2]: *** [simtrace2-remsim] Error 1
[  372s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  372s] Makefile:20: recipe for target 'utils' failed
[  372s] make[1]: *** [utils] Error 2
[  372s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  372s] dh_auto_build: make -j1 returned exit code 2
[  372s] debian/rules:4: recipe for target 'build' failed
[  372s] make: *** [build] Error 2
[  372s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  372s] 
[  372s] armbuild15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
21:10:11 UTC 2018.
[  372s] 
[  372s] ### VM INTERACTION START ###
[  376s] [  336.927556] sysrq: SysRq : Power Off
[  376s] [  336.930047] reboot: Power down
[  376s] ### VM INTERACTION END ###
[  376s] 
[  376s] armbuild15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
21:10:15 UTC 2018.
[  376s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_18.04/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  228s] No package 'libpcsclite' found
[  228s] simtrace2-remsim.o: In function `main':
[  228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  228s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  228s] apdu_dispatch.o: In function `apdu_segment_in':
[  228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  228s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  228s] collect2: error: ld returned 1 exit status
[  228s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  228s] make[2]: *** [simtrace2-remsim] Error 1
[  228s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  228s] Makefile:20: recipe for target 'utils' failed
[  228s] make[1]: *** [utils] Error 2
[  228s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  228s] dh_auto_build: make -j1 returned exit code 2
[  228s] debian/rules:4: recipe for target 'build' failed
[  228s] make: *** [build] Error 2
[  228s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  228s] 
[  228s] cloud127 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:58:23 UTC 2018.
[  228s] 
[  228s] ### VM INTERACTION START ###
[  231s] [  195.903852] sysrq: SysRq : Power Off
[  231s] [  195.912781] reboot: Power down
[  233s] ### VM INTERACTION END ###
[  233s] 
[  233s] cloud127 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:58:29 UTC 2018.
[  233s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_17.10/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  135s] No package 'libpcsclite' found
[  135s] simtrace2-remsim.o: In function `main':
[  135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  135s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  135s] apdu_dispatch.o: In function `apdu_segment_in':
[  135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  135s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  135s] collect2: error: ld returned 1 exit status
[  135s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  135s] make[2]: *** [simtrace2-remsim] Error 1
[  135s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  135s] Makefile:20: recipe for target 'utils' failed
[  135s] make[1]: *** [utils] Error 2
[  135s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  135s] dh_auto_build: make -j1 returned exit code 2
[  135s] debian/rules:4: recipe for target 'build' failed
[  135s] make: *** [build] Error 2
[  135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  135s] 
[  135s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:47 UTC 2018.
[  135s] 
[  135s] ### VM INTERACTION START ###
[  139s] [  128.976954] sysrq: SysRq : Power Off
[  139s] [  128.991720] reboot: Power down
[  139s] ### VM INTERACTION END ###
[  139s] 
[  139s] lamb57 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:51 UTC 2018.
[  139s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_18.04/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_18.04/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_18.04/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  161s] No package 'libpcsclite' found
[  161s] simtrace2-remsim.o: In function `main':
[  161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  161s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  161s] apdu_dispatch.o: In function `apdu_segment_in':
[  161s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  161s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  161s] collect2: error: ld returned 1 exit status
[  161s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  161s] make[2]: *** [simtrace2-remsim] Error 1
[  161s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  161s] Makefile:20: recipe for target 'utils' failed
[  161s] make[1]: *** [utils] Error 2
[  161s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  161s] dh_auto_build: make -j1 returned exit code 2
[  161s] debian/rules:4: recipe for target 'build' failed
[  161s] make: *** [build] Error 2
[  161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit 
status 2
[  161s] 
[  161s] lamb15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:37 UTC 2018.
[  161s] 
[  161s] ### VM INTERACTION START ###
[  165s] [  153.978973] sysrq: SysRq : Power Off
[  165s] [  153.986664] reboot: Power down
[  165s] ### VM INTERACTION END ###
[  165s] 
[  165s] lamb15 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:41 UTC 2018.
[  165s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/i586

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  153s] No package 'libpcsclite' found
[  153s] simtrace2-remsim.o: In function `main':
[  153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  153s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  153s] apdu_dispatch.o: In function `apdu_segment_in':
[  153s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  153s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  153s] collect2: error: ld returned 1 exit status
[  153s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  153s] make[2]: *** [simtrace2-remsim] Error 1
[  153s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  153s] Makefile:20: recipe for target 'utils' failed
[  153s] make[1]: *** [utils] Error 2
[  153s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  153s] dh_auto_build: make -j1 returned exit code 2
[  153s] debian/rules:4: recipe for target 'build' failed
[  153s] make: *** [build] Error 2
[  153s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  153s] 
[  153s] lamb23 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:45 UTC 2018.
[  153s] 
[  153s] ### VM INTERACTION START ###
[  156s] [  144.164770] sysrq: SysRq : Power Off
[  156s] [  144.170538] reboot: Power down
[  156s] ### VM INTERACTION END ###
[  156s] 
[  156s] lamb23 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:49 UTC 2018.
[  156s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  144s] No package 'libpcsclite' found
[  144s] simtrace2-remsim.o: In function `main':
[  144s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  144s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  144s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  144s] apdu_dispatch.o: In function `apdu_segment_in':
[  144s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  144s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  144s] collect2: error: ld returned 1 exit status
[  144s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  144s] make[2]: *** [simtrace2-remsim] Error 1
[  144s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  144s] Makefile:20: recipe for target 'utils' failed
[  144s] make[1]: *** [utils] Error 2
[  144s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  144s] dh_auto_build: make -j1 returned exit code 2
[  144s] debian/rules:4: recipe for target 'build' failed
[  144s] make: *** [build] Error 2
[  144s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  144s] 
[  144s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:19 UTC 2018.
[  144s] 
[  144s] ### VM INTERACTION START ###
[  147s] [  136.731316] sysrq: SysRq : Power Off
[  147s] [  136.739459] reboot: Power down
[  147s] ### VM INTERACTION END ###
[  147s] 
[  147s] lamb56 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:22 UTC 2018.
[  147s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_17.10/i586

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_17.10/i586

Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_17.10/i586

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  163s] No package 'libpcsclite' found
[  163s] simtrace2-remsim.o: In function `main':
[  163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  163s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  163s] apdu_dispatch.o: In function `apdu_segment_in':
[  163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  163s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  163s] collect2: error: ld returned 1 exit status
[  163s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  163s] make[2]: *** [simtrace2-remsim] Error 1
[  163s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  163s] Makefile:20: recipe for target 'utils' failed
[  163s] make[1]: *** [utils] Error 2
[  163s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  163s] dh_auto_build: make -j1 returned exit code 2
[  163s] debian/rules:4: recipe for target 'build' failed
[  163s] make: *** [build] Error 2
[  163s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  163s] 
[  163s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:21 UTC 2018.
[  163s] 
[  163s] ### VM INTERACTION START ###
[  167s] [  154.778991] sysrq: SysRq : Power Off
[  167s] [  154.844599] reboot: Power down
[  167s] ### VM INTERACTION END ###
[  167s] 
[  167s] morla3 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:25 UTC 2018.
[  167s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in Debian_9.0/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_9.0/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in Debian_9.0/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  133s] No package 'libpcsclite' found
[  133s] simtrace2-remsim.o: In function `main':
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  133s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  133s] apdu_dispatch.o: In function `apdu_segment_in':
[  133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  133s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  133s] collect2: error: ld returned 1 exit status
[  133s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  133s] make[2]: *** [simtrace2-remsim] Error 1
[  133s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  133s] Makefile:20: recipe for target 'utils' failed
[  133s] make[1]: *** [utils] Error 2
[  133s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  133s] dh_auto_build: make -j1 returned exit code 2
[  133s] debian/rules:4: recipe for target 'build' failed
[  133s] make: *** [build] Error 2
[  133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  133s] 
[  133s] lamb72 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:26 UTC 2018.
[  133s] 
[  133s] ### VM INTERACTION START ###
[  136s] [  124.297722] sysrq: SysRq : Power Off
[  136s] [  124.305001] reboot: Power down
[  136s] ### VM INTERACTION END ###
[  136s] 
[  136s] lamb72 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:57:30 UTC 2018.
[  136s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64

[OBS Notification]

Visit 
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64

Package network:osmocom:nightly/simtrace2 failed to build in 
xUbuntu_16.04/x86_64

Check out the package for editing:
  osc checkout network:osmocom:nightly simtrace2

Last lines of build log:
[  108s] No package 'libpcsclite' found
[  108s] simtrace2-remsim.o: In function `main':
[  108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:664: undefined 
reference to `osim_uicc_sim_cic_profile'
[  108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:689: undefined 
reference to `osim_reader_open'
[  108s] /usr/src/packages/BUILD/host/simtrace2-remsim.c:695: undefined 
reference to `osim_card_open'
[  108s] apdu_dispatch.o: In function `apdu_segment_in':
[  108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_uicc_sim_cic_profile'
[  108s] /usr/src/packages/BUILD/host/apdu_dispatch.c:84: undefined reference 
to `osim_determine_apdu_case'
[  108s] collect2: error: ld returned 1 exit status
[  108s] Makefile:9: recipe for target 'simtrace2-remsim' failed
[  108s] make[2]: *** [simtrace2-remsim] Error 1
[  108s] make[2]: Leaving directory '/usr/src/packages/BUILD/host'
[  108s] Makefile:20: recipe for target 'utils' failed
[  108s] make[1]: *** [utils] Error 2
[  108s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[  108s] dh_auto_build: make -j1 returned exit code 2
[  108s] debian/rules:4: recipe for target 'build' failed
[  108s] make: *** [build] Error 2
[  108s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[  108s] 
[  108s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:56:20 UTC 2018.
[  108s] 
[  108s] ### VM INTERACTION START ###
[  112s] [  105.358234] sysrq: SysRq : Power Off
[  112s] [  105.363953] reboot: Power down
[  112s] ### VM INTERACTION END ###
[  112s] 
[  112s] sheep81 failed "build simtrace2_0.5.1.15.5b5d.dsc" at Wed Sep 12 
19:56:24 UTC 2018.
[  112s] 

-- 
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)

Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: stop properly on failure in f_establish_fully()

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10904 )

Change subject: MSC_ConnectionHandler: stop properly on failure in 
f_establish_fully()
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10904
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7
Gerrit-Change-Number: 10904
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 17:51:23 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate.

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10906 )

Change subject: gsm_data: remove unused struct member full_rate.
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10906
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
Gerrit-Change-Number: 10906
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 17:49:28 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10907 )

Change subject: gsm_data: remove unused struct member chan_mode
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10907
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
Gerrit-Change-Number: 10907
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 17:49:56 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: LCLS: use type and tch_mode from lchan to check codec

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10905 )

Change subject: LCLS: use type and tch_mode from lchan to check codec
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10905
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Gerrit-Change-Number: 10905
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 17:48:59 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: cosmetic: fix typo in comment

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10908 )

Change subject: cosmetic: fix typo in comment
..


Patch Set 3: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10908
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c
Gerrit-Change-Number: 10908
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 17:47:07 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: measurement: remove missed interval end detection

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10814 )

Change subject: measurement: remove missed interval end detection
..


Patch Set 4: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10814
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e
Gerrit-Change-Number: 10814
Gerrit-PatchSet: 4
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Reviewer: dexter 
Gerrit-Comment-Date: Wed, 12 Sep 2018 17:46:53 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bts[master]: measurement: fix unit-test test_lchan_meas_process_measurement

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10815 )

Change subject: measurement: fix unit-test test_lchan_meas_process_measurement
..


Patch Set 4: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10815
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I9e00ce683e8c44528804f65181dbfed9e85e3aed
Gerrit-Change-Number: 10815
Gerrit-PatchSet: 4
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 17:44:37 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: grgsm_channelize: Add ichar data type

[Vasil Velichkov]

Vasil Velichkov has uploaded this change for review. ( 
https://gerrit.osmocom.org/10909


Change subject: grgsm_channelize: Add ichar data type
..

grgsm_channelize: Add ichar data type

This is the output format of rtl_sdr and hackrf_transfer and this would
allow direct channelization without an additional post processing.

Change-Id: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8
---
M apps/helpers/grgsm_channelize
1 file changed, 5 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/09/10909/1

diff --git a/apps/helpers/grgsm_channelize b/apps/helpers/grgsm_channelize
index 9b00bd7..5eaeb3b 100755
--- a/apps/helpers/grgsm_channelize
+++ b/apps/helpers/grgsm_channelize
@@ -79,6 +79,10 @@
 self.blocks_file_source = blocks.file_source(gr.sizeof_short, 
input_file, False)
 self.source = blocks.interleaved_short_to_complex(False, False)
 self.connect((self.blocks_file_source, 0), (self.source, 0))
+elif data_type == "ichar":
+self.blocks_file_source = blocks.file_source(gr.sizeof_char, 
input_file, False)
+self.source = blocks.interleaved_char_to_complex(False)
+self.connect((self.blocks_file_source, 0), (self.source, 0))
 elif data_type == "complex":
 self.source = blocks.file_source(gr.sizeof_gr_complex, input_file, 
False)

@@ -114,7 +118,7 @@
 help="Sample rate of the output capture files [default=%(default)s]")
 parser.add_argument("-i", "--input_file", dest="input_file", type=str, 
required=True,
 help="Path to wideband GSM capture file")
-parser.add_argument("-t", "--data_type", dest="data_type", type=str, 
choices=["complex","ishort"], default="complex",
+parser.add_argument("-t", "--data_type", dest="data_type", type=str, 
choices=["complex","ishort","ichar"], default="complex",
 help="Type of the input file [default=%(default)s]")
 parser.add_argument("-d", "--dest_dir", dest="dest_dir", type=str,
 help="Destination directory - if not given defaults to input file name 
without extension")

--
To view, visit https://gerrit.osmocom.org/10909
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia489eca9ec7defc3a83946c42f1ae3f136efe4e8
Gerrit-Change-Number: 10909
Gerrit-PatchSet: 1
Gerrit-Owner: Vasil Velichkov 

Change in osmo-ttcn3-hacks[master]: BTS_Tests: check paging channel fn (bs_ag_blks_res)

[dexter]

dexter has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10726 )

Change subject: BTS_Tests: check paging channel fn (bs_ag_blks_res)
..

BTS_Tests: check paging channel fn (bs_ag_blks_res)

BTS_Tests.ttcn contains numorous tests that issue pagings via RSL and
observe if these pagings are visible on the UM interface as well.
However, it is not checked whether the frame number of the blocks on
which those pagings are sent actually falls into the range that is
specified for PCH. We should check this as well.

(The PCH is part of the CCCH, which also contains the
AGC. How many blocks of the CCCH are to be used by the PCH is set by the
parameter bs_ag_blks_res.)

- Check the FN of each paging message that arrives on L1CTL and make
  sure that those FN are part of the PCH.

Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2
Related: OS#1575
---
M bts/BTS_Tests.ttcn
1 file changed, 59 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 67f302f..bfa8988 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1532,7 +1532,60 @@
}
 }

-altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, inout integer 
num_paging_rcv_ids)
+type record allowedFn { integer frame_nr }
+template allowedFn bs_ag_blks_res_0  := { frame_nr := (6, 12, 16, 22, 26, 32, 
36, 42, 46) }
+template allowedFn bs_ag_blks_res_1  := { frame_nr := (12, 16, 22, 26, 32, 36, 
42, 46) }
+template allowedFn bs_ag_blks_res_2  := { frame_nr := (16, 22, 26, 32, 36, 42, 
46) }
+template allowedFn bs_ag_blks_res_3  := { frame_nr := (22, 26, 32, 36, 42, 46) 
}
+template allowedFn bs_ag_blks_res_4  := { frame_nr := (26, 32, 36, 42, 46) }
+template allowedFn bs_ag_blks_res_5  := { frame_nr := (32, 36, 42, 46) }
+template allowedFn bs_ag_blks_res_6  := { frame_nr := (36, 42, 46) }
+template allowedFn bs_ag_blks_res_7  := { frame_nr := (42, 46) }
+function check_pch_fn(integer frame_nr, integer bs_ag_blks_res) runs on test_CT
+{
+   var integer frame_nr_51;
+   frame_nr_51 := frame_nr mod 51
+
+   var allowedFn fn_check;
+   fn_check.frame_nr := frame_nr_51;
+
+   if (bs_ag_blks_res < 0 or bs_ag_blks_res > 7) {
+   setverdict(fail, "bs_ag_blks_res out of valid range (0..7)");
+   mtc.stop;
+   return;
+   }
+
+   if (bs_ag_blks_res == 0 and match(fn_check, bs_ag_blks_res_0)) {
+   return;
+   }
+   if (bs_ag_blks_res == 1 and match(fn_check, bs_ag_blks_res_1)) {
+   return;
+   }
+   if (bs_ag_blks_res == 2 and match(fn_check, bs_ag_blks_res_2)) {
+   return;
+   }
+   if (bs_ag_blks_res == 3 and match(fn_check, bs_ag_blks_res_3)) {
+   return;
+   }
+   if (bs_ag_blks_res == 4 and match(fn_check, bs_ag_blks_res_4)) {
+   return;
+   }
+   if (bs_ag_blks_res == 5 and match(fn_check, bs_ag_blks_res_5)) {
+   return;
+   }
+   if (bs_ag_blks_res == 6 and match(fn_check, bs_ag_blks_res_6)) {
+   return;
+   }
+   if (bs_ag_blks_res == 7 and match(fn_check, bs_ag_blks_res_7)) {
+   return;
+   }
+
+   setverdict(fail, "received paging on AGCH");
+   mtc.stop;
+   return;
+}
+
+altstep as_l1_count_paging(inout integer num_paging_rcv_msgs, inout integer 
num_paging_rcv_ids, PagingTestCfg cfg)
 runs on test_CT {
var L1ctlDlMessage dl;
[] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?, 
c_DummyUI)) {
@@ -1542,6 +1595,9 @@
var octetstring without_plen :=
substr(dl.payload.data_ind.payload, 1, 
lengthof(dl.payload.data_ind.payload)-1);
var PDU_ML3_NW_MS rr := dec_PDU_ML3_NW_MS(without_plen);
+
+   check_pch_fn(dl.dl_info.frame_nr, cfg.bs_ag_blks_res);
+
if (match(rr, tr_PAGING_REQ1)) {
num_paging_rcv_msgs := num_paging_rcv_msgs + 1;
num_paging_rcv_ids := num_paging_rcv_ids + 1;
@@ -1659,7 +1715,7 @@
repeat;
}
/* check if paging requests arrive on Um side */
-   [] as_l1_count_paging(st.num_paging_rcv_msgs, 
st.num_paging_rcv_ids);
+   [] as_l1_count_paging(st.num_paging_rcv_msgs, 
st.num_paging_rcv_ids, cfg);
[] L1CTL.receive { repeat; }
[] T_itv.timeout { }
[] as_rsl_res_ind();
@@ -1670,7 +1726,7 @@
timer T_wait := 18.0;
T_wait.start;
alt {
-   [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids);
+   [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids, 
cfg);
[] L1CTL.receive { repeat; }
/* 65535 == empty paging queue, we can terminate*/

Change in osmo-ttcn3-hacks[master]: BTS_Tests: check paging channel fn (bs_ag_blks_res)

[dexter]

dexter has posted comments on this change. ( https://gerrit.osmocom.org/10726 )

Change subject: BTS_Tests: check paging channel fn (bs_ag_blks_res)
..


Patch Set 2:

> It's a bit of a philosophy question. I typically try to not test
 > too many things in one patch.  For example, if the patch is about
 > testing paging load reporting, then that test should only test
 > whatever is required in that context, and not verify if paging
 > blocks are send on AGCH, as that's "out of scope".  It's sometimes
 > difficult to draw the line, and this is not a strict rule.  I'm
 > just explaining my rationale why I didn't add such checks before.
 >
 > But we can merge this one.  Just in the future, keep it in mind
 > that it's typically better to have more specific test cases rather
 > than single test cases that test tons of thing in one.

Thanks for the hint. I will keep this in mind for next time.


--
To view, visit https://gerrit.osmocom.org/10726
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I839e75ece05166518bf7132acd3017434b3d3bc2
Gerrit-Change-Number: 10726
Gerrit-PatchSet: 2
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: dexter 
Gerrit-Comment-Date: Wed, 12 Sep 2018 15:59:17 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-bts[master]: measurement: remove missed interval end detection

[dexter]

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/10814

to look at the new patch set (#3).

Change subject: measurement: remove missed interval end detection
..

measurement: remove missed interval end detection

The function is_meas_overdue() was introduced to allow
lchan_meas_process_measurement() to detect when the end of a measurement
interval has been missed. Interval ends may be missed when the SACCH
block of the related measurement interval gets lost. This is due to the
fact that the SACCH block is used as a trigger to start the measurement
result computation.

The idea behind is_meas_overdue() was to check the frame number of the
current measurement against the frame number of the previous measurement
in order to see if there was a measurement for SACCH in between or not.
Unfortunately SACCH and TCH Voice data is not necessarly processed in
order by each phy. Depending on the phy there may be a jitter between
the timing of SACCH and TCH Voice. Depending on the phy this jitter may
be enough to mess up the timing so that we see a SACCH block earlier
than expected. So we can not use the current frame number of TCH Voice
measurements to check for missed SACCH blocks.

Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e
Related: OS#3502
Related: OS#2975
---
M include/osmo-bts/measurement.h
M src/common/measurement.c
M tests/meas/meas_test.c
M tests/meas/meas_test.ok
4 files changed, 2 insertions(+), 733 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/10814/3
--
To view, visit https://gerrit.osmocom.org/10814
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e
Gerrit-Change-Number: 10814
Gerrit-PatchSet: 3
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: dexter 
Gerrit-CC: Vadim Yanitskiy 

Change in osmo-bts[master]: measurement: remove missed interval end detection

[dexter]

Hello Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/10814

to look at the new patch set (#2).

Change subject: measurement: remove missed interval end detection
..

measurement: remove missed interval end detection

The function is_meas_overdue() was introduced to allow
lchan_meas_process_measurement() to detect when the end of a measurement
interval has been missed. Interval ends may be missed when the SACCH
block of the related measurement interval gets lost. This is due to the
fact that the SACCH block is used as a trigger to start the measurement
result computation.

The idea behind is_meas_overdue() was to check the frame number of the
current measurement against the frame number of the previous measurement
in order to see if there was a measurement for SACCH in between or not.
Unfortunately SACCH and TCH Voice data is not necessarly processed in
order by each phy. Depending on the phy there may be a jitter between
the timing of SACCH and TCH Voice. Depending on the phy this jitter may
be enough to mess up the timing so that we see a SACCH block earlier
than expected. So we can not use the current frame number of TCH Voice
measurements to check for missed SACCH blocks.

Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e
Related: OS#3502
Related: OS#2975
---
M include/osmo-bts/measurement.h
M src/common/measurement.c
M tests/meas/meas_test.c
M tests/meas/meas_test.ok
4 files changed, 2 insertions(+), 707 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/10814/2
--
To view, visit https://gerrit.osmocom.org/10814
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e
Gerrit-Change-Number: 10814
Gerrit-PatchSet: 2
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: dexter 
Gerrit-CC: Vadim Yanitskiy 

Change in osmo-bts[master]: cosmetic: fix typo in comment

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10908


Change subject: cosmetic: fix typo in comment
..

cosmetic: fix typo in comment

Change-Id: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c
---
M src/common/measurement.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/10908/1

diff --git a/src/common/measurement.c b/src/common/measurement.c
index 21ec16a..a296a8a 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -730,7 +730,7 @@

 /* Process a single uplink measurement sample. This function is called from
  * l1sap.c every time a measurement indication is received. It collects the
- * measurement samples and automatically detects the end oft the measurement
+ * measurement samples and automatically detects the end of the measurement
  * interval. */
 int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas 
*ulm, uint32_t fn)
 {

--
To view, visit https://gerrit.osmocom.org/10908
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a1147e2a3858475c99c99ceb33d7d416f3cac6c
Gerrit-Change-Number: 10908
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 

Change in osmo-bts[master]: measurement: remove missed interval end detection

[dexter]

dexter has posted comments on this change. ( https://gerrit.osmocom.org/10814 )

Change subject: measurement: remove missed interval end detection
..


Patch Set 1:

(1 comment)

> (1 comment)
 >
 > BTW: why not to revert 4553890d?

Unfortunately this is interlaced with other patches. It was easier just to 
remove the problematic sections using a regular patch.

https://gerrit.osmocom.org/#/c/10814/1/src/common/measurement.c
File src/common/measurement.c:

https://gerrit.osmocom.org/#/c/10814/1/src/common/measurement.c@737
PS1, Line 737: uint32_t fn_missed_end;
 :  bool missed_end;
> Not needed anymore.
Done



--
To view, visit https://gerrit.osmocom.org/10814
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Idfdbf64c1f965f35c12559b3995e2b746c74ee9e
Gerrit-Change-Number: 10814
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: dexter 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 15:31:32 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-bsc[master]: gsm_data: remove unused struct member chan_mode

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10907


Change subject: gsm_data: remove unused struct member chan_mode
..

gsm_data: remove unused struct member chan_mode

The struct member chan_mode in struct gsm_subscriber_connection is no
longer used. There is only one VTY command that displays it along other
parameters, but it is used no where else. Lets remove it.

Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_vty.c
2 files changed, 1 insertion(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/10907/1

diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 5a922d1..33a5a8d 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -268,10 +268,6 @@
/* The connection identifier of the mgw_endpoint used to 
transceive RTP towards the MSC.
 * (The BTS side CI is handled by struct gsm_lchan and the 
lchan_fsm.) */
struct mgwep_ci *mgw_endpoint_ci_msc;
-
-   /* Channel mode requested by the MSC (signalling or voice 
channel) */
-   enum gsm48_chan_mode chan_mode;
-
} user_plane;

/* LCLS (local call, local switch) related state */
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index b1938e6..d06ec57 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -1472,9 +1472,8 @@

 static void dump_one_subscr_conn(struct vty *vty, const struct 
gsm_subscriber_connection *conn)
 {
-   vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mode=%s, mgw_ep=%s%s",
+   vty_out(vty, "conn ID=%u, MSC=%u, hodec2_fail=%d, mgw_ep=%s%s",
conn->sccp.conn_id, conn->sccp.msc->nr, conn->hodec2.failures,
-   get_value_string(gsm48_chan_mode_names, 
conn->user_plane.chan_mode),
mgw_endpoint_name(conn->user_plane.mgw_endpoint), VTY_NEWLINE);
if (conn->lcls.global_call_ref_len) {
vty_out(vty, " LCLS GCR: %s%s",

--
To view, visit https://gerrit.osmocom.org/10907
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10049c14ea206a4daafbdad01634d57c72a79d7c
Gerrit-Change-Number: 10907
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 

Change in osmo-bsc[master]: gsm_data: remove unused struct member full_rate.

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10906


Change subject: gsm_data: remove unused struct member full_rate.
..

gsm_data: remove unused struct member full_rate.

The struct member full_rate in struct gsm_subscriber_connection is not
used anymore. Lets remove it.

Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
---
M include/osmocom/bsc/gsm_data.h
1 file changed, 0 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/10906/1

diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index e408ff9..5a922d1 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -269,9 +269,6 @@
 * (The BTS side CI is handled by struct gsm_lchan and the 
lchan_fsm.) */
struct mgwep_ci *mgw_endpoint_ci_msc;

-   /* Channel rate flag requested by the MSC, FR=1, HR=0, 
Invalid=-1 */
-   int full_rate;
-
/* Channel mode requested by the MSC (signalling or voice 
channel) */
enum gsm48_chan_mode chan_mode;


--
To view, visit https://gerrit.osmocom.org/10906
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a14efe0039ff4690e27e3b083eb23c1b2a616c3
Gerrit-Change-Number: 10906
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 

Change in osmo-bsc[master]: LCLS: use type and tch_mode from lchan to check codec

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10905


Change subject: LCLS: use type and tch_mode from lchan to check codec
..

LCLS: use type and tch_mode from lchan to check codec

When not explicitly allowed via VTY settings, the LCLS mechanisms will
avoid to locally switch connections with different codecs/rates. For
example GSM HR and GSM FR would not be locally switched.

At the moment osmo_bsc_lcls.c uses abandonned struct members to check if
there is a codec mismatch, so a mismatch will never be detected.

- Use struct memfffubers tch_mode and type from struct gsm_lchan *lchan
  instead of full_rate and chan_mode in struct gsm_subscriber_connection

Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Related: OS#1602
---
M src/osmo-bsc/osmo_bsc_lcls.c
1 file changed, 4 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/10905/1

diff --git a/src/osmo-bsc/osmo_bsc_lcls.c b/src/osmo-bsc/osmo_bsc_lcls.c
index 6aeccb3..42bb5fa 100644
--- a/src/osmo-bsc/osmo_bsc_lcls.c
+++ b/src/osmo-bsc/osmo_bsc_lcls.c
@@ -274,15 +274,15 @@
return false;
}

-   if (conn->user_plane.full_rate != conn->lcls.other->user_plane.full_rate
+   if (conn->lchan->type != conn->lcls.other->lchan->type
&& conn->sccp.msc->lcls_codec_mismatch_allow == false) {
-   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(channel rate)\n");
+   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(channel type)\n");
return false;
}

-   if (conn->user_plane.chan_mode != conn->lcls.other->user_plane.chan_mode
+   if (conn->lchan->tch_mode != conn->lcls.other->lchan->tch_mode
&& conn->sccp.msc->lcls_codec_mismatch_allow == false) {
-   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(channel mode)\n");
+   LOGPFSM(conn->lcls.fi, "Not enabling LS due to codec mismiatch 
(TCH-Mode)\n");
return false;
}


--
To view, visit https://gerrit.osmocom.org/10905
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd7117092b1f170d5029303ae5ba0a49e02a8bfb
Gerrit-Change-Number: 10905
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 

Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: stop properly on failure in f_establish_fully()

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/10904


Change subject: MSC_ConnectionHandler: stop properly on failure in 
f_establish_fully()
..

MSC_ConnectionHandler: stop properly on failure in f_establish_fully()

When the altstep in f_establish_fully() gets an unexpected ASSIGNMENT
FAIL or COMPLETE it should stop completely like it is already
implemented in many other altsteps.

Change-Id: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7
---
M bsc/MSC_ConnectionHandler.ttcn
1 file changed, 10 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/04/10904/1

diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 102c30e..9f67f1b 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -939,18 +939,28 @@
 (not st.is_assignment and (st.modify_done or not exp_modify))) and
 exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) {
setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE");
+   all component.stop;
+   mtc.stop;
}
[exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) {
setverdict(fail, "Received unexpected ASSIGNMENT FAIL");
+   all component.stop;
+   mtc.stop;
}
[not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) {
setverdict(fail, "Received unexpected ASSIGNMENT COMPLETE");
+   all component.stop;
+   mtc.stop;
}
[not exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentFail) {
setverdict(fail, "Received non-matching ASSIGNMENT FAIL");
+   all component.stop;
+   mtc.stop;
}
[] T.timeout {
setverdict(fail, "Timeout waiting for ASSIGNMENT COMPLETE");
+   all component.stop;
+   mtc.stop;
}
}
log("g_media ", g_media);

--
To view, visit https://gerrit.osmocom.org/10904
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4ac7bcbac35a4ae454d1806f3fbb727834d18b7
Gerrit-Change-Number: 10904
Gerrit-PatchSet: 1
Gerrit-Owner: dexter 

Build failed in Jenkins: master-asn1c » a1=default,a2=default,a3=default,osmocom-master-debian9 #244

[jenkins]

See 


--
[...truncated 3.67 KB...]

+ ./configure
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether to enable maintainer-specific portions of Makefiles... no
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables... 
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for /usr/bin/ld option to reload object files... -r
checking for BSD-compatible nm... /usr/bin/nm -B
checking whether ln -s works... yes
checking how to recognise dependent libraries... pass_all
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking dlfcn.h usability... yes
checking dlfcn.h presence... yes
checking for dlfcn.h... yes
checking for g++... g++
checking whether we are using the GNU C++ compiler... yes
checking whether g++ accepts -g... yes
checking dependency style of g++... gcc3
checking how to run the C++ preprocessor... g++ -E
checking for g77... no
checking for f77... no
checking for xlf... no
checking for frt... no
checking for pgf77... no
checking for cf77... no
checking for fort77... no
checking for fl32... no
checking for af77... no
checking for f90... no
checking for xlf90... no
checking for pgf90... no
checking for pghpf... no
checking for epcf90... no
checking for gfortran... no
checking for g95... no
checking for f95... no
checking for fort... no
checking for xlf95... no
checking for ifort... no
checking for ifc... no
checking for efc... no
checking for pgf95... no
checking for lf95... no
checking for ftn... no
checking whether we are using the GNU Fortran 77 compiler... no
checking whether  accepts -g... no
checking the maximum length of command line arguments... 32768
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for objdir... .libs
checking for ar... ar
checking for ranlib... ranlib
checking for strip... strip
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC
checking if gcc PIC flag -fPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
configure: creating libtool
appending configuration tag "CXX" to libtool
checking for ld used by g++... /usr/bin/ld -m elf_x86_64
checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking for g++ option to produce PIC... -fPIC
checking if g++ PIC flag -fPIC works... yes
checking if g++ static flag -static works... yes
checking if g++ supports -c -o file.o... yes
checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared 
libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
appending configuration tag "F77" to libtool
checking for autoconf... /usr/bin/autoconf
checking for autoheader... /usr/bin/autoheader
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking 

Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files

[Pau Espin Pedrol]

Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/10903 )

Change subject: contrib: Disable installing unneeded systemd service files
..


Patch Set 1: Verified+1


--
To view, visit https://gerrit.osmocom.org/10903
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477
Gerrit-Change-Number: 10903
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Comment-Date: Wed, 12 Sep 2018 14:09:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10903 )

Change subject: contrib: Disable installing unneeded systemd service files
..

contrib: Disable installing unneeded systemd service files

Otherwise since we install without root perissins to a local directory,
systemd files will fail to be installed to regular systemd location
/lib/systemd/system/).

Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477
---
M contrib/jenkins-build-common.sh
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Pau Espin Pedrol: Verified



diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index b8cafcf..731bf58 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -132,7 +132,7 @@
   set +x; echo; echo; set -x
   autoreconf -fi
   set +x; echo; echo; set -x
-  ./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts
+  ./configure --prefix="$prefix" --with-systemdsystemunitdir=no 
$CONFIGURE_FLAGS $configure_opts
   set +x; echo; echo; set -x
   make -j8 || make  # libsmpp34 can't build in parallel
   set +x; echo; echo; set -x

--
To view, visit https://gerrit.osmocom.org/10903
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477
Gerrit-Change-Number: 10903
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Pau Espin Pedrol 

Change in libosmocore[master]: logging vty: deprecate 'all', introduce 'force-all'

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10888 )

Change subject: logging vty: deprecate 'all', introduce 'force-all'
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10888
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I36f17c131cc70ce5a1aef62fd9693097de230cd4
Gerrit-Change-Number: 10888
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:59:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: logging: define lower-case loglevel value_string[]

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10886 )

Change subject: logging: define lower-case loglevel value_string[]
..


Patch Set 1:

I don't really like that approach.  The number of times when we "constantly" 
conver the strings is actually very low.  I don't see any need for optimization 
at all. This doesn't seem to be something we do many times per second, or maybe 
even during logging of each log line - but only at the time somebody enters a 
VTY command that gets parsed.

So I'd prefer to have that miniscule runtime overhead at rare occasions, than 
to have copy+paste of the table


--
To view, visit https://gerrit.osmocom.org/10886
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie55d732281bdf74324e1dd7f8a2ba91d11409851
Gerrit-Change-Number: 10886
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:58:50 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmocore[master]: logging vty: add VTY transcript test

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10883 )

Change subject: logging vty: add VTY transcript test
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10883
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I948e832a33131f8eab98651d6010ceb0ccbc9a9c
Gerrit-Change-Number: 10883
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:56:42 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: jenkins: add --enable-external-tests

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10890 )

Change subject: jenkins: add --enable-external-tests
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10890
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic4ec1f6c131da50b3956f16f0b49375f387196b3
Gerrit-Change-Number: 10890
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:55:43 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: logging vty: write: check logging levels validity

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10887 )

Change subject: logging vty: write: check logging levels validity
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10887
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: If683b1272ad2d5b402b91c52c496aa7975bc6315
Gerrit-Change-Number: 10887
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:55:32 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: logging vty: deprecate the 'everything' keyword

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10885 )

Change subject: logging vty: deprecate the 'everything' keyword
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10885
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib75fedb0572570a61bb34ee729a2af86cf5f16da
Gerrit-Change-Number: 10885
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:55:16 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: logging vty: rewrite 'logging level' vty cmd generation

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10884 )

Change subject: logging vty: rewrite 'logging level' vty cmd generation
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10884
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I3b083f27e3d751ccec258880ae7676e9af959a63
Gerrit-Change-Number: 10884
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:54:41 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ggsn[master]: Install systemd services with autotools

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10893 )

Change subject: Install systemd services with autotools
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10893
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I563559f5b501eded44efafc60bb0c9ffdea20b3e
Gerrit-Change-Number: 10893
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:52:44 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-iuh[master]: Install systemd services with autotools

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10891 )

Change subject: Install systemd services with autotools
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10891
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I90f1efc4433ec641a28931d5c19e2301a67cf1e9
Gerrit-Change-Number: 10891
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:52:29 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-sip-connector[master]: Install systemd services with autotools

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10901 )

Change subject: Install systemd services with autotools
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10901
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I672f49f1034554ce62347ff9493eca18340deb3a
Gerrit-Change-Number: 10901
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:51:52 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in openbsc[master]: Install systemd services with autotools

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10902 )

Change subject: Install systemd services with autotools
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10902
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6
Gerrit-Change-Number: 10902
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:51:34 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10903 )

Change subject: contrib: Disable installing unneeded systemd service files
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10903
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477
Gerrit-Change-Number: 10903
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:50:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10871 )

Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots
..

ts,lchan_fsm: do not attempt to allocate CBCH subslots

In case a given channel combination contains a CBCH, it replaces sub-slot 2
with a CBCH, i.e. we must not attempt to allocate the same for SDCCH.

On timeslot initialization, immediately place such an lchan FSM into new state
LCHAN_ST_CBCH, so that it never appears unused and never is picked during
lchan_select(). Also set lchan->type = GSM_LCHAN_CBCH.

Verified by configuring CBCH timeslots and watching 'show lchan summary'.

Immediately after RSL and OML are up, these pchan types show lchan 2 in state
CBCH:

  BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type CBCH, State CBCH - 
L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm
  BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS 
Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm

With a 'phys_chan_config ccch+sdcch4+cbch' and three phones simultaneously
requesting USSD, I see:

  BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 0, Type SDCCH, State 
ESTABLISHED - L1 MS Power: 14 dBm RXL-FULL-dl:  -53 dBm RXL-FULL-ul:  -47 dBm
  BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 1, Type SDCCH, State 
ESTABLISHED - L1 MS Power: 30 dBm RXL-FULL-dl:  -47 dBm RXL-FULL-ul:  -47 dBm
  BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 2, Type CBCH, State CBCH - 
L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm
  BTS 0, TRX 0, Timeslot 0 CCCH+SDCCH4+CBCH, Lchan 3, Type SDCCH, State 
ESTABLISHED - L1 MS Power: 16 dBm RXL-FULL-dl:  -47 dBm RXL-FULL-ul:  -47 dBm

With 'phys_chan_config SDCCH8+CBCH' and three phones simultaneously attaching,
I see:

  BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 0, Type SDCCH, State 
WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: 
-110 dBm
  BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 1, Type SDCCH, State 
WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: 
-110 dBm
  BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 2, Type CBCH, State CBCH - L1 MS 
Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: -110 dBm
  BTS 0, TRX 0, Timeslot 1 SDCCH8+CBCH, Lchan 3, Type SDCCH, State 
WAIT_RLL_RTP_ESTABLISH - L1 MS Power: 0 dBm RXL-FULL-dl: -110 dBm RXL-FULL-ul: 
-110 dBm

i.e. in all cases the CBCH lchan remains occupied and is not allocated as
SDCCH.

Detaching and re-attaching the BTS reliably brings back the CBCH state. Also
verified that changing the osmo-bsc config from telnet vty and dropping oml
followed by the BTS re-attaching brings back the CBCH state.

Change-Id: I2bafc5f696e818e38f8907ad0c8f38494df0623d
---
M include/osmocom/bsc/lchan_fsm.h
M src/osmo-bsc/lchan_fsm.c
M src/osmo-bsc/timeslot_fsm.c
3 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h
index 35b8847..9fbf9b3 100644
--- a/include/osmocom/bsc/lchan_fsm.h
+++ b/include/osmocom/bsc/lchan_fsm.h
@@ -14,6 +14,7 @@

 enum lchan_fsm_state {
LCHAN_ST_UNUSED,
+   LCHAN_ST_CBCH, /*< Blocked by CBCH channel combination, not usable as 
SDCCH. */
LCHAN_ST_WAIT_TS_READY,
LCHAN_ST_WAIT_ACTIV_ACK, /*< After RSL Chan Act Ack, lchan is active 
but RTP not configured. */
LCHAN_ST_WAIT_RLL_RTP_ESTABLISH,
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index 1ef7869..c80d8a1 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -1035,6 +1035,13 @@
,
.out_state_mask = 0
| S(LCHAN_ST_WAIT_TS_READY)
+   | S(LCHAN_ST_CBCH)
+   ,
+   },
+   [LCHAN_ST_CBCH] = {
+   .name = "CBCH",
+   .out_state_mask = 0
+   | S(LCHAN_ST_UNUSED)
,
},
[LCHAN_ST_WAIT_TS_READY] = {
diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c
index 56b3357..fc25460 100644
--- a/src/osmo-bsc/timeslot_fsm.c
+++ b/src/osmo-bsc/timeslot_fsm.c
@@ -295,6 +295,15 @@
T_CHAN_ACT_DEACT);
break;

+   case GSM_PCHAN_CCCH_SDCCH4_CBCH:
+   case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:
+   /* For any pchans containing a CBCH, lchan[2] is reserved for 
CBCH and cannot be
+* allocated for SDCCH. */
+   OSMO_ASSERT(ts->lchan[2].fi);
+   ts->lchan[2].type = GSM_LCHAN_CBCH;
+   osmo_fsm_inst_state_chg(ts->lchan[2].fi, LCHAN_ST_CBCH, 0, 0);
+   break;
+
default:
/* nothing to do */
break;

--
To view, visit 

Change in osmo-bsc[master]: ts, lchan_fsm: do not attempt to allocate CBCH subslots

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10871 )

Change subject: ts,lchan_fsm: do not attempt to allocate CBCH subslots
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10871
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I2bafc5f696e818e38f8907ad0c8f38494df0623d
Gerrit-Change-Number: 10871
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Comment-Date: Wed, 12 Sep 2018 13:49:30 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-gsm-tester[master]: contrib: Disable installing unneeded systemd service files

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10903


Change subject: contrib: Disable installing unneeded systemd service files
..

contrib: Disable installing unneeded systemd service files

Otherwise since we install without root perissins to a local directory,
systemd files will fail to be installed to regular systemd location
/lib/systemd/system/).

Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477
---
M contrib/jenkins-build-common.sh
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester 
refs/changes/03/10903/1

diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index b8cafcf..731bf58 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -132,7 +132,7 @@
   set +x; echo; echo; set -x
   autoreconf -fi
   set +x; echo; echo; set -x
-  ./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts
+  ./configure --prefix="$prefix" --with-systemdsystemunitdir=no 
$CONFIGURE_FLAGS $configure_opts
   set +x; echo; echo; set -x
   make -j8 || make  # libsmpp34 can't build in parallel
   set +x; echo; echo; set -x

--
To view, visit https://gerrit.osmocom.org/10903
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20a285e4e92fec7990770568e8d5dc117d6bf477
Gerrit-Change-Number: 10903
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in openbsc[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10902


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I9bc40cf9e9a901d28d1f1629f6f1d55e8ba0c0b6
---
M debian/osmo-bsc-mgcp.install
D debian/osmo-bsc-mgcp.service
M debian/osmocom-bsc-nat.install
D debian/osmocom-bsc-nat.service
M debian/osmocom-bsc-sccplite.install
D debian/osmocom-bsc-sccplite.service
M debian/osmocom-nitb.install
D debian/osmocom-nitb.service
M openbsc/Makefile.am
M openbsc/configure.ac
A openbsc/contrib/Makefile.am
A openbsc/contrib/systemd/Makefile.am
D openbsc/debian/osmo-bsc-mgcp.service
13 files changed, 42 insertions(+), 7 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/02/10902/1

diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install
index 1550437..828fb31 100644
--- a/debian/osmo-bsc-mgcp.install
+++ b/debian/osmo-bsc-mgcp.install
@@ -1 +1,2 @@
+lib/systemd/system/osmo-bsc-mgcp.service
 usr/bin/osmo-bsc_mgcp
diff --git a/debian/osmo-bsc-mgcp.service b/debian/osmo-bsc-mgcp.service
deleted file mode 12
index 0f8700b..000
--- a/debian/osmo-bsc-mgcp.service
+++ /dev/null
@@ -1 +0,0 @@
-../openbsc/contrib/systemd/osmo-bsc-mgcp.service
\ No newline at end of file
diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install
index b561a7e..d6cabe2 100644
--- a/debian/osmocom-bsc-nat.install
+++ b/debian/osmocom-bsc-nat.install
@@ -1 +1,2 @@
+/lib/systemd/system/osmo-bsc-nat.service
 /usr/bin/osmo-bsc_nat
diff --git a/debian/osmocom-bsc-nat.service b/debian/osmocom-bsc-nat.service
deleted file mode 12
index 0d5b3be..000
--- a/debian/osmocom-bsc-nat.service
+++ /dev/null
@@ -1 +0,0 @@
-../openbsc/contrib/systemd/osmo-bsc-nat.service
\ No newline at end of file
diff --git a/debian/osmocom-bsc-sccplite.install 
b/debian/osmocom-bsc-sccplite.install
index 9ce795c..67c50cb 100644
--- a/debian/osmocom-bsc-sccplite.install
+++ b/debian/osmocom-bsc-sccplite.install
@@ -1,2 +1,2 @@
-/usr/bin/osmo-bsc_mgcp
+/lib/systemd/system/osmo-bsc-sccplite.service
 /usr/bin/osmo-bsc-sccplite
diff --git a/debian/osmocom-bsc-sccplite.service 
b/debian/osmocom-bsc-sccplite.service
deleted file mode 12
index f30a9db..000
--- a/debian/osmocom-bsc-sccplite.service
+++ /dev/null
@@ -1 +0,0 @@
-../openbsc/contrib/systemd/osmo-bsc-sccplite.service
\ No newline at end of file
diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install
index 26caf71..78e8f77 100644
--- a/debian/osmocom-nitb.install
+++ b/debian/osmocom-nitb.install
@@ -1,2 +1,3 @@
+/lib/systemd/system/osmo-nitb.service
 /usr/bin/osmo-nitb
-openbsc/contrib/*.py usr/bin/
\ No newline at end of file
+openbsc/contrib/*.py usr/bin/
diff --git a/debian/osmocom-nitb.service b/debian/osmocom-nitb.service
deleted file mode 12
index eaecd9d..000
--- a/debian/osmocom-nitb.service
+++ /dev/null
@@ -1 +0,0 @@
-../openbsc/contrib/systemd/osmo-nitb.service
\ No newline at end of file
diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am
index dc53929..792dcf2 100644
--- a/openbsc/Makefile.am
+++ b/openbsc/Makefile.am
@@ -13,6 +13,7 @@
include \
src \
tests \
+   contrib \
$(NULL)

 pkgconfigdir = $(libdir)/pkgconfig
@@ -21,6 +22,9 @@
 BUILT_SOURCES = $(top_srcdir)/.version
 EXTRA_DIST = git-version-gen osmoappdesc.py .version

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 $(top_srcdir)/.version:
diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index c3615d6..75dd5d3 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -220,6 +220,22 @@
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -262,4 +278,6 @@
 tests/nanobts_omlattr/Makefile
 doc/Makefile

Change in osmo-sip-connector[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10901


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I672f49f1034554ce62347ff9493eca18340deb3a
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-sip-connector.install
D debian/osmo-sip-connector.service
M debian/rules
7 files changed, 32 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector 
refs/changes/01/10901/1

diff --git a/Makefile.am b/Makefile.am
index 5a2c4a9..7c1e00c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,13 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6

-SUBDIRS = src tests
+SUBDIRS = src tests contrib

 BUILT_SOURCES = $(top_srcdir)/.version
 EXTRA_DIST = git-version-gen osmoappdesc.py .version

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 $(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index 916cfc3..1514faa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,22 @@
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
@@ -73,4 +89,6 @@
 AC_OUTPUT(
src/Makefile
tests/Makefile
+   contrib/Makefile
+   contrib/systemd/Makefile
Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..213cc7a
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-sip-connector.service
+systemdsystemunit_DATA = \
+  osmo-sip-connector.service
+endif
diff --git a/debian/osmo-sip-connector.install 
b/debian/osmo-sip-connector.install
index a16b95f..b776fda 100644
--- a/debian/osmo-sip-connector.install
+++ b/debian/osmo-sip-connector.install
@@ -1 +1,2 @@
+lib/systemd/system/osmo-sip-connector.service
 usr/bin/osmo-sip-connector
diff --git a/debian/osmo-sip-connector.service 
b/debian/osmo-sip-connector.service
deleted file mode 12
index c0ae1e1..000
--- a/debian/osmo-sip-connector.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-sip-connector.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 5e9e20f..e4e7ca9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,6 @@

 override_dh_strip:
dh_strip --dbg-package=osmo-sip-connector-dbg
+
+override_dh_auto_configure:
+   dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system

--
To view, visit https://gerrit.osmocom.org/10901
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I672f49f1034554ce62347ff9493eca18340deb3a
Gerrit-Change-Number: 10901
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-trx[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10900


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: Ia1a4fb62dee35737ece1f3501f352501eba2449e
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-trx-lms.install
D debian/osmo-trx-lms.service
M debian/osmo-trx-uhd.install
D debian/osmo-trx-uhd.service
M debian/osmo-trx-usrp1.install
D debian/osmo-trx-usrp1.service
M debian/patches/build-for-debian8.patch
M debian/rules
12 files changed, 47 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/00/10900/1

diff --git a/Makefile.am b/Makefile.am
index 8ab73a6..38cd88d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,7 @@
CommonLibs \
GSM \
Transceiver52M \
+   contrib \
tests

 EXTRA_DIST = \
@@ -41,6 +42,9 @@
COPYING \
README

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 .PHONY: release

 @RELMAKE@
diff --git a/configure.ac b/configure.ac
index daa8677..64e3b35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,6 +223,22 @@
 AC_CHECK_HEADER([boost/config.hpp],[],
 [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for 
systemd service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG 
--variable=systemdsystemunitdir systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to 
query systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != 
"xno"])
+
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
@@ -247,6 +263,8 @@
 tests/Transceiver52M/Makefile \
 doc/Makefile \
 doc/examples/Makefile \
+contrib/Makefile \
+contrib/systemd/Makefile \
 ])
 
 AC_OUTPUT
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..21fbb53
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,18 @@
+if HAVE_SYSTEMD
+SYSTEMD_SERVICES =
+
+if DEVICE_UHD
+SYSTEMD_SERVICES += osmo-trx-uhd.service
+endif
+
+if DEVICE_USRP1
+SYSTEMD_SERVICES += osmo-trx-usrp1.service
+endif
+
+if DEVICE_LMS
+SYSTEMD_SERVICES += osmo-trx-lms.service
+endif
+
+EXTRA_DIST = $(SYSTEMD_SERVICES)
+systemdsystemunit_DATA = $(SYSTEMD_SERVICES)
+endif # HAVE_SYSTEMD
diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install
index dd9d407..b58c862 100644
--- a/debian/osmo-trx-lms.install
+++ b/debian/osmo-trx-lms.install
@@ -1,2 +1,3 @@
+lib/systemd/system/osmo-trx-lms.service
 /usr/bin/osmo-trx-lms
 /usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg 
/usr/share/doc/osmo-trx/examples/osmo-trx-lms/
diff --git a/debian/osmo-trx-lms.service b/debian/osmo-trx-lms.service
deleted file mode 12
index d2d697a..000
--- a/debian/osmo-trx-lms.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-trx-lms.service
\ No newline at end of file
diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install
index 8944b13..b7ec5ca 100644
--- a/debian/osmo-trx-uhd.install
+++ b/debian/osmo-trx-uhd.install
@@ -1,3 +1,4 @@
+lib/systemd/system/osmo-trx-uhd.service
 /usr/bin/osmo-trx-uhd
 /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 
/usr/share/doc/osmo-trx/examples/osmo-trx-uhd/
 /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg 
/usr/share/doc/osmo-trx/examples/osmo-trx-uhd/
diff --git a/debian/osmo-trx-uhd.service b/debian/osmo-trx-uhd.service
deleted file mode 12
index c67648f..000
--- a/debian/osmo-trx-uhd.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-trx-uhd.service
\ No newline at end of file
diff --git a/debian/osmo-trx-usrp1.install b/debian/osmo-trx-usrp1.install
index c7e54b1..112a149 100644
--- a/debian/osmo-trx-usrp1.install
+++ b/debian/osmo-trx-usrp1.install
@@ -1,3 +1,4 @@

Change in osmo-bts[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10898


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I87299134696bbfc6721b1226d4de6c73854aa846
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
D contrib/sysmobts.service
A contrib/systemd/Makefile.am
R contrib/systemd/lc15bts-mgr.service
R contrib/systemd/osmo-bts-lc15.service
R contrib/systemd/osmo-bts-sysmo.service
R contrib/systemd/sysmobts-mgr.service
M debian/osmo-bts-trx.install
D debian/osmo-bts-trx.service
M debian/osmo-bts-virtual.install
D debian/osmo-bts-virtual.service
M debian/rules
14 files changed, 45 insertions(+), 25 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/10898/1

diff --git a/Makefile.am b/Makefile.am
index 10ff2d2..b573aa8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6

-SUBDIRS = include src tests doc
+SUBDIRS = include src tests doc contrib


 # package the contrib and doc
 EXTRA_DIST = \
-   contrib/dump_docs.py contrib/screenrc-l1fwd 
contrib/osmo-bts-sysmo.service \
+   contrib/dump_docs.py contrib/screenrc-l1fwd \
contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \
doc/examples/sysmo/osmo-bts.cfg \
doc/examples/sysmo/sysmobts-mgr.cfg \
@@ -14,6 +14,9 @@
git-version-gen .version \
README.md

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 BUILT_SOURCES = $(top_srcdir)/.version
diff --git a/configure.ac b/configure.ac
index aad55db..38e6713 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,6 +279,22 @@
CPPFLAGS=$oldCPPFLAGS
 fi

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -307,4 +323,6 @@
 tests/meas/Makefile
 doc/Makefile
 doc/examples/Makefile
+contrib/Makefile
+contrib/systemd/Makefile
 Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/sysmobts.service b/contrib/sysmobts.service
deleted file mode 100644
index 64e0127..000
--- a/contrib/sysmobts.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=sysmocom sysmoBTS
-
-[Service]
-Type=simple
-ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'
-ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M
-ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'
-ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 
; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s'
-Restart=always
-RestartSec=2
-RestartPreventExitStatus=1
-
-# The msg queues must be read fast enough
-CPUSchedulingPolicy=rr
-CPUSchedulingPriority=1
-
-[Install]
-WantedBy=multi-user.target
-Alias=osmo-bts-sysmo.service
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..1646308
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,18 @@
+if HAVE_SYSTEMD
+SYSTEMD_SERVICES = osmo-bts-virtual.service
+
+if ENABLE_SYSMOBTS
+SYSTEMD_SERVICES += osmo-bts-sysmo.service sysmobts-mgr.service
+endif
+
+if ENABLE_TRX
+SYSTEMD_SERVICES += osmo-bts-trx.service
+endif
+
+if ENABLE_LC15BTS
+SYSTEMD_SERVICES += osmo-bts-lc15.service lc15bts-mgr.service
+endif
+
+EXTRA_DIST = $(SYSTEMD_SERVICES)
+systemdsystemunit_DATA = $(SYSTEMD_SERVICES)
+endif # HAVE_SYSTEMD
diff --git a/contrib/lc15bts-mgr.service b/contrib/systemd/lc15bts-mgr.service
similarity index 100%
rename from contrib/lc15bts-mgr.service
rename to contrib/systemd/lc15bts-mgr.service
diff --git a/contrib/osmo-bts-lc15.service 
b/contrib/systemd/osmo-bts-lc15.service
similarity index 100%
rename from contrib/osmo-bts-lc15.service
rename to 

Change in osmo-pcu[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10899


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: Ie4c7e81495181059d1dff1c194d52d11fb72ed03
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
R contrib/systemd/osmo-pcu.service
M debian/osmo-pcu.install
D debian/osmo-pcu.service
M debian/rules
8 files changed, 32 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/99/10899/1

diff --git a/Makefile.am b/Makefile.am
index 7a4e6c0..240e4ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,11 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
-SUBDIRS = include src examples tests
+SUBDIRS = include src examples tests contrib
 EXTRA_DIST = osmoappdesc.py README.md

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 7288c24..90394e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,6 +157,22 @@
 STD_DEFINES_AND_INCLUDES="-Wall"
 AC_SUBST(STD_DEFINES_AND_INCLUDES)

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
@@ -168,4 +184,6 @@
 src/Makefile
 examples/Makefile
 tests/Makefile
+contrib/Makefile
+contrib/systemd/Makefile
 Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..f565234
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-pcu.service
+systemdsystemunit_DATA = \
+  osmo-pcu.service
+endif
diff --git a/contrib/osmo-pcu.service b/contrib/systemd/osmo-pcu.service
similarity index 100%
rename from contrib/osmo-pcu.service
rename to contrib/systemd/osmo-pcu.service
diff --git a/debian/osmo-pcu.install b/debian/osmo-pcu.install
index 80316ee..1b82e96 100644
--- a/debian/osmo-pcu.install
+++ b/debian/osmo-pcu.install
@@ -1,4 +1,5 @@
 etc/osmocom/osmo-pcu.cfg
+lib/systemd/system/osmo-pcu.service
 usr/bin/osmo-pcu
 usr/include/osmocom/pcu/pcuif_proto.h
 usr/lib/*/pkgconfig/osmo-pcu.pc
diff --git a/debian/osmo-pcu.service b/debian/osmo-pcu.service
deleted file mode 12
index f077431..000
--- a/debian/osmo-pcu.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/osmo-pcu.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index cffb6ca..712dd75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,6 @@
 # Print test results in case of a failure
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
+
+override_dh_auto_configure:
+   dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system

--
To view, visit https://gerrit.osmocom.org/10899
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4c7e81495181059d1dff1c194d52d11fb72ed03
Gerrit-Change-Number: 10899
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-bsc[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10897


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-bsc.install
D debian/osmo-bsc.service
M debian/rules
7 files changed, 32 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/10897/1

diff --git a/Makefile.am b/Makefile.am
index 2f0a786..60a5b4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,11 +13,15 @@
include \
src \
tests \
+   contrib \
$(NULL)

 BUILT_SOURCES = $(top_srcdir)/.version
 EXTRA_DIST = git-version-gen osmoappdesc.py .version

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 $(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index 54d6a83..c6fa9a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,6 +157,22 @@
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -183,4 +199,6 @@
 tests/handover/Makefile
 doc/Makefile
 doc/examples/Makefile
+contrib/Makefile
+contrib/systemd/Makefile
 Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..5119adf
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-bsc.service
+systemdsystemunit_DATA = \
+  osmo-bsc.service
+endif
diff --git a/debian/osmo-bsc.install b/debian/osmo-bsc.install
index 5dc1e0f..651ddb3 100644
--- a/debian/osmo-bsc.install
+++ b/debian/osmo-bsc.install
@@ -1,3 +1,4 @@
+lib/systemd/system/osmo-bsc.service
 usr/bin/osmo-bsc
 usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 
usr/share/doc/osmo-bsc/examples
 usr/share/doc/osmo-bsc/examples/osmo-bsc/osmo-bsc.cfg 
usr/share/doc/osmo-bsc/examples
diff --git a/debian/osmo-bsc.service b/debian/osmo-bsc.service
deleted file mode 12
index ce03af1..000
--- a/debian/osmo-bsc.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-bsc.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 71ffbf1..ffc99db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,8 +42,10 @@

 # main packaging script based on dh7 syntax
 %:
-   dh $@ --with autoreconf
+   dh $@ --with autoreconf

+# debmake generated override targets
+CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system
 override_dh_auto_configure:
dh_auto_configure -- $(CONFIGURE_FLAGS)
 #

--
To view, visit https://gerrit.osmocom.org/10897
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I015ac3fbe5adc551b76bac5c15ad93d30d0d2b6e
Gerrit-Change-Number: 10897
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-msc[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10896


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-msc.install
D debian/osmo-msc.service
M debian/rules
7 files changed, 31 insertions(+), 3 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/10896/1

diff --git a/Makefile.am b/Makefile.am
index 2f0a786..9f3644f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,12 +12,16 @@
doc \
include \
src \
+   contrib \
tests \
$(NULL)

 BUILT_SOURCES = $(top_srcdir)/.version
 EXTRA_DIST = git-version-gen osmoappdesc.py .version

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 $(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index 03acc0c..2d8dc42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,6 +181,22 @@
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -203,4 +219,6 @@
 tests/msc_vlr/Makefile
 doc/Makefile
 doc/examples/Makefile
+contrib/Makefile
+contrib/systemd/Makefile
 Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..8648172
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-msc.service
+systemdsystemunit_DATA = \
+  osmo-msc.service
+endif
diff --git a/debian/osmo-msc.install b/debian/osmo-msc.install
index 6b84b8f..1e7f22f 100644
--- a/debian/osmo-msc.install
+++ b/debian/osmo-msc.install
@@ -1,3 +1,4 @@
+lib/systemd/system/osmo-msc.service
 usr/bin/osmo-msc
 usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc.cfg 
usr/share/doc/osmo-msc/examples
 usr/share/doc/osmo-msc/examples/osmo-msc/osmo-msc_custom-sccp.cfg 
usr/share/doc/osmo-msc/examples
diff --git a/debian/osmo-msc.service b/debian/osmo-msc.service
deleted file mode 12
index 784b8b5..000
--- a/debian/osmo-msc.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-msc.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 15e79da..1cf3a35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,11 +42,11 @@

 # main packaging script based on dh7 syntax
 %:
-   dh $@ --with autoreconf
+   dh $@ --with autoreconf

 # debmake generated override targets
 # Set options for ./configure
-CONFIGURE_FLAGS += --enable-iu --enable-smpp
+CONFIGURE_FLAGS += --enable-iu --enable-smpp 
--with-systemdsystemunitdir=/lib/systemd/system
 override_dh_auto_configure:
dh_auto_configure -- $(CONFIGURE_FLAGS)
 #

--
To view, visit https://gerrit.osmocom.org/10896
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a87d5ad4cb43efdcfc25828144f825f4d3b1594
Gerrit-Change-Number: 10896
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-mgw[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10895


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c
---
M Makefile.am
M configure.ac
M contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-mgw.install
D debian/osmo-mgw.service
M debian/rules
7 files changed, 32 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/10895/1

diff --git a/Makefile.am b/Makefile.am
index 3270e4f..1497f80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,9 @@
 BUILT_SOURCES = $(top_srcdir)/.version
 EXTRA_DIST = git-version-gen osmoappdesc.py .version

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 $(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index 9f021df..3e6581d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,22 @@
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -151,4 +167,5 @@
 doc/Makefile
 doc/examples/Makefile
 contrib/Makefile
+contrib/systemd/Makefile
 Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index db6d0f5..ab410c7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1 +1,3 @@
+SUBDIRS = systemd
+
 EXTRA_DIST = ipa.py
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..c0d95ff
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-mgw.service
+systemdsystemunit_DATA = \
+  osmo-mgw.service
+endif
diff --git a/debian/osmo-mgw.install b/debian/osmo-mgw.install
index 39f7c01..ad3d3c6 100644
--- a/debian/osmo-mgw.install
+++ b/debian/osmo-mgw.install
@@ -1,2 +1,3 @@
+lib/systemd/system/osmo-mgw.service
 usr/bin/osmo-mgw
 usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw.cfg
diff --git a/debian/osmo-mgw.service b/debian/osmo-mgw.service
deleted file mode 12
index 1e0664c..000
--- a/debian/osmo-mgw.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-mgw.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index d13e426..d67243c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@

 # main packaging script based on dh7 syntax
 %:
-   dh $@ --with autoreconf
+   dh $@ --with autoreconf

 # debmake generated override targets
 # Set options for ./configure
@@ -29,4 +29,7 @@
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)

+override_dh_auto_configure:
+   dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system
+
 # See 
https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg

--
To view, visit https://gerrit.osmocom.org/10895
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e4dae6b8c1685e8a673c58a843c41fa0af1b35c
Gerrit-Change-Number: 10895
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-ggsn[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10893


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I563559f5b501eded44efafc60bb0c9ffdea20b3e
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
R contrib/systemd/osmo-ggsn.service
M debian/osmo-ggsn.install
D debian/osmo-ggsn.service
M debian/rules
8 files changed, 35 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/93/10893/1

diff --git a/Makefile.am b/Makefile.am
index f9849c0..be378be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = lib gtp ggsn sgsnemu doc tests
+SUBDIRS = lib gtp ggsn sgsnemu doc contrib tests

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtp.pc
@@ -12,4 +12,7 @@

 EXTRA_DIST = git-version-gen .version README.md README.FreeBSD README.MacOSX

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@
diff --git a/configure.ac b/configure.ac
index 62812ae..bfa1364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,9 @@


 case "${host}" in
-  i*86-*-linux-gnu*)
+  i*86-*-linux-gnu*)
 EXEC_LDADD="" ;;
-  *solaris*)
+  *solaris*)
 EXEC_LDADD="-lresolv -lsocket -lnsl" ;;
 esac

@@ -126,7 +126,7 @@
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 # AC_FUNC_MALLOC
-# AC_FUNC_MEMCMP
+# AC_FUNC_MEMCMP
 AC_CHECK_FUNCS([gethostbyname inet_ntoa memset select socket strdup strerror 
strtol])
 AC_CHECK_FUNCS(inet_aton inet_addr, break)

@@ -169,6 +169,22 @@
CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
 fi

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -181,6 +197,8 @@
  intl/Makefile
  po/Makefile
  sgsnemu/Makefile
+ contrib/Makefile
+ contrib/systemd/Makefile
  tests/Makefile
  tests/lib/Makefile
  tests/gtp/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..e6ad299
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-ggsn.service
+systemdsystemunit_DATA = \
+  osmo-ggsn.service
+endif
diff --git a/contrib/osmo-ggsn.service b/contrib/systemd/osmo-ggsn.service
similarity index 100%
rename from contrib/osmo-ggsn.service
rename to contrib/systemd/osmo-ggsn.service
diff --git a/debian/osmo-ggsn.install b/debian/osmo-ggsn.install
index 522a3d1..17caef7 100644
--- a/debian/osmo-ggsn.install
+++ b/debian/osmo-ggsn.install
@@ -1,3 +1,4 @@
+/lib/systemd/system/osmo-ggsn.service
 /usr/bin/osmo-ggsn
 /usr/bin/sgsnemu
 /usr/share/man/man8/*
diff --git a/debian/osmo-ggsn.service b/debian/osmo-ggsn.service
deleted file mode 12
index 3bc7d3d..000
--- a/debian/osmo-ggsn.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/osmo-ggsn.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 5db7886..fa087ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,3 +17,6 @@
 override_dh_strip:
dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg
dh_strip -plibgtp3 --dbg-package=libgtp-dbg
+
+override_dh_auto_configure:
+   dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system

--
To view, visit https://gerrit.osmocom.org/10893
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I563559f5b501eded44efafc60bb0c9ffdea20b3e
Gerrit-Change-Number: 10893
Gerrit-PatchSet: 1
Gerrit-Owner: Pau 

Change in osmo-sgsn[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10894


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I103bf3468d53578045593eac31b61f7e0248495e
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-gbproxy.install
D debian/osmo-gbproxy.service
M debian/osmo-gtphub.install
D debian/osmo-gtphub.service
M debian/osmo-sgsn.install
D debian/osmo-sgsn.service
M debian/rules
11 files changed, 37 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/94/10894/1

diff --git a/Makefile.am b/Makefile.am
index 38fdcba..1883ab5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@
doc \
include \
src \
+   contrib \
tests \
$(NULL)

@@ -21,6 +22,9 @@
 BUILT_SOURCES = $(top_srcdir)/.version
 EXTRA_DIST = git-version-gen osmoappdesc.py .version

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 $(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index c233fa3..73b6dce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,22 @@
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -201,4 +217,6 @@
 tests/v42bis/Makefile
 doc/Makefile
 doc/examples/Makefile
+contrib/Makefile
+contrib/systemd/Makefile
 Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..b644f34
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,9 @@
+if HAVE_SYSTEMD
+SYSTEMD_SERVICES = \
+  osmo-gbproxy.service \
+  osmo-gtphub.service \
+  osmo-sgsn.service
+
+EXTRA_DIST = $(SYSTEMD_SERVICES)
+systemdsystemunit_DATA = $(SYSTEMD_SERVICES)
+endif
diff --git a/debian/osmo-gbproxy.install b/debian/osmo-gbproxy.install
index 8272551..9c7fb77 100644
--- a/debian/osmo-gbproxy.install
+++ b/debian/osmo-gbproxy.install
@@ -1,3 +1,4 @@
+lib/systemd/system/osmo-gbproxy.service
 usr/bin/osmo-gbproxy
 usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg 
usr/share/doc/osmo-gbproxy/examples
 usr/share/doc/osmo-sgsn/examples/osmo-gbproxy/osmo-gbproxy.cfg 
usr/share/doc/osmo-gbproxy/examples
diff --git a/debian/osmo-gbproxy.service b/debian/osmo-gbproxy.service
deleted file mode 12
index d23c649..000
--- a/debian/osmo-gbproxy.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-gbproxy.service
\ No newline at end of file
diff --git a/debian/osmo-gtphub.install b/debian/osmo-gtphub.install
index ed0bd1b..568caaf 100644
--- a/debian/osmo-gtphub.install
+++ b/debian/osmo-gtphub.install
@@ -1,3 +1,4 @@
+lib/systemd/system/osmo-gtphub.service
 usr/bin/osmo-gtphub
 usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub-1iface.cfg 
usr/share/doc/osmo-gtphub/examples
 usr/share/doc/osmo-sgsn/examples/osmo-gtphub/osmo-gtphub.cfg 
usr/share/doc/osmo-gtphub/examples
diff --git a/debian/osmo-gtphub.service b/debian/osmo-gtphub.service
deleted file mode 12
index 81a0eb4..000
--- a/debian/osmo-gtphub.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-gtphub.service
\ No newline at end of file
diff --git a/debian/osmo-sgsn.install b/debian/osmo-sgsn.install
index 9390deb..9d603f9 100644
--- a/debian/osmo-sgsn.install
+++ b/debian/osmo-sgsn.install
@@ -1,3 +1,4 @@
+lib/systemd/system/osmo-sgsn.service
 usr/bin/osmo-sgsn
 usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn.cfg 
usr/share/doc/osmo-sgsn/examples
 usr/share/doc/osmo-sgsn/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg 
usr/share/doc/osmo-sgsn/examples
diff 

Change in osmo-iuh[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10891


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: I90f1efc4433ec641a28931d5c19e2301a67cf1e9
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-hnbgw.install
D debian/osmo-hnbgw.service
M debian/rules
7 files changed, 32 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/91/10891/1

diff --git a/Makefile.am b/Makefile.am
index 67445ee..2e59306 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,15 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2

-SUBDIRS = src include doc
+SUBDIRS = src include doc contrib

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosmo-ranap.pc

 EXTRA_DIST = asn1 .version README.md

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 @RELMAKE@

 BUILT_SOURCES = $(top_srcdir)/.version
diff --git a/configure.ac b/configure.ac
index bb99dfb..559db39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,22 @@
 CFLAGS="$CFLAGS -Wall"
 CPPFLAGS="$CPPFLAGS -Wall"

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 
@@ -98,4 +114,6 @@
include/osmocom/iuh/Makefile
doc/Makefile
doc/examples/Makefile
+   contrib/Makefile
+   contrib/systemd/Makefile
)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..507be2d
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-hnbgw.service
+systemdsystemunit_DATA = \
+  osmo-hnbgw.service
+endif
diff --git a/debian/osmo-hnbgw.install b/debian/osmo-hnbgw.install
index e230915..bb70ad5 100644
--- a/debian/osmo-hnbgw.install
+++ b/debian/osmo-hnbgw.install
@@ -1,2 +1,3 @@
+lib/systemd/system/osmo-hnbgw.service
 usr/bin/osmo-hnbgw
 usr/share/doc/osmo-iuh/examples/osmo-hnbgw.cfg
diff --git a/debian/osmo-hnbgw.service b/debian/osmo-hnbgw.service
deleted file mode 12
index e69ea55..000
--- a/debian/osmo-hnbgw.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-hnbgw.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 9ebfdd0..6f20b3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,6 @@
 # Print test results in case of a failure
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
+
+override_dh_auto_configure:
+   dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system

--
To view, visit https://gerrit.osmocom.org/10891
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90f1efc4433ec641a28931d5c19e2301a67cf1e9
Gerrit-Change-Number: 10891
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in osmo-hlr[master]: Install systemd services with autotools

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/10892


Change subject: Install systemd services with autotools
..

Install systemd services with autotools

Change-Id: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694
---
M Makefile.am
M configure.ac
A contrib/Makefile.am
A contrib/systemd/Makefile.am
M debian/osmo-hlr.install
D debian/osmo-hlr.service
M debian/rules
7 files changed, 32 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/10892/1

diff --git a/Makefile.am b/Makefile.am
index 8e18167..210e499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@
src \
include \
sql \
+   contrib \
tests \
$(NULL)

@@ -12,6 +13,9 @@
.version \
$(NULL)

+DISTCHECK_CONFIGURE_FLAGS = \
+   --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosmo-gsup-client.pc

diff --git a/configure.ac b/configure.ac
index 16c8b51..368f1cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,22 @@
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")

+# https://www.freedesktop.org/software/systemd/man/daemon.html
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd 
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o 
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir 
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+[AC_MSG_ERROR([systemd support requested but pkg-config unable to query 
systemd package])])
+with_systemdsystemunitdir=no],
+   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+  [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

@@ -103,6 +119,8 @@
include/Makefile
libosmo-gsup-client.pc
sql/Makefile
+   contrib/Makefile
+   contrib/systemd/Makefile
tests/Makefile
tests/auc/Makefile
tests/auc/gen_ts_55_205_test_sets/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 000..3439c97
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = systemd
diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
new file mode 100644
index 000..520e720
--- /dev/null
+++ b/contrib/systemd/Makefile.am
@@ -0,0 +1,5 @@
+if HAVE_SYSTEMD
+EXTRA_DIST = osmo-hlr.service
+systemdsystemunit_DATA = \
+  osmo-hlr.service
+endif
diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install
index 7991522..5a7c37b 100644
--- a/debian/osmo-hlr.install
+++ b/debian/osmo-hlr.install
@@ -1,3 +1,4 @@
+/lib/systemd/system/osmo-hlr.service
 /usr/bin/osmo-hlr
 /usr/bin/osmo-hlr-db-tool
 /usr/share/doc/osmo-hlr/sql/hlr.sql
diff --git a/debian/osmo-hlr.service b/debian/osmo-hlr.service
deleted file mode 12
index 184f5aa..000
--- a/debian/osmo-hlr.service
+++ /dev/null
@@ -1 +0,0 @@
-../contrib/systemd/osmo-hlr.service
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 1d8d8ab..9e97c6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,6 @@
 # Print test results in case of a failure
 override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
+
+override_dh_auto_configure:
+   dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system

--
To view, visit https://gerrit.osmocom.org/10892
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id81ae8e2d8a2c9456ac0dac2c30c0d24dab3b694
Gerrit-Change-Number: 10892
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 

Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts

[Vasil Velichkov]

Vasil Velichkov has posted comments on this change. ( 
https://gerrit.osmocom.org/10881 )

Change subject: burst_file_source: Fix reading longer bursts
..


Patch Set 2:

(2 comments)

https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc
File lib/misc_utils/burst_file_source_impl.cc:

https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc@96
PS1, Line 96: d_input_file.close();
> ws
Done


https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py
File python/qa_burst_file_source.py:

https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py@1
PS1, Line 1: #!/usr/bin/env python
> Would this script work with both Python 2 and 3? […]
It should once the gnuradio supports python3.
I prefer not to change this as all other python tests are like this and 
gr_modtool also generate new tests with python and not python2/3



--
To view, visit https://gerrit.osmocom.org/10881
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc
Gerrit-Change-Number: 10881
Gerrit-PatchSet: 2
Gerrit-Owner: Vasil Velichkov 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Reviewer: Vasil Velichkov 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 11:08:51 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts

[Vasil Velichkov]

Hello Piotr Krysik,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/10881

to look at the new patch set (#2).

Change subject: burst_file_source: Fix reading longer bursts
..

burst_file_source: Fix reading longer bursts

- Read bursts with pmt::deserialize directly from the std::filebuf
- Remove the unused unserialized variable
- Add tests

Since df978693 when the rx_time tags are present in the incomming stream
the gsm receiver adds fm_time to the burst's PMT and the bursts that
burst file sink writes becomes longer because of the additional field.

The burst file source block was expecting all burst to be 147 bytes long
and reading files with longer bursts was failing with an unhandled exception.

terminate called after throwing an instance of 'pmt::exception'
thread[thread-per-block[5]: ]: pmt_cdr: 
wrong_type : #f
  what():  pmt::deserialize: malformed input stream, tag value = : 115

Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc
---
M lib/misc_utils/burst_file_source_impl.cc
M lib/qa_utils/burst_source_impl.cc
M python/CMakeLists.txt
A python/qa_burst_file_source.py
4 files changed, 109 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/81/10881/2
--
To view, visit https://gerrit.osmocom.org/10881
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc
Gerrit-Change-Number: 10881
Gerrit-PatchSet: 2
Gerrit-Owner: Vasil Velichkov 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Reviewer: Vasil Velichkov 
Gerrit-CC: Vadim Yanitskiy 

Change in gr-gsm[master]: burst_file_source: Fix reading longer bursts

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10881 )

Change subject: burst_file_source: Fix reading longer bursts
..


Patch Set 1:

(2 comments)

https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc
File lib/misc_utils/burst_file_source_impl.cc:

https://gerrit.osmocom.org/#/c/10881/1/lib/misc_utils/burst_file_source_impl.cc@96
PS1, Line 96:
ws


https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py
File python/qa_burst_file_source.py:

https://gerrit.osmocom.org/#/c/10881/1/python/qa_burst_file_source.py@1
PS1, Line 1: #!/usr/bin/env python
Would this script work with both Python 2 and 3?
If no, it makes sense to specify the version explicitly:

  #!/usr/bin/env python2



--
To view, visit https://gerrit.osmocom.org/10881
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I989b0d6a6b214088b7880e5cbf7bb6725492dbfc
Gerrit-Change-Number: 10881
Gerrit-PatchSet: 1
Gerrit-Owner: Vasil Velichkov 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Reviewer: Vasil Velichkov 
Gerrit-CC: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 10:14:26 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in libosmocore[master]: logging vty: add 'logging level set-all '

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10889 )

Change subject: logging vty: add 'logging level set-all '
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10889
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I4c3e4f786476cb813fdc0a7c64f30ee04758309d
Gerrit-Change-Number: 10889
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 08:32:12 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: logging vty: deprecate 'all', introduce 'force-all'

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10888 )

Change subject: logging vty: deprecate 'all', introduce 'force-all'
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10888
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I36f17c131cc70ce5a1aef62fd9693097de230cd4
Gerrit-Change-Number: 10888
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 08:30:23 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: logging: define lower-case loglevel value_string[]

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10886 )

Change subject: logging: define lower-case loglevel value_string[]
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10886
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie55d732281bdf74324e1dd7f8a2ba91d11409851
Gerrit-Change-Number: 10886
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 08:23:37 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: logging vty: add VTY transcript test

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10883 )

Change subject: logging vty: add VTY transcript test
..


Patch Set 1: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10883
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I948e832a33131f8eab98651d6010ceb0ccbc9a9c
Gerrit-Change-Number: 10883
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 08:16:15 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in libosmocore[master]: fix tests linking: don't use system installed libs

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/5844 )

Change subject: fix tests linking: don't use system installed libs
..


Patch Set 6:

So, let's try to figure out the reason of this strange behavior
first, before merging this change?


--
To view, visit https://gerrit.osmocom.org/5844
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6
Gerrit-Change-Number: 5844
Gerrit-PatchSet: 6
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 08:11:33 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmocore[master]: fix tests linking: don't use system installed libs

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/5844 )

Change subject: fix tests linking: don't use system installed libs
..


Patch Set 6:

Doing the following:

> $ cd libosmocore/tests/
> $ ldd gb/.libs/bssgp_fc_test | grep osmo

results in the following:

> libosmocore.so.11 => /usr/local/lib/libosmocore.so.11 (0x7fd995723000)
> libosmogb.so.6 => /usr/local/lib/libosmogb.so.6 (0x7fd9952fb000)
> libosmovty.so.4 => /usr/local/lib/libosmovty.so.4 (0x7fd994b0e000)
> libosmogsm.so.10 => /usr/local/lib/libosmogsm.so.10 (0x7fd9948b5000)

but there is also an 'lt-*' version, so:

> $ ldd gb/.libs/lt-bssgp_fc_test | grep osmo

results in:

> libosmocore.so.11 => /opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 
> (0x7fab7bd22000)
> libosmogb.so.6 => /opt/osmocom/libosmocore/src/gb/.libs/libosmogb.so.6 
> (0x7fab7b8fa000)
> libosmovty.so.4 => /opt/osmocom/libosmocore/src/vty/.libs/libosmovty.so.4 
> (0x7fab7b10d000)
> libosmogsm.so.10 => /opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 
> (0x7fab7aeb4000)


--
To view, visit https://gerrit.osmocom.org/5844
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6
Gerrit-Change-Number: 5844
Gerrit-PatchSet: 6
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 08:09:38 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in libosmocore[master]: fix tests linking: don't use system installed libs

[Vadim Yanitskiy]

Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/5844 )

Change subject: fix tests linking: don't use system installed libs
..


Patch Set 6:

Hi Neels,

> Vadim, I don't understand why you can't reproduce this problem,

Well, does anyone else experience this problem too?

> maybe your installed libraries are simply not in the LD_LIBRARY_PATH?

My LD_LIBRARY_PATH is empty, all libraries are installed to the
default '/usr/local/lib/' location, that is configured for most
Debian based distributions in '/etc/ld.so.conf.d/libc.conf'.

I just even tried to explicitly set LD_LIBRARY_PATH to '/usr/local/lib/',
but the result is the same, not matching your output:

$ for l in $(find . -name "*.so") ; do echo; echo "$l"; ldd $l | grep libosmo; 
done
./src/coding/.libs/libosmocoding.so
libosmocore.so.11 => 
/opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x7f8fac718000)
libosmogsm.so.10 => 
/opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x7f8fac4bf000)
libosmocodec.so.0 => 
/opt/osmocom/libosmocore/src/codec/.libs/libosmocodec.so.0 (0x7f8fac2bb000)

./src/sim/.libs/libosmosim.so
libosmocore.so.11 => 
/opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x7f0439542000)
libosmogsm.so.10 => 
/opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x7f04392e9000)

./src/.libs/libosmocore.so

./src/gsm/.libs/libosmogsm.so
libosmocore.so.11 => 
/opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x7f68f8339000)

./src/gb/.libs/libosmogb.so
libosmocore.so.11 => 
/opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x7f2989c75000)
libosmovty.so.4 => 
/opt/osmocom/libosmocore/src/vty/.libs/libosmovty.so.4 (0x7f2989a55000)
libosmogsm.so.10 => 
/opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x7f29897fc000)

./src/vty/.libs/libosmovty.so
libosmocore.so.11 => 
/opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x7f064ba63000)

./src/codec/.libs/libosmocodec.so
libosmocore.so.11 => 
/opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x7f973165)

./src/ctrl/.libs/libosmoctrl.so
libosmocore.so.11 => 
/opt/osmocom/libosmocore/src/.libs/libosmocore.so.11 (0x7f187bd94000)
libosmogsm.so.10 => 
/opt/osmocom/libosmocore/src/gsm/.libs/libosmogsm.so.10 (0x7f187bb3b000)
libosmovty.so.4 => 
/opt/osmocom/libosmocore/src/vty/.libs/libosmovty.so.4 (0x7f187b91b000)

where '/opt/osmocom/libosmocore/' is exactly the build directory...


--
To view, visit https://gerrit.osmocom.org/5844
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id084e6e6efd25cd62b1bd7a4fc7c5985c39130c6
Gerrit-Change-Number: 5844
Gerrit-PatchSet: 6
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 08:01:40 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in gr-gsm[master]: apps/grgsm_trx: migrate from getopt to argparse

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10832 )

Change subject: apps/grgsm_trx: migrate from getopt to argparse
..


Patch Set 3: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10832
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I24a17b4cd44db0ce95a19d7470f4f09f3c85a26d
Gerrit-Change-Number: 10832
Gerrit-PatchSet: 3
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 07:41:51 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: trx/radio_if.py: clarify magic numbers in sample rate calculation

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10880 )

Change subject: trx/radio_if.py: clarify magic numbers in sample rate 
calculation
..


Patch Set 2: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10880
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I55f283113d0324a0236b7bbf13bce5718003b857
Gerrit-Change-Number: 10880
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Comment-Date: Wed, 12 Sep 2018 07:41:32 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: apps/grgsm_trx: fix inaccurate sample rate calculation

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10831 )

Change subject: apps/grgsm_trx: fix inaccurate sample rate calculation
..


Patch Set 3: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/10831
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I0c309588fa0f7822abfb3919327639735db07679
Gerrit-Change-Number: 10831
Gerrit-PatchSet: 3
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Piotr Krysik 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Wed, 12 Sep 2018 07:41:07 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10768 )

Change subject: GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC
..

GSUP_Types.ttcn: add tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC

Match only on AKA RESYNC packages

Change-Id: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7
---
M library/GSUP_Types.ttcn
1 file changed, 27 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index ba8180f..0d21404 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -299,6 +299,17 @@
 template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) :=
tr_GSUP_IMSI(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, imsi);

+template GSUP_PDU tr_GSUP_SAI_REQ_UMTS_AKA_RESYNC(
+   template hexstring imsi,
+   template octetstring auts,
+   template octetstring rand) :=
+   tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, {
+   tr_GSUP_IE_IMSI(imsi),
+   tr_GSUP_IE_AUTS(auts),
+   tr_GSUP_IE_RAND(rand),
+   *
+   });
+
 template (value) GSUP_PDU ts_GSUP_SAI_RES(hexstring imsi, GSUP_IE auth_tuple) 
:=
ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT, {
valueof(ts_GSUP_IE_IMSI(imsi)), auth_tuple });
@@ -464,6 +475,14 @@
}
 }

+template GSUP_IE tr_GSUP_IE_AUTS(template octetstring auts) := {
+   tag := OSMO_GSUP_AUTS_IE,
+   len := ?,
+   val := {
+   auts := auts
+   }
+}
+
 template (value) GSUP_IE ts_GSUP_IE_RAND(octetstring rand) := {
tag := OSMO_GSUP_RAND_IE,
len := 0, /* overwritten */
@@ -472,6 +491,14 @@
}
 }

+template GSUP_IE tr_GSUP_IE_RAND(template octetstring rand) := {
+   tag := OSMO_GSUP_RAND_IE,
+   len := ?,
+   val := {
+   rand := rand
+   }
+}
+
 template (value) GSUP_IE ts_GSUP_IE_SRES(octetstring sres) := {
tag := OSMO_GSUP_SRES_IE,
len := 0, /* overwritten */

--
To view, visit https://gerrit.osmocom.org/10768
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibab8a76fde78db6e7a84794e0b641bcb7b1fd1a7
Gerrit-Change-Number: 10768
Gerrit-PatchSet: 4
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain AUTS

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10767 )

Change subject: L3_Common: extend the AuthVector to contain AUTS
..

L3_Common: extend the AuthVector to contain AUTS

AUTS is used in the UMTS AKA resync procedure.

Change-Id: Id1afa47778e6220cab375ae4b54b251801724fdb
---
M library/L3_Common.ttcn
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/library/L3_Common.ttcn b/library/L3_Common.ttcn
index bf7818a..57db6b3 100644
--- a/library/L3_Common.ttcn
+++ b/library/L3_Common.ttcn
@@ -11,7 +11,11 @@
OCT16 ik,
OCT16 ck,
OCT16 autn,
-   OCT8 res
+   OCT8 res,
+   /* auts is usally calculated from autn + rand on the MS.
+* To simplify the test case, auts is generated instead calculated here.
+*/
+   OCT14 auts
 }

 private function f_rnd_oct(integer len) return octetstring {
@@ -37,6 +41,7 @@
vec.ck := f_rnd_oct(16);
vec.autn := f_rnd_oct(16);
vec.res := f_rnd_oct(8);
+   vec.auts := f_rnd_oct(14);
return vec;
 }


--
To view, visit https://gerrit.osmocom.org/10767
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1afa47778e6220cab375ae4b54b251801724fdb
Gerrit-Change-Number: 10767
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)

Change in osmo-ttcn3-hacks[master]: L3_Common: extend the AuthVector to contain AUTS

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10767 )

Change subject: L3_Common: extend the AuthVector to contain AUTS
..


Patch Set 5: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10767
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Id1afa47778e6220cab375ae4b54b251801724fdb
Gerrit-Change-Number: 10767
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Comment-Date: Wed, 12 Sep 2018 07:38:58 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in gr-gsm[master]: Add .gitreview similar to the other osmocom's projects

[Harald Welte]

Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10882 )

Change subject: Add .gitreview similar to the other osmocom's projects
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10882
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie07446ba1a13e53c87bcc9b23e3b775803d158f4
Gerrit-Change-Number: 10882
Gerrit-PatchSet: 1
Gerrit-Owner: Vasil Velichkov 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Wed, 12 Sep 2018 07:38:13 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes