]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip_config_wizard.c: Add port matching support.
authorSean Bright <sean.bright@gmail.com>
Wed, 30 Jun 2021 13:07:47 +0000 (09:07 -0400)
committerGeorge Joseph <gjoseph@digium.com>
Thu, 8 Jul 2021 15:31:07 +0000 (10:31 -0500)
In f8b0c2c9 we added support for port numbers in 'match' statements
but neglected to include that support in the PJSIP config wizard.

The removed code would have also prevented IPv6 addresses from being
successfully used in the config wizard as well.

ASTERISK-29503 #close

Change-Id: Idd5bbfd48009e7a741757743dbaea68e2835a34d

res/res_pjsip_config_wizard.c

index e61b7c5cc8a1d427aef3ff520bdb6bdfc5d1444b..8611be7a9d467400113502c894f90de62f1e7ea2 100644 (file)
@@ -764,18 +764,8 @@ static int handle_identify(const struct ast_sorcery *sorcery, struct object_type
 
        if (!ast_variable_find_last_in_list(vars, "match")) {
                for (host_counter = 0; host_counter < host_count; host_counter++) {
-                       char *rhost = AST_VECTOR_GET(remote_hosts_vector, host_counter);
-                       char host[strlen(rhost) + 1];
-                       char *colon;
-
-                       /* If there's a :port specified, we have to remove it. */
-                       strcpy(host, rhost); /* Safe */
-                       colon = strchr(host, ':');
-                       if (colon) {
-                               *colon = '\0';
-                       }
-
-                       variable_list_append_return(&vars, "match", host);
+                       variable_list_append_return(&vars, "match",
+                               AST_VECTOR_GET(remote_hosts_vector, host_counter));
                }
        }