Changeset 1062:56bf0377e2ff in freeDiameter

Timestamp:

Apr 29, 2013, 7:43:52 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Children:

1064:4e6c7710f4d5, 1065:c4e4e07f1336

Phase:

public

Message:

Raise "Conflicting rules" to error level since it causes validation
errors and usually will stop a message from being accepted or sent.

File:

• libfdproto/messages.c (modified) (4 diffs)

libfdproto/messages.c

@@ -2352 +2352 @@
         }
         if (count < min) {
-                TRACE_DEBUG(INFO, "Conflicting rule: the number of occurences (%d) is < the rule min (%d) for '%s'.", count, min, avp_name);
+                fd_log_error("Conflicting rule: the number of occurences (%d) is < the rule min (%d) for '%s'.", count, min, avp_name);
                 if (pr_data->pei) {
                         pr_data->pei->pei_errcode = "DIAMETER_MISSING_AVP";
@@ -2362 +2362 @@
         /* Check the "max" value */
         if ((rule->rule_max != -1) && (count > rule->rule_max)) {
-                TRACE_DEBUG(INFO, "Conflicting rule: the number of occurences (%d) is > the rule max (%d) for '%s'.", count, rule->rule_max, avp_name);
+                fd_log_error("Conflicting rule: the number of occurences (%d) is > the rule max (%d) for '%s'.", count, rule->rule_max, avp_name);
                 if (pr_data->pei) {
                         if (rule->rule_max == 0)
@@ -2383 +2383 @@
                         /* Since "0*1<fixed>" is a valid rule specifier, we only reject cases where the AVP appears *after* its fixed position */
                         if (first > rule->rule_order) {
-                                TRACE_DEBUG(INFO, "Conflicting rule: the FIXED_HEAD AVP appears first in (%d) position, the rule requires (%d) for '%s'.", first, rule->rule_order, avp_name);
+                                fd_log_error("Conflicting rule: the FIXED_HEAD AVP appears first in (%d) position, the rule requires (%d) for '%s'.", first, rule->rule_order, avp_name);
                                 if (pr_data->pei) {
                                         pr_data->pei->pei_errcode = "DIAMETER_MISSING_AVP";
@@ -2396 +2396 @@
                         /* Since "0*1<fixed>" is a valid rule specifier, we only reject cases where the AVP appears *before* its fixed position */
                         if (last > rule->rule_order) {  /* We have a ">" here because we count in reverse order (i.e. from the end) */
-                                TRACE_DEBUG(INFO, "Conflicting rule: the FIXED_TAIL AVP appears last in (%d) position, the rule requires (%d) for '%s'.", last, rule->rule_order, avp_name);
+                                fd_log_error("Conflicting rule: the FIXED_TAIL AVP appears last in (%d) position, the rule requires (%d) for '%s'.", last, rule->rule_order, avp_name);
                                 if (pr_data->pei) {
                                         pr_data->pei->pei_errcode = "DIAMETER_MISSING_AVP";