Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
f068f4e579
6 changed files with 159 additions and 0 deletions
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.163"
|
||||
subject="comment 10"
|
||||
date="2014-02-08T18:31:23Z"
|
||||
content="""
|
||||
But you said that setSocketOption failed when you were using XMPP, not when starting the webapp, so I think it's more likely to be one of the setSocketOption calls in the network library, or possibly somewhere else.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,97 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
|
||||
nickname="dxtrish"
|
||||
subject="comment 11"
|
||||
date="2014-02-08T19:18:17Z"
|
||||
content="""
|
||||
I honestly have no idea why that move works because
|
||||
|
||||
% ls -lh /usr/lib|grep -E '(gsasl|xml2|gnutls|idn)'
|
||||
|
||||
returns nothing. But couldn't those symbols already be in the other libraries considering, from what I've read at least, haskell stuff are statically compiled by default?
|
||||
|
||||
Anyway, you are completely right that this happened when I try to use XMPP. The reason I was looking in the wrong place to begin with was because the webapp spit out the error messsage. I have redirected my attention to the network library and the xmpp library.
|
||||
|
||||
But I might have found something interesting in the network library. Keep in mind that I just learned a little today, so do correct me if I'm wrong.
|
||||
|
||||
Looking at http://hackage.haskell.org/package/network-2.2.1.8/docs/src/Network-Socket.html I found:
|
||||
|
||||
setSocketOption :: Socket
|
||||
-> SocketOption -- Option Name
|
||||
-> Int -- Option Value
|
||||
-> IO ()
|
||||
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))
|
||||
return ()
|
||||
|
||||
Everything here looks good. So I decided to take a look at SocketOption, socketOptLevel and packSocketOption.
|
||||
|
||||
data SocketOption
|
||||
= DummySocketOption__
|
||||
| Debug {- SO_DEBUG -}
|
||||
| ReuseAddr {- SO_REUSEADDR -}
|
||||
| Type {- SO_TYPE -}
|
||||
| SoError {- SO_ERROR -}
|
||||
| DontRoute {- SO_DONTROUTE -}
|
||||
| Broadcast {- SO_BROADCAST -}
|
||||
| SendBuffer {- SO_SNDBUF -}
|
||||
| RecvBuffer {- SO_RCVBUF -}
|
||||
| KeepAlive {- SO_KEEPALIVE -}
|
||||
| OOBInline {- SO_OOBINLINE -}
|
||||
| TimeToLive {- IP_TTL -}
|
||||
| MaxSegment {- TCP_MAXSEG -}
|
||||
| NoDelay {- TCP_NODELAY -}
|
||||
| Linger {- SO_LINGER -}
|
||||
| RecvLowWater {- SO_RCVLOWAT -}
|
||||
| SendLowWater {- SO_SNDLOWAT -}
|
||||
| RecvTimeOut {- SO_RCVTIMEO -}
|
||||
| SendTimeOut {- SO_SNDTIMEO -}
|
||||
|
||||
socketOptLevel :: SocketOption -> CInt
|
||||
socketOptLevel so =
|
||||
case so of
|
||||
TimeToLive -> 0
|
||||
MaxSegment -> 6
|
||||
NoDelay -> 6
|
||||
_ -> 1
|
||||
|
||||
packSocketOption :: SocketOption -> CInt
|
||||
packSocketOption so =
|
||||
case so of
|
||||
Debug -> 1
|
||||
ReuseAddr -> 2
|
||||
Type -> 3
|
||||
SoError -> 4
|
||||
DontRoute -> 5
|
||||
Broadcast -> 6
|
||||
SendBuffer -> 7
|
||||
RecvBuffer -> 8
|
||||
KeepAlive -> 9
|
||||
OOBInline -> 10
|
||||
TimeToLive -> 2
|
||||
MaxSegment -> 2
|
||||
NoDelay -> 1
|
||||
Linger -> 13
|
||||
RecvLowWater -> 18
|
||||
SendLowWater -> 19
|
||||
RecvTimeOut -> 20
|
||||
SendTimeOut -> 21
|
||||
|
||||
Everything looks good so I thought long and hard about this. Then, by chance, I just looked at the man page for setsockopt() and it mentioned SOL_SOCKET and I was like \"Hmm...\"
|
||||
|
||||
% grep -R SOL_SOCKET /usr/include
|
||||
/usr/include/openssl/e_os.h:#define ioctlsocket(a,b,c) setsockopt((a),SOL_SOCKET,(b),(c),sizeof(*(c)))
|
||||
/usr/include/sys/socket.h:#define SOL_SOCKET 0xffff /* options for socket level */
|
||||
/usr/include/sys/socket.h:/* Read using getsockopt() with SOL_SOCKET, SO_PEERCRED */
|
||||
|
||||
Wat?
|
||||
|
||||
#define SOL_SOCKET 0xffff
|
||||
|
||||
Going back to the Haskell code above I realized that SetSocketOption will NEVER feed 0xffff as level to setsockopt() because socketOptLevel returns 1 unless optname is TimeToLive, MaxSegment or NoDelay.
|
||||
|
||||
Am I way off?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
|
||||
nickname="dxtrish"
|
||||
subject="comment 8"
|
||||
date="2014-02-08T18:13:33Z"
|
||||
content="""
|
||||
What I did was to temporarily move away (or rename) the offending libs. What I essentially did was this:
|
||||
|
||||
cabal configure
|
||||
cabal build
|
||||
sudo mv /usr/local/lib/lib{xml2,gnutls,gsasl,idn}.a /tmp
|
||||
cabal install
|
||||
sudo mv /tmp/lib{xml2,gnutls,gsasl,idn}.a /usr/local/lib
|
||||
|
||||
but I've also had to patch network-info. I've contacted the maintainer of that package but I haven't received anything. I'm considering creating an actual fork with my changes but that would almost seem kind of silly as I don't know *ANY* haskell.. But I am looking at the Haskell wiki as I'm typing this so I can see what I'm looking at :).
|
||||
|
||||
Won't break anything by not setting SO_REUSEADDR? I suspect you're setting it for a reason?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.163"
|
||||
subject="comment 9"
|
||||
date="2014-02-08T18:29:41Z"
|
||||
content="""
|
||||
So you moved away libs in /usr/local to expose usable ones in /usr?
|
||||
|
||||
I've had luck before sending the network-info mantainer pull requests: <https://github.com/jystic/network-info/issues/3>
|
||||
|
||||
git-annex does set ReuseAddr in one place; in Utility/Webapp.hs. The only time that would have a benefit would be when using `git annex webapp --listen=address:port` and starting and restarting the webapp. Normally the webapp chooses a random free port so it shouldn't need that.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
|
||||
nickname="Hamza"
|
||||
subject="comment 2"
|
||||
date="2014-02-08T18:30:47Z"
|
||||
content="""
|
||||
I tried with/without --from still does not drop the files.
|
||||
|
||||
git annex dropunused --from cloud 1-3 --force
|
||||
dropunused 1 (from cloud...) (gpg) ok
|
||||
dropunused 2 (from cloud...) ok
|
||||
dropunused 3 (from cloud...) ok
|
||||
(Recording state in git...)
|
||||
|
||||
still running unused shows the files as unused.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.163"
|
||||
subject="comment 3"
|
||||
date="2014-02-08T19:17:46Z"
|
||||
content="""
|
||||
Ok, you're right and this *does* involve spaces. Some bug in the unused log parser.
|
||||
"""]]
|
||||
Loading…
Add table
Reference in a new issue