Changeset 5565

Timestamp:

07/22/08 14:03:59 (1 month ago)

Author:

hdm

Message:

Raw IP socket support for Rex. Guess what this is for :-)

Files:

• framework3/trunk/lib/rex/socket.rb (modified) (1 diff)
• framework3/trunk/lib/rex/socket/comm/local.rb (modified) (3 diffs)
• framework3/trunk/lib/rex/socket/ip.rb (added)
• framework3/trunk/lib/rex/socket/parameters.rb (modified) (1 diff)

framework3/trunk/lib/rex/socket.rb

@@ -67 +67 @@
-        end
-
+        #
+        # Create a IP socket using the supplied parameter hash.
+        #
+        def self.create_ip(opts = {})
+                return create_param(Rex::Socket::Parameters.from_hash(opts.merge('Proto' => 'ip')))
+        end
+        
-        ##
-        #

framework3/trunk/lib/rex/socket/comm/local.rb

@@ -5 +5 @@
-require 'rex/socket/ssl_tcp_server'
-require 'rex/socket/udp'
+require 'rex/socket/ip'
-require 'timeout'
-
@@ -26 +27 @@
-                        when 'udp'
-                                return create_by_type(param, ::Socket::SOCK_DGRAM, ::Socket::IPPROTO_UDP)
+                        when 'ip'
+                                return create_ip(param)
-                        else
-                                raise Rex::UnsupportedProtocol.new(param.proto), caller
@@ -31 +34 @@
-        end
-
+
+        #
+        # Creates a raw IP socket using the supplied Parameter instance.
+        # Special-cased because of how different it is from UDP/TCP
+        #
+        def self.create_ip(param)
+                sock = ::Socket.open(::Socket::PF_INET, ::Socket::SOCK_RAW, ::Socket::IPPROTO_RAW)
+                unless sock.getsockopt(::Socket::SOL_IP, ::Socket::IP_HDRINCL)
+                        sock.setsockopt(::Socket::SOL_IP, ::Socket::IP_HDRINCL, true)
+                end             
+
+                return sock if (param.bare?)
+
+                sock.extend(::Rex::Socket::Ip)
+                sock.initsock(param)
+                
+                sock
+        end
+        
+        
-        #
-        # Creates a socket using the supplied Parameter instance.

framework3/trunk/lib/rex/socket/parameters.rb

@@ -193 +193 @@
-
-        #
+        # Returns true if the protocol for the parameters is IP.
+        #
+        def ip?
+                return (proto == 'ip')
+        end
+        
+        #
-        # Returns true if the socket is a bare socket that does not inherit from
-        # any extended Rex classes.