I did say that I planned to remove ipsec_getsocket()/ipsec_setsocket(),
and I already have a tree with most of them gone.

Tho if you'd rather revive the ipsec_getsocket() as a short-term fix,
thats fine with me, and (again) I'm willing to help clean up, if only
you and i can get in synch.