ffi-pcap 0.2.0 → 0.2.1

data/lib/ffi/pcap/common_wrapper.rb

@@ -1,175 +1,200 @@
 module FFI
-module PCap
+  module PCap
+    #
+    # An abstract base wrapper class with features common to all pcap
+    # wrapper types. Do not use this directly. Instead refer to {Live}, 
+    # {Dead}, or {Offline} class for {PCap.open_live}, {PCap.open_dead}, or
+    # {PCap.open_file}, respectively.
+    #
+    class CommonWrapper
 
-  # An abstract base wrapper class with features common to all pcap
-  # wrapper types. Do not use this directly. Instead refer to Live, 
-  # Dead, or Offline class for open_live, open_dead, or open_file 
-  # respectively.
-  class CommonWrapper
-    attr_accessor :pcap
+      attr_accessor :pcap
 
-    def initialize(pcap, opts={})
-      @pcap = pcap
-      @closed = false
-      @errbuf ||= ErrorBuffer.create
+      def initialize(pcap, opts={})
+        @pcap     = pcap
+        @closed   = false
+        @errbuf ||= ErrorBuffer.new
 
-      yield(self) if block_given?
-    end
+        yield self if block_given?
+      end
 
+      #
+      # Returns the DataLink for the pcap device.
+      #
+      def datalink
+        @datalink ||= DataLink.new(PCap.pcap_datalink(_pcap))
+      end
 
-    # Returns the DataLink for the pcap device.
-    def datalink
-      @datalink ||= DataLink.new(FFI::PCap.pcap_datalink(_pcap))
-    end
+      #
+      # Returns an array of supported DataLinks for the pcap device.
+      #
+      def supported_datalinks
+        dlt_lst = MemoryPointer.new(:pointer)
 
+        if (cnt = PCap.pcap_list_datalinks(_pcap, dlt_lst)) < 0
+          raise(LibError, "pcap_list_datalinks(): #{geterr}",caller)
+        end
+
+        # extract datalink values 
+        p = dlt_lst.get_pointer(0)
+        ret = p.get_array_of_int(0, cnt).map {|dlt| DataLink.new(dlt) }
 
-    # Returns an array of supported DataLinks for the pcap device.
-    def supported_datalinks
-      dlt_lst = FFI::MemoryPointer.new(:pointer)
-      if (cnt=FFI::PCap.pcap_list_datalinks(_pcap, dlt_lst)) < 0
-        raise(LibError, "pcap_list_datalinks(): #{geterr()}")
+        CRT.free(p)
+        return ret
       end
-      # extract datalink values 
-      p = dlt_lst.get_pointer(0)
-      ret = p.get_array_of_int(0, cnt).map {|dlt| DataLink.new(dlt) }
-      CRT.free(p)
-      return ret
-    end
 
-    # Indicates whether the pcap interface is already closed.
-    def closed?
-      @closed == true
-    end
+      #
+      # Indicates whether the pcap interface is already closed.
+      #
+      def closed?
+        @closed == true
+      end
 
-    def ready?
-      @closed == false and not @pcap.nil? and not @pcap.null?
-    end
+      def ready?
+        (@closed == false && !(@pcap.nil?) && !(@pcap.null?))
+      end
+
+      #
+      # Closes the pcap interface using libpcap.
+      #
+      def close
+        unless @closed
+          PCap.pcap_close(_pcap)
 
-    # Closes the pcap interface using libpcap.
-    def close
-      unless @closed
-        FFI::PCap.pcap_close(_pcap)
-        @closed = true
-        @pcap = nil
+          @closed = true
+          @pcap = nil
+        end
       end
-    end
 
-    # Returns the pcap interface pointer.
-    #
-    # @return [FFI::Pointer]
-    #   Internal pointer to a pcap_t handle.
-    #
-    def to_ptr
-      _check_pcap()
-    end
-    
-    # Gets the snapshot length.
-    #
-    # @return [Integer]
-    #  Snapshot length for the pcap interface.
-    def snaplen
-      FFI::PCap.pcap_snapshot(_pcap)
-    end
+      #
+      # Returns the pcap interface pointer.
+      #
+      # @return [FFI::Pointer]
+      #   Internal pointer to a pcap_t handle.
+      #
+      def to_ptr
+        _check_pcap()
+      end
 
+      #
+      # Gets the snapshot length.
+      #
+      # @return [Integer]
+      #  Snapshot length for the pcap interface.
+      def snaplen
+        PCap.pcap_snapshot(_pcap)
+      end
 
-    # Compiles a pcap filter but does not apply it to the pcap interface.
-    #
-    # @param [String] expression
-    #   A pcap filter expression. See pcap-filter(7) manpage for syntax.
-    #
-    # @param [Hash] opts
-    #   Additional options for compile
-    #
-    # @option opts [optional, Integer] :optimize
-    #   Optimization flag. 0 means don't optimize. Defaults to 1.
-    #
-    # @option opts [optional, Integer] :netmask
-    #   A 32-bit number representing the IPv4 netmask of the network on which
-    #   packets are being captured. It is only used when checking for IPv4
-    #   broadcast addresses in the filter program. Default: 0 (unspecified 
-    #   netmask)
-    #
-    # @return [BPFProgram]
-    #   A FFI::PCap::BPFProgram structure for the compiled filter.
-    #
-    # @raise [LibError]
-    #   On failure, an exception is raised with the relevant error message 
-    #   from libpcap.
-    #
-    def compile(expression, opts={})
-      optimize = opts[:optimize] || 1
-      netmask  = opts[:netmask] || 0 
-      code = BPFProgram.new
-      if FFI::PCap.pcap_compile(_pcap, code, expression, optimize, netmask) != 0
-        raise(LibError, "pcap_compile(): #{geterr()}")
+      #
+      # Compiles a pcap filter but does not apply it to the pcap interface.
+      #
+      # @param [String] expression
+      #   A pcap filter expression. See `pcap-filter(7)` manpage for syntax.
+      #
+      # @param [Hash] opts
+      #   Additional options for compile
+      #
+      # @option opts [optional, Integer] :optimize
+      #   Optimization flag. 0 means don't optimize. Defaults to 1.
+      #
+      # @option opts [optional, Integer] :netmask
+      #   A 32-bit number representing the IPv4 netmask of the network on
+      #   which packets are being captured. It is only used when checking
+      #   for IPv4 broadcast addresses in the filter program.
+      #   Default: 0 (unspecified netmask)
+      #
+      # @return [BPF::Program]
+      #   A BPF program structure for the compiled filter.
+      #
+      # @raise [LibError]
+      #   On failure, an exception is raised with the relevant error
+      #   message from libpcap.
+      #
+      def compile(expression, opts={})
+        optimize = opts[:optimize] || 1
+        netmask  = opts[:netmask] || 0 
+        code = BPFProgram.new
+
+        if PCap.pcap_compile(_pcap, code, expression, optimize, netmask) != 0
+          raise(LibError,"pcap_compile(): #{geterr()}",caller)
+        end
+
+        return code
       end
-      return code
-    end
 
+      #
+      # @return [Dumper]
+      #
+      # @raise [LibError]
+      #   On failure, an exception is raised with the relevant error
+      #   message from libpcap.
+      #
+      def open_dump(path)
+        dp = PCap.pcap_dump_open(_pcap, File.expand_path(path))
 
-    # @return [Dumper]
-    #
-    # @raise [LibError]
-    #   On failure, an exception is raised with the relevant error
-    #   message from libpcap.
-    #
-    def open_dump(path)
-      dp = FFI::PCap.pcap_dump_open(_pcap, File.expand_path(path))
-      raise(LibError, "pcap_dump_open(): #{geterr()}") if dp.null?
-      return Dumper.new(dp)
-    end
+        if dp.null?
+          raise(LibError,"pcap_dump_open(): #{geterr}",caller)
+        end
 
+        return Dumper.new(dp)
+      end
 
-    # @return [String]
-    #   The error text pertaining to the last pcap library error.
-    #
-    def geterr
-      FFI::PCap.pcap_geterr(_pcap)
-    end
+      #
+      # @return [String]
+      #   The error text pertaining to the last pcap library error.
+      #
+      def geterr
+        PCap.pcap_geterr(_pcap)
+      end
 
-    alias error geterr
+      alias error geterr
 
+      private
 
-    private
-      # Raises an exception if @pcap is not set.
+      #
+      # Raises an exception if `@pcap` is not set.
       #
       # Internal sanity check to confirm the pcap instance
       # variable has been set. Otherwise very bad things can 
       # ensue by passing a null pointer to various libpcap 
       # functions.
+      #
       def _check_pcap
         if @pcap.nil?
-          raise(StandardError, "nil pcap device")
+          raise(StandardError,"nil pcap device",caller)
         else
-          return @pcap
+          @pcap
         end
       end
 
+      #
       # Raises an exception if @pcap is not set or is a null pointer.
       #
       # Internal sanity check to confirm the pcap pointer
       # variable has been set and is not a null pointer. 
       # Otherwise very bad things can ensue by passing a null 
       # pointer to various libpcap functions.
+      #
       def _pcap
-        if (p = _check_pcap()).null?
-          raise(StandardError, "null pointer to pcap device")
+        ptr = _check_pcap
+
+        if ptr.null?
+          raise(StandardError,"null pointer to pcap device",caller)
+        else
+          ptr
         end
-        p
       end
 
+    end
 
-  end
-
-
-  attach_function :pcap_close, [:pcap_t], :void
-  attach_function :pcap_geterr, [:pcap_t], :string
-  attach_function :pcap_compile, [:pcap_t, BPFProgram, :string, :int, :bpf_uint32], :int
-  attach_function :pcap_datalink, [:pcap_t], :int
-  attach_function :pcap_list_datalinks, [:pcap_t, :pointer], :int
-  attach_function :pcap_set_datalink, [:pcap_t, :int], :int
-  attach_function :pcap_snapshot, [:pcap_t], :int
-  attach_function :pcap_dump_open, [:pcap_t, :string], :pcap_dumper_t
+    attach_function :pcap_close, [:pcap_t], :void
+    attach_function :pcap_geterr, [:pcap_t], :string
+    attach_function :pcap_compile, [:pcap_t, BPFProgram, :string, :int, :bpf_uint32], :int
+    attach_function :pcap_datalink, [:pcap_t], :int
+    attach_function :pcap_list_datalinks, [:pcap_t, :pointer], :int
+    attach_function :pcap_set_datalink, [:pcap_t, :int], :int
+    attach_function :pcap_snapshot, [:pcap_t], :int
+    attach_function :pcap_dump_open, [:pcap_t, :string], :pcap_dumper_t
 
-end
+  end
 end

data/lib/ffi/pcap/copy_handler.rb

@@ -1,38 +1,38 @@
-
 module FFI
-module PCap
-
-  # CopyHandler is a callback handler for use with CaptureWrapper.loop and 
-  # CaptureWrapper.dispatch. When used, it works exactly as normal, 
-  # passing a reference to a pcap wrapper and Packet except for one important
-  # difference. A copy of the Packet is yielded to the callback instead of
-  # the volatile one received in the pcap_loop() and pcap_dispatch() 
-  # callbacks.
-  #
-  # The CopyHandler implements receive_callback to return a _copy_
-  # of the Packet object. It is necessary to make a copy to keep allocated
-  # references to packets supplied by pcap_loop() and pcap_dispatch() 
-  # callbacks outside of the scope of a single callback firing on one
-  # packet.
-  #
-  # This handler interface is used by default by CaptureWrapper, so it is
-  # generally always safe to keep references to received packets after new
-  # packets have been received or even after a pcap interface has been 
-  # closed. See CaptureWrapper for more information.
-  class CopyHandler
-    def receive_pcap(pcap, pkt)
-      return [pcap, pkt.copy]
+  module PCap
+    #
+    # {CopyHandler} is a callback handler for use with {CaptureWrapper#loop}
+    # and {CaptureWrapper#dispatch}. When used, it works exactly as normal, 
+    # passing a reference to a pcap wrapper and {Packet} except for one
+    # important difference. A copy of the {Packet} is yielded to the callback
+    # instead of the volatile one received in the pcap_loop() and
+    # `pcap_dispatch()` callbacks.
+    #
+    # The {CopyHandler} implements receive_callback to return a _copy_
+    # of the {Packet} object. It is necessary to make a copy to keep
+    # allocated references to packets supplied by `pcap_loop()` and
+    # `pcap_dispatch()` callbacks outside of the scope of a single callback
+    # firing on one packet.
+    #
+    # This handler interface is used by default by {CaptureWrapper}, so it is
+    # generally always safe to keep references to received packets after new
+    # packets have been received or even after a pcap interface has been 
+    # closed. See {CaptureWrapper} for more information.
+    #
+    class CopyHandler
+      def receive_pcap(pcap, pkt)
+        [pcap, pkt.copy]
+      end
     end
-  end
 
-
-  # This class only exists for backward compatibility. Setting
-  # pcap handler to nil has the same effect now.
-  class Handler
-    def receive_pcap(*args)
-      return args
+    #
+    # This class only exists for backward compatibility. Setting
+    # pcap handler to nil has the same effect now.
+    #
+    class Handler
+      def receive_pcap(*args)
+        args
+      end
     end
   end
 end
-end
-

data/lib/ffi/pcap/crt.rb

@@ -1,15 +1,12 @@
-
 module FFI
-module PCap
-  module CRT
-    extend FFI::Library
-
-    ffi_lib FFI::Library::LIBC
+  module PCap
+    module CRT
+      extend FFI::Library
 
-    typedef :ulong, :size_t  # not all platforms have this set for FFI
+      ffi_lib FFI::Library::LIBC
 
-    attach_function :free, [:pointer], :void
-    attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
+      attach_function :free, [:pointer], :void
+      attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
+    end
   end
 end
-end

data/lib/ffi/pcap/data_link.rb

@@ -1,173 +1,198 @@
 module FFI
-module PCap
-
-  class DataLink
-
-    # Several DLT names harvested out of the pcap-bpf.h header file. These
-    # are in alphabetical order. Their Array index _does_ _not_ match their 
-    # pcap DLT value.
-    #
-    # Don't use this Array for anything except quick reference.  Use the 
-    # 'lookup' class methods for actually resolving name to value 
-    # mappings or such.
-    SOME_DLTS = %w[A429 A653_ICM AIRONET_HEADER APPLE_IP_OVER_IEEE1394 
-    ARCNET ARCNET_LINUX ATM_CLIP ATM_RFC1483 AURORA AX25 BACNET_MS_TP 
-    BLUETOOTH_HCI_H4 BLUETOOTH_HCI_H4_WITH_PHDR CAN20B CHAOS CHDLC CISCO_IOS 
-    C_HDLC DOCSIS ECONET EN10MB EN3MB ENC ERF ERF_ETH ERF_POS FDDI FRELAY 
-    GCOM_SERIAL GCOM_T1E1 GPF_F GPF_T GPRS_LLC HHDLC IBM_SN IBM_SP IEEE802 
-    IEEE802_11 IEEE802_11_RADIO IEEE802_11_RADIO_AVS IEEE802_15_4 
-    IEEE802_15_4_LINUX IEEE802_16_MAC_CPS IEEE802_16_MAC_CPS_RADIO IPFILTER 
-    IPMB IP_OVER_FC JUNIPER_ATM1 JUNIPER_ATM2 JUNIPER_CHDLC JUNIPER_ES 
-    JUNIPER_ETHER JUNIPER_FRELAY JUNIPER_GGSN JUNIPER_ISM JUNIPER_MFR 
-    JUNIPER_MLFR JUNIPER_MLPPP JUNIPER_MONITOR JUNIPER_PIC_PEER JUNIPER_PPP 
-    JUNIPER_PPPOE JUNIPER_PPPOE_ATM JUNIPER_SERVICES JUNIPER_ST JUNIPER_VP 
-    LINUX_IRDA LINUX_LAPD LINUX_PPP_WITHDIRECTION LINUX_SLL LOOP LTALK MFR 
-    MTP2 MTP2_WITH_PHDR MTP3 NULL OLD_PFLOG PCI_EXP PFLOG PFSYNC PPI PPP 
-    PPP_BSDOS PPP_ETHER PPP_PPPD PPP_SERIAL PPP_WITH_DIRECTION PRISM_HEADER 
-    PRONET RAIF1 RAW REDBACK_SMARTEDGE RIO SCCP SITA SLIP SLIP_BSDOS SUNATM 
-    SYMANTEC_FIREWALL TZSP USB USB_LINUX USER0 USER1 USER10 USER11 USER12 
-    USER13 USER14 USER15 USER2 USER3 USER4 USER5 USER6 USER7 USER8 USER9]
-
-    # Uses the pcap_datalnk_* functions to lookup a datalink name and value 
-    # pair.
-    # 
-    # @param [String, Symbol or Integer] l
-    #   The name or value to lookup. A Symbol is converted to String. Names 
-    #   are case-insensitive.
-    #
-    # @return [Array]
-    #   A 2-element array containing [value, name]. Both elements are nil
-    #   if the lookup failed.
-    #
-    def self.lookup(l)
-      val, name = nil
-      l = l.to_s if l.kind_of? Symbol
-
-      case l
-      when String
-        if v=name_to_val(l)
-          name = val_to_name(v)  # get the canonical name
-          val = v
+  module PCap
+    class DataLink
+
+      #
+      # Several DLT names harvested out of the pcap-bpf.h header file. These
+      # are in alphabetical order. Their Array index _does_ _not_ match
+      # their pcap DLT value.
+      #
+      # Don't use this Array for anything except quick reference.  Use the 
+      # {lookup} class methods for actually resolving name to value 
+      # mappings or such.
+      #
+      SOME_DLTS = %w[
+        A429 A653_ICM AIRONET_HEADER APPLE_IP_OVER_IEEE1394 
+        ARCNET ARCNET_LINUX ATM_CLIP ATM_RFC1483 AURORA AX25 BACNET_MS_TP 
+        BLUETOOTH_HCI_H4 BLUETOOTH_HCI_H4_WITH_PHDR CAN20B CHAOS CHDLC
+        CISCO_IOS C_HDLC DOCSIS ECONET EN10MB EN3MB ENC ERF ERF_ETH ERF_POS
+        FDDI FRELAY GCOM_SERIAL GCOM_T1E1 GPF_F GPF_T GPRS_LLC HHDLC IBM_SN
+        IBM_SP IEEE802 IEEE802_11 IEEE802_11_RADIO IEEE802_11_RADIO_AVS
+        IEEE802_15_4 IEEE802_15_4_LINUX IEEE802_16_MAC_CPS
+        IEEE802_16_MAC_CPS_RADIO IPFILTER IPMB IP_OVER_FC JUNIPER_ATM1
+        JUNIPER_ATM2 JUNIPER_CHDLC JUNIPER_ES JUNIPER_ETHER JUNIPER_FRELAY
+        JUNIPER_GGSN JUNIPER_ISM JUNIPER_MFR JUNIPER_MLFR JUNIPER_MLPPP
+        JUNIPER_MONITOR JUNIPER_PIC_PEER JUNIPER_PPP JUNIPER_PPPOE
+        JUNIPER_PPPOE_ATM JUNIPER_SERVICES JUNIPER_ST JUNIPER_VP LINUX_IRDA
+        LINUX_LAPD LINUX_PPP_WITHDIRECTION LINUX_SLL LOOP LTALK MFR MTP2
+        MTP2_WITH_PHDR MTP3 NULL OLD_PFLOG PCI_EXP PFLOG PFSYNC PPI PPP
+        PPP_BSDOS PPP_ETHER PPP_PPPD PPP_SERIAL PPP_WITH_DIRECTION
+        PRISM_HEADER PRONET RAIF1 RAW REDBACK_SMARTEDGE RIO SCCP SITA SLIP
+        SLIP_BSDOS SUNATM SYMANTEC_FIREWALL TZSP USB USB_LINUX USER0 USER1
+        USER10 USER11 USER12 USER13 USER14 USER15 USER2 USER3 USER4 USER5
+        USER6 USER7 USER8 USER9
+      ]
+
+      #
+      # Uses the `pcap_datalnk_*` functions to lookup a datalink name and
+      # value pair.
+      # 
+      # @param [String, Symbol or Integer] l
+      #   The name or value to lookup. A Symbol is converted to String.
+      #   Names are case-insensitive.
+      #
+      # @return [Array]
+      #   A 2-element array containing [value, name]. Both elements are
+      #   `nil` if the lookup failed.
+      #
+      def self.lookup(l)
+        val, name = nil
+        l = l.to_s if l.kind_of?(Symbol)
+
+        case l
+        when String
+          if (v = name_to_val(l))
+            name = val_to_name(v)  # get the canonical name
+            val = v
+          end
+        when Integer
+          name = val_to_name(l)
+          val = l
+        else
+          raise(ArgumentError,"lookup takes either a String or Integer",caller)
         end
-      when Integer
-        name = val_to_name(l)
-        val = l
-      else
-        raise(ArgumentError, "lookup takes either a String or Integer")
+        return [val, name]
       end
-      return [val, name]
-    end
 
-    # Translates a data link type name, which is a DLT_ name with the DLT_ 
-    # removed, to the corresponding data link type numeric value.
-    #
-    # @param [String or Symbol] n
-    #   The name to lookup. Names are case-insensitive.
-    #
-    # @return [Integer or nil] 
-    #   The numeric value for the datalink name or nil on failure.
-    def self.name_to_val(n)
-      n = n.to_s if n.kind_of?(Symbol)
-      if (v=FFI::PCap.pcap_datalink_name_to_val(n)) >= 0
-        return v
+      #
+      # Translates a data link type name, which is a `DLT_` name with the
+      # `DLT_` removed, to the corresponding data link type numeric value.
+      #
+      # @param [String or Symbol] n
+      #   The name to lookup. Names are case-insensitive.
+      #
+      # @return [Integer or nil] 
+      #   The numeric value for the datalink name or `nil` on failure.
+      #
+      def self.name_to_val(n)
+        n = n.to_s if n.kind_of?(Symbol)
+        v = PCap.pcap_datalink_name_to_val(n)
+
+        return v if v >= 0
       end
-    end
 
-    # Translates a data link type  value  to  the corresponding data link 
-    # type name.
-    #
-    # @return [String or nil]
-    #   The string name of the data-link or nil on failure.
-    # 
-    def self.val_to_name(v)
-      FFI::PCap.pcap_datalink_val_to_name(v)
-    end
+      #
+      # Translates a data link type value to the corresponding data link 
+      # type name.
+      #
+      # @return [String or nil]
+      #   The string name of the data-link or `nil` on failure.
+      # 
+      def self.val_to_name(v)
+        PCap.pcap_datalink_val_to_name(v)
+      end
 
-    # @param [String, Symbol or Integer] l
-    #   The name or value to lookup. A Symbol is converted to String. Names 
-    #   are case-insensitive.
-    def self.describe(l)
-      l = l.to_s if l.kind_of?(Symbol)
-      l = FFI::PCap.pcap_datalink_name_to_val(l) if l.kind_of?(String) 
-      FFI::PCap.pcap_datalink_val_to_description(l)
-    end
-    
-    # FFI::PCap datalink numeric value
-    attr_reader :value
-
-    # Creates a new DataLink object with the specified value or name.
-    # The canonical name, value, and description are can be looked up on 
-    # demand. 
-    #
-    # @param [String or Integer] arg
-    #   Arg can be a string or number which will be used to look up the
-    #   datalink.
-    #
-    # @raise [UnsupportedDataLinkError]
-    #   An exception is raised if a name is supplied and a lookup for its
-    #   value fails or if the arg parameter is an invalid type.
-    #
-    def initialize(arg)
-      if arg.kind_of? String or arg.kind_of? Symbol
-        unless @value = self.class.name_to_val(arg.to_s)
-          raise(UnsupportedDataLinkError, "Invalid DataLink: #{arg.to_s}")
+      #
+      # @param [String, Symbol or Integer] l
+      #   The name or value to lookup. A Symbol is converted to String.
+      #   Names are case-insensitive.
+      #
+      def self.describe(l)
+        l = l.to_s if l.kind_of?(Symbol)
+        l = PCap.pcap_datalink_name_to_val(l) if l.kind_of?(String) 
+
+        PCap.pcap_datalink_val_to_description(l)
+      end
+
+      # FFI::PCap datalink numeric value
+      attr_reader :value
+
+      #
+      # Creates a new DataLink object with the specified value or name.
+      # The canonical name, value, and description are can be looked up on 
+      # demand. 
+      #
+      # @param [String or Integer] arg
+      #   Arg can be a string or number which will be used to look up the
+      #   datalink.
+      #
+      # @raise [UnsupportedDataLinkError]
+      #   An exception is raised if a name is supplied and a lookup for its
+      #   value fails or if the arg parameter is an invalid type.
+      #
+      def initialize(arg)
+        case arg
+        when String, Symbol
+          unless (@value = self.class.name_to_val(arg.to_s))
+            raise(UnsupportedDataLinkError, "Invalid DataLink: #{arg.to_s}")
+          end
+        when Numeric
+          @value = arg
+        else
+          raise(UnsupportedDataLinkError,"Invalid DataLink: #{arg.inspect}",caller)
         end
-      elsif arg.kind_of? Numeric
-        @value = arg
-      else
-        raise(UnsupportedDataLinkError, "Invalid DataLink: #{arg.inspect}")
+
+        @name = self.class.val_to_name(@value)
       end
-      @name = self.class.val_to_name(@value)
-    end
 
-    # Overrides the equality operator so that quick comparisons can be
-    # made against other DataLinks, name by String, or value by Integer.
-    def ==(other)
-      case other
-      when DataLink
-        return (self.value == other.value)
-      when Numeric
-        return (self.value == other)
-      when Symbol
-        return (@value == self.class.name_to_val(other.to_s))
-      when String
-        return (@value == self.class.name_to_val(other))
-      else
-        return false
+      #
+      # Overrides the equality operator so that quick comparisons can be
+      # made against other DataLinks, name by String, or value by Integer.
+      #
+      def ==(other)
+        case other
+        when DataLink
+          self.value == other.value
+        when Numeric
+          self.value == other
+        when Symbol
+          @value == self.class.name_to_val(other.to_s)
+        when String
+          @value == self.class.name_to_val(other)
+        else
+          false
+        end
       end
-    end
 
-    # Overrides the sort comparison operator to sort by DLT value.
-    def <=>(other)
-      self.value <=> other.value
-    end
+      #
+      # Overrides the sort comparison operator to sort by DLT value.
+      #
+      def <=>(other)
+        self.value <=> other.value
+      end
 
-    # Returns the description of the datalink.
-    def description
-      @desc ||= self.class.describe(@value)
-    end
+      #
+      # Returns the description of the datalink.
+      #
+      def description
+        @desc ||= self.class.describe(@value)
+      end
 
-    alias desc description
-    alias describe description
+      alias desc description
+      alias describe description
 
-    # Returns the canonical String name of the DataLink object
-    def name
-      @name
-    end
+      #
+      # Returns the canonical String name of the DataLink object
+      #
+      def name
+        @name
+      end
 
-    # Override 'inspect' we'll to always provide the name for irb, 
-    # pretty_print, etc.
-    def inspect
-      "<#{self.class}:#{"0x%0.8x" % self.object_id} @value=#{@value}, @name=#{name().inspect}>"
-    end
+      #
+      # Override `inspect` to always provide the name for irb, 
+      # pretty_print, etc.
+      #
+      def inspect
+        "<#{self.class}:#{"0x%0.8x" % self.object_id} @value=#{@value}, @name=#{name().inspect}>"
+      end
 
-    alias to_s name
-    alias to_i value
-  end
+      alias to_s name
+      alias to_i value
 
-  attach_function :pcap_datalink_name_to_val, [:string], :int
-  attach_function :pcap_datalink_val_to_name, [:int], :string
-  attach_function :pcap_datalink_val_to_description, [:int], :string
+    end
 
-end
+    attach_function :pcap_datalink_name_to_val, [:string], :int
+    attach_function :pcap_datalink_val_to_name, [:int], :string
+    attach_function :pcap_datalink_val_to_description, [:int], :string
+  end
 end