diff options
| -rw-r--r-- | include/asterisk/config_options.h | 26 | ||||
| -rw-r--r-- | include/asterisk/sorcery.h | 57 | ||||
| -rw-r--r-- | main/config_options.c | 11 | ||||
| -rw-r--r-- | main/features_config.c | 34 | ||||
| -rw-r--r-- | main/sorcery.c | 15 | ||||
| -rw-r--r-- | res/res_pjsip.c | 63 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 3 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_options.c | 6 |
8 files changed, 141 insertions, 74 deletions
diff --git a/include/asterisk/config_options.h b/include/asterisk/config_options.h index d557b5685..8947521d3 100644 --- a/include/asterisk/config_options.h +++ b/include/asterisk/config_options.h @@ -116,6 +116,7 @@ struct aco_type { aco_matchvalue_func matchfunc; /*!< A function for determing whether the option value matches (i.e. hassip= requires ast_true()) */ enum aco_category_op category_match; /*!< Whether the following category regex is a whitelist or blacklist */ size_t item_offset; /*!< The offset in the config snapshot for the global config or item config container */ + unsigned int hidden; /*!< Type is for internal purposes only and it and all options should not be visible to users */ /* non-global callbacks */ aco_type_item_alloc item_alloc; /*!< An allocation function for item associated with this type */ @@ -528,6 +529,7 @@ int aco_set_defaults(struct aco_type *type, const char *category, void *obj); * \param type The option type (only for default handlers) * \param handler The handler function for the option (only for non-default types) * \param flags a type specific flags, stored in the option and available to the handler + * \param no_doc if non-zero, this option should not have documentation * \param argc The number for variadic arguments * \param ... field offsets to store for default handlers * @@ -535,7 +537,7 @@ int aco_set_defaults(struct aco_type *type, const char *category, void *obj); * \retval -1 failure */ int __aco_option_register(struct aco_info *info, const char *name, enum aco_matchtype match_type, struct aco_type **types, - const char *default_val, enum aco_option_type type, aco_option_handler handler, unsigned int flags, size_t argc, ...); + const char *default_val, enum aco_option_type type, aco_option_handler handler, unsigned int flags, unsigned int no_doc, size_t argc, ...); /*! \brief Register a config option * \param info A pointer to the aco_info struct @@ -551,7 +553,7 @@ int __aco_option_register(struct aco_info *info, const char *name, enum aco_matc * \retval -1 Failure */ #define aco_option_register(info, name, matchtype, types, default_val, opt_type, flags, ...) \ - __aco_option_register(info, name, matchtype, types, default_val, opt_type, NULL, flags, VA_NARGS(__VA_ARGS__), __VA_ARGS__); + __aco_option_register(info, name, matchtype, types, default_val, opt_type, NULL, flags, 0, VA_NARGS(__VA_ARGS__), __VA_ARGS__); /*! \brief Register a config option * \param info A pointer to the aco_info struct @@ -566,7 +568,25 @@ int __aco_option_register(struct aco_info *info, const char *name, enum aco_matc * \retval -1 Failure */ #define aco_option_register_custom(info, name, matchtype, types, default_val, handler, flags) \ - __aco_option_register(info, name, matchtype, types, default_val, OPT_CUSTOM_T, handler, flags, 0); + __aco_option_register(info, name, matchtype, types, default_val, OPT_CUSTOM_T, handler, flags, 0, 0); + +/*! \brief Register a config option with no expected documentation + * \param info A pointer to the aco_info struct + * \param name The name of the option + * \param matchtype + * \param types An array of valid option types for matching categories to the correct struct type + * \param default_val The default value of the option in the same format as defined in a config file + * \param handler The handler callback for the option + * \param flags \a type specific flags, stored in the option and available to the handler + * + * \note This is used primarily with custom options that only have internal purposes + * and that should be ignored by the user. + * + * \retval 0 Success + * \retval -1 Failure + */ +#define aco_option_register_custom_nodoc(info, name, matchtype, types, default_val, handler, flags) \ + __aco_option_register(info, name, matchtype, types, default_val, OPT_CUSTOM_T, handler, flags, 1, 0); /*! \brief Register a deprecated (and aliased) config option * \param info A pointer to the aco_info struct diff --git a/include/asterisk/sorcery.h b/include/asterisk/sorcery.h index 85d745615..20bf2d20a 100644 --- a/include/asterisk/sorcery.h +++ b/include/asterisk/sorcery.h @@ -345,6 +345,24 @@ int __ast_sorcery_apply_default(struct ast_sorcery *sorcery, const char *type, c * * \param sorcery Pointer to a sorcery structure * \param type Type of object + * \param hidden All objects of this type are internal and should not be manipulated by users + * \param alloc Required object allocation callback + * \param transform Optional transformation callback + * \param apply Optional object set apply callback + * + * \note In general, this function should not be used directly. One of the various + * macro'd versions should be used instead. + * + * \retval 0 success + * \retval -1 failure + */ +int __ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, unsigned int hidden, aco_type_item_alloc alloc, sorcery_transform_handler transform, sorcery_apply_handler apply); + +/*! + * \brief Register an object type + * + * \param sorcery Pointer to a sorcery structure + * \param type Type of object * \param alloc Required object allocation callback * \param transform Optional transformation callback * \param apply Optional object set apply callback @@ -352,7 +370,23 @@ int __ast_sorcery_apply_default(struct ast_sorcery *sorcery, const char *type, c * \retval 0 success * \retval -1 failure */ -int ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, aco_type_item_alloc alloc, sorcery_transform_handler transform, sorcery_apply_handler apply); +#define ast_sorcery_object_register(sorcery, type, alloc, transform, apply) \ + __ast_sorcery_object_register((sorcery), (type), 0, (alloc), (transform), (apply)) + +/*! + * \brief Register an internal, hidden object type + * + * \param sorcery Pointer to a sorcery structure + * \param type Type of object + * \param alloc Required object allocation callback + * \param transform Optional transformation callback + * \param apply Optional object set apply callback + * + * \retval 0 success + * \retval -1 failure + */ +#define ast_sorcery_internal_object_register(sorcery, type, alloc, transform, apply) \ + __ast_sorcery_object_register((sorcery), (type), 1, (alloc), (transform), (apply)) /*! * \brief Set the copy handler for an object type @@ -401,7 +435,8 @@ int ast_sorcery_object_fields_register(struct ast_sorcery *sorcery, const char * * \retval -1 failure */ int __ast_sorcery_object_field_register(struct ast_sorcery *sorcery, const char *type, const char *name, const char *default_val, enum aco_option_type opt_type, - aco_option_handler config_handler, sorcery_field_handler sorcery_handler, unsigned int flags, size_t argc, ...); + aco_option_handler config_handler, sorcery_field_handler sorcery_handler, unsigned int flags, unsigned int no_doc, + size_t argc, ...); /*! * \brief Register a field within an object @@ -417,7 +452,23 @@ int __ast_sorcery_object_field_register(struct ast_sorcery *sorcery, const char * \retval -1 failure */ #define ast_sorcery_object_field_register(sorcery, type, name, default_val, opt_type, flags, ...) \ - __ast_sorcery_object_field_register(sorcery, type, name, default_val, opt_type, NULL, NULL, flags, VA_NARGS(__VA_ARGS__), __VA_ARGS__) + __ast_sorcery_object_field_register(sorcery, type, name, default_val, opt_type, NULL, NULL, flags, 0, VA_NARGS(__VA_ARGS__), __VA_ARGS__) + +/*! + * \brief Register a field within an object without documentation + * + * \param sorcery Pointer to a sorcery structure + * \param type Type of object + * \param name Name of the field + * \param default_val Default value of the field + * \param opt_type Option type + * \param flags Option type specific flags + * + * \retval 0 success + * \retval -1 failure + */ +#define ast_sorcery_object_field_register_nodoc(sorcery, type, name, default_val, opt_type, flags, ...) \ + __ast_sorcery_object_field_register(sorcery, type, name, default_val, opt_type, NULL, NULL, flags, 1, VA_NARGS(__VA_ARGS__), __VA_ARGS__) /*! * \brief Register a field within an object with custom handlers diff --git a/main/config_options.c b/main/config_options.c index 2770558df..20e993507 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -69,6 +69,7 @@ struct aco_option { enum aco_option_type type; aco_option_handler handler; unsigned int flags; + unsigned int no_doc:1; unsigned char deprecated:1; size_t argc; intptr_t args[0]; @@ -183,7 +184,7 @@ static int link_option_to_types(struct aco_info *info, struct aco_type **types, } if (!ao2_link(type->internal->opts, opt) #ifdef AST_XML_DOCS - || xmldoc_update_config_option(types, info->module, opt->name, type->name, opt->default_val, opt->match_type == ACO_REGEX, opt->type) + || (!opt->no_doc && xmldoc_update_config_option(types, info->module, opt->name, type->name, opt->default_val, opt->match_type == ACO_REGEX, opt->type)) #endif /* AST_XML_DOCS */ ) { do { @@ -276,7 +277,8 @@ static struct ast_xml_doc_item *find_xmldoc_type(struct ast_xml_doc_item *config #endif /* AST_XML_DOCS */ int __aco_option_register(struct aco_info *info, const char *name, enum aco_matchtype matchtype, struct aco_type **types, - const char *default_val, enum aco_option_type kind, aco_option_handler handler, unsigned int flags, size_t argc, ...) + const char *default_val, enum aco_option_type kind, aco_option_handler handler, unsigned int flags, + unsigned int no_doc, size_t argc, ...) { struct aco_option *opt; va_list ap; @@ -313,6 +315,7 @@ int __aco_option_register(struct aco_info *info, const char *name, enum aco_matc opt->handler = handler; opt->flags = flags; opt->argc = argc; + opt->no_doc = no_doc; if (!opt->handler && !(opt->handler = ast_config_option_default_handler(opt->type))) { /* This should never happen */ @@ -765,7 +768,7 @@ int aco_info_init(struct aco_info *info) goto error; } #ifdef AST_XML_DOCS - if (xmldoc_update_config_type(info->module, type->name, type->category, type->matchfield, type->matchvalue, type->category_match == ACO_WHITELIST)) { + if (!type->hidden && xmldoc_update_config_type(info->module, type->name, type->category, type->matchfield, type->matchvalue, type->category_match == ACO_WHITELIST)) { goto error; } #endif /* AST_XML_DOCS */ @@ -917,7 +920,7 @@ static char *complete_config_option(const char *module, const char *option, cons /* Define as 0 if we want to allow configurations to be registered without * documentation */ -#define XMLDOC_STRICT 0 +#define XMLDOC_STRICT 1 /*! \internal * \brief Update the XML documentation for a config type based on its registration diff --git a/main/features_config.c b/main/features_config.c index bebd593d1..ac4a1fec0 100644 --- a/main/features_config.c +++ b/main/features_config.c @@ -1654,39 +1654,39 @@ static int load_config(void) aco_option_register_custom(&cfg_info, "pickupfailsound", ACO_EXACT, global_options, DEFAULT_PICKUPFAILSOUND, pickup_handler, 0); - aco_option_register_custom(&cfg_info, "context", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "context", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkext", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkext", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkext_exclusive", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkext_exclusive", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkinghints", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkinghints", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkedmusicclass", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkedmusicclass", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkingtime", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkingtime", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkpos", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkpos", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "findslot", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "findslot", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkedcalltransfers", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkedcalltransfers", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkedcallreparking", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkedcallreparking", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkedcallhangup", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkedcallhangup", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkedcallrecording", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkedcallrecording", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "comebackcontext", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "comebackcontext", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "comebacktoorigin", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "comebacktoorigin", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "comebackdialtime", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "comebackdialtime", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "parkeddynamic", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "parkeddynamic", ACO_EXACT, global_options, "", unsupported_handler, 0); - aco_option_register_custom(&cfg_info, "adsipark", ACO_EXACT, global_options, + aco_option_register_custom_nodoc(&cfg_info, "adsipark", ACO_EXACT, global_options, "", unsupported_handler, 0); aco_option_register_custom(&cfg_info, "blindxfer", ACO_EXACT, featuremap_options, diff --git a/main/sorcery.c b/main/sorcery.c index bb803c116..b2bb87915 100644 --- a/main/sorcery.c +++ b/main/sorcery.c @@ -575,7 +575,7 @@ static int sorcery_extended_fields_handler(const void *obj, struct ast_variable return 0; } -int ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, aco_type_item_alloc alloc, sorcery_transform_handler transform, sorcery_apply_handler apply) +int __ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, unsigned int hidden, aco_type_item_alloc alloc, sorcery_transform_handler transform, sorcery_apply_handler apply) { RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup); @@ -587,6 +587,7 @@ int ast_sorcery_object_register(struct ast_sorcery *sorcery, const char *type, a object_type->type.type = ACO_ITEM; object_type->type.category = ".?"; object_type->type.item_alloc = alloc; + object_type->type.hidden = hidden; object_type->transform = transform; object_type->apply = apply; @@ -639,13 +640,13 @@ int ast_sorcery_object_fields_register(struct ast_sorcery *sorcery, const char * object_field->multiple_handler = sorcery_handler; ao2_link(object_type->fields, object_field); - __aco_option_register(object_type->info, regex, ACO_REGEX, object_type->file->types, "", OPT_CUSTOM_T, config_handler, 0, 0); + __aco_option_register(object_type->info, regex, ACO_REGEX, object_type->file->types, "", OPT_CUSTOM_T, config_handler, 0, 1, 0); return 0; } int __ast_sorcery_object_field_register(struct ast_sorcery *sorcery, const char *type, const char *name, const char *default_val, enum aco_option_type opt_type, - aco_option_handler config_handler, sorcery_field_handler sorcery_handler, unsigned int flags, size_t argc, ...) + aco_option_handler config_handler, sorcery_field_handler sorcery_handler, unsigned int flags, unsigned int no_doc, size_t argc, ...) { RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup); RAII_VAR(struct ast_sorcery_object_field *, object_field, NULL, ao2_cleanup); @@ -677,15 +678,15 @@ int __ast_sorcery_object_field_register(struct ast_sorcery *sorcery, const char /* TODO: Improve this hack */ if (!argc) { - __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, argc); + __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc); } else if (argc == 1) { - __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, argc, + __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc, object_field->args[0]); } else if (argc == 2) { - __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, argc, + __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc, object_field->args[0], object_field->args[1]); } else if (argc == 3) { - __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, argc, + __aco_option_register(object_type->info, name, ACO_EXACT, object_type->file->types, default_val, opt_type, config_handler, flags, no_doc, argc, object_field->args[0], object_field->args[1], object_field->args[2]); } else { ast_assert(0); /* The hack... she does us no good for this */ diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 9b5727fb5..1e5d25705 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -256,6 +256,10 @@ <configOption name="rtp_symmetric" default="no"> <synopsis>Enforce that RTP must be symmetric</synopsis> </configOption> + <configOption name="send_diversion" default="yes"> + <synopsis>Send the Diversion header, conveying the diversion + information to the called user agent</synopsis> + </configOption> <configOption name="send_pai" default="no"> <synopsis>Send the P-Asserted-Identity header</synopsis> </configOption> @@ -670,15 +674,6 @@ <synopsis>Username to use for account</synopsis> </configOption> </configObject> - <configObject name="nat_hook"> - <synopsis>XXX This exists only to prevent XML documentation errors.</synopsis> - <configOption name="external_media_address"> - <synopsis>I should be undocumented or hidden</synopsis> - </configOption> - <configOption name="method"> - <synopsis>I should be undocumented or hidden</synopsis> - </configOption> - </configObject> <configObject name="domain_alias"> <synopsis>Domain Alias</synopsis> <description><para> @@ -769,6 +764,8 @@ <enum name="udp" /> <enum name="tcp" /> <enum name="tls" /> + <enum name="ws" /> + <enum name="wss" /> </enumlist> </description> </configOption> @@ -784,6 +781,24 @@ <configOption name="verify_server" default="false"> <synopsis>Require verification of server certificate (TLS ONLY)</synopsis> </configOption> + <configOption name="tos" default="false"> + <synopsis>Enable TOS for the signalling sent over this transport</synopsis> + <description> + <para>See <literal>https://wiki.asterisk.org/wiki/display/AST/IP+Quality+of+Service</literal> + for more information on this parameter.</para> + <note><para>This option does not apply to the <replaceable>ws</replaceable> + or the <replaceable>wss</replaceable> protocols.</para></note> + </description> + </configOption> + <configOption name="cos" default="false"> + <synopsis>Enable COS for the signalling sent over this transport</synopsis> + <description> + <para>See <literal>https://wiki.asterisk.org/wiki/display/AST/IP+Quality+of+Service</literal> + for more information on this parameter.</para> + <note><para>This option does not apply to the <replaceable>ws</replaceable> + or the <replaceable>wss</replaceable> protocols.</para></note> + </description> + </configOption> </configObject> <configObject name="contact"> <synopsis>A way of creating an aliased name to a SIP URI</synopsis> @@ -812,28 +827,6 @@ </para></description> </configOption> </configObject> - <configObject name="contact_status"> - <synopsis>Status for a contact</synopsis> - <description><para> - The contact status keeps track of whether or not a contact is reachable - and how long it took to qualify the contact (round trip time). - </para></description> - <configOption name="status"> - <synopsis>A contact's status</synopsis> - <description> - <enumlist> - <enum name="AVAILABLE" /> - <enum name="UNAVAILABLE" /> - </enumlist> - </description> - </configOption> - <configOption name="rtt"> - <synopsis>Round trip time</synopsis> - <description><para> - The time, in microseconds, it took to qualify the contact. - </para></description> - </configOption> - </configObject> <configObject name="aor"> <synopsis>The configuration for a location of an endpoint</synopsis> <description><para> @@ -972,7 +965,7 @@ A value of 0 indicates no maximum.</synopsis> </configOption> <configOption name="type"> - <synopsis>Must be of type 'system'.</synopsis> + <synopsis>Must be of type 'system'.</synopsis> </configOption> </configObject> <configObject name="global"> @@ -984,12 +977,12 @@ <configOption name="maxforwards" default="70"> <synopsis>Value used in Max-Forwards header for SIP requests.</synopsis> </configOption> + <configOption name="type"> + <synopsis>Must be of type 'global'.</synopsis> + </configOption> <configOption name="useragent" default="Asterisk <Asterisk Version>"> <synopsis>Value used in User-Agent header for SIP requests and Server header for SIP responses.</synopsis> </configOption> - <configOption name="type"> - <synopsis>Must be of type 'global'.</synopsis> - </configOption> </configObject> </configFile> </configInfo> diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index 527df5da3..b6926391e 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -628,7 +628,7 @@ int ast_res_pjsip_initialize_configuration(void) return -1; } - ast_sorcery_object_register(sip_sorcery, "nat_hook", sip_nat_hook_alloc, NULL, NULL); + ast_sorcery_internal_object_register(sip_sorcery, "nat_hook", sip_nat_hook_alloc, NULL, NULL); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "type", "", OPT_NOOP_T, 0, 0); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "context", "default", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, context)); @@ -696,7 +696,6 @@ int ast_res_pjsip_initialize_configuration(void) ast_sorcery_object_field_register(sip_sorcery, "endpoint", "cos_video", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, media.cos_video)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "allowsubscribe", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, subscription.allow)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "subminexpiry", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, subscription.minexpiry)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "subminexpirey", "0", OPT_UINT_T, 0, FLDSET(struct ast_sip_endpoint, subscription.minexpiry)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "fromuser", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, fromuser)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "fromdomain", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, fromdomain)); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "mwifromuser", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, subscription.mwi.fromuser)); diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c index ce0eeb2b7..e5f062db0 100644 --- a/res/res_pjsip/pjsip_options.c +++ b/res/res_pjsip/pjsip_options.c @@ -734,15 +734,15 @@ int ast_sip_initialize_sorcery_qualify(struct ast_sorcery *sorcery) /* initialize sorcery ast_sip_contact_status resource */ ast_sorcery_apply_default(sorcery, CONTACT_STATUS, "memory", NULL); - if (ast_sorcery_object_register(sorcery, CONTACT_STATUS, + if (ast_sorcery_internal_object_register(sorcery, CONTACT_STATUS, contact_status_alloc, NULL, NULL)) { ast_log(LOG_ERROR, "Unable to register ast_sip_contact_status in sorcery\n"); return -1; } - ast_sorcery_object_field_register(sorcery, CONTACT_STATUS, "rtt", "0", OPT_UINT_T, + ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "rtt", "0", OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, status)); - ast_sorcery_object_field_register(sorcery, CONTACT_STATUS, "rtt", "0", OPT_UINT_T, + ast_sorcery_object_field_register_nodoc(sorcery, CONTACT_STATUS, "rtt", "0", OPT_UINT_T, 1, FLDSET(struct ast_sip_contact_status, rtt)); return 0; |