o Cleaning up code, fixing many small bugs.HEADmaster

o Making a better envelope format.
o Reading out the interface's channel.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/misc.cpp b/src/misc.cpp
index ffe174f..cd45013 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -1,33 +1,33 @@
 #include "wifi-triangulator/core.h"
 
 namespace std {
-string to_string(wifi_triangulator::pb::packet_type t) {
-    using wifi_triangulator::pb::packet_type;
+string to_string(wifi_triangulator::pb::frame_type t) {
+    using wifi_triangulator::pb::frame_type;
 
     switch (t) {
-        case packet_type::probe_request:
+        case frame_type::probe_request:
             return "probe request";
-        case packet_type::beacon:
+        case frame_type::beacon:
             return "beacon";
-        case packet_type::probe_response:
+        case frame_type::probe_response:
             return "probe response";
-        case packet_type::null:
+        case frame_type::null:
             return "null";
-        case packet_type::ack:
+        case frame_type::ack:
             return "ack";
-        case packet_type::data:
+        case frame_type::data:
             return "data";
-        case packet_type::cts:
+        case frame_type::cts:
             return "cts";
-        case packet_type::rts:
+        case frame_type::rts:
             return "rts";
-        case packet_type::cf_end:
+        case frame_type::cf_end:
             return "cf-end";
-        case packet_type::cf_end_cf_ack:
+        case frame_type::cf_end_cf_ack:
             return "cf-end+cf-ack";
-        case packet_type::ps_poll:
+        case frame_type::ps_poll:
             return "ps-poll";
-        case packet_type::unknown:
+        case frame_type::unknown:
         default:
             return "unknown";
     }