[sr-dev] git:master:256d5f75: Merge pull request #475 from ianlin/master

Module: kamailio Branch: master Commit: 256d5f754ddfa7c47086f18a6d15fb08ae6bff87 URL: https://github.com/kamailio/kamailio/commit/256d5f754ddfa7c47086f18a6d15fb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-14T09:29:06+01:00 Merge pull request #475 from ianlin/master registrar: reg_xavp_cfg should not be reset when sock_flag is not set --- Modified: modules/registrar/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/256d5f754ddfa7c47086f18a6d15fb0… Patch: https://github.com/kamailio/kamailio/commit/256d5f754ddfa7c47086f18a6d15fb0… --- diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 0d7c5ac..f859db4 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -365,7 +365,6 @@ static int mod_init(void) } else if (reg_xavp_cfg.s) { if (reg_xavp_cfg.len == 0 || sock_flag == -1) { LM_WARN("empty reg_xavp_cfg or sock_flag no set -> resetting\n"); - reg_xavp_cfg.len = 0; sock_flag = -1; } } else if (sock_flag!=-1) {