Osmocom Open Build Service

commit_0273b8967041285cd61f9d4bb2f16b282d86d142.txt Added

commit_9d4666376b6e72bd6af90e7e871e290873899cdd.txt Deleted

osmo-pcu_1.5.1.10.9d46.dsc -> osmo-pcu_1.5.1.12.0273.dsc Changed

osmo-pcu_1.5.1.10.9d46.tar.xz/.tarball-version -> osmo-pcu_1.5.1.12.0273.tar.xz/.tarball-version Changed

osmo-pcu_1.5.1.10.9d46.tar.xz/debian/changelog -> osmo-pcu_1.5.1.12.0273.tar.xz/debian/changelog Changed

osmo-pcu_1.5.1.10.9d46.tar.xz/src/gprs_ms.c -> osmo-pcu_1.5.1.12.0273.tar.xz/src/gprs_ms.c Changed

osmo-pcu_1.5.1.10.9d46.tar.xz/src/llc.c -> osmo-pcu_1.5.1.12.0273.tar.xz/src/llc.c Changed

@@ -141,24 +141,34 @@
 	}
 }
 
-void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time)
+int llc_queue_enqueue(struct gprs_llc_queue *q, const uint8_t *data, uint16_t len, const struct timespec *expire_time)
 {
+	struct msgb *llc_msg;
 	struct MetaInfo *meta_storage;
-	struct gprs_llc_hdr *llc_hdr = (struct gprs_llc_hdr *)msgb_data(llc_msg);
+	struct gprs_llc_hdr *llc_hdr;
 	enum gprs_llc_queue_prio prio;
 
-	osmo_static_assert(sizeof(*meta_storage) <= sizeof(llc_msg->cb), info_does_not_fit);
+	llc_msg = msgb_alloc_headroom(sizeof(*meta_storage) + len, sizeof(*meta_storage), "llc_pdu_queue");
+	if (!llc_msg)
+		return -ENOMEM;
+
+	/* Fist set up MetaInfo in the msgb headroom: */
+	meta_storage = (struct MetaInfo *)llc_msg->head;
+	osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time);
+	meta_storage->expire_time = *expire_time;
+
+	/* Copy PDU to msgb data: */
+	llc_hdr = (struct gprs_llc_hdr *)msgb_put(llc_msg, len);
+	memcpy(llc_hdr, data, len);
 
 	prio = llc_sapi2prio(llc_hdr->sapi);
 
+	/* Append: */
 	q->queue_size += 1;
 	q->queue_octets += msgb_length(llc_msg);
-
-	meta_storage = (struct MetaInfo *)&llc_msg->cb0;
-	osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time);
-	meta_storage->expire_time = *expire_time;
-
 	msgb_enqueue(&q->pqprio.queue, llc_msg);
+
+	return 0;
 }
 
 void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts)
@@ -205,8 +215,8 @@
 				msg = msg1;
 				msg1 = NULL;
 			} else {
-				const struct MetaInfo *mi1 = (struct MetaInfo *)&msg1->cb0;
-				const struct MetaInfo *mi2 = (struct MetaInfo *)&msg2->cb0;
+				const struct MetaInfo *mi1 = (struct MetaInfo *)msg1->head;
+				const struct MetaInfo *mi2 = (struct MetaInfo *)msg2->head;
 
 				if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) {
 					msg = msg1;
@@ -234,22 +244,23 @@
 }
 
 /* Prepend / Put back a previously dequeued LLC frame (llc_queue_dequeue()) */
-void llc_queue_merge_prepend(struct gprs_llc_queue *q, struct gprs_llc *llc)
+void llc_queue_merge_prepend(struct gprs_llc_queue *q, const struct gprs_llc *llc)
 {
+	struct msgb *llc_msg;
 	struct MetaInfo *meta_storage;
 	unsigned int len = llc_frame_length(llc);
-	struct msgb *llc_msg = msgb_alloc(len, "llc_pdu_queue");
 
+	llc_msg = msgb_alloc_headroom(sizeof(*meta_storage) + len, sizeof(*meta_storage), "llc_pdu_queue");
 	OSMO_ASSERT(llc_msg);
-	memcpy(msgb_put(llc_msg, len), llc->frame, len);
-
-	q->queue_size += 1;
-	q->queue_octets += msgb_length(llc_msg);
 
-	meta_storage = (struct MetaInfo *)&llc_msg->cb0;
+	meta_storage = (struct MetaInfo *)llc_msg->head;
 	memcpy(meta_storage, &llc->meta_info, sizeof(struct MetaInfo));
 
+	memcpy(msgb_put(llc_msg, len), llc->frame, len);
+
 	/* Prepend: */
+	q->queue_size += 1;
+	q->queue_octets += msgb_length(llc_msg);
 	llist_add(&llc_msg->list, &q->pqllc->prio.queue);
 }
 
@@ -272,7 +283,7 @@
 	if (!msg)
 		return NULL;
 
-	meta_storage = (struct MetaInfo *)&msg->cb0;
+	meta_storage = (struct MetaInfo *)msg->head;
 
 	q->queue_size -= 1;
 	q->queue_octets -= msgb_length(msg);
@@ -305,7 +316,7 @@
 	timespecadd(&tv_now, &hyst_delta, &tv_now2);
 
 	while ((msg = llc_queue_pick_msg(q, &prio))) {
-		info = (const struct MetaInfo *)&msg->cb0;
+		info = (const struct MetaInfo *)msg->head;
 		const struct timespec *tv_disc = &info->expire_time;
 		const struct timespec *tv_recv = &info->recv_time;

osmo-pcu_1.5.1.10.9d46.tar.xz/src/llc.h -> osmo-pcu_1.5.1.12.0273.tar.xz/src/llc.h Changed

osmo-pcu_1.5.1.10.9d46.tar.xz/tests/llc/LlcTest.cpp -> osmo-pcu_1.5.1.12.0273.tar.xz/tests/llc/LlcTest.cpp Changed

Changes of Revision 165