Added reader ID & CRC to JSON output

Author: ccattuto

host/openbeacon-json/src/main.c

@@ -109,12 +109,13 @@ microtime (void)
 
 
 void
-print_error(FILE *out, double timestamp, struct sockaddr_in *reader_addr, char *error_msg, uint32_t error_code)
+print_error(FILE *out, double timestamp, struct sockaddr_in *reader_addr, uint16_t reader_id, char *error_msg, uint32_t error_code)
 {
 	fprintf(out, "{");
 
-	fprintf(out, "\"reader\": {\"ip\":\"%s\",\"t\":%d},",
+	fprintf(out, "\"reader\": {\"ip\":\"%s\",\"id\":%d,\"t\":%d},",
 		inet_ntoa(reader_addr->sin_addr),
+		reader_id,
 		(uint32_t) timestamp);
 
 	fprintf(out, "\"error\": \"%s (%d)\"", error_msg, error_code);
@@ -126,22 +127,29 @@ print_error(FILE *out, double timestamp, struct sockaddr_in *reader_addr, char *
 
 
 void
-print_packet(FILE *out, double timestamp, struct sockaddr_in *reader_addr, const TBeaconNgTracker *track)
+print_packet(FILE *out, double timestamp, struct sockaddr_in *reader_addr, uint16_t reader_id, const uint8_t *signature, const TBeaconNgTracker *track)
 {
 	uint32_t t;
+	int j;
 	const TBeaconNgSighting *slot;
 
 	fprintf(out, "{");
 
-	fprintf(out, "\"reader\": {\"ip\":\"%s\",\"t\":%d},",
+	fprintf(out, "\"reader\": {\"ip\":\"%s\",\"id\":%d,\"t\":%d},",
 		inet_ntoa(reader_addr->sin_addr),
+		reader_id,
 		(uint32_t) timestamp);
 
 	fprintf(out, "\"packet\": {\"id\":\"%08X\",\"t\":%d,",
 		track->uid,
 		track->epoch
 	);
 
+	fprintf(out, "\"crc\":\"");
+    for (j=0; j<CONFIG_SIGNATURE_SIZE; j++)
+        fprintf(out, "%02X", signature[j]);
+    fprintf(out, "\",");
+
 	/* show specific fields */
 	switch(track->proto)
 	{
@@ -204,30 +212,30 @@ parse_packet (double timestamp, struct sockaddr_in *reader_addr, const void *dat
 	pkt = (const TBeaconLogSighting*)data;
 	if(pkt->hdr.protocol != BEACONLOG_SIGHTING)
 	{
-		print_error(stdout, timestamp, reader_addr, "Invalid protocol", pkt->hdr.protocol);
+		print_error(stdout, timestamp, reader_addr, ntohs(pkt->hdr.reader_id), "Invalid protocol", pkt->hdr.protocol);
 		//fprintf(stderr, " Invalid protocol [0x%02X]\n\r", pkt->hdr.protocol);
 		return len;
 	}
 
 	t = ntohs(pkt->hdr.size);
 	if(ntohs(t != sizeof(TBeaconLogSighting)))
 	{
-		print_error(stdout, timestamp, reader_addr, "Invalid packet size", t);
+		print_error(stdout, timestamp, reader_addr, ntohs(pkt->hdr.reader_id), "Invalid packet size", t);
 		//fprintf(stderr, " Invalid packet size (%u)\n\r", t);
 		return len;
 	}
 
 	if(ntohs(pkt->hdr.icrc16) != icrc16(&pkt->hdr.protocol, (sizeof(TBeaconLogSighting)-sizeof(pkt->hdr.icrc16))))
 	{
-		print_error(stdout, timestamp, reader_addr, "Invalid packet CRC", 0);
+		print_error(stdout, timestamp, reader_addr, ntohs(pkt->hdr.reader_id), "Invalid packet CRC", 0);
 		//fprintf(stderr, " Invalid packet CRC\n\r");
 		return len;
 	}
 
 	/* decrypt valid packet */
 	if((t = aes_decr(&pkt->log, &track, sizeof(track), CONFIG_SIGNATURE_SIZE))!=0)
 	{
-		print_error(stdout, timestamp, reader_addr, "Packet decryption error", t);
+		print_error(stdout, timestamp, reader_addr, ntohs(pkt->hdr.reader_id), "Packet decryption error", t);
 		//fprintf(stderr, " Failed decrypting packet with error [%i]\n\r", t);
 		return len;
 	}
@@ -236,13 +244,13 @@ parse_packet (double timestamp, struct sockaddr_in *reader_addr, const void *dat
 	if(!((track.proto == RFBPROTO_BEACON_NG_SIGHTING)||
 		(track.proto == RFBPROTO_BEACON_NG_STATUS)))
 	{
-		print_error(stdout, timestamp, reader_addr, "Unkown packet protocol", track.proto);
+		print_error(stdout, timestamp, reader_addr, ntohs(pkt->hdr.reader_id), "Unkown packet protocol", track.proto);
 		//fprintf(stderr, " Unknown protocol [%i]\n\r", track.proto);
 		return len;
 	}
 
 	/* show & process latest packet */
-	print_packet(stdout, timestamp, reader_addr, &track);
+	print_packet(stdout, timestamp, reader_addr, ntohs(pkt->hdr.reader_id), ((uint8_t *) &pkt->log) + sizeof(track) - CONFIG_SIGNATURE_SIZE, &track);
 
 	return sizeof(TBeaconLogSighting);
 }