packetgen 3.3.2 → 4.0.0

data/lib/packetgen/header/sctp/chunk.rb

@@ -42,20 +42,20 @@ module PacketGen
         # @!attribute type
         #  8-bit SCTP chunk type
         #  @return [Integer]
-        define_field :type, Types::Int8Enum, enum: TYPES
+        define_attr :type, BinStruct::Int8Enum, enum: TYPES
         # @!attribute type
         #  8-bit SCTP chunk flags
         #  @return [Integer]
-        define_field :flags, Types::Int8
+        define_attr :flags, BinStruct::Int8
         # @!attribute length
         #  16-bit SCTP chunk length
         #  @return [Integer]
-        define_field :length, Types::Int16
+        define_attr :length, BinStruct::Int16
 
         # Get human-redable chunk
         # @return [::String]
         def to_human
-          str = +"<chunk:#{human_type}"
+          str = "<chunk:#{human_type}"
           flags_str = flags_to_human
           str << ",flags:#{flags_str}" unless flags_str.empty?
           str << '>'
@@ -91,7 +91,7 @@ module PacketGen
     class SCTP
       # Embed chunks for a given {SCTP} packet.
       # @author Sylvain Daubert
-      class ArrayOfChunk < Types::Array
+      class ArrayOfChunk < BinStruct::Array
         set_of BaseChunk
 
         private
@@ -121,7 +121,7 @@ module PacketGen
         # @!attribute body
         #  SCTP chunk value
         #  @return [String]
-        define_field :body, Types::String, builder: ->(h, t) { t.new(length_from: -> { h.length - 4 }) }
+        define_attr :body, BinStruct::String, builder: ->(h, t) { t.new(length_from: -> { h.length - 4 }) }
       end
 
       # Data chunk
@@ -145,37 +145,38 @@ module PacketGen
         # @!attribute tsn
         #   32-bit TSN for this DATA chunk
         #   @return [Integer]
-        define_field :tsn, Types::Int32
+        define_attr :tsn, BinStruct::Int32
         # @!attribute stream_id
         #  16-bit stream identifier
         #  @return [Integer]
-        define_field :stream_id, Types::Int16
+        define_attr :stream_id, BinStruct::Int16
         # @!attribute stream_sn
         #  16-bit stream sequence number
         #  @return [Integer]
-        define_field :stream_sn, Types::Int16
+        define_attr :stream_sn, BinStruct::Int16
         # @!attribute ppid
         #  32-bit payload protocol identifier
         #  @return [Integer]
-        define_field :ppid, Types::Int32
+        define_attr :ppid, BinStruct::Int32
         # @!attribute body
         #  SCTP chunk value
         #  @return [String]
-        define_field :body, Types::String, builder: ->(h, t) { t.new(length_from: -> { h.length - 4 }) }
+        define_attr :body, BinStruct::String, builder: ->(h, t) { t.new(length_from: -> { h.length - 4 }) }
 
+        remove_attr :flags
         # @!attribute flag_i
         #  IMMEDIATE flag
-        #  @return [Boolean]
+        #  @return [Integer]
         # @!attribute flag_u
         #  UNORDERED flag
-        #  @return [Boolean]
+        #  @return [Integer]
         # @!attribute flag_b
         #  BEGINNING fragment flag
-        #  @return [Boolean]
+        #  @return [Integer]
         # @!attribute flag_e
         #  ENDING fragment flag
-        #  @return [Boolean]
-        define_bit_fields_on :flags, :flag_res, 4, :flag_i, :flag_u, :flag_b, :flag_e
+        #  @return [Integer]
+        define_bit_attr_after :type, :flags, flag_res: 4, flag_i: 1, flag_u: 1, flag_b: 1, flag_e: 1
 
         private
 
@@ -212,27 +213,27 @@ module PacketGen
         # @!attribute initiate_tag
         #   32-bit Initiate Tag
         #   @return [Integer]
-        define_field :initiate_tag, Types::Int32
+        define_attr :initiate_tag, BinStruct::Int32
         # @!attribute a_wrnd
         #   32-bit Advertised Receiver Window Credit (a_rwnd)
         #   @return [Integer]
-        define_field :a_rwnd, Types::Int32
+        define_attr :a_rwnd, BinStruct::Int32
         # @!attribute nos
         #   16-bit Number of Outbound Streams
         #   @return [Integer]
-        define_field :nos, Types::Int16
+        define_attr :nos, BinStruct::Int16
         # @!attribute nis
         #   16-bit Number of Inbound Streams
         #   @return [Integer]
-        define_field :nis, Types::Int16
+        define_attr :nis, BinStruct::Int16
         # @!attribute initial_tsn
         #   32-bit Initial TSN
         #   @return [Integer]
-        define_field :initial_tsn, Types::Int32
+        define_attr :initial_tsn, BinStruct::Int32
         # @!attribute parameters
         #  List of parameters
         #  @return [ArrayOfParameter]
-        define_field :parameters, ArrayOfParameter
+        define_attr :parameters, ArrayOfParameter
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['INIT'] unless options.key?(:type)
@@ -248,7 +249,7 @@ module PacketGen
 
         # @return [::String]
         def to_human
-          str = +"<chunk:#{human_type}"
+          str = "<chunk:#{human_type}"
           flags_str = flags_to_human
           str << ",flags:#{flags_str}" unless flags_str.empty?
           str << ",param:#{parameters.map(&:to_human).join(',')}" unless parameters.empty?
@@ -315,28 +316,28 @@ module PacketGen
         # @!attribute ctsn_ack
         #   32-bit Cumulative TSN Ack
         #   @return [Integer]
-        define_field :ctsn_ack, Types::Int32
+        define_attr :ctsn_ack, BinStruct::Int32
         # @!attribute a_rwnd
         #   32-bit Advertised Receiver Window Credit
         #   @return [Integer]
-        define_field :a_rwnd, Types::Int32
+        define_attr :a_rwnd, BinStruct::Int32
         # @!attribute num_gap
         #   16-bit Number of Gap Ack Blocks
         #   @return [Integer]
-        define_field :num_gap, Types::Int32
+        define_attr :num_gap, BinStruct::Int32
         # @!attribute num_dup_tsn
         #   16-bit Number of Duplicate TSNs
         #   @return [Integer]
-        define_field :num_dup_tsn, Types::Int32
+        define_attr :num_dup_tsn, BinStruct::Int32
         # @!attribute gaps
         #   Array of 32-bit Integers, encoding boudaries of a Gap Ack Block.
         #   16 most significant bits encode block start. 16 least significant bits encode block end.
-        #   @return [Types::ArrayOfInt32]
-        define_field :gaps, Types::ArrayOfInt32
+        #   @return [BinStruct::ArrayOfInt32]
+        define_attr :gaps, BinStruct::ArrayOfInt32
         # @!attribute dup_tsns
         #   Array of 32-bit Duplicate TSNs.
-        #   @return [Types::ArrayOfInt32]
-        define_field :dup_tsns, Types::ArrayOfInt32
+        #   @return [BinStruct::ArrayOfInt32]
+        define_attr :dup_tsns, BinStruct::ArrayOfInt32
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['SACK'] unless options.key?(:type)
@@ -358,8 +359,8 @@ module PacketGen
       class HeartbeatChunk < BaseChunk
         # @!attribute info
         #   Array of Heartbeat information TLV.
-        #   @return [Types::ArrayOfInt32]
-        define_field :info, HearbeatInfoParameter
+        #   @return [BinStruct::ArrayOfInt32]
+        define_attr :info, HearbeatInfoParameter
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['HEARTBEAT'] unless options.key?(:type)
@@ -399,7 +400,7 @@ module PacketGen
       class ErrorChunk < BaseChunk
         # @!attribute error_causes
         #  @return [ArrayofError]
-        define_field :error_causes, ArrayOfError
+        define_attr :error_causes, ArrayOfError
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['ERROR'] unless options.key?(:type)
@@ -415,7 +416,7 @@ module PacketGen
 
         # @return [::String]
         def to_human
-          str = +"<chunk:#{human_type}"
+          str = "<chunk:#{human_type}"
           flags_str = flags_to_human
           str << ",flags:#{flags_str}" unless flags_str.empty?
           str << ",causes:#{error_causes.map(&:to_human).join(',')}" unless error_causes.empty?
@@ -435,9 +436,10 @@ module PacketGen
       #  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       # @author Sylvain Daubert
       class AbortChunk < ErrorChunk
+        remove_attr :flags
         # @!attribute flag_t
-        #  @return [Boolean]
-        define_bit_fields_on :flags, :flag_res, 7, :flag_t
+        #  @return [Integer]
+        define_bit_attr_after :type, :flags, flag_res: 7, flag_t: 1
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['ABORT'] unless options.key?(:type)
@@ -464,7 +466,7 @@ module PacketGen
         # @!attribute cstn_ack
         #  32-bit cumulative TSN ack
         #  @return [Integer]
-        define_field :ctsn_ack, Types::Int32
+        define_attr :ctsn_ack, BinStruct::Int32
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['SHUTDOWN'] unless options.key?(:type)
@@ -501,7 +503,7 @@ module PacketGen
       class CookieEchoChunk < BaseChunk
         # @!attribute cookie
         #  @return [String]
-        define_field :cookie, Types::String
+        define_attr :cookie, BinStruct::String
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['COOKIE_ECHO'] unless options.key?(:type)
@@ -532,9 +534,10 @@ module PacketGen
       #  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
       # @author Sylvain Daubert
       class ShutdownCompleteChunk < BaseChunk
+        remove_attr :flags
         # @!attribute flag_t
-        #  @return [Boolean]
-        define_bit_fields_on :flags, :flag_res, 7, :flag_t
+        #  @return [Integer]
+        define_bit_attr_after :type, :flags, flag_res: 7, flag_t: 1
 
         def initialize(options={})
           options[:type] = BaseChunk::TYPES['SHUTDOWN_COMPLETE'] unless options.key?(:type)

data/lib/packetgen/header/sctp/error.rb

@@ -26,9 +26,9 @@ module PacketGen
         end
       end
 
-      Error = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                        length_class: Types::Int16,
-                                        field_in_length: 'TLV')
+      Error = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                            length_class: BinStruct::Int16,
+                                            attr_in_length: 'TLV')
 
       # Base class/factory for {AbortChunk} and {ErrorChunk} error causes
       # @author Sylvain Daubert
@@ -65,7 +65,7 @@ module PacketGen
 
       # Handle array of {Error} and {ErrorMixin} classes.
       # @author Sylvain Daubert
-      class ArrayOfError < Types::Array
+      class ArrayOfError < BinStruct::Array
         set_of Error
 
         private
@@ -83,10 +83,10 @@ module PacketGen
         end
       end
 
-      InvalidStreamIdError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                       length_class: Types::Int16,
-                                                       value_class: Types::Int32,
-                                                       field_in_length: 'TLV')
+      InvalidStreamIdError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                           length_class: BinStruct::Int16,
+                                                           value_class: BinStruct::Int32,
+                                                           attr_in_length: 'TLV')
 
       # InvalidStreamIdentifier error
       # @author Sylvain Daubert
@@ -115,16 +115,16 @@ module PacketGen
         # @param [Integer] val
         def from_human(val)
           super
-          self.value <<= 16 if self[:value] < Types::Int
+          self.value <<= 16 if self[:value] < BinStruct::Int
         end
       end
       InvalidStreamIdError.define_type_enum(Error::TYPES)
       InvalidStreamIdError.define_type_default('InvalidStreamId')
 
-      MissingMandatoryParameterError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                                 length_class: Types::Int16,
-                                                                 value_class: Types::ArrayOfInt16,
-                                                                 field_in_length: 'TLV')
+      MissingMandatoryParameterError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                     length_class: BinStruct::Int16,
+                                                                     value_class: BinStruct::ArrayOfInt16,
+                                                                     attr_in_length: 'TLV')
 
       # MissingMandatoryParameter error. Indicate that one or more
       # mandatory TLV parameters are missing in a received {InitChunk}
@@ -141,10 +141,10 @@ module PacketGen
       MissingMandatoryParameterError.define_type_enum(Error::TYPES)
       MissingMandatoryParameterError.define_type_default('MissingMandatoryParameter')
 
-      StaleCookieError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                   length_class: Types::Int16,
-                                                   value_class: Types::Int32,
-                                                   field_in_length: 'TLV')
+      StaleCookieError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                       length_class: BinStruct::Int16,
+                                                       value_class: BinStruct::Int32,
+                                                       attr_in_length: 'TLV')
 
       # StaleCookie error. Indicates the receipt of a valid State Cookie that
       # has expired.
@@ -155,9 +155,9 @@ module PacketGen
       StaleCookieError.define_type_enum(Error::TYPES)
       StaleCookieError.define_type_default('StaleCookie')
 
-      OutOfResourceError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                     length_class: Types::Int16,
-                                                     field_in_length: 'TLV')
+      OutOfResourceError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                         length_class: BinStruct::Int16,
+                                                         attr_in_length: 'TLV')
 
       # Out of ressource error. Indicates that the sender is out of resource.
       # @author Sylvain Daubert
@@ -172,10 +172,10 @@ module PacketGen
       OutOfResourceError.define_type_enum(Error::TYPES)
       OutOfResourceError.define_type_default('OutOfResource')
 
-      UnresolvableAddressError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                           length_class: Types::Int16,
-                                                           value_class: Parameter,
-                                                           field_in_length: 'TLV')
+      UnresolvableAddressError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                               length_class: BinStruct::Int16,
+                                                               value_class: Parameter,
+                                                               attr_in_length: 'TLV')
 
       # Out of ressource error. Indicates that the sender is out of resource.
       # @author Sylvain Daubert
@@ -203,10 +203,10 @@ module PacketGen
       UnresolvableAddressError.define_type_enum(Error::TYPES)
       UnresolvableAddressError.define_type_default('UnresolvableAddress')
 
-      UnrecognizedChunkTypeError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                             length_class: Types::Int16,
-                                                             value_class: BaseChunk,
-                                                             field_in_length: 'TLV')
+      UnrecognizedChunkTypeError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                 length_class: BinStruct::Int16,
+                                                                 value_class: BaseChunk,
+                                                                 attr_in_length: 'TLV')
 
       # Unrecognized chunk type error. The receiver does not understand the chunk and the upper bits of the 'Chunk Type'
       # are set to 01 or 11.
@@ -222,9 +222,9 @@ module PacketGen
       UnrecognizedChunkTypeError.define_type_enum(Error::TYPES)
       UnrecognizedChunkTypeError.define_type_default('UnrecognizedChunkType')
 
-      InvalidMandatoryParameterError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                                 length_class: Types::Int16,
-                                                                 field_in_length: 'TLV')
+      InvalidMandatoryParameterError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                     length_class: BinStruct::Int16,
+                                                                     attr_in_length: 'TLV')
 
       # Invalid mandatory parameter error. Returned to the originator of an INIT or INIT ACK chunk when one of the
       # mandatory parameters is set to an invalid value.
@@ -240,10 +240,10 @@ module PacketGen
       InvalidMandatoryParameterError.define_type_enum(Error::TYPES)
       InvalidMandatoryParameterError.define_type_default('InvalidMandatoryParameter')
 
-      UnrecognizedParametersError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                              length_class: Types::Int16,
-                                                              value_class: ArrayOfParameter,
-                                                              field_in_length: 'TLV')
+      UnrecognizedParametersError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                  length_class: BinStruct::Int16,
+                                                                  value_class: ArrayOfParameter,
+                                                                  attr_in_length: 'TLV')
 
       # Unrecognized parameters error. Returned to the originator of the INIT ACK chunk if the receiver does not
       # recognize one or more Optional TLV parameters in the INIT ACK chunk.
@@ -259,10 +259,10 @@ module PacketGen
       UnrecognizedParametersError.define_type_enum(Error::TYPES)
       UnrecognizedParametersError.define_type_default('UnrecognizedParameters')
 
-      NoUserDataError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                  length_class: Types::Int16,
-                                                  value_class: Types::Int32,
-                                                  field_in_length: 'TLV')
+      NoUserDataError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                      length_class: BinStruct::Int16,
+                                                      value_class: BinStruct::Int32,
+                                                      attr_in_length: 'TLV')
 
       # No user data error. Returned when a received {DataChunk} was received with no data.
       # @author Sylvain Daubert
@@ -272,9 +272,9 @@ module PacketGen
       NoUserDataError.define_type_enum(Error::TYPES)
       NoUserDataError.define_type_default('NoUserData')
 
-      CookieReceivedWhileShuttingDownError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                                       length_class: Types::Int16,
-                                                                       field_in_length: 'TLV')
+      CookieReceivedWhileShuttingDownError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                           length_class: BinStruct::Int16,
+                                                                           attr_in_length: 'TLV')
 
       # Cookie received while shutting down error.
       # A COOKIE ECHO chunk was received while the endpoint was in the SHUTDOWN-ACK-SENT state.
@@ -290,10 +290,10 @@ module PacketGen
       CookieReceivedWhileShuttingDownError.define_type_enum(Error::TYPES)
       CookieReceivedWhileShuttingDownError.define_type_default('CookieReceivedWhileShuttingDown')
 
-      RestartAssociationWithNewAddressError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                                        length_class: Types::Int16,
-                                                                        value_class: ArrayOfParameter,
-                                                                        field_in_length: 'TLV')
+      RestartAssociationWithNewAddressError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                            length_class: BinStruct::Int16,
+                                                                            value_class: ArrayOfParameter,
+                                                                            attr_in_length: 'TLV')
 
       # Cookie received while shutting down error.
       # A COOKIE ECHO chunk was received while the endpoint was in the SHUTDOWN-ACK-SENT state.
@@ -309,9 +309,9 @@ module PacketGen
       RestartAssociationWithNewAddressError.define_type_enum(Error::TYPES)
       RestartAssociationWithNewAddressError.define_type_default('RestartAssociationWithNewAddress')
 
-      UserInitiatedAbortError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                          length_class: Types::Int16,
-                                                          field_in_length: 'TLV')
+      UserInitiatedAbortError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                              length_class: BinStruct::Int16,
+                                                              attr_in_length: 'TLV')
 
       # User-Initiated abort error.
       # @author Sylvain Daubert
@@ -326,9 +326,9 @@ module PacketGen
       UserInitiatedAbortError.define_type_enum(Error::TYPES)
       UserInitiatedAbortError.define_type_default('UserInitiatedAbort')
 
-      ProtocolViolationError = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                         length_class: Types::Int16,
-                                                         field_in_length: 'TLV')
+      ProtocolViolationError = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                             length_class: BinStruct::Int16,
+                                                             attr_in_length: 'TLV')
 
       # Protocol violation error.
       # @author Sylvain Daubert

data/lib/packetgen/header/sctp/parameter.rb

@@ -26,9 +26,9 @@ module PacketGen
         end
       end
 
-      Parameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                            length_class: Types::Int16,
-                                            field_in_length: 'TLV')
+      Parameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                length_class: BinStruct::Int16,
+                                                attr_in_length: 'TLV')
       # Base class/factory for {InitChunk} and {InitAckChunk} parameters
       # @author Sylvain Daubert
       class Parameter
@@ -62,10 +62,10 @@ module PacketGen
       end
       Parameter.define_type_enum(Parameter::TYPES)
 
-      IPv4Parameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                length_class: Types::Int16,
-                                                value_class: IP::Addr,
-                                                field_in_length: 'TLV')
+      IPv4Parameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                    length_class: BinStruct::Int16,
+                                                    value_class: IP::Addr,
+                                                    attr_in_length: 'TLV')
 
       # IPv4 address parameter
       # @author Sylvain Daubert
@@ -75,10 +75,10 @@ module PacketGen
       IPv4Parameter.define_type_enum(Parameter::TYPES)
       IPv4Parameter.define_type_default('IPv4')
 
-      IPv6Parameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                length_class: Types::Int16,
-                                                value_class: IPv6::Addr,
-                                                field_in_length: 'TLV')
+      IPv6Parameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                    length_class: BinStruct::Int16,
+                                                    value_class: IPv6::Addr,
+                                                    attr_in_length: 'TLV')
 
       # IPv6 address parameter
       # @author Sylvain Daubert
@@ -88,10 +88,10 @@ module PacketGen
       IPv6Parameter.define_type_enum(Parameter::TYPES)
       IPv6Parameter.define_type_default('IPv6')
 
-      StateCookieParameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                       length_class: Types::Int16,
-                                                       value_class: Types::String,
-                                                       field_in_length: 'TLV')
+      StateCookieParameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                           length_class: BinStruct::Int16,
+                                                           value_class: BinStruct::String,
+                                                           attr_in_length: 'TLV')
 
       # State Cookie parameter
       # @author Sylvain Daubert
@@ -106,10 +106,10 @@ module PacketGen
       StateCookieParameter.define_type_enum(Parameter::TYPES)
       StateCookieParameter.define_type_default('StateCookie')
 
-      UnrecognizedParameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                        length_class: Types::Int16,
-                                                        value_class: Parameter,
-                                                        field_in_length: 'TLV')
+      UnrecognizedParameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                            length_class: BinStruct::Int16,
+                                                            value_class: Parameter,
+                                                            attr_in_length: 'TLV')
 
       # Unrecognized parameter
       # @author Sylvain Daubert
@@ -124,10 +124,10 @@ module PacketGen
       UnrecognizedParameter.define_type_enum(Parameter::TYPES)
       UnrecognizedParameter.define_type_default('Unrecognized')
 
-      HostnameParameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                    length_class: Types::Int16,
-                                                    value_class: Types::CString,
-                                                    field_in_length: 'TLV')
+      HostnameParameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                        length_class: BinStruct::Int16,
+                                                        value_class: BinStruct::CString,
+                                                        attr_in_length: 'TLV')
 
       # Hostname address parameter
       # @author Sylvain Daubert
@@ -137,10 +137,10 @@ module PacketGen
       HostnameParameter.define_type_enum(Parameter::TYPES)
       HostnameParameter.define_type_default('Hostname')
 
-      SupportedAddrTypesParameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                              length_class: Types::Int16,
-                                                              value_class: Types::ArrayOfInt16,
-                                                              field_in_length: 'TLV')
+      SupportedAddrTypesParameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                  length_class: BinStruct::Int16,
+                                                                  value_class: BinStruct::ArrayOfInt16,
+                                                                  attr_in_length: 'TLV')
 
       # Supported address types parameter
       # @author Sylvain Daubert
@@ -158,10 +158,10 @@ module PacketGen
       SupportedAddrTypesParameter.define_type_enum(Parameter::TYPES)
       SupportedAddrTypesParameter.define_type_default('SupportedAddrTypes')
 
-      CookiePreservativeParameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                              length_class: Types::Int16,
-                                                              value_class: Types::Int32,
-                                                              field_in_length: 'TLV')
+      CookiePreservativeParameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                                  length_class: BinStruct::Int16,
+                                                                  value_class: BinStruct::Int32,
+                                                                  attr_in_length: 'TLV')
 
       # Cookie Preservative parameter
       # @author Sylvain Daubert
@@ -176,9 +176,9 @@ module PacketGen
       CookiePreservativeParameter.define_type_enum(Parameter::TYPES)
       CookiePreservativeParameter.define_type_default('CookiePreservative')
 
-      ECNParameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                               length_class: Types::Int16,
-                                               field_in_length: 'TLV')
+      ECNParameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                   length_class: BinStruct::Int16,
+                                                   attr_in_length: 'TLV')
 
       # ECN parameter
       # @author Sylvain Daubert
@@ -193,9 +193,9 @@ module PacketGen
       ECNParameter.define_type_enum(Parameter::TYPES)
       ECNParameter.define_type_default('ECN')
 
-      HearbeatInfoParameter = Types::AbstractTLV.create(type_class: Types::Int16Enum,
-                                                        length_class: Types::Int16,
-                                                        field_in_length: 'TLV')
+      HearbeatInfoParameter = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16Enum,
+                                                            length_class: BinStruct::Int16,
+                                                            attr_in_length: 'TLV')
 
       # Heartbeat Information parameter
       # @author Sylvain Daubert
@@ -207,7 +207,7 @@ module PacketGen
 
       # Array of {Parameter}s and {ParameterMixin}.
       # @author Sylvain Daubert
-      class ArrayOfParameter < Types::Array
+      class ArrayOfParameter < BinStruct::Array
         set_of Parameter
 
         private

data/lib/packetgen/header/sctp.rb

@@ -46,23 +46,23 @@ module PacketGen
       # @!attribute sport
       #  16-bit TCP source port
       #  @return [Integer]
-      define_field :sport, Types::Int16
+      define_attr :sport, BinStruct::Int16
       # @!attribute dport
       #  16-bit TCP destination port
       #  @return [Integer]
-      define_field :dport, Types::Int16
+      define_attr :dport, BinStruct::Int16
       # @!attribute verification_tag
       #  32-bit verification tag
       #  @return [Integer]
-      define_field :verification_tag, Types::Int32
+      define_attr :verification_tag, BinStruct::Int32
       # @!attribute checksum
       #  32-bit TCP checksum
       #  @return [Integer]
-      define_field :checksum, Types::Int32le
+      define_attr :checksum, BinStruct::Int32le
       # @!attribute chunks
       #  List of chunks this packet transports
       #  @return [ArrayOfChunk]
-      define_field :chunks, ArrayOfChunk
+      define_attr :chunks, ArrayOfChunk
 
       # Compute SCTP checksum
       def calc_checksum

data/lib/packetgen/header/snmp.rb

@@ -286,7 +286,7 @@ module PacketGen
       end
 
       # accessor to data payload
-      # @return [ASN1::Types::Choice]
+      # @return [ASN1::BinStruct::Choice]
       def data
         @elements[:data]
       end
@@ -319,7 +319,7 @@ module PacketGen
       # @since 2.7.0 Set UDP sport according to bindings, only if sport is 0.
       #  Needed by new bind API.
       def added_to_packet(packet)
-        return unless packet.is? 'UDP'
+        return unless packet.is?('UDP')
         return unless packet.udp.sport.zero?
 
         packet.udp.sport = packet.udp.dport