cwmp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ExN2IwZDNhYzA4ZGQ3YWNlNzU2NzY4YTAxZWU1OTVkYzY3Y2IxYQ==
+    ZGNiMDdmODQyNzE1M2RhYjYxYmI2ZDlmYjA0YTEwNGQ3MDg0MWQ1NA==
   data.tar.gz: !binary |-
-    YmFlYzhkN2E5MjY4ZmQ0OWQ5N2I0YjMzMTIxYWRjZWZlZjQyYzkwYQ==
+    OGNkZDYwZmM2MmM4YjIyZWIyZWRiY2QwNGYwZTU2MzU4NzUzOWE4MA==
 SHA512:
   metadata.gz: !binary |-
-    NDA5ZjJmZDkyNDQ2OTMwYWIwODA4M2JmMjljN2MwMzMyZjY0YzVkYTI5NjEx
-    NDM5MmRkMzQ3NTdjNjQwNTU5NWNiM2VlYWUzNDA4ZjMzMzZmMzA3YTAwNjZh
-    OWNjMmEzNGM5M2FlMWQ4YWI4N2JhNDIyNGNmYmQ2ZGNjNjAxMmU=
+    YWMxNjUzNDJmYjNlYmY1MDMwZDg4ZWY2MGJlMGY3OGI1Mjk3M2EyMWIyZWM3
+    YmE5MjZiMDQxNTQ1ZmVlYTNlNmRkNTFjMTE5ZmNkOGM2ZjQ0ZDliM2VmMTU1
+    ZmVkNTkzNWZmNzkxZDcwMTdkYzU4MjkzMGE5NDMyYWM4M2Q4MjI=
   data.tar.gz: !binary |-
-    MmU2ZDVhZTI2ZDA4MWFiNTNiNDIwNmU3ZmZlODI4ZmViZjNhYzFjMGNlMWIz
-    NzVlZGFiNjU3YTY3ZDI0M2Q3ZjQxNWRjYmRkYjdmYWI2YTIwNmQzMDMzNTY0
-    N2UwNzA4MmIyNzUzNzhjZGEwN2IwYzk3M2E0YmZlMzNkMGU3ZDE=
+    ZDVjMzAwNmFiM2I2YjcyNGY3MjVmZGM3ZDQ2NzVkNGI3NTkwODM5ZTUwNzIy
+    YzgxNTJkMGYxOGU1YjMzMDYwZDEwYWI0ZDI2Y2E2ZjNmODI3OTI2NzBlOTIz
+    NWI4MTllZTc1YWMzMzZjMTdhNzhmNjc5ZWUxNDY2NWY5ODVjMDY=

data/client_xmpp_ruby.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/ruby
+
+# This bot will reply to every message it receives. To end the game, send 'exit'
+
+$:.unshift '../../../../../lib'
+
+require 'xmpp4r/client'
+include Jabber
+
+# settings
+if ARGV.length != 2
+  puts "Run with ./echo_thread.rb user@server/resource password"
+  exit 1
+end
+myJID = JID.new(ARGV[0])
+myPassword = ARGV[1]
+cl = Client.new(myJID)
+cl.connect
+cl.auth(myPassword)
+cl.send(Presence.new)
+puts "Connected ! send messages to #{myJID.strip.to_s}."
+mainthread = Thread.current
+cl.add_message_callback do |m|
+  if m.type != :error
+    m2 = Message.new(m.from, "You sent: #{m.body}")
+    m2.type = m.type
+    cl.send(m2)
+    if m.body == 'exit'
+      m2 = Message.new(m.from, "Exiting ...")
+      m2.type = m.type
+      cl.send(m2)
+      mainthread.wakeup
+    end
+  end
+end
+Thread.stop
+cl.close

data/lib/cwmp/cpe.rb

@@ -1,5 +1,8 @@
 require 'httpclient'
 require 'socket'
+require 'xmpp4r/client'
+require 'nokogiri'
+include Jabber
 
 module Cwmp
 
@@ -15,6 +18,7 @@ module Cwmp
             @state = 'off'
             @periodic = Thread.new { periodic periodic } if periodic > 0
             @conn_req = Thread.new { connection_request }
+            @xmpp_req = Thread.new { xmpp_connection_request }
             @factory = true
         end
 
@@ -46,6 +50,7 @@ module Cwmp
         end
 
         def loop
+            @xmpp_req.join
             @conn_req.join
         end
 
@@ -79,6 +84,59 @@ module Cwmp
             end
         end
 
+        def xmpp_connection_request
+            puts "start xmpp connection"
+            myJID = JID.new('cpe@mosesacs.org/casatua')
+            myPassword = 'pass'
+            cl = Client.new(myJID)
+            cl.connect
+            cl.auth(myPassword)
+            cl.send(Presence.new)
+            puts "Connected ! send messages to #{myJID.strip.to_s}."
+
+            mainthread = Thread.current
+            cl.add_iq_callback do |m|
+                if m.type == :error
+                    puts "error"
+                elsif m.type == :get
+                    puts "send xmpp connection request result"
+
+                    puts "#{xmpp_connection_request_response_iq(m.from)}"
+                    cl.send(xmpp_connection_request_response_iq(m.from))
+
+                    puts "send Inform with event CONNECTION REQUEST"
+                    do_connection '6 CONNECTION REQUEST'
+                end
+
+            end
+            Thread.stop
+            cl.close
+
+        end
+
+        def xmpp_connection_request_response_iq from
+            iq = Iq.new(:result)
+            iq.from = 'cpe1@mosesacs.org'
+            iq.to = from
+            iq.id = 'cr001'
+            iq.add_namespace('urn:broadband-forum-org:cwmp:xmppConnReq-1-0')
+            return iq
+        end
+
+        def xmpp_connection_request_iq
+            iq = Iq.new(:get)
+            iq.from = 'cpe1@mosesacs.org'
+            iq.to = 'acs@mosesacs.org'
+            iq.id = 'cr001'
+            iq.add_namespace('urn:broadband-forum-org:cwmp:xmppConnReq-1-0')
+            cr = iq.add REXML::Element.new('connectionRequest')
+            cr.add_namespace('urn:broadband-forum-org:cwmp:xmppConnReq-1-0')
+            cr.add(REXML::Element.new('username').add_text('username'))
+            cr.add(REXML::Element.new('password').add_text('password'))
+            iq.add(cr)
+            return iq
+        end
+
         def do_connection(event)
             begin
                 c = HTTPClient.new
@@ -96,15 +154,17 @@ module Cwmp
                     message_type = doc.css("#{soap_ns}|Body").children.map(&:name)[1]
                     puts "got #{message_type}"
                     case message_type
-                        when "GetParameterValues"
+                        when "cwmp:GetParameterValues"
                             resp = c.post @acs_url, (Cwmp::Message::get_parameter_values_response).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
-                        when "GetParameterNames"
+                        when "cwmp:GetParameterNames"
                             resp = c.post @acs_url, (Cwmp::Message::get_parameter_names_response).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
-                        when "SetParameterValues"
+                        when "cwmp:SetParameterValues"
                             resp = c.post @acs_url, (Cwmp::Message::set_parameter_values_response).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
+                        when "cmwp:ChangeDUState"
+                            resp = c.post @acs_url, (Cwmp::Message::change_du_state_response).xml, {'User-Agent' => "ruby-cwmp #{Cwmp::VERSION}", "Content-Type" => 'text/xml; charset="utf-8"'}
                     end
                 end
-                puts "got #{resp.status}, closing"
+                puts "got a #{resp.status}, closing"
                 c.reset @acs_url
             rescue Errno::ECONNREFUSED
                 puts "can't connect to #{@acs_url}"

data/lib/cwmp/message.rb

@@ -70,13 +70,15 @@ module Cwmp
 
         def self.inform(manufacturer, oui, serial, eventcodes, software_version)
             m = Cwmp::Message.new
-
+puts "here we go"
             m.message_type = "Inform"
             m.raw_xml_message = '<?xml version="1.0" encoding="UTF-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
                xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:cwmp="urn:dslforum-org:cwmp-1-0"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <soap:Header/>
+    <soap:Header>
+        <cwmp:ID soap:mustUnderstand="1">37</cwmp:ID>
+    </soap:Header>
     <soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
         <cwmp:Inform>
             <DeviceId>
@@ -151,6 +153,25 @@ module Cwmp
             return m
         end
 
+        def self.change_du_state_response
+            m = Cwmp::Message.new
+
+            m.message_type = "ChangeDUStateResponse"
+
+            b = Nokogiri::XML::Builder.new
+
+            b[:soap].Envelope(NAMESPACES) {
+                b[:soap].Header {}
+                b[:soap].Body {
+                    b[:cwmp].ChangeDUStateResponse() {}
+                }
+            }
+
+            m.raw_xml_message = b.to_xml
+
+            return m
+        end
+
         def self.set_parameter_values(leaves)
             b = Nokogiri::XML::Builder.new
 
@@ -343,4 +364,4 @@ module Cwmp
         end
 
     end
-end
+end

data/lib/cwmp/version.rb

@@ -1,3 +1,3 @@
 module Cwmp
-    VERSION = "0.2.0"
-end
+    VERSION = "0.2.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cwmp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Luca Cervasio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -147,6 +147,7 @@ files:
 - Rakefile
 - bin/acs
 - bin/cpe
+- client_xmpp_ruby.rb
 - cwmp.gemspec
 - examples/api_usage.rb
 - lib/cwmp.rb