AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4754 from mpg/fix-overly-aggressive-udp-proxy

Browse Source 
Fix bug with UDP proxy not forwarding enough
This commit is contained in:
Gilles Peskine 2021-07-09 11:57:43 +02:00 committed by GitHub
commit ac694b9eac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
programs/test/udp_proxy.c
View File

@ -681,26 +681,21 @@ int send_delayed()
}
/*
* Avoid dropping or delaying a packet that was already dropped twice: this
* only results in uninteresting timeouts. We can't rely on type to identify
* packets, since during renegotiation they're all encrypted. So, rely on
* size mod 2048 (which is usually just size).
*/
static unsigned char dropped[2048] = { 0 };
#define DROP_MAX 2
/* We only drop packets at the level of entire datagrams, not at the level
* Avoid dropping or delaying a packet that was already dropped or delayed
* ("held") twice: this only results in uninteresting timeouts. We can't rely
* on type to identify packets, since during renegotiation they're all
* encrypted. So, rely on size mod 2048 (which is usually just size).
*
* We only hold packets at the level of entire datagrams, not at the level
* of records. In particular, if the peer changes the way it packs multiple
* records into a single datagram, we don't necessarily count the number of
* times a record has been dropped correctly. However, the only known reason
* times a record has been held correctly. However, the only known reason
* why a peer would change datagram packing is disabling the latter on
* retransmission, in which case we'd drop involved records at most
* DROP_MAX + 1 times. */
void update_dropped( const packet *p )
{
size_t id = p->len % sizeof( dropped );
++dropped[id];
}
* retransmission, in which case we'd hold involved records at most
* HOLD_MAX + 1 times.
*/
static unsigned char held[2048] = { 0 };
#define HOLD_MAX 2
int handle_message( const char *way,
mbedtls_net_context *dst,
@ -727,7 +722,7 @@ int handle_message( const char *way,
cur.dst = dst;
print_packet( &cur, NULL );
id = cur.len % sizeof( dropped );
id = cur.len % sizeof( held );
if( strcmp( way, "S <- C" ) == 0 )
{
@ -769,10 +764,10 @@ int handle_message( const char *way,
! ( opt.protect_hvr &&
strcmp( cur.type, "HelloVerifyRequest" ) == 0 ) &&
cur.len != (size_t) opt.protect_len &&
dropped[id] < DROP_MAX &&
held[id] < HOLD_MAX &&
rand() % opt.drop == 0 ) )
{
update_dropped( &cur );
++held[id];
}
else if( ( opt.delay_ccs == 1 &&
strcmp( cur.type, "ChangeCipherSpec" ) == 0 ) ||
@ -782,9 +777,10 @@ int handle_message( const char *way,
! ( opt.protect_hvr &&
strcmp( cur.type, "HelloVerifyRequest" ) == 0 ) &&
cur.len != (size_t) opt.protect_len &&
dropped[id] < DROP_MAX &&
held[id] < HOLD_MAX &&
rand() % opt.delay == 0 ) )
{
++held[id];
delay_packet( &cur );
}
else
@ -895,7 +891,7 @@ accept:
* 3. Forward packets forever (kill the process to terminate it)
*/
clear_pending();
memset( dropped, 0, sizeof( dropped ) );
memset( held, 0, sizeof( held ) );
nb_fds = client_fd.fd;
if( nb_fds < server_fd.fd )