Change in osmo-bsc[master]: Drop unused old osmux leftover code
Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13649 ) Change subject: Drop unused old osmux leftover code .. Drop unused old osmux leftover code Let's better clean up old stuff before doing new implementation. Change-Id: Id4e254a1c24831afaba9ab7b330d4e09a2474c8e --- M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/osmux.h 2 files changed, 0 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 02a4ad8..044fdc9 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -43,7 +43,6 @@ osmo_bsc_rf.h \ osmo_bsc_sigtran.h \ bsc_msc_data.h \ - osmux.h \ paging.h \ pcu_if.h \ pcuif_proto.h \ diff --git a/include/osmocom/bsc/osmux.h b/include/osmocom/bsc/osmux.h deleted file mode 100644 index f3ea72a..000 --- a/include/osmocom/bsc/osmux.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef _OPENBSC_OSMUX_H_ -#define _OPENBSC_OSMUX_H_ - -#include - -#define OSMUX_PORT 1984 - -enum { - OSMUX_ROLE_BSC = 0, - OSMUX_ROLE_BSC_NAT, -}; - -int osmux_init(int role, struct mgcp_config *cfg); -int osmux_enable_endpoint(struct mgcp_endpoint *endp, struct in_addr *addr, uint16_t port); -void osmux_disable_endpoint(struct mgcp_endpoint *endp); -void osmux_allocate_cid(struct mgcp_endpoint *endp); -void osmux_release_cid(struct mgcp_endpoint *endp); - -int osmux_xfrm_to_rtp(struct mgcp_endpoint *endp, int type, char *buf, int rc); -int osmux_xfrm_to_osmux(int type, char *buf, int rc, struct mgcp_endpoint *endp); - -int osmux_send_dummy(struct mgcp_endpoint *endp); - -int osmux_get_cid(void); -void osmux_put_cid(uint8_t osmux_cid); -int osmux_used_cid(void); - -enum osmux_state { - OSMUX_STATE_DISABLED = 0, - OSMUX_STATE_NEGOTIATING, - OSMUX_STATE_ACTIVATING, - OSMUX_STATE_ENABLED, -}; - -enum osmux_usage { - OSMUX_USAGE_OFF = 0, - OSMUX_USAGE_ON = 1, - OSMUX_USAGE_ONLY = 2, -}; - -#endif -- To view, visit https://gerrit.osmocom.org/13649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4e254a1c24831afaba9ab7b330d4e09a2474c8e Gerrit-Change-Number: 13649 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-msc[master]: gsm_04_11: Log MT sms dst subscriber
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13555 ) Change subject: gsm_04_11: Log MT sms dst subscriber .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I483ac61067f51d03f6f476821d8664da3d1f17b2 Gerrit-Change-Number: 13555 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 19:54:37 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: BSSMAP_Emulation: Check for ==/!= null instead of isvalue()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13648 ) Change subject: BSSMAP_Emulation: Check for ==/!= null instead of isvalue() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13648 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: I2434c776c6a4ee83e97bc04e7cbbaf1b546731c0 Gerrit-Change-Number: 13648 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 15 Apr 2019 19:53:52 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: gsm_04_11: Log MT sms dst subscriber
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13555 ) Change subject: gsm_04_11: Log MT sms dst subscriber .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I483ac61067f51d03f6f476821d8664da3d1f17b2 Gerrit-Change-Number: 13555 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 19:54:17 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Drop unused old osmux leftover code
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13649 ) Change subject: Drop unused old osmux leftover code .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13649 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: Id4e254a1c24831afaba9ab7b330d4e09a2474c8e Gerrit-Change-Number: 13649 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 19:53:10 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Add RANAP support
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13653 Change subject: RAN_Emulation: Add RANAP support .. RAN_Emulation: Add RANAP support So far, RAN_Emulation only handled BSSAP and hence could be used to emulate BSCs towards the MSC. Let's extend it with RANAP support so we can also emulate RNCs towards the MSC. We try to share as much code and logic as possible betweeb the two. Related: OS#2856, OS#2857 Change-Id: Ie79bda764162e5c5a42608bde5c5f486ea531f33 --- M library/RAN_Adapter.ttcnpp M library/RAN_Emulation.ttcnpp M library/ranap/RANAP_Templates.ttcn 3 files changed, 418 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/13653/1 diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp index 43b4988..a97d148 100644 --- a/library/RAN_Adapter.ttcnpp +++ b/library/RAN_Adapter.ttcnpp @@ -43,7 +43,8 @@ type enumerated RAN_Transport { BSSAP_TRANSPORT_AoIP, /* 3GPP AoIP: SCCP over M3UA over SCTP */ BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */ - BSSAP_TRANSPORT_SCCPlite_CLIENT /* SCCPlite: SCCP over IPA over TCP */ + BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */ + RANAP_TRANSPORT_IuCS/* 3GPP IuCS: SCCP over M3UA over SCTP */ }; type record RAN_Configuration { @@ -88,8 +89,7 @@ ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN"); } select (cfg.transport) { -#ifdef RAN_EMULATION_BSSAP - case (BSSAP_TRANSPORT_AoIP) { + case (BSSAP_TRANSPORT_AoIP, RANAP_TRANSPORT_IuCS) { ba.vc_M3UA := M3UA_CT.create(id & "-M3UA"); map(ba.vc_M3UA:SCTP_PORT, system:sctp); /* connect MTP3 service provider (M3UA) to lower side of SCCP */ @@ -129,7 +129,6 @@ ba.vc_WAIT.done; disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); } -#endif case else { setverdict(fail, "Unsuppored RAN_Transport"); mtc.stop; @@ -141,16 +140,22 @@ T.start; //T.timeout; log("Connecting BSSMAP Emulation to SCCP_SP_PORT and starting emulation"); -#if RAN_EMULATION_BSSAP /* connect BSSNAP component to upper side of SCCP */ - connect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); + if (cfg.transport == RANAP_TRANSPORT_IuCS) { +#ifdef RAN_EMULATION_RANAP + ops.protocol := RAN_PROTOCOL_RANAP + connect(ba.vc_RAN:RANAP, ba.vc_SCCP:SCCP_SP_PORT); #endif + } else { +#ifdef RAN_EMULATION_BSSAP + connect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); +#endif + } if (cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER or cfg.transport == BSSAP_TRANSPORT_SCCPlite_CLIENT) { /* connect IPA MGCP port with BSSMAP MGCP port */ connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP); } - /* start the BSSMAP emulation */ ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), "")); } diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 21dbea9..b826982 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -48,6 +48,14 @@ import from MGCP_Templates all; #endif +#ifdef RAN_EMULATION_RANAP +import from RANAP_CodecPort all; +import from RANAP_PDU_Descriptions all; +import from RANAP_Constants all; +import from RANAP_IEs all; +import from RANAP_Templates all; +#endif + /* General "base class" component definition, of which specific implementations * derive themselves by means of the "extends" feature */ type component RAN_ConnHdlr { @@ -110,6 +118,11 @@ /* Client requests us to create SCCP Connection */ BSSAP_Conn_Req, #endif +#ifdef RAN_EMULATION_RANAP + RANAP_PDU, + /* Client requests us to create SCCP Connection */ + RANAP_Conn_Req, +#endif #ifdef RAN_EMULATION_MGCP /* MGCP, only used for IPA SCCPlite (MGCP in IPA mux) */ MgcpCommand, MgcpResponse, @@ -147,6 +160,9 @@ #ifdef RAN_EMULATION_BSSAP port BSSAP_CODEC_PT BSSAP; #endif +#ifdef RAN_EMULATION_RANAP + port RANAP_CODEC_PT RANAP; +#endif /* BSSAP port to the per-connection clients */ port RAN_Conn_PT CLIENT; #ifdef RAN_EMULATION_MGCP @@ -487,10 +503,137 @@ } #endif +#ifdef RAN_EMULATION_RANAP +type record RANAP_Conn_Req { + SCCP_PAR_Addressaddr_peer, + SCCP_PAR_Addressaddr_own, + RANAP_PDU ranap +} +template (value) RANAP_Conn_Req ts_RANAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, RANAP_PDU ranap) := { + addr_pe
Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Modularize protocol support
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13651 Change subject: RAN_Emulation: Modularize protocol support .. RAN_Emulation: Modularize protocol support The RAN_Emulation currently unconditionally provides BSSAP and MGCP support. Let's re-structure the code so that support for those protocols is now possible to enable/disable at compile time. This patch is in preparation of introducing RANAP support in RAN_Emulation. Change-Id: Id53ba3ff05f9946230e0e4a759245de14a0f9fbd Related: OS#2856 --- M bsc-nat/BSC_MS_ConnectionHandler.ttcn M bsc-nat/MSC_ConnectionHandler.ttcn M bsc-nat/gen_links.sh M bsc-nat/regen_makefile.sh M bsc/MSC_ConnectionHandler.ttcn M bsc/gen_links.sh M bsc/regen_makefile.sh R library/RAN_Adapter.ttcnpp R library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 12 files changed, 216 insertions(+), 141 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/13651/1 diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn index 63d0451..e52b678 100644 --- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn +++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn @@ -53,6 +53,7 @@ unitdata_cb := refers(UnitdataCallback), decode_dtap := false, role_ms := true, + protocol := RAN_PROTOCOL_BSSAP, sccp_addr_local := omit, sccp_addr_peer := omit } diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn index 383b67b..8635a29 100644 --- a/bsc-nat/MSC_ConnectionHandler.ttcn +++ b/bsc-nat/MSC_ConnectionHandler.ttcn @@ -59,6 +59,7 @@ unitdata_cb := refers(UnitdataCallback), decode_dtap := false, role_ms := false, + protocol := RAN_PROTOCOL_BSSAP, sccp_addr_local := omit, sccp_addr_peer := omit } diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index e54eec4..16e32b7 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -47,7 +47,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn BSSAP_CodecPort.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index c5fe64c..f49df7e 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -4,6 +4,6 @@ FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DUSE_MTP3_DISTRIBUTOR" ../regen-makefile.sh $MAIN $FILES diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 36e554d..520cc3e 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -376,6 +376,7 @@ unitdata_cb := refers(UnitdataCallback), decode_dtap := false, role_ms := false, + protocol := RAN_PROTOCOL_BSSAP, sccp_addr_local := omit, sccp_addr_peer := omit } diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index d8393c3..a4f09f4 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcn Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn R
Change in osmo-ttcn3-hacks[master]: HNBAP, RUA and RANAP protocol codecs
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/13652 Change subject: HNBAP, RUA and RANAP protocol codecs .. HNBAP, RUA and RANAP protocol codecs This patch introduces protocol codecs for the HNBAP, RUA and RANAP protocols, which is mandatory for testing IuCS, IuPS or Iuh in the future. As Eclipse TITAN ASN.1 only supports the BER codec and the above protocols all use APER, we need to use an external transcoder from APER to BER and vice-versa. This was implemented using a proprietary ASN.1 compiler / trnaslator which sysmocom is packaging as libfftranscode, and which will be made available as bianry package for Debian 9. Related: OS#2856, OS#2857, OS#2858 Change-Id: If4a72de9bc54d6e6a7daaca78a4d4aa5684203a5 --- A asn-test/ttcn3_asn1_rename.sh A library/hnbap/HNBAP_CommonDataTypes.asn A library/hnbap/HNBAP_Constants.asn A library/hnbap/HNBAP_Containers.asn A library/hnbap/HNBAP_EncDec.cc A library/hnbap/HNBAP_IEs.asn A library/hnbap/HNBAP_PDU_Contents.asn A library/hnbap/HNBAP_PDU_Descriptions.asn A library/hnbap/HNBAP_Types.ttcn A library/hnbap/regen_makefile.sh A library/ranap/RANAP_CodecPort.ttcn A library/ranap/RANAP_CommonDataTypes.asn A library/ranap/RANAP_Constants.asn A library/ranap/RANAP_Containers.asn A library/ranap/RANAP_EncDec.cc A library/ranap/RANAP_IEs.asn A library/ranap/RANAP_PDU_Contents.asn A library/ranap/RANAP_PDU_Descriptions.asn A library/ranap/RANAP_Selftests.ttcn A library/ranap/RANAP_Templates.ttcn A library/ranap/RANAP_Types.ttcn A library/ranap/regen_makefile.sh A library/rua/RUA_CommonDataTypes.asn A library/rua/RUA_Constants.asn A library/rua/RUA_Containers.asn A library/rua/RUA_EncDec.cc A library/rua/RUA_IEs.asn A library/rua/RUA_PDU_Contents.asn A library/rua/RUA_PDU_Descriptions.asn A library/rua/RUA_Types.ttcn A library/rua/regen_makefile.sh 31 files changed, 12,295 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/13652/1 -- To view, visit https://gerrit.osmocom.org/13652 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: If4a72de9bc54d6e6a7daaca78a4d4aa5684203a5 Gerrit-Change-Number: 13652 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte
Change in osmo-bsc[master]: Drop unused old osmux leftover code
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/13649 Change subject: Drop unused old osmux leftover code .. Drop unused old osmux leftover code Let's better clean up old stuff before doing new implementation. Change-Id: Id4e254a1c24831afaba9ab7b330d4e09a2474c8e --- M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/osmux.h 2 files changed, 0 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/49/13649/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 02a4ad8..044fdc9 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -43,7 +43,6 @@ osmo_bsc_rf.h \ osmo_bsc_sigtran.h \ bsc_msc_data.h \ - osmux.h \ paging.h \ pcu_if.h \ pcuif_proto.h \ diff --git a/include/osmocom/bsc/osmux.h b/include/osmocom/bsc/osmux.h deleted file mode 100644 index f3ea72a..000 --- a/include/osmocom/bsc/osmux.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef _OPENBSC_OSMUX_H_ -#define _OPENBSC_OSMUX_H_ - -#include - -#define OSMUX_PORT 1984 - -enum { - OSMUX_ROLE_BSC = 0, - OSMUX_ROLE_BSC_NAT, -}; - -int osmux_init(int role, struct mgcp_config *cfg); -int osmux_enable_endpoint(struct mgcp_endpoint *endp, struct in_addr *addr, uint16_t port); -void osmux_disable_endpoint(struct mgcp_endpoint *endp); -void osmux_allocate_cid(struct mgcp_endpoint *endp); -void osmux_release_cid(struct mgcp_endpoint *endp); - -int osmux_xfrm_to_rtp(struct mgcp_endpoint *endp, int type, char *buf, int rc); -int osmux_xfrm_to_osmux(int type, char *buf, int rc, struct mgcp_endpoint *endp); - -int osmux_send_dummy(struct mgcp_endpoint *endp); - -int osmux_get_cid(void); -void osmux_put_cid(uint8_t osmux_cid); -int osmux_used_cid(void); - -enum osmux_state { - OSMUX_STATE_DISABLED = 0, - OSMUX_STATE_NEGOTIATING, - OSMUX_STATE_ACTIVATING, - OSMUX_STATE_ENABLED, -}; - -enum osmux_usage { - OSMUX_USAGE_OFF = 0, - OSMUX_USAGE_ON = 1, - OSMUX_USAGE_ONLY = 2, -}; - -#endif -- To view, visit https://gerrit.osmocom.org/13649 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: Id4e254a1c24831afaba9ab7b330d4e09a2474c8e Gerrit-Change-Number: 13649 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol
Change in osmo-ttcn3-hacks[master]: BSSMAP_Emulation: Check for ==/!= null instead of isvalue()
Daniel Willmann has uploaded this change for review. ( https://gerrit.osmocom.org/13648 Change subject: BSSMAP_Emulation: Check for ==/!= null instead of isvalue() .. BSSMAP_Emulation: Check for ==/!= null instead of isvalue() Related: OS#3932 Change-Id: I2434c776c6a4ee83e97bc04e7cbbaf1b546731c0 --- M library/BSSMAP_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/13648/1 diff --git a/library/BSSMAP_Emulation.ttcn b/library/BSSMAP_Emulation.ttcn index 55ce2fb..3816ed7 100644 --- a/library/BSSMAP_Emulation.ttcn +++ b/library/BSSMAP_Emulation.ttcn @@ -406,7 +406,7 @@ var BSSAP_ConnHdlr client := null; client := f_imsi_table_find(bssap.pdu.bssmap.paging.iMSI.digits, bssap.pdu.bssmap.paging.tMSI.tmsiOctets); - if (isvalue(client)) { + if (client != null) { log("CommonBssmapUnitdataCallback: IMSI/TMSI found in table, dispatching to ", client); CLIENT.send(bssap) to client; -- To view, visit https://gerrit.osmocom.org/13648 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: I2434c776c6a4ee83e97bc04e7cbbaf1b546731c0 Gerrit-Change-Number: 13648 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann
Change in libosmo-sccp[master]: add caller-owns-msgb variant osmo_sccp_user_sap_down_nofree()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13277 ) Change subject: add caller-owns-msgb variant osmo_sccp_user_sap_down_nofree() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic818efa78b90f727e1a94c18b60d9a306644f340 Gerrit-Change-Number: 13277 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Apr 2019 15:06:44 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: gsm_data.h: Remove unused variable from OpenBSC times
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13647 ) Change subject: gsm_data.h: Remove unused variable from OpenBSC times .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13647 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: I5e4aa352fa5f16f6ff64738f25afd1a844fa4fcb Gerrit-Change-Number: 13647 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 15:05:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: doc: Add generic counter chapter in manual
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13644 ) Change subject: doc: Add generic counter chapter in manual .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13644 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: Ida53d79787aedc5b37a68e6795a863cb0b4a343a Gerrit-Change-Number: 13644 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 15:05:11 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Change comments/strings from OpenBSC to OsmoBSC
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13646 ) Change subject: Change comments/strings from OpenBSC to OsmoBSC .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13646 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: I785278df411b13a701c8441fde798d4bfe79ffd1 Gerrit-Change-Number: 13646 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 15:05:35 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: manuals: Fix example config to reflect OsmoBSC commands
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13645 ) Change subject: manuals: Fix example config to reflect OsmoBSC commands .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13645 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: Ic38eec67a2cbbef57d1d6349f08249ec20ff7e8c Gerrit-Change-Number: 13645 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 15:05:24 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: configure.ac: drop rudimentary check for -fvisibility=hidden
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13643 ) Change subject: configure.ac: drop rudimentary check for -fvisibility=hidden .. configure.ac: drop rudimentary check for -fvisibility=hidden This looks like a rudiment from OpenBSC, where we have: #define BSC_API __attribute__((visibility("default"))) However, we don't use this attribute in OsmoMSC. Change-Id: Ie2f18e9b47eca478f6e4702606068814546e34ce --- M configure.ac 1 file changed, 0 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index f8787cf..e500375 100644 --- a/configure.ac +++ b/configure.ac @@ -119,18 +119,6 @@ dnl Checks for typedefs, structures and compiler characteristics - -# The following test is taken from WebKit's webkit.m4 -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -fvisibility=hidden " -AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden]) -AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])], - [ AC_MSG_RESULT([yes]) -SYMBOL_VISIBILITY="-fvisibility=hidden"], -AC_MSG_RESULT([no])) -CFLAGS="$saved_CFLAGS" -AC_SUBST(SYMBOL_VISIBILITY) - AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"]) AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"]) AX_CHECK_COMPILE_FLAG([-Werror=memset-transposed-args], [CFLAGS="$CFLAGS -Werror=memset-transposed-args"]) -- To view, visit https://gerrit.osmocom.org/13643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie2f18e9b47eca478f6e4702606068814546e34ce Gerrit-Change-Number: 13643 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-msc[master]: configure.ac: drop rudimentary check for -fvisibility=hidden
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13643 ) Change subject: configure.ac: drop rudimentary check for -fvisibility=hidden .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie2f18e9b47eca478f6e4702606068814546e34ce Gerrit-Change-Number: 13643 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 15 Apr 2019 15:04:46 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: Introduce initial unit test for db_sms_* API
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13629 ) Change subject: Introduce initial unit test for db_sms_* API .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/13629/1/tests/db_sms/Makefile.am File tests/db_sms/Makefile.am: https://gerrit.osmocom.org/#/c/13629/1/tests/db_sms/Makefile.am@47 PS1, Line 47: -lrt \ > why is -lrt needed? TBH, I just copy-pasted the whole Makefile.am from the 'sms_queue' test. It's also used in the 'msc_vlr'. Not sure if we really need this... OsmoMSC builds (and passes all tests) just fine without this library. https://gerrit.osmocom.org/#/c/13629/1/tests/db_sms/db_sms_test.c File tests/db_sms/db_sms_test.c: https://gerrit.osmocom.org/#/c/13629/1/tests/db_sms/db_sms_test.c@278 PS1, Line 278: struct sms_test *test = sms_test_set + i; > Use sms_test_set[i] Ok, will be done in the next patch set. -- To view, visit https://gerrit.osmocom.org/13629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id94ad35b6f78f839137db2e17010fbf9b40111a3 Gerrit-Change-Number: 13629 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 15:03:22 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-bsc[master]: gsm_data.h: Remove unused variable from OpenBSC times
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13647 ) Change subject: gsm_data.h: Remove unused variable from OpenBSC times .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13647 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: I5e4aa352fa5f16f6ff64738f25afd1a844fa4fcb Gerrit-Change-Number: 13647 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 14:59:59 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: configure.ac: drop rudimentary check for -fvisibility=hidden
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13643 ) Change subject: configure.ac: drop rudimentary check for -fvisibility=hidden .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie2f18e9b47eca478f6e4702606068814546e34ce Gerrit-Change-Number: 13643 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 14:59:08 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bsc[master]: Change comments/strings from OpenBSC to OsmoBSC
Daniel Willmann has uploaded this change for review. ( https://gerrit.osmocom.org/13646 Change subject: Change comments/strings from OpenBSC to OsmoBSC .. Change comments/strings from OpenBSC to OsmoBSC Change-Id: I785278df411b13a701c8441fde798d4bfe79ffd1 --- M src/osmo-bsc/bsc_vty.c M src/utils/meas_vis.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/13646/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 9413d36..767d565 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1,4 +1,4 @@ -/* OpenBSC interface to quagga VTY */ +/* OsmoBSC interface to quagga VTY */ /* (C) 2009-2017 by Harald Welte * All Rights Reserved * @@ -3170,7 +3170,7 @@ DEFUN(cfg_bts_neigh_mode, cfg_bts_neigh_mode_cmd, "neighbor-list mode (automatic|manual|manual-si5)", "Neighbor List\n" "Mode of Neighbor List generation\n" - "Automatically from all BTS in this OpenBSC\n" "Manual\n" + "Automatically from all BTS in this BSC\n" "Manual\n" "Manual with different lists for SI2 and SI5\n") { struct gsm_bts *bts = vty->index; diff --git a/src/utils/meas_vis.c b/src/utils/meas_vis.c index 851aa03..cba08f5 100644 --- a/src/utils/meas_vis.c +++ b/src/utils/meas_vis.c @@ -274,7 +274,7 @@ g_st.cdkscreen = initCDKScreen(g_st.curses_win); initCDKColor(); - g_st.title = "OpenBSC link quality monitor"; + g_st.title = "OsmoBSC link quality monitor"; title[0] = g_st.title; g_st.cdk_title = newCDKLabel(g_st.cdkscreen, CENTER, 0, title, 1, FALSE, FALSE); -- To view, visit https://gerrit.osmocom.org/13646 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: I785278df411b13a701c8441fde798d4bfe79ffd1 Gerrit-Change-Number: 13646 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann
Change in osmo-bsc[master]: gsm_data.h: Remove unused variable from OpenBSC times
Daniel Willmann has uploaded this change for review. ( https://gerrit.osmocom.org/13647 Change subject: gsm_data.h: Remove unused variable from OpenBSC times .. gsm_data.h: Remove unused variable from OpenBSC times This variable does not seem to be used anywere in OsmoBSC, seems to be a remnant from OpenBSC times. Change-Id: I5e4aa352fa5f16f6ff64738f25afd1a844fa4fcb --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/13647/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 131a53e..dc133e1 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1566,7 +1566,6 @@ struct gsm_bts *start_bts); extern void *tall_bsc_ctx; -extern int ipacc_rtp_direct; /* this actaully refers to the IPA transport, not the BTS model */ static inline int is_ipaccess_bts(struct gsm_bts *bts) diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 349bfea..7ff94ad 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -45,10 +45,6 @@ #include -/* should ip.access BTS use direct RTP streams between each other (1), - * or should OpenBSC always act as RTP relay/proxy in between (0) ? */ -int ipacc_rtp_direct = 1; - int gsm48_sendmsg(struct msgb *msg) { if (msg->lchan) -- To view, visit https://gerrit.osmocom.org/13647 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: I5e4aa352fa5f16f6ff64738f25afd1a844fa4fcb Gerrit-Change-Number: 13647 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann
Change in osmo-bsc[master]: manuals: Fix example config to reflect OsmoBSC commands
Daniel Willmann has uploaded this change for review. ( https://gerrit.osmocom.org/13645 Change subject: manuals: Fix example config to reflect OsmoBSC commands .. manuals: Fix example config to reflect OsmoBSC commands Change-Id: Ic38eec67a2cbbef57d1d6349f08249ec20ff7e8c Related: OS#2299 --- M doc/manuals/chapters/bts-examples.adoc 1 file changed, 1 insertion(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/13645/1 diff --git a/doc/manuals/chapters/bts-examples.adoc b/doc/manuals/chapters/bts-examples.adoc index e404989..2dd8b37 100644 --- a/doc/manuals/chapters/bts-examples.adoc +++ b/doc/manuals/chapters/bts-examples.adoc @@ -19,14 +19,8 @@ network network country code 1 mobile network code 1 - short name OpenBSC - long name OpenBSC - auth policy closed - location updating reject cause 13 encryption a5 0 neci 1 - rrlp mode none - mm info 1 handover 0 bts 0 type nanobts <2> @@ -103,14 +97,8 @@ network network country code 1 mobile network code 1 - short name OpenBSC - long name OpenBSC - auth policy closed - location updating reject cause 13 encryption a5 0 neci 1 - rrlp mode none - mm info 0 handover 0 bts 0 type nanobts @@ -179,7 +167,7 @@ first nanoBTS unit (`trx 0`) needs to be configured to 1800/0/0 and the second nanoBTS unit (`trx 1`) needs to be configured to 1800/0/1. You can configure the BTS unit IDs using the `ipaccess-config` -utility included in OpenBSC. +utility included in OsmoBSC. [NOTE] -- To view, visit https://gerrit.osmocom.org/13645 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: Ic38eec67a2cbbef57d1d6349f08249ec20ff7e8c Gerrit-Change-Number: 13645 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann
Change in osmo-bsc[master]: doc: Add generic counter chapter in manual
Daniel Willmann has uploaded this change for review. ( https://gerrit.osmocom.org/13644 Change subject: doc: Add generic counter chapter in manual .. doc: Add generic counter chapter in manual Depends: I01b8529136450cb50e48b0fb5c17cb2daa5e24c3 (osmo-gsm-manuals) Change-Id: Ida53d79787aedc5b37a68e6795a863cb0b4a343a --- M doc/manuals/chapters/counters.adoc M doc/manuals/osmobsc-usermanual.adoc 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/13644/1 diff --git a/doc/manuals/chapters/counters.adoc b/doc/manuals/chapters/counters.adoc index 7fbb10c..be92369 100644 --- a/doc/manuals/chapters/counters.adoc +++ b/doc/manuals/chapters/counters.adoc @@ -1,4 +1,4 @@ [[counters]] -== Counters +== Implemented Counters include::./counters_generated.adoc[] diff --git a/doc/manuals/osmobsc-usermanual.adoc b/doc/manuals/osmobsc-usermanual.adoc index 275c436..3515aaa 100644 --- a/doc/manuals/osmobsc-usermanual.adoc +++ b/doc/manuals/osmobsc-usermanual.adoc @@ -23,6 +23,8 @@ include::{srcdir}/chapters/handover.adoc[] +include::./common/chapters/counters-overview.adoc[] + include::{srcdir}/chapters/counters.adoc[] include::./common/chapters/abis.adoc[] -- To view, visit https://gerrit.osmocom.org/13644 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: Ida53d79787aedc5b37a68e6795a863cb0b4a343a Gerrit-Change-Number: 13644 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann
Change in osmo-msc[master]: configure.ac: properly check for libdbi SQLite3 driver
Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/13640 ) Change subject: configure.ac: properly check for libdbi SQLite3 driver .. Abandoned Thanks, Pau! You're right. -- To view, visit https://gerrit.osmocom.org/13640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I7f7c719d41d9be28527e4ac3a8b2869c87337074 Gerrit-Change-Number: 13640 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol
Change in osmo-msc[master]: configure.ac: drop rudimentary check for -fvisibility=hidden
Vadim Yanitskiy has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/13643 ) Change subject: configure.ac: drop rudimentary check for -fvisibility=hidden .. configure.ac: drop rudimentary check for -fvisibility=hidden This looks like a rudiment from OpenBSC, where we have: #define BSC_API __attribute__((visibility("default"))) However, we don't use this attribute in OsmoMSC. Change-Id: Ie2f18e9b47eca478f6e4702606068814546e34ce --- M configure.ac 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/13643/2 -- To view, visit https://gerrit.osmocom.org/13643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie2f18e9b47eca478f6e4702606068814546e34ce Gerrit-Change-Number: 13643 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-CC: Jenkins Builder (102)
Change in osmo-msc[master]: configure.ac: drop useless check for -fvisibility=hidden
Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/13643 Change subject: configure.ac: drop useless check for -fvisibility=hidden .. configure.ac: drop useless check for -fvisibility=hidden This looks like a rudiment from OpenBSC, where we have: #define BSC_API __attribute__((visibility("default"))) However, we don't use this attribute in OsmoMSC. Change-Id: Ie2f18e9b47eca478f6e4702606068814546e34ce --- M configure.ac 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/13643/1 diff --git a/configure.ac b/configure.ac index f8787cf..e500375 100644 --- a/configure.ac +++ b/configure.ac @@ -119,18 +119,6 @@ dnl Checks for typedefs, structures and compiler characteristics - -# The following test is taken from WebKit's webkit.m4 -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -fvisibility=hidden " -AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden]) -AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])], - [ AC_MSG_RESULT([yes]) -SYMBOL_VISIBILITY="-fvisibility=hidden"], -AC_MSG_RESULT([no])) -CFLAGS="$saved_CFLAGS" -AC_SUBST(SYMBOL_VISIBILITY) - AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"]) AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"]) AX_CHECK_COMPILE_FLAG([-Werror=memset-transposed-args], [CFLAGS="$CFLAGS -Werror=memset-transposed-args"]) -- To view, visit https://gerrit.osmocom.org/13643 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: Ie2f18e9b47eca478f6e4702606068814546e34ce Gerrit-Change-Number: 13643 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy
Change in osmo-gsm-manuals[master]: Change VTY samples from OsmoNITB to OsmoMSC
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13642 ) Change subject: Change VTY samples from OsmoNITB to OsmoMSC .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9fb3c43ea56087900eee4427f1ae50a7c9e84698 Gerrit-Change-Number: 13642 Gerrit-PatchSet: 1 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 15 Apr 2019 14:50:49 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-gsm-manuals[master]: Change VTY samples from OsmoNITB to OsmoMSC
Daniel Willmann has uploaded this change for review. ( https://gerrit.osmocom.org/13642 Change subject: Change VTY samples from OsmoNITB to OsmoMSC .. Change VTY samples from OsmoNITB to OsmoMSC Change-Id: I9fb3c43ea56087900eee4427f1ae50a7c9e84698 Related: OS#2299 --- M common/chapters/vty.adoc 1 file changed, 92 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/42/13642/1 diff --git a/common/chapters/vty.adoc b/common/chapters/vty.adoc index c9e3d59..3aed41a 100644 --- a/common/chapters/vty.adoc +++ b/common/chapters/vty.adoc @@ -133,7 +133,7 @@ NOTE: The VTY is present on most Osmocom GSM/UMTS/GPRS software, thus this chapter is present in all the relevant manuals. The detailed examples -below assume you are executing them on the OsmoNITB VTY. They will work +below assume you are executing them on the OsmoMSC VTY. They will work in similar fashion on the other VTY interfaces, while the node structure will differ in each program. @@ -147,9 +147,9 @@ even only a partial command), you will get a list of the first word of all possible commands available at this node: -.Example: Typing `?` at start of OsmoNITB prompt +.Example: Typing `?` at start of OsmoMSC prompt -OpenBSC> <1> +OsmoMSC> <1> showShow running system information listPrint command list exitExit current mode and down to previous mode @@ -157,7 +157,8 @@ enable Turn on privileged mode command terminalSet terminal line parameters who Display who is on vty - logging Configure log message to this terminal + logging Configure logging + no Negate a command or set its defaults sms SMS related commands subscriber Operations on a Subscriber @@ -171,35 +172,35 @@ .Example: Typing `?` after a partial command -OpenBSC> show <1> - version Displays program version - online-help Online help - history Display the session command history - network Display information about a GSM NETWORK - bts Display information about a BTS - trx Display information about a TRX - timeslot Display information about a TS - lchan Display information about a logical channel - pagingDisplay information about paging requests of a BTS - paging-group Display the paging group - logging Show current logging configuration - alarmsShow current logging configuration - stats Show statistical values - e1_driver Display information about available E1 drivers - e1_line Display information about a E1 line - e1_timeslot Display information about a E1 timeslot - subscriberOperations on a Subscriber - statisticsDisplay network statistics - sms-queue Display SMSqueue statistics +OsmoMSC> show <1> + version Displays program version + online-help Online help + history Display the session command history + cs7 ITU-T Signaling System 7 + logging Show current logging configuration + alarms Show current logging configuration + talloc-context Show talloc memory hierarchy + statsShow statistical values + asciidoc Asciidoc generation + rate-countersShow all rate counters + fsm Show information about finite state machines + fsm-instancesShow information about finite state machine instances + sgs-connections Show SGs interface connections / MMEs + subscriber Operations on a Subscriber + bsc BSC + connection Subscriber Connections + transaction Transactions + statistics Display network statistics + sms-queueDisplay SMSqueue statistics smpp SMPP Interface <1> Type `?` after the `show` command, the `?` itself will not be printed. -You may pick the `network` object and type `?` again: +You may pick the `bsc` object and type `?` again: -.Example: Typing `?` after `show network` +.Example: Typing `?` after `show bsc` -OpenBSC> show network +OsmoMSC> show bsc @@ -216,7 +217,7 @@ .Example: Use of `` pressed after typing only `s` as command -OpenBSC> s<1> +OsmoMSC> s<1> show smssubscriber <1> Type `` here. @@ -225,11 +226,11 @@ .Example: Use of `` pressed after typing `show` command -OpenBSC> show <1> -versiononline-help historynetworkbtstrx -timeslot lchan paging paging-group loggingalarms -stats e1_driver e1_linee1_timeslot subscriber statistics -sms-queue smpp +OsmoMSC> show <1> +versiononline-help historycs7loggingalarms +talloc-context stats asciidoc rate-counters fsmfsm-instances +sgs-connections subscriber bscconnection transaction statistics +sms-queue smpp <1> Type `` here. @@ -239,9 +240,9 @@ The `list` com
Change in osmo-msc[master]: configure.ac: drop useless SQLite3 dependency
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13639 ) Change subject: configure.ac: drop useless SQLite3 dependency .. Patch Set 1: > I think that's from the time we handled subscriber database inside nitb/misc. Yep, but... AFAIR, OpenBSC also doesn't use SQLite3 directly ;) Most likely, it was used by the 'meas_db' utility... -- To view, visit https://gerrit.osmocom.org/13639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf4eb53e60a2957eca99a2c8e613f75a8c43ac89 Gerrit-Change-Number: 13639 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 14:35:56 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-gsm-manuals[master]: Add a chapter to explain our different counters
Daniel Willmann has submitted this change and it was merged. ( https://gerrit.osmocom.org/13516 ) Change subject: Add a chapter to explain our different counters .. Add a chapter to explain our different counters Change-Id: I01b8529136450cb50e48b0fb5c17cb2daa5e24c3 --- A common/chapters/counters-overview.adoc 1 file changed, 50 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/common/chapters/counters-overview.adoc b/common/chapters/counters-overview.adoc new file mode 100644 index 000..fbdef30 --- /dev/null +++ b/common/chapters/counters-overview.adoc @@ -0,0 +1,50 @@ +[[common-counters]] +== Osmocom Counters + +The following gives an overview of all the types of counters available: + +=== Osmo Counters + +Osmo counters are the oldest type of counters added to Osmocom projects. +They are not grouped. + +* Printed as part of VTY show stats +* Increment, Decrement +* Accessible through the control interface: counter. + +=== Rate Counters + +Rate counters count rates of events. + +* Printed as part of VTY show stats +* Intervals: per second, minute, hour, day or absolute value +* Increment only +* Accessible through the control interface +* Rate counters are grouped and different instances per group can exist + +The control interface command to get a counter (group) is: + +rate_ctr.per_{sec,min,hour,day,abs}...[counter_name] + +It is possible to get all counters from a group by omitting the counter name + +=== Stat Item + +Stat items are a grouped replacement for osmo counters, but not many stat +items are available yet. + +* Printed as part of VTY show stats +* Replacement for osmo counters +* Not yet available through the control interface +* Grouped and indexed like rate counters +* Items have a unit +* Keeps a list of the last values measured, so could return an average, min, + max, std. deviation + +=== Stats Reporter + +Statsd stats reporter can send osmo counter, rate counter and stats item values to statsd + +See the stats reporter command of the VTY reference for details on how to +setup the connection to statsd. + -- To view, visit https://gerrit.osmocom.org/13516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I01b8529136450cb50e48b0fb5c17cb2daa5e24c3 Gerrit-Change-Number: 13516 Gerrit-PatchSet: 2 Gerrit-Owner: Daniel Willmann Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-msc[master]: libmsc/db.c: print info about database name and libdbi version
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13641 ) Change subject: libmsc/db.c: print info about database name and libdbi version .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaed452548eb2d847738b78d3489bf6f507a2e3c1 Gerrit-Change-Number: 13641 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 13:30:38 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: configure.ac: properly check for libdbi SQLite3 driver
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13640 ) Change subject: configure.ac: properly check for libdbi SQLite3 driver .. Patch Set 1: Code-Review-1 What you are doing here doesn't make much sense to me, since you check for some runtime dependency during build time. That doesn't make sense if buildhost != runhost. We don't need libdbi-sqlite to build the software. It would only make sense if we require libdbi-sqlite to run the unit tests, and in that case it should only be checked during make check or similar. -- To view, visit https://gerrit.osmocom.org/13640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7f7c719d41d9be28527e4ac3a8b2869c87337074 Gerrit-Change-Number: 13640 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 15 Apr 2019 13:30:16 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: configure.ac: drop useless SQLite3 dependency
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13639 ) Change subject: configure.ac: drop useless SQLite3 dependency .. Patch Set 1: Code-Review+1 I think that's from the time we handled subscriber database inside nitb/misc. -- To view, visit https://gerrit.osmocom.org/13639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf4eb53e60a2957eca99a2c8e613f75a8c43ac89 Gerrit-Change-Number: 13639 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 15 Apr 2019 13:27:14 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: libmsc/db.c: print info about database name and libdbi version
Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/13641 Change subject: libmsc/db.c: print info about database name and libdbi version .. libmsc/db.c: print info about database name and libdbi version Change-Id: Iaed452548eb2d847738b78d3489bf6f507a2e3c1 --- M src/libmsc/db.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/13641/1 diff --git a/src/libmsc/db.c b/src/libmsc/db.c index 0384320..a9aaf94 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -615,6 +615,9 @@ { dbi_initialize_r(NULL, &inst); + LOGP(DDB, LOGL_NOTICE, "Init database connection to '%s' using %s\n", +name, dbi_version()); + conn = dbi_conn_new_r("sqlite3", inst); if (conn == NULL) { LOGP(DDB, LOGL_FATAL, "Failed to create database connection to sqlite3 db '%s'; " -- To view, visit https://gerrit.osmocom.org/13641 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: Iaed452548eb2d847738b78d3489bf6f507a2e3c1 Gerrit-Change-Number: 13641 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy
Change in osmo-msc[master]: smpp: Fix SMS-receiver put assertion
Pau Espin Pedrol has abandoned this change. ( https://gerrit.osmocom.org/13637 ) Change subject: smpp: Fix SMS-receiver put assertion .. Abandoned -- To view, visit https://gerrit.osmocom.org/13637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ida8628c3c0569a2e3bd66c591d57eb93bf1fab14 Gerrit-Change-Number: 13637 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy
Change in osmo-msc[master]: smpp: Fix SMS-receiver put assertion
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13637 ) Change subject: smpp: Fix SMS-receiver put assertion .. Patch Set 1: Patch https://gerrit.osmocom.org/#/c/osmo-msc/+/13638/ was merged fixing the same issue, abandoning. -- To view, visit https://gerrit.osmocom.org/13637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida8628c3c0569a2e3bd66c591d57eb93bf1fab14 Gerrit-Change-Number: 13637 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 13:25:16 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: smpp: fix vlr_subscr use count bugs
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13638 ) Change subject: smpp: fix vlr_subscr use count bugs .. Patch Set 1: Well, I already submitted same patch here: https://gerrit.osmocom.org/#/c/osmo-msc/+/13637/ -- To view, visit https://gerrit.osmocom.org/13638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idaf01cd3cfa08088ce0d543d0576db957dc94262 Gerrit-Change-Number: 13638 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 15 Apr 2019 12:12:49 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: configure.ac: drop useless SQLite3 dependency
Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/13639 Change subject: configure.ac: drop useless SQLite3 dependency .. configure.ac: drop useless SQLite3 dependency We don't use SQLite3 directly, we use libdbi and libdbdsqlite3. Change-Id: Ibf4eb53e60a2957eca99a2c8e613f75a8c43ac89 --- M configure.ac M src/utils/Makefile.am 2 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/13639/1 diff --git a/configure.ac b/configure.ac index f8787cf..4cfb774 100644 --- a/configure.ac +++ b/configure.ac @@ -112,11 +112,6 @@ AC_HEADER_STDC AC_CHECK_HEADERS(dbi/dbd.h,,AC_MSG_ERROR(DBI library is not installed)) -found_sqlite3=yes -PKG_CHECK_MODULES(SQLITE3, sqlite3, ,found_sqlite3=no) -AM_CONDITIONAL(HAVE_SQLITE3, test "$found_sqlite3" = yes) -AC_SUBST(found_sqlite3) - dnl Checks for typedefs, structures and compiler characteristics diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 2d67102..cb0faf6 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -10,7 +10,6 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(SQLITE3_CFLAGS) \ $(LIBSMPP34_CFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/13639 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: Ibf4eb53e60a2957eca99a2c8e613f75a8c43ac89 Gerrit-Change-Number: 13639 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy
Change in osmo-msc[master]: configure.ac: properly check for libdbi SQLite3 driver
Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/13640 Change subject: configure.ac: properly check for libdbi SQLite3 driver .. configure.ac: properly check for libdbi SQLite3 driver Since we use SQLite3 driver of libdbi, we need to make sure that it is installed and available. Checking just for libdbi in not enough. For more details, please see: http://libdbi.sourceforge.net/docs/programmers-guide/addtoproject.html Change-Id: I7f7c719d41d9be28527e4ac3a8b2869c87337074 --- M configure.ac 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/40/13640/1 diff --git a/configure.ac b/configure.ac index 4cfb774..693044d 100644 --- a/configure.ac +++ b/configure.ac @@ -110,8 +110,21 @@ dnl checks for header files AC_HEADER_STDC + +dnl Check for the libdbi library +AC_CHECK_LIB(dbi,dbi_initialize) AC_CHECK_HEADERS(dbi/dbd.h,,AC_MSG_ERROR(DBI library is not installed)) +dnl To check for the availability and function of a particular +dnl driver, we need a runtime check (since the driver is loaded +dnl dynamically). By default, we use the SQLite3 driver. +AC_MSG_CHECKING([for libdbi SQLite3 driver (libdbd-sqlite3)]) +AC_RUN_IFELSE( +[AC_LANG_PROGRAM(, +[[dbi_initialize(0); return(dbi_conn_new("sqlite3") ? 0 : 1);]])], +[AC_MSG_RESULT([yes])], +[AC_MSG_FAILURE([SQLite3 driver is not installed])]) + dnl Checks for typedefs, structures and compiler characteristics -- To view, visit https://gerrit.osmocom.org/13640 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: I7f7c719d41d9be28527e4ac3a8b2869c87337074 Gerrit-Change-Number: 13640 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy
Change in osmo-msc[master]: smpp: fix vlr_subscr use count bugs
Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/13638 ) Change subject: smpp: fix vlr_subscr use count bugs .. smpp: fix vlr_subscr use count bugs In smpp_openbsc.c submit_to_sms(), "get" the appropriate use count upon assigning sms->receiver, fixing a -1 use count upon sms_free(). Also, avoid a "put" of a NULL subscriber in the same function. Related: OS#3930 Change-Id: Idaf01cd3cfa08088ce0d543d0576db957dc94262 --- M src/libmsc/smpp_openbsc.c 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved dexter: Verified Jenkins Builder: Verified diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 01c39f9..151c788 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -139,7 +139,8 @@ } else { LOGP(DLSMS, LOGL_ERROR, "SMPP neither message payload nor valid sm_length.\n"); - vlr_subscr_put(dest, VSUB_USE_SMPP); + if (dest) + vlr_subscr_put(dest, VSUB_USE_SMPP); return ESME_RINVPARLEN; } } @@ -152,6 +153,12 @@ /* fill in the destination address */ sms->receiver = dest; + if (dest) { + /* Replace use count from above subscr_by_dst (VSUB_USE_SMPP) by the sms->receiver use count +* (VSUB_USE_SMS_RECEIVER) */ + vlr_subscr_get(sms->receiver, VSUB_USE_SMS_RECEIVER); + vlr_subscr_put(dest, VSUB_USE_SMPP); + } sms->dst.ton = submit->dest_addr_ton; sms->dst.npi = submit->dest_addr_npi; if (dest) -- To view, visit https://gerrit.osmocom.org/13638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idaf01cd3cfa08088ce0d543d0576db957dc94262 Gerrit-Change-Number: 13638 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter
Change in osmo-bts[master]: oc2gbts_mgr: use osmo_init_logging2() instead of osmo_init_logging()
dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/13275 ) Change subject: oc2gbts_mgr: use osmo_init_logging2() instead of osmo_init_logging() .. oc2gbts_mgr: use osmo_init_logging2() instead of osmo_init_logging() The function osmo_init_logging() is deprecated, lets use osmo_init_logging2() as suggested. Change-Id: Iebc80cd1f77f10a879d4536d788377f522dd853f --- M src/osmo-bts-oc2g/misc/oc2gbts_mgr.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Vadim Yanitskiy: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c index 46831f6..99d2b56 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr.c @@ -261,9 +261,9 @@ .num_cat = ARRAY_SIZE(mgr_log_info_cat), }; -static int mgr_log_init(void) +static int mgr_log_init(void *ctx) { - osmo_init_logging(&mgr_log_info); + osmo_init_logging2(ctx, &mgr_log_info); return 0; } @@ -276,7 +276,7 @@ tall_msgb_ctx = talloc_named_const(tall_mgr_ctx, 1, "msgb"); msgb_talloc_ctx_init(tall_msgb_ctx, 0); - mgr_log_init(); + mgr_log_init(tall_mgr_ctx); osmo_init_ignore_signals(); signal(SIGINT, &signal_handler); -- To view, visit https://gerrit.osmocom.org/13275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iebc80cd1f77f10a879d4536d788377f522dd853f Gerrit-Change-Number: 13275 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter
Change in osmo-msc[master]: smpp: fix vlr_subscr use count bugs
dexter has posted comments on this change. ( https://gerrit.osmocom.org/13638 ) Change subject: smpp: fix vlr_subscr use count bugs .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/13638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idaf01cd3cfa08088ce0d543d0576db957dc94262 Gerrit-Change-Number: 13638 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 11:57:07 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: smpp: fix vlr_subscr use count bugs
Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/13638 ) Change subject: smpp: fix vlr_subscr use count bugs .. Patch Set 1: Code-Review+2 master-fix +2 -- To view, visit https://gerrit.osmocom.org/13638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idaf01cd3cfa08088ce0d543d0576db957dc94262 Gerrit-Change-Number: 13638 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 11:51:30 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: smpp: fix vlr_subscr use count bugs
Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/13638 Change subject: smpp: fix vlr_subscr use count bugs .. smpp: fix vlr_subscr use count bugs In smpp_openbsc.c submit_to_sms(), "get" the appropriate use count upon assigning sms->receiver, fixing a -1 use count upon sms_free(). Also, avoid a "put" of a NULL subscriber in the same function. Related: OS#3930 Change-Id: Idaf01cd3cfa08088ce0d543d0576db957dc94262 --- M src/libmsc/smpp_openbsc.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/13638/1 diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 01c39f9..151c788 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -139,7 +139,8 @@ } else { LOGP(DLSMS, LOGL_ERROR, "SMPP neither message payload nor valid sm_length.\n"); - vlr_subscr_put(dest, VSUB_USE_SMPP); + if (dest) + vlr_subscr_put(dest, VSUB_USE_SMPP); return ESME_RINVPARLEN; } } @@ -152,6 +153,12 @@ /* fill in the destination address */ sms->receiver = dest; + if (dest) { + /* Replace use count from above subscr_by_dst (VSUB_USE_SMPP) by the sms->receiver use count +* (VSUB_USE_SMS_RECEIVER) */ + vlr_subscr_get(sms->receiver, VSUB_USE_SMS_RECEIVER); + vlr_subscr_put(dest, VSUB_USE_SMPP); + } sms->dst.ton = submit->dest_addr_ton; sms->dst.npi = submit->dest_addr_npi; if (dest) -- To view, visit https://gerrit.osmocom.org/13638 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: Idaf01cd3cfa08088ce0d543d0576db957dc94262 Gerrit-Change-Number: 13638 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr
Change in osmo-msc[master]: gsm_04_11: Log MT sms dst subscriber
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13555 ) Change subject: gsm_04_11: Log MT sms dst subscriber .. Patch Set 4: AFAICS, it conflicts with the bomb patch by Neels... Maybe rather rebase and push on top of it? -- To view, visit https://gerrit.osmocom.org/13555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I483ac61067f51d03f6f476821d8664da3d1f17b2 Gerrit-Change-Number: 13555 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 11:34:56 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-msc[master]: smpp: Fix SMS-receiver put assertion
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13637 ) Change subject: smpp: Fix SMS-receiver put assertion .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ida8628c3c0569a2e3bd66c591d57eb93bf1fab14 Gerrit-Change-Number: 13637 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 11:31:31 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: gsm_04_11: Log MT sms dst subscriber
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13555 to look at the new patch set (#4). Change subject: gsm_04_11: Log MT sms dst subscriber .. gsm_04_11: Log MT sms dst subscriber Change-Id: I483ac61067f51d03f6f476821d8664da3d1f17b2 --- M src/libmsc/gsm_04_11.c M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 7 files changed, 20 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/13555/4 -- To view, visit https://gerrit.osmocom.org/13555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I483ac61067f51d03f6f476821d8664da3d1f17b2 Gerrit-Change-Number: 13555 Gerrit-PatchSet: 4 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Vadim Yanitskiy
Change in osmo-msc[master]: smpp: Fix SMS-receiver put assertion
Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/13637 Change subject: smpp: Fix SMS-receiver put assertion .. smpp: Fix SMS-receiver put assertion Catched by osmo-gsm-tester smpp/esme_ms_sms_transaction.py In sms_free(), if sms->receiver is set, then VSUB_USE_SMS_RECEIVER is put. However, If sms comes from SMPP (ESME), dest was being referenced in smpp_openbsc.c:submit_to_sms by means of VSUB_USE_SMPP. As a result, during sms_free(), following assertion was triggered: DREF gsm_04_11.c:74 VLR subscr IMSI-90170015252:MSISDN-7846:TMSI-0x2A74BA76 - SMS-receiver: now used by 3 (attached,SMPP,SMS,conn,-1*SMS-receiver) Assert failed _osmo_use_count_get_put(&(sms->receiver)->use_count, "SMS-receiver", -1, "gsm_04_11.c", 74) == 0 gsm_04_11.c:74 Solve it by dropping reference to VSUB_USE_SMPP and referencing VSUB_USE_SMS_RECEIVER once we are done using dest in SMPP code and store it in sms->receiver. Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb ("vlr_subscr: use osmo_use_count") Change-Id: Ida8628c3c0569a2e3bd66c591d57eb93bf1fab14 --- M src/libmsc/smpp_openbsc.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/13637/1 diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c index 01c39f9..25d649b 100644 --- a/src/libmsc/smpp_openbsc.c +++ b/src/libmsc/smpp_openbsc.c @@ -151,7 +151,6 @@ sms->msg_ref = msg_ref; /* fill in the destination address */ - sms->receiver = dest; sms->dst.ton = submit->dest_addr_ton; sms->dst.npi = submit->dest_addr_npi; if (dest) @@ -159,6 +158,11 @@ else OSMO_STRLCPY_ARRAY(sms->dst.addr, (const char *)submit->destination_addr); + if (dest) { + sms->receiver = dest; + vlr_subscr_get(sms->receiver, VSUB_USE_SMS_RECEIVER); + vlr_subscr_put(dest, VSUB_USE_SMPP); + } /* fill in the source address */ sms->src.ton = submit->source_addr_ton; -- To view, visit https://gerrit.osmocom.org/13637 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: Ida8628c3c0569a2e3bd66c591d57eb93bf1fab14 Gerrit-Change-Number: 13637 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol
Change in osmo-msc[master]: large refactoring: support inter-BSC and inter-MSC Handover
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/13137 ) Change subject: large refactoring: support inter-BSC and inter-MSC Handover .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/13137/6/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/13137/6/src/libmsc/gsm_04_11.c@472 PS6, Line 472: return GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER; > This return looks like memleaking allocated gsms=sms_alloc() in line 467. […] Definitely, ACK. -- To view, visit https://gerrit.osmocom.org/13137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27e4988e0371808b512c757d2b52ada1615067bd Gerrit-Change-Number: 13137 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-CC: Vadim Yanitskiy Gerrit-Comment-Date: Mon, 15 Apr 2019 10:00:18 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in libosmo-sccp[master]: add caller-owns-msgb variant osmo_sccp_user_sap_down_nofree()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13277 ) Change subject: add caller-owns-msgb variant osmo_sccp_user_sap_down_nofree() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic818efa78b90f727e1a94c18b60d9a306644f340 Gerrit-Change-Number: 13277 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: osmith Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 15 Apr 2019 09:09:45 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-msc[master]: large refactoring: support inter-BSC and inter-MSC Handover
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13137 ) Change subject: large refactoring: support inter-BSC and inter-MSC Handover .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/#/c/13137/6/src/libmsc/gsm_04_11.c File src/libmsc/gsm_04_11.c: https://gerrit.osmocom.org/#/c/13137/6/src/libmsc/gsm_04_11.c@472 PS6, Line 472: return GSM411_RP_CAUSE_MO_NET_OUT_OF_ORDER; This return looks like memleaking allocated gsms=sms_alloc() in line 467. Move it before line 467. -- To view, visit https://gerrit.osmocom.org/13137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27e4988e0371808b512c757d2b52ada1615067bd Gerrit-Change-Number: 13137 Gerrit-PatchSet: 6 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 15 Apr 2019 09:00:53 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in osmo-gsm-manuals[master]: Bump version: 0.0.0 → 0.1.0
Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13636 ) Change subject: Bump version: 0.0.0 → 0.1.0 .. Bump version: 0.0.0 → 0.1.0 Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/debian/changelog b/debian/changelog index 975644a..33251f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-gsm-manuals-dev (0.1.0) unstable; urgency=medium + + * Proper release number, which will also get tagged. + + -- Oliver Smith Mon, 15 Apr 2019 09:39:51 +0200 + osmo-gsm-manuals-dev (0.0.0) unstable; urgency=medium * Initial Release. -- To view, visit https://gerrit.osmocom.org/13636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 Gerrit-Change-Number: 13636 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102)
Change in osmo-gsm-manuals[master]: Bump version: 0.0.0 → 0.1.0
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13636 Change subject: Bump version: 0.0.0 → 0.1.0 .. Bump version: 0.0.0 → 0.1.0 Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/36/13636/1 diff --git a/debian/changelog b/debian/changelog index 975644a..33251f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-gsm-manuals-dev (0.1.0) unstable; urgency=medium + + * Proper release number, which will also get tagged. + + -- Oliver Smith Mon, 15 Apr 2019 09:39:51 +0200 + osmo-gsm-manuals-dev (0.0.0) unstable; urgency=medium * Initial Release. -- To view, visit https://gerrit.osmocom.org/13636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 Gerrit-Change-Number: 13636 Gerrit-PatchSet: 1 Gerrit-Owner: osmith
Change in osmo-gsm-manuals[master]: Bump version: 0.0.0 → 0.1.0
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13636 ) Change subject: Bump version: 0.0.0 → 0.1.0 .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 Gerrit-Change-Number: 13636 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder (102) Gerrit-Comment-Date: Mon, 15 Apr 2019 08:43:44 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: jobs: use "cmd: |", not "# keep first line ..."
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13634 ) Change subject: jobs: use "cmd: |", not "# keep first line ..." .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/13634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65a06acb76e5d693aa187f9ac38970b73e7fead6 Gerrit-Change-Number: 13634 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Apr 2019 08:31:41 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: jobs: use "cmd: |", not "# keep first line ..."
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13634 ) Change subject: jobs: use "cmd: |", not "# keep first line ..." .. Patch Set 1: > Did you you check/test job config is generated properly with your change? Yes, for both jobs. And for good measure I've also build master-osmo-mgw with this change, and it builds just fine. -- To view, visit https://gerrit.osmocom.org/13634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65a06acb76e5d693aa187f9ac38970b73e7fead6 Gerrit-Change-Number: 13634 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Apr 2019 08:29:04 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-gsm-manuals[osmith/release]: Bump version: 0.0.0 → 0.1.0
osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/13635 ) Change subject: Bump version: 0.0.0 → 0.1.0 .. Bump version: 0.0.0 → 0.1.0 Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 975644a..33251f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-gsm-manuals-dev (0.1.0) unstable; urgency=medium + + * Proper release number, which will also get tagged. + + -- Oliver Smith Mon, 15 Apr 2019 09:39:51 +0200 + osmo-gsm-manuals-dev (0.0.0) unstable; urgency=medium * Initial Release. -- To view, visit https://gerrit.osmocom.org/13635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: osmith/release Gerrit-MessageType: merged Gerrit-Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 Gerrit-Change-Number: 13635 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith
Change in osmo-gsm-manuals[osmith/release]: Bump version: 0.0.0 → 0.1.0
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13635 ) Change subject: Bump version: 0.0.0 → 0.1.0 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: osmith/release Gerrit-MessageType: comment Gerrit-Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 Gerrit-Change-Number: 13635 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 15 Apr 2019 08:23:43 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-ci[master]: jobs: use "cmd: |", not "# keep first line ..."
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/13634 ) Change subject: jobs: use "cmd: |", not "# keep first line ..." .. Patch Set 1: I see no reference in the links your provided about "first line must have less indentation" that is announced in our README.adoc. So it could be it is some jenkins-job-builder limitation. Did you you check/test job config is generated properly with your change? -- To view, visit https://gerrit.osmocom.org/13634 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I65a06acb76e5d693aa187f9ac38970b73e7fead6 Gerrit-Change-Number: 13634 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Daniel Willmann Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 15 Apr 2019 08:22:43 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-hlr[master]: GSUP routing: use Message Class IE
osmith has posted comments on this change. ( https://gerrit.osmocom.org/13588 ) Change subject: GSUP routing: use Message Class IE .. Patch Set 2: Change looks good, but as Vadim commented in [1], it would be nice to unify all the GSUP forwarding log messages. I have done it in patchset 12 and upwards of [2]. Would you like me to rebase this patch and make it use that unified log macro? [1]: https://gerrit.osmocom.org/#/c/osmo-hlr/+/13006/8/src/hlr.c@478 [2]: https://gerrit.osmocom.org/#/c/osmo-hlr/+/13006/ -- To view, visit https://gerrit.osmocom.org/13588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dc3967d9372d63e9d57ca2608dd3316edb234a4 Gerrit-Change-Number: 13588 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Vadim Yanitskiy Gerrit-CC: osmith Gerrit-Comment-Date: Mon, 15 Apr 2019 08:20:20 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-gsm-manuals[osmith/release]: Bump version: 0.0.0 → 0.1.0
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/13635 Change subject: Bump version: 0.0.0 → 0.1.0 .. Bump version: 0.0.0 → 0.1.0 Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/35/13635/1 diff --git a/debian/changelog b/debian/changelog index 975644a..33251f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-gsm-manuals-dev (0.1.0) unstable; urgency=medium + + * Proper release number, which will also get tagged. + + -- Oliver Smith Mon, 15 Apr 2019 09:39:51 +0200 + osmo-gsm-manuals-dev (0.0.0) unstable; urgency=medium * Initial Release. -- To view, visit https://gerrit.osmocom.org/13635 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: osmith/release Gerrit-MessageType: newchange Gerrit-Change-Id: Ied515c46f7de5fb0224ac5b3d16ee2709d614202 Gerrit-Change-Number: 13635 Gerrit-PatchSet: 1 Gerrit-Owner: osmith