4 files changed, 26 insertions, 18 deletions
diff --git a/analyzer/parser/fight_results.c b/analyzer/parser/fight_results.c
index c6ad7cc..1db79ea 100644
--- a/analyzer/parser/fight_results.c
+++ b/analyzer/parser/fight_results.c
@@ -3,16 +3,16 @@
 #include <stdio.h>
 #include <string.h>
 
-char *find_fight_results(char *stream, int stream_len, int *length) {
-    char *start = memmem(stream, stream_len, FIGHT_RESULTS_START, strlen(FIGHT_RESULTS_START));
-    char *end = memmem(stream, stream_len, FIGHT_RESULTS_END, strlen(FIGHT_RESULTS_END));
+byte_t *find_fight_results(TCPStream *stream, int *length) {
+    byte_t *start = memmem(stream->data, stream->len, FIGHT_RESULTS_START, strlen(FIGHT_RESULTS_START));
+    byte_t *end = memmem(stream->data, stream->len, FIGHT_RESULTS_END, strlen(FIGHT_RESULTS_END));
     *length = start != NULL && end != NULL ? end - start + strlen(FIGHT_RESULTS_END) : -1;
     return start;
 }
 
-FightResults parse_fight_results(char *data, int length) {
+FightResults parse_fight_results(byte_t *data, size_t length) {
     // TODO: actually parse that data
-    printf("len=%d\n%.*s\n----------------\n", length, length, data);
+    printf("len=%zu\n%.*s\n----------------\n", length, (int)length, data);
     FightResults tmp;
     return tmp;
 }
diff --git a/analyzer/parser/fight_results.h b/analyzer/parser/fight_results.h
index 270aba8..b275f2b 100644
--- a/analyzer/parser/fight_results.h
+++ b/analyzer/parser/fight_results.h
@@ -1,6 +1,8 @@
 // parser/fight_results.h
 // utilities for parsing the fight results data
 
+#include "../utils/tcp.h"
+
 // Payload structure:
 // FIGHT_RESULTS_START EntityResults (SEPARATOR_ENTITY EntityResults)* FIGHT_RESULTS_END
 //
@@ -87,11 +89,10 @@ typedef struct {
 // find the first fight results data in stream
 // params:
 //      - stream - stream to find the fight results in
-//      - stream_len - length of the stream
 //      - length - length of the fight results data or -1 if there's no end yet
 // returns:
-//      pointer to the beggining of fight results data or NULL if there's none
-extern char *find_fight_results(char *stream, int stream_len, int *length);
+//      pointer to the beginning of fight results data or NULL if there's none
+extern byte_t *find_fight_results(TCPStream *stream, int *length);
 
 // parse given fight results
 // params:
@@ -99,4 +100,4 @@ extern char *find_fight_results(char *stream, int stream_len, int *length);
 //      - length - length of fight results data
 // returns:
 //      FightResults struct containing parsed data
-extern FightResults parse_fight_results(char *data, int length);
+extern FightResults parse_fight_results(byte_t *data, size_t length);
diff --git a/analyzer/parser/parser.c b/analyzer/parser/parser.c
index b551d8e..7fb155f 100644
--- a/analyzer/parser/parser.c
+++ b/analyzer/parser/parser.c
@@ -2,14 +2,19 @@
 
 #include <stdlib.h>
 
-ParsedData *parse_stream(char *stream, int stream_len, int *parsed_len) {
+ParsedData *parse_stream(TCPStream *stream, size_t *parsed_len, size_t *n_parsed_data) {
     // TODO: Need to do parsing of the entire thing (loop) and return all of the parsed data
-    if (stream_len > 0) {
-        int length;
-        char *start = find_fight_results(stream, stream_len, &length);
-        if (start != NULL) {
-            parse_fight_results(start, length);
-        }
+    int length;
+    byte_t *start = find_fight_results(stream, &length);
+    if (start == NULL) {
+        *parsed_len = stream->len;
+    }
+    else if (length == -1) {
+        *parsed_len = 0;
+    }
+    else {
+        parse_fight_results(start, length);
+        *parsed_len = start - stream->data + length;
     }
     return NULL;
 }
diff --git a/analyzer/parser/parser.h b/analyzer/parser/parser.h
index 18b4b83..088bb5d 100644
--- a/analyzer/parser/parser.h
+++ b/analyzer/parser/parser.h
@@ -3,6 +3,8 @@
 
 #include "fight_results.h"
 
+#include "../utils/tcp.h"
+
 // "generic" type for parsed data
 typedef struct {
     enum { FIGHT_RESULTS } data_type;
@@ -14,8 +16,8 @@ typedef struct {
 // parse a stream of TCP data
 // params:
 //      - stream - the stream to parse
-//      - stream_len - length of the stream to parse
 //      - parsed_len - pointer to inform how much of the stream was parsed (not all if e.g. start of data is there, but the end isn't yet)
+//      - n_parsed_data - pointer to the count of parsed data that was retrieved from the stream
 // returns:
 //      pointer to the array of parsed data
-extern ParsedData *parse_stream(char *stream, int stream_len, int *parsed_len);
+extern ParsedData *parse_stream(TCPStream *stream, size_t *parsed_len, size_t *n_parsed_data);