Update libsrtp to version 2.0

test/rtp.c

 /*
  * rtp.c
  *
  * library functions for the real-time transport protocol
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 41 matching lines @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
 
 #define PRINT_DEBUG    0    /* set to 1 to print out debugging data */
 #define VERBOSE_DEBUG  0    /* set to 1 to print out more data      */
 
 int
 rtp_sendto(rtp_sender_t sender, const void* msg, int len) {
   int octets_sent;
-  err_status_t stat;
+  srtp_err_status_t stat;
   int pkt_len = len + RTP_HEADER_LEN;
 
   /* marshal data */
   strncpy(sender->message.body, msg, len);
   
   /* update header */
   sender->message.header.seq = ntohs(sender->message.header.seq) + 1;
   sender->message.header.seq = htons(sender->message.header.seq);
   sender->message.header.ts = ntohl(sender->message.header.ts) + 1;
   sender->message.header.ts = htonl(sender->message.header.ts);
@@ skipping 19 matching lines @@
     perror("");
 #endif
   }
 
   return octets_sent;
 }
 
 int
 rtp_recvfrom(rtp_receiver_t receiver, void *msg, int *len) {
   int octets_recvd;
-  err_status_t stat;
+  srtp_err_status_t stat;
   
   octets_recvd = recvfrom(receiver->socket, (void *)&receiver->message,
                          *len, 0, (struct sockaddr *) NULL, 0);
 
   if (octets_recvd == -1) {
     *len = 0;
     return -1;
   }
 
   /* verify rtp header */
   if (receiver->message.header.version != 2) {
     *len = 0;
     return -1;
   }
 
 #if PRINT_DEBUG
   fprintf(stderr, "%d octets received from SSRC %u\n",
           octets_recvd, receiver->message.header.ssrc);
 #endif
 #if VERBOSE_DEBUG
   srtp_print_packet(&receiver->message.header, octets_recvd);
 #endif
 
   /* apply srtp */
   stat = srtp_unprotect(receiver->srtp_ctx,
                         &receiver->message.header, &octets_recvd);
   if (stat) {
     fprintf(stderr,
             "error: srtp unprotection failed with code %d%s\n", stat,
-            stat == err_status_replay_fail ? " (replay check failed)" :
-            stat == err_status_auth_fail ? " (auth check failed)" : "");
+            stat == srtp_err_status_replay_fail ? " (replay check failed)" :
+            stat == srtp_err_status_auth_fail ? " (auth check failed)" : "");
     return -1;
   }
   strncpy(msg, receiver->message.body, octets_recvd);
   
   return octets_recvd;
 }
 
 int
 rtp_sender_init(rtp_sender_t sender, 
                 int sock, 
@@ skipping 74 matching lines @@
 
 rtp_receiver_t 
 rtp_receiver_alloc(void) {
   return (rtp_receiver_t)malloc(sizeof(rtp_receiver_ctx_t));
 }
 
 void
 rtp_receiver_dealloc(rtp_receiver_t rtp_ctx) {
   free(rtp_ctx);
 }