Move service id to be the first field in ECM and EMM messages.

tables.c

@@ -248,7 +248,7 @@ void process_sdt(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	}
 }
 
-#define dump_sz      (16)
+#define dump_sz      (15)
 #define dump_buf_sz  (dump_sz * 6)
 
 static void __process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
@@ -267,10 +267,10 @@ static void __process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	struct ts_section_header *sec = ts->emm->section_header;
 	if (ts->debug_level >= 2) {
 		ts_hex_dump_buf(dump, dump_buf_sz, sec->section_data, min(dump_sz, sec->section_data_len), 0);
-		ts_LOGf("EMM | CAID: 0x%04x PID 0x%04x SID 0x%04x Table: 0x%02x Length: %3d Data: %s..\n",
+		ts_LOGf("EMM | SID 0x%04x CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %4d Data: %s..\n",
+			ts->service_id,
 			ts->emm_caid,
 			th->pid,
-			ts->service_id,
 			sec->table_id,
 			sec->section_data_len,
 			dump);
@@ -310,10 +310,10 @@ static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	if (!duplicate || ts->is_cw_error) {
 		if (ts->ecm_cw_log) {
 			ts_hex_dump_buf(dump, dump_buf_sz, sec->section_data, min(dump_sz, sec->section_data_len), 0);
-			ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x SID 0x%04x Table: 0x%02x Length: %3d Data: %s..\n",
+			ts_LOGf("ECM | SID 0x%04x CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %4d Data: %s..\n",
+				ts->service_id,
 				ts->ecm_caid,
 				th->pid,
-				ts->service_id,
 				sec->table_id,
 				sec->section_data_len,
 				dump);
@@ -321,7 +321,8 @@ static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 		ts->is_cw_error = 0;
 		camd_process_packet(ts, camd_msg_alloc(ECM_MSG, ts->ecm_caid, ts->service_id, sec->section_data, sec->section_data_len));
 	} else if (ts->debug_level >= 3) {
-		ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %3d Data: -dup-\n",
+		ts_LOGf("ECM | SID 0x%04x CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %4d Data: -dup-\n",
+			ts->service_id,
 			ts->ecm_caid,
 			th->pid,
 			sec->table_id,