Osmocom Open Build Service

libosmo-netif.spec Changed

commit_7fe21f67f647a1cede87042911588e57b17580c6.txt Deleted

commit_8355b65d9bcfd50c3ae666824464ab4789863345.txt Added

libosmo-netif_1.3.0.35.7fe2.dsc -> libosmo-netif_1.3.0.37.8355.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmo-netif
 Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
 Architecture: any all
-Version: 1.3.0.35.7fe2
+Version: 1.3.0.37.8355
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmo-netif
 Standards-Version: 3.9.6
@@ -15,8 +15,8 @@
  libosmo-netif-doc deb doc optional arch=all
  libosmonetif11 deb libs optional arch=any
 Checksums-Sha1:
- a43542499f687f921e767f572b6b3719ca244295 183700 libosmo-netif_1.3.0.35.7fe2.tar.xz
+ 1b67f163e10f6241eac2c2724b758cb5dff56226 183696 libosmo-netif_1.3.0.37.8355.tar.xz
 Checksums-Sha256:
- 83b32149bb36d8ff06daefb406dd004ba956a23ba0f3d7846c94aa5258948e31 183700 libosmo-netif_1.3.0.35.7fe2.tar.xz
+ 4613059e422fcac4a19292b9f4097283ea7089f0aa1c35774eb58ec019671da5 183696 libosmo-netif_1.3.0.37.8355.tar.xz
 Files:
- 97c80e4b1387f8af1ff40e1ee019426d 183700 libosmo-netif_1.3.0.35.7fe2.tar.xz
+ 077092f0407d4bfcd4a61550a771a06d 183696 libosmo-netif_1.3.0.37.8355.tar.xz

libosmo-netif_1.3.0.35.7fe2.tar.xz/.tarball-version -> libosmo-netif_1.3.0.37.8355.tar.xz/.tarball-version Changed

libosmo-netif_1.3.0.35.7fe2.tar.xz/debian/changelog -> libosmo-netif_1.3.0.37.8355.tar.xz/debian/changelog Changed

libosmo-netif_1.3.0.35.7fe2.tar.xz/examples/ipa-stream-client.c -> libosmo-netif_1.3.0.37.8355.tar.xz/examples/ipa-stream-client.c Changed

libosmo-netif_1.3.0.35.7fe2.tar.xz/include/osmocom/netif/ipa.h -> libosmo-netif_1.3.0.37.8355.tar.xz/include/osmocom/netif/ipa.h Changed

libosmo-netif_1.3.0.35.7fe2.tar.xz/src/ipa.c -> libosmo-netif_1.3.0.37.8355.tar.xz/src/ipa.c Changed

@@ -97,6 +97,11 @@
 	return msg;
 }
 
+struct msgb *osmo_ipa_ext_msg_alloc(size_t headroom)
+{
+	return osmo_ipa_msg_alloc(sizeof(struct ipa_head_ext) + headroom);
+}
+
 void osmo_ipa_msg_push_header(struct msgb *msg, uint8_t proto)
 {
 	struct ipa_head *hh;
@@ -366,3 +371,68 @@
 
 	return 0;
 }
+
+#define MSG_CB_IPA_INFO_OFFSET 0
+
+/* Check and remove headers (in case of p == IPAC_PROTO_OSMO, also the IPA extension header).
+ * Returns a negative number on error, otherwise the number of octets removed */
+static inline int ipa_check_pull_headers(struct msgb *msg)
+{
+	int ret;
+	size_t octets_removed = 0;
+	msg->l1h = msg->data;
+	struct ipa_head *ih = (struct ipa_head *)msg->data;
+	osmo_ipa_msgb_cb_proto(msg) = ih->proto;
+
+	if ((ret = osmo_ipa_process_msg(msg)) < 0) {
+		LOGP(DLINP, LOGL_ERROR, "Error processing IPA message\n");
+		return -EIO;
+	}
+	msgb_pull(msg, sizeof(struct ipa_head));
+	octets_removed += sizeof(struct ipa_head);
+	msg->l2h = msg->data;
+	if (ih->proto != IPAC_PROTO_OSMO)
+		return octets_removed;
+
+	osmo_ipa_msgb_cb_proto_ext(msg) = msg->data0;
+	msgb_pull(msg, sizeof(struct ipa_head_ext));
+	octets_removed += sizeof(struct ipa_head_ext);
+	return octets_removed;
+}
+
+/*! Segmentation callback used by libosmo-netif streaming backend
+ *  See definition of `struct osmo_io_ops` for callback semantics
+ *  \paramout msg	Original `struct msgb` received via osmo_io
+ *  \returns		The total packet length indicated by the first header,
+ *			otherwise negative number on error. Constants:
+ *			-EAGAIN,  if the header has not been read yet,
+ *			-ENOBUFS, if the header declares a payload too large
+ */
+int osmo_ipa_segmentation_cb(struct msgb *msg)
+{
+	const struct ipa_head *hh = (const struct ipa_head *) msg->data;
+	size_t payload_len, total_len;
+	size_t available = msgb_length(msg) + msgb_tailroom(msg);
+	int removed_octets = 0;
+
+	if (msgb_length(msg) < sizeof(*hh)) {
+		/* Haven't even read the entire header */
+		return -EAGAIN;
+	}
+	payload_len = osmo_ntohs(hh->len);
+	total_len = sizeof(*hh) + payload_len;
+	if (OSMO_UNLIKELY(available < total_len)) {
+		LOGP(DLINP, LOGL_ERROR, "Not enough space left in message buffer. "
+					"Have %zu octets, but need %zu\n",
+					available, total_len);
+		return -ENOBUFS;
+	}
+	if (total_len <= msgb_length(msg)) {
+		removed_octets = ipa_check_pull_headers(msg);
+		if (removed_octets < 0) {
+			LOGP(DLINP, LOGL_ERROR, "Error pulling IPA headers\n");
+			return removed_octets;
+		}
+	}
+	return total_len;
+}

Changes of Revision 55