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, 20 insertions, 4 deletions

diff --git a/wifi-triangulator.proto b/wifi-triangulator.proto
index 959a370..accd829 100644
--- a/wifi-triangulator.proto
+++ b/wifi-triangulator.proto
@@ -2,7 +2,12 @@ syntax = "proto3";
 
 package wifi_triangulator.pb;
 
-enum packet_type {
+message listener_station_info {
+  fixed64 mac = 1;
+  int64 freq = 2;
+}
+
+enum frame_type {
   unknown = 0;
   probe_request = 1;
   beacon = 2;
@@ -20,13 +25,24 @@ enum packet_type {
 message probe {
   sint32 rssi = 1;
   fixed64 src = 2;
-  fixed64 dst = 3;
+}
+
+message frame {
+  frame_type type = 3;
+  probe probe = 20;
+}
+
+enum letter_type {
+  unknown_lt = 0;
+  listener_station_info_lt = 1;
+  frame_lt = 2;
 }
 
 message envelope {
   sfixed64 time_s = 1;
   sfixed64 time_us = 2;
 
-  packet_type type = 3;
-  probe probe = 20;
+  letter_type type = 3;
+  listener_station_info listener_station_info = 20;
+  frame frame = 21;
 }