RubyGems - opcua - Versions diffs - 0.21 → 0.26 - Mend

opcua 0.21 → 0.26

Files changed (13) hide show

checksums.yaml +4 -4
data/README.md +16 -1
data/cert/cert.h +52 -52
data/cert/cert_key.h +99 -99
data/example/client_subscription.rb +6 -0
data/example/server_values_callback.rb +43 -0
data/ext/opcua/client/client.c +30 -14
data/ext/opcua/client/client.h +2 -2
data/ext/opcua/helpers/finders.c +0 -6
data/ext/opcua/server/server.c +109 -21
data/lib/opcua/server.rb +16 -4
data/opcua.gemspec +2 -2
metadata +8 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dede52136945d72311f619c6fe2299896aeb67eb00db4a6a2ebc0c985422c7d6
-  data.tar.gz: 285eb4c834021ae986c91d492a7e77fb847947be66c69284c24a187dfee816d5
+  metadata.gz: e0bd449baa58c495096569ded2e6a50df7e0554ff273b0c853ae8302dc33e544
+  data.tar.gz: b6d8ee15542d9be07673ea0522c88f19e0309261ff454cf47f4f1d3b8b8fc927
 SHA512:
-  metadata.gz: a75f3952786bdf049432cf6dd46a11f770f6da45d5fcbf8a95ed9528e122e1918cafbfacf8e2a7c80c40987c598601a5326834c4905ecb5e080adfc52b91ee0e
-  data.tar.gz: 699a713490e9059cf6ed4b610b159da174e2117210bdff60dcedf502d9586318cc7c39343ffa71dbbcdb16b7e5e821be7f25c451c0cb8f5994839db133cae2b1
+  metadata.gz: 880f9af425e78f1dfd71e30383b4133201e1af01bd23de16c96a18e5ca0e75d0696b856d3453d8ea75fce4578f2574b823645b0ca39671c0fb626855e9dbc159
+  data.tar.gz: f695ee96bdfe1c19a632698b25171e08142b425cd1eeca2f10cb1f72fed7b58cc996bddedf4f833f072b2016696772b37c87a6def87f3ddef7549724321ab813

data/README.md CHANGED Viewed

@@ -50,6 +50,8 @@ sudo make install
 gem install opcua
 ```
+If you get errors during compilation, please file an issue in github. Maybe the API open62541 API changed (constant improvements are happening).
 If the installation works correctly, but examples are still complaining about missing lib62541.so, try this:
 ```sh
@@ -122,11 +124,24 @@ Multible variables can be defined at once with the ```.add_variables``` command.
 t.add_variables :TestVar1, :TestVar2
 ```
 By default variables are read-only.
-If you want to add a variable with read/write support you must use the ```.add_Varable_rw``` method.
+If you want to add a variable with read/write support you must use the ```.add_variable_rw``` method.
 ```ruby
 t.add_variable_rw :TestVar1
 ```
+It is also possible to add a block to the variable. The block is called
+whenever the variable is changed. Each block gets three parameters passed:
+nodeid, new value, and if the value has been changed through a client (true) or
+internally in the server (false).
+```ruby
+t.add_variable_rw :Value do |node,value,external|
+  p node.id   # ObjectVarNode object, which has properties such as #id, #value
+  p value     # new content of the variable
+  p external  # true || false
+end
+```
 ##### Add Object
 With ```.add_object(:TestObject)``` a new object named _TestObject_ is added. The second parameter is optional and definies of which type the new object is. Default the object is from _BaseObjectType_. In this example the created object is from _FolderType_. All child nodes of the object can be definded in the ```tap{}``` area.

data/cert/cert.h CHANGED Viewed

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

data/cert/cert_key.h CHANGED Viewed

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

data/example/client_subscription.rb CHANGED Viewed

@@ -9,8 +9,14 @@ client = OPCUA::Client.new("opc.tcp://localhost:4840")
 client.subscription_interval = 100 # default 500
 node = client.get 2, '/KalimatC34/Tools/Tool1/ToolNumber'  # get node from nodeid
+n2 = client.get 2, '/KalimatC34/Tools/Tool2/ToolNumber'  # get node from nodeid
+p node.unsubscribe
 node.on_change do |value,timestamp|
   p value
+  if value == 2
+    p 'unsub'
+    p node.unsubscribe
+  end
 end
 while true

data/example/server_values_callback.rb ADDED Viewed

@@ -0,0 +1,43 @@
+#!/usr/bin/ruby
+require_relative '../lib/opcua/server'
+#require 'opcua/server'
+Daemonite.new do
+  on startup do |opts|
+    opts['server'] = OPCUA::Server.new
+    opts['server'].add_namespace "https://centurio.work/kelch"
+    t = opts['server'].types.add_object_type(:Test).tap{ |u|
+      u.add_object(:Measurements, opts['server'].types.folder).tap{ |v|
+        v.add_object(:BitRegister, opts['server'].types.folder).tap{ |w|
+          w.add_variable_rw :Wert do |node,value,external|
+            if external
+              p node.id
+              p value
+            end
+          end
+        }
+      }
+    }
+    v = opts['server'].objects.manifest(:Tester, t)
+    opts['mm'] = v.find :Measurements
+    opts['br'] = opts['mm'].find :BitRegister
+    opts['value'] = opts['br'].find :Wert
+  rescue => e
+    puts e.message
+  end
+  run do |opts|
+    opts['server'].run
+    opts['value'].value = rand
+  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 CHANGED Viewed

@@ -33,6 +33,7 @@ static node_struct * node_alloc(client_struct *client, UA_NodeId nodeid) { //{{{
   ns->id  = nodeid;
   ns->on_change  = Qnil;
   ns->waiting = 0;
+  ns->monId = 0;
   return ns;
 } //}}}
@@ -99,7 +100,6 @@ static VALUE node_on_change(VALUE self) { //{{{
   rb_gc_register_address(&ns->on_change);
   rb_ary_push(ns->master->subs,self);
-  ns->master->subs_changed = true;
   return self;
 } //}}}
@@ -184,7 +184,7 @@ static VALUE node_on_value_change(VALUE self) { // {{{
 /* -- */
 static void  client_free(client_struct *pss) { //{{{
   if (pss != NULL) {
-    if (!pss->firstrun) {
+    if (pss->subrun) {
       // do we need to delete the individual monResponse (#UA_MonitoredItemCreateResult_clear)?
       UA_Client_Subscriptions_deleteSingle(pss->master,pss->subscription_response.subscriptionId);
     }
@@ -201,11 +201,10 @@ static VALUE client_alloc(VALUE self) { //{{{
   pss->master = UA_Client_new();
   pss->config = UA_Client_getConfig(pss->master);
-  pss->firstrun = true;
+  pss->subrun = false;
   pss->started = true;
   pss->debug = true;
   pss->subs = rb_ary_new();
-  pss->subs_changed = false;
   pss->subscription_interval = 500;
   pss->default_ns = 2;
@@ -491,6 +490,20 @@ static VALUE node_to_s(VALUE self) { //{{{
   }
   return ret;
 } //}}}
+static VALUE unsubscribe(VALUE self) { //{{{
+  node_struct *ns;
+  Data_Get_Struct(self, node_struct, ns);
+  if (ns->master->subrun && ns->monId > 0) {
+    UA_Client_MonitoredItems_deleteSingle(ns->master->master, ns->master->subscription_response.subscriptionId, ns->monId);
+    ns->monId = 0;
+    rb_ary_delete(ns->master->subs, self);
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+} //}}}
 static VALUE node_call(int argc, VALUE* argv, VALUE self) { //{{{
   node_struct *ns;
@@ -553,7 +566,7 @@ static VALUE node_call(int argc, VALUE* argv, VALUE self) { //{{{
   }
 } //}}}
-static void  client_run_handler(UA_Client *client, UA_UInt32 subId, void *subContext, UA_UInt32 monId, void *monContext, UA_DataValue *value) { //{{{
+static void client_run_handler(UA_Client *client, UA_UInt32 subId, void *subContext, UA_UInt32 monId, void *monContext, UA_DataValue *value) { //{{{
   VALUE val = (VALUE)monContext;
   if (NIL_P(val) || TYPE(val) != T_NIL) {
@@ -573,7 +586,7 @@ static void  client_run_handler(UA_Client *client, UA_UInt32 subId, void *subCon
     rb_proc_call(val,args);
   }
 } //}}}
-static void  client_run_iterate(VALUE key) { //{{{
+static void client_run_iterate(VALUE key) { //{{{
   node_struct *ns;
   Data_Get_Struct(key, node_struct, ns);
@@ -583,26 +596,28 @@ static void  client_run_iterate(VALUE key) { //{{{
   UA_Client_MonitoredItems_createDataChange(ns->master->master, ns->master->subscription_response.subscriptionId,
                                             UA_TIMESTAMPSTORETURN_BOTH,
                                             monRequest, (void *)ns->on_change, client_run_handler, NULL);
+  ns->monId = monResponse.monitoredItemId;
   if(monResponse.statusCode != UA_STATUSCODE_GOOD) {
     rb_raise(rb_eRuntimeError, "Monitoring item failed: %s\n", UA_StatusCode_name(monResponse.statusCode));
   }
+  UA_MonitoredItemCreateResult_clear(&monResponse);
+  UA_MonitoredItemCreateRequest_clear(&monRequest);
 } //}}}
 static VALUE client_run(VALUE self) { //{{{
   client_struct *pss;
   Data_Get_Struct(self, client_struct, pss);
   if (!pss->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
-  if (pss->firstrun) {
-    pss->firstrun = false;
-    pss->subs_changed = false;
+  if (!pss->subrun) {
+    pss->subrun = true;
     pss->subscription_response = UA_Client_Subscriptions_create(pss->master, pss->subscription_request, NULL, NULL, NULL);
     if (pss->subscription_response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
       rb_raise(rb_eRuntimeError, "Subscription could not be created.");
-    for (int i = 0; i < RARRAY_LEN(pss->subs); i++) {
-      client_run_iterate(rb_ary_entry(pss->subs,i));
-    }
+  }
+  while (RARRAY_LEN(pss->subs)>0) {
+    VALUE aentry = rb_ary_pop(pss->subs);
+    client_run_iterate(aentry);
   }
   UA_Client_run_iterate(pss->master, 100);
@@ -613,7 +628,7 @@ static VALUE client_disconnect(VALUE self) { //{{{
   Data_Get_Struct(self, client_struct, pss);
   if (!pss->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
-  if (!pss->firstrun) {
+  if (pss->subrun) {
     // do we need to delete the individual monResponse (#UA_MonitoredItemCreateResult_clear)?
     UA_Client_Subscriptions_deleteSingle(pss->master,pss->subscription_response.subscriptionId);
   }
@@ -648,6 +663,7 @@ void Init_client(void) {
   rb_define_method(cNode, "to_s", node_to_s, 0);
   rb_define_method(cNode, "id", node_id, 0);
+  rb_define_method(cNode, "unsubscribe", unsubscribe, 0);
   rb_define_method(cMethodNode, "call", node_call, -1);

data/ext/opcua/client/client.h CHANGED Viewed

@@ -11,11 +11,10 @@ typedef struct client_struct {
   UA_CreateSubscriptionResponse subscription_response;
   UA_UInt32 subscription_interval;
-  bool firstrun;
+  bool subrun;
   bool started;
   bool debug;
   VALUE subs;
-  bool subs_changed;
   UA_UInt16 default_ns;
 } client_struct;
@@ -23,5 +22,6 @@ typedef struct node_struct {
   client_struct *master;
   VALUE on_change;
   UA_NodeId id;
+  UA_UInt32 monId;
   int waiting;
 } node_struct;

data/ext/opcua/helpers/finders.c CHANGED Viewed

@@ -39,7 +39,6 @@ bool server_node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *r
 		// 			 qn.name.data
 		// );
-    UA_BrowseResult_deleteMembers(&bRes);
     UA_BrowseResult_clear(&bRes);
     return true;
   }
@@ -63,13 +62,11 @@ bool server_node_get_reference_by_name(UA_Server *server, UA_NodeId parent, UA_Q
     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;
 }
@@ -100,7 +97,6 @@ bool client_node_get_reference_by_name(UA_Client *client, UA_NodeId parent, UA_Q
     }
   }
-  UA_BrowseResponse_deleteMembers(&bResp);
   UA_BrowseResponse_clear(&bResp);
   return success;
 }
@@ -126,7 +122,6 @@ bool client_node_get_reference_by_type(UA_Client *client, UA_NodeId parent, UA_N
     }
   }
-  UA_BrowseResponse_deleteMembers(&bResp);
   UA_BrowseResponse_clear(&bResp);
   return success;
 }
@@ -164,7 +159,6 @@ bool client_node_list_references(UA_Client *client, UA_NodeId parent, bool inver
     }
   }
-  UA_BrowseResponse_deleteMembers(&bResp);
   UA_BrowseResponse_clear(&bResp);
   return false;
 }

data/ext/opcua/server/server.c CHANGED Viewed

@@ -335,11 +335,56 @@ static VALUE node_add_method(int argc, VALUE* argv, VALUE self) { //{{{
   return node_wrap(CLASS_OF(self),node_alloc(parent->master,node_add_method_ua_simple(nstr,parent,opts,blk)));
 } //}}}
-static UA_NodeId node_add_variable_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent, UA_Byte accesslevelmask) { //{{{
+static void node_add_variable_callback( //{{{
+  UA_Server *server,
+  const UA_NodeId *sessionId, void *sessionContext,
+  const UA_NodeId *nodeId, void *nodeContext,
+  const UA_NumericRange *range, const UA_DataValue *data
+) {
+  node_struct *me = (node_struct *)nodeContext;
+  UA_Guid internal = UA_GUID("00000001-0000-0000-0000-000000000000");
+  // if (sessionId->identifierType == UA_NODEIDTYPE_NUMERIC) {
+  //   printf("sessionId ns=%d;i=%d\n", sessionId->namespaceIndex, sessionId->identifier.numeric);
+  // } else if(sessionId->identifierType == UA_NODEIDTYPE_STRING) {
+  //   printf("sessionId ns=%d;s=%.*s\n", sessionId->namespaceIndex, (int)sessionId->identifier.string.length, sessionId->identifier.string.data);
+  // } else if(sessionId->identifierType == UA_NODEIDTYPE_GUID) {
+  //   if (UA_Guid_equal(&(sessionId->identifier.guid),&internal)) {
+  //     printf("sessionId internal session\n");
+  //   } else {
+  //     printf("sessionId ns=%d;g=%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",sessionId->namespaceIndex,UA_PRINTF_GUID_DATA(sessionId->identifier.guid));
+  //   }
+  // } else if(sessionId->identifierType == UA_NODEIDTYPE_BYTESTRING) {
+  //   printf("sessionId ns=%d;b=%.*s\n", sessionId->namespaceIndex, (int)sessionId->identifier.string.length, sessionId->identifier.string.data);
+  // } else if(UA_NodeId_isNull(sessionId)) {
+  //   printf("sessionId is null");
+  // } else {
+  //   printf("sessionId ns=%d;unsupported\n",sessionId->namespaceIndex);
+  // }
+  VALUE args = rb_ary_new();
+  rb_ary_push(args, Data_Wrap_Struct(cVarNode,NULL,NULL,me));
+  VALUE para = extract_value(data->value);
+  rb_ary_push(args,rb_ary_entry(para,0));
+  if (UA_Guid_equal(&(sessionId->identifier.guid),&internal)) {
+    rb_ary_push(args,Qfalse);
+  } else {
+    rb_ary_push(args,Qtrue);
+  }
+  if (me->method != Qnil) {
+    rb_proc_call(me->method,args);
+  }
+} //}}}
+static UA_NodeId node_add_variable_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent, UA_Byte accesslevelmask, VALUE blk) { //{{{
   UA_VariableAttributes vAttr = UA_VariableAttributes_default;
   vAttr.displayName = dn;
   vAttr.accessLevel = accesslevelmask;
+  node_struct *me = node_alloc(parent->master,n);
+  me->method = blk;
+  rb_gc_register_address(&blk);
+  rb_gc_register_address(&me->method);
   UA_Server_addVariableNode(parent->master->master,
                             n,
                             parent->id,
@@ -347,9 +392,13 @@ static UA_NodeId node_add_variable_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedTe
                             qn,
                             UA_NODEID_NUMERIC(0, type),
                             vAttr,
-                            NULL,
+                            (void *)me,
                             NULL);
+  UA_ValueCallback callback ;
+  callback.onWrite = node_add_variable_callback;
+  UA_Server_setVariableNode_valueCallback(parent->master->master, n, callback);
   UA_Server_addReference(parent->master->master,
                          n,
                          UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
@@ -357,15 +406,28 @@ static UA_NodeId node_add_variable_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedTe
                          true);
   return n;
-} //}}}
-static UA_NodeId node_add_variable_ua_simple(UA_Int32 type, char* nstr, node_struct *parent, UA_Byte accesslevelmask, bool numeric) { //{{{
+}  //}}}
+static UA_NodeId node_add_variable_ua_simple(UA_Int32 type, VALUE str, node_struct *parent, UA_Byte accesslevelmask, bool numeric, VALUE blk) { //{{{
+  int nodeid = nodecounter++;
+  char *nstr = (char *)StringValuePtr(str);
+  UA_NodeId n;
+  if (numeric) {
+    n =  UA_NODEID_NUMERIC(parent->master->default_ns,nodeid);
+    rb_hash_aset(parent->master->methods,INT2NUM(nodeid),blk);
+  } else {
+    n = UA_NODEID_STRING(parent->master->default_ns,nstr);
+    rb_hash_aset(parent->master->methods,str,blk);
+  }
+  rb_gc_register_address(&blk);
   return node_add_variable_ua(
     type,
-    numeric ? UA_NODEID_NUMERIC(parent->master->default_ns,nodecounter++) : UA_NODEID_STRING(parent->master->default_ns,nstr),
+    n,
     UA_LOCALIZEDTEXT("en-US", nstr),
     UA_QUALIFIEDNAME(parent->master->default_ns, nstr),
     parent,
-    accesslevelmask
+    accesslevelmask,
+    blk
   );
 } //}}}
 static VALUE node_add_variable_wrap(int argc, VALUE* argv, VALUE self, UA_Byte accesslevelmask, bool numeric) { //{{{
@@ -375,22 +437,28 @@ static VALUE node_add_variable_wrap(int argc, VALUE* argv, VALUE self, UA_Byte a
     rb_raise(rb_eArgError, "wrong number of arguments");
   }
+  Data_Get_Struct(self, node_struct, parent);
+  if (!parent->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
+  VALUE name;
+	VALUE ttype;
+	VALUE blk;
+  rb_gc_register_address(&blk);
+	rb_scan_args(argc, argv, "11&", &name, &ttype, &blk);
   UA_UInt32 type;
-  if (argc == 2 && argv[1] != Qnil) {
-    type = NUM2INT(argv[1]);
-  } else {
+  if (NIL_P(ttype)) {
     type = UA_NS0ID_BASEDATAVARIABLETYPE;
+  } else {
+    type = NUM2INT(ttype);
   }
-  Data_Get_Struct(self, node_struct, parent);
-  if (!parent->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
-  VALUE str = rb_obj_as_string(argv[0]);
+  VALUE str = rb_obj_as_string(name);
   if (NIL_P(str) || TYPE(str) != T_STRING)
     rb_raise(rb_eTypeError, "cannot convert obj to string");
-  char *nstr = (char *)StringValuePtr(str);
-  return node_wrap(cVarNode,node_alloc(parent->master,node_add_variable_ua_simple(type,nstr,parent,accesslevelmask,numeric)));
+  return node_wrap(cVarNode,node_alloc(parent->master,node_add_variable_ua_simple(type,str,parent,accesslevelmask,numeric,blk)));
 } //}}}
 static VALUE node_add_variable(int argc, VALUE* argv, VALUE self) { //{{{
   return node_add_variable_wrap(argc,argv,self,UA_ACCESSLEVELMASK_READ,true);
@@ -449,10 +517,18 @@ static UA_NodeId node_add_object_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedText
   return n;
 } //}}}
-static UA_NodeId node_add_object_ua_simple(UA_Int32 type, char* nstr, node_struct *parent, node_struct *datatype, VALUE ref) { //{{{
+static UA_NodeId node_add_object_ua_simple(UA_Int32 type, char* nstr, node_struct *parent, node_struct *datatype, VALUE ref, bool numeric) { //{{{
+  int nodeid = nodecounter++;
+  UA_NodeId n;
+  if (numeric) {
+    n =  UA_NODEID_NUMERIC(parent->master->default_ns,nodeid);
+  } else {
+    n = UA_NODEID_STRING(parent->master->default_ns,nstr);
+  }
   return node_add_object_ua(
     type,
-    UA_NODEID_STRING(parent->master->default_ns,nstr),
+    n,
     UA_LOCALIZEDTEXT("en-US", nstr),
     UA_QUALIFIEDNAME(parent->master->default_ns, nstr),
     parent,
@@ -489,7 +565,7 @@ static VALUE node_add_object(int argc, VALUE* argv, VALUE self) { //{{{
     rb_raise(rb_eTypeError, "cannot convert obj to string");
   char *nstr = (char *)StringValuePtr(str);
-  return node_wrap(CLASS_OF(self),node_alloc(parent->master,node_add_object_ua_simple(type,nstr,parent,datatype,argv[2])));
+  return node_wrap(CLASS_OF(self),node_alloc(parent->master,node_add_object_ua_simple(type,nstr,parent,datatype,argv[2],true)));
 } //}}}
 static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_inverse, UA_NodeId reference_type_id, void *handle) { //{{{
@@ -564,10 +640,22 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
             UA_BrowsePathResult property = node_browse_path(parent->master->master, child_id, UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION), pqn, false);
             UA_QualifiedName_clear(&pqn);
+            VALUE blk;
+            if (child_id.identifierType == UA_NODEIDTYPE_NUMERIC) {
+              blk = rb_hash_aref(parent->master->methods,INT2NUM(child_id.identifier.numeric));
+            } else if (child_id.identifierType == UA_NODEIDTYPE_STRING) {
+              blk = rb_hash_aref(parent->master->methods,rb_str_new((const char *)child_id.identifier.string.data,child_id.identifier.string.length));
+            } else if (child_id.identifierType == UA_NODEIDTYPE_BYTESTRING) {
+              blk = rb_hash_aref(parent->master->methods,rb_str_new((const char *)child_id.identifier.byteString.data,child_id.identifier.byteString.length));
+            } else {
+              blk = Qnil;
+            }
             if (property.statusCode == UA_STATUSCODE_GOOD) {
-              node_add_variable_ua(UA_NS0ID_PROPERTYTYPE,UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,al);
+              node_add_variable_ua(UA_NS0ID_PROPERTYTYPE,UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,al,blk);
             } else {
-              node_add_variable_ua(UA_NS0ID_BASEDATAVARIABLETYPE,UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,al);
+              node_add_variable_ua(UA_NS0ID_BASEDATAVARIABLETYPE,UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,al,blk);
             }
             UA_BrowsePathResult_clear(&property);
@@ -758,7 +846,7 @@ static VALUE node_value_set(VALUE self, VALUE value) { //{{{
     }
     UA_Server_writeValue(ns->master->master, ns->id, variant);
-    UA_Variant_deleteMembers(&variant);
+    UA_Variant_clear(&variant);
   }
   return self;
 } //}}}

data/lib/opcua/server.rb CHANGED Viewed

@@ -46,11 +46,23 @@ module OPCUA
       def add_property_rw(*item)
         item.each { |e| add_property_rw e }
       end
-      def add_variables(*item)
-        item.each { |e| add_variable e }
+      def add_variables(*item,&blk)
+        item.each do |e|
+          if blk.nil?
+            add_variable e
+          else
+            add_variable e, &blk
+          end
+        end
       end
-      def add_variables_rw(*item)
-        item.each { |e| add_variable_rw e }
+      def add_variables_rw(*item,&blk)
+        item.each do |e|
+          if blk.nil?
+            add_variable_rw e
+          else
+            add_variable_rw e, &blk
+          end
+        end
       end
     end
   end

data/opcua.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "opcua"
-  s.version          = "0.21"
+  s.version          = "0.26"
   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."
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>=2.5.0'
-  s.authors          = ['Juergen eTM Mangler','Florian Pauker']
+  s.authors          = ['Juergen eTM Mangler','Florian Pauker','Matthias Ehrendorfer']
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'https://github.com/etm/opcua-smart'

metadata CHANGED Viewed

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: opcua
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: '0.26'
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Florian Pauker
-autorequire:
+- Matthias Ehrendorfer
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -84,6 +85,7 @@ files:
 - example/server.rb
 - example/server_deep.rb
 - example/server_values.rb
+- example/server_values_callback.rb
 - example/server_xml.rb
 - example/test.rb
 - ext/opcua/client/client.c
@@ -123,7 +125,7 @@ homepage: https://github.com/etm/opcua-smart
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Preliminary release of opcua (open62541) ruby bindings. C performance, Ruby
   elegance, simplicity, and productivity.