From 3713f78ac23ca815c361fe79378ff6d2e522ef6a Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Mon, 1 Sep 2014 11:02:05 +0200
Subject: [PATCH] mgcp: Use the rtp_hdr structure and extract ts/seq from there

Use the rtp_hdr structure. The basic alignment issue remains
and I need to merge/cherry-pick Jacob's getters for the ts,
sequence number and other attributes.
---
 openbsc/include/openbsc/rtp.h        |  1 +
 openbsc/src/libmgcp/mgcp_transcode.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/openbsc/include/openbsc/rtp.h b/openbsc/include/openbsc/rtp.h
index 451d0defa..718fa84e6 100644
--- a/openbsc/include/openbsc/rtp.h
+++ b/openbsc/include/openbsc/rtp.h
@@ -35,4 +35,5 @@ struct rtp_hdr {
 	uint16_t sequence;
 	uint32_t timestamp;
 	uint32_t ssrc;
+	uint8_t data[0];
 } __attribute__((packed));
diff --git a/openbsc/src/libmgcp/mgcp_transcode.c b/openbsc/src/libmgcp/mgcp_transcode.c
index 4d4cec8a2..88de7d2b2 100644
--- a/openbsc/src/libmgcp/mgcp_transcode.c
+++ b/openbsc/src/libmgcp/mgcp_transcode.c
@@ -28,6 +28,7 @@
 #include <openbsc/mgcp.h>
 #include <openbsc/mgcp_internal.h>
 #include <openbsc/mgcp_transcode.h>
+#include <openbsc/rtp.h>
 
 #include <osmocom/core/talloc.h>
 
@@ -396,8 +397,9 @@ int mgcp_transcoding_process_rtp(struct mgcp_endpoint *endp,
 			     char *data, int *len, int buf_size)
 {
 	struct mgcp_process_rtp_state *state = dst_end->rtp_process_data;
-	size_t rtp_hdr_size = 12;
-	char *payload_data = data + rtp_hdr_size;
+	const size_t rtp_hdr_size = sizeof(struct rtp_hdr);
+	struct rtp_hdr *rtp_hdr = (struct rtp_hdr *) data;
+	char *payload_data = (char *) &rtp_hdr->data[0];
 	int payload_len = *len - rtp_hdr_size;
 	uint8_t *src = (uint8_t *)payload_data;
 	uint8_t *dst = (uint8_t *)payload_data;
@@ -427,9 +429,9 @@ int mgcp_transcoding_process_rtp(struct mgcp_endpoint *endp,
 	/* TODO: check payload type (-> G.711 comfort noise) */
 
 	if (payload_len > 0) {
-		ts_no = ntohl(*(uint32_t*)(data+4));
+		ts_no = ntohl(rtp_hdr->timestamp);
 		if (!state->is_running) {
-			state->next_seq = ntohs(*(uint16_t*)(data+2));
+			state->next_seq = ntohs(rtp_hdr->sequence);
 			state->next_time = ts_no;
 			state->is_running = 1;
 		}
@@ -504,8 +506,8 @@ int mgcp_transcoding_process_rtp(struct mgcp_endpoint *endp,
 	nsamples -= state->sample_cnt;
 
 	*len = rtp_hdr_size + rc;
-	*(uint16_t*)(data+2) = htons(state->next_seq);
-	*(uint32_t*)(data+4) = htonl(ts_no);
+	rtp_hdr->sequence = htons(state->next_seq);
+	rtp_hdr->timestamp = htonl(ts_no);
 
 	state->next_seq += 1;
 	state->next_time = ts_no + nsamples;