From: zuul Date: Wed, 11 May 2016 17:22:10 +0000 (-0500) Subject: Merge "res_pjsip: improve realtime performance" into 13 X-Git-Tag: 13.10.0-rc1~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a01ce2b88912cd802bb045e40fe264906e55bc45;p=thirdparty%2Fasterisk.git Merge "res_pjsip: improve realtime performance" into 13 --- a01ce2b88912cd802bb045e40fe264906e55bc45 diff --cc res/res_pjsip/location.c index db1d0794b0,c30acc7b8a..ef06456a75 --- a/res/res_pjsip/location.c +++ b/res/res_pjsip/location.c @@@ -1121,9 -1088,9 +1121,10 @@@ int ast_sip_initialize_sorcery_location ast_sorcery_object_field_register(sorcery, "contact", "qualify_frequency", 0, OPT_UINT_T, PARSE_IN_RANGE, FLDSET(struct ast_sip_contact, qualify_frequency), 0, 86400); ast_sorcery_object_field_register(sorcery, "contact", "qualify_timeout", "3.0", OPT_DOUBLE_T, 0, FLDSET(struct ast_sip_contact, qualify_timeout)); + ast_sorcery_object_field_register(sorcery, "contact", "authenticate_qualify", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_contact, authenticate_qualify)); ast_sorcery_object_field_register(sorcery, "contact", "outbound_proxy", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_contact, outbound_proxy)); ast_sorcery_object_field_register(sorcery, "contact", "user_agent", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_contact, user_agent)); + ast_sorcery_object_field_register(sorcery, "contact", "reg_server", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_contact, reg_server)); ast_sorcery_object_field_register(sorcery, "aor", "type", "", OPT_NOOP_T, 0, 0); ast_sorcery_object_field_register(sorcery, "aor", "minimum_expiration", "60", OPT_UINT_T, 0, FLDSET(struct ast_sip_aor, minimum_expiration));