Modifies adtn_setsockopt to accept more parameters.
Adds adtn_getsockopt to get the socket parameters and the timestamp of the last sended bundle.
Adds setters and getters in the bundle for report and custom field.
Fixes merge conflicts.