Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more TCP socket options #570

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Network/Socket.hs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ module Network.Socket
,RecvLowWater,SendLowWater,RecvTimeOut,SendTimeOut
,UseLoopBack,UserTimeout,IPv6Only
,RecvIPv4TTL,RecvIPv4TOS,RecvIPv4PktInfo
,RecvIPv6HopLimit,RecvIPv6TClass,RecvIPv6PktInfo)
,RecvIPv6HopLimit,RecvIPv6TClass,RecvIPv6PktInfo
,KeepIdle,KeepInterval,KeepCount)
, StructLinger (..)
, SocketTimeout (..)
, isSupportedSocketOption
Expand Down
25 changes: 25 additions & 0 deletions Network/Socket/Options.hsc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module Network.Socket.Options (
,UseLoopBack,UserTimeout,IPv6Only
,RecvIPv4TTL,RecvIPv4TOS,RecvIPv4PktInfo
,RecvIPv6HopLimit,RecvIPv6TClass,RecvIPv6PktInfo
,KeepIdle,KeepInterval,KeepCount
,CustomSockOpt)
, isSupportedSocketOption
, whenSupported
Expand Down Expand Up @@ -94,6 +95,9 @@ socketOptionBijection =
, (RecvIPv6HopLimit, "RecvIPv6HopLimit")
, (RecvIPv6TClass, "RecvIPv6TClass")
, (RecvIPv6PktInfo, "RecvIPv6PktInfo")
, (KeepIdle, "KeepIdle")
, (KeepInterval, "KeepInterval")
, (KeepCount, "KeepCount")
]

instance Show SocketOption where
Expand Down Expand Up @@ -306,6 +310,27 @@ pattern Cork = SockOpt (#const IPPROTO_TCP) (#const TCP_CORK)
#else
pattern Cork = SockOpt (-1) (-1)
#endif
-- | TCP_KEEPIDLE
pattern KeepIdle :: SocketOption
#ifdef TCP_KEEPIDLE
pattern KeepIdle = SockOpt (#const IPPROTO_TCP) (#const TCP_KEEPIDLE)
#else
pattern KeepIdle = SockOpt (-1) (-1)
#endif
-- | TCP_KEEPINTVL
pattern KeepInterval :: SocketOption
#ifdef TCP_KEEPINTVL
pattern KeepInterval = SockOpt (#const IPPROTO_TCP) (#const TCP_KEEPINTVL)
#else
pattern KeepInterval = SockOpt (-1) (-1)
#endif
-- | TCP_KEEPCNT
pattern KeepCount :: SocketOption
#ifdef TCP_KEEPCNT
pattern KeepCount = SockOpt (#const IPPROTO_TCP) (#const TCP_KEEPCNT)
#else
pattern KeepCount = SockOpt (-1) (-1)
#endif
#endif // HAVE_DECL_IPPROTO_TCP

#if HAVE_DECL_IPPROTO_IP
Expand Down
3 changes: 2 additions & 1 deletion tests/Network/SocketSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,8 @@ sockoptPatterns = nub
,RecvLowWater,SendLowWater,RecvTimeOut,SendTimeOut
,UseLoopBack,UserTimeout,IPv6Only
,RecvIPv4TTL,RecvIPv4TOS,RecvIPv4PktInfo
,RecvIPv6HopLimit,RecvIPv6TClass,RecvIPv6PktInfo]
,RecvIPv6HopLimit,RecvIPv6TClass,RecvIPv6PktInfo
,KeepIdle,KeepInterval,KeepCount]

cmsgidPatterns :: [CmsgId]
cmsgidPatterns = nub
Expand Down