Matthew Dillon is making some changes to sockets; these should make the code significantly more simple.  Look at the first patch, for instance.