stream: Move helper functions

Prepare for next commits

Change-Id: I318965538e5329c44d0910694621b5e1f1db0626
---
M src/stream.c
1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/stream.c b/src/stream.c
index 150b85f..d1682c2 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -1184,6 +1184,27 @@
 	osmo_stream_cli_open(cli);
 }
 
+/* msgb_l1(msg) is expected to be set */
+static inline enum ipaccess_proto msg_get_ipa_proto(struct msgb *msg)
+{
+	struct ipa_head *ih = msgb_l1(msg);
+	OSMO_ASSERT(ih);
+	return ih->proto;
+}
+
+/* msgb->l1h is expected to be set, msgb->l2h is expected to be set if
+ * we have IPAC_PROTO_OSMO specified in the header.
+ * Returns the protocol extension (enum ipaccess_proto) or -ENOPROTOOPT if
+ * we don't have IPAC_PROTO_OSMO specified in the IPA header */
+static inline int msg_get_ipa_proto_ext(struct msgb *msg)
+{
+	if (msg_get_ipa_proto(msg) != IPAC_PROTO_OSMO)
+		return -ENOPROTOOPT;
+	struct ipa_head_ext *ihe = msgb_l2(msg);
+	OSMO_ASSERT(ihe);
+	return ihe->proto;
+}
+
 /*! \brief Enqueue data to be sent via an Osmocom stream client
  *  \param[in] cli Stream Client through which we want to send
  *  \param[in] msg Message buffer to enqueue in transmit queue */
@@ -1937,27 +1958,6 @@
 	talloc_free(conn);
 }
 
-/* msgb_l1(msg) is expected to be set */
-static inline enum ipaccess_proto msg_get_ipa_proto(struct msgb *msg)
-{
-	struct ipa_head *ih = msgb_l1(msg);
-	OSMO_ASSERT(ih);
-	return ih->proto;
-}
-
-/* msgb->l1h is expected to be set, msgb->l2h is expected to be set if
- * we have IPAC_PROTO_OSMO specified in the header.
- * Returns the protocol extension (enum ipaccess_proto) or -ENOPROTOOPT if
- * we don't have IPAC_PROTO_OSMO specified in the IPA header */
-static inline int msg_get_ipa_proto_ext(struct msgb *msg)
-{
-	if (msg_get_ipa_proto(msg) != IPAC_PROTO_OSMO)
-		return -ENOPROTOOPT;
-	struct ipa_head_ext *ihe = msgb_l2(msg);
-	OSMO_ASSERT(ihe);
-	return ihe->proto;
-}
-
 /*! \brief Enqueue IPA data to be sent via an Osmocom stream server
  *  \param[in] conn Stream Server through which we want to send
  *  \param[in] p   Protocol transported by IPA. When set to IPAC_PROTO_UNSPECIFIED, the protocol will be

