mqtt-sn-ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc99a508bb40d3261b690b13a97094bb257210b
-  data.tar.gz: 04af70b7e0a86a63044631c9e6daa41c273509c5
+  metadata.gz: e4f084a51dc0bd607b1900db2538237006d67575
+  data.tar.gz: c5e15cf5dbebf2fd20dc952673d2e79c21902d02
 SHA512:
-  metadata.gz: 6d1cc0c33d1becf9986eeffe185352436a4e8ebbb4b81c9ddaa0cab5a9433f92f661e890d570962bbbbf44a3f8f145bb81992078bbc38c96d06d53d2dd60e354
-  data.tar.gz: 5d385953fa575f7537634a5c15b3d1267abac839514191be53a00089b5f113a397ee62959e13f2f55bd30d1fba07bdf5e3859ca01ec57c0c59740e7725010566
+  metadata.gz: 511d406d08eafc28272637f9c7418f2296864519f2036d04a76133e58feb00e49609331e0ad855ec1c7ecb6e9781bc00e6dd8661a1dc94fdbb0b3a3c9bc88cca
+  data.tar.gz: 90c07411e0b78c7baccc7f68b4a7b4ed735155e7de943d88cf567b3eaa1b22d2f86ff21714468b5e52d570f23bf56f6b540166a74f10568207bd0ceb8d677232

data/bin/mqtt-sn-pub.rb

@@ -28,7 +28,7 @@ OptionParser.new do |opts|
   opts.on("-q", "--qos level", "QoS level (0). When using QoS -1, you must provide either Short Topic (2-char) or Topic_Id") do |v|
     options[:qos] = v.to_i
   end
-  opts.on("-i", "--id id", "This client's id -- free choice (hostname-pid)") do |name|
+  opts.on("-i", "--id id", "This client's id -- free choice (mqtt-sn-ruby-pid)") do |name|
     options[:id] = name
   end
   opts.on("-m", "--msg msg", "Message to send (test_value)") do |msg|
@@ -40,8 +40,8 @@ OptionParser.new do |opts|
   
 end.parse!
 
-puts "MQTT-SN-PUB: #{options.to_json}"
 sn=MqttSN.new options
+sn.note "MQTT-SN-PUB: #{options.to_json}"
 begin
   sn.pub options
 rescue SystemExit, Interrupt

data/c/mqtt-sn-pub.c

@@ -0,0 +1,36 @@
+/* Minimal MQTT-SN Send QoS=-1 */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "mqtt-sn.h"
+
+/*
+MQTT-SN minimal c-client-library: 
+Copyright (C) 2014  Ari Siitonen
+
+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/>.
+*/
+
+int main(int argc, char**argv)
+{
+   if (argc != 5)
+   {
+      printf("usage: pub Ip Port Topic Msg \n");
+      exit(1);
+   }
+   MqttSN_open_socket(argv[1],atoi(argv[2]));
+   MqttSN_pub(argv[3],argv[4]);
+   printf("Published '%s' with topic '%s' to mqtt-sn server '%s:%d'\n",argv[4],argv[3],argv[1],atoi(argv[2]));
+}

data/c/mqtt-sn.c

@@ -0,0 +1,40 @@
+/* Minimal MQTT-SN Send QoS=-1 */
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+int MqttSN_sockfd;
+struct sockaddr_in MqttSN_server;
+#define MAX_MSG_LEN 64
+
+int MqttSN_open_socket(char *host, int port) {
+   MqttSN_sockfd=socket(AF_INET,SOCK_DGRAM,0);
+   bzero(&MqttSN_server,sizeof(MqttSN_server));
+   MqttSN_server.sin_family = AF_INET;
+   MqttSN_server.sin_addr.s_addr=inet_addr(host);
+   MqttSN_server.sin_port=htons(port);
+}
+
+int MqttSN_pub(char *topic, char *msg) {
+   unsigned char buf[MAX_MSG_LEN];
+   if (strlen(msg)+7>MAX_MSG_LEN) {
+      printf("Error: too long message!\n");
+      exit(-1);
+   }
+   if (strlen(topic)!=2) {
+      printf("Error: Topic must be two characters!\n");
+      exit(-1);
+   }
+   buf[0]=strlen(msg)+7; //len
+   buf[1]=0x0c; // msg type= publish
+   buf[2]=0x62; // flags
+   buf[3]=topic[0]; // topic , 2 char
+   buf[4]=topic[1];
+   buf[5]=0x00;
+   buf[6]=0x01;
+   strcpy(&buf[7],msg);
+   sendto(MqttSN_sockfd,buf,buf[0],0,(struct sockaddr *)&MqttSN_server,sizeof(MqttSN_server));
+}

data/c/mqtt-sn.h

@@ -0,0 +1,3 @@
+
+int MqttSN_open_socket(char *host, int port);
+int MqttSN_pub(char *topic, char *msg);

data/examples/recv.rb

@@ -3,7 +3,7 @@
 require 'mqtt-sn-ruby'
 
 begin
-  sn=MqttSN.new server_uri: "udp://mqtt.fi:1882"
+  sn=MqttSN.new server_uri: "udp://mqtt.fi:1882", verbose: true
   sn.sub  do |status,msg|
     sn.note "Got Message '#{msg[:msg]}' with Topic '#{msg[:topic]}'"
   end

data/lib/mqtt-sn-ruby.rb

@@ -128,11 +128,9 @@ class MqttSN
     s
   end
 
-
   attr_accessor :clients
   attr_accessor :gateways
 
-
   def initialize(hash={})
       @options=hash #save these
       @server_uri=hash[:server_uri]
@@ -156,14 +154,14 @@ class MqttSN
       @broadcast_uri=hash[:broadcast_uri]
 
       if @server_uri
-        puts "Using Default Gateway: #{@server_uri}"
+        note "Using Default Gateway: #{@server_uri}"
         @gateways[0]={stamp: Time.now.to_i,uri: @server_uri, duration: 0, source: 'default', status: :ok}
         pick_new_gateway 
       elsif @broadcast_uri
-        puts "Autodiscovery Active, using #{@broadcast_uri}"
+        note "Autodiscovery Active, using #{@broadcast_uri}"
         @autodiscovery=true
       else
-        puts "No autodiscovery and no Default Gateway -- cannot proceed"
+        note "No autodiscovery and no Default Gateway -- cannot proceed"
         exit -1
       end
 
@@ -186,7 +184,7 @@ class MqttSN
       end
       if @forwarder
         @s,@server,@port = MqttSN::open_port @server_uri
-        puts "Open port to Gateway: #{@server_uri}: #{@server},#{@port} -- Listening local port: #{@local_port}"
+        note "Open port to Gateway: #{@server_uri}: #{@server},#{@port} -- Listening local port: #{@local_port}"
         @local_port=hash[:local_port]||1883
         @s.bind("0.0.0.0",@local_port)
         @bcast_period=60
@@ -311,9 +309,10 @@ class MqttSN
     end
     case type
     when :connect
-      if not hash[:id]
+      if not hash[:id] or hash[:id]=""
         hash[:id]="mqtt-sn-ruby-#{$$}"
       end
+      note "Connecting as '#{hash[:id]}'"
       flags=0 
       flags+=CLEAN_FLAG if hash[:clean]
       flags+=RETAIN_FLAG if hash[:retain]
@@ -1048,7 +1047,6 @@ class MqttSN
 
 #toplevel funcs:
   def pub options={}
-    pp options
     sent=false
     if options[:qos]==-1
       publish options[:topic]||"XX", options[:msg]||"test_value", qos: options[:qos]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ari Siitonen
@@ -23,6 +23,9 @@ files:
 - bin/mqtt-sn-forwarder.rb
 - bin/mqtt-sn-pub.rb
 - bin/mqtt-sn-sub.rb
+- c/mqtt-sn-pub.c
+- c/mqtt-sn.c
+- c/mqtt-sn.h
 - examples/recv.rb
 - examples/send.rb
 - lib/mqtt-sn-ruby.rb