Merge pull request #144 from pi-hole/development

FTL v2.11.1

parser.c

@@ -284,6 +284,17 @@ void process_pihole_log(int file)
  }
  }
 
+ // Detect time travel events
+ if(timeidx < 0)
+ {
+ // This query is older than the first one in the log, hence the clock
+ // on this machine was at least slightly off for a while. We will skip
+ // this query as we cannot attribute it correctly to anything.
+ validate_access("overTime", 0, false, __LINE__, __FUNCTION__, __FILE__);
+ logg("Warning: Skipping log entry with incorrect timestamp (%i/%i)", overTimetimestamp, overTime[0].timestamp);
+ continue;
+ }
+
  // Get domain
  // domainstart = pointer to | in "query[AAAA] |host.name from ww.xx.yy.zz\n"
  const char *domainstart = strstr(readbuffer, "] ");

request.c

@@ -128,6 +128,8 @@ void process_request(char *client_message, int *sock)
  else if(command(client_message, ">kill"))
  {
  processed = true;
+ sprintf(server_message,"killed\n");
+ swrite(server_message, *sock);
  logg("FTL killed by client ID: %i",*sock);
  killed = 1;
  }