[sr-dev] git:4.1: usrloc: remove the filter on nat_bflag for keepalive contact expiration

Module: sip-router Branch: 4.1 Commit: 67dfcb7e64bf0ef3054b011ff98ace10ae609c09 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67dfcb7… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Thu Feb 20 11:04:49 2014 +0100 usrloc: remove the filter on nat_bflag for keepalive contact expiration - keepalives can be sent even for non-natted contacts - reported by Kristian Kielhofner (cherry picked from commit aa2ee6e1d9482b486ebc3f45b26ea886a2f3dbf0) --- modules/usrloc/dlist.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/dlist.c b/modules/usrloc/dlist.c index 2f14f16..63d3f68 100644 --- a/modules/usrloc/dlist.c +++ b/modules/usrloc/dlist.c @@ -342,8 +342,7 @@ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, if(ul_keepalive_timeout>0 && c->last_keepalive>0) { - if((c->cflags & nat_bflag) != 0 && c->sock!=NULL - && c->sock->proto==PROTO_UDP) + if(c->sock!=NULL && c->sock->proto==PROTO_UDP) { if(c->last_keepalive+ul_keepalive_timeout < tnow) {