Merge pull request #5 from nprint/organize

lint and re-org / rename for tab completion

Author: Jordan Holland

Makefile.am

@@ -2,16 +2,21 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = pcapml
 
+
 pcapml_SOURCES = include/dir/dir.hpp include/label/label.hpp include/label/labeler.hpp \
-				 include/pcap/pcap_reader.hpp include/pcapng/pcapng_reader.hpp include/pcapng/pcapng_writer.hpp \
-				 include/pcapng/block.hpp include/pcapng/pcapng_sorter.hpp include/sample/sample.hpp \
-				 include/sample/sampler.hpp include/util.hpp include/pcapng/pcapng_splitter.hpp \
-				 include/pcap/pcap_writer.hpp \
+				 include/pcap/reader_pcap.hpp include/pcap/writer_pcap.hpp \
+				 include/pcapng/block_pcapng.hpp include/pcapng/reader_pcapng.hpp \
+				 include/pcapng/sorter_pcapng.hpp include/pcapng/splitter_pcapng.hpp \
+				 include/pcapng/writer_pcapng.hpp \
+				 include/sample/sample.hpp include/sample/sampler.hpp \
+				 include/util.hpp \
 				 src/dir/dir.cpp src/label/label.cpp src/label/labeler.cpp \
-				 src/pcap/pcap_reader.cpp src/pcapng/pcapng_reader.cpp src/pcapng/pcapng_writer.cpp \
-				 src/pcapng/block.cpp src/pcapng/pcapng_sorter.cpp src/sample/sample.cpp \
-				 src/sample/sampler.cpp src/util.cpp src/pcapml.cpp src/pcapng/pcapng_splitter.cpp \
-				 src/pcap/pcap_writer.cpp
+				 src/pcap/reader_pcap.cpp src/pcap/writer_pcap.cpp \
+				 src/pcapng/block_pcapng.cpp src/pcapng/reader_pcapng.cpp \
+				 src/pcapng/sorter_pcapng.cpp src/pcapng/splitter_pcapng.cpp \
+				 src/pcapng/writer_pcapng.cpp \
+				 src/sample/sample.cpp src/sample/sampler.cpp \
+				 src/util.cpp src/pcapml.cpp
 
 AM_CPPFLAGS = -I include/ -I include/dir -I include/pcap/ -I include/pcapng -I include/sample -I include/label -pedantic -Wall -std=gnu++11 $(WRAPPER_CPPFLAGS)
 AM_LDFLAGS = $(WRAPPER_LDFLAGS)

include/dir/dir.hpp

@@ -24,10 +24,9 @@
 #include <string>
 #include <fstream>
 
-
-#include "pcap_reader.hpp"
-#include "pcapng_writer.hpp"
 #include "util.hpp"
+#include "reader_pcap.hpp"
+#include "writer_pcapng.hpp"
 
 class DirLabeler {
  public:

include/label/labeler.hpp

@@ -13,8 +13,8 @@
 
 #include "util.hpp"
 #include "label.hpp"
-#include "pcap_reader.hpp"
-#include "pcapng_writer.hpp"
+#include "reader_pcap.hpp"
+#include "writer_pcapng.hpp"
 
 #define LABEL_FILE_LOC  0
 #define FILTER_LOC 1

include/pcap/pcap_reader.hpp renamed to include/pcap/reader_pcap.hpp

@@ -5,8 +5,8 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#ifndef INCLUDE_PCAP_PCAP_READER_HPP_
-#define INCLUDE_PCAP_PCAP_READER_HPP_
+#ifndef INCLUDE_PCAP_READER_PCAP_HPP_
+#define INCLUDE_PCAP_READER_PCAP_HPP_
 
 #if defined(__NetBSD__)
 #include <net/if_ether.h>
@@ -30,4 +30,4 @@ class PcapReader {
     pcap_t *get_pcap_handle();
 };
 
-#endif  // INCLUDE_PCAP_PCAP_READER_HPP_
+#endif  // INCLUDE_PCAP_READER_PCAP_HPP_

include/pcap/pcap_writer.hpp renamed to include/pcap/writer_pcap.hpp

@@ -5,8 +5,8 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#ifndef INCLUDE_PCAP_WRITER_HPP_
-#define INCLUDE_PCAP_WRITER_HPP_
+#ifndef INCLUDE_PCAP_WRITER_PCAP_HPP_
+#define INCLUDE_PCAP_WRITER_PCAP_HPP_
 
 #if defined(__NetBSD__)
 #include <net/if_ether.h>
@@ -31,4 +31,4 @@ class PcapWriter {
     pcap_t *get_pcap_handle();
 };
 
-#endif  // INCLUDE_PCAP_PCAP_READER_HPP_
+#endif  // INCLUDE_PCAP_WRITER_PCAP_HPP_

include/pcapng/block.hpp renamed to include/pcapng/block_pcapng.hpp

@@ -5,8 +5,8 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#ifndef INCLUDE_PCAPNG_BLOCK_HPP_
-#define INCLUDE_PCAPNG_BLOCK_HPP_
+#ifndef INCLUDE_PCAPNG_BLOCK_PCAPNG_HPP_
+#define INCLUDE_PCAPNG_BLOCK_PCAPNG_HPP_
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -102,4 +102,4 @@ class Block {
 };
 
 
-#endif  // INCLUDE_PCAPNG_BLOCK_HPP_
+#endif  // INCLUDE_PCAPNG_BLOCK_PCAPNG_HPP_

include/pcapng/pcapng_reader.hpp renamed to include/pcapng/reader_pcapng.hpp

@@ -5,8 +5,8 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#ifndef INCLUDE_PCAPNG_PCAPNG_READER_HPP_
-#define INCLUDE_PCAPNG_PCAPNG_READER_HPP_
+#ifndef INCLUDE_PCAPNG_READER_PCAPNG_HPP_
+#define INCLUDE_PCAPNG_READER_PCAPNG_HPP_
 
 #define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
 
@@ -36,7 +36,7 @@
 #include <algorithm>
 
 #include "util.hpp"
-#include "block.hpp"
+#include "block_pcapng.hpp"
 
 class PcapNGReader {
  public:
@@ -70,4 +70,4 @@ class PcapNGReader {
     void read_section_header(Block *b);
 };
 
-#endif  // INCLUDE_PCAPNG_PCAPNG_READER_HPP_
+#endif  // INCLUDE_PCAPNG_READER_PCAPNG_HPP_

include/pcapng/pcapng_sorter.hpp renamed to include/pcapng/sorter_pcapng.hpp

@@ -5,15 +5,15 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#ifndef INCLUDE_PCAPNG_PCAPNG_SORTER_HPP_
-#define INCLUDE_PCAPNG_PCAPNG_SORTER_HPP_
+#ifndef INCLUDE_PCAPNG_SORTER_PCAPNG_HPP_
+#define INCLUDE_PCAPNG_SORTER_PCAPNG_HPP_
 
 #include <vector>
 #include <algorithm>
 
 #include "util.hpp"
-#include "block.hpp"
-#include "pcapng_reader.hpp"
+#include "block_pcapng.hpp"
+#include "reader_pcapng.hpp"
 
 struct PacketSortInfo {
     size_t sid;
@@ -42,4 +42,4 @@ class Sorter : public PcapNGReader {
     std::vector<PacketSortInfo> pkt_blocks;
 };
 
-#endif  // INCLUDE_PCAPNG_PCAPNG_SORTER_HPP_
+#endif  // INCLUDE_PCAPNG_SORTER_PCAPNG_HPP_

include/pcapng/pcapng_splitter.hpp renamed to include/pcapng/splitter_pcapng.hpp

@@ -5,13 +5,15 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#ifndef INCLUDE_PCAPNG_PCAPNG_SPLITTER_HPP_
-#define INCLUDE_PCAPNG_PCAPNG_SPLITTER_HPP_
+#ifndef INCLUDE_PCAPNG_SPLITTER_PCAPNG_HPP_
+#define INCLUDE_PCAPNG_SPLITTER_PCAPNG_HPP_
+
+#include <string>
 
 #include "util.hpp"
-#include "block.hpp"
-#include "pcapng_reader.hpp"
-#include "pcap_writer.hpp"
+#include "writer_pcap.hpp"
+#include "block_pcapng.hpp"
+#include "reader_pcapng.hpp"
 
 class Splitter : public PcapNGReader {
  public:
@@ -23,13 +25,12 @@ class Splitter : public PcapNGReader {
     std::string cur_sid = "";
     std::string cur_metadata = "";
     FILE *mdf = NULL;
-    
+
     FILE *fopen_mkdir(char *path);
     FILE *open_metadata_file(char *path);
     void recursive_mkdir(char *path);
     bool process_idb(Block *b);
     bool process_packet_block(Block *b);
-    bool update_io(std::vector<std::string> &tokens);
 };
 
-#endif  // INCLUDE_PCAPNG_PCAPNG_SPLITTER_HPP_
+#endif  // INCLUDE_PCAPNG_SPLITTER_PCAPNG_HPP_

include/pcapng/pcapng_writer.hpp renamed to include/pcapng/writer_pcapng.hpp

@@ -5,8 +5,8 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#ifndef INCLUDE_PCAPNG_PCAPNG_WRITER_HPP_
-#define INCLUDE_PCAPNG_PCAPNG_WRITER_HPP_
+#ifndef INCLUDE_PCAPNG_WRITER_PCAPNG_HPP_
+#define INCLUDE_PCAPNG_WRITER_PCAPNG_HPP_
 
 #define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
 
@@ -34,7 +34,7 @@
 #include <exception>
 
 #include "util.hpp"
-#include "block.hpp"
+#include "block_pcapng.hpp"
 
 class PcapNGWriter {
  public:
@@ -54,4 +54,4 @@ class PcapNGWriter {
     int pad_packet(int pkt_len);
 };
 
-#endif  // INCLUDE_PCAPNG_PCAPNG_WRITER_HPP_
+#endif  // INCLUDE_PCAPNG_WRITER_PCAPNG_HPP_

include/sample/sampler.hpp

@@ -8,9 +8,9 @@
 #ifndef INCLUDE_SAMPLE_SAMPLER_HPP_
 #define INCLUDE_SAMPLE_SAMPLER_HPP_
 
-#include "block.hpp"
 #include "sample.hpp"
-#include "pcapng_reader.hpp"
+#include "block_pcapng.hpp"
+#include "reader_pcapng.hpp"
 
 class Sampler : public PcapNGReader {
  public:

include/util.hpp

@@ -9,25 +9,24 @@
 #define INCLUDE_UTIL_HPP_
 
 #include <sys/stat.h>
+
 #include <pcap.h>
 
 #include <string>
 #include <vector>
 #include <sstream>
 #include <tuple>
 
-
-#include "block.hpp"
+#include "block_pcapng.hpp"
 
 struct pcap_packet_info {
     struct pcap_pkthdr hdr;
     const uint8_t *buf;
 };
 
-void tokenize_string(std::string s, std::vector<std::string> &to_fill,
-                     char delimiter);
+bool check_file_exists(char *f);
 uint64_t transform_ts(uint32_t low, uint32_t high);
 std::tuple<size_t, std::string> get_info_from_pkt_comment(std::string comment);
-bool check_file_exists(char *f);
+void tokenize_string(std::string s, std::vector<std::string> &to_fill, char delimiter);
 
 #endif  // INCLUDE_UTIL_HPP_

src/pcap/pcap_reader.cpp renamed to src/pcap/reader_pcap.cpp

@@ -5,7 +5,7 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#include "pcap_reader.hpp"
+#include "reader_pcap.hpp"
 
 int PcapReader::open_file(char *infile) {
     char errbuf[PCAP_ERRBUF_SIZE];

src/pcap/pcap_writer.cpp renamed to src/pcap/writer_pcap.cpp

@@ -5,7 +5,7 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#include "pcap_writer.hpp"
+#include "writer_pcap.hpp"
 
 int PcapWriter::open_file(char *outfile) {
     pd = pcap_open_dead(DLT_EN10MB, 65535 /* snaplen */);
@@ -21,5 +21,5 @@ int PcapWriter::write_packet(pcap_pkthdr *hdr, uint8_t *buf) {
 }
 
 void PcapWriter::close_file() {
-    if(pd != NULL) pcap_close(pd);
+    if (pd != NULL) pcap_close(pd);
 }

src/pcapml.cpp

@@ -11,9 +11,9 @@
 
 #include "dir.hpp"
 #include "labeler.hpp"
-#include "pcapng_reader.hpp"
-#include "pcapng_sorter.hpp"
-#include "pcapng_splitter.hpp"
+#include "reader_pcapng.hpp"
+#include "sorter_pcapng.hpp"
+#include "splitter_pcapng.hpp"
 
 const char *argp_program_version = "pcapml 0.0.1";
 const char *argp_program_bug_address = "https://github.com/nprint/pcapml";

src/pcapng/block.cpp renamed to src/pcapng/block_pcapng.cpp

@@ -5,7 +5,7 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#include "block.hpp"
+#include "block_pcapng.hpp"
 
 Block::Block(BlockHeader *bh, uint64_t f_start) {
     this->bh = bh;

src/pcapng/pcapng_reader.cpp renamed to src/pcapng/reader_pcapng.cpp

@@ -5,7 +5,7 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#include "pcapng_reader.hpp"
+#include "reader_pcapng.hpp"
 
 int PcapNGReader::open_pcapng(char *infile) {
     packets_processed = 0;

src/pcapng/pcapng_sorter.cpp renamed to src/pcapng/sorter_pcapng.cpp

@@ -5,7 +5,7 @@
  * of the License at https://www.apache.org/licenses/LICENSE-2.0
  */
 
-#include "pcapng_sorter.hpp"
+#include "sorter_pcapng.hpp"
 
 bool Sorter::process_block(Block *b, void *p) {
     uint32_t block_type;