]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip/config_domain_aliases.c: Add check for missing domain.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 2 Feb 2018 23:20:55 +0000 (17:20 -0600)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 5 Feb 2018 20:01:15 +0000 (14:01 -0600)
What is the point of defining an alias and not saying what is being
aliased?

Change-Id: I98a892016ed61dcf5efeb6619fd748925103f0be

res/res_pjsip/config_domain_aliases.c

index 8feff05716b6d5946debf3f8196727fefe0c8808..944568bcd749aa91cb6d8017bafcc06f77ef1380 100644 (file)
@@ -34,8 +34,9 @@ static void domain_alias_destroy(void *obj)
 
 static void *domain_alias_alloc(const char *name)
 {
-        struct ast_sip_domain_alias *alias = ast_sorcery_generic_alloc(sizeof(*alias), domain_alias_destroy);
+       struct ast_sip_domain_alias *alias;
 
+       alias = ast_sorcery_generic_alloc(sizeof(*alias), domain_alias_destroy);
        if (!alias) {
                return NULL;
        }
@@ -48,6 +49,22 @@ static void *domain_alias_alloc(const char *name)
        return alias;
 }
 
+/*! \brief Apply handler for domain_alias type */
+static int domain_alias_apply(const struct ast_sorcery *sorcery, void *obj)
+{
+       struct ast_sip_domain_alias *alias = obj;
+
+       if (ast_strlen_zero(alias->domain)) {
+               /*
+                * What is the point of defining an alias and not saying
+                * what is being aliased?
+                */
+               ast_log(LOG_ERROR, "%s '%s' missing required domain being aliased.\n",
+                       SIP_SORCERY_DOMAIN_ALIAS_TYPE, ast_sorcery_object_get_id(alias));
+       }
+       return 0;
+}
+
 /*! \brief Initialize sorcery with domain alias support */
 int ast_sip_initialize_sorcery_domain_alias(void)
 {
@@ -55,7 +72,8 @@ int ast_sip_initialize_sorcery_domain_alias(void)
 
        ast_sorcery_apply_default(sorcery, SIP_SORCERY_DOMAIN_ALIAS_TYPE, "config", "pjsip.conf,criteria=type=domain_alias");
 
-       if (ast_sorcery_object_register(sorcery, SIP_SORCERY_DOMAIN_ALIAS_TYPE, domain_alias_alloc, NULL, NULL)) {
+       if (ast_sorcery_object_register(sorcery, SIP_SORCERY_DOMAIN_ALIAS_TYPE,
+               domain_alias_alloc, NULL, domain_alias_apply)) {
                return -1;
        }