Added some socket creation api's
Merge to resolve conflicts