pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email )
Change subject: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c
......................................................................
input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c
abis/ipa.h will eventually be deprecated. The only current use of
abis/ipa.h in libosmo-abis itself is in helper code such as:
* tests/ipa_recv/ipa_recv_test.c
* src/ipa_proxy.c
ipaccess e1_input driver is also using struct ipa_keepalive_params,
which is only exported publicly in e1_input.h as a pointer and is only
really used internally, hence move a copy of the struct to internal.h
and use it internally (e1_input_vty.c) from there.
Leave a copy of the struct in its original abis/ipa.h (which as
mentioned contains code to be deprecated) for old users.
Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b
---
M include/internal.h
M include/osmocom/abis/e1_input.h
M src/e1_input_vty.c
M src/input/ipa.c
M src/input/ipaccess.c
M src/ipa_proxy.c
6 files changed, 11 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/include/internal.h b/include/internal.h
index 0ee2dcb..ed2dec4 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -10,6 +10,14 @@
struct e1inp_sign_link;
struct e1inp_ts;
+/*! parameters describing the keep-alive FSM (timeouts). */
+struct ipa_keepalive_params {
+ /*! interval (seconds) in which to send IPA CCM PING requests to the peer. */
+ unsigned int interval;
+ /*! time (seconds) to wait for an IPA CCM PONG in response to a IPA CCM PING before giving up. */
+ unsigned int wait_for_resp;
+};
+
struct ipa_proto_pars {
uint8_t dscp;
uint8_t priority;
diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index c3f7da9..66985ea 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -40,6 +40,7 @@
E1I_CTR_REMOVED,
};
+struct ipa_keepalive_params;
struct e1inp_ts;
struct vty;
diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c
index b1898dd..de92359 100644
--- a/src/e1_input_vty.c
+++ b/src/e1_input_vty.c
@@ -41,7 +41,6 @@
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/abis/e1_input.h>
-#include <osmocom/abis/ipa.h>
#define X(x) (1 << x)
diff --git a/src/input/ipa.c b/src/input/ipa.c
index 073c1ff..0d4f32e 100644
--- a/src/input/ipa.c
+++ b/src/input/ipa.c
@@ -1,5 +1,3 @@
-#include "internal.h"
-
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 8960647..a8e4cc4 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -54,7 +54,6 @@
#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 04d3f9c..6a211ee 100644
--- a/src/ipa_proxy.c
+++ b/src/ipa_proxy.c
@@ -1,5 +1,3 @@
-#include "internal.h"
-
#include <stdio.h>
#include <stdbool.h>
#include <unistd.h>
@@ -27,6 +25,8 @@
static void *tall_ipa_proxy_ctx;
+extern void *libosmo_abis_ctx;
+
/*
* data structures used by the IPA VTY commands
*/
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?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: I4efb11ae44c28c4f56f71f5797966f6106493f2b
Gerrit-Change-Number: 39043
Gerrit-PatchSet: 6
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>
Attention is currently required from: pespin.
fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email )
Change subject: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c
......................................................................
Patch Set 6: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b
Gerrit-Change-Number: 39043
Gerrit-PatchSet: 6
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: Tue, 10 Dec 2024 15:00:29 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: fixeria.
fixeria has removed fixeria from this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email )
Change subject: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c
......................................................................
Removed reviewer fixeria <axilirator(a)gmail.com>.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: deleteReviewer
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b
Gerrit-Change-Number: 39043
Gerrit-PatchSet: 6
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>
Attention is currently required from: fixeria, fixeria.
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email )
Change subject: input: Get rid of abis/ipa.h dependency in e1_input and ipaccess.c
......................................................................
Patch Set 6:
(1 comment)
File include/internal.h:
https://gerrit.osmocom.org/c/libosmo-abis/+/39043/comment/5b6311a9_9ab019e7… :
PS5, Line 16: interval
> Is it in seconds? Please clarify at least in comments.
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39043?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I4efb11ae44c28c4f56f71f5797966f6106493f2b
Gerrit-Change-Number: 39043
Gerrit-PatchSet: 6
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator(a)gmail.com>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <axilirator(a)gmail.com>
Gerrit-Comment-Date: Tue, 10 Dec 2024 14:58:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39085?usp=email )
Change subject: Drop unneeded use of abis/ipa.h header
......................................................................
Drop unneeded use of abis/ipa.h header
Direct include of abis/ipa.h is not needed there, remove it to ease
later deprecation of such header.
Change-Id: I72d0787d4f5641a6a2fbe51427ac490120cbc616
---
M src/remote_hlr.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/remote_hlr.c b/src/remote_hlr.c
index 93157a3..f80f460 100644
--- a/src/remote_hlr.c
+++ b/src/remote_hlr.c
@@ -20,7 +20,7 @@
#include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
#include <osmocom/gsm/gsup.h>
#include <osmocom/gsm/gsm23003.h>
-#include <osmocom/abis/ipa.h>
+#include <osmocom/gsm/ipa.h>
#include <osmocom/gsupclient/gsup_client.h>
#include <osmocom/hlr/logging.h>
#include <osmocom/hlr/hlr.h>
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39085?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: I72d0787d4f5641a6a2fbe51427ac490120cbc616
Gerrit-Change-Number: 39085
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>
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39084?usp=email )
Change subject: Drop unneeded use of abis/ipa.h header
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39084?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: Ib5b9557ff5611fd6606cd0ae6af9046e14cceda0
Gerrit-Change-Number: 39084
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: Tue, 10 Dec 2024 14:57:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39085?usp=email )
Change subject: Drop unneeded use of abis/ipa.h header
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39085?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: I72d0787d4f5641a6a2fbe51427ac490120cbc616
Gerrit-Change-Number: 39085
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: Tue, 10 Dec 2024 14:56:46 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes