Revert "Revert for test"

This reverts commit 02d6bb589bf447079e1bc35f12c5c8e6c0457ee8.

Conflicts:
	osppeer.c
broken