Changeset 961:d95cd3ca9e8d in freeDiameter for libfdproto/dictionary.c

Timestamp:

Mar 7, 2013, 4:09:54 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

960:f39fa6cd86e0 (diff), 933:04f590da5821 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge latest 1.1 branch (one commit post 1.1.6)

Files:

• libfdproto/dictionary.c (modified) (8 diffs)
• libfdproto/dictionary.c (modified) (1 diff)

libfdproto/dictionary.c

@@ -1278 +1278 @@
                 _OBINFO(obj).dump_data(&obj->data);
         
-        fd_log_debug("\n");
-        
         if (depth) {
                 int i;
@@ -1470 +1468 @@
         
         /* Done! */
-        CHECK_FCT( dump_add_str(outstr, offset, outlen, "\n") );
         return 0;
 }
@@ -1725 +1722 @@
                 switch (type) {
                         case DICT_VENDOR:
+                                TRACE_DEBUG(FULL, "Vendor %s already in dictionary", new->data.vendor.vendor_name);
                                 /* if we are here, it means the two vendors id are identical */
                                 if (fd_os_cmp(locref->data.vendor.vendor_name, locref->datastr_len, 
@@ -1736 +1734 @@
 
                         case DICT_APPLICATION:
+                                TRACE_DEBUG(FULL, "Application %s already in dictionary", new->data.application.application_name);
                                 /* got same id */
                                 if (fd_os_cmp(locref->data.application.application_name, locref->datastr_len, 
@@ -1746 +1745 @@
 
                         case DICT_TYPE:
+                                TRACE_DEBUG(FULL, "Type %s already in dictionary", new->data.type.type_name);
                                 /* got same name */
                                 if (locref->data.type.type_base != new->data.type.type_base) {
@@ -1768 +1768 @@
 
                         case DICT_ENUMVAL:
+                                TRACE_DEBUG(FULL, "Enum %s already in dictionary", new->data.enumval.enum_name);
                                 /* got either same name or same value. We check that both are true */
                                 if (order_enum_by_name(locref, new)) {
@@ -1781 +1782 @@
 
                         case DICT_AVP:
+                                TRACE_DEBUG(FULL, "AVP %s already in dictionary", new->data.avp.avp_name);
                                 /* got either same name or code */
                                 if (order_avp_by_code(locref, new)) {
@@ -1810 +1812 @@
 
                         case DICT_COMMAND:
+                                TRACE_DEBUG(FULL, "Command %s already in dictionary", new->data.cmd.cmd_name);
                                 /* We got either same name, or same code + R flag */
                                 if (order_cmd_by_name(locref, new)) {

libfdproto/dictionary.c

@@ -3 +3 @@
 * Author: Sebastien Decugis <sdecugis@freediameter.net>                                                  *
 *                                                                                                        *
-* Copyright (c) 2012, WIDE Project and NICT                                                              *
+* Copyright (c) 2013, WIDE Project and NICT                                                              *
 * All rights reserved.                                                                                   *
 *                                                                                                        *