X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_fec_test.c;h=b94b16dcd91441afb23dad5ffdf2f012cdd0f695;hb=1ae3f467a1d7be2fc3b1a45ba12568a3a25a0099;hp=8ce532c8739dcc419aa5acd8a6b72ba6b1f90b00;hpb=f1ae622eff60e05c1f5d8f822a3cf6a85750c6cc;p=fw%2Faltos

diff --git a/src/test/ao_fec_test.c b/src/test/ao_fec_test.c
index 8ce532c8..b94b16dc 100644
--- a/src/test/ao_fec_test.c
+++ b/src/test/ao_fec_test.c
@@ -268,22 +268,26 @@ int
 ao_real_packet(void)
 {
 	uint8_t	decode[64];
-	uint8_t	decode_len;
-	int ok = 0;
+	int	ok;
 
-	decode_len = ao_fec_decode(real_packet, 576, decode, 34, NULL);
+	ok = ao_fec_decode(real_packet, 576, decode, 34, NULL);
 
-	if (decode[32] == 0 && decode[33] == 0) {
+	if (ok && decode[33] == AO_FEC_DECODE_CRC_OK) {
 		printf ("match\n");
 
-		ao_fec_dump_bytes(decode, decode_len, "Decode");
-		ok = 1;
+		ao_fec_dump_bytes(decode, 34, "Decode");
 	} else {
 		printf ("actual packet crc error\n");
+		ok = 0;
 	}
 	return ok;
 }
 
+#define EXPECT_DECODE_FAIL	0
+#define EXPECT_CRC_MISMATCH	6386
+#define EXPECT_DATA_MISMATCH	0
+#define NOISE_AMOUNT		0x50
+
 int
 main(int argc, char **argv)
 {
@@ -299,13 +303,15 @@ main(int argc, char **argv)
 	int		transmit_len;
 
 	uint8_t		receive[EXPAND_LEN(sizeof(original))];
-	int		receive_len, receive_errors;
+	int		receive_len;
 
 	uint8_t		decode[DECODE_LEN(sizeof(original))];
-	int		decode_len;
+	int		decode_ok;
 
 	int		errors = 0;
-	int		error;
+	int		decode_fail = 0;
+	int		crc_mismatch = 0;
+	int		data_mismatch = 0;
 
 	if (!ao_real_packet())
 		errors++;
@@ -323,37 +329,38 @@ main(int argc, char **argv)
 		transmit_len = ao_expand(encode, encode_len, transmit);
 
 		/* Add gaussian noise to the signal */
-		receive_errors = ao_fuzz(transmit, transmit_len, receive, 0x38);
+		(void) ao_fuzz(transmit, transmit_len, receive, NOISE_AMOUNT);
 		receive_len = transmit_len;
 		
 		/* Decode it */
-		decode_len = ao_fec_decode(receive, receive_len, decode, original_len + 2, NULL);
+		decode_ok = ao_fec_decode(receive, receive_len, decode, original_len + 2, NULL);
 
 		/* Check to see if we received the right data */
-		error = 0;
 
-		if (decode_len < original_len + 2) {
-			printf ("len mis-match\n");
-			error++;
-		}
+		if (!decode_ok)
+			decode_fail++;
+		else if (decode[original_len +1] != AO_FEC_DECODE_CRC_OK)
+			crc_mismatch++;
+		else if (memcmp(original, decode, original_len) != 0)
+			data_mismatch++;
+	}
 
-		if (decode[original_len] != 0 || decode[original_len+1] != 0) {
-			printf ("crc mis-match\n");
-			error++;
-		}
 
-		if (memcmp(original, decode, original_len) != 0) {
-			printf ("data mis-match\n");
-			error++;
-		}
-		if (error) {
-			printf ("Errors: %d\n", receive_errors);
-			ao_fec_dump_bytes(original, original_len, "Input");
-			ao_fec_dump_bytes(decode, original_len, "Decode");
-			errors += error;
-		}
-	}
 	printf ("%d packets coded\n", trial);
+	printf ("decode_fail %d crc_mismatch %d data_mismatch %d\n",
+		decode_fail, crc_mismatch, data_mismatch);
+	if (decode_fail != EXPECT_DECODE_FAIL) {
+		printf ("expected %d decode failures\n", EXPECT_DECODE_FAIL);
+		errors++;
+	}
+	if (crc_mismatch != EXPECT_CRC_MISMATCH) {
+		printf ("expected %d crc mismatch\n", EXPECT_CRC_MISMATCH);
+		errors++;
+	}
+	if (data_mismatch != EXPECT_DATA_MISMATCH) {
+		printf ("expected %d data mismatch\n", EXPECT_DATA_MISMATCH);
+		errors++;
+	}
 	return errors;
 }