The commits in my repo adds IPv6 support, shouldn't hopefully break things...
Use the current local IP address that the client has connected to for…
… incoming listening sockets, too
Handle connections over IPv6 as well as IPv4
Should I merge this in?
If you find it clean enough, go ahead - I haven't touched this for a while but I don't remember there being any outstanding issues with it other than making the code slightly uglier all over the place.
Sure, send me a pull request?