Mercurial > hg > freeDiameter
changeset 897:d8d0772586ad
Use correct default port for outgoing connections even when local port is not the default one
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Fri, 30 Nov 2012 23:14:34 +0100 |
| parents | b13359ace625 |
| children | c2ecce3fb928 |
| files | include/freeDiameter/libfdproto.h libfdcore/config.c libfdcore/p_cnx.c |
| diffstat | 3 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/include/freeDiameter/libfdproto.h Fri Nov 30 23:04:16 2012 +0100 +++ b/include/freeDiameter/libfdproto.h Fri Nov 30 23:14:34 2012 +0100 @@ -79,6 +79,15 @@ #include <libgen.h> /* for basename if --dbg_file is specified */ #endif /* DEBUG */ + +/*============================================================*/ +/* CONSTANTS */ +/*============================================================*/ + +#define DIAMETER_PORT 3868 +#define DIAMETER_SECURE_PORT 3869 + + /*============================================================*/ /* INIT */ /*============================================================*/
--- a/libfdcore/config.c Fri Nov 30 23:04:16 2012 +0100 +++ b/libfdcore/config.c Fri Nov 30 23:14:34 2012 +0100 @@ -55,8 +55,8 @@ fd_g_config->cnf_timer_tc = 30; fd_g_config->cnf_timer_tw = 30; - fd_g_config->cnf_port = 3868; - fd_g_config->cnf_port_tls = 3869; + fd_g_config->cnf_port = DIAMETER_PORT; + fd_g_config->cnf_port_tls = DIAMETER_SECURE_PORT; fd_g_config->cnf_sctp_str = 30; fd_g_config->cnf_dispthr = 4; fd_list_init(&fd_g_config->cnf_endpoints, NULL);
--- a/libfdcore/p_cnx.c Fri Nov 30 23:04:16 2012 +0100 +++ b/libfdcore/p_cnx.c Fri Nov 30 23:14:34 2012 +0100 @@ -137,10 +137,10 @@ /* Prepare the parameters */ if ((peer->p_hdr.info.config.pic_flags.sec != PI_SEC_DEFAULT) || (fd_g_config->cnf_flags.tls_alg)) { dotls_immediate = 0; - port_no = htons(peer->p_hdr.info.config.pic_port ?: fd_g_config->cnf_port); + port_no = htons(peer->p_hdr.info.config.pic_port ?: DIAMETER_PORT); } else { dotls_immediate = 1; - port_no = htons(peer->p_hdr.info.config.pic_port ?: fd_g_config->cnf_port_tls); + port_no = htons(peer->p_hdr.info.config.pic_port ?: DIAMETER_SECURE_PORT); } last_prio = &peer->p_connparams;