Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 8 commits
  • 5 files changed
  • 0 commit comments
  • 3 contributors
View
30 Network/BSD.hsc
@@ -146,10 +146,10 @@ type ProtocolName = String
data ServiceEntry =
ServiceEntry {
- serviceName :: ServiceName, -- Official Name
- serviceAliases :: [ServiceName], -- aliases
- servicePort :: PortNumber, -- Port Number ( network byte order )
- serviceProtocol :: ProtocolName -- Protocol
+ serviceName :: ServiceName, -- Official Name
+ serviceAliases :: [ServiceName], -- aliases
+ servicePort :: PortNumber, -- Port Number ( network byte order )
+ serviceProtocol :: ProtocolName -- Protocol
} deriving (Show, Typeable)
instance Storable ServiceEntry where
@@ -249,9 +249,9 @@ getServiceEntries stayOpen = do
data ProtocolEntry =
ProtocolEntry {
- protoName :: ProtocolName, -- Official Name
- protoAliases :: [ProtocolName], -- aliases
- protoNumber :: ProtocolNumber -- Protocol Number
+ protoName :: ProtocolName, -- Official Name
+ protoAliases :: [ProtocolName], -- aliases
+ protoNumber :: ProtocolNumber -- Protocol Number
} deriving (Read, Show, Typeable)
instance Storable ProtocolEntry where
@@ -336,10 +336,10 @@ getProtocolEntries stayOpen = withLock $ do
data HostEntry =
HostEntry {
- hostName :: HostName, -- Official Name
- hostAliases :: [HostName], -- aliases
- hostFamily :: Family, -- Host Type (currently AF_INET)
- hostAddresses :: [HostAddress] -- Set of Network Addresses (in network byte order)
+ hostName :: HostName, -- Official Name
+ hostAliases :: [HostName], -- aliases
+ hostFamily :: Family, -- Host Type (currently AF_INET)
+ hostAddresses :: [HostAddress] -- Set of Network Addresses (in network byte order)
} deriving (Read, Show, Typeable)
instance Storable HostEntry where
@@ -443,10 +443,10 @@ type NetworkName = String
data NetworkEntry =
NetworkEntry {
- networkName :: NetworkName, -- official name
- networkAliases :: [NetworkName], -- aliases
- networkFamily :: Family, -- type
- networkAddress :: NetworkAddr
+ networkName :: NetworkName, -- official name
+ networkAliases :: [NetworkName], -- aliases
+ networkFamily :: Family, -- type
+ networkAddress :: NetworkAddr
} deriving (Read, Show, Typeable)
instance Storable NetworkEntry where
View
10 Network/Socket.hsc
@@ -280,7 +280,7 @@ data SocketStatus
| Listening -- listen
| Connected -- connect/accept
| ConvertedToHandle -- is now a Handle, don't touch
- | Closed -- sClose
+ | Closed -- sClose
deriving (Eq, Show, Typeable)
data Socket
@@ -407,8 +407,8 @@ instance Show SockAddr where
-- 'Datagram'. The protocol number is usually 'defaultProtocol'.
-- If 'AF_INET6' is used, the 'IPv6Only' socket option is set to 0
-- so that both IPv4 and IPv6 can be handled with one socket.
-socket :: Family -- Family Name (usually AF_INET)
- -> SocketType -- Socket Type (usually Stream)
+socket :: Family -- Family Name (usually AF_INET)
+ -> SocketType -- Socket Type (usually Stream)
-> ProtocolNumber -- Protocol Number (getProtocolByName to find value)
-> IO Socket -- Unconnected Socket
socket family stype protocol = do
@@ -1006,7 +1006,7 @@ packSocketOption so =
#ifdef SO_USELOOPBACK
UseLoopBack -> #const SO_USELOOPBACK
#endif
-#ifdef HAVE_DECL_IPV6_V6ONLY
+#if HAVE_DECL_IPV6_V6ONLY
IPv6Only -> #const IPV6_V6ONLY
#endif
@@ -1018,7 +1018,7 @@ setSocketOption (MkSocket s _ _ _ _) so v = do
with (fromIntegral v) $ \ptr_v -> do
throwErrnoIfMinus1_ "setSocketOption" $
c_setsockopt s (socketOptLevel so) (packSocketOption so) ptr_v
- (fromIntegral (sizeOf v))
+ (fromIntegral (sizeOf (undefined :: CInt)))
return ()
View
3  Network/Socket/ByteString/Lazy.hsc
@@ -27,10 +27,11 @@ module Network.Socket.ByteString.Lazy
-- * Send data to a socket
send
, sendAll
+ ,
#endif
-- * Receive data from a socket
- , getContents
+ getContents
, recv
) where
View
2  configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell network package], [1.0], [libraries@haskell.org], [network])
+AC_INIT([Haskell network package], [2.3.0.10], [libraries@haskell.org], [network])
ac_includes_default="$ac_includes_default
#ifdef HAVE_NETDB_H
View
10 network.cabal
@@ -1,5 +1,5 @@
name: network
-version: 2.3.0.8
+version: 2.3.0.10
license: BSD3
license-file: LICENSE
maintainer: Johan Tibell <johan.tibell@gmail.com>
@@ -62,11 +62,11 @@ test-suite simple
type: exitcode-stdio-1.0
build-depends:
- base < 4.5,
+ base < 4.6,
bytestring < 0.10,
HUnit < 1.3,
network,
- test-framework < 0.5,
+ test-framework < 0.6,
test-framework-hunit < 0.3
test-suite uri
@@ -75,10 +75,10 @@ test-suite uri
type: exitcode-stdio-1.0
build-depends:
- base < 4.5,
+ base < 4.6,
HUnit < 1.3,
network,
- test-framework < 0.5,
+ test-framework < 0.6,
test-framework-hunit < 0.3
source-repository head

No commit comments for this range

Something went wrong with that request. Please try again.