Changeset 804:c5b7d4a2cc77 in freeDiameter for libfdcore/dict_base_proto.c

Timestamp:

Aug 22, 2012, 7:22:46 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment

File:

• libfdcore/dict_base_proto.c (modified) (4 diffs)

libfdcore/dict_base_proto.c

@@ -145 +145 @@
 
 /* Dump the content of an Address AVP */
-static void Address_dump(union avp_value * avp_value, FILE * fstr)
+static char * Address_dump(union avp_value * avp_value)
 {
+        char * ret;
+        #define STR_LEN 1024
         union {
                 sSA     sa;
@@ -157 +159 @@
         memset(&s, 0, sizeof(s));
         
+        CHECK_MALLOC_DO( ret = malloc(STR_LEN), return NULL );
+        
         /* The first two octets represent the address family, http://www.iana.org/assignments/address-family-numbers/ */
         if (avp_value->os.len < 2) {
-                fd_log_debug_fstr(fstr, "[invalid length: %d]", avp_value->os.len);
-                return;
+                snprintf(ret, STR_LEN, "[invalid length: %d]", avp_value->os.len);
+                return ret;
         }
         
@@ -170 +174 @@
                         s.sa.sa_family = AF_INET;
                         if (avp_value->os.len != 6) {
-                                fd_log_debug_fstr(fstr, "[invalid IP length: %d]", avp_value->os.len);
-                                return;
+                                snprintf(ret, STR_LEN, "[invalid IP length: %d]", avp_value->os.len);
+                                return ret;
                         }
                         memcpy(&s.sin.sin_addr.s_addr, avp_value->os.data + 2, 4);
@@ -179 +183 @@
                         s.sa.sa_family = AF_INET6;
                         if (avp_value->os.len != 18) {
-                                fd_log_debug_fstr(fstr, "[invalid IP6 length: %d]", avp_value->os.len);
-                                return;
+                                snprintf(ret, STR_LEN, "[invalid IP6 length: %d]", avp_value->os.len);
+                                return ret;
                         }
                         memcpy(&s.sin6.sin6_addr.s6_addr, avp_value->os.data + 2, 16);
                         break;
                 default:
-                        fd_log_debug_fstr(fstr, "[unsupported family: 0x%hx]", fam);
-                        return;
+                        snprintf(ret, STR_LEN, "[unsupported family: 0x%hx]", fam);
+                        return ret;
         }
         
         {
-                char addrbuf[INET6_ADDRSTRLEN];
-                int rc = getnameinfo(&s.sa, sSAlen(&s.sa), addrbuf, INET6_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST);
+                int rc = getnameinfo(&s.sa, sSAlen(&s.sa), ret, STR_LEN, NULL, 0, NI_NUMERICHOST);
                 if (rc)
-                        fd_log_debug_fstr(fstr, "%s", (char *)gai_strerror(rc));
-                else
-                        fd_log_debug_fstr(fstr, "%s", addrbuf);
-                
+                        snprintf(ret, STR_LEN, "%s", (char *)gai_strerror(rc));
         }
+        
+        return ret;
 }
 
-static void UTF8String_dump(union avp_value * avp_value, FILE * fstr)
+static char * UTF8String_dump(union avp_value * avp_value)
 {
-        size_t len = avp_value->os.len;
-        if (len > 42)
-                len = 42; /* avoid very long strings */
-        fd_log_debug_fstr(fstr, "%.*s", len, avp_value->os.data);
+        return strndup((char *)avp_value->os.data, 42); /* avoid very long strings */
 }