Merge pull request #2838 from NorbertHeusser/fix-no-expiry-on-outgoing-bridge
Do not add outgoing bridge connection context to session expiry list
This commit is contained in:
commit
9c295efe98
@ -214,20 +214,21 @@ void context__disconnect(struct mosquitto *context)
|
||||
|
||||
context__send_will(context);
|
||||
net__socket_close(context);
|
||||
if(context->session_expiry_interval == 0){
|
||||
/* Client session is due to be expired now */
|
||||
#ifdef WITH_BRIDGE
|
||||
if(context->bridge == NULL)
|
||||
/* Outgoing bridge connection never expire */
|
||||
#endif
|
||||
{
|
||||
if(context->session_expiry_interval == 0){
|
||||
/* Client session is due to be expired now */
|
||||
if(context->will_delay_interval == 0){
|
||||
/* This will be done later, after the will is published for delay>0. */
|
||||
context__add_to_disused(context);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
session_expiry__add(context);
|
||||
}
|
||||
}
|
||||
keepalive__remove(context);
|
||||
mosquitto__set_state(context, mosq_cs_disconnected);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user