March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: CBSP_Types: Fix typo num_bcats_compl -> num_bcast_compl

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27593 ) Change subject: CBSP_Types: Fix typo num_bcats_compl -> num_bcast_compl ...................................................................... CBSP_Types: Fix typo num_bcats_compl -> num_bcast_compl Change-Id: Ic51b3071ea9233a053cb1ee837b910d9250010d2 --- M library/CBSP_Types.ttcn 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/CBSP_Types.ttcn b/library/CBSP_Types.ttcn index 5ab3c98..b282454 100644 --- a/library/CBSP_Types.ttcn +++ b/library/CBSP_Types.ttcn @@ -161,31 +161,31 @@ }; type record CBSP_FIELD_NumBcastCompl_CGI { BSSMAP_FIELD_CellIdentification_CGI ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_LAC_CI { BSSMAP_FIELD_CellIdentification_LAC_CI ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_LAI { BSSMAP_FIELD_CellIdentification_LAI ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_CI { OCT2 ci, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; type record CBSP_FIELD_NumBcastCompl_LAC { OCT2 lac, - uint16_t num_bcats_compl, + uint16_t num_bcast_compl, CBSP_NumBcastInfo num_bcast_info, BIT4 spare1_4 }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27593 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: Ic51b3071ea9233a053cb1ee837b910d9250010d2 Gerrit-Change-Number: 27593 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 ) Change subject: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure ...................................................................... bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure Change-Id: I124a69c515d634bc054ed35e430af6b3c11ad46e Related: SYS#5909 --- M bsc/BSC_Tests_CBSP.ttcn M library/CBSP_Templates.ttcn 2 files changed, 149 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 8119289..25f00d8 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -380,6 +380,34 @@ } } +/* send a KILL CBS to the BSC; expect either COMPLETE or FAILURE in response*/ +function f_cbsp_msg_status_query(uint16_t msg_id, uint16_t ser_no, template (value) uint8_t channel_ind := 0, + template (value) BSSMAP_FIELD_CellIdentificationList cell_list := ts_BSSMAP_CIL_BSS, + template CBSP_IE_NumBcastComplList compl_list := ?, + template CBSP_FailureListItems fail_list := omit) runs on cbsp_test_CT +{ + var template (value) CBSP_PDU tx; + var template CBSP_PDU rx; + + tx := ts_CBSP_MSG_STATUS_QUERY(msg_id, ser_no, cell_list, channel_ind); + CBSP[0].send(ts_CBSP_Send(g_cbsp_conn_id[0], tx)); + if (istemplatekind(fail_list, "omit")) { + rx := tr_CBSP_MSG_STATUS_QUERY_COMPL(msg_id, ser_no, compl_list:=compl_list, channel_ind:=channel_ind); + } else { + rx := tr_CBSP_MSG_STATUS_QUERY_FAIL(msg_id, ser_no, fail_list, channel_ind:=channel_ind, + compl_list:=compl_list); + } + alt { + [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], rx)) { + setverdict(pass); + } + [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) { + setverdict(fail, "Received unexpected CBSP"); + mtc.stop; + } + } +} + template (present) RSL_IE_CbCommandType tr_RslCbCmdType(template (present) uint2_t lblock := ?, template (present) RSL_CbCommand cmd := ?) := { command := cmd, @@ -858,6 +886,45 @@ } } +/* Send a MSG STATUS QUERY for an unknown message; expect no completion list and present failure list */ +testcase TC_cbsp_status_q_empty() runs on cbsp_test_CT { + g_pars := valueof(ts_CBSP_Pars_default(false, 18001, 18501)); + f_init(); + + f_cbsp_msg_status_query(g_cbsp_msg_id, g_cbsp_ser_no, compl_list := omit, fail_list := ?); +} + +/* Send a SMSCB to entire BSS followed by MSG_STATUS_QUERY; expect completion list and no failure list */ +testcase TC_cbsp_status_q_bts_cgi() runs on cbsp_test_CT { + g_pars := valueof(ts_CBSP_Pars_default(false, 19001, 19501)); + f_init(); + + var CBSP_IEs pages := {f_gen_page()}; + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list; + cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); + /* request 5 transmissions */ + f_cbsp_write(g_cbsp_msg_id, g_cbsp_ser_no, cell_list, num_bcast_req := 5, content:=pages, + success_list:=cell_list, fail_list:=omit); + var template (present) RSL_Message tr := f_page2rsl(pages[0], g_cbsp_msg_id, g_cbsp_ser_no); + /* wait for first transmission */ + IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)); + var template (present) CBSP_IE_NumBcastComplList compl_list := { + len := ?, + spare1_4 := ?, + cell_id_discr := ?, + list := { + cI_CGI := { + ci := bssmap_cgi(mp_cgi_bts0), + num_bcast_compl := (1 .. 5), + num_bcast_info := CBSP_NUM_BCAST_INFO_VALID, + spare1_4 := '0000'B + } + } + }; + f_cbsp_msg_status_query(g_cbsp_msg_id, g_cbsp_ser_no, cell_list:=cell_list, compl_list := compl_list, fail_list := omit); +} + + control { @@ -884,6 +951,9 @@ execute( TC_cbsp_write_then_kill() ); execute( TC_cbsp_write_then_reset() ); + execute( TC_cbsp_status_q_empty() ); + execute( TC_cbsp_status_q_bts_cgi() ); + execute( TC_cbsp_emerg_write_bts_cgi_dchan() ); execute( TC_cbsp_emerg_write_bts_cgi_cchan() ); execute( TC_cbsp_emerg_write_bts_cgi_cchan_disable() ); diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index 5da2958..f86241e 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -667,6 +667,85 @@ return tr_CBSP(CBSP_MSGT_KILL_FAIL, ies); } +/* 8.1.3.10 MESSAGE STATUS QUERY */ +template (value) CBSP_PDU +ts_CBSP_MSG_STATUS_QUERY(template (value) uint16_t msg_id, + template (value) uint16_t old_ser_nr, + template (value) BSSMAP_FIELD_CellIdentificationList cell_list, + template (value) uint8_t channel_ind) := + ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY, { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspCellList(cell_list), + ts_CbspChannelInd(channel_ind)}); +template (present) CBSP_PDU +tr_CBSP_MSG_STATUS_QUERY(template (present) uint16_t msg_id := ?, + template (present) uint16_t old_ser_nr := ?, + template (present) BSSMAP_FIELD_CellIdentificationList cell_list := ?, + template (present) uint8_t channel_ind := ?) := + ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY, { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspCellList(cell_list), + ts_CbspChannelInd(channel_ind)}); + +/* 8.1.3.11 MESSAGE STATUS QUERY COMPLETE */ +template (value) CBSP_PDU +ts_CBSP_MSG_STATUS_QUERY_COMPL(template (value) uint16_t msg_id, template (value) uint16_t old_ser_nr, + template (value) CBSP_IE_NumBcastComplList compl_list, + template (value) uint8_t channel_ind) := + ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_COMPL, { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspNumComplList(valueof(compl_list)), + ts_CbspChannelInd(channel_ind)}); +template (present) CBSP_PDU +tr_CBSP_MSG_STATUS_QUERY_COMPL(template (present) uint16_t msg_id, template (present) uint16_t old_ser_nr, + template (present) CBSP_IE_NumBcastComplList compl_list, + template (present) uint8_t channel_ind) := + tr_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_COMPL, { + tr_CbspMsgId(msg_id), + tr_OldSerNo(old_ser_nr), + tr_CbspNumComplList(compl_list), + tr_CbspChannelInd(channel_ind)}); + +/* 8.1.3.12 MESSAGE STATUS QUERY FAILURE */ +function ts_CBSP_MSG_STATUS_QUERY_FAIL(template (value) uint16_t msg_id, template (value) uint16_t old_ser_nr, + template (value) CBSP_FailureListItems fail_list, + template (value) uint8_t channel_ind, + template (omit) CBSP_IE_NumBcastComplList compl_list) +return template (value) CBSP_PDU { + var template (value) CBSP_IEs ies := { + ts_CbspMsgId(msg_id), + ts_OldSerNo(old_ser_nr), + ts_CbspFailList(fail_list), + ts_CbspChannelInd(channel_ind) + }; + if (not istemplatekind(compl_list, "omit")) { + ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list)); + } + return ts_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_FAIL, ies); +} +function tr_CBSP_MSG_STATUS_QUERY_FAIL(template (present) uint16_t msg_id := ?, template (present) uint16_t old_ser_nr := ?, + template (present) CBSP_FailureListItems fail_list := ?, + template (present) uint8_t channel_ind := ?, + template CBSP_IE_NumBcastComplList compl_list := *) +return template (present) CBSP_PDU { + var template (present) CBSP_IEs ies := { + tr_CbspMsgId(msg_id), + tr_OldSerNo(old_ser_nr), + tr_CbspFailList(fail_list), + tr_CbspChannelInd(channel_ind) + }; + if (istemplatekind(compl_list, "*")) { + testcase.stop("TITAN > 6.5.0 doesn't support this"); + //ies[lengthof(ies)] := ts_CbspNumComplList(valueof(compl_list)); + } else if (not istemplatekind(compl_list, "omit")) { + ies[lengthof(ies)] := tr_CbspNumComplList(compl_list); + } + return tr_CBSP(CBSP_MSGT_MSG_STATUS_QUERY_FAIL, ies); +} + /* 8.1.3.16 RESET */ template (value) CBSP_PDU ts_CBSP_RESET(template (value) BSSMAP_FIELD_CellIdentificationList cell_list) := -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 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: I124a69c515d634bc054ed35e430af6b3c11ad46e Gerrit-Change-Number: 27594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 ) Change subject: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 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: I124a69c515d634bc054ed35e430af6b3c11ad46e Gerrit-Change-Number: 27594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 14:25:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: CBSP: implement MESSAGE STATUS QUERY

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27592 ) Change subject: CBSP: implement MESSAGE STATUS QUERY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b738dc29d0ead4f735abeeb6960d3675cb05ae2 Gerrit-Change-Number: 27592 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 29 Mar 2022 13:48:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 ) Change subject: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 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: I124a69c515d634bc054ed35e430af6b3c11ad46e Gerrit-Change-Number: 27594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 29 Mar 2022 13:20:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: vty: Support platforms that don't support pthread_getname_np()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27591 ) Change subject: vty: Support platforms that don't support pthread_getname_np() ...................................................................... vty: Support platforms that don't support pthread_getname_np() pthread_getname_np() is a non-portable extension of pthreads. While it exists in glibc, for example musl didn't have it until rather recently (April 2021) and there still hasn't yet been a musl release with this change, resulting even current OpenWRT not yet supporting pthread_getname_np. So let's check if pthread_getname_np is supported, and only use it in that case. Change-Id: Ibd01485af24e2fe574006f8d049bf37226dda966 --- M configure.ac M src/vty/cpu_sched_vty.c 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 0210926..990d0e7 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,24 @@ # check for pthread (PTHREAD_CFLAGS, PTHREAD_LIBS) AX_PTHREAD +AC_MSG_CHECKING(for pthread_getname_np(pthread_t, char*, size_t)) +saved_CFLAGS="$CFLAGS" +saved_LIBS="$LIBS" +CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +LIBS="$LIBS $PTHREAD_LIBS" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#define _GNU_SOURCE + #include <pthread.h>], + [pthread_getname_np(pthread_self(),"example",0)])], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_PTHREAD_GETNAME_NP,1, + [Have function pthread_setname_np(const char*)])], + [AC_MSG_RESULT(no)]) +CFLAGS="$saved_CFLAGS" +LIBS="$saved_LIBS" + + # check for old glibc < 2.17 to get clock_gettime AC_SEARCH_LIBS([clock_gettime], [rt posix4], [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if clock_gettime is available]) diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 0b4b249..dbb3cd5 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -25,6 +25,8 @@ #define _GNU_SOURCE +#include "../../config.h" + #include <string.h> #include <stdlib.h> #include <errno.h> @@ -637,8 +639,10 @@ return 0; } +#ifdef HAVE_PTHREAD_GETNAME_NP if (pthread_getname_np(pthread_self(), name, sizeof(name)) == 0) has_name = true; +#endif /* Get latest matching mask for the thread */ pthread_mutex_lock(&sched_vty_opts->cpu_affinity_li_mutex); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd01485af24e2fe574006f8d049bf37226dda966 Gerrit-Change-Number: 27591 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: vty: Support platforms that don't support pthread_getname_np()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27591 ) Change subject: vty: Support platforms that don't support pthread_getname_np() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd01485af24e2fe574006f8d049bf37226dda966 Gerrit-Change-Number: 27591 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:57:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: configure: Support libsctp < 1.0.17 without libsctp.pc

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27598 ) Change subject: configure: Support libsctp < 1.0.17 without libsctp.pc ...................................................................... Patch Set 1: (1 comment) File libosmocore.pc.in: https://gerrit.osmocom.org/c/libosmocore/+/27598/comment/1dd72c1f_b36904b8 PS1, Line 10: Requires.private: @LIBSCTP_PC@ > with this approach if the .pc is found it ends up looking like this: […] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 Gerrit-Change-Number: 27598 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:57:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: configure: Support libsctp < 1.0.17 without libsctp.pc

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27598 ) Change subject: configure: Support libsctp < 1.0.17 without libsctp.pc ...................................................................... configure: Support libsctp < 1.0.17 without libsctp.pc libsctp 1.0.17 is the first to contain a pkgconfig file in upstream. Current OpenSure Leap 15.3 as well as our OpenEmbedded meta-telephony layer still ship 1.0.16 which contain no pkgconfig file. Let's attempt first finding the .pc file, and otherwise manually link against the lib. Related: https://bugzilla.opensuse.org/show_bug.cgi?id=1197590 Related: https://build.opensuse.org/request/show/965348 Fixes: 12eed19066a11aece6f346b54b85326bc6ba7f0b Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 --- M configure.ac M libosmocore.pc.in 2 files changed, 18 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 89615fd..0210926 100644 --- a/configure.ac +++ b/configure.ac @@ -223,16 +223,22 @@ [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_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) + # Attempt finding .pc, otherwise set manually (<1.0.17 have no .pc file) + PKG_CHECK_MODULES(LIBSCTP, libsctp, + [AC_SUBST(LIBSCTP_PC, [libsctp])], + [ + AC_MSG_NOTICE([libsctp.pc not found (building against <1.0.17 ?), attempting manual lib lookup]) + old_LIBS=$LIBS + AC_SEARCH_LIBS([sctp_bindx], [sctp], [ + 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([sctp-tests], [AS_HELP_STRING([--disable-sctp-tests], [Do not run socket tests requiring system SCTP support])], diff --git a/libosmocore.pc.in b/libosmocore.pc.in index 6296417..d804b8e 100644 --- a/libosmocore.pc.in +++ b/libosmocore.pc.in @@ -7,7 +7,7 @@ Description: C Utility Library Version: @VERSION@ Requires: talloc -Requires.private: libsctp +Requires.private: @LIBSCTP_PC@ Libs: -L${libdir} -losmocore -Libs.private: @PTHREAD_LIBS@ +Libs.private: @PTHREAD_LIBS@ @LIBSCTP_LIBS@ Cflags: -I${includedir}/ @PTHREAD_CFLAGS@ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 Gerrit-Change-Number: 27598 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: configure: Support libsctp < 1.0.17 without libsctp.pc

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27598 ) Change subject: configure: Support libsctp < 1.0.17 without libsctp.pc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 Gerrit-Change-Number: 27598 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:57:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022