Update libsrtp to version 2.0

test/rdbx_driver.c

Index: test/rdbx_driver.c
diff --git a/srtp/test/rdbx_driver.c b/test/rdbx_driver.c
similarity index 75%
rename from srtp/test/rdbx_driver.c
rename to test/rdbx_driver.c
index 90bd72e7afb4d66d18862884e7bb426d3ebb3b49..2a8c7bf37097ac34e2a6e8b682220082f4949cf4 100644
--- a/srtp/test/rdbx_driver.c
+++ b/test/rdbx_driver.c
@@ -53,12 +53,12 @@
 #include "rdbx.h"
 
 #ifdef ROC_TEST
-#error "rdbx_t won't work with ROC_TEST - bitmask same size as seq_median"
+#error "srtp_rdbx_t won't work with ROC_TEST - bitmask same size as seq_median"
 #endif
 
 #include "ut_sim.h"
 
-err_status_t 
+srtp_err_status_t 
 test_replay_dbx(int num_trials, unsigned long ws);
 
 double
@@ -73,7 +73,7 @@ usage(char *prog_name) {
 int
 main (int argc, char *argv[]) {
   double rate;
-  err_status_t status;
+  srtp_err_status_t status;
   int q;
   unsigned do_timing_test = 0;
   unsigned do_validation = 0;
@@ -103,7 +103,7 @@ main (int argc, char *argv[]) {
     usage(argv[0]);
 
   if (do_validation) {
-    printf("testing rdbx_t (ws=128)...\n");
+    printf("testing srtp_rdbx_t (ws=128)...\n");
 
     status = test_replay_dbx(1 << 12, 128);
     if (status) {
@@ -112,7 +112,7 @@ main (int argc, char *argv[]) {
     }
     printf("passed\n");
 
-    printf("testing rdbx_t (ws=1024)...\n");
+    printf("testing srtp_rdbx_t (ws=1024)...\n");
 
     status = test_replay_dbx(1 << 12, 1024);
     if (status) {
@@ -133,7 +133,7 @@ main (int argc, char *argv[]) {
 }
 
 void
-print_rdbx(rdbx_t *rdbx) {
+print_rdbx(srtp_rdbx_t *rdbx) {
   char buf[2048];
   printf("rdbx: {%llu, %s}\n",
 	 (unsigned long long)(rdbx->index),
@@ -146,20 +146,20 @@ print_rdbx(rdbx_t *rdbx) {
  * rdbx_check_add(rdbx, idx) checks a known-to-be-good idx against
  * rdbx, then adds it.  if a failure is detected (i.e., the check
  * indicates that the value is already in rdbx) then
- * err_status_algo_fail is returned.
+ * srtp_err_status_algo_fail is returned.
  *
  */
 
-err_status_t
-rdbx_check_add(rdbx_t *rdbx, uint32_t idx) {
+srtp_err_status_t
+rdbx_check_add(srtp_rdbx_t *rdbx, uint32_t idx) {
   int delta;
-  xtd_seq_num_t est;
+  srtp_xtd_seq_num_t est;
   
-  delta = index_guess(&rdbx->index, &est, idx);
+  delta = srtp_index_guess(&rdbx->index, &est, idx);
   
-  if (rdbx_check(rdbx, delta) != err_status_ok) {
+  if (srtp_rdbx_check(rdbx, delta) != srtp_err_status_ok) {
     printf("replay_check failed at index %u\n", idx);
-    return err_status_algo_fail;
+    return srtp_err_status_algo_fail;
   }
 
   /*
@@ -167,72 +167,72 @@ rdbx_check_add(rdbx_t *rdbx, uint32_t idx) {
    * the estimated value est, at this point
    */
   
-  if (rdbx_add_index(rdbx, delta) != err_status_ok) {
+  if (srtp_rdbx_add_index(rdbx, delta) != srtp_err_status_ok) {
     printf("rdbx_add_index failed at index %u\n", idx);
-    return err_status_algo_fail;
+    return srtp_err_status_algo_fail;
   }  
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
 /*
- * rdbx_check_expect_failure(rdbx_t *rdbx, uint32_t idx)
+ * rdbx_check_expect_failure(srtp_rdbx_t *rdbx, uint32_t idx)
  * 
  * checks that a sequence number idx is in the replay database
  * and thus will be rejected
  */
 
-err_status_t
-rdbx_check_expect_failure(rdbx_t *rdbx, uint32_t idx) {
+srtp_err_status_t
+rdbx_check_expect_failure(srtp_rdbx_t *rdbx, uint32_t idx) {
   int delta;
-  xtd_seq_num_t est;
-  err_status_t status;
+  srtp_xtd_seq_num_t est;
+  srtp_err_status_t status;
 
-  delta = index_guess(&rdbx->index, &est, idx);
+  delta = srtp_index_guess(&rdbx->index, &est, idx);
 
-  status = rdbx_check(rdbx, delta);
-  if (status == err_status_ok) {
+  status = srtp_rdbx_check(rdbx, delta);
+  if (status == srtp_err_status_ok) {
     printf("delta: %d ", delta);
     printf("replay_check failed at index %u (false positive)\n", idx);
-    return err_status_algo_fail; 
+    return srtp_err_status_algo_fail; 
   }
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
-err_status_t
-rdbx_check_add_unordered(rdbx_t *rdbx, uint32_t idx) {
+srtp_err_status_t
+rdbx_check_add_unordered(srtp_rdbx_t *rdbx, uint32_t idx) {
   int delta;
-  xtd_seq_num_t est;
-  err_status_t rstat;
+  srtp_xtd_seq_num_t est;
+  srtp_err_status_t rstat;
 
-  delta = index_guess(&rdbx->index, &est, idx);
+  delta = srtp_index_guess(&rdbx->index, &est, idx);
 
-  rstat = rdbx_check(rdbx, delta);
-  if ((rstat != err_status_ok) && (rstat != err_status_replay_old)) {
+  rstat = srtp_rdbx_check(rdbx, delta);
+  if ((rstat != srtp_err_status_ok) && (rstat != srtp_err_status_replay_old)) {
     printf("replay_check_add_unordered failed at index %u\n", idx);
-    return err_status_algo_fail;
+    return srtp_err_status_algo_fail;
   }
-  if (rstat == err_status_replay_old) {
-	return err_status_ok;
+  if (rstat == srtp_err_status_replay_old) {
+	return srtp_err_status_ok;
   }
-  if (rdbx_add_index(rdbx, delta) != err_status_ok) {
+  if (srtp_rdbx_add_index(rdbx, delta) != srtp_err_status_ok) {
     printf("rdbx_add_index failed at index %u\n", idx);
-    return err_status_algo_fail;
+    return srtp_err_status_algo_fail;
   }  
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
-err_status_t
+srtp_err_status_t
 test_replay_dbx(int num_trials, unsigned long ws) {
-  rdbx_t rdbx;
+  srtp_rdbx_t rdbx;
   uint32_t idx, ircvd;
   ut_connection utc;
-  err_status_t status;
+  srtp_err_status_t status;
   int num_fp_trials;
 
-  status = rdbx_init(&rdbx, ws);
+  status = srtp_rdbx_init(&rdbx, ws);
   if (status) {
     printf("replay_init failed with error code %d\n", status);
     exit(1);
@@ -269,11 +269,11 @@ test_replay_dbx(int num_trials, unsigned long ws) {
   printf("passed\n");
 
   /* re-initialize */
-  rdbx_dealloc(&rdbx);
+  srtp_rdbx_dealloc(&rdbx);
 
-  if (rdbx_init(&rdbx, ws) != err_status_ok) {
+  if (srtp_rdbx_init(&rdbx, ws) != srtp_err_status_ok) {
     printf("replay_init failed\n");
-    return err_status_init_fail;
+    return srtp_err_status_init_fail;
   }
 
   /*
@@ -297,11 +297,11 @@ test_replay_dbx(int num_trials, unsigned long ws) {
   printf("passed\n");
 
   /* re-initialize */
-  rdbx_dealloc(&rdbx);
+  srtp_rdbx_dealloc(&rdbx);
 
-  if (rdbx_init(&rdbx, ws) != err_status_ok) {
+  if (srtp_rdbx_init(&rdbx, ws) != srtp_err_status_ok) {
     printf("replay_init failed\n");
-    return err_status_init_fail;
+    return srtp_err_status_init_fail;
   }
 
   /*
@@ -319,9 +319,9 @@ test_replay_dbx(int num_trials, unsigned long ws) {
   }
   printf("passed\n");
 
-  rdbx_dealloc(&rdbx);
+  srtp_rdbx_dealloc(&rdbx);
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
 
@@ -333,12 +333,12 @@ double
 rdbx_check_adds_per_second(int num_trials, unsigned long ws) {
   uint32_t i;
   int delta;
-  rdbx_t rdbx;
-  xtd_seq_num_t est;
+  srtp_rdbx_t rdbx;
+  srtp_xtd_seq_num_t est;
   clock_t timer;
   int failures;                    /* count number of failures        */
   
-  if (rdbx_init(&rdbx, ws) != err_status_ok) {
+  if (srtp_rdbx_init(&rdbx, ws) != srtp_err_status_ok) {
     printf("replay_init failed\n");
     exit(1);
   }  
@@ -347,19 +347,19 @@ rdbx_check_adds_per_second(int num_trials, unsigned long ws) {
   timer = clock();
   for(i=0; (int) i < num_trials; i++) {
     
-    delta = index_guess(&rdbx.index, &est, i);
+    delta = srtp_index_guess(&rdbx.index, &est, i);
     
-    if (rdbx_check(&rdbx, delta) != err_status_ok) 
+    if (srtp_rdbx_check(&rdbx, delta) != srtp_err_status_ok) 
       ++failures;
     else
-      if (rdbx_add_index(&rdbx, delta) != err_status_ok)
+      if (srtp_rdbx_add_index(&rdbx, delta) != srtp_err_status_ok)
 	++failures;
   }
   timer = clock() - timer;
 
   printf("number of failures: %d \n", failures);
 
-  rdbx_dealloc(&rdbx);
+  srtp_rdbx_dealloc(&rdbx);
 
   return (double) CLOCKS_PER_SEC * num_trials / timer;
 }