[PATCH 06/16] peer_service: Setting retval ignored, always overwritten