diff options
Diffstat (limited to 'toxcore')
-rw-r--r-- | toxcore/DHT.c | 2 | ||||
-rw-r--r-- | toxcore/LAN_discovery.c | 2 | ||||
-rw-r--r-- | toxcore/network.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/DHT.c b/toxcore/DHT.c index 4ed437bb..19f8a30c 100644 --- a/toxcore/DHT.c +++ b/toxcore/DHT.c | |||
@@ -1070,7 +1070,7 @@ static void punch_holes(DHT *dht, IP ip, uint16_t *port_list, uint16_t numports, | |||
1070 | for (i = dht->friends_list[friend_num].punching_index; i != top; i++) { | 1070 | for (i = dht->friends_list[friend_num].punching_index; i != top; i++) { |
1071 | /* TODO: improve port guessing algorithm */ | 1071 | /* TODO: improve port guessing algorithm */ |
1072 | uint16_t port = port_list[(i / 2) % numports] + (i / (2 * numports)) * ((i % 2) ? -1 : 1); | 1072 | uint16_t port = port_list[(i / 2) % numports] + (i / (2 * numports)) * ((i % 2) ? -1 : 1); |
1073 | IP_Port pinging = {{ip, htons(port)}}; | 1073 | IP_Port pinging = {{ip, htons(port), 0}}; |
1074 | send_ping_request(dht->ping, dht->c, pinging, dht->friends_list[friend_num].client_id); | 1074 | send_ping_request(dht->ping, dht->c, pinging, dht->friends_list[friend_num].client_id); |
1075 | } | 1075 | } |
1076 | 1076 | ||
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c index 80cebcad..4662bc8e 100644 --- a/toxcore/LAN_discovery.c +++ b/toxcore/LAN_discovery.c | |||
@@ -144,7 +144,7 @@ int send_LANdiscovery(uint16_t port, Net_Crypto *c) | |||
144 | uint8_t data[crypto_box_PUBLICKEYBYTES + 1]; | 144 | uint8_t data[crypto_box_PUBLICKEYBYTES + 1]; |
145 | data[0] = NET_PACKET_LAN_DISCOVERY; | 145 | data[0] = NET_PACKET_LAN_DISCOVERY; |
146 | memcpy(data + 1, c->self_public_key, crypto_box_PUBLICKEYBYTES); | 146 | memcpy(data + 1, c->self_public_key, crypto_box_PUBLICKEYBYTES); |
147 | IP_Port ip_port = {{broadcast_ip(), port}}; | 147 | IP_Port ip_port = {{broadcast_ip(), port, 0}}; |
148 | return sendpacket(c->lossless_udp->net->sock, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES); | 148 | return sendpacket(c->lossless_udp->net->sock, ip_port, data, 1 + crypto_box_PUBLICKEYBYTES); |
149 | } | 149 | } |
150 | 150 | ||
diff --git a/toxcore/network.c b/toxcore/network.c index 34775570..4f1f1a3a 100644 --- a/toxcore/network.c +++ b/toxcore/network.c | |||
@@ -62,7 +62,7 @@ uint32_t random_int(void) | |||
62 | */ | 62 | */ |
63 | int sendpacket(int sock, IP_Port ip_port, uint8_t *data, uint32_t length) | 63 | int sendpacket(int sock, IP_Port ip_port, uint8_t *data, uint32_t length) |
64 | { | 64 | { |
65 | ADDR addr = {AF_INET, ip_port.port, ip_port.ip}; | 65 | ADDR addr = {AF_INET, ip_port.port, ip_port.ip, {0}}; |
66 | return sendto(sock, (char *) data, length, 0, (struct sockaddr *)&addr, sizeof(addr)); | 66 | return sendto(sock, (char *) data, length, 0, (struct sockaddr *)&addr, sizeof(addr)); |
67 | } | 67 | } |
68 | 68 | ||
@@ -207,7 +207,7 @@ Networking_Core *new_networking(IP ip, uint16_t port) | |||
207 | #endif | 207 | #endif |
208 | 208 | ||
209 | /* Bind our socket to port PORT and address 0.0.0.0 */ | 209 | /* Bind our socket to port PORT and address 0.0.0.0 */ |
210 | ADDR addr = {AF_INET, htons(port), ip}; | 210 | ADDR addr = {AF_INET, htons(port), ip, {0}}; |
211 | bind(temp->sock, (struct sockaddr *)&addr, sizeof(addr)); | 211 | bind(temp->sock, (struct sockaddr *)&addr, sizeof(addr)); |
212 | return temp; | 212 | return temp; |
213 | } | 213 | } |