From: Adam Sutton <dev@adamsutton.me.uk>
Date: Sat, 4 Aug 2012 21:26:59 +0000 (+0100)
Subject: Add proper parsing of T2 else things go horribly wrong.
X-Git-Tag: 3.3~174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=741612ccf9d8bd46f08ffc4fac467b93da92d293;p=thirdparty%2Ftvheadend.git

Add proper parsing of T2 else things go horribly wrong.
---

diff --git a/src/muxes.c b/src/muxes.c
index 5e13f21ec..c760f9e0e 100644
--- a/src/muxes.c
+++ b/src/muxes.c
@@ -119,10 +119,17 @@ static int _muxes_load_dvbt ( mux_t *mux, const char *line )
 {
   char bw[20], fec[20], fec2[20], qam[20], mode[20], guard[20], hier[20];
   int r;
+  uint32_t i;
 
-  r = sscanf(line, "%u %10s %10s %10s %10s %10s %10s %10s",
-	           &mux->freq, bw, fec, fec2, qam, mode, guard, hier);
-  if(r != 8) return 1;
+  if (*line == '2') {
+    r = sscanf(line+1, "%u %u %u %10s %10s %10s %10s %10s %10s %10s",
+	             &i, &i, &mux->freq, bw, fec, fec2, qam, mode, guard, hier);
+    if(r != 10) return 1;
+  } else {
+    r = sscanf(line, "%u %10s %10s %10s %10s %10s %10s %10s",
+	             &mux->freq, bw, fec, fec2, qam, mode, guard, hier);
+    if(r != 8) return 1;
+  }
 
   if ((mux->bw            = dvb_mux_str2bw(bw))       == -1) return 1;
   if ((mux->constellation = dvb_mux_str2qam(qam))     == -1) return 1;