chore: Add missing module dependencies.

Also flip some callback asserts, because they can be reached by fuzzing
eventually.

Also update the bootstrapd checksum, since the alpine image changed a
bit.
This commit is contained in:
iphydf 2023-08-10 20:57:50 +00:00
parent 172f279dc0
commit 2e02d56379
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
4 changed files with 39 additions and 10 deletions

View File

@ -1 +1 @@
62d2c7ab2a14d1f9b00acaf13813b3ea916ccfb2173c9ba95ac82a843a258119 /usr/local/bin/tox-bootstrapd 57f46dbb45034232c62e29ad31fd433ad298591fd9d3ea06b92040d33b8d8660 /usr/local/bin/tox-bootstrapd

View File

@ -24,7 +24,7 @@ void setup_callbacks(Tox_Dispatch *dispatch)
}); });
tox_events_callback_conference_connected( tox_events_callback_conference_connected(
dispatch, [](Tox *tox, const Tox_Event_Conference_Connected *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_Conference_Connected *event, void *user_data) {
assert(event == nullptr); assert(event != nullptr);
}); });
tox_events_callback_conference_invite( tox_events_callback_conference_invite(
dispatch, [](Tox *tox, const Tox_Event_Conference_Invite *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_Conference_Invite *event, void *user_data) {
@ -35,19 +35,19 @@ void setup_callbacks(Tox_Dispatch *dispatch)
}); });
tox_events_callback_conference_message( tox_events_callback_conference_message(
dispatch, [](Tox *tox, const Tox_Event_Conference_Message *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_Conference_Message *event, void *user_data) {
assert(event == nullptr); assert(event != nullptr);
}); });
tox_events_callback_conference_peer_list_changed(dispatch, tox_events_callback_conference_peer_list_changed(dispatch,
[](Tox *tox, const Tox_Event_Conference_Peer_List_Changed *event, void *user_data) { [](Tox *tox, const Tox_Event_Conference_Peer_List_Changed *event, void *user_data) {
assert(event == nullptr); assert(event != nullptr);
}); });
tox_events_callback_conference_peer_name( tox_events_callback_conference_peer_name(
dispatch, [](Tox *tox, const Tox_Event_Conference_Peer_Name *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_Conference_Peer_Name *event, void *user_data) {
assert(event == nullptr); assert(event != nullptr);
}); });
tox_events_callback_conference_title( tox_events_callback_conference_title(
dispatch, [](Tox *tox, const Tox_Event_Conference_Title *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_Conference_Title *event, void *user_data) {
assert(event == nullptr); assert(event != nullptr);
}); });
tox_events_callback_file_chunk_request( tox_events_callback_file_chunk_request(
dispatch, [](Tox *tox, const Tox_Event_File_Chunk_Request *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_File_Chunk_Request *event, void *user_data) {
@ -61,11 +61,11 @@ void setup_callbacks(Tox_Dispatch *dispatch)
}); });
tox_events_callback_file_recv_chunk( tox_events_callback_file_recv_chunk(
dispatch, [](Tox *tox, const Tox_Event_File_Recv_Chunk *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_File_Recv_Chunk *event, void *user_data) {
assert(event == nullptr); assert(event != nullptr);
}); });
tox_events_callback_file_recv_control( tox_events_callback_file_recv_control(
dispatch, [](Tox *tox, const Tox_Event_File_Recv_Control *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_File_Recv_Control *event, void *user_data) {
assert(event == nullptr); assert(event != nullptr);
}); });
tox_events_callback_friend_connection_status( tox_events_callback_friend_connection_status(
dispatch, [](Tox *tox, const Tox_Event_Friend_Connection_Status *event, void *user_data) { dispatch, [](Tox *tox, const Tox_Event_Friend_Connection_Status *event, void *user_data) {

View File

@ -54,6 +54,7 @@ cc_library(
"//c-toxcore/toxcore:ccompat", "//c-toxcore/toxcore:ccompat",
"//c-toxcore/toxcore:logger", "//c-toxcore/toxcore:logger",
"//c-toxcore/toxcore:mono_time", "//c-toxcore/toxcore:mono_time",
"//c-toxcore/toxcore:tox",
"//c-toxcore/toxcore:util", "//c-toxcore/toxcore:util",
], ],
) )
@ -68,6 +69,7 @@ cc_library(
"//c-toxcore/toxcore:ccompat", "//c-toxcore/toxcore:ccompat",
"//c-toxcore/toxcore:logger", "//c-toxcore/toxcore:logger",
"//c-toxcore/toxcore:mono_time", "//c-toxcore/toxcore:mono_time",
"//c-toxcore/toxcore:tox",
"//c-toxcore/toxcore:util", "//c-toxcore/toxcore:util",
], ],
) )
@ -94,6 +96,7 @@ cc_library(
"//c-toxcore/toxcore:ccompat", "//c-toxcore/toxcore:ccompat",
"//c-toxcore/toxcore:logger", "//c-toxcore/toxcore:logger",
"//c-toxcore/toxcore:mono_time", "//c-toxcore/toxcore:mono_time",
"//c-toxcore/toxcore:util",
"@opus", "@opus",
], ],
) )
@ -113,6 +116,7 @@ cc_library(
":public_api", ":public_api",
":ring_buffer", ":ring_buffer",
":rtp", ":rtp",
"//c-toxcore/toxcore:Messenger",
"//c-toxcore/toxcore:ccompat", "//c-toxcore/toxcore:ccompat",
"//c-toxcore/toxcore:logger", "//c-toxcore/toxcore:logger",
"//c-toxcore/toxcore:mono_time", "//c-toxcore/toxcore:mono_time",
@ -129,6 +133,7 @@ cc_library(
deps = [ deps = [
"//c-toxcore/toxcore", "//c-toxcore/toxcore",
"//c-toxcore/toxcore:ccompat", "//c-toxcore/toxcore:ccompat",
"//c-toxcore/toxcore:group",
"//c-toxcore/toxcore:logger", "//c-toxcore/toxcore:logger",
"//c-toxcore/toxcore:mono_time", "//c-toxcore/toxcore:mono_time",
"//c-toxcore/toxcore:tox", "//c-toxcore/toxcore:tox",

View File

@ -59,6 +59,7 @@ cc_library(
hdrs = ["bin_pack.h"], hdrs = ["bin_pack.h"],
visibility = ["//c-toxcore:__subpackages__"], visibility = ["//c-toxcore:__subpackages__"],
deps = [ deps = [
":attributes",
":ccompat", ":ccompat",
"//c-toxcore/third_party:cmp", "//c-toxcore/third_party:cmp",
], ],
@ -70,6 +71,7 @@ cc_library(
hdrs = ["bin_unpack.h"], hdrs = ["bin_unpack.h"],
visibility = ["//c-toxcore:__subpackages__"], visibility = ["//c-toxcore:__subpackages__"],
deps = [ deps = [
":attributes",
":ccompat", ":ccompat",
"//c-toxcore/third_party:cmp", "//c-toxcore/third_party:cmp",
], ],
@ -93,6 +95,7 @@ cc_library(
hdrs = ["crypto_core.h"], hdrs = ["crypto_core.h"],
visibility = ["//c-toxcore:__subpackages__"], visibility = ["//c-toxcore:__subpackages__"],
deps = [ deps = [
":attributes",
":ccompat", ":ccompat",
"@libsodium", "@libsodium",
], ],
@ -115,7 +118,10 @@ cc_library(
name = "list", name = "list",
srcs = ["list.c"], srcs = ["list.c"],
hdrs = ["list.h"], hdrs = ["list.h"],
deps = [":ccompat"], deps = [
":attributes",
":ccompat",
],
) )
cc_test( cc_test(
@ -139,7 +145,10 @@ cc_library(
"//c-toxcore/other/bootstrap_daemon:__pkg__", "//c-toxcore/other/bootstrap_daemon:__pkg__",
"//c-toxcore/toxav:__pkg__", "//c-toxcore/toxav:__pkg__",
], ],
deps = [":ccompat"], deps = [
":attributes",
":ccompat",
],
) )
cc_library( cc_library(
@ -164,6 +173,7 @@ cc_library(
"//c-toxcore/toxav:__pkg__", "//c-toxcore/toxav:__pkg__",
], ],
deps = [ deps = [
":attributes",
":ccompat", ":ccompat",
"@pthread", "@pthread",
], ],
@ -301,6 +311,7 @@ cc_library(
], ],
deps = [ deps = [
":LAN_discovery", ":LAN_discovery",
":attributes",
":ccompat", ":ccompat",
":crypto_core", ":crypto_core",
":logger", ":logger",
@ -344,6 +355,7 @@ cc_library(
":DHT", ":DHT",
":ccompat", ":ccompat",
":crypto_core", ":crypto_core",
":logger",
":mono_time", ":mono_time",
":shared_key_cache", ":shared_key_cache",
":util", ":util",
@ -398,7 +410,9 @@ cc_library(
hdrs = ["TCP_common.h"], hdrs = ["TCP_common.h"],
visibility = ["//c-toxcore/auto_tests:__pkg__"], visibility = ["//c-toxcore/auto_tests:__pkg__"],
deps = [ deps = [
":attributes",
":ccompat", ":ccompat",
":crypto_core",
":network", ":network",
], ],
) )
@ -436,8 +450,10 @@ cc_library(
deps = [ deps = [
":TCP_common", ":TCP_common",
":ccompat", ":ccompat",
":crypto_core",
":forwarding", ":forwarding",
":mono_time", ":mono_time",
":network",
":util", ":util",
], ],
) )
@ -478,9 +494,11 @@ cc_library(
visibility = ["//c-toxcore/auto_tests:__pkg__"], visibility = ["//c-toxcore/auto_tests:__pkg__"],
deps = [ deps = [
":DHT", ":DHT",
":LAN_discovery",
":TCP_connection", ":TCP_connection",
":ccompat", ":ccompat",
":list", ":list",
":logger",
":mono_time", ":mono_time",
":util", ":util",
], ],
@ -499,6 +517,7 @@ cc_library(
":DHT", ":DHT",
":LAN_discovery", ":LAN_discovery",
":ccompat", ":ccompat",
":logger",
":mono_time", ":mono_time",
":onion", ":onion",
":shared_key_cache", ":shared_key_cache",
@ -577,6 +596,7 @@ cc_library(
":net_crypto", ":net_crypto",
":network", ":network",
":onion_announce", ":onion_announce",
":ping_array",
":util", ":util",
], ],
) )
@ -588,6 +608,7 @@ cc_library(
visibility = ["//c-toxcore/auto_tests:__pkg__"], visibility = ["//c-toxcore/auto_tests:__pkg__"],
deps = [ deps = [
":DHT", ":DHT",
":LAN_discovery",
":ccompat", ":ccompat",
":mono_time", ":mono_time",
":net_crypto", ":net_crypto",
@ -698,6 +719,7 @@ cc_library(
":forwarding", ":forwarding",
":friend_connection", ":friend_connection",
":friend_requests", ":friend_requests",
":group_announce",
":group_moderation", ":group_moderation",
":group_onion_announce", ":group_onion_announce",
":logger", ":logger",
@ -768,6 +790,7 @@ cc_library(
hdrs = ["tox_unpack.h"], hdrs = ["tox_unpack.h"],
visibility = ["//c-toxcore:__subpackages__"], visibility = ["//c-toxcore:__subpackages__"],
deps = [ deps = [
":attributes",
":bin_unpack", ":bin_unpack",
":ccompat", ":ccompat",
":tox", ":tox",
@ -783,6 +806,7 @@ cc_library(
hdrs = ["tox_events.h"], hdrs = ["tox_events.h"],
visibility = ["//c-toxcore:__subpackages__"], visibility = ["//c-toxcore:__subpackages__"],
deps = [ deps = [
":attributes",
":bin_pack", ":bin_pack",
":bin_unpack", ":bin_unpack",
":ccompat", ":ccompat",