nabaztag_hack_kit 0.1.0.beta3 → 0.1.0.beta8

data/ext/mtl_linux/src/vm/vnet.c

@@ -0,0 +1,298 @@
+// VLISP Virtual Machine - 2006 - by Sylvain Huet
+// Lowcost IS Powerfull
+#include"vmem.h"
+#include"properties.h"
+
+#ifdef VSIMU
+#include <string.h>
+#include<stdio.h>
+#include<time.h>
+#include "log.h"
+int netstatesimu=1;
+#endif
+#ifdef VREAL
+#include "rt2501usb.h"
+#endif
+#include"vloader.h"
+#include"vnet.h"
+#include"vlog.h"
+#include"vinterp.h"
+int netState()
+{
+#ifdef VSIMU
+    return netstatesimu;
+#endif
+#ifdef VREAL
+    return rt2501_state();
+#endif
+}
+
+int netSend(char* src,int indexsrc,int lentosend,int lensrc,char* macdst,int inddst,int lendst,int speed)
+{
+#ifdef VSIMU
+    my_printf(LOG_SIMUNET, "xxxx netSend\n");
+    return -1;
+#endif
+#ifdef VREAL
+    if (indexsrc<0)
+    {
+        return -1;
+    }
+    if (indexsrc+lentosend>lensrc)
+    {
+        lentosend=lensrc-indexsrc;
+    }
+    if (lentosend<=0)
+    {
+        return -1;
+    }
+    if (inddst<0)
+    {
+        return -1;
+    }
+    if (inddst+6>lendst)
+    {
+        return -1;
+    }
+    return rt2501_send((const unsigned char *)(src+indexsrc),lentosend,(const unsigned char *)(macdst+inddst),speed,1);
+#endif
+}
+
+int netCb(char* src,int lensrc,char* macsrc)
+{
+    VPUSH(PNTTOVAL(VMALLOCSTR(src,lensrc)));
+    VPUSH(PNTTOVAL(VMALLOCSTR(macsrc,6)));
+    VPUSH(VCALLSTACKGET(sys_start,SYS_CBTCP));
+    if (VSTACKGET(0)!=NIL)
+    {
+        interpGo();
+    }
+    else
+    {
+        VPULL();
+        VPULL();
+    }
+    VPULL();
+    return 0;
+}
+
+extern unsigned char rt2501_mac[6];
+
+#ifdef VSIMU
+int htoi2(char* src)
+{
+    char buf[3];
+    buf[0]=src[0];
+    buf[1]=src[1];
+    buf[2]=0;
+    return sysHtoi(buf);
+}
+#endif
+
+char mac[6];
+
+char* netMac()
+{
+#ifdef VSIMU
+    int i;
+    char *p=PropGet("MAC");
+    for(i=0; i<6; i++)
+    {
+        mac[i]=htoi2(&p[i*2]);
+    }
+    return mac;
+//	return "abcdef";
+#endif
+#ifdef VREAL
+    return (char*) rt2501_mac;
+#endif
+}
+
+int netChk(char* src,int indexsrc,int lentosend,int lensrc,unsigned int val)
+{
+    unsigned short* p;
+
+    if (indexsrc<0)
+    {
+        return val;
+    }
+    if (indexsrc+lentosend>lensrc)
+    {
+        lentosend=lensrc-indexsrc;
+    }
+    if (lentosend<=0)
+    {
+        return val;
+    }
+
+    src+=indexsrc;
+    p=(unsigned short*)src;
+
+    val=((val<<8)&0xff00)+((val>>8)&0xff);
+    while(lentosend>1)
+    {
+        val+=*(p++);
+        lentosend-=2;
+    }
+    if (lentosend)
+    {
+        val+=*(unsigned char*)p;
+    }
+
+    val=(val>>16)+(val&0xffff);
+    val=(val>>16)+(val&0xffff);
+    val=((val<<8)&0xff00)+((val>>8)&0xff);
+    return val;
+}
+
+void netSetmode(int mode,char* ssid,int chn)
+{
+#ifdef VSIMU
+    my_printf(LOG_SIMUNET, "xxxx netSetmode %d %s %d\n",mode,ssid,chn);
+    netstatesimu=(mode)?5:4;
+#endif
+#ifdef VREAL
+    rt2501_setmode(mode,ssid,chn);
+#endif
+}
+
+
+int nscan;
+#ifdef VREAL
+void netScan_(struct rt2501_scan_result *scan_result, void *userparam)
+{
+    char buf[256];
+    sprintf(buf,">>> %s %d %d %d %d\n",scan_result->ssid,scan_result->rssi,scan_result->channel,scan_result->rateset,scan_result->encryption);
+    consolestr((UBYTE*)buf);
+    VPUSH(PNTTOVAL(VMALLOCSTR(scan_result->ssid,strlen(scan_result->ssid))));
+    VPUSH(PNTTOVAL(VMALLOCSTR((char*)scan_result->mac,6)));
+    VPUSH(PNTTOVAL(VMALLOCSTR((char*)scan_result->bssid,6)));
+    VPUSH(INTTOVAL(scan_result->rssi));
+    VPUSH(INTTOVAL(scan_result->channel));
+    VPUSH(INTTOVAL(scan_result->rateset));
+    VPUSH(INTTOVAL(scan_result->encryption));
+    VMKTAB(7);
+    nscan++;
+}
+#endif
+
+void netScan(char* ssid)
+{
+    nscan=0;
+#ifdef VSIMU
+    VPUSH(PNTTOVAL(VMALLOCSTR("foo",3)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("xyzxyz",6)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("765432",6)));
+    VPUSH(INTTOVAL(-20));
+    VPUSH(INTTOVAL(11));
+    VPUSH(INTTOVAL(1));
+    VPUSH(INTTOVAL(0));
+    VMKTAB(7);
+    nscan++;
+    VPUSH(PNTTOVAL(VMALLOCSTR("foo",3)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("xyzxyz",6)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("765432",6)));
+    VPUSH(INTTOVAL(-10));
+    VPUSH(INTTOVAL(11));
+    VPUSH(INTTOVAL(1));
+    VPUSH(INTTOVAL(0));
+    VMKTAB(7);
+    nscan++;
+    VPUSH(PNTTOVAL(VMALLOCSTR("zzzz",3)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("xyzxyz",6)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("765432",6)));
+    VPUSH(INTTOVAL(-10));
+    VPUSH(INTTOVAL(11));
+    VPUSH(INTTOVAL(1));
+    VPUSH(INTTOVAL(0));
+    VMKTAB(7);
+    nscan++;
+    VPUSH(PNTTOVAL(VMALLOCSTR("",3)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("xyzxyz",6)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("765432",6)));
+    VPUSH(INTTOVAL(-10));
+    VPUSH(INTTOVAL(11));
+    VPUSH(INTTOVAL(1));
+    VPUSH(INTTOVAL(0));
+    VMKTAB(7);
+    nscan++;
+    VPUSH(PNTTOVAL(VMALLOCSTR("a\"a<a'a  a\\a",strlen("a\"a<a'a  a\\a"))));
+    VPUSH(PNTTOVAL(VMALLOCSTR("xyzxyz",6)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("765432",6)));
+    VPUSH(INTTOVAL(-10));
+    VPUSH(INTTOVAL(11));
+    VPUSH(INTTOVAL(1));
+    VPUSH(INTTOVAL(3));
+    VMKTAB(7);
+    nscan++;
+    VPUSH(PNTTOVAL(VMALLOCSTR("foo",3)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("xyzxyz",6)));
+    VPUSH(PNTTOVAL(VMALLOCSTR("765432",6)));
+    VPUSH(INTTOVAL(-30));
+    VPUSH(INTTOVAL(11));
+    VPUSH(INTTOVAL(1));
+    VPUSH(INTTOVAL(0));
+    VMKTAB(7);
+    nscan++;
+#endif
+#ifdef VREAL
+    rt2501_scan(ssid, netScan_, NULL);
+#endif
+    VPUSH(NIL);
+    while(nscan--)
+    {
+        VMKTAB(2);
+    }
+}
+
+void netAuth(char* ssid,char* mac,char* bssid,int chn,int rate,int authmode,int encrypt,char* key)
+{
+#ifdef VSIMU
+    my_printf(LOG_SIMUNET, "xxxx netAuth %s %d %d %d %d\n",ssid,chn,rate,authmode,encrypt);
+    netstatesimu=4;
+#endif
+#ifdef VREAL
+    rt2501_auth((const char*)ssid,(const unsigned char*)mac,(const unsigned char*)bssid,chn,rate,authmode,encrypt,(const unsigned char*)key);
+#endif
+}
+
+void netSeqAdd(unsigned char* seq,int n)
+{
+    unsigned char res[4];
+    unsigned int val;
+    val=(seq[0]<<24)+(seq[1]<<16)+(seq[2]<<8)+seq[3];
+    val+=n;
+    res[3]=val;
+    val>>=8;
+    res[2]=val;
+    val>>=8;
+    res[1]=val;
+    val>>=8;
+    res[0]=val;
+    VPUSH(PNTTOVAL(VMALLOCSTR((char*)res,4)));
+}
+
+void mypassword_to_pmk(const char *password, char *ssid, int ssidlength, unsigned char *pmk);
+
+void netPmk(char* ssid,char* key,char* buf)
+{
+#ifdef VSIMU
+    my_printf(LOG_SIMUNET, "xxxx netPmk %s %s\n",ssid,key);
+    strcpy(buf,"01234567012345670123456701234567");
+#endif
+#ifdef VREAL
+//      strcpy(buf,"01234567012345670123456701234567");
+    mypassword_to_pmk(key,ssid,strlen(ssid), (unsigned char*)buf);
+#endif
+}
+
+int netRssi()
+{
+#ifdef VSIMU
+    return -20;
+#endif
+#ifdef VREAL
+    return rt2501_rssi_average();
+#endif
+}
+

data/lib/nabaztag_hack_kit/server.rb

@@ -12,16 +12,13 @@ module NabaztagHackKit
     def initialize(opts = {})
       super
       @base_file     = opts.fetch(:base_file, __FILE__)
-      @bytecode_file = opts.fetch(:bytecode_file, public_file('bytecode.bin'))
+      @bytecode_file = opts.fetch(:bytecode_file, public_file('bytecode.bin')).to_s
+      abort("Couldn't find Bytecode file. Pls compile first") unless File.exists?(@bytecode_file)
+      puts "Serving Bytecode from #{@bytecode_file}"
     end
 
     get "/bc.jsp" do
-      if File.exists?(@bytecode_file)
-        logger.info "Serving Bytecode from #{@bytecode_file}"
-        send_file @bytecode_file
-      else
-        status 404
-      end
+      send_file @bytecode_file
     end
 
     get "/" do

data/lib/nabaztag_hack_kit/version.rb

@@ -1,3 +1,3 @@
 module NabaztagHackKit
-  VERSION = "0.1.0.beta3"
+  VERSION = "0.1.0.beta8"
 end

data/lib/nabaztag_hack_kit.rb

@@ -1,4 +1,4 @@
-require "nabaztag_hack_kit/version"
+require 'nabaztag_hack_kit/version'
 
 module NabaztagHackKit
-end
+end

data/nabaztag_hack_kit.gemspec

@@ -6,25 +6,24 @@ Gem::Specification.new do |s|
   s.name        = "nabaztag_hack_kit"
   s.version     = NabaztagHackKit::VERSION
   s.authors     = ["RngTng - Tobias Bielohlawek"]
-  s.email       = ["tobi@soundcloud.com"]
-  s.homepage    = "https://github.com/rngtng/nabaztag_hack_kit"
+  s.email       = ["tobi@rngtng.com"]
+  s.homepage    = "https://github.com/rngtng/NabaztagHackKit"
   s.summary     = %q{Sinatra server to run custom Nabaztag bytecode}
   s.description = %q{Sinatra server api framework to run custom bytecode on Nabaztag v1/v2. Sources + Compiler included (linux only)}
 
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files --recurse-submodules`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.extensions    = ['bytecode/src/mtl/extconf.rb']
+  s.extensions    = ['ext/extconf.rb']
 
-  s.bindir        = 'bytecode/bin'
+  s.bindir        = 'ext/bin'
   s.executables   = ['mtl_comp', 'mtl_simu', 'mtl_merge']
 
   s.require_paths = ["lib"]
 
-  ["sinatra"].each do |gem|
-    s.add_dependency *gem.split(' ')
-  end
+  s.add_dependency 'sinatra', '>= 2.0'
+  s.add_dependency 'rack', '>= 2.0'
 
-  ["rake", "rspec", "rack-test"].each do |gem|
-    s.add_development_dependency *gem.split(' ')
-  end
+  s.add_development_dependency 'rake', '>= 11.2'
+  s.add_development_dependency 'rspec', '>= 3.5'
+  s.add_development_dependency 'rack-test', '>= 0.6'
 end

data/spec/integration/server_spec.rb

@@ -6,14 +6,14 @@ require "rack/test"
 shared_examples_for :successful_route do
   it "returns 200" do
     get route
-    last_response.should be_ok
+    expect(last_response).to be_ok
   end
 end
 
 shared_examples_for :notfound_route do
   it "returns 404" do
     get route
-    last_response.status.should == 404
+    expect(last_response.status).to eq 404
   end
 end
 
@@ -53,7 +53,7 @@ describe NabaztagHackKit::Server do
 
     it "execute callback" do
       get route
-      last_response.body.should == ""
+      expect(last_response.body).to eq ""
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
+require 'bundler/setup'
 require 'rspec'
 
+
 $: << File.expand_path("../../lib", __FILE__)
 
 require "nabaztag_hack_kit"

data/spec/unit/message_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-
 require "nabaztag_hack_kit/message"
 
 describe NabaztagHackKit::Message do
@@ -9,58 +8,53 @@ describe NabaztagHackKit::Message do
   let(:size) { NabaztagHackKit::Message.to_3b(data.size) }
 
   before do
-    NabaztagHackKit::Message.stub!(:full_message).and_return do |data|
-      data
-    end
-
-    NabaztagHackKit::Message.stub!(:pack).and_return do |data|
-      data
-    end
+    allow(NabaztagHackKit::Message).to receive(:full_message) { |data| data }
+    allow(NabaztagHackKit::Message).to receive(:pack) { |data| data }
   end
 
   describe ".build" do
     it "accepts single input" do
-      NabaztagHackKit::Message.build(*[["40"], ["40", "2", "3", "4"]]).should == [[40, 0, 0, 0], [40, 0, 0, 1, 50]]
+      expect(NabaztagHackKit::Message.build(*[["40"], ["40", "2", "3", "4"]])).to eq [[40, 0, 0, 0], [40, 0, 0, 1, 50]]
     end
 
     it "accepts single input" do
-      NabaztagHackKit::Message.build(CMD).should == [[CMD, 0, 0, 0]]
+      expect(NabaztagHackKit::Message.build(CMD)).to eq [[CMD, 0, 0, 0]]
     end
 
     it "accepts flat input" do
-      NabaztagHackKit::Message.build(CMD, *data).should == [[CMD, *size, *data]]
+      expect(NabaztagHackKit::Message.build(CMD, *data)).to eq [[CMD, *size, *data]]
     end
 
     it "accepts array input" do
-      NabaztagHackKit::Message.build([CMD, *data]).should == [[CMD, *size, *data]]
+      expect(NabaztagHackKit::Message.build([CMD, *data])).to eq [[CMD, *size, *data]]
     end
 
     it "accepts multiple array input" do
-      NabaztagHackKit::Message.build([CMD, *data], [CMD1, *data]).should == [[CMD, *size, *data], [CMD1, *size, *data]]
+      expect(NabaztagHackKit::Message.build([CMD, *data], [CMD1, *data])).to eq [[CMD, *size, *data], [CMD1, *size, *data]]
     end
 
     it "accepts hash input" do
-      NabaztagHackKit::Message.build(CMD => data, CMD1 => data).should == [[CMD, *size, *data], [CMD1, *size, *data]]
+      expect(NabaztagHackKit::Message.build(CMD => data, CMD1 => data)).to eq [[CMD, *size, *data], [CMD1, *size, *data]]
     end
 
     context "as string" do
       it "accepts hash input" do
-        NabaztagHackKit::Message.build(CMD.to_s => data.map(&:to_s), CMD1.to_s => data).should == [[CMD, *size, *data], [CMD1, *size, *data]]
+        expect(NabaztagHackKit::Message.build(CMD.to_s => data.map(&:to_s), CMD1.to_s => data)).to eq [[CMD, *size, *data], [CMD1, *size, *data]]
       end
     end
   end
 
   describe ".to_3b" do
     it "accepts zero" do
-      NabaztagHackKit::Message.to_3b(0).should == [0, 0, 0]
+      expect(NabaztagHackKit::Message.to_3b(0)).to eq [0, 0, 0]
     end
 
     it "accepts 2 byte input" do
-      NabaztagHackKit::Message.to_3b(511).should == [0, 1, 255]
+      expect(NabaztagHackKit::Message.to_3b(511)).to eq [0, 1, 255]
     end
 
     it "accepts 3 byte input" do
-      NabaztagHackKit::Message.to_3b(6334239).should == [96, 167, 31]
+      expect(NabaztagHackKit::Message.to_3b(6334239)).to eq [96, 167, 31]
     end
   end
 end

data/spec/unit/server_spec.rb

@@ -14,27 +14,30 @@ describe NabaztagHackKit::Server do
       })
     end
 
-    it "reads from public/bytecode.bin" do
-      pending
-      app.should_receive(:send_file).with("public/bytecode.bin")
-      do_action '/bc.jsp'
+    xit "reads from public/bytecode.bin" do
+      expect(app).to_receive(:send_file).with("public/bytecode.bin")
+      begin
+        do_action '/bc.jsp'
+      rescue SystemExit
+      end
     end
 
     context "with custom bin code route" do
       let(:app) { NabaztagHackKit::Server.new(custom_route) }
       let(:custom_route) { "bytecode.bin" }
 
-      it "reads from" do
-        pending
-        app.should_receive(:send_file).with(custom_route)
-        do_action '/bc.jsp'
+      xit "reads from" do
+        expect(app).to_receive(:send_file).with(custom_route)
+        begin
+          do_action '/bc.jsp'
+        rescue SystemExit
+        end
       end
     end
   end
 
   describe "#on" do
-    it "accepts" do
-      pending
+    xit "accepts" do
     end
   end
 end