Skip to content
Snippets Groups Projects
Commit 64fe5f1f authored by Wenpeng Song's avatar Wenpeng Song
Browse files

Revert "Add config parameter "allow_tx_hash_in_uri" in pjsip, REF 14468"

This reverts merge request !172
parent 5f21fdb0
No related branches found
No related tags found
2 merge requests!222Add "expire != 0" restriction to V001,!187Syslog addition example. Taking syslog v001 as an example, the framework of syslog addition is shown.
......@@ -124,9 +124,6 @@ struct global_config {
unsigned int accept_proxy_req_only;
/*! Nonzero if we should return all codecs on empty re-INVITE */
unsigned int all_codecs_on_empty_reinvite;
/*! Allow hash ('#') to appear in outgoing URIs. Default: NO */
unsigned int allow_tx_hash_in_uri;
};
static void global_destructor(void *obj)
......@@ -216,8 +213,6 @@ static int global_apply(const struct ast_sorcery *sorcery, void *obj)
return -1;
}
pjsip_cfg()->endpt.allow_tx_hash_in_uri = cfg->allow_tx_hash_in_uri;
ao2_t_global_obj_replace_unref(global_cfg, cfg, "Applying global settings");
return 0;
}
......@@ -789,8 +784,6 @@ int ast_sip_initialize_sorcery_global(void)
ast_sorcery_object_field_register(sorcery, "global", "all_codecs_on_empty_reinvite",
DEFAULT_ALL_CODECS_ON_EMPTY_REINVITE ? "yes" : "no",
OPT_BOOL_T, 1, FLDSET(struct global_config, all_codecs_on_empty_reinvite));
ast_sorcery_object_field_register(sorcery, "global", "allow_tx_hash_in_uri", "no",
OPT_YESNO_T, 1, FLDSET(struct global_config, allow_tx_hash_in_uri));
if (ast_sorcery_instance_observer_add(sorcery, &observer_callbacks_global)) {
return -1;
......
......@@ -389,13 +389,6 @@
"required": "",
"default": "",
"description": "Server details which allows NAT clients"
},
{
"name": "allow_tx_hash_in_uri",
"type": "integer",
"required": "",
"default": "0",
"description": "Allows unescaped '#' in outgoing SIP URI. "
}
]
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment