update lib files

2013-07-16 12:23:56 +02:00
parent 86f8787e86
commit d4b42d23ca
10 changed files with 192 additions and 225 deletions
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "ether_encap_impl.h"
+#include "ofdm_parse_mac_impl.h"
+
+#include <gnuradio/io_signature.h>
+#include <gnuradio/block_detail.h>
+#include <string>
+
+using namespace gr::ieee802_11;
+
+#define dout d_debug && std::cout
+
+ether_encap_impl::ether_encap_impl(bool debug) :
+		block("ether_encap",
+				gr::io_signature::make(0, 0, 0),
+				gr::io_signature::make(0, 0, 0)),
+		d_debug(debug),
+		d_last_seq(123) {
+
+    message_port_register_out(pmt::mp("out"));
+
+    message_port_register_in(pmt::mp("in"));
+    set_msg_handler(pmt::mp("in"), boost::bind(&ether_encap_impl::parse, this, _1));
+}
+
+void
+ether_encap_impl::parse(pmt::pmt_t msg) {
+
+	if(pmt::is_eof_object(msg)) {
+		message_port_pub(pmt::mp("out"), pmt::PMT_EOF);
+		detail().get()->set_done(true);
+		return;
+	}
+
+	msg = pmt::cdr(msg);
+
+	int data_len = pmt::blob_length(msg);
+	const mac_header *mhdr = reinterpret_cast<const mac_header*>(pmt::blob_data(msg));
+
+	if(d_last_seq == mhdr->seq_control) {
+		dout << "Ether Encap: frame already seen -- skipping" << std::endl;
+		return;
+	}
+
+	d_last_seq = mhdr->seq_control;
+
+	if(data_len < 33) {
+		dout << "Ether Encap: frame too short to parse (<33)" << std::endl;
+		return;
+	}
+
+	ethernet_header *ehdr = reinterpret_cast<ethernet_header*>(buf);
+
+        if(((mhdr->frame_control >> 2) & 3) != 2) {
+		dout << "this is not a data frame -- ignoring" << std::endl;
+		return;
+	}
+
+	memcpy(ehdr->dest, mhdr->addr1, 6);
+	memcpy(ehdr->src, mhdr->addr2, 6);
+	ehdr->type = 0x0008;
+
+	char *frame = (char*)pmt::blob_data(msg);
+
+	// DATA
+	if((((mhdr->frame_control) >> 2) & 63) == 2) {
+		memcpy(buf + sizeof(ethernet_header), frame + 32, data_len - 32);
+		pmt::pmt_t payload = pmt::make_blob(buf, data_len - 32 + 14);
+		message_port_pub(pmt::mp("out"), pmt::cons(pmt::PMT_NIL, payload));
+
+	// QoS Data
+	} else if((((mhdr->frame_control) >> 2) & 63) == 34) {
+
+		memcpy(buf + sizeof(ethernet_header), frame + 34, data_len - 34);
+		pmt::pmt_t payload = pmt::make_blob(buf, data_len - 34 + 14);
+		message_port_pub(pmt::mp("out"), pmt::cons(pmt::PMT_NIL, payload));
+	}
+}
+
+ether_encap::sptr
+ether_encap::make(bool debug) {
+	return gnuradio::get_initial_sptr(new ether_encap_impl(debug));
+}
+