From 13922373d685bfd583b464ac3237750941f1fa0b Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sun, 29 Jan 2012 22:57:13 -0600
Subject: [PATCH] Create dedicated class for messages.

---
 lib/mach.rb      |  6 ++++++
 lib/mach/port.rb | 52 ++++++++++++++++++++++++++++--------------------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/lib/mach.rb b/lib/mach.rb
index d51b7fb..f2d08a5 100644
--- a/lib/mach.rb
+++ b/lib/mach.rb
@@ -1,6 +1,12 @@
 require 'mach/port'
 require 'mach/semaphore'
 require 'mach/task'
+require 'mach/functions'
 
 module Mach
+  # @return [Port] the original bootstrap port; different from that
+  # affected by {get,set}_special_port
+  def self.bootstrap_port
+    @bootstrap_port ||= Mach::Port.new(:port => Mach::Functions::bootstrap_port)
+  end
 end
diff --git a/lib/mach/port.rb b/lib/mach/port.rb
index 0f2c9fe..f947e0d 100644
--- a/lib/mach/port.rb
+++ b/lib/mach/port.rb
@@ -9,6 +9,23 @@ module Mach
   class Port
     include Functions
 
+    class SendRightMsg < FFI::Struct
+      include Functions
+
+      layout(:header, MsgHeader,
+             :body, MsgBody,
+             :port, MsgPortDescriptor)
+    end
+
+    class ReceiveRightMsg < FFI::Struct
+      include Functions
+
+      layout(:header, MsgHeader,
+             :body, MsgBody,
+             :port, MsgPortDescriptor,
+             :trailer, MsgTrailer)
+    end
+
     attr_reader :ipc_space, :port
 
     # @param [Hash] opts
@@ -21,18 +38,16 @@ module Mach
     # is wrapped in a new Port object; otherwise a new port is
     # allocated according to the other options
     def initialize(opts = {})
-      if opts.kind_of? Hash
-        @ipc_space = opts[:ipc_space] || mach_task_self
-        right = opts[:right] || :receive
+      @ipc_space = opts[:ipc_space] || mach_task_self
+      right = opts[:right] || :receive
 
-        @port = if opts[:port]
-                  opts[:port].to_i
-                else
-                  mem = new_memory_pointer(:mach_port_right_t)
-                  mach_port_allocate(@ipc_space.to_i, right, mem)
-                  mem.get_uint(0)
-                end
-      end
+      @port = if opts[:port]
+                opts[:port].to_i
+              else
+                mem = new_memory_pointer(:mach_port_right_t)
+                mach_port_allocate(@ipc_space.to_i, right, mem)
+                mem.get_uint(0)
+              end
     end
 
     # With this alias, we can call #to_i on either bare Integer ports
@@ -81,17 +96,14 @@ module Mach
     # must already have the requisite rights allowing it to send
     # +right+.
     def send_right(right, remote_port)
-      msg = FFI::Struct.new(nil,
-                            :header, MsgHeader,
-                            :body, MsgBody,
-                            :port, MsgPortDescriptor)
-      
+      msg = SendRightMsg.new
+
       msg[:header].tap do |h|
         h[:remote_port] = remote_port.to_i
         h[:local_port] = MACH_PORT_NULL
         h[:bits] =
           (MachMsgType[right] | (0 << 8)) | 0x80000000 # MACH_MSGH_BITS_COMPLEX
-        h[:size] = msg.size
+        h[:size] = 40 # msg.size
       end
 
       msg[:body][:descriptor_count] = 1
@@ -115,11 +127,7 @@ module Mach
     # Create a new Port by receiving a port right message on this
     # port.
     def receive_right
-      msg = FFI::Struct.new(nil,
-                            :header, MsgHeader,
-                            :body, MsgBody,
-                            :port, MsgPortDescriptor,
-                            :trailer, MsgTrailer)
+      msg = ReceiveRightMsg.new
   
       mach_msg(msg,
                2, # MACH_RCV_MSG,