Protocol-Types like Idx. Codes for sharing code.

This commit is contained in:
Denis Knauf 2022-12-13 22:44:06 +01:00
parent 2255c784bc
commit e9321d4de6

View file

@ -1,5 +1,7 @@
require 'iounpack'
require 'stringio'
require 'pathname'
require 'socket'
require 'logger'
require_relative 'errors'
module Knot
@ -72,8 +74,7 @@ end
# end
#end
module Knot::Protocol::Idx
class Id
class Knot::Protocol::Code
include Comparable
attr_reader :name, :code, :cname, :description
@ -86,7 +87,7 @@ module Knot::Protocol::Idx
def === x
case x
when self.class then self == x
when self.class then @id == x.id
when Symbol then @name == x
when String then @name == x.to_sym
when Integer then @code == x
@ -100,44 +101,67 @@ module Knot::Protocol::Idx
def to_i() @code end
end
Idx = [
Id.new( :command, 0x10, :CMD, 'Control command name.'),
Id.new( :flags, 0x11, :FLAGS, 'Control command flags.'),
Id.new( :error, 0x12, :ERROR, 'Error message.'),
Id.new( :section, 0x13, :SECTION, 'Configuration section name.'),
Id.new( :item, 0x14, :ITEM, 'Configuration item name.'),
Id.new( :id, 0x15, :ID, 'Congiguration item identifier.'),
Id.new( :zone, 0x16, :ZONE, 'Zone name.'),
Id.new( :owner, 0x17, :OWNER, 'Zone record owner'),
Id.new( :ttl, 0x18, :TTL, 'Zone record TTL.'),
Id.new( :type, 0x19, :TYPE, 'Zone record type name.'),
Id.new( :data, 0x1a, :DATA, 'Configuration item/zone record data.'),
Id.new( :filter, 0x1b, :FILTER, 'An option or a filter for output data processing.'),
]
Name = {}
Code = {}
Idx.each do |id|
Code[id.to_i] = id
Name[id.to_sym] = id
end
class <<self
module Knot::Protocol::Codes
include Enumerable
def [] k
case k
when Symbol
Name[k] or raise Knot::Errors::EINVAL, "Unknown Idx: #{k}"
self::Name[k] or raise Knot::Errors::EINVAL, "Unknown Codes: #{k}"
when Integer
Code[k] or raise Knot::Errors::EINVAL, "Unknown Idx: #{k}"
self::Code[k] or raise Knot::Errors::EINVAL, "Unknown Codes: #{k}"
else
raise ArgumentError, "Unknown Idx-Type: #{k}"
raise ArgumentError, "Unknown Codes-Type: #{k}"
end
end
def each &exe
block_given? ? Idx.each( &exe) : Idx.to_enum( :each)
block_given? ? self::Codes.each( &exe) : self::Codes.to_enum( :each)
end
end
module Knot::Protocol::Idx
extend Knot::Protocol::Codes
Codes = [
Knot::Protocol::Code.new( :command, 0x10, :CMD, 'Control command name.'),
Knot::Protocol::Code.new( :flags, 0x11, :FLAGS, 'Control command flags.'),
Knot::Protocol::Code.new( :error, 0x12, :ERROR, 'Error message.'),
Knot::Protocol::Code.new( :section, 0x13, :SECTION, 'Configuration section name.'),
Knot::Protocol::Code.new( :item, 0x14, :ITEM, 'Configuration item name.'),
Knot::Protocol::Code.new( :id, 0x15, :ID, 'Congiguration item identifier.'),
Knot::Protocol::Code.new( :zone, 0x16, :ZONE, 'Zone name.'),
Knot::Protocol::Code.new( :owner, 0x17, :OWNER, 'Zone record owner'),
Knot::Protocol::Code.new( :ttl, 0x18, :TTL, 'Zone record TTL.'),
Knot::Protocol::Code.new( :type, 0x19, :TYPE, 'Zone record type name.'),
Knot::Protocol::Code.new( :data, 0x1a, :DATA, 'Configuration item/zone record data.'),
Knot::Protocol::Code.new( :filter, 0x1b, :FILTER, 'An option or a filter for output data processing.'),
]
Name = {}
Code = {}
Codes.each do |id|
Code[id.to_i] = id
Name[id.to_sym] = id
end
end
module Knot::Protocol::Types
extend Knot::Protocol::Codes
Codes = [
Knot::Protocol::Code.new( :end, 0x00, :END, 'Type END.'),
Knot::Protocol::Code.new( :data, 0x01, :DATA, 'Type DATA.'),
Knot::Protocol::Code.new( :extra, 0x02, :EXTRA, 'Type EXTRA.'),
Knot::Protocol::Code.new( :block, 0x03, :BLOCK, 'Type BLOCK.'),
]
Name = {}
Code = {}
Codes.each do |id|
Code[id.to_i] = id
Name[id.to_sym] = id
end
end
class Knot::Protocol
@ -164,11 +188,11 @@ class Knot::Protocol
#sock.write [1].pack( 'c')
data[:flags] ||= ''
ds =
Idx::Idx.
Idx.
select {|n| data[n.to_sym] }.
map {|n| v = data[n.to_sym].to_s.b; [n.to_i, v.size, v ] }
s = (ds.flatten+[3]).pack( ('c na*'*ds.length)+'c').b
#Idx::Idx.each do |n|
s = [Types[:data].to_i, ds, Types[:block].to_i].flatten.pack( "c #{'c na*'*ds.length} c").b
#Idx.each do |n|
# v = data[n.to_sym]&.to_s&.b
# sock.write [n.to_i, v.size, v].pack( 'c na*') if v
#end
@ -211,16 +235,16 @@ class Knot::Protocol
loop do
t = sock.unpack1 'c'
case t
when 0, 3
when Knot::Protocol::Types[:end], Knot::Protocol::Types[:block]
return ret
when 1, 2
when Knot::Protocol::Types[:data], Knot::Protocol::Types[:extra]
type = t
ret.push( r = {})
else
raise Knot::Errors::EINVAL, "Missing Type before: #{t}" if ret.empty?
i = Idx::Idx[t - 0x10] or raise Knot::Errors::EINVAL, "Unknown index: #{t-0x10}"
i = Idx[t] or raise Knot::Errors::EINVAL, "Unknown index: #{t}"
l = sock.unpack1 'n'
r[i] = sock.read( l)
r[i.to_sym] = sock.read( l)
end
end
ensure