- gerrit-log - lists.osmocom.org

[S] Change in osmo-hlr[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h
by pespin 02 Dec '24

02 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Drop use of libosmo-abis osmocom/abis/ipaccess.h That header is only really used to provide an old hack for ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated soon. Take the chance to organize a bit better the includes based on dependency chain. Change-Id: I393cd23a09af6d1eefa68dc955415f4fe334d71b --- M include/osmocom/hlr/gsup_server.h M src/gsup_server.c 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hlr/gsup_server.h b/include/osmocom/hlr/gsup_server.h index 86ae4ec..5767dec 100644 --- a/include/osmocom/hlr/gsup_server.h +++ b/include/osmocom/hlr/gsup_server.h @@ -2,9 +2,9 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/msgb.h> -#include <osmocom/abis/ipa.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/gsm/gsup.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/ipa.h> #include <osmocom/gsupclient/cni_peer_id.h> #include <osmocom/gsupclient/gsup_req.h> diff --git a/src/gsup_server.c b/src/gsup_server.c index 1510bd0..2df2d3d 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,12 +24,12 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/core/linuxlist.h> -#include <osmocom/abis/ipa.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/gsm48_ie.h> #include <osmocom/gsm/apn.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/gsm23003.h> +#include <osmocom/abis/ipa.h> #include <osmocom/hlr/gsup_server.h> #include <osmocom/hlr/gsup_router.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I393cd23a09af6d1eefa68dc955415f4fe334d71b Gerrit-Change-Number: 38989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bsc[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h
by pespin 02 Dec '24

02 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Drop use of libosmo-abis osmocom/abis/ipaccess.h That header is only really used to provide an old hack for ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated soon. src/ipaccess/ipaccess-config.c already has an explicit extern declaration for ipacces_fd_cb() anyway, so drop the header in advance. Take the chance to organize a bit better the includes based on dependency chain. Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b --- M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_osmobts.c M src/osmo-bsc/e1_config.c 5 files changed, 30 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 720837e..15dcc54 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -40,21 +40,21 @@ #include <osmocom/core/application.h> #include <osmocom/core/select.h> #include <osmocom/core/timer.h> -#include <osmocom/bsc/ipaccess.h> +#include <osmocom/core/talloc.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> +#include <osmocom/bsc/ipaccess.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/signal.h> #include <osmocom/bsc/debug.h> #include <osmocom/bsc/network_listen.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/bsc/gsm_data.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/signal.h> #include <osmocom/bsc/debug.h> #include <osmocom/bsc/network_listen.h> -#include <osmocom/core/talloc.h> -#include <osmocom/abis/abis.h> -#include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmocom/bsc/bss.h> #include <osmocom/bsc/bts.h> diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 62e79cd..e659708 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -37,18 +37,18 @@ #define _GNU_SOURCE #include <getopt.h> -#include <osmocom/bsc/gsm_data.h> #include <osmocom/core/application.h> #include <osmocom/core/select.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> -#include <osmocom/gsm/ipa.h> -#include <osmocom/abis/ipa.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/bsc/debug.h> -#include <osmocom/bsc/ipaccess.h> #include <osmocom/core/socket.h> #include <osmocom/core/talloc.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> +#include <osmocom/abis/ipa.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/bsc/ipaccess.h> /* one instance of an ip.access protocol proxy */ struct ipa_proxy { diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 9382fa4..9f6d048 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -25,25 +25,23 @@ #include <osmocom/gsm/tlv.h> -#include <osmocom/bsc/gsm_data.h> -#include <osmocom/bsc/signal.h> -#include <osmocom/bsc/abis_nm.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/socket.h> #include <osmocom/core/stat_item.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/subchan_demux.h> #include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/signal.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/abis_osmo.h> #include <osmocom/bsc/debug.h> -#include <osmocom/abis/subchan_demux.h> -#include <osmocom/gsm/ipa.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/core/logging.h> #include <osmocom/bsc/ipaccess.h> #include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> #include <osmocom/bsc/paging.h> diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 9312a2a..1df9497 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -24,21 +24,19 @@ #include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/logging.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/subchan_demux.h> #include <osmocom/bsc/gsm_data.h> #include <osmocom/bsc/signal.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/bts.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/gsm/tlv.h> -#include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> -#include <osmocom/bsc/gsm_data.h> -#include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/debug.h> -#include <osmocom/abis/subchan_demux.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/core/logging.h> extern struct gsm_bts_model bts_model_nanobts; diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c index dbea3e9..aaf8b70 100644 --- a/src/osmo-bsc/e1_config.c +++ b/src/osmo-bsc/e1_config.c @@ -23,11 +23,11 @@ #include <time.h> #include <netinet/in.h> -#include <osmocom/bsc/gsm_data.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/bsc/misdn.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/talloc.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/misdn.h> #include <osmocom/bsc/debug.h> #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/bts.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b Gerrit-Change-Number: 38991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-bsc[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h
by pespin 02 Dec '24

02 Dec '24

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b Gerrit-Change-Number: 38991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 13:04:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-bts[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h
by pespin 02 Dec '24

02 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Drop use of libosmo-abis osmocom/abis/ipaccess.h That header is only really used to provide an old hack for ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated soon. Take the chance to organize a bit better the includes based on dependency chain. Change-Id: Ie4540eb6f535375a1e4ddf3849602aecb6260914 --- M src/common/abis.c M src/common/oml.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/abis.c b/src/common/abis.c index e619ec8..d9c56e9 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -39,10 +39,10 @@ #include <osmocom/core/signal.h> #include <osmocom/core/macaddr.h> #include <osmocom/core/fsm.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/abis/abis.h> #include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/gsm/ipa.h> #include <osmo-bts/abis.h> #include <osmo-bts/logging.h> diff --git a/src/common/oml.c b/src/common/oml.c index a9e13b5..35b8664 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -36,10 +36,10 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/gsm/abis_nm.h> #include <osmocom/gsm/tlv.h> #include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie4540eb6f535375a1e4ddf3849602aecb6260914 Gerrit-Change-Number: 38990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-bts[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h
by osmith 02 Dec '24

02 Dec '24

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie4540eb6f535375a1e4ddf3849602aecb6260914 Gerrit-Change-Number: 38990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 12:58:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-hlr[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h
by osmith 02 Dec '24

02 Dec '24

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38989?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I393cd23a09af6d1eefa68dc955415f4fe334d71b Gerrit-Change-Number: 38989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 12:57:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-bsc[master]: Drop use of libosmo-abis osmocom/abis/ipaccess.h
by osmith 02 Dec '24

02 Dec '24

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email ) Change subject: Drop use of libosmo-abis osmocom/abis/ipaccess.h ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/38991/comment/a2353e35_0f28a5d9?usp… : PS1, Line 16: Take the chance to organize a bit better > This patch would have been easier to read if this was done separately. +1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5f9daaf7789a56a08d2ec24b5e25e2e3b65b8b5b Gerrit-Change-Number: 38991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Dec 2024 12:57:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bsc: Add missing testcase in expected-results.xml
by pespin 02 Dec '24

02 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38998?usp=email ) Change subject: bsc: Add missing testcase in expected-results.xml ...................................................................... bsc: Add missing testcase in expected-results.xml Change-Id: I6416e5cf4c12912f5094841d3738302bbd6228bb --- M bsc/expected-results.xml 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/38998/1 diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index f042a8c..93432b9 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='BSC_Tests' tests='317' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='BSC_Tests' tests='318' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='BSC_Tests' name='TC_ctrl_msc_connection_status' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ctrl_msc0_connection_status' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_stat_num_msc_connected_1' time='MASKED'/> @@ -9,6 +9,7 @@ <testcase classname='BSC_Tests' name='TC_stat_num_bts_connected_2' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_stat_num_bts_connected_3' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_ctrl' time='MASKED'/> + <testcase classname='BSC_Tests' name='TC_ctrl_location' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_si_default' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_si2quater_2_earfcns' time='MASKED'/> <testcase classname='BSC_Tests' name='TC_si2quater_3_earfcns' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38998?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6416e5cf4c12912f5094841d3738302bbd6228bb Gerrit-Change-Number: 38998 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-abis[master]: ipaccess: Assert fd is positive
by pespin 02 Dec '24

02 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38997?usp=email ) Change subject: ipaccess: Assert fd is positive ...................................................................... ipaccess: Assert fd is positive Make coverity happy. We are in a rx path from socket, so socket should be fine at that point. Closes: Coverity CID#435266 Change-Id: I09004040107fb72b6170618a6253a6225f4351c2 --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5a24686..505ec3f 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -958,6 +958,7 @@ /* ping, pong and acknowledgment cases. */ struct osmo_fd tmp_ofd = { .fd = osmo_stream_cli_get_fd(cli) }; + OSMO_ASSERT(tmp_ofd.fd >= 0); ret = ipa_ccm_rcvmsg_bts_base(msg, &tmp_ofd); if (ret < 0) goto err; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38997?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I09004040107fb72b6170618a6253a6225f4351c2 Gerrit-Change-Number: 38997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: Drop internal use of osmocom/abis/ipaccess.h
by pespin 02 Dec '24

02 Dec '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38988?usp=email ) Change subject: Drop internal use of osmocom/abis/ipaccess.h ...................................................................... Drop internal use of osmocom/abis/ipaccess.h That header is only really used to provide an old hack for ipaccess-proxy tool in openbsc.h/osmo-bsc.h, and will be deprecated soon. Take the chance to organize a bit better the includes based on dependency chain. Change-Id: Ifc9759b17a9b966cb713f7533a13f6223161a4cd --- M src/input/ipa.c M src/input/ipaccess.c M src/ipa_proxy.c M tests/e1inp_ipa_bts_test.c 4 files changed, 16 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/input/ipa.c b/src/input/ipa.c index f902b95..f49d0dc 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -13,15 +13,14 @@ #include <osmocom/core/select.h> #include <osmocom/core/timer.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/core/talloc.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> #include <osmocom/core/backtrace.h> - +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> #include <osmocom/abis/ipa.h> #define LOGIPA(link, level, fmt, args...) LOGP(DLINP, level, "%s:%u " fmt, link->addr, link->port, ## args) diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index af6e39d..94f1b2b 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -39,21 +39,21 @@ #include <arpa/inet.h> #include <osmocom/core/select.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/macaddr.h> #include <osmocom/core/logging.h> #include <osmocom/core/talloc.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> -#include <osmocom/abis/ipa.h> #include <osmocom/core/backtrace.h> -#include <osmocom/gsm/ipa.h> #include <osmocom/core/stats_tcp.h> #include <osmocom/core/fsm.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/netif/stream.h> #include <osmocom/netif/ipa.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/ipa.h> /* global parameters of IPA input driver */ struct ipa_pars g_e1inp_ipaccess_pars; diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c index 441dd3f..04d3f9c 100644 --- a/src/ipa_proxy.c +++ b/src/ipa_proxy.c @@ -14,17 +14,16 @@ #include <osmocom/core/select.h> #include <osmocom/core/bitvec.h> -#include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/core/talloc.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> - -#include <osmocom/abis/ipa.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/ipaccess.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/ipa.h> static void *tall_ipa_proxy_ctx; diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c index 68dfefb..4488fe7 100644 --- a/tests/e1inp_ipa_bts_test.c +++ b/tests/e1inp_ipa_bts_test.c @@ -1,15 +1,15 @@ #include <stdio.h> #include <signal.h> -#include <osmocom/core/talloc.h> #include <string.h> #include <unistd.h> -#include <osmocom/abis/abis.h> -#include <osmocom/abis/e1_input.h> +#include <osmocom/core/talloc.h> #include <osmocom/core/logging.h> #include <osmocom/core/application.h> -#include <osmocom/abis/ipaccess.h> #include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/gsm/ipa.h> +#include <osmocom/abis/abis.h> +#include <osmocom/abis/e1_input.h> static void *tall_test; static struct e1inp_sign_link *oml_sign_link, *rsl_sign_link; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifc9759b17a9b966cb713f7533a13f6223161a4cd Gerrit-Change-Number: 38988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log