ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-18 02:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't reuse mdp ports that are already bound, release mdp bindings on msp close

Browse Source
This commit is contained in:
Jeremy Lakeman 2014-05-22 15:20:35 +09:30
parent 64237e4ab4
commit c361a9cb90
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
msp_client.c
View File

@ -275,6 +275,8 @@ static size_t call_handler(struct msp_sock *sock, const uint8_t *payload, size_t
size_t nconsumed = len;
time_ms_t now = gettime_ms();
if (sock->handler && (len || sock->last_state != sock->state || now - sock->last_handler > HANDLER_KEEPALIVE)) {
// remember what we are about to call, rather than what we just called
// we don't want to miss a state change due to re-entrancy.
sock->last_state = sock->state;
sock->last_handler = now;
nconsumed = sock->handler(sock_to_handle(sock), sock->state, payload, len, sock->context);
@ -711,6 +713,28 @@ static int process_sock(struct msp_sock *sock)
return 0;
}
static void msp_release(struct msp_sock *sock){
if (!sock->header.local.port)
return;
// release mdp port binding when there are no other sockets using it.
struct msp_sock *o = root;
while(o){
if (o!=sock && o->mdp_sock == sock->mdp_sock && o->header.local.port == sock->header.local.port)
return;
o=o->_next;
}
struct mdp_header header;
bzero(&header, sizeof header);
header.local = sock->header.local;
header.flags = MDP_FLAG_CLOSE;
if (config.debug.msp)
DEBUGF("Releasing mdp port binding %d", header.local.port);
mdp_send(sock->mdp_sock, &header, NULL, 0);
}
int msp_processing(time_ms_t *next_action)
{
time_ms_t next=TIME_MS_NEVER_WILL;
@ -722,6 +746,7 @@ int msp_processing(time_ms_t *next_action)
if (sock->state & MSP_STATE_CLOSED){
struct msp_sock *s = sock->_next;
msp_release(sock);
msp_free(sock);
sock=s;
}else{

11
overlay_mdp.c
View File

@ -1355,11 +1355,18 @@ static void mdp_process_packet(struct socket_address *client, struct mdp_header
// assign the next available port number
if (header->local.port==0 && header->flags & MDP_FLAG_BIND){
// TODO check if the port is already bound
again:
if (next_port_binding > 32*1024)
next_port_binding=256;
else
next_port_binding++;
unsigned i;
for(i=0;i<MDP_MAX_BINDINGS;i++) {
if (mdp_bindings[i].port==next_port_binding)
goto again;
}
header->local.port=next_port_binding;
}
@ -1370,7 +1377,7 @@ static void mdp_process_packet(struct socket_address *client, struct mdp_header
// find matching binding
{
int i;
unsigned i;
for(i=0;i<MDP_MAX_BINDINGS;i++) {
if ((!free_slot) && mdp_bindings[i].port==0)
free_slot=&mdp_bindings[i];