Build failure of network:osmocom:nightly/libusrp in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_Testing/x86_64 Package network:osmocom:nightly/libusrp failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 102s] [224/391] installing gcc-8-8.3.0-26 [ 104s] [225/391] installing gcc-9-9.2.1-22 [ 106s] [226/391] installing debconf-1.5.73 [ 107s] [227/391] installing init-system-helpers-1.57 [ 107s] [228/391] installing libboost-numpy-dev-1.67.0.2 [ 107s] [229/391] installing libboost1.67-dev-1.67.0-13+b1 [ 112s] [230/391] installing gcc-4:9.2.1-3.1 [ 112s] [231/391] installing perl-modules-5.30-5.30.0-9 [ 113s] [232/391] installing libreadline8-8.0-3 [ 114s] Processing triggers for libc-bin (2.29-7) ... [ 114s] [233/391] installing libxnvctrl0-430.64-1 [ 114s] Processing triggers for libc-bin (2.29-7) ... [ 114s] [234/391] installing python-minimal-2.7.17-2 [ 114s] [235/391] installing doxygen-1.8.16-1 [ 116s] [236/391] installing gettext-0.19.8.1-10 [ 117s] Processing triggers for libc-bin (2.29-7) ... [ 117s] [237/391] installing g++-9-9.2.1-22 [ 119s] /.build/build-pkg-deb: line 42: 5580 Segmentation fault (core dumped) DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical DEBCONF_NONINTERACTIVE_SEEN=true LC_ALL=C LANGUAGE=C LANG=C chroot $* [ 119s] exit ... [ 119s] [ 119s] lamb56 failed "build libusrp_3.4.4.1.45c0.dsc" at Wed Jan 8 01:50:12 UTC 2020. [ 119s] [ 119s] ### VM INTERACTION START ### [ 122s] [ 99.845977] sysrq: SysRq : Power Off [ 122s] [ 99.883198] reboot: Power down [ 122s] ### VM INTERACTION END ### [ 122s] [ 122s] lamb56 failed "build libusrp_3.4.4.1.45c0.dsc" at Wed Jan 8 01:50:16 UTC 2020. [ 122s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 ) Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f Gerrit-Change-Number: 16767 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 07 Jan 2020 22:33:20 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 to look at the new patch set (#2). Change subject: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn .. MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn Change-Id: I99e888708ed1efeab12a4c88c734a78619a39888 --- M msc/MSC_Tests_Iu.ttcn M msc/expected-results.xml 2 files changed, 52 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/16766/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I99e888708ed1efeab12a4c88c734a78619a39888 Gerrit-Change-Number: 16766 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in simtrace2[master]: DFU: add DFU application
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/16558 ) Change subject: DFU: add DFU application .. Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > what about something bogus like "afblud" (application for boot loader > > update via dfu)? > > I find afblud also very cryptic, but I agree that the firmware names are not > super clear for uninitiated users. > just flashing the DFU application using the DFU bootloader so to updated the > bootloader using DFU is complicated enough to parse. > instead I think we just need to provide a script taking care of updating > everything. this will hide all the details and avoid confusion and mistakes. > thus I don't think renaming is necessary, but I don't mind. > instead of renaming the DFU "app" (since it's the same for the bootloader or > application), I would just rename the final binary in the Makefile. I still think its best to rename. Doesn't have my stupid proposal, though. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/16558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ic273bb593a7669111b0219fe301d7897419167c8 Gerrit-Change-Number: 16558 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tsaitgaist Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:27:53 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: l1sap: add measurement related struct members
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/15888 )
Change subject: l1sap: add measurement related struct members
..
l1sap: add measurement related struct members
In order to dissolve info_meas_ind_param in ph_data_param and
ph_tch_param we need to add the measurement related struct members to
ph_data_param and ph_tch_param as well so that those indications can
also carry measurement data.
Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42
Related: OS#2977
---
M TODO-RELEASE
M include/osmocom/gsm/l1sap.h
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 8ccfa49..329e217 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
+gsmAPI/ABI change l1sap.h, added struct members to
ph_data_param and ph_tch_param
\ No newline at end of file
diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h
index 3d2ad25..11b2773 100644
--- a/include/osmocom/gsm/l1sap.h
+++ b/include/osmocom/gsm/l1sap.h
@@ -84,6 +84,7 @@
};
int16_t lqual_cb; /*!< Link quality in centiBel */
enum osmo_ph_pres_info_type pdch_presence_info; /*!< Info regarding
presence/validity of header and data parts */
+ uint8_t is_sub:1; /*!< flags */
};
/*! for TCH.{req,ind} | TCH-RTS.ind */
@@ -94,6 +95,8 @@
uint8_t marker; /*!< RTP Marker bit (speech onset indicator) */
uint16_t ber10k;/*!< BER in units of 0.01% */
int16_t lqual_cb; /*!< Link quality in centiBel */
+ int16_t ta_offs_256bits;/*!< timing advance offset (in 1/256th bits) */
+ uint8_t is_sub:1; /*!< flags */
};
/*! for PH-CONN.ind */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42
Gerrit-Change-Number: 15888
Gerrit-PatchSet: 8
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/16668 )
Change subject: radioInterfaceMulti: Fail to tune on freq not following
multi-arfcn restrictions
..
radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions
multi-arfcn feature uses a hardcoded disposition of logical channels on
a physical channel. Logical channels in the phisical channel are
separated by MCBTS_SPACING Hz, that is 4 GSM ARFCNs.
As a result, multi-arfcn restricts the TRX ARFCN setup to the following:
ARFCN(TRX0)=N, ARFCN(TRX1)=N+1*4, ARFCN(TRX2)=N+2*4, ...
Let's make sure radioInterfaceMulti verifies the requested Rx/Tx
frequencies for each logical channel over TRXC match the restriction
explained above. It will check freq going to be set is indeed separated
by MCBTS_SPACING from already set channels, making sure the ARFCN series
is consistent.
Otherwise, before this patch, one could set in osmo-bsc:
ARFCN(TRX0)=N, ARFCN(TRX1)=N+2
and osmo-trx would silently ack the related Rx/TxTUNE TRXC commands, but
actually still transmit on ARFCN N+4 instead. As a result, in this
scenario TRX!=0 were unusable with multi-arfcn.
Related: OS#4207
Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f
---
M Transceiver52M/radioInterface.h
M Transceiver52M/radioInterfaceMulti.cpp
2 files changed, 59 insertions(+), 22 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h
index d9fa414..c75a983 100644
--- a/Transceiver52M/radioInterface.h
+++ b/Transceiver52M/radioInterface.h
@@ -156,16 +156,24 @@
void close();
};
+struct freq_cfg_state {
+ bool set;
+ double freq_hz;
+};
+
class RadioInterfaceMulti : public RadioInterface {
private:
bool pushBuffer();
int pullBuffer();
+ bool verify_arfcn_consistency(double freq, size_t chan, bool tx);
virtual double setTxGain(double dB, size_t chan);
signalVector *outerSendBuffer;
signalVector *outerRecvBuffer;
std::vector history;
std::vector active;
+ std::vector rx_freq_state;
+ std::vector tx_freq_state;
Resampler *dnsampler;
Resampler *upsampler;
diff --git a/Transceiver52M/radioInterfaceMulti.cpp
b/Transceiver52M/radioInterfaceMulti.cpp
index 668305c..a0c24b5 100644
--- a/Transceiver52M/radioInterfaceMulti.cpp
+++ b/Transceiver52M/radioInterfaceMulti.cpp
@@ -73,6 +73,8 @@
powerScaling.resize(0);
history.resize(0);
active.resize(0);
+ rx_freq_state.resize(0);
+ tx_freq_state.resize(0);
RadioInterface::close();
}
@@ -148,6 +150,8 @@
mReceiveFIFO.resize(mChans);
powerScaling.resize(mChans);
history.resize(mChans);
+ rx_freq_state.resize(mChans);
+ tx_freq_state.resize(mChans);
active.resize(MCHANS, false);
inchunk = RESAMP_INRATE * 4;
@@ -362,42 +366,67 @@
return fabs(a - b) < FREQ_DELTA_LIMIT ? true : false;
}
+bool RadioInterfaceMulti::verify_arfcn_consistency(double freq, size_t chan,
bool tx)
+{
+ double freq_i;
+ std::string str_dir = tx ? "Tx" : "Rx";
+ std::vector &v = tx ? tx_freq_state :
rx_freq_state;
+
+ for (size_t i = 0; i < mChans; i++) {
+ if (i == chan)
+ continue;
+ if (!v[i].set)
+ continue;
+
+ freq_i = v[i].freq_hz + (double) ((int)chan - (int)i) *
MCBTS_SPACING;
+ if (!fltcmp(freq, freq_i)) {
+ LOGCHAN(chan, DMAIN, ERROR)
+ << "Setting " << str_dir << " frequency " <<
freq
+ << " is incompatible: already configured
channel "
+ << i << " uses frequency " << v[i].freq_hz
+ << " (expected " << freq_i << ")";
+ return false;
+ }
+ }
+ v[chan].set = true;
+ v[chan].freq_hz = freq;
+ return true;
+}
+
bool RadioInterfaceMulti::tuneTx(double freq, size_t chan)
{
- if (chan >= mChans)
-return false;
+ double shift;
- double shift = (double) getFreqShift(mChans);
+ if (chan >= mChans)
+ return false;
- if (!chan)
-return mDevice->setTxFreq(freq + shift * MCBTS_SPACING);
+ if (!verify_arfcn_consistency(freq, chan, true))
+ return false;
- double center = mDevice->getTxFreq();
- if (!fltcmp(freq, center + (double) (chan - shift) * MCBTS_SPACING)) {
-LOG(NOTICE) << "Channel " << chan << " RF Tx frequency offset is "
-<< freq / 1e6 << " MHz";
- }
+ if (chan == 0) {
+ shift = (double) getFreqShift(mChans);
+ return mDevice->setTxFreq(freq + shift * MCBTS_SPACING);
+ }
- return true;
+ return true;
}
bool RadioInterfaceMulti::tuneRx(double freq, size_t chan)
Change in libosmocore[master]: l1sap: add measurement related struct members
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15888 ) Change subject: l1sap: add measurement related struct members .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c34b02d329f9df190c5035c396403ca0a4f9c42 Gerrit-Change-Number: 15888 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:25:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled .. doc: clarify number of channels on B210 with multi-arfcn enabled Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c --- M doc/manuals/chapters/configuration.adoc 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 2f4986f..a194537 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -46,15 +46,16 @@ added specifically in commit `76764278169d252980853251daeb9f1ba0c246e1`. This feature is useful for instance if you want to run more than 1 TRX with an -Ettus B200 device, or 2 TRX with an Ettus B210 device, since they support only 1 -and 2 physical RF channels respectively. No device from other providers or even -other devices than B200 and B210 from Ettus are known to support this feature. +Ettus B200 device, or more than 2 TRXs with an Ettus B210 device, since they +support only 1 and 2 physical RF channels respectively. No device from other +providers or even other devices than B200 and B210 from Ettus are known to +support this feature. With multi-ARFCN enabled, ARFCN spacing is fixed at 800 kHz or 4 GSM channels. So if TRX-0 is set to ARFCN 51, TRX-1 _must_ be set to 55, and so on. Up to three ARFCN's is supported for multi-TRX. -From BTS and BSC point of view, supporting multiple TRX through multi-ARFCN +From BTS and BSC point of view, supporting multiple TRXs through multi-ARFCN feature in OsmoTRX doesn't make any difference from a regular multi-TRX setup, leaving apart of course the mentioned ARFCN limitations explained above and as a consequence physical installation and operational differences. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged
Change in osmo-trx[master]: lms: Drop unused define
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16754 ) Change subject: lms: Drop unused define .. lms: Drop unused define Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 4a687e1..b8893fb 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -39,7 +39,6 @@ using namespace std; #define MAX_ANTENNA_LIST_SIZE 10 -#define LMS_SAMPLE_RATE GSMRATE*32 #define GSM_CARRIER_BW 27.0 /* 270kHz */ #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe Gerrit-Change-Number: 16754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-trx[master]: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn r...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16668 ) Change subject: radioInterfaceMulti: Fail to tune on freq not following multi-arfcn restrictions .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2f3d66a611d3a489b3e4d9431994f4ec77b4460f Gerrit-Change-Number: 16668 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: tnt Gerrit-Reviewer: ttsou Gerrit-Comment-Date: Tue, 07 Jan 2020 22:24:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/1 )
Change subject: uhd: Improve some logging lines printing UHD pretty-print output
..
uhd: Improve some logging lines printing UHD pretty-print output
Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199
---
M Transceiver52M/device/uhd/UHDDevice.cpp
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp
b/Transceiver52M/device/uhd/UHDDevice.cpp
index 4a6c233..8bab882 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -566,7 +566,7 @@
init_gains();
// Print configuration
- LOGC(DDEV, INFO) << "\n" << usrp_dev->get_pp_string();
+ LOGC(DDEV, INFO) << "Device configuration: " <<
usrp_dev->get_pp_string();
if (iface == MULTI_ARFCN)
return MULTI_ARFCN;
@@ -919,15 +919,18 @@
std::vector freqs;
uhd::tune_result_t tres;
uhd::tune_request_t treq = select_freq(freq, chan, tx);
+ std::string str_dir;
if (tx) {
tres = usrp_dev->set_tx_freq(treq, chan);
tx_freqs[chan] = usrp_dev->get_tx_freq(chan);
+ str_dir = "Tx";
} else {
tres = usrp_dev->set_rx_freq(treq, chan);
rx_freqs[chan] = usrp_dev->get_rx_freq(chan);
+ str_dir = "Rx";
}
- LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl;
+ LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " << str_dir <<
"): " << tres.to_pp_string() << std::endl;
if ((chans == 1) || ((chans == 2) && dev_type == UMTRX))
return true;
@@ -947,7 +950,7 @@
rx_freqs[!chan] = usrp_dev->get_rx_freq(!chan);
}
- LOGC(DDEV, INFO) << "\n" << tres.to_pp_string() << std::endl;
+ LOGCHAN(chan, DDEV, INFO) << "set_freq(" << freq << ", " <<
str_dir << "): " << tres.to_pp_string() << std::endl;
}
return true;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/1
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199
Gerrit-Change-Number: 1
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-trx[master]: lms: Move initialization of field started to constructor
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/16753 )
Change subject: lms: Move initialization of field started to constructor
..
lms: Move initialization of field started to constructor
Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 19fe6e8..4a687e1 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -49,7 +49,7 @@
const std::vector& tx_paths,
const std::vector& rx_paths):
RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths,
rx_paths),
- m_lms_dev(NULL)
+ m_lms_dev(NULL), started(false)
{
LOGC(DDEV, INFO) << "creating LMS device...";
@@ -248,8 +248,6 @@
for (size_t i = 0; i < rx_buffers.size(); i++)
rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t));
- started = false;
-
return NORMAL;
out_close:
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16753
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad
Gerrit-Change-Number: 16753
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-trx[master]: doc: Update vty reference xml file
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16699 ) Change subject: doc: Update vty reference xml file .. doc: Update vty reference xml file Change-Id: Ib2707204cbba6df813ffc08d7098093cf4393da0 --- M doc/manuals/vty/trx_vty_reference.xml 1 file changed, 135 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/vty/trx_vty_reference.xml b/doc/manuals/vty/trx_vty_reference.xml index 8738235..ff44078 100644 --- a/doc/manuals/vty/trx_vty_reference.xml +++ b/doc/manuals/vty/trx_vty_reference.xml @@ -18,10 +18,11 @@ - + + @@ -96,12 +97,6 @@ - - - - - - @@ -193,14 +188,17 @@ - + + + + - + @@ -259,6 +257,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -272,6 +307,12 @@ + + + + + + @@ -415,12 +456,6 @@ - - - - - - @@ -512,14 +547,17 @@ - + + + + - + @@ -578,6 +616,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -591,6 +666,12 @@ + + + + + + @@ -772,16 +853,6 @@ - - - - - - - - - - @@ -861,6 +932,16 @@ + + + + + + + + + + @@ -973,14 +1054,17 @@ - + + + + - + @@ -1179,20 +1263,6 @@ - - - - - - - - - - - - - - @@ -1247,10 +1317,29 @@ - + - - + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ib2707204cbba6df813ffc08d7098093cf4393da0 Gerrit-Change-Number: 16699 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/16665 )
Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging
framework
..
uhd: Use DEVDRV log category and support UHD >=3.11 logging framework
Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4
---
M CommonLibs/Logger.h
M Transceiver52M/device/uhd/UHDDevice.cpp
2 files changed, 51 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/CommonLibs/Logger.h b/CommonLibs/Logger.h
index ab72303..b752e51 100644
--- a/CommonLibs/Logger.h
+++ b/CommonLibs/Logger.h
@@ -58,6 +58,9 @@
#define LOGLV(category, level) \
Log(category, level, __BASE_FILE__, __LINE__).get() << "[tid=" <<
pthread_self() << "] "
+#define LOGSRC(category, level, file, line) \
+ Log(category, level, file, line).get() << "[tid=" << pthread_self() <<
"] "
+
#define LOGCHAN(chan, category, level) \
Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[tid="
<< pthread_self() << "][chan=" << chan << "] "
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp
b/Transceiver52M/device/uhd/UHDDevice.cpp
index 59eb8a7..4a6c233 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -33,11 +33,12 @@
#include "config.h"
#endif
-#ifndef USE_UHD_3_11
+#ifdef USE_UHD_3_11
+#include
+#include
+#else
#include
#include
-#else
-#include
#endif
#define USRP_TX_AMPL 0.3
@@ -134,23 +135,52 @@
return NULL;
}
-#ifndef USE_UHD_3_11
+#ifdef USE_UHD_3_11
+static void uhd_log_handler(const uhd::log::logging_info &info)
+{
+ int level;
+
+ switch (info.verbosity)
+ {
+ case uhd::log::trace:
+ case uhd::log::debug:
+ level = LOGL_DEBUG;
+ break;
+ case uhd::log::info:
+ level = LOGL_INFO;
+ break;
+ case uhd::log::warning:
+ level = LOGL_NOTICE;
+ break;
+ case uhd::log::error:
+ level = LOGL_ERROR;
+ break;
+ case uhd::log::fatal:
+ level = LOGL_FATAL;
+ break;
+ default:
+ level = LOGL_NOTICE;
+ }
+
+ LOGSRC(DDEVDRV, level, info.file.c_str(), info.line) << "[" <<
info.component << "] " << info.message;
+}
+#else
/*
Catch and drop underrun 'U' and overrun 'O' messages from stdout
since we already report using the logging facility. Direct
everything else appropriately.
*/
-void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
+static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)
{
switch (type) {
case uhd::msg::status:
- LOGC(DDEV, INFO) << msg;
+ LOGC(DDEVDRV, INFO) << msg;
break;
case uhd::msg::warning:
- LOGC(DDEV, WARNING) << msg;
+ LOGC(DDEVDRV, NOTICE) << msg;
break;
case uhd::msg::error:
- LOGC(DDEV, ERROR) << msg;
+ LOGC(DDEVDRV, ERROR) << msg;
break;
case uhd::msg::fastpath:
break;
@@ -418,6 +448,16 @@
{
const char *refstr;
+ /* Register msg handler. Different APIs depending on UHD version */
+#ifdef USE_UHD_3_11
+ uhd::log::add_logger("OsmoTRX", &uhd_log_handler);
+ uhd::log::set_log_level(uhd::log::debug);
+ uhd::log::set_console_level(uhd::log::off);
+ uhd::log::set_logger_level("OsmoTRX", uhd::log::debug);
+#else
+ uhd::msg::register_handler(&uhd_msg_handler);
+#endif
+
// Find UHD devices
uhd::device_addr_t addr(args);
uhd::device_addrs_t dev_addrs = uhd::device::find(addr);
@@ -604,10 +644,6 @@
return false;
}
-#ifndef USE_UHD_3_11
- // Register msg handler
- uhd::msg::register_handler(&uhd_msg_handler);
-#endif
// Start asynchronous event (underrun check) loop
async_event_thrd = new Thread();
async_event_thrd->start((void * (*)(void*))async_event_loop,
(void*)this);
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4
Gerrit-Change-Number: 16665
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/16698 )
Change subject: Make logging category DLMS generic and reusable for other
backends
..
Make logging category DLMS generic and reusable for other backends
Make sure old configs using "logging level lms " are still accepted.
Initialization order of VTY componenets need to be resorted since newly
introduced command requires logging VTY node to be already setup
beforehand.
Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e
---
M CommonLibs/debug.c
M CommonLibs/debug.h
M CommonLibs/trx_vty.c
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/osmo-trx.cpp
5 files changed, 9 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c
index cc5be44..c227435 100644
--- a/CommonLibs/debug.c
+++ b/CommonLibs/debug.c
@@ -65,9 +65,9 @@
.color = NULL,
.enabled = 1, .loglevel = LOGL_INFO,
},
- [DLMS] = {
- .name = "DLMS",
- .description = "Logging from within LimeSuite itself",
+ [DDEVDRV] = {
+ .name = "DDEVDRV",
+ .description = "Logging from external device driver library
implementing lower level specifics",
.color = NULL,
.enabled = 1, .loglevel = LOGL_NOTICE,
},
diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h
index 3837329..0dca2ee 100644
--- a/CommonLibs/debug.h
+++ b/CommonLibs/debug.h
@@ -15,7 +15,7 @@
DTRXDDL,
DTRXDUL,
DDEV,
- DLMS,
+ DDEVDRV,
};
#define CLOGC(category, level, fmt, args...) do { \
diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c
index 02d6572..44e1d31 100644
--- a/CommonLibs/trx_vty.c
+++ b/CommonLibs/trx_vty.c
@@ -32,6 +32,7 @@
#include
#include
+#include
#include
#include
@@ -731,5 +732,7 @@
install_element(CHAN_NODE, &cfg_chan_rx_path_cmd);
install_element(CHAN_NODE, &cfg_chan_tx_path_cmd);
+ logging_vty_add_deprecated_subsys(g_trx_ctx, "lms");
+
return 0;
}
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index b5993b8..19fe6e8 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -93,7 +93,7 @@
if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map))
lvl = ARRAY_SIZE(lvl_map)-1;
- LOGLV(DLMS, lvl_map[lvl]) << msg;
+ LOGLV(DDEVDRV, lvl_map[lvl]) << msg;
}
static void print_range(const char* name, lms_range_t *range)
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 16047a9..0ad60ef 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -588,10 +588,10 @@
log_enable_multithread();
osmo_stats_init(tall_trx_ctx);
vty_init(&g_vty_info);
+ logging_vty_add_cmds();
ctrl_vty_init(tall_trx_ctx);
trx_vty_init(g_trx_ctx);
- logging_vty_add_cmds();
osmo_talloc_vty_add_cmds();
osmo_stats_vty_add_cmds();
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e
Gerrit-Change-Number: 16698
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-CC: fixeria
Gerrit-MessageType: merged
Change in osmo-trx[master]: doc: clarify number of channels on B210 with multi-arfcn enabled
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16667 ) Change subject: doc: clarify number of channels on B210 with multi-arfcn enabled .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I082d4d8c346f1be1569fe63baa856029e439cb2c Gerrit-Change-Number: 16667 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jan 2020 22:24:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16665 ) Change subject: uhd: Use DEVDRV log category and support UHD >=3.11 logging framework .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 Gerrit-Change-Number: 16665 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:24:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: Make logging category DLMS generic and reusable for other backends
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16698 ) Change subject: Make logging category DLMS generic and reusable for other backends .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia195a74a62a8a3dd6267fb1359acaa5628208d8e Gerrit-Change-Number: 16698 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 07 Jan 2020 22:23:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: uhd: Improve some logging lines printing UHD pretty-print output
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/1 ) Change subject: uhd: Improve some logging lines printing UHD pretty-print output .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/1 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: If5aba28aaf8a3312d89b3e963184f9f20966d199 Gerrit-Change-Number: 1 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:22:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: lms: Move initialization of field started to constructor
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16753 ) Change subject: lms: Move initialization of field started to constructor .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad Gerrit-Change-Number: 16753 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:21:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: lms: Drop unused define
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/16754 ) Change subject: lms: Drop unused define .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe Gerrit-Change-Number: 16754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:21:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: add/clean big-endian packed structs (struct_endianess.py)
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) .. Patch Set 1: does it actually change anything? I couldn't spot anything. If so: Should be marked as cosmetic. Or not bother at all? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd Gerrit-Change-Number: 16761 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:20:28 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-netif[master]: struct amr_header: copy comments to little endian part
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16758 ) Change subject: struct amr_header: copy comments to little endian part .. struct amr_header: copy comments to little endian part I will soon apply struct_endianess.py to this code, and then the comments that are now only in the big endian part would be lost. Copy them to preserve them. Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a --- M include/osmocom/netif/amr.h 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 46ec86a..729d0ae 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -55,12 +55,12 @@ #elif OSMO_IS_LITTLE_ENDIAN /* Payload Header */ uint8_t pad1:4, - cmr:4; + cmr:4; /* Codec Mode Request */ /* Table of Contents */ uint8_t pad2:2, - q:1, - ft:4, - f:1; + q:1,/* OK (not damaged) at origin? */ + ft:4, /* coding mode */ + f:1;/* followed by another speech frame? */ #endif } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a Gerrit-Change-Number: 16758 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in libosmo-abis[master]: add/clean big-endian packed structs (struct_endianess.py)
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-abis/+/16757 )
Change subject: add/clean big-endian packed structs (struct_endianess.py)
..
add/clean big-endian packed structs (struct_endianess.py)
Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84
---
M src/e1_input.c
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/e1_input.c b/src/e1_input.c
index eb973ef..9e2f7b0 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#define NUM_E1_TS 32
@@ -115,12 +116,19 @@
} __attribute__((packed));
struct lapd_header {
+#if OSMO_IS_LITTLE_ENDIAN
uint8_t ea1 : 1;
uint8_t cr : 1;
uint8_t sapi : 6;
uint8_t ea2 : 1;
uint8_t tei : 7;
uint8_t control_foo; /* fake UM's ... */
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t sapi:6, cr:1, ea1:1;
+ uint8_t tei:7, ea2:1;
+ uint8_t control_foo;
+#endif
} __attribute__((packed));
osmo_static_assert(offsetof(struct fake_linux_lapd_header, hatype) == 2,
hatype_offset);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16757
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84
Gerrit-Change-Number: 16757
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmo-netif[master]: struct amr_header: copy comments to little endian part
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16758 ) Change subject: struct amr_header: copy comments to little endian part .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a Gerrit-Change-Number: 16758 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:19:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: jenkins.sh: simpler invocation of verify_value_string_...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16756 ) Change subject: jenkins.sh: simpler invocation of verify_value_string_... .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I888c20b9b19d777cd6581a541536842292f434b9 Gerrit-Change-Number: 16756 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:18:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-abis[master]: add/clean big-endian packed structs (struct_endianess.py)
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/16757 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84 Gerrit-Change-Number: 16757 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:19:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: jenkins.sh: simpler invocation of verify_value_string_...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/16756 )
Change subject: jenkins.sh: simpler invocation of verify_value_string_...
..
jenkins.sh: simpler invocation of verify_value_string_...
The script
osmo-ci/scripts/verify_value_string_arrays_are_terminated.py
is able to find .c/.h files in directory trees by itself.
Shorten the cmdline invocation of this script for libosmocore.
Change-Id: I888c20b9b19d777cd6581a541536842292f434b9
---
M contrib/jenkins_common.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index fa1d544..b86a479 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -10,7 +10,7 @@
osmo-clean-workspace.sh
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+verify_value_string_arrays_are_terminated.py
prep_build() {
_src_dir="$1"
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16756
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I888c20b9b19d777cd6581a541536842292f434b9
Gerrit-Change-Number: 16756
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmocore[master]: add crcXXgen.c.tpl to EXTRA_DIST
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16755 ) Change subject: add crcXXgen.c.tpl to EXTRA_DIST .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 Gerrit-Change-Number: 16755 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:18:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: add crcXXgen.c.tpl to EXTRA_DIST
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/16755 ) Change subject: add crcXXgen.c.tpl to EXTRA_DIST .. add crcXXgen.c.tpl to EXTRA_DIST 'make distcheck' distributes the generated .c files, but it is good GPL practice to also distribute the template. Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 --- M Makefile.am M src/Makefile.am 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 7390f98..d08f41b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ $(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \ $(top_srcdir)/include/osmocom/core/*.h \ $(top_srcdir)/src/*.[hc] \ + $(top_srcdir)/src/crcXXgen.c.tpl \ $(top_srcdir)/src/pseudotalloc/*.[hc] rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core rm -rf $(top_builddir)/doc/libosmocore.map diff --git a/src/Makefile.am b/src/Makefile.am index 34cda0f..16119d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ endif BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c -EXTRA_DIST = conv_acc_sse_impl.h +EXTRA_DIST = conv_acc_sse_impl.h crcXXgen.c.tpl libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 Gerrit-Change-Number: 16755 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766 )
Change subject: MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn
..
MSC/Iu: add missing SS/USSD test cases from MSC_Tests.ttcn
Change-Id: I99e888708ed1efeab12a4c88c734a78619a39888
---
M msc/MSC_Tests_Iu.ttcn
M msc/expected-results.xml
2 files changed, 52 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/66/16766/1
diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn
index b80005e..586642b 100644
--- a/msc/MSC_Tests_Iu.ttcn
+++ b/msc/MSC_Tests_Iu.ttcn
@@ -422,6 +422,46 @@
f_vty_config(MSCVTY, "msc", "ncss guard-timeout 0");
}
+testcase TC_iu_mt_ussd_for_unknown_subscr() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init(3);
+ vc_conn := f_start_handler(refers(f_tc_mt_ussd_for_unknown_subscr),
1052,
+ ran_idx := 2, ran_is_geran := false);
+ vc_conn.done;
+}
+
+testcase TC_iu_mo_ussd_for_unknown_trans() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init(3);
+ vc_conn := f_start_handler(refers(f_tc_mo_ussd_for_unknown_trans), 1053,
+ ran_idx := 2, ran_is_geran := false);
+ vc_conn.done;
+}
+
+testcase TC_iu_proc_ss_for_unknown_session() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init(3);
+ vc_conn := f_start_handler(refers(f_tc_proc_ss_for_unknown_session),
1055,
+ ran_idx := 2, ran_is_geran := false);
+ vc_conn.done;
+}
+
+testcase TC_iu_proc_ss_paging_fail() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init(3);
+ vc_conn := f_start_handler(refers(f_tc_proc_ss_paging_fail), 1056,
+ ran_idx := 2, ran_is_geran := false);
+ vc_conn.done;
+}
+
+testcase TC_iu_proc_ss_abort() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+ f_init(3);
+ vc_conn := f_start_handler(refers(f_tc_proc_ss_abort), 1057,
+ ran_idx := 2, ran_is_geran := false);
+ vc_conn.done;
+}
+
testcase TC_iu_lu_with_invalid_mcc_mnc() runs on MTC_CT {
var BSC_ConnHdlr vc_conn;
f_init(3);
@@ -476,6 +516,13 @@
execute( TC_iu_lu_and_mt_ussd_during_mt_call() );
execute( TC_iu_lu_and_mo_ussd_mo_release() );
execute( TC_iu_lu_and_ss_session_timeout() );
+
+ execute( TC_iu_mt_ussd_for_unknown_subscr() );
+ execute( TC_iu_mo_ussd_for_unknown_trans() );
+ execute( TC_iu_proc_ss_for_unknown_session() );
+ execute( TC_iu_proc_ss_paging_fail() );
+ execute( TC_iu_proc_ss_abort() );
+
execute( TC_iu_lu_with_invalid_mcc_mnc() );
/* TODO: Iu + SGsAP related tests, e.g. paging on IuCS */
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index f94c781..3a0749b 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -207,6 +207,11 @@
+
+
+
+
+
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16766
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I99e888708ed1efeab12a4c88c734a78619a39888
Gerrit-Change-Number: 16766
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: MSC: add test cases for concurrent MO/MT SS/USSD transactions
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16767 )
Change subject: MSC: add test cases for concurrent MO/MT SS/USSD transactions
..
MSC: add test cases for concurrent MO/MT SS/USSD transactions
Both test cases make use of the existing functions:
- TC_multi_lu_and_mo_ussd: f_tc_lu_and_mo_ussd_single_request(),
- TC_multi_lu_and_mt_ussd: f_tc_lu_and_mt_ussd_notification(),
starting several (*) BSC_ConnHdlr components in parallel.
(*) The maximum amount is limited by 8, and this limitation seems
to be caused by size of GSUP_Emulation_CT.GsupExpectTable[],
even despite SCCP_Emulation can handle twice more.
Change-Id: I2fb1c5d285163d5245d92fa24c197a5027ecbe6f
Related: OS#2931
---
M msc/MSC_Tests.ttcn
M msc/MSC_Tests_Iu.ttcn
2 files changed, 83 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/67/16767/1
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 508acdd..0319137 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -3744,6 +3744,44 @@
}
+/* Verify multiple concurrent MO SS/USSD transactions
+ * (one subscriber - one transaction) */
+testcase TC_multi_lu_and_mo_ussd() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn[8];
+ var integer i;
+
+ f_init();
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ vc_conn[i] :=
f_start_handler(refers(f_tc_lu_and_mo_ussd_single_request), 210 + i);
+ }
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ vc_conn[i].done;
+ }
+}
+
+/* Verify multiple concurrent MT SS/USSD transactions
+ * (one subscriber - one transaction) */
+testcase TC_multi_lu_and_mt_ussd() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn[8];
+ var integer i;
+ var OCT4 sid;
+
+ f_init();
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ sid := '21'O & int2oct(i, 1); /* All transactions must use
different session ID */
+ vc_conn[i] :=
f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification),
+ f_init_pars(220 + i,
gsup_sid := sid));
+ }
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ vc_conn[i].done;
+ }
+}
+
+
/* A5/1 only permitted on network side; attempt an invalid CIPHER MODE
COMPLETE with A5/3 which MSC should reject. */
private function f_tc_cipher_complete_with_invalid_cipher(charstring id,
BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
pars.net.expect_auth := true;
@@ -5894,6 +5932,9 @@
execute( TC_proc_ss_paging_fail() );
execute( TC_proc_ss_abort() );
+ execute( TC_multi_lu_and_mo_ussd() );
+ execute( TC_multi_lu_and_mt_ussd() );
+
execute( TC_cipher_complete_with_invalid_cipher() );
execute( TC_cipher_complete_1_without_cipher() );
execute( TC_cipher_complete_3_without_cipher() );
diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn
index 586642b..b6b0983 100644
--- a/msc/MSC_Tests_Iu.ttcn
+++ b/msc/MSC_Tests_Iu.ttcn
@@ -462,6 +462,45 @@
vc_conn.done;
}
+/* Verify multiple concurrent MO SS/USSD transactions
+ * (one subscriber - one transaction) */
+testcase TC_iu_multi_lu_and_mo_ussd() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn[8];
+ var BSC_ConnHdlrPars pars;
+ var integer i;
+
+ f_init(3);
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ pars := f_init_pars(1100 + i, ran_idx := 2, ran_is_geran :=
false);
+ vc_conn[i] :=
f_start_handler_with_pars(refers(f_tc_lu_and_mo_ussd_single_request), pars);
+ }
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ vc_conn[i].done;
+ }
+}
+
+/* Verify multiple concurrent MT SS/USSD transactions
+ * (one subscriber - one transaction) */
+testcase TC_iu_multi_lu_and_mt_ussd() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn[8];
+ var BSC_ConnHdlrPars pars;
+ var integer i;
+
+ f_init(3);
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ pars := f_init_pars(1110 + i, ran_idx := 2, ran_is_geran :=
false,
+ gsup_sid := '21'O & int2oct(i, 1));
+ vc_conn[i] :=
f_start_handler_with_pars(refers(f_tc_lu_and_mt_ussd_notification), pars);
+ }
+
+ for (i := 0; i < sizeof(vc_conn); i := i + 1) {
+ vc_conn[i].done;
+ }
+}
+
testcase TC_iu_lu_with_invalid_mcc_mnc() runs on MTC_CT {
var BSC_ConnHdlr vc_conn;
f_init(3);
@@ -523,6 +562,9 @@
execute( TC_iu_proc_ss_paging_fail() );
execute( TC_iu_proc_ss_abort() );
+ execute( TC_iu_multi_lu_and_mo_ussd() );
+ execute( TC_iu_multi_lu_and_mt_ussd() );
+
execute( TC_iu_lu_with_invalid_mcc_mnc() );
/* TODO: Iu + SGsAP
Change in osmo-ttcn3-hacks[master]: MSC/GSUP: make session ID for MT SS/USSD configurable
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765 )
Change subject: MSC/GSUP: make session ID for MT SS/USSD configurable
..
MSC/GSUP: make session ID for MT SS/USSD configurable
This would allow to run multiple SS/USSD transactions in parallel.
Change-Id: I326b5e47f4c1e9f9209efa64c143c3dc64132edb
---
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.ttcn
2 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/65/16765/1
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index eae5e56..c21bcd9 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -97,6 +97,7 @@
boolean mm_info,
boolean sgsap_enable,
boolean gsup_enable,
+ OCT4 gsup_sid,
integer ran_idx,
boolean use_umts_aka,
boolean ran_is_geran,
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index c2a5bbb..508acdd 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -362,7 +362,7 @@
/* FIXME: move into BSC_ConnectionHandler? */
function f_init_pars(integer imsi_suffix, boolean sgsap := false, boolean gsup
:= true, integer ran_idx := 0,
-boolean ran_is_geran := true, boolean use_osmux := false)
+boolean ran_is_geran := true, boolean use_osmux := false,
OCT4 gsup_sid := '2101'O)
runs on MTC_CT return BSC_ConnHdlrPars {
var BSC_ConnHdlrNetworkPars net_pars := {
kc_support := '0A'O,/* A5/1 and A5/3 enabled */
@@ -394,6 +394,7 @@
mm_info := mp_mm_info,
sgsap_enable := sgsap,
gsup_enable := gsup,
+ gsup_sid := gsup_sid,
ran_idx := ran_idx,
use_umts_aka := false,
ran_is_geran := ran_is_geran,
@@ -3009,7 +3010,7 @@
/* Compose HLR -> MSC GSUP message */
var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ(
imsi := g_pars.imsi,
- sid := '2101'O,
+ sid := g_pars.gsup_sid,
state := OSMO_GSUP_SESSION_STATE_BEGIN,
ss := valueof(facility_req)
);
@@ -3046,7 +3047,7 @@
/* Compose expected MSC -> HLR GSUP message */
var template GSUP_PDU gsup_rsp := tr_GSUP_PROC_SS_REQ(
imsi := g_pars.imsi,
- sid := '2101'O,
+ sid := g_pars.gsup_sid,
state := OSMO_GSUP_SESSION_STATE_CONTINUE,
ss := valueof(facility_rsp)
);
@@ -3066,7 +3067,7 @@
/* Compose MSC -> HLR GSUP message */
var template GSUP_PDU gsup_term := ts_GSUP_PROC_SS_REQ(
imsi := g_pars.imsi,
- sid := '2101'O,
+ sid := g_pars.gsup_sid,
state := OSMO_GSUP_SESSION_STATE_END
);
@@ -3228,7 +3229,7 @@
/* Compose HLR -> MSC GSUP message */
var template (value) GSUP_PDU gsup_req := ts_GSUP_PROC_SS_REQ(
imsi := g_pars.imsi,
- sid := '2101'O,
+ sid := g_pars.gsup_sid,
state := OSMO_GSUP_SESSION_STATE_BEGIN,
ss := valueof(facility_req)
);
@@ -3248,7 +3249,7 @@
/* Compose expected MSC -> HLR GSUP message */
var template GSUP_PDU gsup_rsp := tr_GSUP_PROC_SS_REQ(
imsi := g_pars.imsi,
- sid := '2101'O,
+ sid := g_pars.gsup_sid,
state := OSMO_GSUP_SESSION_STATE_CONTINUE,
ss := valueof(facility_rsp)
);
@@ -3267,7 +3268,7 @@
/* Compose MSC -> HLR GSUP message */
var template GSUP_PDU gsup_term := ts_GSUP_PROC_SS_REQ(
imsi := g_pars.imsi,
- sid := '2101'O,
+ sid := g_pars.gsup_sid,
state := OSMO_GSUP_SESSION_STATE_END
);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16765
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I326b5e47f4c1e9f9209efa64c143c3dc64132edb
Gerrit-Change-Number: 16765
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16764 ) Change subject: db v6: determine 3G AUC IND from VLR name .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:16:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16763 ) Change subject: auc3g: officially wrap IND around IND_bitlen space .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e Gerrit-Change-Number: 16763 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 22:15:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: drop error log for when a subscriber does not exist
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16212 ) Change subject: drop error log for when a subscriber does not exist .. Patch Set 28: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:14:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16211 ) Change subject: adoc: add D-GSM chapter to osmohlr-usermanual .. Patch Set 28: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:11:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16336 ) Change subject: gsup_server: send routing error back to the correct peer .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:10:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16209 ) Change subject: D-GSM 1/n: add mslookup server in osmo-hlr .. Patch Set 24: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:09:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: test_nodes.vty: remove cruft
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16460 ) Change subject: test_nodes.vty: remove cruft .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia11a209778b78ab02424e2abf3f9004fe97cf570 Gerrit-Change-Number: 16460 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:09:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16207 ) Change subject: db v5: prep for D-GSM: add vlr_via_proxy and sgsn_via_proxy .. Patch Set 23: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I98c7b3870559ede84adf56e4bf111f53c7487745 Gerrit-Change-Number: 16207 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:09:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: 2/2: fixup: add osmo_gsup_peer_id with type enum and union
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16459 ) Change subject: 2/2: fixup: add osmo_gsup_peer_id with type enum and union .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ide9dcdca283ab989240cfc6e53e9211862a199c5 Gerrit-Change-Number: 16459 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:08:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: gsup client: add up_down_cb(), add osmo_gsup_client_create3()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16206 ) Change subject: gsup client: add up_down_cb(), add osmo_gsup_client_create3() .. Patch Set 23: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f181e42b678465bc9945f192559dc57d2083c6d Gerrit-Change-Number: 16206 Gerrit-PatchSet: 23 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 22:08:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 390s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 390s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 390s]dh_install -O--fail-missing [ 390s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 390s] dh_install: This feature will be removed in compat 12. [ 390s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 390s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 390s] dh_missing: missing files, aborting [ 390s]The following debhelper tools have reported what they installed (with files per package) [ 390s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 390s]If the missing files are installed by another tool, please file a bug against it. [ 390s]When filing the report, if the tool is not part of debhelper itself, please reference the [ 390s]"Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 390s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 390s]Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 390s]For a short-term work-around: Add the files to debian/not-installed [ 390s] dh_install: dh_missing --fail-missing returned exit code 255 [ 390s] make: *** [debian/rules:12: binary] Error 255 [ 390s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 391s] [ 391s] lamb14 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 22:07:03 UTC 2020. [ 391s] [ 391s] ### VM INTERACTION START ### [ 394s] [ 375.917530] sysrq: SysRq : Power Off [ 394s] [ 375.926616] reboot: Power down [ 394s] ### VM INTERACTION END ### [ 394s] [ 394s] lamb14 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 22:07:07 UTC 2020. [ 394s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-hlr[master]: add libosmo-mslookup abstract client
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16202 ) Change subject: add libosmo-mslookup abstract client .. Patch Set 20: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I83487ab8aad1611eb02e997dafbcb8344da13df1 Gerrit-Change-Number: 16202 Gerrit-PatchSet: 20 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:07:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb()
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() .. fix memleaks in mtp_user_prim_cb() After dispatching to scrc_rx_mtp_xfer_ind_xua(), free the xua_msg. Do not free the xua_msg in any of the code paths triggered within scrc_rx_mtp_xfer_ind_xua(), i.e. remove xua_msg_free() from: sccp_scoc_rx_from_scrc() +->sccp_scoc_rx_unass_local_ref() +->tx_coerr_from_xua() +->tx_relco_from_xua() Before this, some code paths would free the xua_msg, while most code paths would not, causing mem leaks. Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 --- M src/sccp_scoc.c M src/sccp_user.c 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 7570764..e2768ea 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1413,7 +1413,6 @@ /* sent to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); - xua_msg_free(xua); } /* Generate a RELCO based in input arguments */ @@ -1451,7 +1450,6 @@ /* send to SCRC for transmission */ sccp_scrc_rx_scoc_conn_msg(inst, xua); - xua_msg_free(xua); } /* Generate a RLSD based in input arguments */ diff --git a/src/sccp_user.c b/src/sccp_user.c index 929445f..49cc212 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -174,6 +174,7 @@ xua->mtp = omp->u.transfer; /* hand this primitive into SCCP via the SCRC code */ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); + xua_msg_free(xua); break; default: LOGP(DLSCCP, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c@1415 PS3, Line 1415: sccp_scrc_rx_scoc_conn_msg(inst, xua); > why is this function called _rx_ and not _tx_ ? It's confusing. because the SCRC (SCCP Routing Control) receives a message We (SCOC) are transmitting, but SCRC is receiving. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 22:04:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16257 ) Change subject: D-GSM 2/n: implement mDNS method of mslookup server .. Patch Set 14: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/mslookup_server_mdns.c File src/mslookup_server_mdns.c: https://gerrit.osmocom.org/c/osmo-hlr/+/16257/14/src/mslookup_server_mdns.c@152 PS14, Line 152: OSMO_SOCKADDR_STR_FMT_ARGS(&g_hlr->mslookup.server.mdns.running->bind_addr)); SIGSEGV for me while configuring in the vty. Accessing g_hlr->mslookup.server.mdns.running->bind_addr after (!g_hlr->mslookup.server.mdns.running) ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 07 Jan 2020 20:57:06 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: vty: show subscriber: change format of 'last LU seen'
neels has uploaded a new patch set (#18) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-hlr/+/15359 ) Change subject: vty: show subscriber: change format of 'last LU seen' .. vty: show subscriber: change format of 'last LU seen' So far, the time string format comes from ctime_r, and we manually add "UTC" to it. The ctime_r format is wildly chaotic IMHO, mixing weekday, day-of-month and hour and year in very unsorted ways. Adding "UTC" to it is non-standard. Instead use an ISO-8601 standardized time string via strftime(). Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a --- M src/hlr_vty_subscr.c 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/59/15359/18 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/15359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a Gerrit-Change-Number: 15359 Gerrit-PatchSet: 18 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 to look at the new patch set (#2). Change subject: db v6: determine 3G AUC IND from VLR name .. db v6: determine 3G AUC IND from VLR name Each VLR requesting auth tuples should use a distinct IND pool for 3G auth. So far we tied the IND to the GSUP peer connection; MSC and SGSN were always distinct GSUP peers, they ended up using distinct INDs. However, we have implemented a GSUP proxy, so that, in a distributed setup, a remotely roaming subscriber has only one direct GSUP peer proxying for both remote MSC and SGSN. That means as soon as a subscriber roams to a different site, we would use the GSUP proxy name to determine the IND instead of the separate MSC and SGSN. The site's MSC and SGSN appear as the same client, get the same IND bucket, waste SQNs rapidly and cause auth tuple generation load. So instead of using the local client as IND, persistently keep a list of VLR names and assign a different IND to each. Use the gsup_req->source_name as indicator, which reflects the actual remote VLR's name (remote MSC or SGSN). Persist the site <-> IND assignments in the database. Add an IND test to db_test.c There was an earlier patch version that separated the IND pools by cn_domain, but it turned out to add complex semantics, while only solving one aspect of the "adjacent VLR" problem. We need a solution not only for CS vs PS, but also for 2,3G vs 4G, and for sites that are physically adjacent to each other. This patch version does not offer any automatic solution for that -- as soon as more than 2^IND_bitlen (usually 32) VLRs show up, it is the responsibility of the admin to ensure the 'ind' table in the hlr.db does not have unfortunate IND assignments. So far no VTY commands exist for that, they may be added in the future. Related: OS#4319 Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 --- M include/osmocom/hlr/db.h M sql/hlr.sql M src/db.c M src/db_hlr.c M src/gsupclient/gsup_peer_id.c M src/hlr.c M tests/db/db_test.c M tests/db/db_test.err M tests/db_upgrade/db_upgrade_test.ok 9 files changed, 296 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/16764/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374 Gerrit-Change-Number: 16764 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: vty: show subscriber: show lu d, h, m, s ago, not just seconds
Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 to look at the new patch set (#14). Change subject: vty: show subscriber: show lu d,h,m,s ago, not just seconds .. vty: show subscriber: show lu d,h,m,s ago, not just seconds Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 --- M src/hlr_vty_subscr.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/62/16262/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0fe34e0f065160ef959b2b7b4dd040f3f2985f43 Gerrit-Change-Number: 16262 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: D-GSM 1/n: add mslookup server in osmo-hlr
Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 to look at the new patch set (#24). Change subject: D-GSM 1/n: add mslookup server in osmo-hlr .. D-GSM 1/n: add mslookup server in osmo-hlr Implement the mslookup server to service remote mslookup requests. This patch merely adds the logic to answer incoming mslookup requests, an actual method to receive requests (mDNS) follows in a subsequent patch. - API to configure service names and addresses for the local site (per MSC). - determine whether a subscriber is on a local MSC (checking the local proxy will be added in subsequent patch that adds proxy capability). - VTY config follows in a subsequent patch. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h A include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/timestamp.h M src/Makefile.am M src/hlr.c A src/mslookup_server.c A src/timestamp.c 8 files changed, 536 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/09/16209/24 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ife4a61d71926d08f310a1aeed9d9f1974f64178b Gerrit-Change-Number: 16209 Gerrit-PatchSet: 24 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 to look at the new patch set (#2). Change subject: auc3g: officially wrap IND around IND_bitlen space .. auc3g: officially wrap IND around IND_bitlen space To determine distinct IND pools for each connected VLR, we need to pick ever increasing values for any new peer showing up. Each subscriber's individual IND_bitlen is then required to modulo the least significant N of bits that fit in its IND_bitlen to effectively round-robin in the available IND pool space. So far we did that but issued a warning message. This is actually exactly what we want and it doesn't need to be treated like it weren't so. Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e --- M src/db_auc.c 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/63/16763/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e Gerrit-Change-Number: 16763 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: drop error log for when a subscriber does not exist
Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 to look at the new patch set (#28). Change subject: drop error log for when a subscriber does not exist .. drop error log for when a subscriber does not exist Checking for existence of a subscriber and seeing that there is none is not inherently an error. However, osmo-hlr currently logs on all occasions: DAUC ERROR Cannot read subscriber from db: MSISDN='1001': No such subscriber This spams the ERROR log level. Particularly when a D-GSM setup does subscriber existence checks for every incoming mslookup request, that potentially creates constant ERROR logging. The "No such subscriber" part comes from db_sel(), which might also return an sqlite3_errmsg(). We still want those sqlite3_errmsg()es in the ERROR log. Hence print an ERROR log only if db_sel() returns an rc != -ENOENT. Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b --- M src/db_hlr.c M tests/db/db_test.err 2 files changed, 4 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/12/16212/28 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5044e9b4519b948edc4e451cef0f7830d315619b Gerrit-Change-Number: 16212 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: adoc: add D-GSM chapter to osmohlr-usermanual
Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 to look at the new patch set (#28). Change subject: adoc: add D-GSM chapter to osmohlr-usermanual .. adoc: add D-GSM chapter to osmohlr-usermanual Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 --- A doc/manuals/chapters/dgsm.adoc M doc/manuals/osmohlr-usermanual.adoc 2 files changed, 483 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/16211/28 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I392b5523870c2ef3267179160028d26f3f761b77 Gerrit-Change-Number: 16211 Gerrit-PatchSet: 28 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: gsup_server: send routing error back to the correct peer
Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 to look at the new patch set (#6). Change subject: gsup_server: send routing error back to the correct peer .. gsup_server: send routing error back to the correct peer If a peer attempts to add a route to an ipa-name that we already have in the routing system, don't send the routing error to the peer that already has the name, but to the peer that attempts to re-use it and would cause the collision. This is fixing a situation where for example a locally attached MSC has name 'MSC-1', and a remote site is proxying GSUP here for a remote MSC that also has the name 'MSC-1'. Send the routing error back to the proxy, not local 'MSC-1'. Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 --- M src/gsup_server.c 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/36/16336/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Icafaedc11b5925149d338bdcb987ae985a7323d6 Gerrit-Change-Number: 16336 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: D-GSM 2/n: implement mDNS method of mslookup server
Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 to look at the new patch set (#14). Change subject: D-GSM 2/n: implement mDNS method of mslookup server .. D-GSM 2/n: implement mDNS method of mslookup server Implement the mslookup server's mDNS responder, to actually service remote mslookup requests: - VTY mslookup/server config with service names, - the mslookup_mdns_server listening for mslookup requests, For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 --- M include/osmocom/hlr/Makefile.am M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/mslookup_server_mdns.h M src/Makefile.am A src/dgsm_vty.c M src/hlr.c A src/mslookup_server_mdns.c M tests/test_nodes.vty M tests/test_subscriber.vty 11 files changed, 605 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/57/16257/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I5cae6459090588b4dd292be90a5e8903432669d2 Gerrit-Change-Number: 16257 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr
Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#15). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr .. D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h M include/osmocom/hlr/mslookup_server.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/gsup_server.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c M src/mslookup_server_mdns.c A src/proxy.c A src/remote_hlr.c M tests/gsup_server/Makefile.am M tests/test_nodes.vty 22 files changed, 2,005 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/15 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 15 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: hlr_vty_subscr: prettier output for last LU seen
neels has uploaded a new patch set (#24) to the change originally created by osmith. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16214 ) Change subject: hlr_vty_subscr: prettier output for last LU seen .. hlr_vty_subscr: prettier output for last LU seen Extend the "last LU seen on ..." line with the amount of seconds that passed since now, or "(invalid timestamp)". Patch split from Id7fc50567211a0870ac0524f6dee94d4513781ba, because it depends on timestamp_age which was just added in Ife4a61d71926d08f310a1aeed9d9f1974f64178b. Change-Id: I24f9e86c1aa0b1576290094e024562f41b988f37 --- M src/hlr_vty_subscr.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/14/16214/24 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I24f9e86c1aa0b1576290094e024562f41b988f37 Gerrit-Change-Number: 16214 Gerrit-PatchSet: 24 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/16258 ) Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr .. Patch Set 14: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 07 Jan 2020 20:12:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: db v6: determine 3G AUC IND from VLR name
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hlr/+/16764 )
Change subject: db v6: determine 3G AUC IND from VLR name
..
db v6: determine 3G AUC IND from VLR name
Each VLR requesting auth tuples should use a distinct IND pool for 3G auth. So
far we tied the IND to the GSUP peer connection; MSC and SGSN were always
distinct GSUP peers, they ended up using distinct INDs.
However, we have implemented a GSUP proxy, so that, in a distributed setup, a
remotely roaming subscriber has only one direct GSUP peer proxying for both
remote MSC and SGSN. That means as soon as a subscriber roams to a different
site, we would use the GSUP proxy name to determine the IND instead of the
separate MSC and SGSN. The site's MSC and SGSN appear as the same client, get
the same IND bucket, waste SQNs rapidly and cause auth tuple generation load.
So instead of using the local client as IND, persistently keep a list of VLR
names and assign a different IND to each. Use the gsup_req->source_name as
indicator, which reflects the actual remote VLR's name (remote MSC or SGSN).
Persist the site <-> IND assignments in the database.
Add an IND test to db_test.c
There was an earlier patch version that separated the IND pools by cn_domain,
but it turned out to add complex semantics, while only solving one aspect of
the "adjacent VLR" problem. We need a solution not only for CS vs PS, but also
for 2,3G vs 4G, and for sites that are physically adjacent to each other. This
patch version does not offer any automatic solution for that -- as soon as more
than 2^IND_bitlen (usually 32) VLRs show up, it is the responsibility of the
admin to ensure the 'ind' table in the hlr.db does not have unfortunate IND
assignments. So far no VTY commands exist for that, they may be added in the
future.
Related: OS#4319
Change-Id: I6f0a6bbef3a27507605c3b4a0e1a89bdfd468374
---
M include/osmocom/hlr/db.h
M sql/hlr.sql
M src/db.c
M src/db_hlr.c
M src/gsupclient/gsup_peer_id.c
M src/hlr.c
M tests/db/db_test.c
M tests/db/db_test.err
M tests/db_upgrade/db_upgrade_test.ok
9 files changed, 296 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/64/16764/1
diff --git a/include/osmocom/hlr/db.h b/include/osmocom/hlr/db.h
index 9309b8f..1f1bacb 100644
--- a/include/osmocom/hlr/db.h
+++ b/include/osmocom/hlr/db.h
@@ -4,6 +4,7 @@
#include
#include
+#include
struct hlr;
@@ -33,6 +34,9 @@
DB_STMT_SET_LAST_LU_SEEN_PS,
DB_STMT_EXISTS_BY_IMSI,
DB_STMT_EXISTS_BY_MSISDN,
+ DB_STMT_IND_ADD,
+ DB_STMT_IND_SELECT,
+ DB_STMT_IND_DEL,
_NUM_DB_STMT
};
@@ -163,6 +167,9 @@
int db_subscr_purge(struct db_context *dbc, const char *by_imsi,
bool purge_val, bool is_ps);
+int db_ind(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr,
unsigned int *ind);
+int db_ind_del(struct db_context *dbc, const struct osmo_gsup_peer_id *vlr);
+
/*! Call sqlite3_column_text() and copy result to a char[].
* \param[out] buf A char[] used as sizeof() arg(!) and osmo_strlcpy() target.
* \param[in] stmt An sqlite3_stmt*.
diff --git a/sql/hlr.sql b/sql/hlr.sql
index 98e586d..e855a6c 100644
--- a/sql/hlr.sql
+++ b/sql/hlr.sql
@@ -79,8 +79,16 @@
ind_bitlen INTEGER NOT NULL DEFAULT 5
);
+CREATE TABLE ind (
+ -- 3G auth IND pool to be used for this VLR
+ ind INTEGER PRIMARY KEY,
+ -- VLR identification, usually the GSUP source_name
+ vlr TEXT NOT NULL,
+ UNIQUE (vlr)
+);
+
CREATE UNIQUE INDEX idx_subscr_imsi ON subscriber (imsi);
-- Set HLR database schema version number
-- Note: This constant is currently duplicated in src/db.c and must be kept in
sync!
-PRAGMA user_version = 5;
+PRAGMA user_version = 6;
diff --git a/src/db.c b/src/db.c
index 3cbd9c9..c265ffa 100644
--- a/src/db.c
+++ b/src/db.c
@@ -30,7 +30,7 @@
#include "db_bootstrap.h"
/* This constant is currently duplicated in sql/hlr.sql and must be kept in
sync! */
-#define CURRENT_SCHEMA_VERSION 5
+#define CURRENT_SCHEMA_VERSION 6
#define SEL_COLUMNS \
"id," \
@@ -87,6 +87,9 @@
[DB_STMT_SET_LAST_LU_SEEN_PS] = "UPDATE subscriber SET last_lu_seen_ps
= datetime($val, 'unixepoch') WHERE id = $subscriber_id",
[DB_STMT_EXISTS_BY_IMSI] = "SELECT 1 FROM subscriber WHERE imsi =
$imsi",
[DB_STMT_EXISTS_BY_MSISDN] = "SELECT 1 FROM subscriber WHERE msisdn =
$msisdn",
+ [DB_STMT_IND_ADD] = "INSERT INTO ind (vlr) VALUES ($vlr)",
+ [DB_STMT_IND_SELECT] = "SELECT ind FROM ind WHERE vlr = $vlr",
+ [DB_STMT_IND_DEL] = "DELETE FROM ind WHERE vlr = $vlr",
};
static void sql3_error_log_cb(void *arg, int err_code, const char *msg)
@@ -481,6 +484,29 @@
return rc;
}
+static int db_upgrade_v6(struct db_context *dbc)
+{
+ int rc;
+ const char *statements[] = {
+ "CREATE TABLE in
Change in osmo-hlr[master]: auc3g: officially wrap IND around IND_bitlen space
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hlr/+/16763 )
Change subject: auc3g: officially wrap IND around IND_bitlen space
..
auc3g: officially wrap IND around IND_bitlen space
To determine distinct IND pools for each connected VLR, we need to pick ever
increasing values for any new peer showing up. Each subscriber's individual
IND_bitlen is then required to modulo the least significant N of bits that fit
in its IND_bitlen to effectively round-robin in the available IND pool space.
So far we did that but issued a warning message. This is actually exactly what
we want and it doesn't need to be treated like it weren't so.
Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e
---
M src/db_auc.c
1 file changed, 9 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/63/16763/1
diff --git a/src/db_auc.c b/src/db_auc.c
index ecb9f58..975eb2d 100644
--- a/src/db_auc.c
+++ b/src/db_auc.c
@@ -200,15 +200,16 @@
if (rc)
return rc;
+ /* modulo by the IND bitlen value range. For example, ind_bitlen == 5
would modulo 32:
+* 1 << 5 == 0b010 == 32
+* - 1 == 0b001 == bitmask of 5 lowest bits
+* x &= 0b001 == modulo 32
+* Why do this? osmo-hlr cannot possibly choose individual VLR INDs
always matching all subscribers' IND_bitlen,
+* which might vary wildly. Instead, let hlr.c pass in an arbitrarily
high number here, and the modulo does a
+* round-robin if the IND pools that this subscriber has available. */
+ auc_3g_ind &= (1U << aud3g.u.umts.ind_bitlen) - 1;
aud3g.u.umts.ind = auc_3g_ind;
- if (aud3g.type == OSMO_AUTH_TYPE_UMTS
- && aud3g.u.umts.ind >= (1U << aud3g.u.umts.ind_bitlen)) {
- LOGAUC(imsi, LOGL_NOTICE, "3G auth: SQN's IND bitlen %u is"
- " too small to hold an index of %u. Truncating. This"
- " may cause numerous additional AUTS resyncing.\n",
- aud3g.u.umts.ind_bitlen, aud3g.u.umts.ind);
- aud3g.u.umts.ind &= (1U << aud3g.u.umts.ind_bitlen) - 1;
- }
+
/* the first bit (bit0) cannot be used as AMF anymore, but has been
* re-appropriated as the separation bit. See 3GPP TS 33.102 Annex H
* together with 3GPP TS 33.401 / 33.402 / 33.501 */
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16763
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I716d8a8a249235c8093d7a6a78b3535d893d867e
Gerrit-Change-Number: 16763
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-hlr[master]: D-GSM 3/n: implement roaming by mslookup in osmo-hlr
Hello laforge, osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 to look at the new patch set (#14). Change subject: D-GSM 3/n: implement roaming by mslookup in osmo-hlr .. D-GSM 3/n: implement roaming by mslookup in osmo-hlr Add mslookup client to find remote home HLRs of unknown IMSIs, and proxy/forward GSUP for those to the right remote HLR instances. Add remote_hlr.c to manage one GSUP client per remote HLR GSUP address. Add proxy.c to keep state about remotely handled IMSIs (remote GSUP address, MSISDN, and probably more in future patches). The mslookup_server that determines whether a given MSISDN is attached locally now also needs to look in the proxy record: it is always the osmo-hlr immediately peering for the MSC that should respond to mslookup service address queries like SIP and SMPP. (Only gsup.hlr service is always answered by the home HLR.) Add dgsm.c to set up an mdns mslookup client, ask for IMSI homes, and to decide which GSUP is handled locally and which needs to go to a remote HLR. Add full VTY config and VTY tests. For a detailed overview of the D-GSM and mslookup related files, please see the elaborate comment at the top of mslookup.c (already added in an earlier patch). Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa --- M include/osmocom/hlr/Makefile.am A include/osmocom/hlr/dgsm.h M include/osmocom/hlr/gsup_server.h M include/osmocom/hlr/hlr.h M include/osmocom/hlr/hlr_vty.h M include/osmocom/hlr/logging.h A include/osmocom/hlr/proxy.h A include/osmocom/hlr/remote_hlr.h M src/Makefile.am A src/dgsm.c M src/dgsm_vty.c M src/hlr.c M src/hlr_vty.c M src/logging.c M src/mslookup_server.c M src/mslookup_server_mdns.c A src/proxy.c A src/remote_hlr.c M tests/test_nodes.vty 19 files changed, 1,914 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/16258/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/16258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I2fe453553c90e6ee527ed13a13089900efd488aa Gerrit-Change-Number: 16258 Gerrit-PatchSet: 14 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-hlr[master]: proxy routing refactor
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hlr/+/16762 )
Change subject: proxy routing refactor
..
proxy routing refactor
Change-Id: I43ad27f6d768df02abb3459ac4c43bb80cc1cbeb
---
M include/osmocom/hlr/dgsm.h
M include/osmocom/hlr/gsup_server.h
M include/osmocom/hlr/mslookup_server.h
M include/osmocom/hlr/proxy.h
M include/osmocom/hlr/remote_hlr.h
M src/dgsm.c
M src/dgsm_vty.c
M src/gsup_server.c
M src/hlr.c
M src/mslookup_server.c
M src/proxy.c
M src/remote_hlr.c
M tests/gsup_server/Makefile.am
13 files changed, 297 insertions(+), 208 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/62/16762/1
diff --git a/include/osmocom/hlr/dgsm.h b/include/osmocom/hlr/dgsm.h
index f06e381..b3d73e9 100644
--- a/include/osmocom/hlr/dgsm.h
+++ b/include/osmocom/hlr/dgsm.h
@@ -21,6 +21,7 @@
#include
#include
+#include
#include
#include
diff --git a/include/osmocom/hlr/gsup_server.h
b/include/osmocom/hlr/gsup_server.h
index b7cfb89..22c9a10 100644
--- a/include/osmocom/hlr/gsup_server.h
+++ b/include/osmocom/hlr/gsup_server.h
@@ -74,3 +74,5 @@
uint8_t *msisdn_enc, size_t
msisdn_enc_size,
uint8_t *apn_buf, size_t
apn_buf_size,
enum osmo_gsup_cn_domain cn_domain);
+int osmo_gsup_forward_to_local_peer(struct osmo_gsup_server *server, const
struct osmo_gsup_peer_id *to_peer,
+ struct osmo_gsup_req *req, struct
osmo_gsup_message *modified_gsup);
diff --git a/include/osmocom/hlr/mslookup_server.h
b/include/osmocom/hlr/mslookup_server.h
index f76e92f..aed7ad0 100644
--- a/include/osmocom/hlr/mslookup_server.h
+++ b/include/osmocom/hlr/mslookup_server.h
@@ -63,6 +63,10 @@
extern const struct osmo_ipa_name mslookup_server_msc_wildcard;
struct mslookup_server_msc_cfg *mslookup_server_msc_get(const struct
osmo_ipa_name *msc_name, bool create);
-struct mslookup_service_host *mslookup_server_get_local_gsup_addr();
+const struct mslookup_service_host *mslookup_server_get_local_gsup_addr();
void mslookup_server_rx(const struct osmo_mslookup_query *query,
struct osmo_mslookup_result *result);
+
+bool subscriber_has_done_lu_here(const struct osmo_mslookup_query *query,
+uint32_t *lu_age_p, struct osmo_ipa_name
*local_msc_name,
+char *ret_imsi, size_t ret_imsi_len);
diff --git a/include/osmocom/hlr/proxy.h b/include/osmocom/hlr/proxy.h
index 8412dd2..92ed30a 100644
--- a/include/osmocom/hlr/proxy.h
+++ b/include/osmocom/hlr/proxy.h
@@ -28,12 +28,6 @@
struct osmo_gsup_req;
struct remote_hlr;
-struct proxy_pending_gsup_req {
- struct llist_head entry;
- struct osmo_gsup_req *req;
- timestamp_t received_at;
-};
-
struct proxy {
struct llist_head subscr_list;
struct llist_head pending_gsup_reqs;
@@ -87,8 +81,8 @@
int proxy_subscr_create_or_update(struct proxy *proxy, const struct
proxy_subscr *proxy_subscr);
int proxy_subscr_del(struct proxy *proxy, const char *imsi);
-void proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct
proxy_subscr *proxy_subscr,
- struct osmo_gsup_req *req);
+int proxy_subscr_forward_to_remote_hlr(struct proxy *proxy, const struct
proxy_subscr *proxy_subscr,
+ struct osmo_gsup_req *req);
void proxy_subscr_forward_to_remote_hlr_resolved(struct proxy *proxy, const
struct proxy_subscr *proxy_subscr,
struct remote_hlr *remote_hlr,
struct osmo_gsup_req *req);
@@ -96,6 +90,6 @@
const struct osmo_gsup_message *gsup, struct
remote_hlr *from_remote_hlr);
void proxy_subscr_remote_hlr_resolved(struct proxy *proxy, const struct
proxy_subscr *proxy_subscr,
- struct remote_hlr *remote_hlr);
+ const struct osmo_sockaddr_str
*remote_hlr_addr);
void proxy_subscr_remote_hlr_up(struct proxy *proxy, const struct proxy_subscr
*proxy_subscr,
struct remote_hlr *remote_hlr);
diff --git a/include/osmocom/hlr/remote_hlr.h b/include/osmocom/hlr/remote_hlr.h
index 4f9f939..6a4e8a1 100644
--- a/include/osmocom/hlr/remote_hlr.h
+++ b/include/osmocom/hlr/remote_hlr.h
@@ -40,9 +40,20 @@
struct llist_head entry;
struct osmo_sockaddr_str addr;
struct osmo_gsup_client *gsupc;
+ struct llist_head pending_up_callbacks;
};
-struct remote_hlr *remote_hlr_get(const struct osmo_sockaddr_str *addr, bool
create);
+/*! Receive a remote_hlr address when connecting succeeded, or remote_hlr ==
NULL on error.
+ * \param addr GSUP IP address and port for which the connection was
requested.
+ * \
Change in libosmo-netif[master]: configure: check for sctp.h
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure: check for sctp.h .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmo-netif/+/16760/1/configure.ac File configure.ac: https://gerrit.osmocom.org/c/libosmo-netif/+/16760/1/configure.ac@100 PS1, Line 100: AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found)) Support check for libsctp here is wrong actually. Same for DAHDI probably. We should have explicit build enable/disable flags for those instead, and the header should only be checked in the event --enable-libsctp is passed (the default). See libosmocore (libsctp) and libosmo-abis(dahdi) as an example: --disable-libsctp Do not enable socket multiaddr APIs requiring libsctp AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])], [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) AM_CONDITIONAL(ENABLE_LIBSCTP, test x"$ENABLE_LIBSCTP" = x"yes") AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"], [ old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_bindx], [sctp], [ AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) AC_SUBST(HAVE_LIBSCTP, [1]) if test -n "$ac_lib"; then AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) fi ], [ AC_MSG_ERROR([sctp_bindx not found in searched libs])]) LIBS=$old_LIBS ]) AC_ARG_ENABLE([dahdi], AC_HELP_STRING([--disable-dahdi], [disable support for DAHID ISDN (E1/T1) cards [default=yes]]), [enable_dahdi="$enableval"], [enable_dahdi="yes"]) AM_CONDITIONAL(ENABLE_DAHDI, test "x$enable_dahdi" = "xyes") if test "x$enable_dahdi" = "xyes"; then AC_CHECK_HEADERS([dahdi/user.h],[],[AC_MSG_ERROR([DAHDI input driver enabled but DAHDI not found])]) else AC_MSG_WARN([DAHDI input driver will not be built]) fi -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 17:52:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-netif[master]: add/clean big-endian packed structs (struct_endianess.py)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16759 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) .. Patch Set 1: I don't see the point of these patches. The structs are already correctly supporting both little endian and big endian, so running the script in this case is simply making them harder to read? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 Gerrit-Change-Number: 16759 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 17:44:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() .. Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c File src/sccp_scoc.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/9957/3/src/sccp_scoc.c@1415 PS3, Line 1415: sccp_scrc_rx_scoc_conn_msg(inst, xua); why is this function called _rx_ and not _tx_ ? It's confusing. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 17:41:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: fix memleaks in mtp_user_prim_cb()
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 ) Change subject: fix memleaks in mtp_user_prim_cb() .. Patch Set 3: I still have this patch but not sure how to test: get a memleak and then verify that the patch fixes that (and not sure whether time should be spent) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/9957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I72b3c6a6f57ba32d9ba191af33b4b236492174e0 Gerrit-Change-Number: 9957 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Tue, 07 Jan 2020 17:23:30 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-sccp[master]: add/clean big-endian packed structs (struct_endianess.py)
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 ) Change subject: add/clean big-endian packed structs (struct_endianess.py) .. add/clean big-endian packed structs (struct_endianess.py) Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd --- M include/osmocom/mtp/mtp_level3.h M include/osmocom/sccp/sccp_types.h 2 files changed, 14 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/61/16761/1 diff --git a/include/osmocom/mtp/mtp_level3.h b/include/osmocom/mtp/mtp_level3.h index d0d24a1..414b144 100644 --- a/include/osmocom/mtp/mtp_level3.h +++ b/include/osmocom/mtp/mtp_level3.h @@ -131,9 +131,8 @@ spare : 2, ni : 2; #elif OSMO_IS_BIG_ENDIAN - uint8_t ni : 2, -spare : 2, -ser_ind : 4; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t ni:2, spare:2, ser_ind:4; #endif uint32_t addr; uint8_t data[0]; @@ -144,8 +143,8 @@ uint8_t h0 : 4, h1 : 4; #elif OSMO_IS_BIG_ENDIAN - uint8_t h1 : 4, -h0 : 4; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t h1:4, h0:4; #endif } __attribute__((packed)); @@ -155,8 +154,8 @@ uint8_t spare : 4, length : 4; #elif OSMO_IS_BIG_ENDIAN - uint8_t length : 4, -spare : 4; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t length:4, spare:4; #endif uint8_t data[0]; } __attribute__((packed)); @@ -175,8 +174,8 @@ uint8_t mul_ind : 2, spare : 6; #elif OSMO_IS_BIG_ENDIAN - uint8_t spare : 6, -mul_ind : 2; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t spare:6, mul_ind:2; #endif } __attribute__((packed)); diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 18b54f4..17c60e4 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -97,11 +97,8 @@ routing_indicator: 1, reserved : 1; #elif OSMO_IS_BIG_ENDIAN - uint8_t reserved : 1, - routing_indicator: 1, - global_title_indicator : 4, - ssn_indicator: 1, - point_code_indicator : 1; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:1, routing_indicator:1, global_title_indicator:4, ssn_indicator:1, point_code_indicator:1; #endif uint8_t data[0]; } __attribute__((packed)); @@ -115,8 +112,8 @@ uint8_t msb : 6, reserved : 2; #elif OSMO_IS_BIG_ENDIAN - uint8_t reserved : 2, - msb : 6; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t reserved:2, msb:6; #endif } __attribute__((packed)); @@ -157,8 +154,8 @@ uint8_t nature_of_addr_ind : 7, odd_even : 1; #elif OSMO_IS_BIG_ENDIAN - uint8_t odd_even : 1, - nature_of_addr_ind : 7; +/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */ + uint8_t odd_even:1, nature_of_addr_ind:7; #endif uint8_t data[0]; } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/16761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd Gerrit-Change-Number: 16761 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in libosmo-netif[master]: configure: check for sctp.h
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16760 ) Change subject: configure: check for sctp.h .. configure: check for sctp.h Notice missing sctp header at configure time. Without this patch, the user only finds out at build time. Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/60/16760/1 diff --git a/configure.ac b/configure.ac index 7af10ec..56fc4d5 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,7 @@ ], [ AC_MSG_ERROR([sctp_send not found in searched libs])]) LIBS=$old_LIBS +AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found)) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I4b3e1f1894f13ac1175a71a5139c02a2633be26d Gerrit-Change-Number: 16760 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in libosmo-netif[master]: struct amr_header: copy comments to little endian part
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/16758 ) Change subject: struct amr_header: copy comments to little endian part .. struct amr_header: copy comments to little endian part I will soon apply struct_endianess.py to this code, and then the comments that are now only in the big endian part would be lost. Copy them to preserve them. Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a --- M include/osmocom/netif/amr.h 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/58/16758/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 46ec86a..729d0ae 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -55,12 +55,12 @@ #elif OSMO_IS_LITTLE_ENDIAN /* Payload Header */ uint8_t pad1:4, - cmr:4; + cmr:4; /* Codec Mode Request */ /* Table of Contents */ uint8_t pad2:2, - q:1, - ft:4, - f:1; + q:1,/* OK (not damaged) at origin? */ + ft:4, /* coding mode */ + f:1;/* followed by another speech frame? */ #endif } __attribute__((packed)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ie4279928bd77a5d425d0e7a3c4d58bac3cf0230a Gerrit-Change-Number: 16758 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in libosmo-netif[master]: add/clean big-endian packed structs (struct_endianess.py)
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/16759 )
Change subject: add/clean big-endian packed structs (struct_endianess.py)
..
add/clean big-endian packed structs (struct_endianess.py)
Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5
---
M include/osmocom/netif/amr.h
M include/osmocom/netif/osmux.h
M include/osmocom/netif/rtp.h
3 files changed, 16 insertions(+), 27 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/59/16759/1
diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h
index 729d0ae..6e37c99 100644
--- a/include/osmocom/netif/amr.h
+++ b/include/osmocom/netif/amr.h
@@ -43,16 +43,7 @@
*/
struct amr_hdr {
-#if OSMO_IS_BIG_ENDIAN
- /* Payload Header */
- uint8_t cmr:4, /* Codec Mode Request */
- pad1:4;
- /* Table of Contents */
- uint8_t f:1,/* followed by another speech frame? */
- ft:4, /* coding mode */
- q:1,/* OK (not damaged) at origin? */
- pad2:2;
-#elif OSMO_IS_LITTLE_ENDIAN
+#if OSMO_IS_LITTLE_ENDIAN
/* Payload Header */
uint8_t pad1:4,
cmr:4; /* Codec Mode Request */
@@ -61,6 +52,10 @@
q:1,/* OK (not damaged) at origin? */
ft:4, /* coding mode */
f:1;/* followed by another speech frame? */
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t cmr:4, pad1:4;
+ uint8_t f:1, ft:4, q:1, pad2:2;
#endif
} __attribute__((packed));
diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h
index 7dee438..6305dc8 100644
--- a/include/osmocom/netif/osmux.h
+++ b/include/osmocom/netif/osmux.h
@@ -30,28 +30,25 @@
#define OSMUX_FT_DUMMY 2
struct osmux_hdr {
-#if OSMO_IS_BIG_ENDIAN
- uint8_t rtp_m:1,
- ft:2,
- ctr:3,
- amr_f:1,
- amr_q:1;
-#elif OSMO_IS_LITTLE_ENDIAN
+#if OSMO_IS_LITTLE_ENDIAN
uint8_t amr_q:1,
amr_f:1,
ctr:3,
ft:2,
rtp_m:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t rtp_m:1, ft:2, ctr:3, amr_f:1, amr_q:1;
#endif
uint8_t seq;
#define OSMUX_CID_MAX 255 /* determined by circuit_id */
uint8_t circuit_id;
-#if OSMO_IS_BIG_ENDIAN
- uint8_t amr_ft:4,
- amr_cmr:4;
-#elif OSMO_IS_LITTLE_ENDIAN
+#if OSMO_IS_LITTLE_ENDIAN
uint8_t amr_cmr:4,
amr_ft:4;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t amr_ft:4, amr_cmr:4;
#endif
} __attribute__((packed));
diff --git a/include/osmocom/netif/rtp.h b/include/osmocom/netif/rtp.h
index c01df41..4e40745 100644
--- a/include/osmocom/netif/rtp.h
+++ b/include/osmocom/netif/rtp.h
@@ -13,12 +13,9 @@
uint8_t payload_type:7,
marker:1;
#elif OSMO_IS_BIG_ENDIAN
- uint8_t version:2,
-padding:1,
-extension:1,
-csrc_count:4;
- uint8_t marker:1,
-payload_type:7;
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t version:2, padding:1, extension:1, csrc_count:4;
+ uint8_t marker:1, payload_type:7;
#endif
uint16_t sequence;
uint32_t timestamp;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/16759
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5
Gerrit-Change-Number: 16759
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in libosmo-abis[master]: add/clean big-endian packed structs (struct_endianess.py)
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-abis/+/16757 )
Change subject: add/clean big-endian packed structs (struct_endianess.py)
..
add/clean big-endian packed structs (struct_endianess.py)
Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84
---
M src/e1_input.c
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/57/16757/1
diff --git a/src/e1_input.c b/src/e1_input.c
index eb973ef..9e2f7b0 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#define NUM_E1_TS 32
@@ -115,12 +116,19 @@
} __attribute__((packed));
struct lapd_header {
+#if OSMO_IS_LITTLE_ENDIAN
uint8_t ea1 : 1;
uint8_t cr : 1;
uint8_t sapi : 6;
uint8_t ea2 : 1;
uint8_t tei : 7;
uint8_t control_foo; /* fake UM's ... */
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t sapi:6, cr:1, ea1:1;
+ uint8_t tei:7, ea2:1;
+ uint8_t control_foo;
+#endif
} __attribute__((packed));
osmo_static_assert(offsetof(struct fake_linux_lapd_header, hatype) == 2,
hatype_offset);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/16757
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I09c56f59631828ad219a5edd7d95cac8df462c84
Gerrit-Change-Number: 16757
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in libosmocore[master]: jenkins.sh: simpler invocation of verify_value_string_...
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/16756 )
Change subject: jenkins.sh: simpler invocation of verify_value_string_...
..
jenkins.sh: simpler invocation of verify_value_string_...
The script
osmo-ci/scripts/verify_value_string_arrays_are_terminated.py
is able to find .c/.h files in directory trees by itself.
Shorten the cmdline invocation of this script for libosmocore.
Change-Id: I888c20b9b19d777cd6581a541536842292f434b9
---
M contrib/jenkins_common.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/16756/1
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index fa1d544..b86a479 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -10,7 +10,7 @@
osmo-clean-workspace.sh
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+verify_value_string_arrays_are_terminated.py
prep_build() {
_src_dir="$1"
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16756
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I888c20b9b19d777cd6581a541536842292f434b9
Gerrit-Change-Number: 16756
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in libosmocore[master]: add crcXXgen.c.tpl to EXTRA_DIST
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/16755 ) Change subject: add crcXXgen.c.tpl to EXTRA_DIST .. add crcXXgen.c.tpl to EXTRA_DIST 'make distcheck' distributes the generated .c files, but it is good GPL practice to also distribute the template. Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 --- M Makefile.am M src/Makefile.am 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/16755/1 diff --git a/Makefile.am b/Makefile.am index 7390f98..d08f41b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ $(top_builddir)/doc/libosmocore.tag.prep: $(top_builddir)/Doxyfile.core \ $(top_srcdir)/include/osmocom/core/*.h \ $(top_srcdir)/src/*.[hc] \ + $(top_srcdir)/src/crcXXgen.c.tpl \ $(top_srcdir)/src/pseudotalloc/*.[hc] rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core rm -rf $(top_builddir)/doc/libosmocore.map diff --git a/src/Makefile.am b/src/Makefile.am index 34cda0f..16119d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ endif BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c -EXTRA_DIST = conv_acc_sse_impl.h +EXTRA_DIST = conv_acc_sse_impl.h crcXXgen.c.tpl libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/16755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I988acd3bc629e98985a99780d3142112125d13f7 Gerrit-Change-Number: 16755 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support
pespin has submitted this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support .. libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index e5b34ae..40a42bc 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,11 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc gnutls lksctp-tools" +DEPENDS = "libtalloc" PACKAGECONFIG ??= "\ +gnutls \ libusb \ +libsctp \ " +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," +PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16750 ) Change subject: libosmocore: Add new dependency lksctp-tools .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 Gerrit-Change-Number: 16750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools
pespin has submitted this change. (
https://gerrit.osmocom.org/c/meta-telephony/+/16750 )
Change subject: libosmocore: Add new dependency lksctp-tools
..
libosmocore: Add new dependency lksctp-tools
Since commit 3f464fc007ace5a829e8d43e72a88055f14b52e3, libosmocore
depends on libsctp to have osmo_sock_init2_multiaddr() API available.
libosmo-netif.inc recipe already had the lksctp-tools dependency and
hence was expecting libosmocore to also provide this API. By adding
lksctp-tools to libosmocore dependencies, libsctp is available in
sysroot and configure enables support for the API.
Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808
---
M recipes-osmocom/libosmocore/libosmocore.inc
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/recipes-osmocom/libosmocore/libosmocore.inc
b/recipes-osmocom/libosmocore/libosmocore.inc
index 6077ff5..5b21196 100644
--- a/recipes-osmocom/libosmocore/libosmocore.inc
+++ b/recipes-osmocom/libosmocore/libosmocore.inc
@@ -2,10 +2,10 @@
HOMEPAGE = "http://openbsc.gnumonks.org";
LICENSE = "GPLv2+"
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS = "libtalloc gnutls"
+DEPENDS = "libtalloc gnutls lksctp-tools"
inherit autotools pkgconfig
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808
Gerrit-Change-Number: 16750
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS
pespin has submitted this change. (
https://gerrit.osmocom.org/c/meta-telephony/+/16751 )
Change subject: libosmocore: Add libusb to DEPENDS
..
libosmocore: Add libusb to DEPENDS
In I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3, libosmocore got libusb
integration support, and since then libusb is a dependency (which can be
disabled through --disable-libusb).
Related: OS#4299
Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e
---
M recipes-osmocom/libosmocore/libosmocore.inc
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/recipes-osmocom/libosmocore/libosmocore.inc
b/recipes-osmocom/libosmocore/libosmocore.inc
index 5b21196..e5b34ae 100644
--- a/recipes-osmocom/libosmocore/libosmocore.inc
+++ b/recipes-osmocom/libosmocore/libosmocore.inc
@@ -2,10 +2,15 @@
HOMEPAGE = "http://openbsc.gnumonks.org";
LICENSE = "GPLv2+"
-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libtalloc gnutls lksctp-tools"
+PACKAGECONFIG ??= "\
+libusb \
+"
+PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb,"
+
inherit autotools pkgconfig
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e
Gerrit-Change-Number: 16751
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001)
pespin has submitted this change. (
https://gerrit.osmocom.org/c/meta-telephony/+/16749 )
Change subject: Update Osmocom recipes to latest tags (release 202001)
..
Update Osmocom recipes to latest tags (release 202001)
Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be
---
M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
M recipes-osmocom/libosmocore/libosmocore_git.bb
M recipes-osmocom/openbsc/openbsc_git.bb
M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb
M recipes-osmocom/osmo-msc/osmo-msc_git.bb
M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb
M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb
M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb
14 files changed, 29 insertions(+), 29 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index e64ace2..0582599 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "30249a15d51a15b498e87b78bd3fc8d684ffcf46"
+SRCREV = "c313d44272f04b24dad38f4caea17180f9cbc509"
SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
-PV = "0.7.0+gitr${SRCPV}"
+PV = "0.8.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
index 23a0148..c52c7e9 100644
--- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
+++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "592057bb33dc0c336a63003cd7a3a67944d92757"
+SRCREV = "b8121e79ef53b30df535fb38987b3a48853ebbe9"
SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git"
-PV = "0.6.0+gitr${SRCPV}"
+PV = "0.7.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index 6204aab..31fa234 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "0b7ad1a72fae2a4547bf0d1d6430918a74ea577b"
+SRCREV = "5e4643f4bc76a1437621348550b5b2a603e2179b"
SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
-PV = "1.1.0+gitr${SRCPV}"
+PV = "1.2.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb
b/recipes-osmocom/libosmocore/libosmocore_git.bb
index f43f296..d5eab3a 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e"
+SRCREV = "2862f9082ed4f16383a134e1112610d76ad91bf0"
SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
-PV = "1.2.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PV = "1.3.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty
osmo-arfcn osmo-auc-gen osmo-config-merge"
FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}"
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb
b/recipes-osmocom/openbsc/openbsc_git.bb
index c9b75e8..98318a4 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
-PV = "1.3.1+gitr${SRCPV}"
+PV = "1.3.2+gitr${SRCPV}"
PRINC = "0"
PR = "${INC_PR}.0"
-SRCREV = "bb414bf8b104e1b56e61bb804c75d30cda2a9e3c"
+SRCREV = "3f457a3b79e2908664b40eab9ca8e70c44a54898"
SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
S = "${WORKDIR}/git/openbsc"
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
index 19be0e5..fdb389b 100644
--- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "3c9485751cd20215ca6029df8dde4be94ee6f39d"
+SRCREV = "a1362ce8c20b2fa60e3da67936ea69d406e23aff"
SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git"
-PV = "1.5.0+gitr${SRCPV}"
+PV = "1.6.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
index 939fc58..b1b2298 100644
--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "67aebc9d1c6b0773b082b496a579be1a80c2a9b2"
+SRCREV = "e71e0f2af84d8b26f4c09a8c859f86cf701b3
Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16751 ) Change subject: libosmocore: Add libusb to DEPENDS .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e Gerrit-Change-Number: 16751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 16:21:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: lms: Drop unused define
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/16754 ) Change subject: lms: Drop unused define .. lms: Drop unused define Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/54/16754/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 4a687e1..b8893fb 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -39,7 +39,6 @@ using namespace std; #define MAX_ANTENNA_LIST_SIZE 10 -#define LMS_SAMPLE_RATE GSMRATE*32 #define GSM_CARRIER_BW 27.0 /* 270kHz */ #define LMS_MIN_BW_SUPPORTED 2.5e6 /* 2.5mHz, minimum supported by LMS */ #define LMS_CALIBRATE_BW_HZ OSMO_MAX(GSM_CARRIER_BW, LMS_MIN_BW_SUPPORTED) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iaf3361ed29dd552e5e52b62bc738fa20c6b583fe Gerrit-Change-Number: 16754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-trx[master]: lms: Move initialization of field started to constructor
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/16753 )
Change subject: lms: Move initialization of field started to constructor
..
lms: Move initialization of field started to constructor
Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/53/16753/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 19fe6e8..4a687e1 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -49,7 +49,7 @@
const std::vector& tx_paths,
const std::vector& rx_paths):
RadioDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths,
rx_paths),
- m_lms_dev(NULL)
+ m_lms_dev(NULL), started(false)
{
LOGC(DDEV, INFO) << "creating LMS device...";
@@ -248,8 +248,6 @@
for (size_t i = 0; i < rx_buffers.size(); i++)
rx_buffers[i] = new smpl_buf(SAMPLE_BUF_SZ / sizeof(uint32_t));
- started = false;
-
return NORMAL;
out_close:
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/16753
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I135a2ff4a419775169452be1128c7b30f7d638ad
Gerrit-Change-Number: 16753
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support .. libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 --- M recipes-osmocom/libosmocore/libosmocore.inc 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/52/16752/1 diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index e5b34ae..40a42bc 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,11 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libtalloc gnutls lksctp-tools" +DEPENDS = "libtalloc" PACKAGECONFIG ??= "\ +gnutls \ libusb \ +libsctp \ " +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb," +PACKAGECONFIG[libsctp] = "--enable-libsctp,--disable-libsctp,lksctp-tools," inherit autotools pkgconfig -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) .. Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:37:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:36:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/meta-telephony/+/16751 )
Change subject: libosmocore: Add libusb to DEPENDS
..
libosmocore: Add libusb to DEPENDS
In I656a1a38cbb5b1f3a9145d2869d3b4d0adefcae3, libosmocore got libusb
integration support, and since then libusb is a dependency (which can be
disabled through --disable-libusb).
Related: OS#4299
Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e
---
M recipes-osmocom/libosmocore/libosmocore.inc
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/51/16751/1
diff --git a/recipes-osmocom/libosmocore/libosmocore.inc
b/recipes-osmocom/libosmocore/libosmocore.inc
index 5b21196..e5b34ae 100644
--- a/recipes-osmocom/libosmocore/libosmocore.inc
+++ b/recipes-osmocom/libosmocore/libosmocore.inc
@@ -2,10 +2,15 @@
HOMEPAGE = "http://openbsc.gnumonks.org";
LICENSE = "GPLv2+"
-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libtalloc gnutls lksctp-tools"
+PACKAGECONFIG ??= "\
+libusb \
+"
+PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb,"
+
inherit autotools pkgconfig
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e
Gerrit-Change-Number: 16751
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16749 ) Change subject: Update Osmocom recipes to latest tags (release 202001) .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be Gerrit-Change-Number: 16749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:36:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/meta-telephony/+/16750 )
Change subject: libosmocore: Add new dependency lksctp-tools
..
libosmocore: Add new dependency lksctp-tools
Since commit 3f464fc007ace5a829e8d43e72a88055f14b52e3, libosmocore
depends on libsctp to have osmo_sock_init2_multiaddr() API available.
libosmo-netif.inc recipe already had the lksctp-tools dependency and
hence was expecting libosmocore to also provide this API. By adding
lksctp-tools to libosmocore dependencies, libsctp is available in
sysroot and configure enables support for the API.
Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808
---
M recipes-osmocom/libosmocore/libosmocore.inc
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/50/16750/1
diff --git a/recipes-osmocom/libosmocore/libosmocore.inc
b/recipes-osmocom/libosmocore/libosmocore.inc
index 6077ff5..5b21196 100644
--- a/recipes-osmocom/libosmocore/libosmocore.inc
+++ b/recipes-osmocom/libosmocore/libosmocore.inc
@@ -2,10 +2,10 @@
HOMEPAGE = "http://openbsc.gnumonks.org";
LICENSE = "GPLv2+"
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS = "libtalloc gnutls"
+DEPENDS = "libtalloc gnutls lksctp-tools"
inherit autotools pkgconfig
--
To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808
Gerrit-Change-Number: 16750
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in meta-telephony[201705]: Update Osmocom recipes to latest tags (release 202001)
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/meta-telephony/+/16749 )
Change subject: Update Osmocom recipes to latest tags (release 202001)
..
Update Osmocom recipes to latest tags (release 202001)
Change-Id: I74c81a96ae40b3f5a0f37fc9ac9977bae0f926be
---
M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
M recipes-osmocom/libosmocore/libosmocore_git.bb
M recipes-osmocom/openbsc/openbsc_git.bb
M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb
M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb
M recipes-osmocom/osmo-msc/osmo-msc_git.bb
M recipes-osmocom/osmo-pcap/osmo-pcap_git.bb
M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb
M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb
14 files changed, 29 insertions(+), 29 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/49/16749/1
diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index e64ace2..0582599 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "30249a15d51a15b498e87b78bd3fc8d684ffcf46"
+SRCREV = "c313d44272f04b24dad38f4caea17180f9cbc509"
SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
-PV = "0.7.0+gitr${SRCPV}"
+PV = "0.8.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
index 23a0148..c52c7e9 100644
--- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
+++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "592057bb33dc0c336a63003cd7a3a67944d92757"
+SRCREV = "b8121e79ef53b30df535fb38987b3a48853ebbe9"
SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git"
-PV = "0.6.0+gitr${SRCPV}"
+PV = "0.7.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index 6204aab..31fa234 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "0b7ad1a72fae2a4547bf0d1d6430918a74ea577b"
+SRCREV = "5e4643f4bc76a1437621348550b5b2a603e2179b"
SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
-PV = "1.1.0+gitr${SRCPV}"
+PV = "1.2.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb
b/recipes-osmocom/libosmocore/libosmocore_git.bb
index f43f296..d5eab3a 100644
--- a/recipes-osmocom/libosmocore/libosmocore_git.bb
+++ b/recipes-osmocom/libosmocore/libosmocore_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "c996d652f974f803653ce66d27d60675c1f77c2e"
+SRCREV = "2862f9082ed4f16383a134e1112610d76ad91bf0"
SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1"
-PV = "1.2.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PV = "1.3.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty
osmo-arfcn osmo-auc-gen osmo-config-merge"
FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}"
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb
b/recipes-osmocom/openbsc/openbsc_git.bb
index c9b75e8..98318a4 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
-PV = "1.3.1+gitr${SRCPV}"
+PV = "1.3.2+gitr${SRCPV}"
PRINC = "0"
PR = "${INC_PR}.0"
-SRCREV = "bb414bf8b104e1b56e61bb804c75d30cda2a9e3c"
+SRCREV = "3f457a3b79e2908664b40eab9ca8e70c44a54898"
SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
S = "${WORKDIR}/git/openbsc"
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
index 19be0e5..fdb389b 100644
--- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "3c9485751cd20215ca6029df8dde4be94ee6f39d"
+SRCREV = "a1362ce8c20b2fa60e3da67936ea69d406e23aff"
SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git"
-PV = "1.5.0+gitr${SRCPV}"
+PV = "1.6.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
index 939fc58..b1b2298 100644
--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
S = "${WORKDIR}/git"
-SRCREV = "67aebc9d1c6b0773b082b496a579be1a80c2a9b2"
+SRCREV = "e71
Change in meta-telephony[201705]: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16752 ) Change subject: libosmocore: Use PACKAGECONFIG to enable gnutls and libsctp support .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Iff9dd88e23a3cdcf333f9c365381b56afd2285c3 Gerrit-Change-Number: 16752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:37:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: libosmocore: Add libusb to DEPENDS
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16751 ) Change subject: libosmocore: Add libusb to DEPENDS .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I86773a3df7f249fae565bd15d8761a537a79651e Gerrit-Change-Number: 16751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:37:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in meta-telephony[201705]: libosmocore: Add new dependency lksctp-tools
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/16750 ) Change subject: libosmocore: Add new dependency lksctp-tools .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/16750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: Ib60437d9f23c651c6329d89e162abbd9945a4808 Gerrit-Change-Number: 16750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 07 Jan 2020 13:36:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#7). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 122 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-dev[master]: ttcn3.sh: use no_{dahdi, optimization, doxygen}.opts
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/16748 )
Change subject: ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts
..
Patch Set 1: Verified+1 Code-Review+2
Trivial patch for ttcn3.sh, as Neels said I can merge those without additional
review.
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16748
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa
Gerrit-Change-Number: 16748
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-Comment-Date: Tue, 07 Jan 2020 12:20:08 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-dev[master]: ttcn3.sh: use no_{dahdi, optimization, doxygen}.opts
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-dev/+/16748 )
Change subject: ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts
..
ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts
Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa
---
M ttcn3/ttcn3.sh
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, approved; Verified
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 5322182..f9297b7 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -131,7 +131,15 @@
echo "osmo-ttcn3-hacks"
echo "osmocom-bb") > ttcn3/3G+2G_ttcn3.deps
- ./gen_makefile.py ttcn3/3G+2G_ttcn3.deps default.opts iu.opts
no_systemd.opts ttcn3/ttcn3.opts -I -m "$DIR_MAKE"
+ ./gen_makefile.py \
+ ttcn3/3G+2G_ttcn3.deps \
+ default.opts \
+ iu.opts \
+ no_systemd.opts \
+ no_doxygen.opts \
+ no_dahdi.opts \
+ no_optimization.opts \
+ ttcn3/ttcn3.opts -I -m "$DIR_MAKE"
}
# $1: name of repository (e.g. osmo-ttcn3-hacks)
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16748
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa
Gerrit-Change-Number: 16748
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in osmo-dev[master]: ttcn3.sh: use no_{dahdi, optimization, doxygen}.opts
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-dev/+/16748 )
Change subject: ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts
..
ttcn3.sh: use no_{dahdi,optimization,doxygen}.opts
Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa
---
M ttcn3/ttcn3.sh
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/48/16748/1
diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh
index 5322182..f9297b7 100755
--- a/ttcn3/ttcn3.sh
+++ b/ttcn3/ttcn3.sh
@@ -131,7 +131,15 @@
echo "osmo-ttcn3-hacks"
echo "osmocom-bb") > ttcn3/3G+2G_ttcn3.deps
- ./gen_makefile.py ttcn3/3G+2G_ttcn3.deps default.opts iu.opts
no_systemd.opts ttcn3/ttcn3.opts -I -m "$DIR_MAKE"
+ ./gen_makefile.py \
+ ttcn3/3G+2G_ttcn3.deps \
+ default.opts \
+ iu.opts \
+ no_systemd.opts \
+ no_doxygen.opts \
+ no_dahdi.opts \
+ no_optimization.opts \
+ ttcn3/ttcn3.opts -I -m "$DIR_MAKE"
}
# $1: name of repository (e.g. osmo-ttcn3-hacks)
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/16748
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: If4e5f271d31ebba25ff7c945ee962aefb4a848fa
Gerrit-Change-Number: 16748
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Build failure of network:osmocom:latest/osmo-remsim in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 445s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 445s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 445s]dh_install -O--fail-missing [ 445s] dh_install: Please use dh_missing --list-missing/--fail-missing instead [ 445s] dh_install: This feature will be removed in compat 12. [ 445s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1.0.0 exists in debian/tmp but is not installed to anywhere [ 445s] dh_missing: usr/lib/x86_64-linux-gnu/libosmo-rspro.so.1 exists in debian/tmp but is not installed to anywhere [ 445s] dh_missing: missing files, aborting [ 445s]The following debhelper tools have reported what they installed (with files per package) [ 445s] * dh_install: libosmo-rspro-dev (5), libosmo-rspro1 (0), osmo-remsim-bankd (1), osmo-remsim-client (1), osmo-remsim-doc (1), osmo-remsim-server (1) [ 445s]If the missing files are installed by another tool, please file a bug against it. [ 445s]When filing the report, if the tool is not part of debhelper itself, please reference the [ 445s]"Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 445s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 445s]Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 445s]For a short-term work-around: Add the files to debian/not-installed [ 445s] dh_install: dh_missing --fail-missing returned exit code 255 [ 445s] make: *** [debian/rules:12: binary] Error 255 [ 445s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 445s] [ 445s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 11:14:07 UTC 2020. [ 445s] [ 445s] ### VM INTERACTION START ### [ 448s] [ 429.997207] sysrq: SysRq : Power Off [ 448s] [ 430.006395] reboot: Power down [ 448s] ### VM INTERACTION END ### [ 448s] [ 448s] lamb60 failed "build osmo-remsim_0.2.2.dsc" at Tue Jan 7 11:14:10 UTC 2020. [ 448s] -- Configure notifications at https://build.opensuse.org/my/notifications openSUSE Build Service (https://build.opensuse.org/)
