Merge pull request #57 from 2600hz/kamailio-4.3.1

minimal changes for kamailio 4.3.1

kamailio/dbtext/location

@@ -1 +1 @@
-id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) reg_id(int)
+id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) reg_id(int) server_id(int) connection_id(int) keepalive(int) partition(int)

kamailio/dbtext/presentity

@@ -1 +1 @@
-id(int,auto) username(string) domain(string) event(string) etag(string) expires(int) received_time(int) body(blob) sender(string,null)
+id(int,auto) username(string) domain(string) event(string) etag(string) expires(int) received_time(int) body(blob) sender(string,null) priority(int)

kamailio/dbtext/version

@@ -3,6 +3,6 @@ address:6
 trusted:5
 pua:7
 active_watchers:11
-presentity:3
+presentity:4
 watchers:3
-location:6
+location:8

kamailio/dispatcher-role.cfg

@@ -15,7 +15,7 @@ modparam("dispatcher", "hash_pvar", "$avp(ds_grp)")
 # modparam("dispatcher", "setid_pvar", "$var(setid)")
 modparam("dispatcher", "ds_ping_method", "OPTIONS")
 modparam("dispatcher", "ds_ping_interval", 10)
-modparam("dispatcher", "ds_probing_threshhold", 3)
+modparam("dispatcher", "ds_probing_threshold", 3)
 modparam("dispatcher", "ds_probing_mode", 1)
 modparam("dispatcher", "ds_ping_reply_codes", "501,403,404,400,200")
 modparam("dispatcher", "ds_ping_from", "sip:sipcheck@MY_IP_ADDRESS")

kamailio/registrar-role.cfg

@@ -39,7 +39,6 @@ modparam("registrar", "received_avp", "$avp(AVP_RECV_PARAM)")
 modparam("registrar", "min_expires", REGISTRAR_MIN_EXPIRES)
 modparam("registrar", "max_expires", REGISTRAR_MAX_EXPIRES)
 modparam("registrar", "xavp_cfg", "regcfg")
-modparam("registrar", "reg_on_match_flag", 1)
 
 
 ####### Registrar Logic ########
@@ -76,9 +75,7 @@ route[ATTEMPT_AUTHORIZATION]
     $var(single_contact) = $(ct{s.select,0,,});
 
     $xavp(regcfg=>match_received) = $su;
-    $xavp(regcfg[0]=>match_contact) = $(var(single_contact){nameaddr.uri});
-
-    if ($sht(auth_cache=>$Au) != $null && registered("location", "$rz:$Au", 6) == 1) {
+    if ($sht(auth_cache=>$Au) != $null && registered("location", "$rz:$Au", 2, 1) == 1) {
         xlog("L_INFO", "$ci|log|authenticating $fu via cached SIP creds");
         $var(password) = $sht(auth_cache=>$Au);
     } else {