From 6b1dbf2d9824044e9db335b2980bd016b3d1a167 Mon Sep 17 00:00:00 2001
From: mvoelkel <mvoelkel@digitaldevices.de>
Date: Sun, 10 Jan 2016 06:53:46 +0100
Subject: [PATCH] octoscan nit parsing fixed

---
 octoscan/octoscan.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/octoscan/octoscan.c b/octoscan/octoscan.c
index 7fd828e..b1961f0 100644
--- a/octoscan/octoscan.c
+++ b/octoscan/octoscan.c
@@ -931,6 +931,8 @@ static int nit_cb(struct sfilter *sf)
 	struct tp_info t;
 
 	slen = get12(buf + 1) + 3;
+	if (buf[1] & 0x80)
+		slen -= 4;
 	nid = get16(buf + 3);
 	ndl = get12(buf + 8);
 	tsp = 10 + ndl;
@@ -985,9 +987,9 @@ static int nit_cb(struct sfilter *sf)
 			else {
 				fprintf(stderr, " *************************  freq = %u  sr = %u  mod = %u  \n", t.freq, t.sr, t.mod);
 				fprintf(stderr, " *************************  buffer start:\n" );
-				dump(buf, 16);
-				fprintf(stderr, " *************************  buffer position c = %d\n", c);
-				dump(buf + c, 16);
+				dump(buf, 32);
+				fprintf(stderr, " *************************  buffer position (c-32,c+16)  c = %d, slen = %d\n", c, slen);
+				dump(buf + c - 32, 48);
 			}
 			break;