Hi Toke, That all makes sense. I'm going out of town extremely soon, but I'll fix this when I've returned. I have a pretty good idea of what's required. If you're curious to try it yourself, just try removing invocations of socket_clear_peer_endpoint_src inside timers.c. Jason