forked from acouzens/open5gs
now we should use freediameter configuration file
This commit is contained in:
parent
4587288f5d
commit
ddd4c12a58
|
@ -6,38 +6,22 @@
|
|||
#include "fd_logger.h"
|
||||
|
||||
static struct fd_hook_hdl *logger_hdl = NULL;
|
||||
static char * buf = NULL;
|
||||
static size_t len;
|
||||
static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
|
||||
static pthread_t fd_stats_th = (pthread_t)NULL;
|
||||
|
||||
static fd_logger_user_handler user_handler = NULL;
|
||||
|
||||
static void fd_logger_cb_tree(enum fd_hook_type type, struct msg * msg,
|
||||
static void fd_logger_cb(enum fd_hook_type type, struct msg * msg,
|
||||
struct peer_hdr * peer, void * other, struct fd_hook_permsgdata *pmd,
|
||||
void * regdata);
|
||||
static void * fd_stats_worker(void * arg);
|
||||
|
||||
int fd_logger_init()
|
||||
{
|
||||
uint32_t mask_errors, mask_sndrcv, mask_routing, mask_peers;
|
||||
uint32_t mask_tree;
|
||||
|
||||
mask_errors = HOOK_MASK( HOOK_MESSAGE_FAILOVER, HOOK_MESSAGE_PARSING_ERROR,
|
||||
HOOK_MESSAGE_ROUTING_ERROR, HOOK_MESSAGE_DROPPED );
|
||||
mask_sndrcv = HOOK_MASK( HOOK_MESSAGE_RECEIVED, HOOK_MESSAGE_SENT );
|
||||
mask_routing= HOOK_MASK( HOOK_MESSAGE_LOCAL,
|
||||
HOOK_MESSAGE_ROUTING_FORWARD, HOOK_MESSAGE_ROUTING_LOCAL );
|
||||
mask_peers = HOOK_MASK( HOOK_PEER_CONNECT_FAILED,
|
||||
HOOK_PEER_CONNECT_SUCCESS );
|
||||
|
||||
mask_tree = mask_errors;
|
||||
mask_tree |= mask_sndrcv;
|
||||
mask_tree |= mask_routing;
|
||||
mask_tree |= mask_peers;
|
||||
uint32_t mask_peers = HOOK_MASK( HOOK_PEER_CONNECT_SUCCESS );
|
||||
|
||||
CHECK_FCT( fd_hook_register(
|
||||
mask_tree, fd_logger_cb_tree, NULL, NULL, &logger_hdl) );
|
||||
mask_peers, fd_logger_cb, NULL, NULL, &logger_hdl) );
|
||||
|
||||
CHECK_POSIX( pthread_mutex_init(&fd_self()->stats_lock, NULL) );
|
||||
|
||||
|
@ -71,7 +55,7 @@ void fd_logger_unregister(void)
|
|||
}
|
||||
|
||||
/* The callback called when messages are received and sent */
|
||||
static void fd_logger_cb_tree(enum fd_hook_type type, struct msg * msg,
|
||||
static void fd_logger_cb(enum fd_hook_type type, struct msg * msg,
|
||||
struct peer_hdr * peer, void * other, struct fd_hook_permsgdata *pmd,
|
||||
void * regdata)
|
||||
{
|
||||
|
@ -82,69 +66,8 @@ static void fd_logger_cb_tree(enum fd_hook_type type, struct msg * msg,
|
|||
if (user_handler)
|
||||
user_handler(type, msg, peer, other, pmd, regdata);
|
||||
|
||||
if (msg) {
|
||||
CHECK_MALLOC_DO( fd_msg_dump_treeview(&buf, &len, NULL, msg, fd_g_config->cnf_dict, (type == HOOK_MESSAGE_PARSING_ERROR) ? 0 : 1, 1),
|
||||
{ LOG_E("Error while dumping a message"); pthread_mutex_unlock(&mtx); return; } );
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
/* errors */
|
||||
case HOOK_MESSAGE_FAILOVER:
|
||||
LOG_E("FAILOVER from '%s':", peer_name);
|
||||
LOG_SPLIT(FD_LOG_ERROR, " ", buf, NULL);
|
||||
break;
|
||||
case HOOK_MESSAGE_PARSING_ERROR:
|
||||
if (msg) {
|
||||
DiamId_t id = NULL;
|
||||
if (fd_msg_source_get( msg, &id, NULL ))
|
||||
id = (DiamId_t)"<error getting source>";
|
||||
if (!id)
|
||||
id = (DiamId_t)"<local>";
|
||||
LOG_E("PARSING ERROR: '%s' from '%s': ", (char *)other, (char *)id);
|
||||
LOG_SPLIT(FD_LOG_ERROR, " ", buf, NULL);
|
||||
} else {
|
||||
struct fd_cnx_rcvdata *rcv_data = other;
|
||||
CHECK_MALLOC_DO(fd_dump_extend_hexdump(&buf, &len, NULL, rcv_data->buffer, rcv_data->length, 0, 0), break);
|
||||
LOG_E("PARSING ERROR: %zdB msg from '%s': %s", rcv_data->length, peer_name, buf);
|
||||
}
|
||||
break;
|
||||
case HOOK_MESSAGE_ROUTING_ERROR:
|
||||
LOG_E("ROUTING ERROR '%s' for: ", (char *)other);
|
||||
LOG_SPLIT(FD_LOG_ERROR, " ", buf, NULL);
|
||||
break;
|
||||
case HOOK_MESSAGE_DROPPED:
|
||||
LOG_E("DROPPED '%s'", (char *)other);
|
||||
LOG_SPLIT(FD_LOG_ERROR, " ", buf, NULL);
|
||||
break;
|
||||
|
||||
/* send receive */
|
||||
case HOOK_MESSAGE_RECEIVED:
|
||||
LOG_N("RCV from '%s':", peer_name);
|
||||
LOG_SPLIT(FD_LOG_DEBUG, " ", buf, NULL);
|
||||
break;
|
||||
case HOOK_MESSAGE_SENT:
|
||||
LOG_N("SND to '%s':", peer_name);
|
||||
LOG_SPLIT(FD_LOG_DEBUG, " ", buf, NULL);
|
||||
break;
|
||||
|
||||
/* routing */
|
||||
case HOOK_MESSAGE_LOCAL:
|
||||
LOG_N("ISSUED:");
|
||||
LOG_SPLIT(FD_LOG_DEBUG, " ", buf, NULL);
|
||||
break;
|
||||
case HOOK_MESSAGE_ROUTING_FORWARD:
|
||||
LOG_D("FORWARDING: %s", buf);
|
||||
LOG_SPLIT(FD_LOG_DEBUG, " ", buf, NULL);
|
||||
break;
|
||||
case HOOK_MESSAGE_ROUTING_LOCAL:
|
||||
LOG_D("DISPATCHING: %s", buf);
|
||||
LOG_SPLIT(FD_LOG_DEBUG, " ", buf, NULL);
|
||||
break;
|
||||
|
||||
/* peers */
|
||||
case HOOK_PEER_CONNECT_FAILED:
|
||||
LOG_N("CONNECT FAILED to %s: %s", peer_name, (char *)other);
|
||||
break;
|
||||
case HOOK_PEER_CONNECT_SUCCESS:
|
||||
{
|
||||
char protobuf[40];
|
||||
|
@ -155,13 +78,10 @@ static void fd_logger_cb_tree(enum fd_hook_type type, struct msg * msg,
|
|||
protobuf[1] = '\0';
|
||||
}
|
||||
d_info("CONNECTED TO '%s' (%s):", peer_name, protobuf);
|
||||
LOG_N("CONNECTED TO '%s' (%s):", peer_name, protobuf);
|
||||
LOG_SPLIT(FD_LOG_NOTICE, " ", buf, NULL);
|
||||
}
|
||||
break;
|
||||
|
||||
/* Not handled */
|
||||
case HOOK_DATA_RECEIVED:
|
||||
default:
|
||||
d_warn("Unknown type(%d)", type);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ libfds6a_la_SOURCES = \
|
|||
extension.h
|
||||
|
||||
nodist_libfds6a_la_SOURCES = \
|
||||
dict_nas_mipv6.c dict_s6a.c dict_init.c
|
||||
dict_s6a.c dict_init.c
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/lib/fd/s6a \
|
||||
|
|
|
@ -67,11 +67,8 @@ struct dict_object *s6a_served_party_ip_addr = NULL;
|
|||
|
||||
int s6a_ext_load()
|
||||
{
|
||||
int fd_ext_dict_nas_mipv6_init(int major, int minor, char *conffile);
|
||||
int fd_ext_dict_s6a_init(int major, int minor, char *conffile);
|
||||
|
||||
CHECK_FCT(fd_ext_dict_nas_mipv6_init(
|
||||
FD_PROJECT_VERSION_MAJOR, FD_PROJECT_VERSION_MINOR, NULL));
|
||||
CHECK_FCT(fd_ext_dict_s6a_init(
|
||||
FD_PROJECT_VERSION_MAJOR, FD_PROJECT_VERSION_MINOR, NULL));
|
||||
|
||||
|
|
|
@ -1,258 +0,0 @@
|
|||
/*********************************************************************************************************
|
||||
* Software License Agreement (BSD License) *
|
||||
* Author: Francois Bard <francois@tera.ics.keio.ac.jp> *
|
||||
* *
|
||||
* Copyright (c) 2010, Teraoka Laboratory, Keio University *
|
||||
* 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 Teraoka Laboratory nor the *
|
||||
* names of its contributors may be used to endorse or *
|
||||
* promote products derived from this software without *
|
||||
* specific prior written permission of Teraoka Laboratory *
|
||||
* *
|
||||
* *
|
||||
* 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. *
|
||||
*********************************************************************************************************/
|
||||
|
||||
/*
|
||||
|
||||
The following table lists the AVPs needed for the NAS to HAAA server interaction.
|
||||
We try to keep the structure of the grouped AVP by declaring the contained AVPs just before the grouped AVP they depend on.
|
||||
The number of '+' indicates the depth of the contained AVP.
|
||||
|
||||
DEPTH NAME AVP CODE RFC TYPE IMPLEMENTED NOTES
|
||||
|
||||
MIP6-Feature-Vector 124 5447 Unsigned64 yes
|
||||
+ MIP-Home-Agent-Address 334 4004 Address not yet
|
||||
++ Destination-Host 293 3588 DiameterIdentity no (Base)
|
||||
++ Destination-Realm 283 3588 DiameterIdentity no (Base)
|
||||
+ MIP-Home-Agent-Host 348 4004 Grouped not yet
|
||||
+ MIP6-Home-Link-Prefix 125 5447 OctetString yes
|
||||
MIP6-Agent-Info 486 5447 Grouped yes
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#include <freeDiameter/extension.h>
|
||||
|
||||
/* The content of this file follows the same structure as dict_base_proto.c */
|
||||
|
||||
#define CHECK_dict_new( _type, _data, _parent, _ref ) \
|
||||
CHECK_FCT( fd_dict_new( fd_g_config->cnf_dict, (_type), (_data), (_parent), (_ref)) );
|
||||
|
||||
#define CHECK_dict_search( _type, _criteria, _what, _result ) \
|
||||
CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, (_type), (_criteria), (_what), (_result), ENOENT) );
|
||||
|
||||
struct local_rules_definition {
|
||||
char *avp_name;
|
||||
enum rule_position position;
|
||||
int min;
|
||||
int max;
|
||||
};
|
||||
|
||||
#define RULE_ORDER( _position ) ((((_position) == RULE_FIXED_HEAD) || ((_position) == RULE_FIXED_TAIL)) ? 1 : 0 )
|
||||
|
||||
#define PARSE_loc_rules( _rulearray, _parent) { \
|
||||
int __ar; \
|
||||
for (__ar=0; __ar < sizeof(_rulearray) / sizeof((_rulearray)[0]); __ar++) { \
|
||||
struct dict_rule_data __data = { NULL, \
|
||||
(_rulearray)[__ar].position, \
|
||||
0, \
|
||||
(_rulearray)[__ar].min, \
|
||||
(_rulearray)[__ar].max}; \
|
||||
__data.rule_order = RULE_ORDER(__data.rule_position); \
|
||||
CHECK_FCT( fd_dict_search( \
|
||||
fd_g_config->cnf_dict, \
|
||||
DICT_AVP, \
|
||||
AVP_BY_NAME, \
|
||||
(_rulearray)[__ar].avp_name, \
|
||||
&__data.rule_avp, 0 ) ); \
|
||||
if ( !__data.rule_avp ) { \
|
||||
TRACE_DEBUG(INFO, "AVP Not found: '%s'", (_rulearray)[__ar].avp_name ); \
|
||||
return ENOENT; \
|
||||
} \
|
||||
CHECK_FCT_DO( fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &__data, _parent, NULL), \
|
||||
{ \
|
||||
TRACE_DEBUG(INFO, "Error on rule with AVP '%s'", \
|
||||
(_rulearray)[__ar].avp_name ); \
|
||||
return EINVAL; \
|
||||
} ); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define enumval_def_u32( _val_, _str_ ) \
|
||||
{ _str_, { .u32 = _val_ }}
|
||||
|
||||
#define enumval_def_os( _len_, _val_, _str_ ) \
|
||||
{ _str_, { .os = { .data = (unsigned char *)_val_, .len = _len_ }}}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* Defines if there are any */
|
||||
|
||||
/* Define Flags for MIP6-Feature-Vector*/
|
||||
|
||||
#define MIP6_INTEGRATED 0x0000000000000001
|
||||
#define LOCAL_HOME_AGENT_ASSIGNMENT 0x0000000000000002
|
||||
|
||||
/* Dictionary */
|
||||
|
||||
int dict_nas_mipv6_init(char * conffile)
|
||||
{
|
||||
struct dict_object * nas_mipv6;
|
||||
{
|
||||
struct dict_application_data data = { 5447, "MIPv6 NAS-to-HAAA Interaction" };
|
||||
CHECK_dict_new( DICT_APPLICATION, &data , NULL, &nas_mipv6);
|
||||
}
|
||||
|
||||
/* AVP section */
|
||||
{
|
||||
/* Loading the derived data formats */
|
||||
|
||||
struct dict_object * Address_type;
|
||||
CHECK_dict_search( DICT_TYPE, TYPE_BY_NAME, "Address", &Address_type);
|
||||
|
||||
/* MIP6-Feature-Vector */
|
||||
{
|
||||
/*
|
||||
|
||||
*/
|
||||
|
||||
struct dict_avp_data data = {
|
||||
124, /* Code */
|
||||
0, /* Vendor */
|
||||
"MIP6-Feature-Vector", /* Name */
|
||||
AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, /* Fixed flags */
|
||||
AVP_FLAG_MANDATORY, /* Fixed flag values */
|
||||
AVP_TYPE_UNSIGNED64 /* base type of data */
|
||||
};
|
||||
|
||||
CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
|
||||
}
|
||||
|
||||
/* MIP-Home-Agent-Address - RFC 4004 */
|
||||
{
|
||||
/*
|
||||
|
||||
*/
|
||||
|
||||
struct dict_avp_data data = {
|
||||
334, /* Code */
|
||||
0, /* Vendor */
|
||||
"MIP-Home-Agent-Address", /* Name */
|
||||
AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, /* Fixed flags */
|
||||
AVP_FLAG_MANDATORY, /* Fixed flag values */
|
||||
AVP_TYPE_OCTETSTRING /* base type of data */
|
||||
};
|
||||
|
||||
CHECK_dict_new( DICT_AVP, &data , Address_type, NULL);
|
||||
}
|
||||
|
||||
/* Destination-Host - Base Protocol */
|
||||
|
||||
/* Destination-Realm - Base Protocol */
|
||||
|
||||
/* MIP-Home-Agent-Host - RFC 4004 */
|
||||
{
|
||||
/*
|
||||
The MIP-Home-Agent-Host AVP (AVP Code 348) is of type Grouped and
|
||||
contains the identity of the assigned Home Agent. If the MIP-Home-
|
||||
Agent-Host AVP is present in the AMR, the AAAH MUST copy it into the
|
||||
HAR.
|
||||
|
||||
MIP-Home-Agent-Host ::= < AVP Header: 348 >
|
||||
{ Destination-Realm }
|
||||
{ Destination-Host }
|
||||
* [ AVP ]
|
||||
*/
|
||||
|
||||
struct dict_object * avp;
|
||||
struct dict_avp_data data = {
|
||||
348, /* Code */
|
||||
0, /* Vendor */
|
||||
"MIP-Home-Agent-Host", /* Name */
|
||||
AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, /* Fixed flags */
|
||||
AVP_FLAG_MANDATORY, /* Fixed flag values */
|
||||
AVP_TYPE_GROUPED /* base type of data */
|
||||
};
|
||||
|
||||
struct local_rules_definition rules[] =
|
||||
{ { "Destination-Realm", RULE_REQUIRED, -1, 1 }
|
||||
,{ "Destination-Host", RULE_REQUIRED, -1, 1 }
|
||||
};
|
||||
|
||||
CHECK_dict_new( DICT_AVP, &data , NULL, &avp);
|
||||
PARSE_loc_rules( rules, avp );
|
||||
}
|
||||
|
||||
/* MIP6-Home-Link-Prefix */
|
||||
{
|
||||
/*
|
||||
|
||||
*/
|
||||
|
||||
struct dict_avp_data data = {
|
||||
125, /* Code */
|
||||
0, /* Vendor */
|
||||
"MIP6-Home-Link-Prefix", /* Name */
|
||||
AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, /* Fixed flags */
|
||||
AVP_FLAG_MANDATORY, /* Fixed flag values */
|
||||
AVP_TYPE_OCTETSTRING /* base type of data */
|
||||
};
|
||||
|
||||
CHECK_dict_new( DICT_AVP, &data , NULL, NULL);
|
||||
}
|
||||
|
||||
/* MIP6-Agent-Info */
|
||||
{
|
||||
/*
|
||||
|
||||
*/
|
||||
struct dict_object * avp;
|
||||
struct dict_avp_data data = {
|
||||
486, /* Code */
|
||||
0, /* Vendor */
|
||||
"MIP6-Agent-Info", /* Name */
|
||||
AVP_FLAG_VENDOR | AVP_FLAG_MANDATORY, /* Fixed flags */
|
||||
AVP_FLAG_MANDATORY, /* Fixed flag values */
|
||||
AVP_TYPE_GROUPED /* base type of data */
|
||||
};
|
||||
|
||||
struct local_rules_definition rules[] =
|
||||
{ { "MIP-Home-Agent-Address", RULE_OPTIONAL, -1, 2 }
|
||||
,{ "MIP-Home-Agent-Host", RULE_OPTIONAL, -1, 1 }
|
||||
,{ "MIP6-Home-Link-Prefix", RULE_OPTIONAL, -1, 1 }
|
||||
};
|
||||
|
||||
CHECK_dict_new( DICT_AVP, &data , NULL, &avp);
|
||||
PARSE_loc_rules( rules, avp );
|
||||
}
|
||||
}
|
||||
|
||||
LOG_D( "Dictionary Extension 'MIPv6 NAS-to-HAAA Interaction' initialized");
|
||||
return 0;
|
||||
}
|
||||
EXTENSION_ENTRY("dict_nas_mipv6", dict_nas_mipv6_init);
|
|
@ -223,6 +223,9 @@ TLS_CA = "@prefix@/etc/freeDiameter/cacert.pem";
|
|||
# 4 - full - display the complete information on a single long line
|
||||
# 8 - tree - display the complete information in an easier to read format spanning several lines.
|
||||
|
||||
LoadExtension = "dbg_msg_dumps.fdx" : "0x8888";
|
||||
LoadExtension = "dict_nas_mipv6.fdx";
|
||||
|
||||
|
||||
##############################################################
|
||||
## Peers configuration
|
||||
|
|
|
@ -223,6 +223,9 @@ TLS_CA = "@prefix@/etc/freeDiameter/cacert.pem";
|
|||
# 4 - full - display the complete information on a single long line
|
||||
# 8 - tree - display the complete information in an easier to read format spanning several lines.
|
||||
|
||||
LoadExtension = "dbg_msg_dumps.fdx" : "0x8888";
|
||||
LoadExtension = "dict_nas_mipv6.fdx";
|
||||
|
||||
|
||||
##############################################################
|
||||
## Peers configuration
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
HSS :
|
||||
{
|
||||
#FD_CONF_PATH : "@prefix@/etc/freeDiameter/hss.conf",
|
||||
FD_CONF_PATH : "@prefix@/etc/freeDiameter/hss.conf",
|
||||
NETWORK :
|
||||
{
|
||||
S6A_ADDR : "10.1.35.214"
|
||||
|
@ -21,7 +21,7 @@
|
|||
|
||||
MME :
|
||||
{
|
||||
#FD_CONF_PATH : "@prefix@/etc/freeDiameter/mme.conf",
|
||||
FD_CONF_PATH : "@prefix@/etc/freeDiameter/mme.conf",
|
||||
|
||||
DEFAULT_PAGING_DRX : "v64",
|
||||
#RELATIVE_CAPACITY : 255,
|
||||
|
|
Loading…
Reference in New Issue