storage: move storage files to a new dir

CMakeLists.txt

@@ -41,6 +41,8 @@ set(SOURCES
         src/capture/capture.c
         src/capture/capture_pcap.c
         src/capture/capture_txt.c
+        src/glib/gasyncqueuesource.c
+        src/glib/glib-extra.c
         src/ncurses/manager.c
         src/ncurses/windows/call_flow_win.c
         src/ncurses/windows/call_list_win.c
@@ -56,19 +58,17 @@ set(SOURCES
         src/ncurses/dialog.c
         src/ncurses/keybinding.c
         src/ncurses/scrollbar.c
-        src/glib/gasyncqueuesource.c
-        src/filter.c
-        src/group.c
-        src/main.c
-        src/stream.c
+        src/storage/filter.c
+        src/storage/group.c
+        src/storage/stream.c
+        src/storage/attribute.c
+        src/storage/storage.c
+        src/storage/call.c
+        src/storage/message.c
+        src/storage/timeval.c
         src/setting.c
-        src/attribute.c
-        src/storage.c
-        src/call.c
-        src/message.c
-        src/timeval.c
-        src/glib/glib-extra.c
-        )
+        src/main.c
+)
 
 ######################################################################
 # HEP  Support

src/capture/capture.c

@@ -31,7 +31,7 @@
 #include <glib.h>
 #include "glib/gasyncqueuesource.h"
 #include "setting.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "capture.h"
 
 static CaptureManager *manager = NULL;

src/capture/capture_hep.c

@@ -48,7 +48,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib-unix.h>
-#include "timeval.h"
+#include "storage/timeval.h"
 #include "setting.h"
 #include "glib/glib-extra.h"
 #include "capture/dissectors/packet_hep.h"

src/capture/capture_pcap.c

@@ -41,10 +41,10 @@
 #include "capture_hep.h"
 #include "capture_pcap.h"
 #include "capture/dissectors/packet_link.h"
-#include "storage.h"
-#include "stream.h"
+#include "storage/storage.h"
+#include "storage/stream.h"
 #include "setting.h"
-#include "timeval.h"
+#include "storage/timeval.h"
 
 GQuark
 capture_pcap_error_quark()

src/capture/capture_txt.c

@@ -32,7 +32,7 @@
 #include <glib.h>
 #include <errno.h>
 #include <stdio.h>
-#include "timeval.h"
+#include "storage/timeval.h"
 #include "packet.h"
 #include "capture/dissectors/packet_sip.h"
 #include "capture/capture_txt.h"

src/capture/dissectors/packet_rtcp.c

@@ -29,7 +29,7 @@
 #include "config.h"
 #include <glib.h>
 #include "glib/glib-extra.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "capture/parser.h"
 #include "capture/packet.h"
 #include "packet_ip.h"

src/capture/dissectors/packet_rtp.c

@@ -32,7 +32,7 @@
 #include "config.h"
 #include <glib.h>
 #include "glib/glib-extra.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "capture/parser.h"
 #include "capture/packet.h"
 #include "packet_ip.h"

src/capture/dissectors/packet_sip.c

@@ -29,7 +29,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include "glib/glib-extra.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "capture/packet.h"
 #include "packet_tcp.h"
 #include "packet_sdp.h"

src/ncurses/manager.h

@@ -40,8 +40,8 @@
 #include "ncurses/window.h"
 #include "ncurses/theme.h"
 #include "ncurses/keybinding.h"
-#include "storage.h"
-#include "group.h"
+#include "storage/storage.h"
+#include "storage/group.h"
 #include "setting.h"
 
 //! Refresh UI every 200 ms

src/ncurses/windows/auth_validate_win.h

@@ -35,7 +35,7 @@
 
 #include "config.h"
 #include <form.h>
-#include "group.h"
+#include "storage/group.h"
 #include "ncurses/manager.h"
 
 /**

src/ncurses/windows/call_flow_win.h

@@ -58,7 +58,7 @@
 #include <glib.h>
 #include "ncurses/manager.h"
 #include "ncurses/scrollbar.h"
-#include "group.h"
+#include "storage/group.h"
 
 //! Configurable some day
 #define CF_COLUMN_WIDTH 30

src/ncurses/windows/call_list_win.c

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include "glib/glib-extra.h"
 #include "setting.h"
-#include "filter.h"
+#include "storage/filter.h"
 #ifdef USE_HEP
 #include "capture/capture_hep.h"
 #endif

src/ncurses/windows/call_raw_win.h

@@ -33,8 +33,8 @@
 #define __SNGREP_CALL_RAW_WIN_H
 
 #include "config.h"
-#include "group.h"
-#include "message.h"
+#include "storage/group.h"
+#include "storage/message.h"
 #include "ncurses/manager.h"
 
 //! Sorter declaration of struct call_raw_info

src/ncurses/windows/column_select_win.h

@@ -34,7 +34,7 @@
 #include <form.h>
 #include "ncurses/manager.h"
 #include "ncurses/scrollbar.h"
-#include "attribute.h"
+#include "storage/attribute.h"
 
 /**
  * @brief Enum of available fields

src/ncurses/windows/filter_win.c

@@ -34,8 +34,8 @@
 #include "ncurses/manager.h"
 #include "filter_win.h"
 #include "call_list_win.h"
-#include "storage.h"
-#include "filter.h"
+#include "storage/storage.h"
+#include "storage/filter.h"
 #include "setting.h"
 
 /**

src/ncurses/windows/rtp_player_win.h

@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <pulse/pulseaudio.h>
 #include "ncurses/manager.h"
-#include "stream.h"
+#include "storage/stream.h"
 
 typedef struct _RtpPlayerInfo RtpPlayerInfo;
 

src/ncurses/windows/save_win.c

@@ -41,7 +41,7 @@
 #include "capture/codecs/codec_g711a.h"
 #include "glib/glib-extra.h"
 #include "setting.h"
-#include "filter.h"
+#include "storage/filter.h"
 #include "capture/capture_txt.h"
 #include "ncurses/dialog.h"
 #include "ncurses/windows/save_win.h"

src/ncurses/windows/save_win.h

@@ -35,7 +35,7 @@
 
 #include "config.h"
 #include <form.h>
-#include "group.h"
+#include "storage/group.h"
 #include "ncurses/manager.h"
 
 /**

src/ncurses/windows/stats_win.c

@@ -56,7 +56,7 @@
 #include "config.h"
 #include <glib.h>
 #include "glib/glib-extra.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "capture/dissectors/packet_sip.h"
 #include "stats_win.h"
 

src/setting.c

@@ -34,7 +34,7 @@
 #include "ncurses/keybinding.h"
 #include "glib/glib-extra.h"
 #include "setting.h"
-#include "timeval.h"
+#include "storage/timeval.h"
 
 /**
  * @brief Storage settings

src/setting.h

@@ -43,7 +43,7 @@
 #define __SNGREP_SETTING_H
 
 #include <glib.h>
-#include "attribute.h"
+#include "storage/attribute.h"
 
 //! Max setting value
 #define SETTING_MAX_LEN   1024

src/storage/call.c

@@ -33,7 +33,7 @@
 #include "glib/glib-extra.h"
 #include "call.h"
 #include "capture/dissectors/packet_sip.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "setting.h"
 
 Call *

src/storage/call.h

@@ -32,7 +32,7 @@
 #include <glib.h>
 #include "stream.h"
 #include "message.h"
-#include "attribute.h"
+#include "storage/attribute.h"
 
 //! Shorter declaration of sip_call structure
 typedef struct _Call Call;

src/storage/filter.c

@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <stdlib.h>
 #include "glib/glib-extra.h"
-#include "storage.h"
+#include "storage/storage.h"
 #include "ncurses/windows/call_list_win.h"
 #include "filter.h"
 

src/storage/filter.h

@@ -41,7 +41,7 @@
 #define __SNGREP_FILTER_H
 
 #include <glib.h>
-#include "storage.h"
+#include "storage/storage.h"
 
 //! Shorter declaration of sip_call_group structure
 typedef struct _Filter Filter;

src/storage/group.h

@@ -34,7 +34,7 @@
 #define __SNGREP_GROUP_H_
 
 #include <glib.h>
-#include "storage.h"
+#include "storage/storage.h"
 
 //! Shorter declaration of sip_call_group structure
 typedef struct _SipCallGroup CallGroup;

src/storage/message.c

@@ -34,7 +34,7 @@
 #include "message.h"
 #include "capture/dissectors/packet_sip.h"
 #include "capture/dissectors/packet_sdp.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 Message *
 msg_new(Packet *packet)

src/storage/message.h

@@ -32,7 +32,7 @@
 #include <glib.h>
 #include "capture/dissectors/packet_sdp.h"
 #include "capture/packet.h"
-#include "attribute.h"
+#include "storage/attribute.h"
 #include "timeval.h"
 
 //! Get IP Address info from message's packet

src/storage/stream.c

@@ -33,7 +33,7 @@
 #include <glib/gprintf.h>
 #include "glib/glib-extra.h"
 #include "stream.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 Stream *
 stream_new(enum StreamType type, Message *msg, PacketSdpMedia *media)

src/storage/stream.h

@@ -30,7 +30,7 @@
 #define __SNGREP_STREAM_H
 
 #include "config.h"
-#include "message.h"
+#include "storage/message.h"
 #include "capture/capture_pcap.h"
 #include "capture/dissectors/packet_sdp.h"
 #include "capture/dissectors/packet_rtp.h"