Skip to content

Commit

Permalink
* Added capability to apply buffer filters to large UDP packets (>64K…
Browse files Browse the repository at this point in the history
…B datagram boundary) (#126)

* Extended Udp transport to deal with FragmentHeader properly
* Still needs to be cleaned up quite a bit
  * Have not analyzed all possible attack surfaces
* Updated network_profiler to include lz4 and ssl options
* Updated test_fragmentation to include ssl fragmentation
* Updated karl with some of the help options it should print out (not done)
* Lots of small improvements throughout the transport layer
  • Loading branch information
jredmondson committed Oct 15, 2018
1 parent 5fa33b7 commit f16663a
Show file tree
Hide file tree
Showing 16 changed files with 1,031 additions and 330 deletions.
4 changes: 2 additions & 2 deletions Tests.mpc
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ project (Test_Counter) : using_madara, no_karl, no_xml, null_lock, using_simtime
}
}

project (Test_Fragmentation) : using_madara, no_karl, no_xml, null_lock, using_simtime {
project (Test_Fragmentation) : using_madara, no_karl, no_xml, null_lock, using_simtime, using_ssl {
exeout = $(MADARA_ROOT)/bin
exename = test_fragmentation

Expand Down Expand Up @@ -539,7 +539,7 @@ project (Network_Counter_Filter) : using_madara, no_karl, no_xml, null_lock, usi
}
}

project (Network_Profiler) : using_madara, no_karl, no_xml, null_lock, using_simtime {
project (Network_Profiler) : using_madara, no_karl, no_xml, null_lock, using_simtime, using_ssl, using_lz4 {
exeout = $(MADARA_ROOT)/bin
exename = network_profiler

Expand Down
6 changes: 3 additions & 3 deletions include/madara/filters/BufferFilterHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ class MADARA_EXPORT BufferFilterHeader
/**
* the size of this header plus the updates
**/
uint64_t size;
uint64_t size = 0;

/**
* filter id
**/
char id[8];
char id[8] = {'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'};

/**
* filter version
**/
uint32_t version;
uint32_t version = 0;
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/madara/knowledge/CheckpointSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ class CheckpointSettings
{
madara_logger_ptr_log(logger::global_logger.get(), logger::LOG_ERROR,
"CheckpointSettings::decode: buffer filter %s doesn't match."
" Returning 0.",
" Returning 0.\n",
header.id);

return 0;
Expand Down

0 comments on commit f16663a

Please sign in to comment.