Changeset 1088:1d1a20a0779d in freeDiameter for include

Timestamp:

May 5, 2013, 4:25:27 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Second part of changeset 1083, now the code compiles again. Still missing some functions implementation, though

Location:

include/freeDiameter

Files:

• libfdcore.h (modified) (2 diffs)
• libfdproto.h (modified) (5 diffs)

include/freeDiameter/libfdcore.h

@@ -803 +803 @@
 int fd_event_trig_regcb(int trigger_val, const char * module, void (*cb)(void));
 
+#ifndef SWIG
 DECLARE_FD_DUMP_PROTOTYPE(fd_event_trig_dump);
 
@@ -808 +809 @@
 DECLARE_FD_DUMP_PROTOTYPE(fd_conf_dump);
 DECLARE_FD_DUMP_PROTOTYPE(fd_ext_dump);
+DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump);
+#endif /* SWIG */
 DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump_list, int details);
 DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump, struct peer_hdr * p, int details);
-DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump);
 
 /*============================================================*/

include/freeDiameter/libfdproto.h

@@ -222 +222 @@
 
 
-/* Helper function for the *dump functions that add into a buffer */
+/* Helper functions for the *dump functions that add into a buffer */
 char * fd_dump_extend(char ** buf, size_t *len, size_t *offset, const char * format, ... ) _ATTRIBUTE_PRINTFLIKE_(4,5);
+char * fd_dump_extend_hexdump(char ** buf, size_t *len, size_t *offset, uint8_t *data, size_t datalen, size_t trunc, size_t wrap );
 
 /* All dump functions follow the same prototype:
@@ -1817 +1818 @@
 
 /* The state information that a module associate with a session -- each module defines its own data format */
-typedef void session_state;
-
-typedef DECLARE_FD_DUMP_PROTOTYPE(session_state_dump, session_state * st);
+struct sess_state; /* declare this in your own extension */
+
+typedef DECLARE_FD_DUMP_PROTOTYPE((*session_state_dump), struct sess_state * st);
 
 /* The following function must be called to activate the session expiry mechanism */
@@ -1843 +1844 @@
  *  ENOMEM      : Not enough memory to complete the operation
  */
-int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(session_state * state, os0_t sid, void * opaque), session_state_dump dumper, void * opaque );
-/* Macro to avoid casting everywhere */
-#define fd_sess_handler_create( _handler, _cleanup, _dumper, _opaque ) \
-        fd_sess_handler_create_internal( (_handler), (void (*)(session_state *, os0_t, void *))(_cleanup), _dumper, (void *)(_opaque) )
+int fd_sess_handler_create ( struct session_handler ** handler, void (*cleanup)(struct sess_state * state, os0_t sid, void * opaque), session_state_dump dumper, void * opaque );
 
         
@@ -2018 +2016 @@
  *  ENOMEM      : Not enough memory to complete the operation
  */
-int fd_sess_state_store_internal ( struct session_handler * handler, struct session * session, session_state ** state );
-#define fd_sess_state_store( _handler, _session, _state ) \
-        fd_sess_state_store_internal( (_handler), (_session), (void *)(_state) )
+int fd_sess_state_store ( struct session_handler * handler, struct session * session, struct sess_state ** state );
 
 /*
@@ -2040 +2036 @@
  *  EINVAL      : A parameter is invalid.
  */
-int fd_sess_state_retrieve_internal ( struct session_handler * handler, struct session * session, session_state ** state ); 
-#define fd_sess_state_retrieve( _handler, _session, _state ) \
-        fd_sess_state_retrieve_internal( (_handler), (_session), (void *)(_state) )
+int fd_sess_state_retrieve ( struct session_handler * handler, struct session * session, struct sess_state ** state );