Update libsrtp to version 2.0

include/rtp.h

 /*
  * rtp.h
  * 
  * rtp interface for srtp reference implementation
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  *
  * data types:
  *
@@ skipping 42 matching lines @@
 
 #ifndef RTP_H
 #define RTP_H
 
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #elif defined HAVE_WINSOCK2_H
 # include <winsock2.h>
 #endif
 
+//#include "srtp_priv.h"
 #include "srtp.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * RTP_HEADER_LEN indicates the size of an RTP header
+ */
+#define RTP_HEADER_LEN   12
+
+/* 
+ * RTP_MAX_BUF_LEN defines the largest RTP packet in the rtp.c implementation
+ */
+#define RTP_MAX_BUF_LEN  16384
+
+
+typedef srtp_hdr_t rtp_hdr_t;
+
+typedef struct {
+  srtp_hdr_t header;        
+  char body[RTP_MAX_BUF_LEN];  
+} rtp_msg_t;
+
+typedef struct rtp_sender_ctx_t {
+  rtp_msg_t message;         
+  int socket;
+  srtp_ctx_t *srtp_ctx;
+  struct sockaddr_in addr;   /* reciever's address */
+} rtp_sender_ctx_t;
+
+typedef struct rtp_receiver_ctx_t {
+  rtp_msg_t message;
+  int socket;
+  srtp_ctx_t *srtp_ctx;
+  struct sockaddr_in addr;   /* receiver's address */
+} rtp_receiver_ctx_t;
+
+
 typedef struct rtp_sender_ctx_t *rtp_sender_t;
 
 typedef struct rtp_receiver_ctx_t *rtp_receiver_t;
 
 int
 rtp_sendto(rtp_sender_t sender, const void* msg, int len);
 
 int
 rtp_recvfrom(rtp_receiver_t receiver, void *msg, int *len);
 
 int
 rtp_receiver_init(rtp_receiver_t rcvr, int sock, 
                   struct sockaddr_in addr, unsigned int ssrc);
 
 int
 rtp_sender_init(rtp_sender_t sender, int sock, 
                 struct sockaddr_in addr, unsigned int ssrc);
 
 /*
  * srtp_sender_init(...) initializes an rtp_sender_t
  */
 
 int
 srtp_sender_init(rtp_sender_t rtp_ctx,          /* structure to be init'ed */
                  struct sockaddr_in name,       /* socket name             */
-                 sec_serv_t security_services,  /* sec. servs. to be used  */
+                 srtp_sec_serv_t security_services,  /* sec. servs. to be used  */
                  unsigned char *input_key       /* master key/salt in hex  */
                  );
 
 int
 srtp_receiver_init(rtp_receiver_t rtp_ctx,       /* structure to be init'ed */
                    struct sockaddr_in name,      /* socket name             */
-                   sec_serv_t security_services, /* sec. servs. to be used  */
+                   srtp_sec_serv_t security_services, /* sec. servs. to be used  */
                    unsigned char *input_key      /* master key/salt in hex  */
                    );
 
 
 int
 rtp_sender_init_srtp(rtp_sender_t sender, const srtp_policy_t *policy);
 
 int
 rtp_sender_deinit_srtp(rtp_sender_t sender);
 
@@ skipping 10 matching lines @@
 void
 rtp_sender_dealloc(rtp_sender_t rtp_ctx);
 
 rtp_receiver_t 
 rtp_receiver_alloc(void);
 
 void
 rtp_receiver_dealloc(rtp_receiver_t rtp_ctx);
 
 
-/*
- * RTP_HEADER_LEN indicates the size of an RTP header
- */
-#define RTP_HEADER_LEN   12
-
-/* 
- * RTP_MAX_BUF_LEN defines the largest RTP packet in the rtp.c implementation
- */
-#define RTP_MAX_BUF_LEN  16384
-
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* RTP_H */