Changeset 1036:aecdc2fbf222 in freeDiameter for libfdproto/dictionary.c

Timestamp:

Apr 17, 2013, 1:53:51 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Add fd_msg_dump_full function that dumps a message in human-readable format.
(not hooked in yet)

For this, add an argument to dump_avp_val if it should print a
header before each value or not.

File:

• libfdproto/dictionary.c (modified) (6 diffs)

libfdproto/dictionary.c

@@ -1180 +1180 @@
                                         n = enumval->enum_value.os.len;
                                 for (i=0; i < n; i++)
-                                        fd_log_debug("0x%02hhX/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i]));
+                                        fd_log_debug("0x%02.2X/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i]));
                                 if (n == LEN_MAX)
                                         fd_log_debug("...");
@@ -1343 +1343 @@
 {
         int i;
+        CHECK_FCT( dump_add_str(outstr, offset, outlen, "<") );
         for (i = 0; i < value->os.len; i++) {
-                if (i == 24) { /* Dump only up to 24 bytes of the buffer */
+                if (i == 1024) { /* Dump only up to 1024 bytes of the buffer */
                         CHECK_FCT( dump_add_str(outstr, offset, outlen, "[...] (len=%zd)", value->os.len) );
                         break;
                 }
-                CHECK_FCT( dump_add_str(outstr, offset, outlen, "%02.2X ", value->os.data[i]) );
-        }
+                CHECK_FCT( dump_add_str(outstr, offset, outlen, "%s%02.2X", (i==0 ? "" : " "), value->os.data[i]) );
+        }
+        CHECK_FCT( dump_add_str(outstr, offset, outlen, ">") );
         return 0;
 }
@@ -1424 +1426 @@
 #define INOBJHDRVAL     indent<0 ? 1 : indent, indent<0 ? "-" : "|"
 
-/* Formater for the AVP value dump line */
+/* Formatter for the AVP value dump line */
 static int dump_avp_val(union avp_value *avp_value, 
                         int (*def_dump_val_cb)(union avp_value *, char **, size_t *, size_t *), 
@@ -1434 +1436 @@
                         char **outstr, 
                         size_t *offset, 
-                        size_t *outlen)
-{
-        /* Header for all AVP values dumps: */
-        CHECK_FCT( dump_add_str(outstr, offset, outlen, INOBJHDR "value ", INOBJHDRVAL) );
-        
-        /* If the type is provided, write it */
-        if (type_name) {
-                CHECK_FCT( dump_add_str(outstr, offset, outlen, "t: '%s' ", type_name) );
-        }
-        
-        /* Always give the base datatype anyway */
-        CHECK_FCT( dump_add_str(outstr, offset, outlen, "(%s) ", type_base_name[datatype]) );
-        
-        /* Now, the value */
-        CHECK_FCT( dump_add_str(outstr, offset, outlen, "v: ") );
+                        size_t *outlen,
+                        int header)
+{
+        if (header) {
+                /* Header for all AVP values dumps: */
+                CHECK_FCT( dump_add_str(outstr, offset, outlen, INOBJHDR "value ", INOBJHDRVAL) );
+        
+                /* If the type is provided, write it */
+                if (type_name) {
+                        CHECK_FCT( dump_add_str(outstr, offset, outlen, "t: '%s' ", type_name) );
+                }
+        
+                /* Always give the base datatype anyway */
+                CHECK_FCT( dump_add_str(outstr, offset, outlen, "(%s) ", type_base_name[datatype]) );
+
+                /* Now, the value */
+                CHECK_FCT( dump_add_str(outstr, offset, outlen, "v: ") );
+        }
         if (const_name) {
                 CHECK_FCT( dump_add_str(outstr, offset, outlen, "'%s' (", const_name) );
@@ -1469 +1474 @@
 
 /* Dump the value of an AVP of known type into the returned str */
-int fd_dict_dump_avp_value(union avp_value *avp_value, struct dict_object * model, int indent, char **outstr, size_t *offset, size_t *outlen)
+int fd_dict_dump_avp_value(union avp_value *avp_value, struct dict_object * model, int indent, char **outstr, size_t *offset, size_t *outlen, int header)
 {
         char * (*dump_val_cb)(union avp_value *avp_value) = NULL;
@@ -1503 +1508 @@
         
         /* And finally, dump the value */
-        CHECK_FCT( dump_avp_val(avp_value, get_default_dump_val_cb(model->data.avp.avp_basetype), dump_val_cb, model->data.avp.avp_basetype, type_name, const_name, indent, outstr, offset, outlen) );
+        CHECK_FCT( dump_avp_val(avp_value, get_default_dump_val_cb(model->data.avp.avp_basetype), dump_val_cb, model->data.avp.avp_basetype, type_name, const_name, indent, outstr, offset, outlen, header) );
         return 0;
 }