1 files changed, 3 insertions, 30 deletions
diff --git a/src/libosfp.h b/src/libosfp.h
index cfc747f..0234175 100644
--- a/src/libosfp.h
+++ b/src/libosfp.h
@@ -1,32 +1,10 @@
 #ifndef __LIBOSFP_H__
 #define __LIBOSFP_H__
 
-typedef enum libosfp_error_code {
-    LIBOSFP_NOERR,
-    LIBOSFP_EINVAL,
-    LIBOSFP_ERR_READ_FILE,
-    LIBOSFP_ERR_PARSE_FILE,
-} libosfp_error_code_t;
-
-typedef enum libosfp_os_class_id {
-    LIBOSFP_OS_CLASS_WINDOWS,
-    LIBOSFP_OS_CLASS_Linux,
-    LIBOSFP_OS_CLASS_MAC_OS,
-    LIBOSFP_OS_CLASS_IOS,
-    LIBOSFP_OS_CLASS_ANDROID,
-    LIBOSFP_OS_CLASS_MAX,
-} libosfp_os_class_id_t;
-
-typedef struct libosfp_score {
-    unsigned int os_class_score[LIBOSFP_OS_CLASS_MAX];
-} libosfp_score_t;
+#include "libosfp_common.h"
 
 typedef struct libosfp_result {
-    enum libosfp_error_code     err;
-    enum libosfp_os_class_id    likely_os_class; // top rated os class
-    unsigned int                likely_score;
-    unsigned int                perfect_score;
-    libosfp_score_t             score;
+    libosfp_score_t score;
 } libosfp_result_t;
 
 typedef struct libosfp_context {
@@ -34,15 +12,10 @@ typedef struct libosfp_context {
     void *score_db;
 } libosfp_context_t;
 
-
-libosfp_os_class_id_t libosfp_os_class_name_to_id(char *name);
-const char *libosfp_os_class_id_to_name(libosfp_os_class_id_t os_class);
-
 int libosfp_result_to_buf(libosfp_result_t *result, char *strbuf, unsigned int buf_len);
-unsigned int libosfp_result_likely_os_class_score_get(libosfp_result_t *result);
 const char *libosfp_result_likely_os_class_name_get(libosfp_result_t *result);
 
-libosfp_error_code_t libosfp_header_match(libosfp_context_t *libosfp_context, unsigned char *ip_hdr, unsigned char *tcp_hdr, libosfp_result_t *result);
+libosfp_error_code_t libosfp_detect(libosfp_context_t *libosfp_context, unsigned int flags, unsigned char *ip_hdr, unsigned char *tcp_hdr, libosfp_result_t *result);
 libosfp_error_code_t libosfp_context_setup(libosfp_context_t *libosfp_context);
 libosfp_context_t *libosfp_context_create(char *fp_file);
 void libosfp_context_destroy(libosfp_context_t *libosfp_context);