Updated some function headers, and changed a bit of logic in the reuse addr function. Refer to the revision in the header.