torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

channel: Refactor matches target address function

Browse Source 
Refactor channel_matches_target_addr_for_extend() to return a boolean
result.

Part of 33817.
This commit is contained in:
teor
2020-04-30 06:31:05 +10:00
parent 496ddd2877
commit 066d2deb3d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/or/channel.c
+7 -7
View File
@@ -85,7 +85,7 @@
/* Static function prototypes */
static int channel_matches_target_addr_for_extend(
static bool channel_matches_target_addr_for_extend(
channel_t *chan,
const tor_addr_t *target_ipv4_addr,
const tor_addr_t *target_ipv6_addr);
@@ -2412,7 +2412,7 @@ channel_get_for_extend,(const char *rsa_id_digest,
continue;
}
const int matches_target =
const bool matches_target =
channel_matches_target_addr_for_extend(chan,
target_ipv4_addr,
target_ipv6_addr);
@@ -3317,7 +3317,7 @@ channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info)
* This function calls into the lower layer and asks if this channel thinks
* it matches the target addresses for circuit extension purposes.
*/
int
static bool
channel_matches_target_addr_for_extend(channel_t *chan,
const tor_addr_t *target_ipv4_addr,
const tor_addr_t *target_ipv6_addr)
@@ -3326,15 +3326,15 @@ channel_matches_target_addr_for_extend(channel_t *chan,
tor_assert(chan->matches_target);
IF_BUG_ONCE(!target_ipv4_addr && !target_ipv6_addr)
return 0;
return false;
if (target_ipv4_addr && chan->matches_target(chan, target_ipv4_addr))
return 1;
return true;
if (target_ipv6_addr && chan->matches_target(chan, target_ipv6_addr))
return 1;
return true;
return 0;
return false;
}
/**