Skip to content

Commit 9284446

Browse files
iphydfiphydf
committed
refactor: Use strong typedef for network family.
1 parent c53c30e commit 9284446

16 files changed

+214
-157
lines changed

‎auto_tests/auto_test_support.c

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,38 @@ static const struct BootstrapNodes {
3636
const uint8_t key[32];
3737
} bootstrap_nodes[] = {
3838
{
39-
"tox.abilinski.com", 33445,
40-
0x10, 0xC0, 0x0E, 0xB2, 0x50, 0xC3, 0x23, 0x3E,
41-
0x34, 0x3E, 0x2A, 0xEB, 0xA0, 0x71, 0x15, 0xA5,
42-
0xC2, 0x89, 0x20, 0xE9, 0xC8, 0xD2, 0x94, 0x92,
43-
0xF6, 0xD0, 0x0B, 0x29, 0x04, 0x9E, 0xDC, 0x7E,
39+
"tox.abilinski.com", 33445, {
40+
0x10, 0xC0, 0x0E, 0xB2, 0x50, 0xC3, 0x23, 0x3E,
41+
0x34, 0x3E, 0x2A, 0xEB, 0xA0, 0x71, 0x15, 0xA5,
42+
0xC2, 0x89, 0x20, 0xE9, 0xC8, 0xD2, 0x94, 0x92,
43+
0xF6, 0xD0, 0x0B, 0x29, 0x04, 0x9E, 0xDC, 0x7E,
44+
},
4445
},
4546
{
46-
"tox.initramfs.io", 33445,
47-
0x02, 0x80, 0x7C, 0xF4, 0xF8, 0xBB, 0x8F, 0xB3,
48-
0x90, 0xCC, 0x37, 0x94, 0xBD, 0xF1, 0xE8, 0x44,
49-
0x9E, 0x9A, 0x83, 0x92, 0xC5, 0xD3, 0xF2, 0x20,
50-
0x00, 0x19, 0xDA, 0x9F, 0x1E, 0x81, 0x2E, 0x46,
47+
"tox.initramfs.io", 33445, {
48+
0x02, 0x80, 0x7C, 0xF4, 0xF8, 0xBB, 0x8F, 0xB3,
49+
0x90, 0xCC, 0x37, 0x94, 0xBD, 0xF1, 0xE8, 0x44,
50+
0x9E, 0x9A, 0x83, 0x92, 0xC5, 0xD3, 0xF2, 0x20,
51+
0x00, 0x19, 0xDA, 0x9F, 0x1E, 0x81, 0x2E, 0x46,
52+
},
5153
},
5254
{
53-
"tox.plastiras.org", 33445,
54-
0x8E, 0x8B, 0x63, 0x29, 0x9B, 0x3D, 0x52, 0x0F,
55-
0xB3, 0x77, 0xFE, 0x51, 0x00, 0xE6, 0x5E, 0x33,
56-
0x22, 0xF7, 0xAE, 0x5B, 0x20, 0xA0, 0xAC, 0xED,
57-
0x29, 0x81, 0x76, 0x9F, 0xC5, 0xB4, 0x37, 0x25,
55+
"tox.plastiras.org", 33445, {
56+
0x8E, 0x8B, 0x63, 0x29, 0x9B, 0x3D, 0x52, 0x0F,
57+
0xB3, 0x77, 0xFE, 0x51, 0x00, 0xE6, 0x5E, 0x33,
58+
0x22, 0xF7, 0xAE, 0x5B, 0x20, 0xA0, 0xAC, 0xED,
59+
0x29, 0x81, 0x76, 0x9F, 0xC5, 0xB4, 0x37, 0x25,
60+
},
5861
},
5962
{
60-
"tox.novg.net", 33445,
61-
0xD5, 0x27, 0xE5, 0x84, 0x7F, 0x83, 0x30, 0xD6,
62-
0x28, 0xDA, 0xB1, 0x81, 0x4F, 0x0A, 0x42, 0x2F,
63-
0x6D, 0xC9, 0xD0, 0xA3, 0x00, 0xE6, 0xC3, 0x57,
64-
0x63, 0x4E, 0xE2, 0xDA, 0x88, 0xC3, 0x54, 0x63,
63+
"tox.novg.net", 33445, {
64+
0xD5, 0x27, 0xE5, 0x84, 0x7F, 0x83, 0x30, 0xD6,
65+
0x28, 0xDA, 0xB1, 0x81, 0x4F, 0x0A, 0x42, 0x2F,
66+
0x6D, 0xC9, 0xD0, 0xA3, 0x00, 0xE6, 0xC3, 0x57,
67+
0x63, 0x4E, 0xE2, 0xDA, 0x88, 0xC3, 0x54, 0x63,
68+
},
6569
},
66-
{ nullptr, 0, 0 },
70+
{ nullptr, 0, {0} },
6771
};
6872

6973
void bootstrap_tox_live_network(Tox *tox, bool enable_tcp)

‎auto_tests/network_test.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static void test_addr_resolv_localhost(void)
3636
ck_assert_msg(res, "Resolver failed: %d, %s", error, net_strerror(error, &error_str));
3737

3838
Ip_Ntoa ip_str;
39-
ck_assert_msg(net_family_is_ipv4(ip.family), "Expected family TOX_AF_INET, got %u.", ip.family.value);
39+
ck_assert_msg(net_family_is_ipv4(ip.family), "Expected family NET_FAMILY_IPV4, got %u.", ip.family.value);
4040
const uint32_t loopback = get_ip4_loopback().uint32;
4141
ck_assert_msg(ip.ip.v4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
4242
net_ip_ntoa(&ip, &ip_str));
@@ -56,7 +56,7 @@ static void test_addr_resolv_localhost(void)
5656
error = net_error();
5757
ck_assert_msg(res, "Resolver failed: %d, %s", error, net_strerror(error, &error_str));
5858

59-
ck_assert_msg(net_family_is_ipv6(ip.family), "Expected family TOX_AF_INET6 (%d), got %u.", TOX_AF_INET6,
59+
ck_assert_msg(net_family_is_ipv6(ip.family), "Expected family NET_FAMILY_IPV6 (%d), got %u.", NET_FAMILY_IPV6,
6060
ip.family.value);
6161
IP6 ip6_loopback = get_ip6_loopback();
6262
ck_assert_msg(!memcmp(&ip.ip.v6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
@@ -78,18 +78,18 @@ static void test_addr_resolv_localhost(void)
7878
ck_assert_msg(res, "Resolver failed: %d, %s", error, net_strerror(error, &error_str));
7979

8080
#if USE_IPV6
81-
ck_assert_msg(net_family_is_ipv6(ip.family), "Expected family TOX_AF_INET6 (%d), got %u.", TOX_AF_INET6,
81+
ck_assert_msg(net_family_is_ipv6(ip.family), "Expected family NET_FAMILY_IPV6 (%d), got %u.", NET_FAMILY_IPV6,
8282
ip.family.value);
8383
ck_assert_msg(!memcmp(&ip.ip.v6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
8484
net_ip_ntoa(&ip, &ip_str));
8585

86-
ck_assert_msg(net_family_is_ipv4(extra.family), "Expected family TOX_AF_INET (%d), got %u.", TOX_AF_INET,
86+
ck_assert_msg(net_family_is_ipv4(extra.family), "Expected family NET_FAMILY_IPV4 (%d), got %u.", NET_FAMILY_IPV4,
8787
extra.family.value);
8888
ck_assert_msg(extra.ip.v4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
8989
net_ip_ntoa(&ip, &ip_str));
9090
#elif 0
9191
// TODO(iphydf): Fix this to work on IPv6-supporting systems.
92-
ck_assert_msg(net_family_is_ipv4(ip.family), "Expected family TOX_AF_INET (%d), got %u.", TOX_AF_INET, ip.family.value);
92+
ck_assert_msg(net_family_is_ipv4(ip.family), "Expected family NET_FAMILY_IPV4 (%d), got %u.", NET_FAMILY_IPV4, ip.family.value);
9393
ck_assert_msg(ip.ip.v4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
9494
net_ip_ntoa(&ip, &ip_str));
9595
#endif
@@ -115,20 +115,20 @@ static void test_ip_equal(void)
115115
ip1.ip.v4.uint32 = net_htonl(0x7F000001);
116116

117117
res = ip_equal(&ip1, &ip2);
118-
ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_UNSPEC, 0} ): "
118+
ck_assert_msg(res == 0, "ip_equal( {NET_FAMILY_IPV4, 127.0.0.1}, {NET_FAMILY_UNSPEC, 0} ): "
119119
"expected result 0, got %d.", res);
120120

121121
ip2.family = net_family_ipv4();
122122
ip2.ip.v4.uint32 = net_htonl(0x7F000001);
123123

124124
res = ip_equal(&ip1, &ip2);
125-
ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET, 127.0.0.1} ): "
125+
ck_assert_msg(res != 0, "ip_equal( {NET_FAMILY_IPV4, 127.0.0.1}, {NET_FAMILY_IPV4, 127.0.0.1} ): "
126126
"expected result != 0, got 0.");
127127

128128
ip2.ip.v4.uint32 = net_htonl(0x7F000002);
129129

130130
res = ip_equal(&ip1, &ip2);
131-
ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET, 127.0.0.2} ): "
131+
ck_assert_msg(res == 0, "ip_equal( {NET_FAMILY_IPV4, 127.0.0.1}, {NET_FAMILY_IPV4, 127.0.0.2} ): "
132132
"expected result 0, got %d.", res);
133133

134134
ip2.family = net_family_ipv6();
@@ -141,21 +141,21 @@ static void test_ip_equal(void)
141141
"ipv6_ipv4_in_v6(::ffff:127.0.0.1): expected != 0, got 0.");
142142

143143
res = ip_equal(&ip1, &ip2);
144-
ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::ffff:127.0.0.1} ): "
144+
ck_assert_msg(res != 0, "ip_equal( {NET_FAMILY_IPV4, 127.0.0.1}, {NET_FAMILY_IPV6, ::ffff:127.0.0.1} ): "
145145
"expected result != 0, got 0.");
146146

147147
IP6 ip6_loopback = get_ip6_loopback();
148148
memcpy(&ip2.ip.v6, &ip6_loopback, sizeof(IP6));
149149
res = ip_equal(&ip1, &ip2);
150-
ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::1} ): expected result 0, got %d.", res);
150+
ck_assert_msg(res == 0, "ip_equal( {NET_FAMILY_IPV4, 127.0.0.1}, {NET_FAMILY_IPV6, ::1} ): expected result 0, got %d.", res);
151151

152152
memcpy(&ip1, &ip2, sizeof(IP));
153153
res = ip_equal(&ip1, &ip2);
154-
ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET6, ::1}, {TOX_AF_INET6, ::1} ): expected result != 0, got 0.");
154+
ck_assert_msg(res != 0, "ip_equal( {NET_FAMILY_IPV6, ::1}, {NET_FAMILY_IPV6, ::1} ): expected result != 0, got 0.");
155155

156156
ip2.ip.v6.uint8[15]++;
157157
res = ip_equal(&ip1, &ip2);
158-
ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET6, ::1}, {TOX_AF_INET6, ::2} ): expected result 0, got %d.", res);
158+
ck_assert_msg(res == 0, "ip_equal( {NET_FAMILY_IPV6, ::1}, {NET_FAMILY_IPV6, ::2} ): expected result 0, got %d.", res);
159159
}
160160

161161
int main(void)

‎other/bootstrap_node_packets.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static uint8_t bootstrap_motd[MAX_MOTD_LENGTH];
2121
static uint16_t bootstrap_motd_length;
2222

2323
/* To request this packet just send a packet of length INFO_REQUEST_PACKET_LENGTH
24-
* with the first byte being BOOTSTRAP_INFO_PACKET_ID
24+
* with the first byte being NET_PACKET_BOOTSTRAP_INFO
2525
*/
2626
static int handle_info_request(void *object, const IP_Port *source, const uint8_t *packet, uint16_t length,
2727
void *userdata)
@@ -33,7 +33,7 @@ static int handle_info_request(void *object, const IP_Port *source, const uint8_
3333
const Networking_Core *nc = (const Networking_Core *)object;
3434

3535
uint8_t data[1 + sizeof(bootstrap_version) + MAX_MOTD_LENGTH];
36-
data[0] = BOOTSTRAP_INFO_PACKET_ID;
36+
data[0] = NET_PACKET_BOOTSTRAP_INFO;
3737
memcpy(data + 1, &bootstrap_version, sizeof(bootstrap_version));
3838
const uint16_t len = 1 + sizeof(bootstrap_version) + bootstrap_motd_length;
3939
memcpy(data + 1 + sizeof(bootstrap_version), bootstrap_motd, bootstrap_motd_length);
@@ -55,6 +55,6 @@ int bootstrap_set_callbacks(Networking_Core *net, uint32_t version, const uint8_
5555
memcpy(bootstrap_motd, motd, motd_length);
5656
bootstrap_motd_length = motd_length;
5757

58-
networking_registerhandler(net, BOOTSTRAP_INFO_PACKET_ID, &handle_info_request, net);
58+
networking_registerhandler(net, NET_PACKET_BOOTSTRAP_INFO, &handle_info_request, net);
5959
return 0;
6060
}

‎toxcore/DHT_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ TEST(AddToList, OverridesKeysWithCloserKeys)
116116

117117
std::array<Node_format, 4> nodes{};
118118

119-
IP_Port ip_port = {0};
119+
IP_Port ip_port = {{{NET_FAMILY_UNSPEC}}};
120120
EXPECT_TRUE(add_to_list(nodes.data(), nodes.size(), keys[0].data(), &ip_port, self_pk.data()));
121121
EXPECT_TRUE(add_to_list(nodes.data(), nodes.size(), keys[1].data(), &ip_port, self_pk.data()));
122122
EXPECT_TRUE(add_to_list(nodes.data(), nodes.size(), keys[2].data(), &ip_port, self_pk.data()));
@@ -356,7 +356,7 @@ TEST(AnnounceNodes, SetAndTest)
356356
PublicKey pk2(to_array(pk_data));
357357
ASSERT_NE(pk2, pk1);
358358

359-
IP_Port ip_port = {0};
359+
IP_Port ip_port = {{{NET_FAMILY_UNSPEC}}};
360360
ip_port.ip.family = net_family_ipv4();
361361

362362
set_announce_node(dht.get(), pk1.data());

‎toxcore/LAN_discovery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static Broadcast_Info *fetch_broadcast_info(const Memory *mem, const Network *ns
142142
* so it's wrapped in `__linux__` for now.
143143
* Definitely won't work like this on Windows...
144144
*/
145-
const Socket sock = net_socket(ns, net_family_ipv4(), TOX_SOCK_STREAM, 0);
145+
const Socket sock = net_socket(ns, net_family_ipv4(), TOX_SOCK_STREAM, TOX_PROTO_TCP);
146146

147147
if (!sock_valid(sock)) {
148148
mem_delete(mem, broadcast);

‎toxcore/TCP_connection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ static bool copy_tcp_relay_conn(const TCP_Connections *tcp_c, Node_format *tcp_r
14801480

14811481
/** @brief Copy a maximum of max_num TCP relays we are connected to to tcp_relays.
14821482
*
1483-
* NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6.
1483+
* NOTE that the family of the copied ip ports will be set to NET_FAMILY_TCP_IPV4 or NET_FAMILY_TCP_IPV6.
14841484
*
14851485
* return number of relays copied to tcp_relays on success.
14861486
* return 0 on failure.

‎toxcore/TCP_connection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ int add_tcp_relay_global(TCP_Connections *tcp_c, const IP_Port *ip_port, const u
279279

280280
/** @brief Copy a maximum of max_num TCP relays we are connected to to tcp_relays.
281281
*
282-
* NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6.
282+
* NOTE that the family of the copied ip ports will be set to NET_FAMILY_TCP_IPV4 or NET_FAMILY_TCP_IPV6.
283283
*
284284
* return number of relays copied to tcp_relays on success.
285285
* return 0 on failure.

‎toxcore/group_announce_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ TEST_F(AnnouncesPack, AnnouncesValidationCheck)
216216
EXPECT_EQ(gca_is_valid_announce(nullptr), false);
217217
#endif
218218

219-
GC_Announce announce = {0};
219+
GC_Announce announce = {{{{0}}}};
220220
EXPECT_EQ(gca_is_valid_announce(&announce), false);
221221
EXPECT_EQ(gca_is_valid_announce(&announces_[0]), true);
222222
EXPECT_EQ(gca_is_valid_announce(&announces_[1]), true);

‎toxcore/net_crypto.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2289,7 +2289,7 @@ int send_tcp_forward_request(const Logger *logger, Net_Crypto *c, const IP_Port
22892289

22902290
/** @brief Copy a maximum of num random TCP relays we are connected to to tcp_relays.
22912291
*
2292-
* NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6.
2292+
* NOTE that the family of the copied ip ports will be set to NET_FAMILY_TCP_IPV4 or NET_FAMILY_TCP_IPV6.
22932293
*
22942294
* return number of relays copied to tcp_relays on success.
22952295
* return 0 on failure.

‎toxcore/net_crypto.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ int send_tcp_forward_request(const Logger *logger, Net_Crypto *c, const IP_Port
346346

347347
/** @brief Copy a maximum of num random TCP relays we are connected to to tcp_relays.
348348
*
349-
* NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6.
349+
* NOTE that the family of the copied ip ports will be set to NET_FAMILY_TCP_IPV4 or NET_FAMILY_TCP_IPV6.
350350
*
351351
* return number of relays copied to tcp_relays on success.
352352
* return 0 on failure.

0 commit comments

Comments
 (0)