fixed includes for cSploitCommon

tux-mind · tux-mind · commit 280e720abb9e · 2015-11-26T13:47:01.000+01:00
diff --git a/cSploitClient/Android.mk b/cSploitClient/Android.mk
@@ -24,7 +24,7 @@ LOCAL_SHARED_LIBRARIES:= cSploitCommon
 LOCAL_LDLIBS:= -llog
 
 LOCAL_C_INCLUDES:= \
-  cSploitCommon/ \
+  cSploitCommon/include \
   cSploitHandlers/
   
 LOCAL_SRC_FILES:= $(wildcard $(LOCAL_PATH)/*.c)
diff --git a/cSploitClient/auth.c b/cSploitClient/auth.c
@@ -19,15 +19,17 @@
 #include <jni.h>
 #include <stddef.h>
 
-#include "control_messages.h"
-#include "message.h"
+#include <csploit/control_messages.h>
+#include <csploit/message.h>
+#include <csploit/control.h>
+#include <csploit/sequence.h>
+#include <csploit/str_array.h>
+
 #include "command.h"
 #include "log.h"
-#include "control.h"
 #include "connection.h"
-#include "sequence.h"
 #include "controller.h"
-#include "str_array.h"
+
 
 #include "auth.h"
 
diff --git a/cSploitClient/auth.h b/cSploitClient/auth.h
@@ -20,7 +20,7 @@
 
 #include <jni.h>
 
-#include "control.h"
+#include <csploit/control.h>
 
 int on_auth_status(message *);
 inline int authenticated(void);
diff --git a/cSploitClient/child.c b/cSploitClient/child.c
@@ -21,7 +21,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include "control_messages.h"
+#include <csploit/control_messages.h>
+
 #include "log.h"
 #include "connection.h"
 
diff --git a/cSploitClient/child.h b/cSploitClient/child.h
@@ -21,9 +21,9 @@
 #include <jni.h>
 #include <arpa/inet.h>
 
-#include "list.h"
-#include "control.h"
-#include "buffer.h"
+#include <csploit/list.h>
+#include <csploit/control.h>
+#include <csploit/buffer.h>
 
 struct handler;
 
diff --git a/cSploitClient/command.c b/cSploitClient/command.c
@@ -19,18 +19,18 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include "message.h"
+#include <csploit/message.h>
+#include <csploit/control_messages.h>
+#include <csploit/sequence.h>
+#include <csploit/str_array.h>
 
 #include "child.h"
 #include "connection.h"
 #include "event.h"
 #include "log.h"
-#include "control_messages.h"
 #include "handler.h"
-#include "sequence.h"
 #include "controller.h"
 #include "auth.h"
-#include "str_array.h"
 
 #include "command.h"
 
diff --git a/cSploitClient/command.h b/cSploitClient/command.h
@@ -18,7 +18,7 @@
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include "message.h"
+#include <csploit/message.h>
 
 int on_command(JNIEnv *, message *);
 int start_blind_command(JNIEnv *, jclass, jstring);
diff --git a/cSploitClient/connection.c b/cSploitClient/connection.c
@@ -26,8 +26,9 @@
 #include <unistd.h>
 #include <pthread.h>
 
+#include <csploit/control.h>
+
 #include "log.h"
-#include "control.h"
 #include "reader.h"
 #include "notifier.h"
 #include "handler.h"
diff --git a/cSploitClient/controller.c b/cSploitClient/controller.c
@@ -18,15 +18,16 @@
 #include <pthread.h>
 #include <jni.h>
 
+#include <csploit/message.h>
+#include <csploit/control_messages.h>
+#include <csploit/sequence.h>
+
 #include "log.h"
 #include "controller.h"
 #include "connection.h"
 #include "command.h"
 #include "auth.h"
 #include "handler.h"
-#include "message.h"
-#include "control_messages.h"
-#include "sequence.h"
 
 pthread_mutex_t ctrl_seq_lock = PTHREAD_MUTEX_INITIALIZER;
 uint16_t ctrl_seq = 0;
diff --git a/cSploitClient/event.c b/cSploitClient/event.c
@@ -21,10 +21,11 @@
 #include <errno.h>
 #include <string.h>
 
+#include <csploit/str_array.h>
+
 #include "log.h"
 #include "cache.h"
 #include "child.h"
-#include "str_array.h"
 
 #include "nmap.h"
 #include "hydra.h"
diff --git a/cSploitClient/event.h b/cSploitClient/event.h
@@ -20,7 +20,7 @@
 #define EVENT_H
 
 #include <jni.h>
-#include "message.h"
+#include <csploit/message.h>
 
 
 jobject create_newline_event(JNIEnv *, void *);
diff --git a/cSploitClient/fini.c b/cSploitClient/fini.c
@@ -16,7 +16,8 @@
  * 
  */
 
-#include "control.h"
+#include <csploit/control.h>
+
 #include "cache.h"
 #include "child.h"
 #include "reader.h"
diff --git a/cSploitClient/handler.c b/cSploitClient/handler.c
@@ -20,12 +20,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include "control_messages.h"
+#include <csploit/control_messages.h>
+#include <csploit/list.h>
+#include <csploit/control.h>
+#include <csploit/message.h>
+#include <csploit/sequence.h>
+
 #include "controller.h"
-#include "list.h"
-#include "control.h"
-#include "message.h"
-#include "sequence.h"
 #include "log.h"
 #include "connection.h"
 #include "auth.h"
diff --git a/cSploitClient/handler.h b/cSploitClient/handler.h
@@ -21,8 +21,8 @@
 #include <stdint.h>
 #include <jni.h>
 
-#include "list.h"
-#include "control.h"
+#include <csploit/list.h>
+#include <csploit/control.h>
 
 typedef struct handler {
   node *next;
diff --git a/cSploitClient/init.c b/cSploitClient/init.c
@@ -26,6 +26,9 @@
 #include <sys/types.h>
 #include <signal.h>
 
+#include <csploit/msgqueue.h>
+#include <csploit/logger.h>
+
 #include "log.h"
 #include "init.h"
 #include "cache.h"
@@ -35,9 +38,7 @@
 #include "controller.h"
 #include "reader.h"
 #include "child.h"
-#include "msgqueue.h"
 #include "auth.h"
-#include "logger.h"
 #include "fini.h"
 #include "crash.h"
 
diff --git a/cSploitClient/log.c b/cSploitClient/log.c
@@ -19,8 +19,9 @@
 #include <android/log.h>
 #include <pthread.h>
 
+#include <csploit/logger.h>
+
 #include "log.h"
-#include "logger.h"
 
 void android_logger(int level, char *fmt, ...) {
   va_list argptr;
diff --git a/cSploitClient/log.h b/cSploitClient/log.h
@@ -21,7 +21,7 @@
 
 #include <android/log.h>
 
-#include "message.h"
+#include <csploit/message.h>
 
 #define LOG_TAG "cSploitClient"
 
diff --git a/cSploitClient/notifier.c b/cSploitClient/notifier.c
@@ -21,7 +21,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include "buffer.h"
+#include <csploit/buffer.h>
+#include <csploit/control_messages.h>
 
 #include "log.h"
 #include "reader.h"
@@ -30,7 +31,6 @@
 #include "controller.h"
 #include "cache.h"
 #include "handler.h"
-#include "control_messages.h"
 
 #include "nmap.h"
 #include "ettercap.h"
diff --git a/cSploitClient/reader.c b/cSploitClient/reader.c
@@ -23,8 +23,9 @@
 
 #include "log.h"
 
-#include "message.h"
-#include "msgqueue.h"
+#include <csploit/message.h>
+#include <csploit/msgqueue.h>
+
 #include "connection.h"
 
 #include "reader.h"
diff --git a/cSploitClient/reader.h b/cSploitClient/reader.h
@@ -20,7 +20,7 @@
 #ifndef READER_H
 #define READER_H
 
-#include "msgqueue.h"
+#include <csploit/msgqueue.h>
 
 int start_reader(void);
 void stop_reader(void);
diff --git a/cSploitCommon b/cSploitCommon
@@ -1 +1 @@
-Subproject commit fa25a06c19812d7eeb0b984c6e52679a954dba24
+Subproject commit 0dc1487c6f1f1c296305b9aa5398331154c33d39
diff --git a/cSploitDaemon b/cSploitDaemon
@@ -1 +1 @@
-Subproject commit 6fed0359fa7cee58cccc0ce6dd568087e0ac0e86
+Subproject commit f66a089e62f18b5d5883188eda39e471f00427e9
diff --git a/cSploitHandlers/Android.mk b/cSploitHandlers/Android.mk
@@ -28,7 +28,7 @@ LOCAL_CFLAGS:= -Wall -Werror
 LOCAL_ALLOW_UNDEFINED_SYMBOLS:= true
 
 LOCAL_C_INCLUDES:= \
-  cSploitCommon/ \
+  cSploitCommon/include \
   cSploitDaemon/
 
 LOCAL_SRC_FILES:= $1.c
diff --git a/cSploitHandlers/arpspoof.c b/cSploitHandlers/arpspoof.c
@@ -18,10 +18,12 @@
 #include <string.h>
 #include <regex.h>
 
+#include <csploit/message.h>
+#include <csploit/logger.h>
+
 #include "handler.h"
-#include "logger.h"
 #include "arpspoof.h"
-#include "message.h"
+
 
 handler handler_info = {
   NULL,                       // next
diff --git a/cSploitHandlers/ettercap.c b/cSploitHandlers/ettercap.c
@@ -24,11 +24,12 @@
 #include <stdlib.h>
 #include <stddef.h>
 
+#include <csploit/logger.h>
+#include <csploit/message.h>
+#include <csploit/str_array.h>
+
 #include "handler.h"
-#include "logger.h"
 #include "ettercap.h"
-#include "message.h"
-#include "str_array.h"
 #include "common_regex.h"
 
 handler handler_info = {
diff --git a/cSploitHandlers/fusemounts.c b/cSploitHandlers/fusemounts.c
@@ -18,11 +18,12 @@
 #include <string.h>
 #include <regex.h>
 
+#include <csploit/message.h>
+#include <csploit/str_array.h>
+#include <csploit/logger.h>
+
 #include "handler.h"
-#include "logger.h"
 #include "fusemounts.h"
-#include "message.h"
-#include "str_array.h"
 
 handler handler_info = {
   NULL,                           // next
diff --git a/cSploitHandlers/hydra.c b/cSploitHandlers/hydra.c
@@ -25,11 +25,12 @@
 #include <stddef.h>
 #include <math.h>
 
+#include <csploit/message.h>
+#include <csploit/str_array.h>
+#include <csploit/logger.h>
+
 #include "handler.h"
-#include "logger.h"
 #include "hydra.h"
-#include "message.h"
-#include "str_array.h"
 
 handler handler_info = {
   NULL,                   // next
diff --git a/cSploitHandlers/msfrpcd.c b/cSploitHandlers/msfrpcd.c
@@ -16,10 +16,11 @@
  */
 #include <string.h>
 
+#include <csploit/message.h>
+#include <csploit/logger.h>
+
 #include "handler.h"
-#include "logger.h"
 #include "msfrpcd.h"
-#include "message.h"
 
 handler handler_info = {
   NULL,                       // next
diff --git a/cSploitHandlers/network-radar.c b/cSploitHandlers/network-radar.c
@@ -20,11 +20,12 @@
 #include <stdio.h>
 #include <arpa/inet.h>
 
+#include <csploit/logger.h>
+#include <csploit/message.h>
+#include <csploit/str_array.h>
+
 #include "handler.h"
-#include "logger.h"
 #include "network-radar.h"
-#include "message.h"
-#include "str_array.h"
 
 handler handler_info = {
   NULL,                                     // next
diff --git a/cSploitHandlers/nmap.c b/cSploitHandlers/nmap.c
@@ -24,11 +24,12 @@
 #include <stdlib.h>
 #include <stddef.h>
 
+#include <csploit/logger.h>
+#include <csploit/message.h>
+#include <csploit/str_array.h>
+
 #include "handler.h"
-#include "logger.h"
 #include "nmap.h"
-#include "message.h"
-#include "str_array.h"
 #include "common_regex.h"
 
 handler handler_info = {
diff --git a/cSploitHandlers/tcpdump.c b/cSploitHandlers/tcpdump.c
diff --git a/network-radar b/network-radar
