diff options
-rw-r--r-- | core/tox.h | 8 | ||||
-rw-r--r-- | testing/nTox.c | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -41,14 +41,14 @@ typedef union { | |||
41 | uint8_t c[4]; | 41 | uint8_t c[4]; |
42 | uint16_t s[2]; | 42 | uint16_t s[2]; |
43 | uint32_t i; | 43 | uint32_t i; |
44 | } IP; | 44 | } tox_IP; |
45 | 45 | ||
46 | typedef struct { | 46 | typedef struct { |
47 | IP ip; | 47 | tox_IP ip; |
48 | uint16_t port; | 48 | uint16_t port; |
49 | /* not used for anything right now */ | 49 | /* not used for anything right now */ |
50 | uint16_t padding; | 50 | uint16_t padding; |
51 | } IP_Port; | 51 | } tox_IP_Port; |
52 | 52 | ||
53 | /* status definitions */ | 53 | /* status definitions */ |
54 | enum { | 54 | enum { |
@@ -252,7 +252,7 @@ void tox_callback_connectionstatus(Tox *tox, void (*function)(Tox *tox, int, uin | |||
252 | 252 | ||
253 | /* Use this function to bootstrap the client | 253 | /* Use this function to bootstrap the client |
254 | Sends a get nodes request to the given node with ip port and public_key */ | 254 | Sends a get nodes request to the given node with ip port and public_key */ |
255 | void tox_bootstrap(Tox *tox, IP_Port ip_port, uint8_t *public_key); | 255 | void tox_bootstrap(Tox *tox, tox_IP_Port ip_port, uint8_t *public_key); |
256 | 256 | ||
257 | /* returns 0 if we are not connected to the DHT | 257 | /* returns 0 if we are not connected to the DHT |
258 | returns 1 if we are */ | 258 | returns 1 if we are */ |
diff --git a/testing/nTox.c b/testing/nTox.c index 87fec818..9df1e78b 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -511,7 +511,7 @@ int main(int argc, char *argv[]) | |||
511 | new_lines(idstring); | 511 | new_lines(idstring); |
512 | strcpy(line, ""); | 512 | strcpy(line, ""); |
513 | 513 | ||
514 | IP_Port bootstrap_ip_port; | 514 | tox_IP_Port bootstrap_ip_port; |
515 | bootstrap_ip_port.port = htons(atoi(argv[2])); | 515 | bootstrap_ip_port.port = htons(atoi(argv[2])); |
516 | int resolved_address = resolve_addr(argv[1]); | 516 | int resolved_address = resolve_addr(argv[1]); |
517 | 517 | ||