hamnet 0.0.4 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDE2N2FlYTBiZjE3YTQyOTA0ZmMyZTBmNWI1YWE3YTIzZGVhYzk1Nw==
+    NTAxZTNiMmI2NmRlY2I5ZDVkNGJkNjVjMDRkY2IxYmY3YWI2N2FlYQ==
   data.tar.gz: !binary |-
-    OTc4N2YwNWIyMTIzZjY0OGJiMmM1MTk0YzI3ODlmZDFjODc5OWUyYQ==
+    NWEzN2Y4ODVkY2YwZjU0Y2U0YTQ3OWJmMTgyYTk1MGM3OTMzNjIwMA==
 SHA512:
   metadata.gz: !binary |-
-    Zjk5MTZmZTE2YmRhOTg5YzM5ZTZhNTE2ZTYyYTMwZjUzMjZmZWY1YWU0NGUw
-    MTlhNjZhYjE4MDk3ZGJjYTlkZDAzMWMyOTVmNWY4MGUzOGJiMGU3MmQ2ZDAz
-    NzY3MjMzYWQyNmVkNzA2YzhhNzhjYWM3MDhiZjRmMjkyMmZkZGY=
+    ZTgzNDY1M2Y4OWQ2ZWVkNzU3MTU4Y2YxNDg1YWI3M2ZjZWRjMDgwNzcxMGM1
+    N2RlYzYxMTc5OGFkZDdhZWE3MWU3OTlmODU1NmI1YWU1OWMzMGVhNDA4ODEy
+    Y2E3YTJlNmM4ZmUyOTk0OWNmNzI4MGYzYWViNTNkYzc1OGZlYzg=
   data.tar.gz: !binary |-
-    ODFjYzIzM2E5ZDBhODVkNDc3ODk4N2FhZmY0NjhmNGJiZjFhYzQxZTkyNzYx
-    ODdkNjNkMjk3NTUzZjI3NjAwNjQ5NmMyZmZmYmVjOTM4N2ZjYmI3NWI2Mjcy
-    OTc4NjczNDRiZTQ0YzAxYWYzMTYxOTQ3MzM3ZmQ0NTFmMjYyZDQ=
+    ZTJmMmJhYzRlMWY1ZWI0NmFhMzM2NzJlNjM1NTg3MDY0YTZiNmU4MDBjZWVl
+    YjVmMTJlMWZjMTMzN2UyYTM2MzI1NmJjMDliZWUwMWQ1OWVkY2M2YzBmOGE5
+    NmQ2YTI4ZDZjYzVmZTYzNmMzZTI1ZTI1OTIzMjJlOTFkNjQ3NmM=

data/lib/hamnet.rb

@@ -20,8 +20,8 @@ HAMNET_FRAME_SIMPLE=1
 HAMNET_FRAME_BASE64=2
 HAMNET_FRAME_COMPRESSED_BASE64=3
 # To do.
-#HAMNET_FRAME_PING=4
-#HAMNET_FRAME_PING_REPLY=5
+HAMNET_FRAME_PING=4
+HAMNET_FRAME_PING_REPLY=5
 #HAMNET_FRAME_TELEMETRY=6
 #HAMNET_FRAME_POSITION=7
 
@@ -48,16 +48,16 @@ class Frame
     @wiredata=nil
     @userdata=nil
     @crc=nil
-    @valid=nil
+    @valid=false
 
     @frompad=@from
     while @frompad.length<9
-      @frompad=@frompad+" "
+      @frompad=@frompad+":"
     end
 
     @topad=@to
     while @topad.length<9
-      @topad=@topad+" "
+      @topad=@topad+":"
     end
   end
 
@@ -79,12 +79,16 @@ class TxFrame < Frame
     @userdata=userdata
 
     sendtype=type
-    if @done or @type==HAMNET_FRAME_ACK
+    if @done or @type==HAMNET_FRAME_ACK or @type==HAMNET_FRAME_PING or @type==HAMNET_FRAME_PING_REPLY
       sendtype=(sendtype|128)
     end
 
     # Do the needful with the payload.
     case @type
+    when HAMNET_FRAME_PING
+      message=@frompad+@topad+sprintf("%02x",sendtype).downcase+sprintf("%02x",@sequence).downcase
+    when HAMNET_FRAME_PING_REPLY
+      message=@frompad+@topad+sprintf("%02x",sendtype).downcase+sprintf("%02x",@sequence).downcase+@userdata
     when HAMNET_FRAME_ACK
       message=@frompad+@topad+sprintf("%02x",sendtype).downcase+sprintf("%02x",@sequence).downcase
     when HAMNET_FRAME_SIMPLE
@@ -101,7 +105,7 @@ class TxFrame < Frame
     @crc=sprintf("%08x",Zlib::crc32(message)).downcase
 
     # Set the rest of the fields, and done.
-    @wiredata="<<<#{message}#{@crc}>>>"
+    @wiredata="----------<<<#{message}#{@crc}>>>"
     @valid=true
   end
 end
@@ -114,53 +118,85 @@ class RxFrame < Frame
 
   def initialize(wiredata)
     # First, make sure it's properly delimited.
-    if wiredata=~/^<<<.*>>>$/ and wiredata.length>=31
-      # Remove the "<<<" and ">>>"
-      tmp=wiredata[3,wiredata.length-6]
-      # Extract the crc field.
-      crc=tmp[tmp.length-8,8]
-      tmp=tmp[0,tmp.length-8]
-      # Save this for checking CRC later.
-      crcstring=tmp
-      # Extract and clean the from field.
-      from=tmp[0,9].gsub(" ","")
-      tmp=tmp[9,tmp.length-9]
-      # Extract and clean the to field.
-      to=tmp[0,9].gsub(" ","")
-      tmp=tmp[9,tmp.length-9]
-      # Extract the frame type.
-      type=tmp[0,2].to_i(16)
-      tmp=tmp[2,tmp.length-2]
-      # Extract the sequence number.
-      sequence=tmp[0,2].to_i(16)
-      tmp=tmp[2,tmp.length-2]
-      # See if this is a "done" frame.
-      done=false
-      if type!=(type&127)
-        done=true
-        type=(type&127)
-      end
-      # Create and populate the object.
-      super(from, to, type, sequence, done)
-      @wiredata=wiredata
-      # Decode the payload.
-      case @type
-      when HAMNET_FRAME_ACK
-        @userdata=""
-      when HAMNET_FRAME_SIMPLE
-        @userdata=tmp
-      when HAMNET_FRAME_BASE64
-        @userdata=Base64::strict_decode64(tmp)
-      when HAMNET_FRAME_COMPRESSED_BASE64
-        @userdata=Zlib::Inflate.inflate(Base64::strict_decode64(tmp))
-      end
-      # Calculate and check the CRC.
-      @crc=Zlib::crc32(crcstring).to_s(16).downcase
-      if crc==@crc
-        @valid=true
+    if wiredata=~/^<<<.*?>>>$/ and wiredata.length>=31
+      begin
+        # Remove the "<<<" and ">>>"
+        tmp=wiredata[3,wiredata.length-6]
+        # Extract the crc field.
+        crc=tmp[tmp.length-8,8]
+        tmp=tmp[0,tmp.length-8]
+        # Save this for checking CRC later.
+        crcstring=tmp
+        # Extract and clean the from field.
+        from=tmp[0,9].gsub(":","")
+        tmp=tmp[9,tmp.length-9]
+        # Extract and clean the to field.
+        to=tmp[0,9].gsub(":","")
+        tmp=tmp[9,tmp.length-9]
+        # Extract the frame type.
+        type=tmp[0,2].to_i(16)
+        tmp=tmp[2,tmp.length-2]
+        # Extract the sequence number.
+        sequence=tmp[0,2].to_i(16)
+        tmp=tmp[2,tmp.length-2]
+        # See if this is a "done" frame.
+        done=false
+        if type!=(type&127)
+          done=true
+          type=(type&127)
+        end
+        # Create and populate the object.
+        super(from, to, type, sequence, done)
+        @wiredata=wiredata
+        # Decode the payload.
+        case @type
+        when HAMNET_FRAME_PING
+          @userdata=""
+        when HAMNET_FRAME_PING_REPLY
+          @userdata=tmp
+        when HAMNET_FRAME_ACK
+          @userdata=""
+        when HAMNET_FRAME_SIMPLE
+          @userdata=tmp
+        when HAMNET_FRAME_BASE64
+          @userdata=Base64::strict_decode64(tmp)
+        when HAMNET_FRAME_COMPRESSED_BASE64
+          @userdata=Zlib::Inflate.inflate(Base64::strict_decode64(tmp))
+        end
+        # Calculate and check the CRC.
+        @crc=Zlib::crc32(crcstring).to_s(16).downcase
+        if crc==@crc
+          @valid=true
+        end
+      rescue
+        # This is bad.
+        return nil
       end
     else
-      return false
+      return nil
+    end
+  end
+end
+
+def sendstring(from, to, type, text, max)
+  sequence=0
+  frames=Array.new()
+  done=false
+
+  while text.length > max
+    chunk=text[0,max]
+    text=text[max,text.length-max]
+    if text.length==0
+      done=true
     end
+    frames.push(TxFrame.new(from, to, type, sequence, chunk, done))
+    sequence=sequence+1
+  end
+
+  if text.length > 0
+    frames.push(TxFrame.new(from, to, type, sequence, text, true))
+    sequence=sequence+1
   end
+  
+  return frames                
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamnet
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Jeff Francis, N0GQ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies: []
 description: A library for constructing fldigi network packets.
 email: jeff@gritch.org