Changeset 687:026802543f57 in freeDiameter for libfdcore/dict_base_proto.c

Timestamp:

Jan 19, 2011, 5:08:21 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Prepare for new message log facility

File:

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

libfdcore/dict_base_proto.c

@@ -145 +145 @@
 
 /* Dump the content of an Address AVP */
-static void Address_dump(union avp_value * avp_value)
+static void Address_dump(union avp_value * avp_value, FILE * fstr)
 {
         union {
@@ -159 +159 @@
         /* 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("[invalid length: %d]", avp_value->os.len);
+                fd_log_debug_fstr(fstr, "[invalid length: %d]", avp_value->os.len);
                 return;
         }
@@ -170 +170 @@
                         s.sa.sa_family = AF_INET;
                         if (avp_value->os.len != 6) {
-                                fd_log_debug("[invalid IP length: %d]", avp_value->os.len);
+                                fd_log_debug_fstr(fstr, "[invalid IP length: %d]", avp_value->os.len);
                                 return;
                         }
@@ -179 +179 @@
                         s.sa.sa_family = AF_INET6;
                         if (avp_value->os.len != 18) {
-                                fd_log_debug("[invalid IP6 length: %d]", avp_value->os.len);
+                                fd_log_debug_fstr(fstr, "[invalid IP6 length: %d]", avp_value->os.len);
                                 return;
                         }
@@ -185 +185 @@
                         break;
                 default:
-                        fd_log_debug("[unsupported family: 0x%hx]", fam);
+                        fd_log_debug_fstr(fstr, "[unsupported family: 0x%hx]", fam);
                         return;
         }
-
-        sSA_DUMP_NODE(&s.sa, NI_NUMERICHOST);
+        
+        {
+                char addrbuf[INET6_ADDRSTRLEN];
+                int rc = getnameinfo(&s.sa, sSAlen(&s.sa), addrbuf, INET6_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST);
+                if (rc)
+                        fd_log_debug_fstr(fstr, "%s", (char *)gai_strerror(rc));
+                else
+                        fd_log_debug_fstr(fstr, "%s", addrbuf);
+                
+        }
 }
 
-static void UTF8String_dump(union avp_value * avp_value)
+static void UTF8String_dump(union avp_value * avp_value, FILE * fstr)
 {
         size_t len = avp_value->os.len;
         if (len > 42)
                 len = 42; /* avoid very long strings */
-        fd_log_debug("%.*s", len, avp_value->os.data);
+        fd_log_debug_fstr(fstr, "%.*s", len, avp_value->os.data);
 }