StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Expose the tox_add_tcp_relay() function in the public api.

Browse Source 
Clients can use this function to make Tox connect to user specified
TCP relays.
This commit is contained in:
irungentoo 2014-09-02 19:38:44 -04:00
parent 6d680274f6
commit 01203a2272
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toxcore/tox.c
View File

@ -729,17 +729,20 @@ uint64_t tox_file_data_remaining(const Tox *tox, int32_t friendnumber, uint8_t f
/***************END OF FILE SENDING FUNCTIONS******************/ /***************END OF FILE SENDING FUNCTIONS******************/
/* TODO: expose this properly. */ /* Like tox_bootstrap_from_address but for TCP relays only.
static int tox_add_tcp_relay(Tox *tox, const char *address, uint8_t ipv6enabled, uint16_t port, *
const uint8_t *public_key) * return 0 on failure.
* return 1 on success.
*/
int tox_add_tcp_relay(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key)
{ {
Messenger *m = tox; Messenger *m = tox;
IP_Port ip_port_v64; IP_Port ip_port_v64;
IP *ip_extra = NULL; IP *ip_extra = NULL;
IP_Port ip_port_v4; IP_Port ip_port_v4;
ip_init(&ip_port_v64.ip, ipv6enabled); ip_init(&ip_port_v64.ip, m->options.ipv6enabled);
if (ipv6enabled) { if (m->options.ipv6enabled) {
/* setup for getting BOTH: an IPv6 AND an IPv4 address */ /* setup for getting BOTH: an IPv6 AND an IPv4 address */
ip_port_v64.ip.family = AF_UNSPEC; ip_port_v64.ip.family = AF_UNSPEC;
ip_reset(&ip_port_v4.ip); ip_reset(&ip_port_v4.ip);
@ -747,7 +750,7 @@ static int tox_add_tcp_relay(Tox *tox, const char *address, uint8_t ipv6enabled,
} }
if (addr_resolve_or_parse_ip(address, &ip_port_v64.ip, ip_extra)) { if (addr_resolve_or_parse_ip(address, &ip_port_v64.ip, ip_extra)) {
ip_port_v64.port = port; ip_port_v64.port = htons(port);
add_tcp_relay(m->net_crypto, ip_port_v64, public_key); add_tcp_relay(m->net_crypto, ip_port_v64, public_key);
onion_add_path_node(m->onion_c, ip_port_v64, public_key); //TODO: move this onion_add_path_node(m->onion_c, ip_port_v64, public_key); //TODO: move this
return 1; return 1;
@ -759,7 +762,7 @@ static int tox_add_tcp_relay(Tox *tox, const char *address, uint8_t ipv6enabled,
int tox_bootstrap_from_address(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key) int tox_bootstrap_from_address(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key)
{ {
Messenger *m = tox; Messenger *m = tox;
tox_add_tcp_relay(tox, address, m->options.ipv6enabled, htons(port), public_key); tox_add_tcp_relay(tox, address, port, public_key);
return DHT_bootstrap_from_address(m->dht, address, m->options.ipv6enabled, htons(port), public_key); return DHT_bootstrap_from_address(m->dht, address, m->options.ipv6enabled, htons(port), public_key);
} }

7
toxcore/tox.h
View File

@ -601,6 +601,13 @@ uint64_t tox_file_data_remaining(const Tox *tox, int32_t friendnumber, uint8_t f
*/ */
int tox_bootstrap_from_address(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key); int tox_bootstrap_from_address(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key);
/* Like tox_bootstrap_from_address but for TCP relays only.
*
* return 0 on failure.
* return 1 on success.
*/
int tox_add_tcp_relay(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key);
/* return 0 if we are not connected to the DHT. /* return 0 if we are not connected to the DHT.
* return 1 if we are. * return 1 if we are.
*/ */