Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Squashed 'external/toxcore/c-toxcore/' changes from 59d3f6674..76bc4c496

Browse Source 
76bc4c496 refactor: TCP connection netprof objects are now owned by Messenger

git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: 76bc4c496d407cbbd11f0a0d9d3eebfbf64ccd2c
This commit is contained in:
Green Sky
2025-03-19 11:19:59 +01:00
parent 72325822b8
commit 119bd4fb1d
15 changed files with 96 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
auto_tests/onion_test.c
View File

@ -396,6 +396,7 @@ static void test_basic(void)
typedef struct {
Logger *log;
Mono_Time *mono_time;
Net_Profile *tcp_np;
Onion *onion;
Onion_Announce *onion_a;
Onion_Client *onion_c;
@ -471,10 +472,24 @@ static Onions *new_onions(const Memory *mem, const Random *rng, uint16_t port, u
return nullptr;
}
on->tcp_np = netprof_new(on->log, mem);
if (!on->tcp_np) {
kill_onion_announce(on->onion_a);
kill_onion(on->onion);
kill_dht(dht);
kill_networking(net);
mono_time_free(mem, on->mono_time);
logger_kill(on->log);
free(on);
return nullptr;
}
TCP_Proxy_Info inf = {{{{0}}}};
on->onion_c = new_onion_client(on->log, mem, rng, on->mono_time, new_net_crypto(on->log, mem, rng, ns, on->mono_time, dht, &inf));
on->onion_c = new_onion_client(on->log, mem, rng, on->mono_time, new_net_crypto(on->log, mem, rng, ns, on->mono_time, dht, &inf, on->tcp_np));
if (!on->onion_c) {
netprof_kill(mem, on->tcp_np);
kill_onion_announce(on->onion_a);
kill_onion(on->onion);
kill_dht(dht);
@ -506,6 +521,7 @@ static void kill_onions(const Memory *mem, Onions *on)
kill_onion_announce(on->onion_a);
kill_onion(on->onion);
kill_net_crypto(c);
netprof_kill(mem, on->tcp_np);
kill_dht(dht);
kill_networking(net);
mono_time_free(mem, on->mono_time);