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

Coalesce v0 and v1 fields of rend_intro_cell_t

Browse Source 
This saves a tiny bit of code, and makes a longstanding coverity
false positive go away.
This commit is contained in:
Nick Mathewson 2014-12-30 12:07:28 -05:00
parent f2e4423bd2
commit ac632a784c
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/rendservice.c
View File

@ -1527,8 +1527,7 @@ find_rp_for_intro(const rend_intro_cell_t *intro,
}
if (intro->version == 0 || intro->version == 1) {
if (intro->version == 1) rp_nickname = (const char *)(intro->u.v1.rp);
else rp_nickname = (const char *)(intro->u.v0.rp);
rp_nickname = (const char *)(intro->u.v0_v1.rp);
node = node_get_by_nickname(rp_nickname, 0);
if (!node) {
@ -1777,11 +1776,7 @@ rend_service_parse_intro_for_v0_or_v1(
goto err;
}
if (intro->version == 1) {
memcpy(intro->u.v1.rp, rp_nickname, endptr - rp_nickname + 1);
} else {
memcpy(intro->u.v0.rp, rp_nickname, endptr - rp_nickname + 1);
}
memcpy(intro->u.v0_v1.rp, rp_nickname, endptr - rp_nickname + 1);
return ver_specific_len;

6
src/or/rendservice.h
View File

@ -37,14 +37,10 @@ struct rend_intro_cell_s {
uint8_t version;
/* Version-specific parts */
union {
struct {
/* Rendezvous point nickname */
uint8_t rp[20];
} v0;
struct {
/* Rendezvous point nickname or hex-encoded key digest */
uint8_t rp[42];
} v1;
} v0_v1;
struct {
/* The extend_info_t struct has everything v2 uses */
extend_info_t *extend_info;