mqtt-sn-ruby 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc76cd166972276f880d322760d35adc7720eaa1
-  data.tar.gz: 2b0f87f21f19caf3e896ab35127a8f88d89aa756
+  metadata.gz: b2cf90277e54e38c81138fd1e4f540e9e074e34b
+  data.tar.gz: efffe5bdaaf339a20b16e8cacbf967b6cfafb915
 SHA512:
-  metadata.gz: ab598d395528d9cce9126daf3238562be93decda49a6bb2afc8929262a43132d055927c170fa5be9a650ae9d5262217e17f906ef370a7a6b53a5afcccef9f6bd
-  data.tar.gz: 9ac8e5e7bfb3b9c8c8dcc26df8c6432b176a986f77c022a1b7861eb5ddc1020f0bdc31b34972d15107aefd2edc2b4eae27c18c621c29f6eaa79d424a804dcaa2
+  metadata.gz: 1070a821c0eb64abba5873774a566b90050fd8a9c15381442dca19d14d7d6d6e09c1b91776aaa45a7160f24b1e74296e57afbf5974c2ca34ac9085ad3bf8c1ea
+  data.tar.gz: 55ecc32a4aca8acd05658c466a3303687ca5f19e91d579494f8346a0df90c06dd4bff397e376dfe643234db658317e35be684ed2f1462366f1224c8500a29439

data/lib/mqtt-sn-http.rb

@@ -5,10 +5,15 @@ require "haml"
 require "coffee-script"
 
 def http_server options
+  
   prev_t={}
-  #@http_log=[]
-  ports=Socket.getifaddrs.map { |i| i.addr.ip_address if i.addr.ipv4? }.compact
-  puts "Starting HTTP services at port #{options[:http_port]}, server IPs: #{ports}"
+  ports=['127.0.0.1']
+  if Socket.method_defined? :getifaddrs
+    ports=Socket.getifaddrs.map { |i| i.addr.ip_address if i.addr.ipv4? }.compact
+    puts "Starting HTTP services at port #{options[:http_port]}, server IPs: #{ports}"
+  else
+    puts "Starting HTTP services at port #{options[:http_port]}."
+  end
   if File.directory? './http'
     $http_dir="http/"
   else

data/lib/mqtt-sn-ruby.rb

@@ -136,7 +136,12 @@ class MqttSN
     ip =  IPAddr.new(uri.host).hton + IPAddr.new("0.0.0.0").hton
     s = UDPSocket.new
     s.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, ip)
-    s.setsockopt(:SOL_SOCKET, :SO_REUSEPORT, 1)
+    begin
+      s.setsockopt(:SOL_SOCKET, :SO_REUSEPORT, 1)
+    rescue #on raspian this is needed...
+      puts "WARNING: :SO_REUSEPORT not defined -- guessing it is 15 ;)"
+      s.setsockopt(:SOL_SOCKET, 15, 1)
+    end
     s.bind(Socket::INADDR_ANY, uri.port)
     s
   end
@@ -259,6 +264,7 @@ class MqttSN
           @clients[key]={ip:client_ip, port:client_port, socket: UDPSocket.new, uri: uri, state: :active, counter_send:0, last_send:0 , counter_recv:0, last_recv:0}
           c=@clients[key]
           puts "thread start for #{key}"
+
           @clients[key][:thread]=Thread.new(key) do |my_key|
             while true
               pacc=MqttSN::poll_packet_block(@clients[my_key][:socket]) #if we get data from server destined to our client
@@ -774,7 +780,15 @@ class MqttSN
 
   def self.parse_message r
     m=nil
+    if not r[0]
+      puts "Malformed empty packet #{r}"
+      return {}
+    end
     len=r[0].ord
+    if len!= r.size
+      puts "Malformed packet #{r}"
+      return {}
+    end
     case r[len-1].ord
     when 0x00
       status=:ok
@@ -941,7 +955,7 @@ class MqttSN
           end
           sleep @keepalive
           if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket] #if we are connected...
-            send :ping, timeout: 2,expect: :pong do |status,message|
+            send :ping, timeout: 5,expect: :pong do |status,message|
               if status!=:ok
                 note "Error:#{@id} no pong! -- sending disconnect to app"
                 @state=:disconnected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ari Siitonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies: []
 description: Ruby toolkit for MQTT-SN, compatible with RSMB, command line tools and
   API