Changeset 804:c5b7d4a2cc77 in freeDiameter for libfdproto/fdproto-internal.h

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:

• libfdproto/fdproto-internal.h (modified) (2 diffs)

libfdproto/fdproto-internal.h

@@ -60 +60 @@
 /* Dispatch / messages / dictionary API */
 int fd_dict_disp_cb(enum dict_object_type type, struct dict_object *obj, struct fd_list ** cb_list);
-void fd_dict_dump_avp_value(union avp_value *avp_value, struct dict_object * model, int indent, FILE * fstr);
+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_disp_call_cb_int( struct fd_list * cb_list, struct msg ** msg, struct avp *avp, struct session *sess, enum disp_action *action, 
                         struct dict_object * obj_app, struct dict_object * obj_cmd, struct dict_object * obj_avp, struct dict_object * obj_enu);
@@ -70 +70 @@
 int fd_sess_reclaim_msg ( struct session ** session );
 
+/* For dump routines into string buffers */
+#include <stdarg.h>
+static __inline__ int dump_init_str(char **outstr, size_t *offset, size_t *outlen) 
+{
+        *outlen = 1<<12;
+        CHECK_MALLOC( *outstr = malloc(*outlen) );
+        *offset = 0;
+        (*outstr)[0] = 0;
+        return 0;
+}
+static __inline__ int dump_add_str(char **outstr, size_t *offset, size_t *outlen, char * fmt, ...) 
+{
+        va_list argp;
+        int len;
+        va_start(argp, fmt);
+        len = vsnprintf(*outstr + *offset, *outlen - *offset, fmt, argp);
+        va_end(argp);
+        if ((len + *offset) >= *outlen) {
+                char * newstr;
+                /* buffer was too short, extend */
+                size_t newsize = ((len + *offset) + (1<<12)) & ~((1<<12) - 1); /* next multiple of 4k */
+                CHECK_MALLOC( newstr = realloc(*outstr, newsize) );
+                
+                /* redo */
+                *outstr = newstr;
+                *outlen = newsize;
+                va_start(argp, fmt);
+                len = vsnprintf(*outstr + *offset, *outlen - *offset, fmt, argp);
+                va_end(argp);
+        }
+        *offset += len;
+        return 0;
+}
+
+
+
 #endif /* _LIBFDPROTO_INTERNAL_H */