Merge pull request #350 from network-intelligence/stun-stats

adding stun to stats output

Author: davidmcgrew

src/libmerc/buffer_stream.h

@@ -1176,6 +1176,13 @@ class output_buffer : public buffer_stream {
         return buffer;
     }
 
+    std::pair<const uint8_t *, const uint8_t *> get_datum() const {
+        if (trunc) {
+            return { nullptr, nullptr };
+        }
+        return { (uint8_t *)buffer, (uint8_t *)buffer + doff };
+    }
+
 };
 
 #endif /* BUFFER_STREAM_H */

src/libmerc/pkt_proc.cc

@@ -228,6 +228,13 @@ struct do_observation {
         analysis_.reset_user_agent();
     }
 
+    void operator()(stun::message &m) {
+        // create event and send it to the data/stats aggregator
+        event_string ev_str{k_, analysis_, m};
+        mq_->push(ev_str.construct_event_string());
+        analysis_.reset_user_agent();
+    }
+
     template <typename T>
     void operator()(T &) { }
 

src/libmerc/stun.h

@@ -10,6 +10,8 @@
 #include "utf8.hpp"
 #include "match.h"
 #include "fingerprint.h"
+#include "result.h"
+#include "util_obj.h"
 #include <unordered_map>
 
 namespace stun {
@@ -471,6 +473,8 @@ namespace stun {
 
         uint16_t get_type() const { return type; }
 
+        datum get_value() const { return value; }
+
     };
 
 
@@ -772,6 +776,7 @@ namespace stun {
     class message : public base_protocol {
         header hdr;
         datum body;
+        datum software;
 
     public:
 
@@ -959,6 +964,13 @@ namespace stun {
                     } else {
                         ;  // by default, attribute information is not included in fingerprint
                     }
+
+                    // remember SOFTWARE for later use in analysis
+                    //
+                    if (attr.value.get_type() == attr_type::SOFTWARE) {
+                        software = attr.value.get_value();
+                    }
+
                 } else {
                     break;
                 }
@@ -970,10 +982,33 @@ namespace stun {
         // analyzes the dst_ip, dst_port, and SOFTWARE attribute
         // value, using a classifier selected by the stun fingerprint
         //
-        bool do_analysis(const struct key &, struct analysis_context &, classifier*) {
+        // request format: dst_addr, dst_port
+        // response format: src_addr, src_port
+
+        bool do_analysis(const struct key &flow_key, struct analysis_context &ac, classifier*) {
+
+            // create a json-friendly utf8 copy of the SOFTWARE atribute's value field
             //
-            // TBD
+            utf8_safe_string<MAX_USER_AGENT_LEN> utf8_software{software};
+
+            // handle message classes appropriately: reverse the
+            // addresses and ports in the flow key for responses,
+            // leave the flow key untouched for requests, and ignore
+            // all other message classes
             //
+            key k{flow_key};
+            if ((hdr.get_message_class() & 0b10) == 0b10) {
+                //
+                // success_resp and error_resp: swap addrs and ports
+                //
+                k.reverse();
+            }
+            ac.destination.init({nullptr,nullptr},         // domain name
+                                utf8_software.get_datum(), // user agent
+                                {nullptr,nullptr},         // alpn
+                                k                          // flow key, used for dst_addr and dst_port
+                                );
+
             return false;
         }
 

src/libmerc/utf8.hpp

@@ -960,6 +960,10 @@ class utf8_safe_string {
         return buf.get_buffer_start();
     }
 
+    datum get_datum() const {
+        return buf.get_datum();
+    }
+
     /// performs unit tests for \ref class utf8_safe_string and
     /// returns `true` if they all pass, and `false` otherwise
     ///

src/libmerc/util_obj.h

@@ -177,6 +177,20 @@ struct key {
         snprintf(src_port_string, MAX_PORT_STR_LEN, "%u", src_port);
     }
 
+    void reverse() {
+        std::swap(src_port, dst_port);
+        switch (ip_vers) {
+        case 4:
+            std::swap(addr.ipv4.src, addr.ipv4.dst);
+            break;
+        case 6:
+            std::swap(addr.ipv6.src, addr.ipv6.dst);
+            break;
+        default:
+            ;
+        }
+    }
+
 };
 
 struct eth_addr : public datum {