Using CULong for CSocket and proper typing

Author: kazu-yamamoto

Network/Socket/Buffer.hsc

@@ -71,7 +71,8 @@ socket2FD :: Socket -> IO FD
 socket2FD s = do
   fd <- unsafeFdSocket s
   -- HACK, 1 means True
-  return $ FD{ fdFD = fd, fdIsSocket_ = 1 }
+  -- TODO: remove fromIntegral for WinIO
+  return $ FD{ fdFD = fromIntegral fd, fdIsSocket_ = 1 }
 #endif
 
 -- | Send data to the socket. The socket must be connected to a remote
@@ -298,27 +299,27 @@ recvBufMsg s bufsizs clen flags = do
 
 #if !defined(mingw32_HOST_OS)
 foreign import ccall unsafe "send"
-  c_send :: CInt -> Ptr a -> CSize -> CInt -> IO CInt
+  c_send :: CSocket -> Ptr a -> CSize -> CInt -> IO CInt
 foreign import ccall unsafe "sendmsg"
-  c_sendmsg :: CInt -> Ptr (MsgHdr sa) -> CInt -> IO CInt -- fixme CSsize
+  c_sendmsg :: CSocket -> Ptr (MsgHdr sa) -> CInt -> IO CInt -- fixme CSsize
 foreign import ccall unsafe "recvmsg"
-  c_recvmsg :: CInt -> Ptr (MsgHdr sa) -> CInt -> IO CInt
+  c_recvmsg :: CSocket -> Ptr (MsgHdr sa) -> CInt -> IO CInt
 #else
 foreign import CALLCONV SAFE_ON_WIN "ioctlsocket"
-  c_ioctlsocket :: CInt -> CLong -> Ptr CULong -> IO CInt
+  c_ioctlsocket :: CSocket -> CLong -> Ptr CULong -> IO CInt
 foreign import CALLCONV SAFE_ON_WIN "WSAGetLastError"
   c_WSAGetLastError :: IO CInt
 foreign import CALLCONV SAFE_ON_WIN "WSASendMsg"
   -- fixme Handle for SOCKET, see #426
-  c_sendmsg :: CInt -> Ptr (MsgHdr sa) -> DWORD -> LPDWORD -> Ptr () -> Ptr ()  -> IO CInt
+  c_sendmsg :: CSocket -> Ptr (MsgHdr sa) -> DWORD -> LPDWORD -> Ptr () -> Ptr ()  -> IO CInt
 foreign import CALLCONV SAFE_ON_WIN "WSARecvMsg"
-  c_recvmsg :: CInt -> Ptr (MsgHdr sa) -> LPDWORD -> Ptr () -> Ptr () -> IO CInt
+  c_recvmsg :: CSocket -> Ptr (MsgHdr sa) -> LPDWORD -> Ptr () -> Ptr () -> IO CInt
 #endif
 
 foreign import ccall unsafe "recv"
-  c_recv :: CInt -> Ptr CChar -> CSize -> CInt -> IO CInt
+  c_recv :: CSocket -> Ptr CChar -> CSize -> CInt -> IO CInt
 foreign import CALLCONV SAFE_ON_WIN "sendto"
-  c_sendto :: CInt -> Ptr a -> CSize -> CInt -> Ptr sa -> CInt -> IO CInt
+  c_sendto :: CSocket -> Ptr a -> CSize -> CInt -> Ptr sa -> CInt -> IO CInt
 foreign import CALLCONV SAFE_ON_WIN "recvfrom"
-  c_recvfrom :: CInt -> Ptr a -> CSize -> CInt -> Ptr sa -> Ptr CInt -> IO CInt
+  c_recvfrom :: CSocket -> Ptr a -> CSize -> CInt -> Ptr sa -> Ptr CInt -> IO CInt
 

Network/Socket/Fcntl.hs

@@ -2,6 +2,7 @@
 
 module Network.Socket.Fcntl where
 
+import Network.Socket.Types
 import qualified System.Posix.Internals
 
 #if !defined(mingw32_HOST_OS)
@@ -11,15 +12,16 @@ import Network.Socket.Imports
 
 -- | Set the nonblocking flag on Unix.
 --   On Windows, nothing is done.
-setNonBlockIfNeeded :: CInt -> IO ()
+setNonBlockIfNeeded :: CSocket -> IO ()
 setNonBlockIfNeeded fd =
-    System.Posix.Internals.setNonBlockingFD fd True
+    System.Posix.Internals.setNonBlockingFD (fromIntegral fd) True
+-- TODO: remove fromIntegral for WinIO
 
 -- | Set the close_on_exec flag on Unix.
 --   On Windows, nothing is done.
 --
 --   Since 2.7.0.0.
-setCloseOnExecIfNeeded :: CInt -> IO ()
+setCloseOnExecIfNeeded :: CSocket -> IO ()
 #if defined(mingw32_HOST_OS) || defined(ghcjs_HOST_OS)
 setCloseOnExecIfNeeded _ = return ()
 #else
@@ -28,14 +30,14 @@ setCloseOnExecIfNeeded fd = System.Posix.Internals.setCloseOnExec fd
 
 #if !defined(mingw32_HOST_OS)
 foreign import ccall unsafe "fcntl"
-  c_fcntl_read  :: CInt -> CInt -> CInt -> IO CInt
+  c_fcntl_read  :: CSocket -> CInt -> CInt -> IO CInt
 #endif
 
 -- | Get the close_on_exec flag.
 --   On Windows, this function always returns 'False'.
 --
 --   Since 2.7.0.0.
-getCloseOnExec :: CInt -> IO Bool
+getCloseOnExec :: CSocket -> IO Bool
 #if defined(mingw32_HOST_OS) || defined(ghcjs_HOST_OS)
 getCloseOnExec _ = return False
 #else
@@ -49,7 +51,7 @@ getCloseOnExec fd = do
 --   On Windows, this function always returns 'False'.
 --
 --   Since 2.7.0.0.
-getNonBlock :: CInt -> IO Bool
+getNonBlock :: CSocket -> IO Bool
 #if defined(mingw32_HOST_OS)
 -- | TODO: Query socket for async flag
 getNonBlock _ = return False

Network/Socket/Handle.hs

@@ -21,9 +21,10 @@ import Network.Socket.Types
 -- sequence with appropriate handshakes specified by the protocol.
 
 -- TODO: WinIO doesn't use fd, add support
+--       Need to remove fromIntegral.
 socketToHandle :: Socket -> IOMode -> IO Handle
 socketToHandle s mode = invalidateSocket s err $ \oldfd -> do
-    h <- fdToHandle' oldfd (Just GHC.IO.Device.Stream) True (show s) mode True{-bin-}
+    h <- fdToHandle' (fromIntegral oldfd) (Just GHC.IO.Device.Stream) True (show s) mode True{-bin-}
     hSetBuffering h NoBuffering
     return h
   where

Network/Socket/Name.hs

@@ -35,9 +35,9 @@ getSocketName s =
      peekSocketAddress ptr
 
 foreign import CALLCONV unsafe "getpeername"
-  c_getpeername :: CInt -> Ptr sa -> Ptr CInt -> IO CInt
+  c_getpeername :: CSocket -> Ptr sa -> Ptr CInt -> IO CInt
 foreign import CALLCONV unsafe "getsockname"
-  c_getsockname :: CInt -> Ptr sa -> Ptr CInt -> IO CInt
+  c_getsockname :: CSocket -> Ptr sa -> Ptr CInt -> IO CInt
 
 -- ---------------------------------------------------------------------------
 -- socketPort

Network/Socket/Options.hsc

@@ -511,6 +511,6 @@ instance Storable SocketTimeout where
 ----------------------------------------------------------------
 
 foreign import CALLCONV unsafe "getsockopt"
-  c_getsockopt :: CInt -> CInt -> CInt -> Ptr a -> Ptr CInt -> IO CInt
+  c_getsockopt :: CSocket -> CInt -> CInt -> Ptr a -> Ptr CInt -> IO CInt
 foreign import CALLCONV unsafe "setsockopt"
-  c_setsockopt :: CInt -> CInt -> CInt -> Ptr a -> CInt -> IO CInt
+  c_setsockopt :: CSocket -> CInt -> CInt -> Ptr a -> CInt -> IO CInt

Network/Socket/Shutdown.hs

@@ -38,7 +38,7 @@ shutdown s stype = void $ withFdSocket s $ \fd ->
     c_shutdown fd $ sdownCmdToInt stype
 
 foreign import CALLCONV unsafe "shutdown"
-  c_shutdown :: CInt -> CInt -> IO CInt
+  c_shutdown :: CSocket -> CInt -> IO CInt
 
 -- | Closing a socket gracefully.
 --   This sends TCP FIN and check if TCP FIN is received from the peer.

Network/Socket/Syscall.hs

@@ -139,7 +139,7 @@ connect :: SocketAddress sa => Socket -> sa -> IO ()
 connect s sa = withSocketsDo $ withSocketAddress sa $ \p_sa sz ->
     connectLoop s p_sa (fromIntegral sz)
 
-connectLoop :: SocketAddress sa => Socket -> Ptr sa -> CSocket -> IO ()
+connectLoop :: SocketAddress sa => Socket -> Ptr sa -> CInt -> IO ()
 connectLoop s p_sa sz = withFdSocket s $ \fd -> loop fd
   where
     errLoc = "Network.Socket.connect: " ++ show s

Network/Socket/Types.hsc

@@ -105,7 +105,7 @@ import Network.Socket.ReadShow
 -----------------------------------------------------------------------------
 
 #if defined(mingw32_HOST_OS)
-type CSocket = SOCKET
+type CSocket = CULong
 #else
 type CSocket = CInt
 #endif