Changeset 653:34373acfbc6a in freeDiameter

Timestamp:

Jan 11, 2011 12:18:09 PM (2 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Message:

Added sample C++ file in _sample extension

Files:

• extensions/_sample/CMakeLists.txt (modified) (2 diffs)
• extensions/_sample/hello.cpp (added)
• extensions/_sample/sample.c (modified) (2 diffs)
• include/freeDiameter/libfreeDiameter.h (modified) (11 diffs)
• libfreeDiameter/log.c (modified) (1 diff)

extensions/_sample/CMakeLists.txt

@@ -1 +1 @@
 # The sample extension
-PROJECT("Sample extension" C)
+PROJECT("Sample extension")
 
 # Overwrite the debug level for the extension code if configured
@@ -12 +12 @@
 
 # Compile as a module
-FD_ADD_EXTENSION(dbg_sample sample.c fini.c)
+FD_ADD_EXTENSION(dbg_sample sample.c hello.cpp fini.c)
 
 

extensions/_sample/sample.c

@@ -36 +36 @@
 /* Sample extension to test extensions mechanism in freeDiameter */
 #include <freeDiameter/extension.h>
+
+/* from sample.cpp */
+void mycppfunc();
 
 static int sample_main(char * conffile);
@@ -86 +89 @@
         TRACE_DEBUG(INFO, "'Example-AVP' created without error\n");
         
+        /* Call the c++ function */
+        mycppfunc();
+        
         /* The initialization function returns an error code with the standard POSIX meaning (ENOMEM, and so on) */
         return 0;

include/freeDiameter/libfreeDiameter.h

@@ -114 +114 @@
  *  None.
  */
-void fd_log_debug ( char * format, ... );
+void fd_log_debug ( const char * format, ... );
 extern pthread_mutex_t  fd_log_lock;
 extern char * fd_debug_one_function;
@@ -195 +195 @@
 /* A version of __FILE__ without the full path */
 static char * file_bname = NULL;
-#define __STRIPPED_FILE__       (file_bname ?: (file_bname = basename(__FILE__)))
+#define __STRIPPED_FILE__       (file_bname ?: (file_bname = basename((char *)__FILE__)))
 
 
@@ -216 +216 @@
         if ( TRACE_BOOL(level) ) {                                                                                              \
                 char __buf[25];                                                                                                 \
-                char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed");                                       \
+                const char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed");                                 \
                 fd_log_debug("\t | tid:%-20s\t%s\tin %s@%s:%d\n"                                                                \
                           "\t%s|%*s" format "\n",                                                                               \
@@ -229 +229 @@
                 if (fd_g_debug_lvl > FULL) {                                                                                            \
                         char __buf[25];                                                                                                 \
-                        char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed");                                       \
+                        const char * __thn = ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed");                                 \
                         fd_log_debug("\t | tid:%-20s\t%s\tin %s@%s:%d\n"                                                                \
                                   "\t%s|%*s" format "\n",                                                                               \
@@ -484 +484 @@
 
 /* helper macros (pre-processor hacks to allow macro arguments) */
-#define __str( arg )  #arg
-#define _stringize( arg ) __str( arg )
+#define __tostr( arg )  #arg
+#define _stringize( arg ) __tostr( arg )
 #define __agr( arg1, arg2 ) arg1 ## arg2
 #define _aggregate( arg1, arg2 ) __agr( arg1, arg2 )
@@ -1629 +1629 @@
  *  len         : length of the sid string (which does not need to be '\0'-terminated)
  *  session     : On success, pointer to the session object created / retrieved.
- *  new         : if not NULL, set to 1 on return if the session object has been created, 0 if it was simply retrieved.
+ *  isnew       : if not NULL, set to 1 on return if the session object has been created, 0 if it was simply retrieved.
  *
  * DESCRIPTION: 
@@ -1640 +1640 @@
  *  ENOMEM      : Not enough memory to complete the operation
  */
-int fd_sess_fromsid ( char * sid, size_t len, struct session ** session, int * new);
+int fd_sess_fromsid ( char * sid, size_t len, struct session ** session, int * isnew);
 
 /*
@@ -2226 +2226 @@
  *  msg         : A valid message.
  *  session     : Location to store the session pointer when retrieved.
- *  new         : Indicates if the session has been created.
+ *  isnew       : Indicates if the session has been created.
  *
  * DESCRIPTION:
@@ -2237 +2237 @@
  * !0 : standard error code.
  */
-int fd_msg_sess_get(struct dictionary * dict, struct msg * msg, struct session ** session, int * new);
+int fd_msg_sess_get(struct dictionary * dict, struct msg * msg, struct session ** session, int * isnew);
 
 /***************************************/
@@ -2664 +2664 @@
  *
  * PARAMETERS:
- *  old         : Location of a FIFO that is to be emptied.
- *  new         : A FIFO that will receive the old data.
+ *  oldq        : Location of a FIFO that is to be emptied.
+ *  newq        : A FIFO that will receive the old data.
  *  loc_update  : if non NULL, a place to store the pointer to new FIFO atomically with the move.
  *
@@ -2675 +2675 @@
  *  EINVAL      : A parameter is invalid.
  */
-int fd_fifo_move ( struct fifo * old, struct fifo * new, struct fifo ** loc_update );
+int fd_fifo_move ( struct fifo * oldq, struct fifo * newq, struct fifo ** loc_update );
 
 /*

libfreeDiameter/log.c

@@ -57 +57 @@
 
 /* Log a debug message */
-void fd_log_debug ( char * format, ... )
+void fd_log_debug ( const char * format, ... )
 {
         va_list ap;