Add debug level 5 (packet debug + packet dump).

ChangeLog

@@ -1,4 +1,5 @@
 xxxx-xx-xx : Version -next
+ * Add debug level 5 (full mpeg ts packet dump).
  * Fix PSI table gathering in invalid transport streams.
  * Fix EMM/ECM parsing (this fixes ORF1 decoding on Astra 19.2).
  * Process ECMs before EMMs, preventing the case where too much

process.c

@@ -66,22 +66,27 @@ static char *get_pid_desc(struct ts *ts, uint16_t pid) {
 }
 
 void show_ts_pack(struct ts *ts, uint16_t pid, char *wtf, char *extra, uint8_t *ts_packet) {
+	char pdump[188 * 6];
 	char cw1_dump[8 * 6];
 	char cw2_dump[8 * 6];
 	if (ts->debug_level >= 4) {
 		if (ts_pack_shown)
 			return;
+		if (ts->debug_level >= 5)
+			ts_hex_dump_buf(pdump, 188 * 6, ts_packet, 188, 0);
+
 		int stype = ts_packet_get_scrambled(ts_packet);
 		ts_hex_dump_buf(cw1_dump, 8 * 6, ts->key.cw    , 8, 0);
 		ts_hex_dump_buf(cw2_dump, 8 * 6, ts->key.cw + 8, 8, 0);
-		fprintf(stderr, "@ %s %s %03x %5ld %7ld | %s   %s | %s\n",
+		fprintf(stderr, "@ %s %s %03x %5ld %7ld | %s   %s | %s %s\n",
 			stype == 0 ? "------" :
 			stype == 2 ? "even 0" :
 			stype == 3 ? "odd  1" : "??????",
 			wtf,
 			pid,
 			ts_pack, ts_pack * 188,
-			cw1_dump, cw2_dump, extra ? extra : wtf);
+			cw1_dump, cw2_dump, extra ? extra : wtf,
+			ts->debug_level >= 5 ? pdump : "");
 	}
 }
 

tsdecrypt.1

@@ -30,8 +30,9 @@ Syslog server port. The default value is \fB514\fR.
 \fB\-D\fR, \fB\-\-debug\fR <level>
 Set message debug level. Currently there are five message levels.
 0 = default messages, 1 = show PSI tables, 2 = show EMMs 3 = show
-duplicate ECMs, 4 = packet debug. Setting higher level enables the
-levels bellow.
+duplicate ECMs, 4 = packet debug. 5 = packet debug + mpeg ts packet
+dump.
+Setting higher level enables the levels bellow.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 Show program help.

tsdecrypt.c

@@ -157,6 +157,7 @@ static void show_help(struct ts *ts) {
 	printf("                            .    2 = show EMMs\n");
 	printf("                            .    3 = show duplicate ECMs\n");
 	printf("                            .    4 = packet debug\n");
+	printf("                            .    5 = packet debug + packet dump\n");
 	printf(" -h --help                  | Show help screen.\n");
 	printf(" -V --version               | Show program version.\n");
 	printf("\n");