socket options check
Merge branch 'master' of https://github.com/yangjin-unique/code

Conflicts:
	net/Makefile