opcua 0.16 → 0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eacc56e17f6089d460714d4f7a5d62860ef4ab5949a6567fa239f981b66c6a54
-  data.tar.gz: ff613e4dc01c4298d97ee35a63f31650f549ad8a7c3d14b791a5795e9563e4eb
+  metadata.gz: dede52136945d72311f619c6fe2299896aeb67eb00db4a6a2ebc0c985422c7d6
+  data.tar.gz: 285eb4c834021ae986c91d492a7e77fb847947be66c69284c24a187dfee816d5
 SHA512:
-  metadata.gz: b2989056d754063f6be7a5d0a75700cb5186c87749e794c683ed4cf233629f37c97178e825e49fc55d54ad04e885698faa78a3b24e470a0805dfd4863c2a2de9
-  data.tar.gz: 333b4e4c447d3ae0651496d960110212135c37e49a765a1b2c74d71991a56c440789af4e9079a8b06583ccd3f201038f3b1ff160054e6ac601df0ba6221a69af
+  metadata.gz: a75f3952786bdf049432cf6dd46a11f770f6da45d5fcbf8a95ed9528e122e1918cafbfacf8e2a7c80c40987c598601a5326834c4905ecb5e080adfc52b91ee0e
+  data.tar.gz: 699a713490e9059cf6ed4b610b159da174e2117210bdff60dcedf502d9586318cc7c39343ffa71dbbcdb16b7e5e821be7f25c451c0cb8f5994839db133cae2b1

data/README.md

@@ -1,6 +1,6 @@
 # OPC-UA Ruby Bindings (open62541)
 
-The development of OPC UA applications takes currently a lot of effort. This is caused by the large possibilities of the OPC UA specification. With this implemtation we want to define some conventions, which shoud make the technology more useable.
+The development of OPC UA applications takes currently a lot of effort. This is caused by the large possibilities of the OPC UA specification. With this implementation we want to define some conventions, which shoud make the technology more useable.
 
 ## Table of Contents
 
@@ -33,32 +33,28 @@ Copyright (C) 2019-* Jürgen "eTM" Mangler . opcua-sm
 
 ```sh
 # Debian/Ubuntu
-apt install build-essential cmake-curses-gui libmbedtls-dev libxml2-dev libxslt-dev libz-dev libssl-dev libicu-dev 
+apt install build-essential cmake-curses-gui libmbedtls-dev libxml2-dev libxslt-dev libz-dev libssl-dev libicu-dev
 # Fedora/Redhat
 dnf install @buildsys-build @development-tools cmake libxml2-devel libxslt-devel zlib-devel libicu-devel mbedtls-devel
 ```
 
-Dependency: https://github.com/open62541/open62541 > 0.4 (master branch as of 2019-04-26)
+Dependency: https://github.com/open62541/open62541 > 1.1 (master branch as of 2020-06-04)
 
 ```sh
 git clone https://github.com/open62541/open62541.git
 cd open62541
-mkdir build
-cd build
-cmake ..
-ccmake ..
-# Configuration, see picture below
+mkdir build && cd build
+cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_ENCRYPTION=ON -DUA_ENABLE_ENCRYPTION_MBEDTLS=ON ..
 make
 sudo make install
 gem install opcua
 ```
 
-![ccmake Config](config.png)
-
 If the installation works correctly, but examples are still complaining about missing lib62541.so, try this:
 
 ```sh
-sudo echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf # add to libs path
+sudo echo "/usr/local/lib" >> /etc/ld.so.conf.d/local.conf # add to libs path
+sudo echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local.conf # add to libs path
 sudo ldconfig # update libs
 sudo ldconfig -p | grep libopen62541 # check if its there
 ```
@@ -75,7 +71,7 @@ The server has following functions:
 * Find nodes in the adress space
 * Loop for getting real life data
 
-Every server application uses the Demonite gem, which allows to run the server as service.
+Every server application uses the Daemonite gem, which allows to run the server as service.
 ```ruby
 Daemonite.new do
   on startup do |opts|
@@ -101,7 +97,7 @@ server.add_namespace "https://yourdomain/testserver"
 ```
 
 
-#### Create ObjectTypes 
+#### Create ObjectTypes
 
 Basically all new created types are subtypes of the _BaseObjectType_. With ```server.types.add_object_type(:TestObjectType)``` a new type is defined in the information model. All nodes of the new created type are defined in the ```tap{}``` region.
 
@@ -137,7 +133,7 @@ With ```.add_object(:TestObject)``` a new object named _TestObject_ is added. Th
 
 ##### Add Method
 
-Methods are added with the ```.add_method(:TestMethod)``` function. Per default the method has no input and output arguments. By adding additional arguments you can define input arguments. The code for defining a method with input arguments looks like 
+Methods are added with the ```.add_method(:TestMethod)``` function. Per default the method has no input and output arguments. By adding additional arguments you can define input arguments. The code for defining a method with input arguments looks like
 ```ruby
  t.add_method :TestMethod, inputarg1: OPCUA::TYPES::STRING, inputarg2: OPCUA::TYPES::DATETIME do |node, inputarg1, inputarg2|
     #do some stuff here
@@ -148,7 +144,7 @@ in the ```do...end```section you write the code which should be executed by call
 
 #### Manifest Objects
 
-ObjectTypes can be instiantiated with the ```.manifest``` method. 
+ObjectTypes can be instiantiated with the ```.manifest``` method.
 
 ```ruby
 testobject =server.objects.manifest(:TestObjectType, to)
@@ -164,7 +160,7 @@ testobject.delete!
 
 #### Find Nodes in the Addressspace
 
-To get a specific node you should use the ```.find``` method. 
+To get a specific node you should use the ```.find``` method.
 ```ruby
 tv = to.find :TestVariable
 ```
@@ -195,7 +191,7 @@ You can assign vlaues without definig a datatype. The correct _DataType_ will be
 #### Loop for getting Real Life Data
 The server loop looks like follows:
 ```ruby
- run do 
+ run do
     sleep server.run
     to.value = 'Testvariable1'
     p to.value
@@ -204,7 +200,7 @@ The server loop looks like follows:
  end
 ```
 
-The loop starts with ```sleep server.run```. This is recommended by the open62541 developer. With the ```.value``` function you can write or get the value of a node. 
+The loop starts with ```sleep server.run```. This is recommended by the open62541 developer. With the ```.value``` function you can write or get the value of a node.
 
 ### Client
 TBD. See examples subdirectory.

data/Rakefile

@@ -1,24 +1,26 @@
 require 'rubygems/package_task'
-require 'rake/extensiontask'
 require 'fileutils'
 
 spec = eval(File.read('opcua.gemspec'))
 
-puts `cert/generate_certificate.sh`
+task :compile do
+  require 'rake/extensiontask'
 
-spec.extensions.each do |f|
-  Rake.application.clear
+  puts `cert/generate_certificate.sh`
+  spec.extensions.each do |f|
+    Rake.application.clear
 
-  task :default => [:compile]
+    task :default => [:compile]
 
-  t = Rake::ExtensionTask.new "opcua/" + File.basename(File.dirname(f)), spec
-  Rake::Task[:default].invoke
+    t = Rake::ExtensionTask.new "opcua/" + File.basename(File.dirname(f)), spec
+    Rake::Task[:default].invoke
+  end
+  Rake.application.clear
 end
-Rake.application.clear
 
-task :default => [:gem]
+task :default => [:compile]
 
-pkg = Gem::PackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
   FileUtils.mkdir 'pkg' rescue nil
@@ -26,10 +28,16 @@ pkg = Gem::PackageTask.new(spec) do |pkg|
   FileUtils.ln_sf "#{pkg.name}.gem", "pkg/#{spec.name}.gem"
 end
 
-task :push => :gem do |r|
+task :push => :gem do
   `gem push pkg/opcua.gem`
 end
 
-task :install => :gem do |r|
+task :install => :gem do
   `gem install pkg/opcua.gem`
 end
+
+task :clean do
+  FileUtils.rm_rf(File.join(__dir__,'tmp'))
+  FileUtils.rm_rf(File.join(__dir__,'lib','opcua','client.so'))
+  FileUtils.rm_rf(File.join(__dir__,'lib','opcua','server.so'))
+end

data/cert/cert.h

@@ -1,70 +1,70 @@
 unsigned char cert_der[] = {
   0x30, 0x82, 0x03, 0x18, 0x30, 0x82, 0x02, 0x00, 0xa0, 0x03, 0x02, 0x01,
-  0x02, 0x02, 0x14, 0x0c, 0x57, 0xd8, 0x38, 0xb3, 0xbc, 0xaf, 0xad, 0xbf,
-  0xcd, 0x64, 0x91, 0xbf, 0x41, 0xf8, 0x55, 0x1c, 0x74, 0x1f, 0x07, 0x30,
+  0x02, 0x02, 0x14, 0x05, 0x1e, 0x58, 0x4d, 0x94, 0xf5, 0x46, 0x0f, 0xf5,
+  0xd2, 0xe0, 0xb9, 0x56, 0xa7, 0x5a, 0x46, 0xe1, 0x3d, 0x3f, 0xa1, 0x30,
   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
   0x05, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04,
   0x03, 0x0c, 0x0a, 0x72, 0x75, 0x62, 0x79, 0x2d, 0x6f, 0x70, 0x63, 0x75,
-  0x61, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x39, 0x31, 0x30, 0x30, 0x32, 0x31,
-  0x30, 0x34, 0x35, 0x31, 0x31, 0x5a, 0x17, 0x0d, 0x32, 0x30, 0x30, 0x39,
-  0x32, 0x31, 0x31, 0x30, 0x34, 0x35, 0x31, 0x31, 0x5a, 0x30, 0x15, 0x31,
+  0x61, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x30, 0x30, 0x37, 0x31, 0x34, 0x31,
+  0x37, 0x32, 0x39, 0x32, 0x35, 0x5a, 0x17, 0x0d, 0x32, 0x31, 0x30, 0x37,
+  0x30, 0x34, 0x31, 0x37, 0x32, 0x39, 0x32, 0x35, 0x5a, 0x30, 0x15, 0x31,
   0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x0a, 0x72, 0x75,
   0x62, 0x79, 0x2d, 0x6f, 0x70, 0x63, 0x75, 0x61, 0x30, 0x82, 0x01, 0x22,
   0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
   0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a,
-  0x02, 0x82, 0x01, 0x01, 0x00, 0xd2, 0x08, 0x20, 0xb4, 0xe6, 0xb0, 0x54,
-  0xae, 0x0b, 0x3e, 0xcb, 0x16, 0xaa, 0xa4, 0xa0, 0x45, 0x9b, 0xad, 0x06,
-  0xdf, 0xc8, 0xa1, 0xa0, 0xdf, 0x70, 0x85, 0xee, 0x67, 0xeb, 0xb9, 0x32,
-  0x90, 0x85, 0x43, 0x59, 0x33, 0x14, 0x48, 0x63, 0xcb, 0x1c, 0xf0, 0xa4,
-  0xd3, 0xd4, 0xd6, 0x86, 0x94, 0x7c, 0x16, 0xa9, 0x25, 0x26, 0x9d, 0xae,
-  0xd6, 0xe5, 0x51, 0xb3, 0xcb, 0xe1, 0xa2, 0x59, 0xde, 0x90, 0xef, 0x8c,
-  0xbc, 0x26, 0x11, 0x57, 0x8c, 0x12, 0xa1, 0xdf, 0x79, 0x1a, 0xab, 0xb3,
-  0x1d, 0x3a, 0xd0, 0xcf, 0x4d, 0xa2, 0x4d, 0x62, 0x9c, 0x61, 0x2c, 0x17,
-  0x30, 0xf7, 0xa9, 0x8b, 0x5f, 0xec, 0xc3, 0xed, 0x5b, 0x69, 0x5f, 0x55,
-  0x21, 0xd0, 0xa1, 0xfb, 0xef, 0x9f, 0x40, 0xc7, 0x7e, 0x2a, 0x07, 0xba,
-  0x18, 0x65, 0xc0, 0xb0, 0xa3, 0x32, 0x0c, 0x22, 0xf3, 0xff, 0x03, 0xa3,
-  0x91, 0x52, 0x1b, 0xa5, 0x80, 0x72, 0xf4, 0x95, 0x81, 0xfa, 0x25, 0xcc,
-  0x52, 0xcc, 0x92, 0xf2, 0xcb, 0xa0, 0x9a, 0x86, 0xf4, 0x78, 0x48, 0x0a,
-  0x01, 0x0f, 0x63, 0x0d, 0x44, 0xc9, 0xa7, 0x68, 0x41, 0xd9, 0x7a, 0xca,
-  0x0a, 0x21, 0xfd, 0x74, 0x6f, 0x14, 0x9d, 0x6a, 0x01, 0xfa, 0x98, 0x06,
-  0xba, 0xd3, 0x16, 0x62, 0xb6, 0x53, 0x1d, 0xe0, 0x9c, 0x6f, 0x4a, 0xea,
-  0x88, 0x9d, 0x12, 0x60, 0x06, 0x72, 0xb2, 0x36, 0xa1, 0xf3, 0xae, 0x60,
-  0x9a, 0xf8, 0x33, 0xc3, 0xbc, 0xee, 0xce, 0xf9, 0xa5, 0x7e, 0xea, 0xbd,
-  0x3c, 0xdd, 0xe6, 0x09, 0xa3, 0x68, 0xf8, 0xbf, 0xe8, 0x08, 0x3e, 0x94,
-  0xca, 0xcf, 0x84, 0xbb, 0x11, 0x40, 0x45, 0x46, 0x7d, 0xd1, 0x77, 0x33,
-  0x71, 0x14, 0x02, 0x4f, 0xa6, 0xaf, 0x4d, 0x73, 0xf2, 0xf5, 0x98, 0xeb,
-  0x5f, 0xeb, 0xf3, 0xb4, 0xb6, 0x62, 0x92, 0x15, 0x55, 0x02, 0x03, 0x01,
+  0x02, 0x82, 0x01, 0x01, 0x00, 0xce, 0x51, 0xee, 0xa9, 0xf6, 0xe0, 0x2c,
+  0x30, 0x8c, 0x04, 0x3a, 0x0d, 0x74, 0x78, 0x7a, 0x93, 0x00, 0x47, 0xeb,
+  0x85, 0x26, 0x38, 0x70, 0x52, 0xeb, 0xcc, 0xf4, 0x21, 0xfe, 0x68, 0x8b,
+  0x1d, 0x57, 0xce, 0x9f, 0xb9, 0x18, 0x62, 0x99, 0x90, 0x4d, 0xc5, 0x00,
+  0x41, 0x71, 0x9d, 0x71, 0xcf, 0xf2, 0xca, 0xd5, 0x88, 0x21, 0x40, 0xfb,
+  0x38, 0x1d, 0xc4, 0xd4, 0xb5, 0xfd, 0x51, 0xdc, 0x9f, 0x8d, 0xed, 0x7b,
+  0x15, 0xf4, 0xd8, 0x08, 0x07, 0x06, 0x50, 0xe4, 0x86, 0xcc, 0x72, 0x63,
+  0xc1, 0x8e, 0x4c, 0xd1, 0xac, 0xc5, 0xdd, 0xac, 0xff, 0x3f, 0x0a, 0xde,
+  0x7e, 0x84, 0x4e, 0xf9, 0x92, 0x35, 0x1a, 0xca, 0x94, 0x85, 0x35, 0x1c,
+  0xcc, 0x9b, 0xda, 0x04, 0x07, 0xd5, 0x07, 0xf9, 0x7f, 0xb0, 0x5f, 0xdc,
+  0x97, 0x1a, 0xac, 0x8b, 0xdb, 0x56, 0x2e, 0x3f, 0x4c, 0x1d, 0x3e, 0xab,
+  0x0f, 0xde, 0x43, 0x18, 0xc0, 0xa8, 0x61, 0xff, 0xac, 0xe6, 0x46, 0x90,
+  0x60, 0xb1, 0x6c, 0x72, 0x3d, 0x38, 0x27, 0xcb, 0xb4, 0x3c, 0x6e, 0x61,
+  0x6f, 0x9e, 0x44, 0xfd, 0xe7, 0xd7, 0x07, 0x9b, 0x5a, 0x00, 0xfa, 0x17,
+  0x8c, 0xa7, 0x8a, 0x31, 0x5d, 0x77, 0x18, 0xd4, 0xec, 0xa3, 0x54, 0x64,
+  0xe2, 0x7b, 0x56, 0xde, 0xf2, 0x6f, 0x94, 0xc3, 0xd4, 0xa9, 0xe0, 0xed,
+  0x96, 0xa2, 0x5c, 0x57, 0xa7, 0x49, 0xc4, 0x84, 0xe8, 0x8e, 0xc5, 0xb0,
+  0xd1, 0x56, 0x05, 0x36, 0xe8, 0xd1, 0xd5, 0x57, 0xb7, 0xbc, 0x31, 0xc3,
+  0xe6, 0x3f, 0x78, 0x09, 0x3e, 0x25, 0xdc, 0x05, 0x62, 0xd3, 0xef, 0xde,
+  0xa8, 0xb9, 0x42, 0x3a, 0x16, 0x82, 0xc7, 0x83, 0x46, 0x65, 0xf2, 0xe0,
+  0xbb, 0xf4, 0x25, 0x4f, 0x5d, 0xcb, 0x7c, 0x96, 0x76, 0x7c, 0x4c, 0xed,
+  0xcb, 0xe3, 0xbb, 0x0c, 0xaa, 0x44, 0xbf, 0x36, 0x47, 0x02, 0x03, 0x01,
   0x00, 0x01, 0xa3, 0x60, 0x30, 0x5e, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d,
-  0x0e, 0x04, 0x16, 0x04, 0x14, 0x35, 0x61, 0xa6, 0xff, 0xf7, 0x22, 0xda,
-  0x39, 0xf1, 0x85, 0x87, 0xdd, 0x4a, 0x43, 0xcc, 0xd3, 0x35, 0xd0, 0x5d,
-  0xb3, 0x30, 0x0f, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04,
+  0x0e, 0x04, 0x16, 0x04, 0x14, 0x6a, 0xa0, 0xd5, 0x2a, 0xf6, 0x52, 0x09,
+  0x4c, 0x9b, 0xa8, 0xb4, 0xb7, 0xe0, 0xe7, 0x94, 0x84, 0xd0, 0xa3, 0xb4,
+  0x23, 0x30, 0x0f, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04,
   0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30, 0x1c, 0x06, 0x03, 0x55, 0x1d,
   0x11, 0x04, 0x15, 0x30, 0x13, 0x86, 0x11, 0x72, 0x75, 0x62, 0x79, 0x2d,
   0x6f, 0x70, 0x63, 0x75, 0x61, 0x3a, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
   0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04,
   0x03, 0x02, 0x05, 0xa0, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
   0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
-  0x87, 0xb2, 0xfb, 0xa2, 0xaa, 0x95, 0x5c, 0xc8, 0x79, 0x4f, 0x65, 0x95,
-  0xc7, 0x75, 0xbb, 0x9f, 0x8f, 0x08, 0x20, 0x42, 0x1a, 0xb0, 0x28, 0x58,
-  0xe3, 0xbf, 0x1f, 0x9f, 0xbb, 0x37, 0xb8, 0x1d, 0x45, 0x82, 0x02, 0x8c,
-  0xbe, 0x34, 0x15, 0xb8, 0x8d, 0xd5, 0x13, 0x88, 0xf6, 0x8a, 0xe4, 0xd6,
-  0xe5, 0x73, 0xaa, 0x31, 0x02, 0xcf, 0xaf, 0x98, 0xe8, 0x2c, 0xac, 0xa0,
-  0x9d, 0xe6, 0xb1, 0xda, 0x34, 0x05, 0x29, 0xf7, 0x6a, 0x10, 0x23, 0x69,
-  0xf8, 0x97, 0x3e, 0xc8, 0xe7, 0xd3, 0xbd, 0x40, 0xfa, 0x73, 0xe6, 0x9c,
-  0xcf, 0xd8, 0x9a, 0xd6, 0x34, 0x78, 0x9f, 0x4b, 0xaa, 0x56, 0x7f, 0xd7,
-  0x5c, 0xcd, 0x2e, 0x37, 0xae, 0x16, 0x9c, 0xe4, 0x08, 0xe7, 0x6a, 0x88,
-  0x2d, 0xfd, 0xcb, 0x3c, 0x39, 0x6e, 0xdc, 0xbc, 0x35, 0x37, 0x46, 0x3c,
-  0x69, 0x9c, 0x37, 0xc0, 0x3c, 0xf6, 0xce, 0x99, 0x79, 0x71, 0x88, 0x41,
-  0xac, 0xc3, 0xa6, 0x66, 0x58, 0xcc, 0x22, 0x19, 0x4d, 0xa8, 0xe1, 0xa0,
-  0xda, 0xe8, 0x56, 0x55, 0x2f, 0xc6, 0x4f, 0x05, 0x92, 0xf9, 0x12, 0x95,
-  0x47, 0xf9, 0xaf, 0xe1, 0xba, 0xce, 0xef, 0x3c, 0x6b, 0xc5, 0xc7, 0xcb,
-  0x4c, 0xa2, 0x57, 0x35, 0x64, 0x89, 0x95, 0x52, 0x52, 0x13, 0xb9, 0x9e,
-  0x68, 0x40, 0x76, 0x4b, 0xac, 0x11, 0x47, 0xbe, 0x37, 0xcc, 0x74, 0x9e,
-  0xc9, 0x2b, 0xc5, 0x2c, 0xdb, 0x4e, 0xf9, 0x0b, 0x68, 0xcb, 0xd1, 0x48,
-  0x46, 0x1d, 0xba, 0xf6, 0xb2, 0x59, 0xce, 0x1e, 0x5e, 0xc4, 0xfb, 0x47,
-  0x3a, 0xcb, 0xad, 0x1e, 0x07, 0xd8, 0x65, 0xf6, 0x1c, 0x58, 0x6b, 0x96,
-  0xaf, 0xd4, 0x87, 0x92, 0x45, 0xd2, 0xc6, 0x0d, 0x9b, 0xb6, 0x07, 0x03,
-  0xf0, 0x6f, 0x52, 0xb4, 0x98, 0x68, 0x1c, 0x63, 0x09, 0xc6, 0x9d, 0xf1,
-  0xe9, 0x70, 0xf4, 0x79
+  0xc3, 0x70, 0xea, 0x90, 0x39, 0xc2, 0x8e, 0xe7, 0x4f, 0xd1, 0xc6, 0x99,
+  0x53, 0xaf, 0x8f, 0x19, 0xec, 0xaa, 0x05, 0x9b, 0xa4, 0x69, 0x2c, 0x00,
+  0x11, 0xcd, 0x66, 0xa3, 0x50, 0x0f, 0xe6, 0x2b, 0x83, 0x27, 0xfe, 0x72,
+  0xde, 0x41, 0x03, 0x0b, 0x4c, 0xe4, 0xd8, 0xc3, 0x54, 0xeb, 0x3c, 0xbc,
+  0xb6, 0x87, 0xba, 0x92, 0x1e, 0x49, 0xcf, 0x7f, 0x5a, 0x57, 0xa7, 0x3e,
+  0x8b, 0xd0, 0x45, 0x7e, 0x3d, 0x95, 0x36, 0x73, 0x0f, 0x16, 0x75, 0x68,
+  0x1c, 0xf5, 0x4d, 0x90, 0xa9, 0x7c, 0xc8, 0xc1, 0x6d, 0x89, 0xaf, 0x74,
+  0x28, 0xb8, 0xe2, 0xde, 0x10, 0x6e, 0x81, 0x79, 0x65, 0xbc, 0x6c, 0xfb,
+  0xe8, 0x07, 0xec, 0x1e, 0x22, 0x6a, 0x2c, 0x50, 0xae, 0xb7, 0x18, 0x4c,
+  0x3a, 0xef, 0x1f, 0xe2, 0xfd, 0x11, 0xf0, 0x95, 0x10, 0x3d, 0xbd, 0x6e,
+  0x17, 0x24, 0xd7, 0x46, 0x0a, 0x42, 0x6b, 0x88, 0xf5, 0x56, 0x12, 0x6e,
+  0xf1, 0xff, 0xaf, 0x40, 0x08, 0x3e, 0x68, 0xa3, 0x3e, 0x38, 0xfa, 0xd6,
+  0x96, 0x56, 0xd6, 0x8b, 0x67, 0x6c, 0x2a, 0x5f, 0x5a, 0xfa, 0xaa, 0x9d,
+  0xd1, 0x54, 0x92, 0x0b, 0x90, 0x2c, 0x9e, 0xcc, 0x7d, 0x48, 0x5f, 0x19,
+  0x59, 0x74, 0xb6, 0xae, 0x0c, 0x33, 0x33, 0x74, 0x72, 0xef, 0xa5, 0xa9,
+  0xfe, 0x8b, 0xc8, 0x48, 0x26, 0x49, 0x88, 0x65, 0x07, 0x60, 0x34, 0x80,
+  0x78, 0x83, 0x1f, 0x82, 0xc0, 0xcb, 0x73, 0x83, 0xe2, 0x7b, 0x6d, 0x7c,
+  0x3c, 0x6d, 0x27, 0xd8, 0x8e, 0xbb, 0x2f, 0x8c, 0xe2, 0x8b, 0x02, 0xb5,
+  0xe6, 0x01, 0x53, 0x74, 0xf0, 0xbe, 0xf6, 0xdd, 0x40, 0x33, 0x35, 0x97,
+  0x87, 0x17, 0xe0, 0xf2, 0x33, 0xc9, 0x38, 0x6f, 0xe0, 0x5d, 0x48, 0x55,
+  0xe0, 0x14, 0xe1, 0x61, 0xca, 0xdb, 0x34, 0x4b, 0xd7, 0x06, 0x6d, 0xcd,
+  0x94, 0x84, 0x98, 0xa2
 };
 unsigned int cert_der_len = 796;

data/cert/cert_key.h

@@ -1,103 +1,103 @@
 unsigned char cert_key_der[] = {
-  0x30, 0x82, 0x04, 0xa5, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00,
-  0xd2, 0x08, 0x20, 0xb4, 0xe6, 0xb0, 0x54, 0xae, 0x0b, 0x3e, 0xcb, 0x16,
-  0xaa, 0xa4, 0xa0, 0x45, 0x9b, 0xad, 0x06, 0xdf, 0xc8, 0xa1, 0xa0, 0xdf,
-  0x70, 0x85, 0xee, 0x67, 0xeb, 0xb9, 0x32, 0x90, 0x85, 0x43, 0x59, 0x33,
-  0x14, 0x48, 0x63, 0xcb, 0x1c, 0xf0, 0xa4, 0xd3, 0xd4, 0xd6, 0x86, 0x94,
-  0x7c, 0x16, 0xa9, 0x25, 0x26, 0x9d, 0xae, 0xd6, 0xe5, 0x51, 0xb3, 0xcb,
-  0xe1, 0xa2, 0x59, 0xde, 0x90, 0xef, 0x8c, 0xbc, 0x26, 0x11, 0x57, 0x8c,
-  0x12, 0xa1, 0xdf, 0x79, 0x1a, 0xab, 0xb3, 0x1d, 0x3a, 0xd0, 0xcf, 0x4d,
-  0xa2, 0x4d, 0x62, 0x9c, 0x61, 0x2c, 0x17, 0x30, 0xf7, 0xa9, 0x8b, 0x5f,
-  0xec, 0xc3, 0xed, 0x5b, 0x69, 0x5f, 0x55, 0x21, 0xd0, 0xa1, 0xfb, 0xef,
-  0x9f, 0x40, 0xc7, 0x7e, 0x2a, 0x07, 0xba, 0x18, 0x65, 0xc0, 0xb0, 0xa3,
-  0x32, 0x0c, 0x22, 0xf3, 0xff, 0x03, 0xa3, 0x91, 0x52, 0x1b, 0xa5, 0x80,
-  0x72, 0xf4, 0x95, 0x81, 0xfa, 0x25, 0xcc, 0x52, 0xcc, 0x92, 0xf2, 0xcb,
-  0xa0, 0x9a, 0x86, 0xf4, 0x78, 0x48, 0x0a, 0x01, 0x0f, 0x63, 0x0d, 0x44,
-  0xc9, 0xa7, 0x68, 0x41, 0xd9, 0x7a, 0xca, 0x0a, 0x21, 0xfd, 0x74, 0x6f,
-  0x14, 0x9d, 0x6a, 0x01, 0xfa, 0x98, 0x06, 0xba, 0xd3, 0x16, 0x62, 0xb6,
-  0x53, 0x1d, 0xe0, 0x9c, 0x6f, 0x4a, 0xea, 0x88, 0x9d, 0x12, 0x60, 0x06,
-  0x72, 0xb2, 0x36, 0xa1, 0xf3, 0xae, 0x60, 0x9a, 0xf8, 0x33, 0xc3, 0xbc,
-  0xee, 0xce, 0xf9, 0xa5, 0x7e, 0xea, 0xbd, 0x3c, 0xdd, 0xe6, 0x09, 0xa3,
-  0x68, 0xf8, 0xbf, 0xe8, 0x08, 0x3e, 0x94, 0xca, 0xcf, 0x84, 0xbb, 0x11,
-  0x40, 0x45, 0x46, 0x7d, 0xd1, 0x77, 0x33, 0x71, 0x14, 0x02, 0x4f, 0xa6,
-  0xaf, 0x4d, 0x73, 0xf2, 0xf5, 0x98, 0xeb, 0x5f, 0xeb, 0xf3, 0xb4, 0xb6,
-  0x62, 0x92, 0x15, 0x55, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x01,
-  0x01, 0x00, 0x9f, 0x90, 0xe9, 0x38, 0x46, 0xa2, 0xe4, 0x52, 0xad, 0xdc,
-  0x70, 0xf2, 0xb1, 0x86, 0x0c, 0xf5, 0x95, 0x46, 0x29, 0x18, 0xcf, 0x16,
-  0x6c, 0x60, 0x14, 0xde, 0xcb, 0xb7, 0x4c, 0x11, 0x11, 0x67, 0x56, 0xb7,
-  0x4a, 0x07, 0x52, 0x7b, 0x84, 0xc5, 0x85, 0x21, 0x16, 0x38, 0x91, 0x54,
-  0xc2, 0x3e, 0x00, 0xe0, 0x3e, 0x75, 0x29, 0x17, 0x57, 0x03, 0x90, 0x89,
-  0x37, 0xed, 0xc7, 0x68, 0x4e, 0x9a, 0x96, 0xc6, 0x47, 0xc7, 0x91, 0xac,
-  0x4f, 0x34, 0xed, 0xda, 0xe9, 0x2a, 0xda, 0xa6, 0x63, 0x97, 0xeb, 0x5d,
-  0x44, 0x81, 0x98, 0xb2, 0xee, 0x1e, 0x1c, 0x7d, 0x20, 0xc9, 0x64, 0xfe,
-  0xfc, 0x12, 0x4e, 0x90, 0xb3, 0xbd, 0x65, 0x1a, 0xb6, 0x54, 0xd0, 0x6a,
-  0xa0, 0x3a, 0xf6, 0x64, 0x82, 0xab, 0x49, 0x47, 0x41, 0x8c, 0xd3, 0x91,
-  0x47, 0x21, 0x55, 0x1e, 0x7f, 0x57, 0x9c, 0x00, 0xa9, 0xbc, 0x97, 0x8c,
-  0x0e, 0xbe, 0x87, 0x80, 0xe9, 0x9f, 0x40, 0x8f, 0x21, 0xd5, 0x54, 0x93,
-  0x37, 0x80, 0xb0, 0x7c, 0x0a, 0xc8, 0xff, 0x41, 0xce, 0x99, 0xf5, 0x4a,
-  0x27, 0xc4, 0xc2, 0xa2, 0x96, 0xe9, 0x3a, 0x22, 0x56, 0x6e, 0x3b, 0x23,
-  0x62, 0x12, 0x3b, 0x25, 0x0f, 0xab, 0x7f, 0xe1, 0x9c, 0x53, 0xcd, 0x0a,
-  0x62, 0x62, 0xd0, 0xdf, 0xed, 0x2a, 0xf1, 0x3a, 0x18, 0xa9, 0x14, 0x0a,
-  0x48, 0x34, 0xa0, 0xf7, 0x6e, 0x20, 0xa1, 0x06, 0x10, 0x11, 0xb9, 0x04,
-  0x5b, 0xe3, 0xde, 0x89, 0xb5, 0xae, 0x63, 0x27, 0x71, 0xf3, 0x4b, 0xe8,
-  0xb1, 0xca, 0xf6, 0x77, 0x31, 0xd2, 0xc9, 0xf3, 0x49, 0x5f, 0x60, 0xeb,
-  0xd3, 0x06, 0x33, 0x41, 0xab, 0x21, 0x88, 0x35, 0x92, 0x44, 0x9b, 0x66,
-  0x2e, 0x49, 0xe6, 0xe3, 0x7b, 0xea, 0xaf, 0x30, 0x7f, 0x5f, 0xec, 0x52,
-  0xdf, 0x91, 0xb7, 0xc7, 0x28, 0x69, 0x02, 0x81, 0x81, 0x00, 0xee, 0x41,
-  0x86, 0xc3, 0xeb, 0x5b, 0x81, 0x9b, 0x32, 0xe3, 0xbc, 0xf3, 0x68, 0x8d,
-  0x46, 0xa1, 0xcb, 0x3f, 0x49, 0x3e, 0xef, 0x42, 0x94, 0x72, 0xd2, 0x95,
-  0x22, 0x77, 0xeb, 0x32, 0xfa, 0xd8, 0x25, 0x49, 0xb1, 0xc4, 0xf1, 0x65,
-  0xf6, 0xe8, 0x83, 0xe9, 0xba, 0x07, 0xe0, 0x38, 0xc1, 0x9e, 0x03, 0x1e,
-  0xab, 0x8b, 0xdb, 0x14, 0x5d, 0x52, 0x7f, 0x52, 0xf0, 0x43, 0x95, 0x63,
-  0xac, 0x56, 0x43, 0xc8, 0x94, 0xf1, 0x16, 0x29, 0x54, 0x20, 0x29, 0x14,
-  0x0a, 0x47, 0x09, 0xfa, 0x54, 0x3d, 0x14, 0xb2, 0xfa, 0x69, 0x2d, 0xe5,
-  0xf6, 0x87, 0x78, 0x69, 0xb4, 0x90, 0xf6, 0xd3, 0xbb, 0x79, 0x8e, 0x67,
-  0xaa, 0x73, 0x57, 0x98, 0x4b, 0x6c, 0xd8, 0xd0, 0xad, 0x30, 0xdd, 0x35,
-  0x9d, 0xf2, 0x9a, 0xff, 0xbe, 0x9e, 0x74, 0x4e, 0xc3, 0xf7, 0x1d, 0xe4,
-  0x7d, 0x9c, 0x02, 0x9e, 0x5c, 0xd7, 0x02, 0x81, 0x81, 0x00, 0xe1, 0xac,
-  0x7d, 0xf7, 0x4e, 0x9f, 0x26, 0x39, 0xab, 0x92, 0xdf, 0xa5, 0x5d, 0x9f,
-  0x8a, 0x1b, 0x20, 0xe7, 0x3a, 0xd8, 0x55, 0x55, 0x79, 0x32, 0x73, 0x48,
-  0xbb, 0xf2, 0x02, 0x80, 0x2e, 0xf4, 0x29, 0x61, 0x99, 0x03, 0x4c, 0x1f,
-  0x30, 0xfd, 0x66, 0xdc, 0xfd, 0xa4, 0x9c, 0x63, 0x18, 0x20, 0x6a, 0x2c,
-  0x63, 0x91, 0x53, 0x3d, 0x76, 0x9a, 0xec, 0xfd, 0xd1, 0xad, 0x05, 0x32,
-  0x7a, 0xce, 0xa5, 0x74, 0xf9, 0x35, 0xf7, 0x09, 0xfe, 0x96, 0x96, 0xb3,
-  0x1b, 0xd6, 0xaf, 0xf4, 0xe7, 0x42, 0xcb, 0x72, 0x3c, 0x61, 0x73, 0xc8,
-  0x2f, 0xe2, 0x1d, 0xb0, 0xdd, 0x3d, 0x9b, 0xa7, 0x66, 0x59, 0x11, 0x6c,
-  0x98, 0x6a, 0xa0, 0x0b, 0xd4, 0xb4, 0x2d, 0xde, 0xdf, 0xb4, 0x10, 0xf1,
-  0x70, 0x06, 0x37, 0x22, 0xc8, 0x3a, 0xcf, 0xdb, 0x81, 0x01, 0x31, 0x6b,
-  0xfa, 0xfe, 0xa7, 0x99, 0xcd, 0xb3, 0x02, 0x81, 0x80, 0x4a, 0xd4, 0xf9,
-  0xe6, 0xff, 0x3d, 0x36, 0x6f, 0xf0, 0x83, 0xe7, 0x0c, 0xec, 0x81, 0xb2,
-  0xf5, 0x8e, 0x48, 0xca, 0x50, 0xa2, 0x05, 0x5f, 0x6a, 0xd1, 0x09, 0x56,
-  0x52, 0x23, 0xe5, 0x57, 0x34, 0x1c, 0x42, 0x11, 0x3b, 0xb2, 0x36, 0x3c,
-  0x5e, 0xbb, 0x4f, 0xe5, 0xc6, 0x23, 0x7e, 0xb0, 0x11, 0x59, 0x19, 0x80,
-  0xf7, 0xe4, 0x4f, 0x79, 0x20, 0x38, 0x2d, 0x6c, 0x99, 0x4d, 0x8a, 0x88,
-  0xce, 0x6f, 0x6b, 0xc8, 0x9c, 0x10, 0x41, 0xda, 0xd2, 0x5f, 0x14, 0x94,
-  0x45, 0xcb, 0xb4, 0x7c, 0x50, 0xd2, 0xf7, 0x83, 0xff, 0x15, 0x13, 0x6d,
-  0x63, 0x0f, 0x46, 0xe4, 0x17, 0xc3, 0xee, 0xac, 0xab, 0x79, 0x36, 0xc6,
-  0x2a, 0x84, 0x10, 0xa9, 0x5f, 0xfe, 0x99, 0x4c, 0x4c, 0x54, 0xae, 0x4a,
-  0x75, 0xb0, 0x89, 0x32, 0xed, 0xc1, 0xca, 0x1b, 0x72, 0xba, 0x48, 0xd1,
-  0xca, 0xf6, 0x67, 0x96, 0xf1, 0x02, 0x81, 0x81, 0x00, 0xc3, 0xff, 0x82,
-  0xdb, 0xc2, 0x5d, 0xf8, 0xde, 0x07, 0x84, 0xa5, 0x56, 0xc3, 0x0c, 0x67,
-  0xef, 0x0d, 0xd1, 0xa5, 0xca, 0xf3, 0xba, 0x2b, 0x6b, 0xc4, 0xb2, 0x7c,
-  0x01, 0x41, 0x68, 0xc0, 0xde, 0xef, 0xfd, 0xc2, 0xde, 0x19, 0x43, 0xd1,
-  0xd1, 0x93, 0x80, 0x05, 0x8e, 0xed, 0x00, 0x27, 0x99, 0x27, 0x7d, 0x6b,
-  0xf0, 0x70, 0xa2, 0x26, 0x1b, 0x82, 0x0f, 0x24, 0x07, 0x28, 0x47, 0x62,
-  0x5f, 0x8d, 0x56, 0x1d, 0x87, 0x60, 0x0a, 0x3f, 0x21, 0xdc, 0xba, 0xac,
-  0x47, 0xf6, 0x44, 0x36, 0x82, 0x4d, 0x9d, 0xe6, 0x91, 0x20, 0xf4, 0xd1,
-  0x99, 0x89, 0xfd, 0xec, 0xf8, 0xaf, 0xf2, 0x60, 0xb2, 0xa4, 0xae, 0x73,
-  0x65, 0xcf, 0xa0, 0xd6, 0xd8, 0xb2, 0x2a, 0x2a, 0x92, 0x02, 0x51, 0x1e,
-  0xe1, 0x57, 0x0b, 0x8f, 0x69, 0x7c, 0xd3, 0x80, 0xa4, 0x5f, 0x9f, 0x0f,
-  0xbc, 0x12, 0x26, 0x43, 0x7f, 0x02, 0x81, 0x81, 0x00, 0x9e, 0xd1, 0x72,
-  0x49, 0x64, 0x87, 0x19, 0x86, 0x03, 0xca, 0xbe, 0xf1, 0x4d, 0x38, 0xec,
-  0xb1, 0x80, 0x5b, 0xd3, 0x3b, 0x46, 0xc8, 0xbc, 0xd0, 0x29, 0x2c, 0x00,
-  0xb8, 0xf2, 0x65, 0x15, 0x6a, 0x83, 0x46, 0x53, 0x33, 0xb9, 0xc9, 0x38,
-  0x36, 0x1c, 0x9f, 0x9f, 0x9d, 0xbe, 0x7d, 0x40, 0xa1, 0xdc, 0x01, 0x31,
-  0x48, 0x1f, 0x29, 0x31, 0x21, 0x86, 0x40, 0xaf, 0x30, 0x25, 0x9b, 0x29,
-  0x04, 0x70, 0x27, 0x5c, 0x9c, 0x72, 0x1d, 0x00, 0x6a, 0xbb, 0xf0, 0xf7,
-  0x64, 0x26, 0xfe, 0x27, 0x1a, 0x29, 0x49, 0xe7, 0x60, 0x97, 0x96, 0xf3,
-  0x66, 0x01, 0x33, 0xd5, 0x6f, 0x80, 0x83, 0xf3, 0xaf, 0xd4, 0xb3, 0xd6,
-  0x33, 0xd2, 0xd0, 0xfe, 0xae, 0x78, 0xc3, 0xa7, 0x5f, 0xf6, 0x20, 0xa6,
-  0xc7, 0xcf, 0xf2, 0xcb, 0x03, 0x3d, 0x13, 0x7f, 0x2c, 0xb6, 0x64, 0x73,
-  0x2b, 0xa1, 0x19, 0x27, 0xe5
+  0x30, 0x82, 0x04, 0xa3, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00,
+  0xce, 0x51, 0xee, 0xa9, 0xf6, 0xe0, 0x2c, 0x30, 0x8c, 0x04, 0x3a, 0x0d,
+  0x74, 0x78, 0x7a, 0x93, 0x00, 0x47, 0xeb, 0x85, 0x26, 0x38, 0x70, 0x52,
+  0xeb, 0xcc, 0xf4, 0x21, 0xfe, 0x68, 0x8b, 0x1d, 0x57, 0xce, 0x9f, 0xb9,
+  0x18, 0x62, 0x99, 0x90, 0x4d, 0xc5, 0x00, 0x41, 0x71, 0x9d, 0x71, 0xcf,
+  0xf2, 0xca, 0xd5, 0x88, 0x21, 0x40, 0xfb, 0x38, 0x1d, 0xc4, 0xd4, 0xb5,
+  0xfd, 0x51, 0xdc, 0x9f, 0x8d, 0xed, 0x7b, 0x15, 0xf4, 0xd8, 0x08, 0x07,
+  0x06, 0x50, 0xe4, 0x86, 0xcc, 0x72, 0x63, 0xc1, 0x8e, 0x4c, 0xd1, 0xac,
+  0xc5, 0xdd, 0xac, 0xff, 0x3f, 0x0a, 0xde, 0x7e, 0x84, 0x4e, 0xf9, 0x92,
+  0x35, 0x1a, 0xca, 0x94, 0x85, 0x35, 0x1c, 0xcc, 0x9b, 0xda, 0x04, 0x07,
+  0xd5, 0x07, 0xf9, 0x7f, 0xb0, 0x5f, 0xdc, 0x97, 0x1a, 0xac, 0x8b, 0xdb,
+  0x56, 0x2e, 0x3f, 0x4c, 0x1d, 0x3e, 0xab, 0x0f, 0xde, 0x43, 0x18, 0xc0,
+  0xa8, 0x61, 0xff, 0xac, 0xe6, 0x46, 0x90, 0x60, 0xb1, 0x6c, 0x72, 0x3d,
+  0x38, 0x27, 0xcb, 0xb4, 0x3c, 0x6e, 0x61, 0x6f, 0x9e, 0x44, 0xfd, 0xe7,
+  0xd7, 0x07, 0x9b, 0x5a, 0x00, 0xfa, 0x17, 0x8c, 0xa7, 0x8a, 0x31, 0x5d,
+  0x77, 0x18, 0xd4, 0xec, 0xa3, 0x54, 0x64, 0xe2, 0x7b, 0x56, 0xde, 0xf2,
+  0x6f, 0x94, 0xc3, 0xd4, 0xa9, 0xe0, 0xed, 0x96, 0xa2, 0x5c, 0x57, 0xa7,
+  0x49, 0xc4, 0x84, 0xe8, 0x8e, 0xc5, 0xb0, 0xd1, 0x56, 0x05, 0x36, 0xe8,
+  0xd1, 0xd5, 0x57, 0xb7, 0xbc, 0x31, 0xc3, 0xe6, 0x3f, 0x78, 0x09, 0x3e,
+  0x25, 0xdc, 0x05, 0x62, 0xd3, 0xef, 0xde, 0xa8, 0xb9, 0x42, 0x3a, 0x16,
+  0x82, 0xc7, 0x83, 0x46, 0x65, 0xf2, 0xe0, 0xbb, 0xf4, 0x25, 0x4f, 0x5d,
+  0xcb, 0x7c, 0x96, 0x76, 0x7c, 0x4c, 0xed, 0xcb, 0xe3, 0xbb, 0x0c, 0xaa,
+  0x44, 0xbf, 0x36, 0x47, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x01,
+  0x01, 0x00, 0xca, 0xf3, 0x97, 0x94, 0xc3, 0x8f, 0x82, 0x88, 0x82, 0xc3,
+  0x09, 0xa4, 0x00, 0xa5, 0x1e, 0xd6, 0x09, 0x99, 0xb5, 0x98, 0xf5, 0x9e,
+  0xe1, 0x07, 0x00, 0x83, 0x4c, 0xc7, 0x3f, 0xad, 0xf0, 0xe2, 0x7d, 0x64,
+  0x78, 0x83, 0xa7, 0xf4, 0x1d, 0xe0, 0xf0, 0x4f, 0x50, 0x50, 0x10, 0x05,
+  0xf3, 0x55, 0xbe, 0x1c, 0x3e, 0x6e, 0x39, 0x5f, 0xe5, 0x7f, 0x2e, 0xf1,
+  0x56, 0xd8, 0x6a, 0x86, 0xa3, 0x42, 0xa4, 0x67, 0x2e, 0x03, 0xcc, 0x24,
+  0xd1, 0xc8, 0xaf, 0x32, 0xd5, 0x89, 0xb0, 0x04, 0xfa, 0x12, 0x04, 0xfb,
+  0x95, 0xe9, 0xa1, 0x7d, 0xcc, 0xd6, 0x0c, 0x5a, 0x91, 0xc0, 0xdc, 0x3f,
+  0x9f, 0x8a, 0x6e, 0x08, 0x9b, 0xab, 0xfb, 0x58, 0xe2, 0xaa, 0x76, 0xc8,
+  0xbf, 0xdc, 0x40, 0x77, 0x26, 0xbb, 0xaf, 0x70, 0xac, 0xda, 0x4a, 0xd7,
+  0xde, 0x7f, 0x74, 0xc7, 0xeb, 0x65, 0xe1, 0x02, 0xab, 0x5b, 0x1c, 0x3a,
+  0xbd, 0x01, 0xb7, 0x00, 0x0a, 0x55, 0x72, 0x21, 0xb2, 0xa9, 0x4a, 0x4f,
+  0xa4, 0x1d, 0x48, 0x92, 0xc0, 0x57, 0x24, 0xf9, 0xd1, 0x63, 0xb3, 0x64,
+  0x09, 0xe7, 0xb6, 0x2a, 0x0d, 0x50, 0xdd, 0xdf, 0xe9, 0xeb, 0x77, 0x5a,
+  0xf1, 0x91, 0x63, 0xd1, 0xfb, 0x8d, 0x03, 0x5d, 0x34, 0xcd, 0xd2, 0x6c,
+  0x0b, 0xbe, 0x77, 0xc1, 0x76, 0x62, 0xef, 0x71, 0xe3, 0x5d, 0x0c, 0xb3,
+  0x48, 0xdd, 0x63, 0x35, 0x48, 0xdd, 0xa0, 0x71, 0xbc, 0x7e, 0x53, 0xa7,
+  0x5e, 0x58, 0x53, 0x00, 0xe1, 0x65, 0xd2, 0x19, 0x8e, 0xe7, 0x99, 0xf2,
+  0xf1, 0x5d, 0xa4, 0xcd, 0x7e, 0xb4, 0x62, 0x76, 0x65, 0x99, 0x49, 0x31,
+  0xcc, 0x93, 0x31, 0xe5, 0xc6, 0xc5, 0xfc, 0x17, 0x94, 0x15, 0xd6, 0x39,
+  0x30, 0xef, 0x97, 0x77, 0x76, 0xb0, 0xc8, 0x2d, 0xf1, 0xe9, 0xda, 0xd1,
+  0xe6, 0x85, 0xd9, 0x4f, 0x3c, 0x89, 0x02, 0x81, 0x81, 0x00, 0xf7, 0xb2,
+  0x98, 0xca, 0x7a, 0x84, 0x5f, 0x3e, 0x11, 0xc2, 0x7a, 0x72, 0xf9, 0x15,
+  0xd3, 0x05, 0xad, 0xb1, 0x96, 0xdc, 0xa0, 0xb6, 0x88, 0x61, 0x40, 0x54,
+  0x76, 0xc9, 0x3f, 0xc1, 0x0e, 0x5d, 0xd2, 0x7d, 0xc4, 0x50, 0x44, 0x61,
+  0x18, 0x93, 0x5a, 0xe1, 0xe8, 0xec, 0x8b, 0xe5, 0xd7, 0x54, 0xbc, 0xeb,
+  0x23, 0x30, 0xbd, 0x9b, 0xde, 0xc6, 0x52, 0xe5, 0xc8, 0x18, 0xc5, 0x45,
+  0x1b, 0x38, 0x80, 0x54, 0xa8, 0x60, 0x77, 0x8f, 0x9e, 0xaa, 0x93, 0x38,
+  0xa4, 0x74, 0xe5, 0x58, 0xa5, 0x5d, 0x2d, 0xa6, 0x30, 0xfa, 0x13, 0xfd,
+  0xf9, 0xf6, 0x57, 0xcc, 0x13, 0x5d, 0x25, 0xf1, 0x19, 0x7e, 0xe4, 0x7c,
+  0xb7, 0xc2, 0x0c, 0x18, 0x59, 0x64, 0x50, 0xd2, 0x4e, 0x7e, 0x37, 0x83,
+  0xc1, 0x92, 0x89, 0x20, 0x30, 0xd5, 0x18, 0x9a, 0xb7, 0x2b, 0x7b, 0xb4,
+  0x7f, 0xc9, 0xf6, 0xd3, 0x12, 0xad, 0x02, 0x81, 0x81, 0x00, 0xd5, 0x3c,
+  0x4a, 0x14, 0xbb, 0x71, 0x0f, 0xc1, 0x33, 0x01, 0x82, 0xe2, 0xb6, 0x66,
+  0x99, 0x82, 0xc9, 0xfe, 0x77, 0xed, 0xda, 0x4a, 0x2b, 0xb3, 0xf6, 0xa7,
+  0x7d, 0xd7, 0x17, 0xa4, 0xd3, 0x2c, 0x5a, 0x73, 0x21, 0x0a, 0x67, 0x29,
+  0x65, 0x1c, 0x7a, 0xc8, 0x72, 0x4e, 0xef, 0xc1, 0xa8, 0x69, 0xe0, 0x6b,
+  0xd8, 0x0d, 0x56, 0x56, 0x51, 0x05, 0xc9, 0x6f, 0x41, 0x88, 0x03, 0x68,
+  0xe9, 0xef, 0xa0, 0x5e, 0xb3, 0xce, 0x1d, 0x4e, 0x27, 0xc9, 0x09, 0x47,
+  0x2e, 0x71, 0x9d, 0x7f, 0xa7, 0x4c, 0xb2, 0x2a, 0xf2, 0x6c, 0xce, 0xc9,
+  0x76, 0x89, 0x64, 0xc7, 0x29, 0x96, 0xd5, 0xf7, 0xe8, 0x72, 0x7c, 0x5e,
+  0x45, 0x76, 0x4c, 0x80, 0x0a, 0x70, 0x02, 0xed, 0x00, 0xb9, 0xad, 0xe0,
+  0xec, 0x3f, 0xe7, 0x08, 0xfc, 0x29, 0xbc, 0x2c, 0xf5, 0x15, 0xec, 0x02,
+  0xf0, 0x74, 0x5f, 0x63, 0xff, 0x43, 0x02, 0x81, 0x80, 0x10, 0xa3, 0x2c,
+  0x64, 0x1d, 0x4a, 0x9a, 0xe3, 0x1e, 0x6a, 0x43, 0xb3, 0x49, 0x4b, 0xcf,
+  0xfa, 0xc7, 0xa9, 0xf0, 0x0a, 0x2d, 0xb9, 0x54, 0xfb, 0xc3, 0x48, 0x69,
+  0x1a, 0x27, 0x70, 0x1e, 0x38, 0xeb, 0x14, 0x8b, 0x85, 0x20, 0xb2, 0xac,
+  0xe5, 0xe8, 0xea, 0xd7, 0xac, 0x5b, 0xd1, 0x3a, 0x5f, 0x74, 0xb9, 0x0e,
+  0x8a, 0x0d, 0x92, 0x54, 0xaa, 0x59, 0x93, 0x19, 0x97, 0xa0, 0x58, 0x7d,
+  0xf5, 0x93, 0x99, 0x1c, 0x1e, 0x2e, 0xa9, 0xb4, 0xec, 0x9c, 0x2a, 0xe7,
+  0xd0, 0xfa, 0x3e, 0xb4, 0x0c, 0xc8, 0x2e, 0x2b, 0x88, 0x00, 0xa3, 0xc4,
+  0x90, 0x69, 0x61, 0x49, 0xc3, 0xad, 0xf2, 0xbd, 0xd5, 0xaa, 0x1f, 0x3e,
+  0x70, 0x88, 0x43, 0x72, 0x6d, 0xac, 0x88, 0x13, 0xc1, 0xa2, 0x94, 0xf5,
+  0x01, 0x94, 0xb8, 0x56, 0xcf, 0x59, 0x71, 0xba, 0xef, 0xee, 0xc5, 0x36,
+  0xf8, 0x27, 0xde, 0x11, 0x99, 0x02, 0x81, 0x80, 0x2b, 0xca, 0x84, 0xe0,
+  0x3b, 0x1a, 0x5e, 0x04, 0xec, 0x47, 0xac, 0x2c, 0x89, 0x0f, 0x0b, 0x09,
+  0xac, 0x18, 0x01, 0x63, 0x2c, 0x88, 0x3c, 0xef, 0x69, 0x81, 0x3e, 0x3b,
+  0xb5, 0x14, 0x59, 0x75, 0xeb, 0x61, 0x67, 0x70, 0xae, 0x7c, 0xf6, 0xd1,
+  0xe1, 0x79, 0x56, 0xd8, 0x55, 0x2e, 0xad, 0x3a, 0x89, 0x27, 0x3c, 0xa8,
+  0x88, 0x89, 0x93, 0x7c, 0x1f, 0xc1, 0x24, 0x71, 0x1d, 0x5a, 0x27, 0x68,
+  0xd9, 0xc3, 0x79, 0x23, 0xa4, 0x2b, 0x0f, 0xca, 0x9e, 0x88, 0x2a, 0xc6,
+  0x94, 0x74, 0xc9, 0xd3, 0xdb, 0x67, 0x2c, 0x80, 0x21, 0xfb, 0x87, 0xc7,
+  0x71, 0x95, 0xe1, 0x39, 0xa3, 0xd9, 0x94, 0xb8, 0x26, 0x48, 0x69, 0xf5,
+  0x80, 0x82, 0x6f, 0x22, 0x4f, 0xc7, 0x82, 0x75, 0x9f, 0x7a, 0xe8, 0xa9,
+  0xba, 0xf5, 0xc2, 0x6b, 0x83, 0xc4, 0xab, 0xd4, 0x83, 0xb2, 0x9a, 0xd5,
+  0x1b, 0x5d, 0xfa, 0xe7, 0x02, 0x81, 0x80, 0x01, 0x3b, 0xaf, 0x5b, 0xad,
+  0x06, 0xa6, 0x3d, 0x6c, 0x66, 0x4f, 0x3d, 0x98, 0x15, 0xbd, 0x14, 0xee,
+  0x8b, 0xb0, 0x6b, 0x06, 0x62, 0x1c, 0x34, 0xee, 0x8f, 0x10, 0x42, 0x75,
+  0x78, 0x75, 0x9a, 0x07, 0x6d, 0x26, 0x29, 0xc3, 0xf0, 0x22, 0xd8, 0x17,
+  0xdb, 0xb8, 0x8c, 0x2b, 0x28, 0xad, 0x9b, 0x0c, 0x93, 0x65, 0xff, 0xb9,
+  0x5b, 0x06, 0x66, 0x0b, 0xe3, 0xf5, 0x4e, 0x3b, 0xb8, 0x29, 0xb9, 0xf8,
+  0xdf, 0xd0, 0x07, 0x2d, 0x77, 0x6b, 0x83, 0x1c, 0x3d, 0xdb, 0xaa, 0xe3,
+  0xea, 0xcf, 0x30, 0xd9, 0x8b, 0x27, 0x89, 0xf4, 0x67, 0xea, 0xd1, 0xd4,
+  0x16, 0x3e, 0x56, 0x6a, 0x9a, 0x02, 0x62, 0xfb, 0xda, 0x1b, 0xff, 0x84,
+  0x03, 0x1e, 0xc9, 0xf7, 0xd8, 0x18, 0xef, 0x0c, 0x97, 0x3d, 0xfa, 0xb7,
+  0x3d, 0xd6, 0xdd, 0x52, 0x47, 0xb4, 0xa8, 0x6f, 0x1b, 0xec, 0xb2, 0x0d,
+  0xcd, 0x40, 0x63
 };
-unsigned int cert_key_der_len = 1193;
+unsigned int cert_key_der_len = 1191;

data/example/bug5.rb

@@ -14,7 +14,7 @@ Daemonite.new do
     t.add_object :M, mt, OPCUA::MANDATORY
   }
 
-  tools = server.objects.instantiate(:KalimatC34, tt)
+  tools = server.objects.manifest(:KalimatC34, tt)
 
   run do
     sleep server.run

data/example/client_get_float.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+require_relative '../lib/opcua/client'
+
+client = OPCUA::Client.new("opc.tcp://128.130.57.76:4840")
+client.subscription_interval = 100 # default 500
+
+if (node = client.get 1, 'DISPLAY_VOLTAGE')  # get node from nodeid
+  p node
+  p node.value
+else
+  p 'invalid nodeid'
+end

data/example/client_method.rb

@@ -13,6 +13,9 @@ client.default_ns = 2
 # p node.call 'abcde', Time.now
 # client.disconnect
 
-node = client.get 1, 62541
-p node.to_s
-p node.call 'a'
+# node = client.get 1, 62541
+# p node.to_s
+# p node.call 'a'
+
+node = client.get '/KalimatC34/Tools/Tool3/testRetMethod'
+p node.call 'abcde'

data/example/server.rb

@@ -27,6 +27,14 @@ Daemonite.new do
         p test2
         puts '-' * 10
       end
+      t.add_method :testRetMethod, test1: OPCUA::TYPES::STRING, return: OPCUA::TYPES::STRING do |node, test1|
+        ns, nid = node.id
+        puts '-' * 10
+        p nid
+        p test1
+        puts '-' * 10
+        "hello world"
+      end
       t.add_object(:Measurements, opts['server'].types.folder).tap{ |u|
         u.add_object :M, mt, OPCUA::OPTIONAL
       }

data/example/server_xml.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/ruby
+require_relative '../lib/opcua/server'
+
+Daemonite.new do
+  on startup do |opts|
+    srv = opts['server'] = OPCUA::Server.new
+    srv.import_UA # FIX
+    srv.import_nodeset File::read('nodeset1.xml')
+    srv.import_nodeset File::read('nodeset1.xml')
+    srv.import_nodeset File::read('nodeset1.xml')
+    DI  = srv.imports['http://xxxxx/DI']
+    AID = srv.imports['http://xxxxx/AutoID']
+
+    srv.objects
+
+    # ab 106 im nodesets.rb
+    x = srv.data_types.add(qualifiedname,referencetype=UA::HasSubtype,nodeid=rand())
+    x.displayname['en-US'] = 'rrr'
+    x.displayname['de'] = 'rrr'
+    x.displayname.delete('de')
+
+    srv.data_types.bla.blurg.add(wieheissts')
+    srv.data_types.bla.blurg.push(wieheissts')
+    srv.data_types.bla.blurg.<<('wieheissts')
+    x = srv.data_types.bla.find name: 'bla', type: SUBXXXX
+    [x] = srv.data_types.bla.find_all name: 'bla', type: SUBXXXX
+    [x] = srv.data_types.bla.select name: 'bla', type: SUBXXXX
+    srv.data_types.bla.parent
+
+    # srv.event_types
+    # srv.interfaces_types
+
+    srv.reference_types.add(qualifiedname,symmetric,referencetype,nodeid)
+    srv.reference_types.add_symmetric(qualifiedname,referencetype,nodeid)
+
+    srv.variable_types
+    srv.object_types
+
+    p server.add_namespace "https://centurio.work/kelch"
+    p server.active_namespace
+    server.active_namespace = 0
+    p server.active_namespace
+    p server.namespaces
+
+
+    tools = opts['server'].objects.manifest(:KalimatC34, pt).find(:Tools)
+
+    t1 = tools.manifest(:Tool1,tt)
+    t2 = tools.manifest(:Tool2,tt)
+    t3 = tools.manifest(:Tool3,tt)
+
+    opts[:tn] = t1.find(:ToolNumber)
+    opts[:tn].description = 'test test'
+    opts[:tn].value = [0,1]
+    p opts[:tn].description
+    p opts[:tn].to_s
+    p opts[:tn].name
+
+    measurments_t1 = t1.find(:Measurements)
+    measurments_t1.manifest(:M1,mt)
+    m2 = measurments_t1.manifest(:M2,mt)
+  rescue => e
+    puts e.message
+  end
+
+
+  counter = 0
+  run do |opts|
+    GC.start
+    sleep opts['server'].run
+    # if counter % 100 == 0
+    #   opts[:tn].value = [counter, counter]
+    #   # opts[:tn].value = 1
+    #   p opts[:tn].value
+    # end
+    # counter += 1
+  rescue => e
+    puts e.message
+  end
+
+  on exit do
+    # we could disconnect here, but OPCUA::Server does not have an explicit disconnect
+    puts 'bye.'
+  end
+end.loop!

data/ext/opcua/client/client.c

@@ -320,7 +320,7 @@ static VALUE client_init(VALUE self,VALUE url,VALUE user,VALUE pass) { //{{{
     }
     char *pstr = (char *)StringValuePtr(vpstr);
 
-    retval = UA_Client_connect_username(pss->master, nstr, ustr, pstr);
+    retval = UA_Client_connectUsername(pss->master, nstr, ustr, pstr);
   }
   if (retval != UA_STATUSCODE_GOOD) {
     pss->started = false;
@@ -631,7 +631,7 @@ void Init_client(void) {
   cMethodNode = rb_define_class_under(cClient, "cMethodNode", cNode);
   cVarNode    = rb_define_class_under(cClient, "cVarNode", cNode);
 
-  Init_types();
+  Init_types(mOPCUA);
 
   rb_define_alloc_func(cClient, client_alloc);
   rb_define_method(cClient, "initialize", client_init, 3);

data/ext/opcua/helpers/finders.c

@@ -46,6 +46,34 @@ bool server_node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *r
   return false;
 }
 
+bool server_node_get_reference_by_name(UA_Server *server, UA_NodeId parent, UA_QualifiedName name, UA_NodeId *result, bool inverse) {
+	UA_BrowseDescription bDes;
+  UA_BrowseDescription_init(&bDes);
+  bDes.nodeId = parent;
+  bDes.resultMask = UA_BROWSERESULTMASK_ALL;
+  bDes.browseDirection = inverse ? 1 : 0;
+  UA_BrowseResult bRes = UA_Server_browse(server, 999, &bDes);
+
+  for (int i=0; i < bRes.referencesSize; i++) {
+    UA_ReferenceDescription *ref = &(bRes.references[i]);
+
+    UA_QualifiedName qn;  UA_QualifiedName_init(&qn);
+    UA_Server_readBrowseName(server, ref->nodeId.nodeId, &qn);
+
+    if (UA_QualifiedName_equal(&qn,&name)) {
+      UA_NodeId_copy(&ref->nodeId.nodeId,result);
+
+      UA_BrowseResult_deleteMembers(&bRes);
+      UA_BrowseResult_clear(&bRes);
+      return true;
+    }
+  }
+
+  UA_BrowseResult_deleteMembers(&bRes);
+  UA_BrowseResult_clear(&bRes);
+  return false;
+}
+
 bool client_node_get_reference_by_name(UA_Client *client, UA_NodeId parent, UA_QualifiedName name, UA_NodeId *result, bool inverse) {
   UA_BrowseRequest bReq;
   UA_BrowseRequest_init(&bReq);

data/ext/opcua/helpers/finders.h

@@ -6,6 +6,7 @@
 
 RUBY_EXTERN UA_BrowsePathResult node_browse_path(UA_Server *server, UA_NodeId relative, UA_NodeId ref, UA_QualifiedName mqn, bool inverse);
 RUBY_EXTERN bool server_node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *result, bool inverse);
+RUBY_EXTERN bool server_node_get_reference_by_name(UA_Server *server, UA_NodeId parent, UA_QualifiedName name, UA_NodeId *result, bool inverse);
 RUBY_EXTERN bool client_node_get_reference_by_name(UA_Client *client, UA_NodeId parent, UA_QualifiedName name, UA_NodeId *result, bool inverse);
 RUBY_EXTERN bool client_node_get_reference_by_type(UA_Client *client, UA_NodeId parent, UA_NodeId type, UA_NodeId *result, bool inverse);
 RUBY_EXTERN bool client_node_list_references(UA_Client *client, UA_NodeId parent, bool inverse);

data/ext/opcua/helpers/values.c

@@ -1,6 +1,6 @@
 #include "values.h"
 
-VALUE mOPCUA;
+VALUE mTYPES;
 
 /* -- */
 static void variant_set_one_dimension(UA_Variant *variant,UA_UInt32 len) { //{{{
@@ -154,8 +154,16 @@ bool value_to_variant(VALUE value, UA_Variant *variant, UA_UInt32 proposal) { //
       case T_SYMBOL:
         {
           VALUE str = rb_obj_as_string(value);
-          UA_String tmp = UA_STRING(StringValuePtr(str));
-          UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_STRING]);
+          if (proposal == UA_TYPES_BYTESTRING) {
+            UA_ByteString tmp = UA_BYTESTRING(StringValuePtr(str));
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_BYTESTRING]);
+          } else if (proposal == UA_TYPES_NODEID) {
+            UA_NodeId tmp = UA_NODEID(StringValuePtr(str));
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_NODEID]);
+          } else {
+            UA_String tmp = UA_STRING(StringValuePtr(str));
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_STRING]);
+          }
           done = true;
           break;
         }
@@ -171,16 +179,19 @@ bool value_to_variant(VALUE value, UA_Variant *variant, UA_UInt32 proposal) { //
   return done;
 } //}}}
 
-void Init_types() {/*{{{*/
+void Init_types(VALUE mOPCUA) {/*{{{*/
   mTYPES = rb_define_module_under(mOPCUA,"TYPES");
   rb_define_const(mTYPES, "DATETIME",            INT2NUM(UA_TYPES_DATETIME           ));
   rb_define_const(mTYPES, "BOOLEAN",             INT2NUM(UA_TYPES_BOOLEAN            ));
+  rb_define_const(mTYPES, "FLOAT",               INT2NUM(UA_TYPES_FLOAT              ));
   rb_define_const(mTYPES, "DOUBLE",              INT2NUM(UA_TYPES_DOUBLE             ));
   rb_define_const(mTYPES, "INT32",               INT2NUM(UA_TYPES_INT32              ));
   rb_define_const(mTYPES, "INT16",               INT2NUM(UA_TYPES_INT16              ));
   rb_define_const(mTYPES, "UINT32",              INT2NUM(UA_TYPES_UINT32             ));
   rb_define_const(mTYPES, "UINT16",              INT2NUM(UA_TYPES_UINT16             ));
   rb_define_const(mTYPES, "STRING",              INT2NUM(UA_TYPES_STRING             ));
+  rb_define_const(mTYPES, "BYTESTRING",          INT2NUM(UA_TYPES_BYTESTRING         ));
+  rb_define_const(mTYPES, "NODEID",              INT2NUM(UA_TYPES_NODEID             ));
 }/*}}}*/
 
 static VALUE UA_TYPES_DATETIME_to_value(UA_DateTime data) { //{{{
@@ -189,6 +200,9 @@ static VALUE UA_TYPES_DATETIME_to_value(UA_DateTime data) { //{{{
 static VALUE UA_TYPES_BOOLEAN_to_value(UA_Boolean data) { //{{{
   return data ? Qtrue : Qfalse;
 } //}}}
+static VALUE UA_TYPES_FLOAT_to_value(UA_Float data) { //{{{
+  return DBL2NUM((double)data);
+} //}}}
 static VALUE UA_TYPES_DOUBLE_to_value(UA_Double data) { //{{{
   return DBL2NUM(data);
 } //}}}
@@ -213,6 +227,9 @@ static VALUE UA_TYPES_UINT16_to_value(UA_UInt16 data) { //{{{
 static VALUE UA_TYPES_STRING_to_value(UA_String data) { //{{{
   return rb_str_export_locale(rb_str_new((char *)(data.data),data.length));
 } //}}}
+static VALUE UA_TYPES_BYTESTRING_to_value(UA_ByteString data) { //{{{
+  return rb_str_export_locale(rb_str_new((char *)(data.data),data.length));
+} //}}}
 
 VALUE extract_value(UA_Variant value) { //{{{
   VALUE ret = rb_ary_new2(2);
@@ -228,6 +245,9 @@ VALUE extract_value(UA_Variant value) { //{{{
     } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
       rb_ary_store(ret,0,UA_TYPES_BOOLEAN_to_value(*(UA_Boolean *)value.data));
       rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Boolean")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_FLOAT])) {
+      rb_ary_store(ret,0,UA_TYPES_FLOAT_to_value(*(UA_Float *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Float")));
     } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DOUBLE])) {
       rb_ary_store(ret,0,UA_TYPES_DOUBLE_to_value(*(UA_Double *)value.data));
       rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Double")));
@@ -252,6 +272,11 @@ VALUE extract_value(UA_Variant value) { //{{{
     } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_STRING])) {
       rb_ary_store(ret,0,UA_TYPES_STRING_to_value(*(UA_String *)value.data));
       rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.String")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_BYTESTRING])) {
+      rb_ary_store(ret,0,UA_TYPES_BYTESTRING_to_value(*(UA_ByteString *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.String")));
+    } else {
+      //printf("Unknown Datatype\n");
     }
   } else if (value.arrayDimensionsSize == 1 || (value.arrayDimensionsSize == 0 && value.arrayLength > 0)) {
     if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_DATETIME])) {
@@ -268,6 +293,13 @@ VALUE extract_value(UA_Variant value) { //{{{
       for (int i=0; i < value.arrayLength; i++) {
         rb_ary_push(res,UA_TYPES_BOOLEAN_to_value(((UA_Boolean *)value.data)[i]));
       }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_FLOAT])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Float")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_FLOAT_to_value(((UA_Float *)value.data)[i]));
+      }
     } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_DOUBLE])) {
       VALUE res = rb_ary_new();
       rb_ary_store(ret,0,res);

data/ext/opcua/helpers/values.h

@@ -4,9 +4,8 @@
 #include <open62541.h>
 #include <ruby.h>
 
-VALUE mTYPES;
 RUBY_EXTERN bool value_to_variant(VALUE value, UA_Variant *variant, UA_UInt32 proposal);
-RUBY_EXTERN void Init_types();
+RUBY_EXTERN void Init_types(VALUE mOPCUA);
 RUBY_EXTERN VALUE extract_value(UA_Variant value);
 
 #endif

data/ext/opcua/server/server.c

@@ -224,11 +224,15 @@ static UA_StatusCode node_add_method_callback( //{{{
     rb_ary_push(args,rb_ary_entry(ret,0));
   }
 
-  rb_proc_call(me->method,args);
+  VALUE ret = rb_proc_call(me->method,args);
+
+  if (outputSize == 1) {
+    value_to_variant(ret,output,-1);
+  }
 
   return UA_STATUSCODE_GOOD;
 } //}}}
-static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent,size_t inputArgumentsSize,const UA_Argument *inputArguments, VALUE blk) { //{{{
+static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent,size_t inputArgumentsSize,const UA_Argument *inputArguments,size_t outputArgumentsSize,const UA_Argument *outputArguments, VALUE blk) { //{{{
   UA_MethodAttributes mnAttr = UA_MethodAttributes_default;
   mnAttr.displayName = dn;
   mnAttr.executable = true;
@@ -248,8 +252,8 @@ static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_Qualifi
                          &node_add_method_callback,
                          inputArgumentsSize,
                          inputArguments,
-                         0,
-                         NULL,
+                         outputArgumentsSize,
+                         outputArguments,
                          (void *)me,
                          NULL);
 
@@ -264,6 +268,8 @@ static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_Qualifi
 } //}}}
 static UA_NodeId node_add_method_ua_simple(char* nstr, node_struct *parent, VALUE opts, VALUE blk) { //{{{
   UA_Argument inputArguments[RHASH_SIZE(opts)];
+  UA_Argument outputArguments[1];
+  int counter = 0;
 
   VALUE ary = rb_funcall(opts, rb_intern("to_a"), 0);
   for (long i=0; i<RARRAY_LEN(ary); i++) {
@@ -272,11 +278,20 @@ static UA_NodeId node_add_method_ua_simple(char* nstr, node_struct *parent, VALU
     if (NIL_P(str) || TYPE(str) != T_STRING)
       rb_raise(rb_eTypeError, "cannot convert obj to string");
     char *nstr = (char *)StringValuePtr(str);
-    UA_Argument_init(&inputArguments[i]);
-    inputArguments[i].description = UA_LOCALIZEDTEXT("en-US", nstr);
-    inputArguments[i].name = UA_STRING(nstr);
-    inputArguments[i].dataType = UA_TYPES[NUM2INT(RARRAY_AREF(item, 1))].typeId;
-    inputArguments[i].valueRank = UA_VALUERANK_SCALAR;
+    if (rb_str_cmp(str,rb_str_new2("return"))) {
+      UA_Argument_init(&inputArguments[counter]);
+      inputArguments[counter].description = UA_LOCALIZEDTEXT("en-US", nstr);
+      inputArguments[counter].name = UA_STRING(nstr);
+      inputArguments[counter].dataType = UA_TYPES[NUM2INT(RARRAY_AREF(item, 1))].typeId;
+      inputArguments[counter].valueRank = UA_VALUERANK_SCALAR;
+      counter++;
+    } else {
+      UA_Argument_init(&outputArguments[0]);
+      outputArguments[0].description = UA_LOCALIZEDTEXT("en-US", nstr);
+      outputArguments[0].name = UA_STRING(nstr);
+      outputArguments[0].dataType = UA_TYPES[NUM2INT(RARRAY_AREF(item, 1))].typeId;
+      outputArguments[0].valueRank = UA_VALUERANK_SCALAR;
+    }
   }
   int nodeid = nodecounter++;
 
@@ -288,8 +303,10 @@ static UA_NodeId node_add_method_ua_simple(char* nstr, node_struct *parent, VALU
     UA_LOCALIZEDTEXT("en-US", nstr),
     UA_QUALIFIEDNAME(parent->master->default_ns, nstr),
     parent,
-    RHASH_SIZE(opts),
+    counter,
     inputArguments,
+    RHASH_SIZE(opts)-counter,
+    outputArguments,
     blk
   );
 } //}}}
@@ -556,16 +573,38 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
             UA_BrowsePathResult_clear(&property);
           }
           if(nc == UA_NODECLASS_METHOD) {
-            UA_NodeId ttt;
+            UA_NodeId ia;
+            UA_NodeId oa;
             VALUE blk = rb_hash_aref(parent->master->methods,INT2NUM(child_id.identifier.numeric));
-            if (server_node_get_reference(parent->master->master, child_id, &ttt, false)) {
+
+            bool iacheck = server_node_get_reference_by_name(parent->master->master, child_id, UA_QUALIFIEDNAME(0,"InputArguments"), &ia, false);
+            bool oacheck = server_node_get_reference_by_name(parent->master->master, child_id, UA_QUALIFIEDNAME(0,"OutputArguments"), &oa, false);
+            if (iacheck && oacheck) {
+              UA_Variant arv1; UA_Variant_init(&arv1);
+              UA_Variant arv2; UA_Variant_init(&arv2);
+              UA_Server_readValue(parent->master->master, ia, &arv1);
+              UA_Server_readValue(parent->master->master, oa, &arv2);
+
+              // todo differentiate between input and output reference
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,arv1.arrayLength,(UA_Argument *)arv1.data,arv2.arrayLength,(UA_Argument *)arv2.data,blk);
+              UA_Variant_clear(&arv1);
+              UA_Variant_clear(&arv2);
+            } else if (iacheck) {
+              UA_Variant arv; UA_Variant_init(&arv);
+              UA_Server_readValue(parent->master->master, ia, &arv);
+
+              // todo differentiate between input and output reference
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,arv.arrayLength,(UA_Argument *)arv.data,0,NULL,blk);
+              UA_Variant_clear(&arv);
+            } else if (oacheck) {
               UA_Variant arv; UA_Variant_init(&arv);
-              UA_Server_readValue(parent->master->master, ttt, &arv);
+              UA_Server_readValue(parent->master->master, oa, &arv);
 
-              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,arv.arrayLength,(UA_Argument *)arv.data,blk);
+              // todo differentiate between input and output reference
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,0,NULL,arv.arrayLength,(UA_Argument *)arv.data,blk);
               UA_Variant_clear(&arv);
             } else {
-              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,0,NULL,blk);
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,0,NULL,0,NULL,blk);
             }
           }
         }
@@ -939,7 +978,7 @@ void Init_server(void) {
   rb_define_const(mOPCUA, "BASEDATAVARIABLETYPE", INT2NUM(UA_NS0ID_BASEDATAVARIABLETYPE));
   rb_define_const(mOPCUA, "PROPERTYTYPE", INT2NUM(UA_NS0ID_PROPERTYTYPE));
 
-  Init_types();
+  Init_types(mOPCUA);
 
   cServer            = rb_define_class_under(mOPCUA, "Server", rb_cObject);
   cNode              = rb_define_class_under(cServer, "Node", rb_cObject);
@@ -974,7 +1013,7 @@ void Init_server(void) {
   rb_define_method(cNode, "exists?", node_exists, 0);
 
   rb_define_method(cTypeTopNode, "add_object_type", node_add_object_type, 1);
-  rb_define_method(cTypeTopNode, "add_reference_type", node_add_reference_type, 1);
+  rb_define_method(cTypeTopNode, "add_reference_type", node_add_reference_type, 2);
   rb_define_method(cTypeTopNode, "folder", node_type_folder, 0);
 
   rb_define_method(cTypeSubNode, "add_object_type", node_add_object_type, 1);

data/opcua.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "opcua"
-  s.version          = "0.16"
+  s.version          = "0.21"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of opcua (open62541) ruby bindings. C performance, Ruby elegance, simplicity, and productivity."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opcua
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.21'
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -74,6 +74,7 @@ files:
 - cert/cert.h
 - cert/cert_key.h
 - example/bug5.rb
+- example/client_get_float.rb
 - example/client_get_sync.rb
 - example/client_get_value.rb
 - example/client_method.rb
@@ -83,6 +84,7 @@ files:
 - example/server.rb
 - example/server_deep.rb
 - example/server_values.rb
+- example/server_xml.rb
 - example/test.rb
 - ext/opcua/client/client.c
 - ext/opcua/client/client.h
@@ -136,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Preliminary release of opcua (open62541) ruby bindings. C performance, Ruby