anchor.diff:              false
       end.
   
  -send_authorize(Pid, SetupChannel, CompSpec) ->
  -    {ok,[{address, Address }]} = bt_drv:local_info([address]),
  -    bt_connection:send(Pid, 
  -		       term_to_json(
  -			 {struct, 		     
  -			  [ { ?DLINK_ARG_TRANSACTION_ID, 1 },
  -			    { ?DLINK_ARG_CMD, ?DLINK_CMD_AUTHORIZE },
  -			    { ?DLINK_ARG_ADDRESS, bt_address_to_string(Address) },
  -			    { ?DLINK_ARG_PORT,  SetupChannel },
  -                            { ?DLINK_ARG_VERSION, ?DLINK_BT_VER },
  -			    { ?DLINK_ARG_CERTIFICATES, {array, get_certificates(CompSpec)} },
  -			    { ?DLINK_ARG_SIGNATURE, get_authorize_jwt(CompSpec) } ]})).
  +send_authorize(Pid, CompSpec) ->
  +    {LocalIP, LocalPort} = rvi_common:node_address_tuple(),
  +    connection:send(Pid, 
  +		    term_to_json(
  +		      {struct, 		     
  +		       [ { ?DLINK_ARG_TRANSACTION_ID, 1 },
  +			 { ?DLINK_ARG_CMD, ?DLINK_CMD_AUTHORIZE },
  +			 { ?DLINK_ARG_ADDRESS, LocalIP },
  +			 { ?DLINK_ARG_PORT,  integer_to_list(LocalPort) },
  +			 { ?DLINK_ARG_VERSION, ?DLINK_TCP_VERSION },
  +			 { ?DLINK_ARG_CERTIFICATES, {array, get_certificates(CompSpec)} },
  +			 { ?DLINK_ARG_SIGNATURE, get_authorize_jwt(CompSpec) } ]})).
   
   connection_authorized(FromPid, {RemoteAddress, RemotePort} = Conn, CompSpec) ->
       case connection_manager:find_connection_by_pid(FromPid) of
  
positive.code: status_string(available  ) -> ?DLINK_ARG_AVAILABLE;
  status_string(unavailable) -> ?DLINK_ARG_UNAVAILABLE.
  
  process_authorize(FromPid, PeerIP, PeerPort, TransactionID, RemoteAddress, RemotePort,
                    Protocol, Signature, CompSpec) ->
  
      ?info("dlink_tcp:authorize(): Peer Address:   ~p:~p", [PeerIP, PeerPort ]),
      ?info("dlink_tcp:authorize(): Remote Address: ~p~p", [ RemoteAddress, RemotePort ]),
      ?info("dlink_tcp:authorize(): Protocol Ver:   ~p", [ ProtoVersion ]),
      ?debug("dlink_tcp:authorize(): TransactionID:  ~p", [ TransactionID ]),
      ?debug("dlink_tcp:authorize(): Certificate:    ~p", [ Certificate ]),
      ?debug("dlink_tcp:authorize(): Signature:      ~p", [ Signature ]),
  
      { LocalAddress, LocalPort } = rvi_common:node_address_tuple(),
  
negative.code:                       ?DLINK_ARG_SIGNATURE],
                       Elems, undefined),
  
  	    Conn = {PeerIP, PeerPort},
              case authorize_rpc:validate_message(CompSpec, Signature, Conn) of
                  [ok, Msg] ->
                      process_announce(Msg, FromPid, PeerIP, PeerPort,
  