kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_geolocation: Add two new options to GEOLOC_PROFILE

Browse Source 
Added an 'a' option to the GEOLOC_PROFILE function to allow
variable lists like location_info_refinement to be appended
to instead of replacing the entire list.

Added an 'r' option to the GEOLOC_PROFILE function to resolve all
variables before a read operation and after a Set operation.

Added a few missing parameters to the ones allowed for writing
with GEOLOC_PROFILE.

Fixed a bug where calling GEOLOC_PROFILE to read a parameter
might actually update the profile object.

Cleaned up XML documentation a bit.

ASTERISK-30190

Change-Id: I75f541db43345509a2e86225bfa4cf8e242e5b6c
This commit is contained in:
George Joseph
2022-08-25 07:00:33 -06:00
parent 22fc2b58d2
commit aeb465fdf1
7 changed files with 261 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
res/res_geolocation/geoloc_eprofile.c
View File

@@ -156,6 +156,67 @@ int ast_geoloc_eprofile_refresh_location(struct ast_geoloc_eprofile *eprofile)
return 0;
}
struct ast_geoloc_eprofile *ast_geoloc_eprofile_dup(struct ast_geoloc_eprofile *src)
{
struct ast_geoloc_eprofile *eprofile;
const char *profile_id;
int rc = 0;
if (!src) {
return NULL;
}
profile_id = ast_strdupa(src->id);
eprofile = ast_geoloc_eprofile_alloc(profile_id);
if (!eprofile) {
return NULL;
}
eprofile->allow_routing_use = src->allow_routing_use;
eprofile->pidf_element = src->pidf_element;
eprofile->suppress_empty_ca_elements = src->suppress_empty_ca_elements;
eprofile->format = src->format;
eprofile->precedence = src->precedence;
rc = ast_string_field_set(eprofile, location_reference, src->location_reference);
if (rc == 0) {
ast_string_field_set(eprofile, notes, src->notes);
}
if (rc == 0) {
ast_string_field_set(eprofile, method, src->method);
}
if (rc == 0) {
ast_string_field_set(eprofile, location_source, src->location_source);
}
if (rc == 0) {
rc = DUP_VARS(eprofile->location_info, src->location_info);
}
if (rc == 0) {
rc = DUP_VARS(eprofile->effective_location, src->effective_location);
}
if (rc == 0) {
rc = DUP_VARS(eprofile->location_refinement, src->location_refinement);
}
if (rc == 0) {
rc = DUP_VARS(eprofile->location_variables, src->location_variables);
}
if (rc == 0) {
rc = DUP_VARS(eprofile->usage_rules, src->usage_rules);
}
if (rc == 0) {
rc = DUP_VARS(eprofile->confidence, src->confidence);
}
if (rc != 0) {
ao2_ref(eprofile, -1);
return NULL;
}
return eprofile;
}
struct ast_geoloc_eprofile *ast_geoloc_eprofile_create_from_profile(struct ast_geoloc_profile *profile)
{
struct ast_geoloc_eprofile *eprofile;
@@ -287,7 +348,7 @@ struct ast_geoloc_eprofile *ast_geoloc_eprofile_create_from_uri(const char *uri,
return eprofile;
}
static struct ast_variable *geoloc_eprofile_resolve_varlist(struct ast_variable *source,
struct ast_variable *geoloc_eprofile_resolve_varlist(struct ast_variable *source,
struct ast_variable *variables, struct ast_channel *chan)
{
struct ast_variable *dest = NULL;