mqtt-sn-ruby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad9bc3bc78a80dccac6baba83cb3e634c13e3a9
-  data.tar.gz: 989fdd5fdd51f43bb291740e44368ac411db83d5
+  metadata.gz: e34953b26fefce4f5e92f3d3b5ce9761fedac071
+  data.tar.gz: 97786a47fa00c49c902edc99fc30072aa00fbc03
 SHA512:
-  metadata.gz: cf0299e126aa60c1614be436eac864c2d52519ae07efa38601e41f23b240bb48d99593ccf4e5835b19f5fa5e20467908e6bf91031e62c6d7605abd169f22c149
-  data.tar.gz: ace1150d210c367fefe9a25a71d2d62996b897039c00a48a21edaf804e0d720a9ca7d2c66ad4b0fac0d51e602707dff82dfbaa7476251ec10fba288fce1d552b
+  metadata.gz: 4e459aca2a8410edadf97935beec968a7fc59c9a9ee0275b05122a71d2c3ffbbf3e5db328528d1ce43c530d85df1f7b3777ee9051f85fae0fb83d8e52a595180
+  data.tar.gz: 934ebee4d63c118429b5b257d2698efd36761eb7a6cff7675b4b360bfd8a8b36e3e241b4ceae8b16bf8bb2df87faa8e30ed97d8119d89bf77b2c5adba31fc944

data/bin/mqtt-sn-forwarder.rb

@@ -22,17 +22,23 @@ OptionParser.new do |opts|
   opts.on("-d", "--[no-]debug", "Produce Debug dump on console (false)") do |v|
     options[:debug] = v
   end
-  opts.on("-h", "--host host", "MQTT-SN Host to connect (localhost)") do |v|
+  opts.on("-h", "--host host", "MQTT-SN target Host to connect (localhost)") do |v|
     options[:server] = v
   end
-  opts.on("-p", "--port port", "MQTT-SN Port to connect (1883)") do |v|
+  opts.on("-p", "--port port", "MQTT-SN target Port to connect (1883)") do |v|
     options[:port] = v.to_i
   end
+  opts.on("-i", "--localip ip", "MQTT-SN Local ip to bind (127.0.0.1)") do |v|
+    options[:local_ip] = v
+  end
+  opts.on("-l", "--localport port", "MQTT-SN local port to listen (1882)") do |v|
+    options[:local_port] = v.to_i
+  end
 end.parse!
 
 puts "MQTT-SN-FORWARDER: #{options.to_json}"
 begin
-  MqttSN.forwarder "20.20.20.21",3333,options
+  MqttSN.forwarder options
 rescue SystemExit, Interrupt
   puts "\nExiting after Disconnect\n"
 rescue => e

data/lib/mqtt-sn-ruby.rb

@@ -256,7 +256,7 @@ class MqttSN
 
   end
 
-  def self.forwarder listen_ip,listen_port,hash={}
+  def self.forwarder hash={}
     @options=hash #save these
     @server=hash[:server]||"127.0.0.1"
     @port=hash[:port]||1883
@@ -264,8 +264,7 @@ class MqttSN
     @verbose=hash[:verbose]
 
     socket = UDPSocket.new
-    socket.bind(listen_ip,listen_port)
-    puts "listening #{listen_ip}:#{listen_port}"
+    socket.bind(hash[:local_ip]||"127.0.0.1",hash[:local_port]||0)
     clients={}
     begin 
       while true
@@ -279,8 +278,8 @@ class MqttSN
             clients[key]={ip:client_ip, port:client_port, socket: UDPSocket.new  }
           end
           clients[key][:socket].send(r, 0, @server, @port)
-          #process_message r
-
+          m=MqttSN::parse_message r
+          puts ">#{m.to_json}"
         rescue IO::WaitReadable
         rescue => e
           puts "Error: receive thread died: #{e}"
@@ -292,7 +291,8 @@ class MqttSN
             puts "got packet from server to client #{key}:"
             puts "sending to #{c[:ip]}:#{c[:port]}"
             socket.send(r, 0, c[:ip], c[:port])
-            #process_message r
+            m=MqttSN::parse_message r
+            puts "<#{m.to_json}"
           rescue IO::WaitReadable
           rescue => e
             puts "Error: receive thread died: #{e}"
@@ -355,7 +355,6 @@ class MqttSN
     send :disconnect, duration: duration, expect: :disconnect do |status,message|
     end
   end
-
   
   def subscribe topic,hash={},&block
     send :subscribe, topic: topic, qos: hash[:qos],expect: :sub_ack do |s,m|
@@ -431,7 +430,7 @@ class MqttSN
     end
   end
 
-  def process_message r
+  def self.parse_message r
     m=nil
     len=r[0].ord
     case r[len-1].ord
@@ -451,7 +450,6 @@ class MqttSN
     case type_byte
     when CONNACK_TYPE
       m={type: :connect_ack,status: status}
-      @state=:connected
     when SUBACK_TYPE
       topic_id=(r[3].ord<<8)+r[4].ord
       msg_id=(r[5].ord<<8)+r[6].ord
@@ -465,37 +463,17 @@ class MqttSN
       msg=r[7,len-7]
       flags=r[2].ord
       qos=(flags>>5)&0x03
-      topic=@topics.key(topic_id)
-      m={type: :publish, qos: qos, topic_id: topic_id, topic: topic,msg_id: msg_id, msg: msg,status: :ok}
-      @dataq<<m
-      if not @transfer
-        if qos==1 
-          send :publish_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
-        elsif qos==2 
-          send :pub_rec, msg_id: msg_id
-        end
-        done=true
-      end
+      m={type: :publish, qos: qos, topic_id: topic_id,msg_id: msg_id, msg: msg,status: :ok}
     when PUBREL_TYPE
       msg_id=(r[2].ord<<8)+r[3].ord
-      m={type: :pub_rel, status: :ok}
-      if not @transfer
-        send :pub_comp, msg_id: msg_id
-        done=true
-      end
+      m={type: :pub_rel, msg_id: msg_id, status: :ok}
     when DISCONNECT_TYPE
       m={type: :disconnect,status: :ok}
-      @state=:disconnected if not @transfer
     when REGISTER_TYPE
       topic_id=(r[2].ord<<8)+r[3].ord
       msg_id=(r[4].ord<<8)+r[5].ord
       topic=r[6,len-6]
       m={type: :register, topic_id: topic_id, msg_id: msg_id, topic: topic,status: :ok}
-      @topics[topic]=m[:topic_id]
-      if not @transfer
-        send :register_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
-        done=true
-      end
     when REGACK_TYPE
       topic_id=(r[2].ord<<8)+r[3].ord
       m={type: :register_ack,topic_id: topic_id,status: status}
@@ -525,11 +503,43 @@ class MqttSN
     else
       m={type: :unknown, type_byte: type_byte }
     end
+    m
+  end
+
+  def process_message r
+    m=MqttSN::parse_message r
     if @debug and m
       m[:debug]=hexdump r
     end
-    if @transfer
-      m[:raw]=r
+    done=false
+    case m[:type]
+    when :register
+      @topics[m[:topic]]=m[:topic_id]
+      if not @transfer
+        send :register_ack,topic_id: m[:topic_id], msg_id: m[:msg_id], return_code: 0
+        done=true
+      end
+    when :disconnect
+      @state=:disconnected if not @transfer
+    when :pub_rel
+      if not @transfer
+        send :pub_comp, msg_id: m[:msg_id]
+        done=true
+      end
+    when :publish
+      m[:topic]=@topics.key(m[:topic_id])
+
+      if not @transfer
+        @dataq<<m
+        if m[:qos]==1 
+          send :publish_ack,topic_id: m[:topic_id], msg_id: m[:msg_id], return_code: 0
+        elsif m[:qos]==2 
+          send :pub_rec, msg_id: m[:msg_id]
+        end
+        done=true
+      end
+    when :connect_ack
+      @state=:connected
     end
     puts "got :#{@id} #{m.to_json}"  if @verbose
     if not done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ari Siitonen