Changeset 304:ad3c46016584 in freeDiameter for include

Timestamp:

May 14, 2010, 5:26:53 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added install directives for cmake; also allow default directory to seek for extensions and configuration files

Location:

include/freeDiameter

Files:

• CMakeLists.txt (modified) (5 diffs)
• freeDiameter-host.h.in (modified) (1 diff)
• libfreeDiameter.h (modified) (1 diff)

include/freeDiameter/CMakeLists.txt

@@ -6 +6 @@
 # Configurable parameters
 
-# Name of the default configuration file
-OPTION(DEFAULT_CONF_FILE "Default path to configuration file?" OFF)
+# The default directory for configuration files
+SET(DEFAULT_CONF_PATH ${CMAKE_INSTALL_PREFIX}/etc/freeDiameter CACHE PATH "Default location of freeDiameter configuration files")
+
+# The default directory for extension files
+SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/lib/fdx CACHE PATH "Default location of freeDiameter extensions")
 
 # Disable SCTP support completly ?
@@ -14 +17 @@
         OPTION(DEBUG_SCTP "Verbose SCTP (for debug)?" OFF)
         OPTION(SCTP_USE_MAPPED_ADDRESSES "Use v6-mapped v4 addresses in SCTP (workaround some SCTP limitations)?" OFF)
+ELSE (NOT DISABLE_SCTP)
+        MESSAGE(STATUS "Disabled SCTP support.")
 ENDIF (NOT DISABLE_SCTP)
 
@@ -19 +24 @@
 OPTION(ERRORS_ON_TODO "(development) Generate compilation errors on TODO items ?" OFF)
 
+MARK_AS_ADVANCED(DISABLE_SCTP DEBUG_SCTP SCTP_USE_MAPPED_ADDRESSES ERRORS_ON_TODO)
 
 ########################
@@ -90 +96 @@
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
 
-# The default configuration file name
-IF (NOT DEFAULT_CONF_FILE)
-   SET(DEFAULT_CONF_FILE "freeDiameter.conf")
-ENDIF (NOT DEFAULT_CONF_FILE)
 ##########################
 
@@ -99 +101 @@
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeDiameter-host.h.in ${CMAKE_CURRENT_BINARY_DIR}/freeDiameter-host.h)
 
-# Save the FD_LIBS for parent scope
+# Save some variables for the other directories
 SET(FD_LIBS ${FD_LIBS} PARENT_SCOPE)
+SET(DEFAULT_CONF_PATH ${DEFAULT_CONF_PATH} PARENT_SCOPE)
+SET(DEFAULT_EXTENSIONS_PATH ${DEFAULT_EXTENSIONS_PATH} PARENT_SCOPE)
+
+
+####
+## INSTALL section ##
+
+# The headers from this directory are required to develop new extensions for freeDiameter.
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/freeDiameter-host.h libfreeDiameter.h freeDiameter.h extension.h
+        DESTINATION include/freeDiameter
+        COMPONENT freeDiameter-dev)
+

include/freeDiameter/freeDiameter-host.h.in

@@ -70 +70 @@
 #cmakedefine FD_PROJECT_COPYRIGHT "@FD_PROJECT_COPYRIGHT@"
 
-#cmakedefine DEFAULT_CONF_FILE "@DEFAULT_CONF_FILE@"
-
+#cmakedefine DEFAULT_CONF_PATH "@DEFAULT_CONF_PATH@"
+#cmakedefine DEFAULT_EXTENSIONS_PATH "@DEFAULT_EXTENSIONS_PATH@"
 
 #endif /* FD_IS_CONFIG */

include/freeDiameter/libfreeDiameter.h

@@ -224 +224 @@
 }
 #else /* DEBUG */
-/* Do not print thread, function, ... only the message itself in this case. */
-#define TRACE_DEBUG(level,format,args... ) {            \
-        if ( TRACE_BOOL(level) ) {                      \
-                fd_log_debug(format "\n", ## args);     \
-        }                                               \
+/* Do not print thread, function, ... only the message itself in this case, unless the debug level is set > FULL. */
+#define TRACE_DEBUG(level,format,args... ) {                                                                                            \
+        if ( TRACE_BOOL(level) ) {                                                                                                      \
+                if (fd_g_debug_lvl > FULL) {                                                                                            \
+                        char __buf[25];                                                                                                 \
+                        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",                                                                               \
+                                                __thn, fd_log_time(NULL, __buf, sizeof(__buf)), __PRETTY_FUNCTION__, __FILE__, __LINE__,\
+                                                (level < FULL)?"@":" ",level, "", ## args);                                             \
+                } else {                                                                                                                \
+                        fd_log_debug(format "\n", ## args);                                                                             \
+                }                                                                                                                       \
+        }                                                                                                                               \
 }
 #endif /* DEBUG */