February 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-iuh[master]: Fix license headers: Should have been AGPLv3+, not GPLv2+

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36005?usp=email ) Change subject: Fix license headers: Should have been AGPLv3+, not GPLv2+ ...................................................................... Fix license headers: Should have been AGPLv3+, not GPLv2+ I'm not sure why one files (written by Philipp) did contain a GPLv2+ header, instead of the AGPLv3+ which is the actual overall project license. I consider it a mistake. In any case, any copyrightable contribution to those files was done by sysmocom employees, so I as managing directory can legally make a license change, whther or not it was a mistake early on or not. Change-Id: Ie28c32022a9cbc42b55195f7dbb513228857a3cd --- M src/ranap_common_ran.c 1 file changed, 21 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/ranap_common_ran.c b/src/ranap_common_ran.c index b238021..0bf3796 100644 --- a/src/ranap_common_ran.c +++ b/src/ranap_common_ran.c @@ -6,16 +6,16 @@ * Author: Philipp Maier * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36005?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie28c32022a9cbc42b55195f7dbb513228857a3cd Gerrit-Change-Number: 36005 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-hnbgw[master]: Fix license headers: Should have been AGPLv3+, not GPLv2+

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36004?usp=email ) Change subject: Fix license headers: Should have been AGPLv3+, not GPLv2+ ...................................................................... Fix license headers: Should have been AGPLv3+, not GPLv2+ I'm not sure why so many files (particularly written by Philipp) did contain a GPLv2+ header, instead of the AGPLv3+ which is the actual overall project license. I consider it a mistake. In any case, any copyrightable contribution to those files was done by sysmocom employees, so I as managing directory can legally make a license change, whther or not it was a mistake early on or not. Change-Id: I42ea544ae4e5c4d3bedad12ddb55cf3c26a30919 --- M src/osmo-hnbgw/mgw_fsm.c M src/osmo-hnbgw/ps_rab_ass_fsm.c M src/osmo-hnbgw/ps_rab_fsm.c M src/osmo-hnbgw/ranap_rab_ass.c M src/osmo-hnbgw/tdefs.c 5 files changed, 33 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c index d762d11..6fd0e6a 100644 --- a/src/osmo-hnbgw/mgw_fsm.c +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -4,14 +4,14 @@ * Author: Philipp Maier * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. */ #include <errno.h> diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index 4dff7c6..456d5aa 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -5,14 +5,14 @@ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. */ #include <errno.h> diff --git a/src/osmo-hnbgw/ps_rab_fsm.c b/src/osmo-hnbgw/ps_rab_fsm.c index 82e4f30..8905540 100644 --- a/src/osmo-hnbgw/ps_rab_fsm.c +++ b/src/osmo-hnbgw/ps_rab_fsm.c @@ -5,14 +5,14 @@ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de> * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. */ #include <errno.h> diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index fe42803..726e3a6 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -4,16 +4,16 @@ * Author: Philipp Maier * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c index b2ee65f..af09d17 100644 --- a/src/osmo-hnbgw/tdefs.c +++ b/src/osmo-hnbgw/tdefs.c @@ -4,14 +4,14 @@ * Author: Philipp Maier * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. */ #include "config.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36004?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I42ea544ae4e5c4d3bedad12ddb55cf3c26a30919 Gerrit-Change-Number: 36004 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-bsc[master]: bsc_ctrl_lookup.c: Use AGPLv3, not GPLv2

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36001?usp=email ) Change subject: bsc_ctrl_lookup.c: Use AGPLv3, not GPLv2 ...................................................................... bsc_ctrl_lookup.c: Use AGPLv3, not GPLv2 I guess it must have been a mistake when introducing this file. The entire project is under AGPLv3, it doesn't make sense to have one single file under GPLv2. As th entire git commit history only contains sysmocom employees, I have the authority to re-license it even if GPLv2 was done intentionally at the time. Let's change it. Change-Id: I5e5385f7630b41f1c4ad9534dbb4551e597ad596 --- M debian/copyright M src/osmo-bsc/bsc_ctrl_lookup.c 2 files changed, 20 insertions(+), 28 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/copyright b/debian/copyright index 8980ffb..ccf3ec0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,31 +25,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. -Files: src/libbsc/bsc_ctrl_lookup.c - src/libbsc/pcu_sock.c -Copyright: 2008-2010 Harald Welte <laforge(a)gnumonks.org> - 2009-2012 Andreas Eversberg <jolly(a)eversberg.eu> - 2010-2011 Daniel Willmann <daniel(a)totalueberwachung.de> - 2010-2011 On-Waves - 2012 Holger Hans Peter Freyther -License: GPL-2.0+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - On Debian systems, the complete text of the GNU General Public License - Version 2 can be found in `/usr/share/common-licenses/GPL-2'. - Files: osmoappdesc.py Copyright: 2013 Katerina Barone-Adesi <kat.obsc(a)gmail.com> License: GPL-3.0+ diff --git a/src/osmo-bsc/bsc_ctrl_lookup.c b/src/osmo-bsc/bsc_ctrl_lookup.c index effad4f..63d0c86 100644 --- a/src/osmo-bsc/bsc_ctrl_lookup.c +++ b/src/osmo-bsc/bsc_ctrl_lookup.c @@ -6,14 +6,14 @@ * All Rights Reserved * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36001?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5e5385f7630b41f1c4ad9534dbb4551e597ad596 Gerrit-Change-Number: 36001 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-bsc[master]: Fix license header in various source code files.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36000?usp=email ) Change subject: Fix license header in various source code files. ...................................................................... Fix license header in various source code files. IF we say "... under the terms of the GNU Affero General Public License" then we cannot say "see the GNU General Public license" later on, that's misleading and likely a copy+paste error somewhere. The project license has always been AGPLv3-or-later. Change-Id: I6b8ad5147ca76052213809e67856dcb80bff2b93 --- M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_bts_fsm.c M src/osmo-bsc/nm_bts_sm_fsm.c M src/osmo-bsc/nm_channel_fsm.c M src/osmo-bsc/nm_common_fsm.c M src/osmo-bsc/nm_gprs_cell_fsm.c M src/osmo-bsc/nm_gprs_nse_fsm.c M src/osmo-bsc/nm_gprs_nsvc_fsm.c M src/osmo-bsc/nm_rcarrier_fsm.c M src/osmo-bsc/power_control.c 10 files changed, 25 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index 0243c0b..a781cb1 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 0bcc8e7..aaccea0 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_bts_sm_fsm.c b/src/osmo-bsc/nm_bts_sm_fsm.c index 5e7b558..24a1ec3 100644 --- a/src/osmo-bsc/nm_bts_sm_fsm.c +++ b/src/osmo-bsc/nm_bts_sm_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c index 1309ebd..2f389d7 100644 --- a/src/osmo-bsc/nm_channel_fsm.c +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_common_fsm.c b/src/osmo-bsc/nm_common_fsm.c index 9259a6e..7719f06 100644 --- a/src/osmo-bsc/nm_common_fsm.c +++ b/src/osmo-bsc/nm_common_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_gprs_cell_fsm.c b/src/osmo-bsc/nm_gprs_cell_fsm.c index a0c0f1e..10f8d07 100644 --- a/src/osmo-bsc/nm_gprs_cell_fsm.c +++ b/src/osmo-bsc/nm_gprs_cell_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_gprs_nse_fsm.c b/src/osmo-bsc/nm_gprs_nse_fsm.c index 319775c..295f5fb 100644 --- a/src/osmo-bsc/nm_gprs_nse_fsm.c +++ b/src/osmo-bsc/nm_gprs_nse_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index beedcdd..c37d46a 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 7ba7ea5..f5d7c27 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -13,7 +13,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/src/osmo-bsc/power_control.c b/src/osmo-bsc/power_control.c index 33b4c71..8bf0783 100644 --- a/src/osmo-bsc/power_control.c +++ b/src/osmo-bsc/power_control.c @@ -14,7 +14,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36000?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6b8ad5147ca76052213809e67856dcb80bff2b93 Gerrit-Change-Number: 36000 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in osmo-pcu[master]: fix license headers

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36006?usp=email ) Change subject: fix license headers ...................................................................... fix license headers I'm not sure why some files did contain an AGPLv3+ header, instead of the GPLv2+ which is the actual overall project license. I consider it a mistake. In any case, any copyrightable contribution to those files was done by sysmocom employees, so I as managing directory can legally make a license change, whther or not it was a mistake early on or not. The only remaining AGPLv3+ files are those implementing the "direct PHY" interface for osmo-bts-{symo,lc15,oc2g}. That is als unintentional, but more complex to resolve as they were copied from osmo-bts, which is indeed an AGPLv3+ project. Change-Id: I52533193de0ec7e24bf7c5bb035589ba5b9419e4 --- M debian/copyright M src/bts.cpp M src/bts_pch_timer.c M src/bts_pch_timer.h M src/ericsson-rbs/er_ccu_if.c M src/ericsson-rbs/er_ccu_l1_if.c M src/gprs_pcu.c M src/gprs_pcu.h M src/pdch.cpp 9 files changed, 46 insertions(+), 38 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/debian/copyright b/debian/copyright index 611d610..433dfe0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,20 +8,6 @@ 2013 Jacob Erlbeck <jerlbeck(a)sysmocom.de> 2016-2019 sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> 2015 by Yves Godin <support(a)nuranwireless.com> -License: AGPL-3.0+ - -Files: src/gprs_ms.h - src/gprs_coding_scheme.cpp - src/gprs_coding_scheme.h - src/coding_scheme.c - src/coding_scheme.h - src/cxx_linuxlist.h - src/pcu_vty_functions.cpp - src/pcu_vty_functions.h - src/pcu_utils.h - src/gprs_codel.c - src/gprs_codel.h -Copyright: 2016-2019 sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> License: GPL-2.0+ Files: osmoappdesc.py diff --git a/src/bts.cpp b/src/bts.cpp index 0fe8fbc..bad06a5 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -4,8 +4,8 @@ * All Rights Reserved * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -13,7 +13,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/bts_pch_timer.c b/src/bts_pch_timer.c index d721155..4b75239 100644 --- a/src/bts_pch_timer.c +++ b/src/bts_pch_timer.c @@ -3,8 +3,8 @@ * Author: Oliver Smith * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/bts_pch_timer.h b/src/bts_pch_timer.h index cc5dcb0..c65f9fa 100644 --- a/src/bts_pch_timer.h +++ b/src/bts_pch_timer.h @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ diff --git a/src/ericsson-rbs/er_ccu_if.c b/src/ericsson-rbs/er_ccu_if.c index fb5b1b4..98abbf7 100644 --- a/src/ericsson-rbs/er_ccu_if.c +++ b/src/ericsson-rbs/er_ccu_if.c @@ -5,16 +5,16 @@ * Author: Philipp Maier * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/ericsson-rbs/er_ccu_l1_if.c b/src/ericsson-rbs/er_ccu_l1_if.c index 1a1f8e4..53ab7bd 100644 --- a/src/ericsson-rbs/er_ccu_l1_if.c +++ b/src/ericsson-rbs/er_ccu_l1_if.c @@ -5,16 +5,16 @@ * Author: Philipp Maier * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index 83ae38d..2c2454b 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -6,8 +6,8 @@ * All Rights Reserved * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -15,7 +15,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/gprs_pcu.h b/src/gprs_pcu.h index 4451996..c789d91 100644 --- a/src/gprs_pcu.h +++ b/src/gprs_pcu.h @@ -6,8 +6,8 @@ * All Rights Reserved * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -15,7 +15,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ diff --git a/src/pdch.cpp b/src/pdch.cpp index 0ea4f4b..7ff1c7e 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -5,8 +5,8 @@ * All Rights Reserved * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -14,7 +14,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Affero General Public License + * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36006?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I52533193de0ec7e24bf7c5bb035589ba5b9419e4 Gerrit-Change-Number: 36006 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in osmo-pcu[master]: fix license headers

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36006?usp=email ) Change subject: fix license headers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36006?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I52533193de0ec7e24bf7c5bb035589ba5b9419e4 Gerrit-Change-Number: 36006 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Feb 2024 20:47:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once

by laforge

Attention is currently required from: dexter, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/36018/comment/e63a2308_8f9f0b0a PS1, Line 10: is not active the PCU even sends the version number in regular > why is the PCU sending its version at different occasions? […] I'm also confused. why would the PCU send its version at any other time than when it connects the PCUIF socket? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Feb 2024 20:46:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Feb 2024 20:46:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once

by pespin

Attention is currently required from: dexter, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/36018/comment/eb69d5e7_dd631bbb PS1, Line 10: is not active the PCU even sends the version number in regular why is the PCU sending its version at different occasions? Is that correct? It needs to be fixed at the PCU? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Feb 2024 15:10:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: forward PCU_VERSION only once

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email ) Change subject: pcu_sock: forward PCU_VERSION only once ...................................................................... pcu_sock: forward PCU_VERSION only once The PCU may send its version at different occasions and in case the BTS is not active the PCU even sends the version number in regular intervals. When the BTS a receives a PCU_VERSION txt message from the PCU, it forwards it as an OML Failure Event Report. This means we might get multiple copies of the same message on OML. This should be avoided, we only should forward the PCU_VERSION when it actually changes. Related: OS#6270 Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 --- M include/osmo-bts/bts.h M src/common/abis.c M src/common/pcu_sock.c 3 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/36018/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index c3e5dce..7193a30 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -173,6 +173,7 @@ /* Connected PCU version (if any) */ char pcu_version[MAX_VERSION_LENGTH]; + bool pcu_version_oml_sent; /* maximum Tx power that the MS is permitted to use in this cell */ int ms_max_power; diff --git a/src/common/abis.c b/src/common/abis.c index 5629cf2..e6a11ba 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -110,6 +110,7 @@ bts->osmo_link = NULL; } + bts->pcu_version_oml_sent = false; } static int pick_next_bsc(struct osmo_fsm_inst *fi) diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 048e766..b8c68d4 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -864,7 +864,15 @@ case PCU_VERSION: LOGP(DPCU, LOGL_INFO, "OsmoPCU version %s connected\n", txt->text); - oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_CEASED, OSMO_EVT_PCU_VERS, txt->text); + + /* Forward the PCU version information only once */ + if (strcmp(bts->pcu_version, txt->text) != 0) + bts->pcu_version_oml_sent = false; + if (!bts->pcu_version_oml_sent && bts->oml_link) { + oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_CEASED, OSMO_EVT_PCU_VERS, txt->text); + bts->pcu_version_oml_sent = true; + } + osmo_strlcpy(bts->pcu_version, txt->text, MAX_VERSION_LENGTH); /* patch SI to advertise GPRS, *if* the SI sent by BSC said so */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36018?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id82fe0504d0cbdf71473c1e7dfe6125a3471bd85 Gerrit-Change-Number: 36018 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024