esp32-open-mac
diff --git a/‎components/80211_mac_rust/80211_mac_interface.c
+15-9 b/‎components/80211_mac_rust/80211_mac_interface.c
+15-9
diff --git a/‎components/80211_mac_rust/include/80211_mac_interface.h
+7-3 b/‎components/80211_mac_rust/include/80211_mac_interface.h
+7-3
diff --git a/‎components/80211_mac_rust/rust_crate/Cargo.lock
+8-101 b/‎components/80211_mac_rust/rust_crate/Cargo.lock
+8-101
diff --git a/‎components/80211_mac_rust/rust_crate/Cargo.toml
+1-1 b/‎components/80211_mac_rust/rust_crate/Cargo.toml
+1-1
@@ -189,29 +189,35 @@ void rs_change_channel(uint8_t channel) {
 	request_channel_change(channel);
 }
 
-void filters_set_scanning_mode();
-void filters_set_client_mode(const uint8_t* bssid);
+void filters_set_scanning_mode(uint8_t interface, const uint8_t* own_mac);
+void filters_set_client_mode(uint8_t interface, const uint8_t* own_mac, const uint8_t* bssid);
+void filters_set_ap_mode(uint8_t interface, const uint8_t* bssid);
 
-void rs_filters_set_scanning() {
-	filters_set_scanning_mode();
+void rs_filters_set_scanning(uint8_t interface, const uint8_t* own_mac) {
+	filters_set_scanning_mode(interface, own_mac);
 }
 
-void rs_filters_set_client_with_bssid(const uint8_t* addr) {
-	filters_set_client_mode(addr);
+void rs_filters_set_client_with_bssid(uint8_t interface, const uint8_t* own_mac, const uint8_t* bssid) {
+	filters_set_client_mode(interface, own_mac, bssid);
+}
+
+void rs_filters_set_ap_mode(uint8_t interface, const uint8_t* addr) {
+	filters_set_ap_mode(interface, addr);
 }
 
 // Called from the C ESP-NETIF stack to request the Rust MAC stack to TX a frame
 // This function does NOT take ownership of the frame, so you're allowed to reuse the buffer directly after this returns
 void c_transmit_data_frame(rs_mac_interface_type_t interface, uint8_t* frame, size_t len) {
 	// TODO make sure we don't flood the stack by sending too much frames
 	// maybe use a counting semaphore?
-	void* queued_buffer = malloc(len);
-	memcpy(queued_buffer, frame, len);
+	uint8_t* queued_buffer = malloc(1 + len);
+	queued_buffer[0] = interface;
+	memcpy(queued_buffer + 1, frame, len);
 
 	rust_mac_event_queue_item_t to_queue = {0};
 	to_queue.event_type = EVENT_TYPE_MAC_TX_DATA_FRAME;
 	to_queue.ptr = queued_buffer;
-	to_queue.len = len;
+	to_queue.len = len + 1;
 	if (xQueueSendToBack(rust_mac_event_queue, &to_queue, 0) != pdTRUE) {
 		rs_recycle_mac_tx_data(queued_buffer);
 	}
 
@@ -16,7 +16,10 @@ typedef struct {
     unsigned rate:5;              /**< PHY rate encoding of the packet. Only valid for non HT(11bg) packet */
     unsigned :1;                  /**< reserved */
     unsigned sig_mode:2;          /**< 0: non HT(11bg) packet; 1: HT(11n) packet; 3: VHT(11ac) packet */
-    unsigned :16;                 /**< reserved */
+    unsigned :8;                  /**< reserved */
+    unsigned :4;
+    unsigned filter_match:2;
+    unsigned :2;
     unsigned mcs:7;               /**< Modulation Coding Scheme. If is HT(11n) packet, shows the modulation, range from 0 to 76(MSC0 ~ MCS76) */
     unsigned cwb:1;               /**< Channel Bandwidth of the packet. 0: 20MHz; 1: 40MHz */
     unsigned :16;                 /**< reserved */
@@ -148,6 +151,7 @@ uint8_t* rs_get_mac_rx_frame(size_t size_required);
 void c_recycle_mac_rx_frame(uint8_t* buffer);
 
 void rs_change_channel(uint8_t channel);
-void rs_filters_set_scanning();
-void rs_filters_set_client_with_bssid(const uint8_t* addr);
+void rs_filters_set_scanning(uint8_t interface, const uint8_t* own_addr);
+void rs_filters_set_client_with_bssid(uint8_t interface, const uint8_t* own_addr, const uint8_t* bssid);
+void rs_filters_set_ap_mode(uint8_t interface, const uint8_t* bssid);
 
@@ -7,7 +7,7 @@ edition = "2021"
 crate-type = ["staticlib"]
 
 [dependencies]
-ieee80211 = { git = "https://github.com/Frostie314159/ieee80211-rs", rev = "66c863cf2768742397e90c01211b31b4285a5e67" }
+ieee80211 = { git = "https://github.com/Frostie314159/ieee80211-rs", rev = "aa4e40084744dd58e42b44cc2a2fccbed87d40c9" }
 esp-println = { version = "0.9.1", features = ["esp32", "uart"], default-features = false }
 llc = { git = "https://github.com/Frostie314159/llc-rs.git", version = "0.1.0" }
 ether-type = { version = "0.1.3" }