summaryrefslogtreecommitdiffstats
path: root/openbsc/src/libtrau
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-03-22 09:51:43 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-03-22 09:51:43 +0100
commitd0e171a9ffe8700d86feb5b73aeb0eccf02c1e7d (patch)
treea127324849c0db105962d61ca94550fa6578c507 /openbsc/src/libtrau
parent8deba01eda7d32e32583d2a862984b430888fbe3 (diff)
rtp: Use osmocom/netif/rtp.h for the rtp structure definition
We depend on libosmo-netif unconditionally. Let's use this definition of rtp and have one portability issue less.
Diffstat (limited to 'openbsc/src/libtrau')
-rw-r--r--openbsc/src/libtrau/rtp_proxy.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c
index 523f2b449..52616a0be 100644
--- a/openbsc/src/libtrau/rtp_proxy.c
+++ b/openbsc/src/libtrau/rtp_proxy.c
@@ -36,22 +36,13 @@
#include <openbsc/rtp_proxy.h>
#include <openbsc/mncc.h>
#include <openbsc/trau_upqueue.h>
-#include <openbsc/rtp.h>
+
+#include <osmocom/netif/rtp.h>
/* attempt to determine byte order */
#include <sys/param.h>
#include <limits.h>
-#ifndef __BYTE_ORDER
-# ifdef __APPLE__
-# define __BYTE_ORDER __DARWIN_BYTE_ORDER
-# define __LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN
-# define __BIG_ENDIAN __DARWIN_BIG_ENDIAN
-# else
-# error "__BYTE_ORDER should be defined by someone"
-# endif
-#endif
-
static LLIST_HEAD(rtp_sockets);
/* should we mangle the CNAME inside SDES of RTCP packets? We disable
@@ -66,21 +57,10 @@ enum rtp_bfd_priv {
#define RTP_ALLOC_SIZE 1500
-/* according to RFC 1889 */
-struct rtcp_hdr {
- uint8_t byte0;
- uint8_t type;
- uint16_t length;
-} __attribute__((packed));
-
#define RTCP_TYPE_SDES 202
#define RTCP_IE_CNAME 1
-struct rtp_x_hdr {
- uint16_t by_profile;
- uint16_t length;
-} __attribute__((packed));
#define RTP_VERSION 2