Changeset 255:cb4307a1cd29 in freeDiameter

Timestamp:

Apr 15, 2010, 11:56:32 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added two plugins for RADIUS/Diameter gateway debug.

Location:

extensions/app_radgw

Files:

• CMakeLists.txt (modified) (3 diffs)
• rgw_common.h (modified) (1 diff)
• rgw_msg.c (modified) (1 diff)
• rgw_msg_attrtype.c (modified) (1 diff)
• rgw_msg_codes.c (modified) (1 diff)
• rgw_plugins.c (modified) (2 diffs)
• rgwx_debug.c (added)
• rgwx_sample.c (added)

extensions/app_radgw/CMakeLists.txt

@@ -17 +17 @@
         radius.c
         md5.c
+        rgw_msg_codes.c
+        rgw_msg_attrtype.c
 )
 SET( RG_COMMON_HEADER
@@ -54 +56 @@
 
 
+########### RADIUS/Diameter translation agent plugins (support for RADIUS protocol) ############
+# Use the macro RGWX_ADD_PLUGIN(name files...) to create a plugin.
+# It is equivalent to add_library with the appropriate parameters
+# and naming conventions (.rgwx : Radius GateWay eXtension)
+MACRO(RGWX_ADD_PLUGIN PLGNAME)
+  ADD_LIBRARY(${PLGNAME} MODULE ${ARGN})
+  SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES PREFIX "" )
+  SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES SUFFIX ".rgwx" )
+  TARGET_LINK_LIBRARIES(${PLGNAME} rgw_common)
+ENDMACRO(RGWX_ADD_PLUGIN)
+
+# Example of plugin:
+OPTION(BUILD_RGWX_SAMPLE "Build sample plugin? (for developers only)" OFF)
+        IF (BUILD_RGWX_SAMPLE)
+           RGWX_ADD_PLUGIN(sample ${RG_COMMON_HEADER} rgwx_sample.c)
+        ENDIF (BUILD_RGWX_SAMPLE)
+
+# A plugin for debug: dumps RADIUS and Diameter messages state at the time the plugin is called.
+OPTION(BUILD_RGWX_DEBUG "Build debug plugin? (display status of RADIUS and Diameter messages)" ON)
+        IF (BUILD_RGWX_DEBUG)
+           RGWX_ADD_PLUGIN(debug ${RG_COMMON_HEADER} rgwx_debug.c)
+        ENDIF (BUILD_RGWX_DEBUG)
 
 
@@ -63 +87 @@
 
 
-########### Sub extensions #############
-# Example of support extension:
-# OPTION(BUILD_RADIUS_GW_SAMPLE "Build sample sub-extension? (for debug only)" OFF)
-#       IF (BUILD_RADIUS_GW_SAMPLE)
-#          ADD_LIBRARY(sub_sample MODULE ${RG_COMMON_HEADER} sub_sample.c)
-#          TARGET_LINK_LIBRARIES(sub_sample rg_common)
-#       ENDIF (BUILD_RADIUS_GW_SAMPLE)
-        
-# OPTION(BUILD_SUB_DEBUG "Build debug sub-extension? (display status of RADIUS and Diameter messages)" ON)
-#       IF (BUILD_SUB_DEBUG)
-#          ADD_LIBRARY(sub_debug MODULE ${RG_COMMON_HEADER} sub_debug.c)
-#          TARGET_LINK_LIBRARIES(sub_debug rg_common)
-#       ENDIF (BUILD_SUB_DEBUG)
+
 # 
 # OPTION(BUILD_SUB_ECHO_DROP "Build 'echo/drop' sub-extension? (echo or drop specific RADIUS attributes, no Diameter translation)" ON)

extensions/app_radgw/rgw_common.h

@@ -219 +219 @@
 };
 
+const char * rgw_msg_attrtype_str(unsigned char c);
+const char * rgw_msg_code_str(unsigned char c);
+
 #endif /* _RGW_COMMON_H */
   

extensions/app_radgw/rgw_msg.c

@@ -41 +41 @@
 #include "rgw.h"
 
-/* Directly include the code of the functions for dumping (generated from the IANA registries) */
-#include "rgw_msg_codes.c"
-#include "rgw_msg_attrtype.c"
-
 /* Destroy a message */
 void rgw_msg_free(struct rgw_radius_msg_meta ** msg)

extensions/app_radgw/rgw_msg_attrtype.c

@@ +1 @@
+/*********************************************************************************************************
+* Software License Agreement (BSD License)                                                               *
+* Author: Sebastien Decugis <sdecugis@nict.go.jp>                                                        *
+*                                                                                                        *
+* Copyright (c) 2009, WIDE Project and NICT                                                              *
+* All rights reserved.                                                                                   *
+*                                                                                                        *
+* Redistribution and use of this software in source and binary forms, with or without modification, are  *
+* permitted provided that the following conditions are met:                                              *
+*                                                                                                        *
+* * Redistributions of source code must retain the above                                                 *
+*   copyright notice, this list of conditions and the                                                    *
+*   following disclaimer.                                                                                *
+*                                                                                                        *
+* * Redistributions in binary form must reproduce the above                                              *
+*   copyright notice, this list of conditions and the                                                    *
+*   following disclaimer in the documentation and/or other                                               *
+*   materials provided with the distribution.                                                            *
+*                                                                                                        *
+* * Neither the name of the WIDE Project or NICT nor the                                                 *
+*   names of its contributors may be used to endorse or                                                  *
+*   promote products derived from this software without                                                  *
+*   specific prior written permission of WIDE Project and                                                *
+*   NICT.                                                                                                *
+*                                                                                                        *
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
+* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT     *
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS    *
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
+* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                                                             *
+*********************************************************************************************************/
+#include "rgw_common.h"
+
+/* The content of this file was semi-automatically generated from the IANA registry. */
+
 /*  Name of RADIUS attribute from its code */
 const char * rgw_msg_attrtype_str(unsigned char c) {

extensions/app_radgw/rgw_msg_codes.c

@@ +1 @@
+/*********************************************************************************************************
+* Software License Agreement (BSD License)                                                               *
+* Author: Sebastien Decugis <sdecugis@nict.go.jp>                                                        *
+*                                                                                                        *
+* Copyright (c) 2009, WIDE Project and NICT                                                              *
+* All rights reserved.                                                                                   *
+*                                                                                                        *
+* Redistribution and use of this software in source and binary forms, with or without modification, are  *
+* permitted provided that the following conditions are met:                                              *
+*                                                                                                        *
+* * Redistributions of source code must retain the above                                                 *
+*   copyright notice, this list of conditions and the                                                    *
+*   following disclaimer.                                                                                *
+*                                                                                                        *
+* * Redistributions in binary form must reproduce the above                                              *
+*   copyright notice, this list of conditions and the                                                    *
+*   following disclaimer in the documentation and/or other                                               *
+*   materials provided with the distribution.                                                            *
+*                                                                                                        *
+* * Neither the name of the WIDE Project or NICT nor the                                                 *
+*   names of its contributors may be used to endorse or                                                  *
+*   promote products derived from this software without                                                  *
+*   specific prior written permission of WIDE Project and                                                *
+*   NICT.                                                                                                *
+*                                                                                                        *
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
+* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT     *
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS    *
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
+* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   *
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                                                             *
+*********************************************************************************************************/
+#include "rgw_common.h"
+
+/* The content of this file was semi-automatically generated from the IANA registry. */
+
 /*  Name of RADIUS command from its command code */
 const char * rgw_msg_code_str(unsigned char c) {

extensions/app_radgw/rgw_plugins.c

@@ -220 +220 @@
                         goto error;
                 }
+                TRACE_DEBUG(INFO, "RADIUS/Diameter gateway plugin '%s%s%s%s' initialized.", new->plgname, conffile ? " (" : "",  conffile ? new->conffile : "", conffile ? ")" : "");
         }
         
@@ -493 +494 @@
                 fd_list_unlink(&plg->chain);
                 free(plg->conffile);
+                free(plg->cc);
+                if (plg->cs && plg->descriptor && plg->descriptor->rgwp_conf_free ) {
+                        TRACE_DEBUG(INFO, "RADIUS/Diameter gateway plugin '%s' cleaning up...", plg->plgname);
+                        (*plg->descriptor->rgwp_conf_free)(plg->cs);
+                }
                 free(plg->plgname);
-                free(plg->cc);
-                if (plg->cs && plg->descriptor && plg->descriptor->rgwp_conf_free )
-                        (*plg->descriptor->rgwp_conf_free)(plg->cs);
                 dlclose(plg->dlo);
                 free(plg);