Merge "pjsip_configuration.c: Ignore repeated identify by methods."

This commit is contained in:
Joshua Colp
2016-09-07 05:02:55 -05:00
committed by Gerrit Code Review

View File

@@ -603,6 +603,10 @@ static int ident_handler(const struct aco_option *opt, struct ast_variable *var,
endpoint->ident_method = 0; endpoint->ident_method = 0;
return -1; return -1;
} }
if (endpoint->ident_method & method) {
/* We are already indentifying by this method. No need to do it again. */
continue;
}
endpoint->ident_method |= method; endpoint->ident_method |= method;
AST_VECTOR_APPEND(&endpoint->ident_method_order, method); AST_VECTOR_APPEND(&endpoint->ident_method_order, method);