Mercurial > hg > freeDiameter
changeset 1280:3eeb564e7bea
Merge updates from Thomas (thanks\!)
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Sat, 03 Jan 2015 02:22:07 +0800 |
| parents | c748e2439a3a (diff) a1685a53fe97 (current diff) |
| children | ab6457399be2 |
| files | |
| diffstat | 15 files changed, 21 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Sep 12 14:47:38 2014 +0200 +++ b/CMakeLists.txt Sat Jan 03 02:22:07 2015 +0800 @@ -11,7 +11,7 @@ # Version of the source code SET(FD_PROJECT_VERSION_MAJOR 1) SET(FD_PROJECT_VERSION_MINOR 2) -SET(FD_PROJECT_VERSION_REV 0) +SET(FD_PROJECT_VERSION_REV 1) # Version of the API with the library SET(FD_PROJECT_VERSION_API 6)
--- a/contrib/debian/control Fri Sep 12 14:47:38 2014 +0200 +++ b/contrib/debian/control Sat Jan 03 02:22:07 2015 +0800 @@ -48,7 +48,7 @@ Architecture: any Section: contrib/debug Depends: ${misc:Depends}, freediameter-common (= ${binary:Version}) -Suggests: python, libmysqlclient16 +Suggests: python, libmysqlclient16 | libmysqlclient18 Description: freeDiameter debug tools. This package provides useful tools to help tracking problems in freeDiameter installation. For example, @@ -197,7 +197,7 @@ Package: freediameter-eap-server Architecture: any -Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4072 (= ${binary:Version}) +Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16 | libmysqlclient18, freediameter-dictionary-rfc4072 (= ${binary:Version}) Description: freeDiameter Diameter EAP server implementation. This freeDiameter extension implements a Diameter EAP server. It supports EAP-MD5 and EAP-TLS methods currently. @@ -212,7 +212,7 @@ Package: freediameter-sip-server Architecture: any -Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4740 (= ${binary:Version}) +Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16 | libmysqlclient18, freediameter-dictionary-rfc4740 (= ${binary:Version}) Description: freeDiameter Diameter SIP server implementation. This freeDiameter extension implements a prototype Diameter SIP server.
--- a/extensions/app_acct/acct_conf.y Fri Sep 12 14:47:38 2014 +0200 +++ b/extensions/app_acct/acct_conf.y Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/extensions/rt_redirect/redir_expiry.c Fri Sep 12 14:47:38 2014 +0200 +++ b/extensions/rt_redirect/redir_expiry.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2011, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/extensions/rt_redirect/redir_fwd.c Fri Sep 12 14:47:38 2014 +0200 +++ b/extensions/rt_redirect/redir_fwd.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/include/freeDiameter/libfdproto.h Fri Sep 12 14:47:38 2014 +0200 +++ b/include/freeDiameter/libfdproto.h Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/libfdcore/cnxctx.c Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdcore/cnxctx.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/libfdcore/config.c Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdcore/config.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/libfdcore/fdd.y Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdcore/fdd.y Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/libfdcore/messages.c Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdcore/messages.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/libfdcore/p_ce.c Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdcore/p_ce.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are * @@ -950,6 +950,9 @@ /* Do not send the ISI IPsec if we are using the new mechanism */ if ((isi == PI_SEC_NONE) && (! (peer->p_hdr.info.config.pic_flags.sec & PI_SEC_TLS_OLD))) isi = 0; + } else if (peer->p_hdr.info.runtime.pir_isi & PI_SEC_TLS_OLD) { + /* Seem some weird peers are sending the Inband-Security-Id AVP on the secure port... No harm */ + isi = PI_SEC_TLS_OLD; } /* Reply a CEA */
--- a/libfdcore/sctp.c Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdcore/sctp.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2015, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are * @@ -575,7 +575,7 @@ struct sctp_event event; - for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0]) - 1; i++) { + for (i = 0; i < (sizeof(events_I_want) / sizeof(events_I_want[0]) - 1); i++) { memset(&event, 0, sizeof(event)); event.se_type = events_I_want[i]; event.se_on = 1;
--- a/libfdproto/dictionary.c Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdproto/dictionary.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/libfdproto/dictionary_functions.c Fri Sep 12 14:47:38 2014 +0200 +++ b/libfdproto/dictionary_functions.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *
--- a/tests/testmesg.c Fri Sep 12 14:47:38 2014 +0200 +++ b/tests/testmesg.c Sat Jan 03 02:22:07 2015 +0800 @@ -2,7 +2,7 @@ * Software License Agreement (BSD License) * * Author: Sebastien Decugis <sdecugis@freediameter.net> * * * -* Copyright (c) 2013, WIDE Project and NICT * +* Copyright (c) 2014, WIDE Project and NICT * * All rights reserved. * * * * Redistribution and use of this software in source and binary forms, with or without modification, are *