[sr-dev] git:master:30222067: Merge pull request #470 from ianlin/master

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 3022206747eaabc17ec711d955987a02b82e87e9
URL: https://github.com/kamailio/kamailio/commit/3022206747eaabc17ec711d955987a02b82e87e9

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-01-08T15:02:26+01:00

Merge pull request #470 from ianlin/master

registrar: do make use of reg_xavp_cfg

---

Modified: modules/registrar/reg_mod.c

---

Diff:  https://github.com/kamailio/kamailio/commit/3022206747eaabc17ec711d955987a02b82e87e9.diff
Patch: https://github.com/kamailio/kamailio/commit/3022206747eaabc17ec711d955987a02b82e87e9.patch

---

diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c
index 98b136b..0d7c5ac 100644
--- a/modules/registrar/reg_mod.c
+++ b/modules/registrar/reg_mod.c
@@ -362,8 +362,14 @@ static int mod_init(void)
 			sock_hdr_name.len = 0;
 			sock_flag = -1;
 		}
+	} 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) {
-		LM_WARN("sock_flag defined but no sock_hdr_name -> reseting flag\n");
+		LM_WARN("sock_flag defined but no sock_hdr_name or no reg_xavp_cfg -> resetting flag\n");
 		sock_flag = -1;
 	}