summaryrefslogtreecommitdiff
path: root/toxcore/tox.c
diff options
context:
space:
mode:
authorcotox <39076296+cotox@users.noreply.github.com>2018-06-26 11:45:17 +0000
committercotox <39076296+cotox@users.noreply.github.com>2018-06-26 11:45:17 +0000
commit5b14542d3b5af207170536c3e84fd80f6035cc03 (patch)
tree0b422a2389028102659f3b6cfac61f4023d3684c /toxcore/tox.c
parentae7899cab8104fa3c3078a3e61ddfa58a826e39a (diff)
Make arg `host` understand clearly.
Rename args `host:port` from `address:port`. The *address* is well known as *Tox Address* in this project. Then we should reserve *addres* to it, and use *host* to express the hostname or IP address in TCP domain.
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r--toxcore/tox.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c
index d2dcd93e..f7613d4f 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -248,9 +248,9 @@ void tox_get_savedata(const Tox *tox, uint8_t *savedata)
248 } 248 }
249} 249}
250 250
251bool tox_bootstrap(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key, TOX_ERR_BOOTSTRAP *error) 251bool tox_bootstrap(Tox *tox, const char *host, uint16_t port, const uint8_t *public_key, TOX_ERR_BOOTSTRAP *error)
252{ 252{
253 if (!address || !public_key) { 253 if (!host || !public_key) {
254 SET_ERROR_PARAMETER(error, TOX_ERR_BOOTSTRAP_NULL); 254 SET_ERROR_PARAMETER(error, TOX_ERR_BOOTSTRAP_NULL);
255 return 0; 255 return 0;
256 } 256 }
@@ -262,7 +262,7 @@ bool tox_bootstrap(Tox *tox, const char *address, uint16_t port, const uint8_t *
262 262
263 IP_Port *root; 263 IP_Port *root;
264 264
265 int32_t count = net_getipport(address, &root, TOX_SOCK_DGRAM); 265 int32_t count = net_getipport(host, &root, TOX_SOCK_DGRAM);
266 266
267 if (count == -1) { 267 if (count == -1) {
268 net_freeipport(root); 268 net_freeipport(root);
@@ -291,10 +291,10 @@ bool tox_bootstrap(Tox *tox, const char *address, uint16_t port, const uint8_t *
291 return 0; 291 return 0;
292} 292}
293 293
294bool tox_add_tcp_relay(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key, 294bool tox_add_tcp_relay(Tox *tox, const char *host, uint16_t port, const uint8_t *public_key,
295 TOX_ERR_BOOTSTRAP *error) 295 TOX_ERR_BOOTSTRAP *error)
296{ 296{
297 if (!address || !public_key) { 297 if (!host || !public_key) {
298 SET_ERROR_PARAMETER(error, TOX_ERR_BOOTSTRAP_NULL); 298 SET_ERROR_PARAMETER(error, TOX_ERR_BOOTSTRAP_NULL);
299 return 0; 299 return 0;
300 } 300 }
@@ -306,7 +306,7 @@ bool tox_add_tcp_relay(Tox *tox, const char *address, uint16_t port, const uint8
306 306
307 IP_Port *root; 307 IP_Port *root;
308 308
309 int32_t count = net_getipport(address, &root, TOX_SOCK_STREAM); 309 int32_t count = net_getipport(host, &root, TOX_SOCK_STREAM);
310 310
311 if (count == -1) { 311 if (count == -1) {
312 net_freeipport(root); 312 net_freeipport(root);