nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

bridge: Always put transport-info line

Browse Source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2024-06-11 12:38:56 -04:00
parent 1941f25f4c
commit d587ba01a7
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/feature/client/transports.c
View File

@ -1798,20 +1798,21 @@ pt_get_extra_info_descriptor_string(void)
/* Set transport-info line. */
{
char *transport_info_args = NULL;
char *version = NULL;
char *impl = NULL;
if (mp->version) {
tor_asprintf(&transport_info_args, " version=%s", mp->version);
tor_asprintf(&version, " version=%s", mp->version);
}
if (mp->implementation) {
tor_asprintf(&transport_info_args, " implementation=%s",
mp->implementation);
}
if (transport_info_args) {
smartlist_add_asprintf(string_chunks, "transport-info%s",
transport_info_args ? transport_info_args : "");
tor_free(transport_info_args);
tor_asprintf(&impl, " implementation=%s", mp->implementation);
}
/* Always put in the line even if empty. Else, we don't know to which
* transport this applies to. */
smartlist_add_asprintf(string_chunks, "transport-info%s%s",
version ? version: "", impl ? impl: "");
tor_free(version);
tor_free(impl);
}
} SMARTLIST_FOREACH_END(mp);

4
src/test/test_pt.c
View File

@ -413,7 +413,9 @@ test_pt_get_extrainfo_string(void *arg)
tt_assert(s);
tt_str_op(s, OP_EQ,
"transport hagbard 127.0.0.1:5555\n"
"transport celine 127.0.0.1:1723 card=no-enemy\n");
"transport-info\n"
"transport celine 127.0.0.1:1723 card=no-enemy\n"
"transport-info\n");
done:
/* XXXX clean up better */