pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38823?usp=email )
Change subject: gsup: Replace deprecated ipa_msg_push_header() ......................................................................
gsup: Replace deprecated ipa_msg_push_header()
Use the libosmocore API, which does the same except setting the l2h pointer, which we don't really need here.
Change-Id: I7a4d05a0b09032d8133d8775fb4707a4da8f0cf3 --- M src/gsup_server.c M src/gsupclient/gsup_client.c 2 files changed, 5 insertions(+), 3 deletions(-)
Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
diff --git a/src/gsup_server.c b/src/gsup_server.c index 20ea162..1510bd0 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -26,6 +26,7 @@ #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/gsm23003.h> @@ -49,7 +50,7 @@ int proto_ext, struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_server_conn_send(conn->conn, msg_tx); }
diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index 3329361..e7d03f2 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -26,6 +26,7 @@ #include <osmocom/gsupclient/gsup_client.h>
#include <osmocom/abis/ipa.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/oap_client.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/core/msgb.h> @@ -44,7 +45,7 @@
msg->l2h = msgb_put(msg, 1); msg->l2h[0] = IPAC_MSGT_PING; - ipa_msg_push_header(msg, IPAC_PROTO_IPACCESS); + ipa_prepend_header(msg, IPAC_PROTO_IPACCESS); ipa_client_conn_send(gsupc->link, msg); }
@@ -114,7 +115,7 @@ struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_client_conn_send(gsupc->link, msg_tx); /* msg_tx is now queued and will be freed. */ }
-
pespin