cosmos 4.4.1-java → 4.5.2-java

data/lib/cosmos/io/posix_serial_driver.rb

@@ -25,19 +25,20 @@ module Cosmos
                    write_timeout = 10.0,
                    read_timeout = nil,
                    flow_control = :NONE,
-                   data_bits = 8)
+                   data_bits = 8,
+                   struct = [])
 
       # Convert Baud Rate into Termios constant
       begin
         baud_rate = Object.const_get("Termios::B#{baud_rate}")
       rescue NameError
-        raise(ArgumentError, "Invalid Baud Rate, Not Defined by Termios: #{baud_rate}")
+        raise(ArgumentError, "Invalid baud rate: #{baud_rate}")
       end
 
       # Verify Parameters
-      raise(ArgumentError, "Invalid Data Bits: #{data_bits}") unless [5,6,7,8].include?(data_bits)
+      raise(ArgumentError, "Invalid data bits: #{data_bits}") unless [5,6,7,8].include?(data_bits)
       raise(ArgumentError, "Invalid parity: #{parity}") if parity and !SerialDriver::VALID_PARITY.include?(parity)
-      raise(ArgumentError, "Invalid Stop Bits: #{stop_bits}") unless [1,2].include?(stop_bits)
+      raise(ArgumentError, "Invalid stop bits: #{stop_bits}") unless [1,2].include?(stop_bits)
       @write_timeout = write_timeout
       @read_timeout = read_timeout
 
@@ -51,22 +52,61 @@ module Cosmos
 
       # Configure the serial Port
       tio = Termios::new_termios()
-      iflags = 0
-      iflags |= Termios::IGNPAR unless parity
-      cflags = 0
-      cflags |= Termios::CREAD # Enable receiver
-      cflags |= Termios.const_get("CS#{data_bits}") # data bits
-      cflags |= Termios::CLOCAL # Ignore Modem Control Lines
-      cflags |= Termios::CSTOPB if stop_bits == 2
-      cflags |= Termios::PARENB if parity
-      cflags |= Termios::PARODD if parity == :ODD
-      cflags |= Termios::CRTSCTS if flow_control == :RTSCTS
-      tio.iflag = iflags
-      tio.oflag = 0
-      tio.cflag = cflags
-      tio.lflag = 0
+      iflag = 0
+      iflag |= Termios::IGNPAR unless parity
+      oflag = 0
+      cflag = 0
+      cflag |= Termios::CREAD # Enable receiver
+      cflag |= Termios.const_get("CS#{data_bits}") # data bits
+      cflag |= Termios::CLOCAL # Ignore Modem Control Lines
+      cflag |= Termios::CSTOPB if stop_bits == 2
+      cflag |= Termios::PARENB if parity
+      cflag |= Termios::PARODD if parity == :ODD
+      cflag |= Termios::CRTSCTS if flow_control == :RTSCTS
+      lflag = 0
       tio.cc[Termios::VTIME] = 0
       tio.cc[Termios::VMIN] = 1
+      unless struct.empty?
+        struct.each do |field, key, value|
+          case field
+          when 'iflag'
+            if value == "0"
+              iflag &= ~Termios.const_get(key)
+            else
+              iflag |= Termios.const_get(key)
+            end
+          when 'oflag'
+            if value == "0"
+              oflag &= ~Termios.const_get(key)
+            else
+              oflag |= Termios.const_get(key)
+            end
+          when 'cflag'
+            if value == "0"
+              cflag &= ~Termios.const_get(key)
+            else
+              cflag |= Termios.const_get(key)
+            end
+          when 'lflag'
+            if value == "0"
+              lflag &= ~Termios.const_get(key)
+            else
+              lflag |= Termios.const_get(key)
+            end
+          when 'cc'
+            begin
+              value = Integer(value) # Try to convert to int
+            rescue ArgumentError
+              # Ignore this error and use the string
+            end
+            tio.cc[Termios.const_get(key)] = value
+          end
+        end
+      end
+      tio.iflag = iflag
+      tio.oflag = oflag
+      tio.cflag = cflag
+      tio.lflag = lflag
       tio.ispeed = baud_rate
       tio.ospeed = baud_rate
       @handle.tcflush(Termios::TCIOFLUSH)
@@ -143,7 +183,5 @@ module Cosmos
 
       data
     end
-
-  end # class PosixSerialDriver
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/io/serial_driver.rb

@@ -32,8 +32,10 @@ module Cosmos
     #   complete or nil to block
     # @param read_timeout [Float|nil] Number of seconds to wait for the read to
     #   complete or nil to block
-    # @param flow_control [Symbol] Currently supported :NONE and :RTSCTS (default :NONE)
+    # @param flow_control [Symbol] Currently supported :NONE, :RTSCTS (default :NONE)
     # @param data_bits [Integer] Number of data bits (default 8)
+    # @param struct [Array] Array of arrays of fields and values to set in the
+    #   Windows DCB or POSIX structure
     def initialize(port_name,
                    baud_rate,
                    parity = :NONE,
@@ -41,7 +43,8 @@ module Cosmos
                    write_timeout = 10.0,
                    read_timeout = nil,
                    flow_control = :NONE,
-                   data_bits = 8)
+                   data_bits = 8,
+                   struct = [])
       raise(ArgumentError, "Invalid parity: #{parity}") unless VALID_PARITY.include? parity
       if Kernel.is_windows?
         @driver = Win32SerialDriver.new(port_name,
@@ -53,7 +56,8 @@ module Cosmos
                                         0.01,
                                         1000,
                                         flow_control,
-                                        data_bits)
+                                        data_bits,
+                                        struct)
       elsif RUBY_ENGINE == 'ruby'
         @driver = PosixSerialDriver.new(port_name,
                                         baud_rate,
@@ -62,7 +66,8 @@ module Cosmos
                                         write_timeout,
                                         read_timeout,
                                         flow_control,
-                                        data_bits)
+                                        data_bits,
+                                        struct)
       else
         @driver = nil # JRuby Serial on Linux not currently supported
       end
@@ -92,7 +97,5 @@ module Cosmos
     def read_nonblock
       @driver.read_nonblock
     end
-
-  end # class SerialDriver
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/io/win32_serial_driver.rb

@@ -24,7 +24,8 @@ module Cosmos
                    read_polling_period = 0.01,
                    read_max_length = 1000,
                    flow_control = :NONE,
-                   data_bits = 8)
+                   data_bits = 8,
+                   struct = [])
 
       # Verify Parameters
       port_name = '\\\\.\\' + port_name if port_name =~ /^COM[0-9]{2,3}$/
@@ -78,6 +79,12 @@ module Cosmos
         # 0x03 - RTS_CONTROL_TOGGLE - Specifies that the RTS line will be high if bytes are available for transmission. After all buffered bytes have been sent, the RTS line will be low.
         dcb.write('fRtsControl', 0x03)
       end
+      # Allow the end user to write arbitrary values into the Windows DCB structure
+      unless struct.empty?
+        struct.each do |key, value|
+          dcb.write(key, value.to_i)
+        end
+      end
       Win32.set_comm_state(@handle, dcb)
 
       # Configure Timeouts, the WinAPI structure is COMMTIMEOUTS:

data/lib/cosmos/packets/packet.rb

@@ -186,9 +186,9 @@ module Cosmos
         @read_conversion_cache.clear if @read_conversion_cache
         @received_count
       end
-      
-    end # if RUBY_ENGINE != 'ruby' or ENV['COSMOS_NO_EXT']      
-      
+
+    end # if RUBY_ENGINE != 'ruby' or ENV['COSMOS_NO_EXT']
+
     # Tries to identify if a buffer represents the currently defined packet. It
     # does this by iterating over all the packet items that were created with
     # an ID value and checking whether that ID value is present at the correct
@@ -216,7 +216,7 @@ module Cosmos
 
       true
     end
-    
+
     # Reads the values from a buffer at the position of each id_item defined
     # in the packet.
     #
@@ -226,7 +226,7 @@ module Cosmos
       return [] unless buffer
       return [] unless @id_items
       values = []
-      
+
       @id_items.each do |item|
         begin
           values << read_item(item, :RAW, buffer)
@@ -234,10 +234,10 @@ module Cosmos
           values << nil
         end
       end
-      
+
       values
     end
-    
+
     # Returns @received_time unless a packet item called PACKET_TIME exists that returns
     # a Ruby Time object that represents a different timestamp for the packet
     def packet_time
@@ -259,7 +259,7 @@ module Cosmos
       end
 
       # Use the hashing algorithm established by Cosmos::System
-      digest = Digest.const_get(System.hashing_algorithm).send('new')
+      digest = Digest.const_get(System.hashing_algorithm).public_send('new')
       digest << string
       @config_name = digest.hexdigest
       @config_name

data/lib/cosmos/packets/packet_config.rb

@@ -443,7 +443,7 @@ module Cosmos
           klass = params[0].filename_to_class_name.to_class
           raise parser.error("#{params[0].filename_to_class_name} class not found. Did you require the file in target.txt?", usage) unless klass
           conversion = klass.new(*params[1..(params.length - 1)])
-          @current_item.send("#{keyword.downcase}=".to_sym, conversion)
+          @current_item.public_send("#{keyword.downcase}=".to_sym, conversion)
           if klass != ProcessorConversion and (conversion.converted_type.nil? or conversion.converted_bit_size.nil?)
             msg = "Read Conversion #{params[0].filename_to_class_name} on item #{@current_item.name} does not specify converted type or bit size. Will not be supported by DART"
             @warnings << msg

data/lib/cosmos/packets/packet_item_limits.rb

@@ -91,24 +91,12 @@ module Cosmos
     end
 
     def persistence_setting=(persistence_setting)
-      if 0.class == Integer
-        # Ruby version >= 2.4.0
-        raise ArgumentError, "persistence_setting must be an Integer but is a #{persistence_setting.class}" unless Integer === persistence_setting
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "persistence_setting must be a Fixnum but is a #{persistence_setting.class}" unless Fixnum === persistence_setting
-      end
+      raise ArgumentError, "persistence_setting must be an Integer but is a #{persistence_setting.class}" unless Integer === persistence_setting
       @persistence_setting = persistence_setting
     end
 
     def persistence_count=(persistence_count)
-      if 0.class == Integer
-        # Ruby version >= 2.4.0
-        raise ArgumentError, "persistence_count must be an Integer but is a #{persistence_count.class}" unless Integer === persistence_count
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "persistence_count must be a Fixnum but is a #{persistence_count.class}" unless Fixnum === persistence_count
-      end
+      raise ArgumentError, "persistence_count must be an Integer but is a #{persistence_count.class}" unless Integer === persistence_count
       @persistence_count = persistence_count
     end
 

data/lib/cosmos/packets/parsers/xtce_converter.rb

@@ -196,7 +196,7 @@ module Cosmos
           # TODO: Handle nonunique item names
           if item.array_size
             # Requiring parameterRef for argument arrays appears to be a defect in the schema
-            xml['xtce'].send("Array#{type}RefEntry".intern, :parameterRef => item.name) do
+            xml['xtce'].public_send("Array#{type}RefEntry".intern, :parameterRef => item.name) do
               set_fixed_value(xml, item) if !packed
               xml['xtce'].DimensionList do
                 xml['xtce'].Dimension do
@@ -211,9 +211,9 @@ module Cosmos
             end
           else
             if packed
-              xml['xtce'].send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name)
+              xml['xtce'].public_send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name)
             else
-              xml['xtce'].send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name) do
+              xml['xtce'].public_send("#{type}RefEntry".intern, "#{type.downcase}Ref".intern => item.name) do
                 set_fixed_value(xml, item)
               end
             end
@@ -256,7 +256,7 @@ module Cosmos
         attrs[:shortDescription] = item.description if item.description
         attrs[:arrayTypeRef] = (item.name + '_Type')
         attrs[:numberOfDimensions] = '1' # COSMOS Only supports one-dimensional arrays
-        xml['xtce'].send('Array' + param_or_arg + 'Type', attrs)
+        xml['xtce'].public_send('Array' + param_or_arg + 'Type', attrs)
       end
     end
 
@@ -289,7 +289,7 @@ module Cosmos
         encoding = 'unsigned'
       end
       if item.states
-        xml['xtce'].send('Enumerated' + param_or_arg + 'Type', attrs) do
+        xml['xtce'].public_send('Enumerated' + param_or_arg + 'Type', attrs) do
           to_xtce_endianness(item, xml)
           to_xtce_units(item, xml)
           xml['xtce'].IntegerDataEncoding(:sizeInBits => item.bit_size, :encoding => encoding)
@@ -308,7 +308,7 @@ module Cosmos
           type_string = 'Integer' + param_or_arg + 'Type'
           attrs[:signed] = signed
         end
-        xml['xtce'].send(type_string, attrs) do
+        xml['xtce'].public_send(type_string, attrs) do
           to_xtce_endianness(item, xml)
           to_xtce_units(item, xml)
           if (item.read_conversion and item.read_conversion.class == PolynomialConversion) or (item.write_conversion and item.write_conversion.class == PolynomialConversion)
@@ -330,7 +330,7 @@ module Cosmos
       attrs = { :name => (item.name + '_Type'), :sizeInBits => item.bit_size }
       attrs[:initialValue] = item.default if item.default and !item.array_size
       attrs[:shortDescription] = item.description if item.description
-      xml['xtce'].send('Float' + param_or_arg + 'Type', attrs) do
+      xml['xtce'].public_send('Float' + param_or_arg + 'Type', attrs) do
         to_xtce_endianness(item, xml)
         to_xtce_units(item, xml)
         if (item.read_conversion and item.read_conversion.class == PolynomialConversion) or (item.write_conversion and item.write_conversion.class == PolynomialConversion)
@@ -359,7 +359,7 @@ module Cosmos
         end
       end
       attrs[:shortDescription] = item.description if item.description
-      xml['xtce'].send(string_or_binary + param_or_arg + 'Type', attrs) do
+      xml['xtce'].public_send(string_or_binary + param_or_arg + 'Type', attrs) do
         # Don't call to_xtce_endianness for Strings or Blocks
         to_xtce_units(item, xml)
         if string_or_binary == 'String'
@@ -382,9 +382,9 @@ module Cosmos
 
     def to_xtce_item(item, param_or_arg, xml)
       if item.array_size
-        xml['xtce'].send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_ArrayType')
+        xml['xtce'].public_send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_ArrayType')
       else
-        xml['xtce'].send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_Type')
+        xml['xtce'].public_send(param_or_arg, :name => item.name, "#{param_or_arg.downcase}TypeRef" => item.name + '_Type')
       end
     end
 

data/lib/cosmos/packets/parsers/xtce_parser.rb

@@ -59,6 +59,9 @@ module Cosmos
     end
 
     def parse(filename, target_name)
+      # Fortify complains about Path Manipulation here
+      # We have previously validated the file is a .xtce file in packet_config
+      # The file is opened read-only and then immediately parsed by Nokogiri
       doc = File.open(filename) { |f| Nokogiri::XML(f, nil, nil, Nokogiri::XML::ParseOptions::STRICT | Nokogiri::XML::ParseOptions::NOBLANKS) }
       # Determine the @current_target_name
       xtce_process_element(doc.root)

data/lib/cosmos/packets/structure.rb

@@ -462,12 +462,14 @@ module Cosmos
       extend(MethodMissing)
     end
 
-    protected
-
     # Take the structure mutex to ensure the buffer does not change while you perform activities
     def synchronize
-      @mutex ||= Mutex.new
-      @mutex.synchronize {|| yield}
+      setup_mutex()
+      if @mutex.owned?
+        yield
+      else
+        @mutex.synchronize {|| yield}
+      end
     end
 
     # Take the structure mutex to ensure the buffer does not change while you perform activities
@@ -476,7 +478,7 @@ module Cosmos
     #      lower level calls to go forward without getting the mutex
     def synchronize_allow_reads(top = false)
       @mutex_allow_reads ||= false
-      @mutex ||= Mutex.new
+      setup_mutex()
       if top
         @mutex.synchronize do
           @mutex_allow_reads = Thread.current
@@ -500,6 +502,17 @@ module Cosmos
       end
     end
 
+    protected
+
+    MUTEX = Mutex.new
+
+    def setup_mutex
+      return if @mutex
+      MUTEX.synchronize do
+        @mutex ||= Mutex.new
+      end
+    end
+
     module MethodMissing
       # Method missing provides reading/writing item values as if they were methods to the class
       def method_missing(name, value = nil)

data/lib/cosmos/packets/structure_item.rb

@@ -112,13 +112,7 @@ module Cosmos
     end
 
     def bit_offset=(bit_offset)
-      if 0.class == Integer
-        # Ruby version >= 2.4.0
-        raise ArgumentError, "#{@name}: bit_offset must be an Integer" unless Integer === bit_offset
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "#{@name}: bit_offset must be a Fixnum" unless Fixnum === bit_offset
-      end
+      raise ArgumentError, "#{@name}: bit_offset must be an Integer" unless Integer === bit_offset
 
       byte_aligned = ((bit_offset % 8) == 0)
       if (@data_type == :FLOAT or @data_type == :STRING or @data_type == :BLOCK) and !byte_aligned
@@ -133,13 +127,8 @@ module Cosmos
     end
 
     def bit_size=(bit_size)
-      if 0.class == Integer
-        # Ruby version >=  2.4.0
-        raise ArgumentError, "#{name}: bit_size must be an Integer" unless Integer === bit_size
-      else
-        # Ruby version < 2.4.0
-        raise ArgumentError, "#{name}: bit_size must be a Fixnum" unless Fixnum === bit_size
-      end
+      raise ArgumentError, "#{name}: bit_size must be an Integer" unless Integer === bit_size
+
       byte_multiple = ((bit_size % 8) == 0)
       if bit_size <= 0 and (@data_type == :INT or @data_type == :UINT or @data_type == :FLOAT)
         raise ArgumentError, "#{@name}: bit_size cannot be negative or zero for :INT, :UINT, and :FLOAT items: #{bit_size}"
@@ -171,13 +160,7 @@ module Cosmos
 
     def array_size=(array_size)
       if array_size
-        if 0.class == Integer
-          # Ruby version >=  2.4.0
-          raise ArgumentError, "#{@name}: array_size must be an Integer" unless Integer === array_size
-        else
-          # Ruby version < 2.4.0
-          raise ArgumentError, "#{@name}: array_size must be a Fixnum" unless Fixnum === array_size
-        end
+        raise ArgumentError, "#{@name}: array_size must be an Integer" unless Integer === array_size
         raise ArgumentError, "#{@name}: array_size must be a multiple of bit_size" unless (@bit_size == 0 or (array_size % @bit_size == 0) or array_size < 0)
         raise ArgumentError, "#{@name}: bit_size cannot be negative or zero for array items" if @bit_size <= 0
       end

data/lib/cosmos/script/api_shared.rb

@@ -9,6 +9,13 @@
 # attribution addendums as found in the LICENSE.txt
 
 module Cosmos
+  # Error raised by the API when a check fails
+  class CheckError < RuntimeError; end
+  # Error raised when a Script should be stopped
+  class StopScript < StandardError; end
+  # Error raised when a TestCase should be skipped by TestRunner
+  class SkipTestCase < StandardError; end
+
   module ApiShared
     DEFAULT_TLM_POLLING_RATE = 0.25
 
@@ -825,6 +832,8 @@ module Cosmos
       while true
         work_start = Time.now.sys
         value = tlm_variable(target_name, packet_name, item_name, value_type)
+        # Fortify: Dynamic Code Evaluation: Code Injection
+        # TODO: Is there anyway to sanitize the exp_to_eval?
         if eval(exp_to_eval)
           return true, value
         end
@@ -839,6 +848,8 @@ module Cosmos
 
         if canceled
           value = tlm_variable(target_name, packet_name, item_name, value_type)
+          # Fortify: Dynamic Code Evaluation: Code Injection
+          # TODO: Is there anyway to sanitize the exp_to_eval?
           if eval(exp_to_eval)
             return true, value
           else
@@ -879,6 +890,8 @@ module Cosmos
 
       while true
         work_start = Time.now.sys
+        # Fortify: Dynamic Code Evaluation: Code Injection
+        # TODO: Is there anyway to sanitize the exp_to_eval?
         if eval(exp_to_eval, context)
           return true
         end
@@ -892,6 +905,8 @@ module Cosmos
         canceled = cosmos_script_sleep(sleep_time)
 
         if canceled
+          # Fortify: Dynamic Code Evaluation: Code Injection
+          # TODO: Is there anyway to sanitize the exp_to_eval?
           if eval(exp_to_eval, context)
             return true
           else
@@ -907,6 +922,8 @@ module Cosmos
       string = "value " + comparison_to_eval
       check_str = "CHECK: #{_upcase(target_name, packet_name, item_name)} #{comparison_to_eval}"
       value_str = "with value == #{value}"
+      # Fortify: Dynamic Code Evaluation: Code Injection
+      # TODO: Is there anyway to sanitize the comparison_to_eval?
       if eval(string)
         Logger.info "#{check_str} success #{value_str}"
       else
@@ -942,7 +959,7 @@ module Cosmos
     end
 
     def run_tlm_viewer(action, display_name = '')
-      tlm_viewer = JsonDRbObject.new System.connect_hosts['TLMVIEWER_API'], System.ports['TLMVIEWER_API']
+      tlm_viewer = JsonDRbObject.new System.connect_hosts['TLMVIEWER_API'], System.ports['TLMVIEWER_API'], 1.0, Cosmos::System.x_csrf_token
       begin
         yield tlm_viewer
         tlm_viewer.disconnect

data/lib/cosmos/script/extract.rb

@@ -130,7 +130,7 @@ module Cosmos
       return [target_name, packet_name, item_name, comparison_to_eval] if split_string.length == 3
       raise "ERROR: Check improperly specified: #{text}" if split_string.length < 4
       split_string = text.split(/ /) # Split on regex spaces to preserve spaces in comparison
-      index = split_string.index(item_name)
+      index = split_string.rindex(item_name)
       comparison_to_eval = split_string[(index + 1)..(split_string.length - 1)].join(" ")
       raise "ERROR: Use '==' instead of '=': #{text}" if split_string[3] == '='
       return [target_name, packet_name, item_name, comparison_to_eval]

data/lib/cosmos/script/script.rb

@@ -25,13 +25,6 @@ $disconnect_all_targets = false
 $cmd_tlm_replay_mode = false
 
 module Cosmos
-  # Error raised by the API when a check fails
-  class CheckError < RuntimeError; end
-  # Error raised when a Script should be stopped
-  class StopScript < StandardError; end
-  # Error raised when a TestCase should be skipped by TestRunner
-  class SkipTestCase < StandardError; end
-
   # Provides a proxy to both a disconnected CmdTlmServer instance and the real
   # JsonDRbObject which communicates with the real CmdTlmServer. If targets
   # are disconnected their method calls are forwarded to the disconnected
@@ -49,9 +42,9 @@ module Cosmos
       end
       # Start a Json connect to the real server
       if $cmd_tlm_replay_mode
-        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['REPLAY_API'], System.ports['REPLAY_API'])
+        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['REPLAY_API'], System.ports['REPLAY_API'], 1.0, Cosmos::System.x_csrf_token)
       else
-        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['CTS_API'], System.ports['CTS_API'])
+        @cmd_tlm_server = JsonDRbObject.new(System.connect_hosts['CTS_API'], System.ports['CTS_API'], 1.0, Cosmos::System.x_csrf_token)
       end
     end
 
@@ -69,7 +62,7 @@ module Cosmos
         @cmd_tlm_server.disconnect
       else
         if $disconnect_all_targets
-          return @disconnected.send(method_name, *method_params)
+          return @disconnected.public_send(method_name, *method_params)
         elsif $disconnected_targets
           name_string = nil
           if method_params[0].is_a?(String)
@@ -86,7 +79,7 @@ module Cosmos
           if name_string
             target = name_string.split(" ")[0]
             if $disconnected_targets.include?(target)
-              return @disconnected.send(method_name, *method_params)
+              return @disconnected.public_send(method_name, *method_params)
             end
           end
         end

data/lib/cosmos/streams/serial_stream.rb

@@ -35,8 +35,10 @@ module Cosmos
     #   complete. Pass nil to create no timeout. The {SerialDriver} will
     #   continously try to read data until it has received data or an error
     #   occurs.
-    # @param flow_control [Symbol] Currently supported :NONE and :RTSCTS (default :NONE)
+    # @param flow_control [Symbol] Currently supported :NONE, :RTSCTS (default :NONE)
     # @param data_bits [Integer] Number of data bits (default 8)
+    # @param struct [Array] Array of arrays of fields and values to set in the
+    #   Windows DCB or POSIX structure
     def initialize(write_port_name,
                    read_port_name,
                    baud_rate,
@@ -45,7 +47,8 @@ module Cosmos
                    write_timeout,
                    read_timeout,
                    flow_control = :NONE,
-                   data_bits = 8)
+                   data_bits = 8,
+                   struct = [])
       super()
 
       # The SerialDriver class will validate the parameters
@@ -69,7 +72,8 @@ module Cosmos
                                               @write_timeout,
                                               @read_timeout,
                                               @flow_control,
-                                              @data_bits)
+                                              @data_bits,
+                                              struct)
       else
         @write_serial_port = nil
       end
@@ -84,7 +88,8 @@ module Cosmos
                                                @write_timeout,
                                                @read_timeout,
                                                @flow_control,
-                                               @data_bits)
+                                               @data_bits,
+                                               struct)
         end
       else
         @read_serial_port = nil
@@ -151,5 +156,5 @@ module Cosmos
         @connected = false
       end
     end
-  end # class SerialStream
-end # module Cosmos
+  end
+end