Changeset 1333:cbe1da7a32f1 in freeDiameter

Timestamp:

Apr 9, 2019, 10:11:32 PM (5 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Add dict_json extension.

This extension allows loading diameter dictionares from a JSON file.

Example files are provided by contrib/dict_json.

Files:

• contrib/dict_json/dictionary_dcca.json (added)
• contrib/dict_json/dictionary_dcca_3gpp.json (added)
• contrib/dict_json/dictionary_dcca_3gpp_sy.json (added)
• contrib/dict_json/dictionary_freediameter_base.json (added)
• contrib/dict_json/dictionary_nasreq.json (added)
• doc/dict_json.json.sample (added)
• extensions/CMakeLists.txt (modified) (5 diffs)
• extensions/dict_json/CMakeLists.txt (added)
• extensions/dict_json/dict-json-diff.cc (added)
• extensions/dict_json/dict_json.cc (added)
• extensions/dict_json/dict_json_dict_schema.cc (added)
• extensions/dict_json/dict_json_dict_schema.json (added)
• include/freeDiameter/CMakeLists.txt (modified) (6 diffs)

extensions/CMakeLists.txt

@@ -13 +13 @@
 ENDMACRO(FD_ADD_EXTENSION)
 
-# Use the macro FD_EXTENSION_SUBDIR(extmacroname subdir descr default) to 
+# Use the macro FD_EXTENSION_SUBDIR(extmacroname subdir descr default) to
 # add a new extension subdirectory.
 MACRO(FD_EXTENSION_SUBDIR EXTSUBDIR EXTDESCR EXTDEFAULT)
@@ -40 +40 @@
 FD_EXTENSION_SUBDIR(dict_eap    "Diameter EAP (RFC4072) Dictionary definitions" ON)
 
-FD_EXTENSION_SUBDIR(dict_dcca   "Diameter CC (RFC4006) Dictionary definitions [incomplete]" ON)
-FD_EXTENSION_SUBDIR(dict_dcca_3gpp   "Diameter CC 3GPP Dictionary definitions [incomplete]" ON)
-FD_EXTENSION_SUBDIR(dict_dcca_starent   "Diameter CC Starent Dictionary definitions" ON)
+FD_EXTENSION_SUBDIR(dict_dcca         "Diameter CC (RFC4006) Dictionary definitions [incomplete]" ON)
+FD_EXTENSION_SUBDIR(dict_dcca_3gpp    "Diameter CC 3GPP Dictionary definitions [incomplete]" ON)
+FD_EXTENSION_SUBDIR(dict_dcca_starent "Diameter CC Starent Dictionary definitions" ON)
 
 FD_EXTENSION_SUBDIR(dict_sip    "Diameter SIP (RFC4740) Dictionary definitions" ON)
@@ -51 +51 @@
 FD_EXTENSION_SUBDIR(dict_rfc5777   "Classification and QoS (RFC 5777) Dictionary definitions" ON)
 
+FD_EXTENSION_SUBDIR(dict_json       "Load Diameter dictionary definitions from JSON files."   OFF)
 FD_EXTENSION_SUBDIR(dict_legacy_xml "Load Diameter dictionary definitions from XML files."    OFF)
 
@@ -68 +69 @@
 # Routing extensions
 
-FD_EXTENSION_SUBDIR(rt_busypeers "Handling of Diameter TOO_BUSY messages and relay timeouts"    ON)
-FD_EXTENSION_SUBDIR(rt_default   "Configurable routing rules for freeDiameter"                  ON)
-FD_EXTENSION_SUBDIR(rt_ereg      "Configurable routing based on regexp matching of AVP values" OFF)
-FD_EXTENSION_SUBDIR(rt_ignore_dh "Stow Destination-Host in Proxy-Info, restore to Origin-Host for answers"      ON)
+FD_EXTENSION_SUBDIR(rt_busypeers    "Handling of Diameter TOO_BUSY messages and relay timeouts" ON)
+FD_EXTENSION_SUBDIR(rt_default      "Configurable routing rules for freeDiameter"                       ON)
+FD_EXTENSION_SUBDIR(rt_ereg         "Configurable routing based on regexp matching of AVP values" OFF)
+FD_EXTENSION_SUBDIR(rt_ignore_dh    "Stow Destination-Host in Proxy-Info, restore to Origin-Host for answers"   ON)
 FD_EXTENSION_SUBDIR(rt_load_balance "Balance load over multiple equal hosts, based on outstanding requests"     ON)
-FD_EXTENSION_SUBDIR(rt_randomize "Randomly choose one of the highest scored hosts and increase its score by one"        ON)
-FD_EXTENSION_SUBDIR(rt_redirect  "Handling of Diameter Redirect messages"                       ON)
+FD_EXTENSION_SUBDIR(rt_randomize    "Randomly choose one of the highest scored hosts and increase its score by one"     ON)
+FD_EXTENSION_SUBDIR(rt_redirect     "Handling of Diameter Redirect messages"                    ON)
 
 
@@ -86 +87 @@
 # Debug & test extensions
 
-FD_EXTENSION_SUBDIR(dbg_monitor "Outputs periodical status information"              ON)
+FD_EXTENSION_SUBDIR(dbg_monitor     "Outputs periodical status information"              ON)
 FD_EXTENSION_SUBDIR(dbg_msg_timings "Show some timing information for messages"      ON)
-FD_EXTENSION_SUBDIR(dbg_msg_dumps "Show human-readable content of the received & sent messages"      ON)
-FD_EXTENSION_SUBDIR(dbg_rt      "Routing extension for debugging the routing module" ON)
-FD_EXTENSION_SUBDIR(test_app    "Testing application to send dummy message to another peer, like a Diameter 'ping'" OFF)
-FD_EXTENSION_SUBDIR(test_sip    "Testing application to simulate Diameter-SIP client (RFC4740)" OFF)
+FD_EXTENSION_SUBDIR(dbg_msg_dumps   "Show human-readable content of the received & sent messages"      ON)
+FD_EXTENSION_SUBDIR(dbg_rt          "Routing extension for debugging the routing module" ON)
+FD_EXTENSION_SUBDIR(test_app        "Testing application to send dummy message to another peer, like a Diameter 'ping'" OFF)
+FD_EXTENSION_SUBDIR(test_sip        "Testing application to simulate Diameter-SIP client (RFC4740)" OFF)
 FD_EXTENSION_SUBDIR(dbg_interactive "Python-interpreter based module"                OFF)
-FD_EXTENSION_SUBDIR(test_netemul "Simple Diameter network emulator proxy extension (latency, PDV, duplicates)" OFF)
+FD_EXTENSION_SUBDIR(test_netemul    "Simple Diameter network emulator proxy extension (latency, PDV, duplicates)" OFF)
 
 

include/freeDiameter/CMakeLists.txt

@@ -18 +18 @@
 # In DEBUG mode, each log can contain pid, calling function and file for easy debug. Set to ON to display this information.
 OPTION(DEBUG_WITH_META "Show calling location in logs?" OFF)
-        
+
 # Create the absolute path for searching extensions
 SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_EXTENSIONS_SUFFIX})
@@ -32 +32 @@
 OPTION(DISABLE_PEER_EXPIRY "Disable RFC3539 Peers Connections Expiration after inactivity?" OFF)
 
-# The following workaround increases compatibility with some implementations without breaking anything in freeDiameter, 
-# so it can be enabled without risk. We keep it disabled by default anyway for those people who use freeDiameter to check the 
+# The following workaround increases compatibility with some implementations without breaking anything in freeDiameter,
+# so it can be enabled without risk. We keep it disabled by default anyway for those people who use freeDiameter to check the
 # compliancy of their implementation with the Diameter RFC...
 OPTION(WORKAROUND_ACCEPT_INVALID_VSAI "Do not reject a CER/CEA with a Vendor-Specific-Application-Id AVP containing both Auth- and Acct- application AVPs?" OFF)
@@ -45 +45 @@
 INCLUDE (CheckFunctionExists)
 INCLUDE (CheckIncludeFiles)
-INCLUDE (CheckSymbolExists) 
+INCLUDE (CheckSymbolExists)
 INCLUDE (CheckCSourceCompiles)
 INCLUDE (TestBigEndian)
@@ -134 +134 @@
 
 # IDNA process: we use libidn from GNU (unless the function & header files are included in libc)
-IF(NOT DIAMID_IDNA_IGNORE  AND NOT DIAMID_IDNA_REJECT)
+IF(NOT DIAMID_IDNA_IGNORE AND NOT DIAMID_IDNA_REJECT)
         FIND_PACKAGE(IDNA)
         SET(CHECK_IDNA_SOURCE_CODE "
@@ -160 +160 @@
 SET(GNUTLS_LIBRARIES ${GNUTLS_LIBRARIES} PARENT_SCOPE)
 
-find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
-If ( NOT GCRYPT_INCLUDE_DIR )
+FIND_PATH(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
+IF(NOT GCRYPT_INCLUDE_DIR)
         MESSAGE(SEND_ERROR "Unable to find gcrypt.h, please install libgcrypt-dev or equivalent")
-Endif ( NOT GCRYPT_INCLUDE_DIR )
+ENDIF(NOT GCRYPT_INCLUDE_DIR)
 MARK_AS_ADVANCED(GCRYPT_INCLUDE_DIR)
 SET(GCRYPT_INCLUDE_DIR ${GCRYPT_INCLUDE_DIR} PARENT_SCOPE)
 
 # Also we need libgcrypt to... display its version :(
-find_library(GCRYPT_LIBRARY 
+FIND_LIBRARY(GCRYPT_LIBRARY
   NAMES gcrypt
 )
-If ( NOT GCRYPT_LIBRARY )
+IF(NOT GCRYPT_LIBRARY)
         MESSAGE(SEND_ERROR "Unable to find libgcrypt, please install libgcrypt or equivalent")
-Endif ( NOT GCRYPT_LIBRARY )
+ENDIF(NOT GCRYPT_LIBRARY)
 SET(GCRYPT_LIBRARY ${GCRYPT_LIBRARY} PARENT_SCOPE)
 
@@ -229 +229 @@
 SET(LFDCORE_INCLUDES ${SCTP_INCLUDE_DIR} ${GNUTLS_INCLUDE_DIR} ${GCRYPT_INCLUDE_DIR} PARENT_SCOPE)
 # And dependencies
-SET(LFDCORE_LINK_INTERFACES "" PARENT_SCOPE) 
+SET(LFDCORE_LINK_INTERFACES "" PARENT_SCOPE)
                 # We don't force other libraries, the programs will link with what it needs
                 # (such as libgnutls if it uses GNUTLS_DEBUG() macro