sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
211 discussions

git:master: permissions: set peer tag avp for allow_address_group()
by Daniel-Constantin Mierla 06 Jan '14

06 Jan '14

Module: sip-router Branch: master Commit: 0c67042fa629ee4744cfc31a15e571b7340b0881 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c67042… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 6 19:48:54 2014 +0100 permissions: set peer tag avp for allow_address_group() - also for allow_source_address_group() - reported by Kelvin Chua --- modules/permissions/hash.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/permissions/hash.c b/modules/permissions/hash.c index 3a16581..b8daeb1 100644 --- a/modules/permissions/hash.c +++ b/modules/permissions/hash.c @@ -486,6 +486,7 @@ int find_group_in_addr_hash_table(struct addr_list** table, { struct addr_list *np; str addr_str; + avp_value_t val; addr_str.s = (char*)addr->u.addr; addr_str.len = 4; @@ -493,6 +494,15 @@ int find_group_in_addr_hash_table(struct addr_list** table, for (np = table[perm_hash(addr_str)]; np != NULL; np = np->next) { if (((np->port == 0) || (np->port == port)) && ip_addr_cmp(&np->addr, addr)) { + + if (tag_avp.n && np->tag.s) { + val.s = np->tag; + if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + } + return np->grp; } } @@ -710,6 +720,7 @@ int find_group_in_subnet_table(struct subnet* table, ip_addr_t *addr, unsigned int port) { unsigned int count, i; + avp_value_t val; count = table[PERM_MAX_SUBNETS].grp; @@ -717,7 +728,16 @@ int find_group_in_subnet_table(struct subnet* table, while (i < count) { if ( ((table[i].port == port) || (table[i].port == 0)) && (ip_addr_match_net(addr, &table[i].subnet, table[i].mask)==0)) + { + if (tag_avp.n && np->tag.s) { + val.s = np->tag; + if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + } return table[i].grp; + } i++; }

1 0

Dialog timeout and in-dialog requests
by Federico Cabiddu 06 Jan '14

06 Jan '14

Hi, we are using the dialog module to limit the duration of users' calls. We recently discovered (well, it's stated in the module doc) that each subsequent in-dialog request resets the dialog timeout. I can understand that this behavior can be useful in some cases, but in our is causing the call duration limitation to not work. I prepared a simple patch to introduce a new parameter to make this behavior configurable (per module). I would like to have it configurable per dialog, via means of an AVP, but this would have implications on the dialog save/restore mechanism and on the db schema, so for the moment I left it simple. Regards, Federico Cabiddu

3 5

Kamailio World 2014 - Call for Speakers
by Daniel-Constantin Mierla 06 Jan '14

06 Jan '14

Hello, I would like to announce that call for speakers at Kamailio World 2014 is now open. Those interested in presenting at the event have to submit the proposal via the web form at: - http://conference.kamailio.com/k02/call-for-speakers/ Have a great 2014, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:4.1: modules/websocket: added OpenSSL licensing exception
by Victor Seva 06 Jan '14

06 Jan '14

Module: sip-router Branch: 4.1 Commit: 71463b06efa2997950aaf1ef088076258fe8a03a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71463b0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sun Jan 5 18:16:04 2014 +0000 modules/websocket: added OpenSSL licensing exception (cherry picked from commit 661d7d3a6231713861a8a1236dd7d783113c2890) --- modules/websocket/config.c | 5 +++++ modules/websocket/config.h | 5 +++++ modules/websocket/ws_conn.c | 5 +++++ modules/websocket/ws_conn.h | 5 +++++ modules/websocket/ws_frame.c | 5 +++++ modules/websocket/ws_frame.h | 5 +++++ modules/websocket/ws_handshake.c | 5 +++++ modules/websocket/ws_handshake.h | 5 +++++ modules/websocket/ws_mod.c | 5 +++++ modules/websocket/ws_mod.h | 5 +++++ 10 files changed, 50 insertions(+), 0 deletions(-) diff --git a/modules/websocket/config.c b/modules/websocket/config.c index e6e6a50..a0607a7 100644 --- a/modules/websocket/config.c +++ b/modules/websocket/config.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/websocket/config.h b/modules/websocket/config.h index 690649e..64ed5bd 100644 --- a/modules/websocket/config.h +++ b/modules/websocket/config.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 613f14e..9f2b672 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../locking.h" diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h index d022d0e..0c7d639 100644 --- a/modules/websocket/ws_conn.h +++ b/modules/websocket/ws_conn.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_CONN_H diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index a3a4cef..3ccb4d1 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <limits.h> diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index 1210c6c..815ec65 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_FRAME_H diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index c4e3143..05332e4 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <openssl/sha.h> diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h index e7ff8e0..5c69fa2 100644 --- a/modules/websocket/ws_handshake.h +++ b/modules/websocket/ws_handshake.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_HANDSHAKE_H diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index ec5e07c..8932769 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../dprint.h" diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index 819d3ea..8db9fef 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_MOD_H

1 0

git:4.1: modules/auth_ephemeral: added OpenSSL licensing exception
by Victor Seva 06 Jan '14

06 Jan '14

Module: sip-router Branch: 4.1 Commit: fb364e0b29ce388574a61ebc4a428c559c411a2a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb364e0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sun Jan 5 18:15:07 2014 +0000 modules/auth_ephemeral: added OpenSSL licensing exception (cherry picked from commit 99960be1d55df2ba4ca596c42c8e78e36dad3cf1) --- modules/auth_ephemeral/autheph_mod.c | 5 +++++ modules/auth_ephemeral/autheph_mod.h | 5 +++++ modules/auth_ephemeral/authorize.c | 5 +++++ modules/auth_ephemeral/authorize.h | 5 +++++ modules/auth_ephemeral/checks.c | 5 +++++ modules/auth_ephemeral/checks.h | 5 +++++ 6 files changed, 30 insertions(+), 0 deletions(-) diff --git a/modules/auth_ephemeral/autheph_mod.c b/modules/auth_ephemeral/autheph_mod.c index 8e72fba..fb59e56 100644 --- a/modules/auth_ephemeral/autheph_mod.c +++ b/modules/auth_ephemeral/autheph_mod.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../dprint.h" #include "../../locking.h" diff --git a/modules/auth_ephemeral/autheph_mod.h b/modules/auth_ephemeral/autheph_mod.h index 62bc808..3ad2356 100644 --- a/modules/auth_ephemeral/autheph_mod.h +++ b/modules/auth_ephemeral/autheph_mod.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef AUTHEPH_MOD_H #define AUTHEPH_MOD_H diff --git a/modules/auth_ephemeral/authorize.c b/modules/auth_ephemeral/authorize.c index a09a9f8..454ecac 100644 --- a/modules/auth_ephemeral/authorize.c +++ b/modules/auth_ephemeral/authorize.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <openssl/hmac.h> #include <openssl/sha.h> diff --git a/modules/auth_ephemeral/authorize.h b/modules/auth_ephemeral/authorize.h index 8ce9331..0a7bb91 100644 --- a/modules/auth_ephemeral/authorize.h +++ b/modules/auth_ephemeral/authorize.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef AUTHORIZE_H #define AUTHORIZE_H diff --git a/modules/auth_ephemeral/checks.c b/modules/auth_ephemeral/checks.c index 447e997..dacec11 100644 --- a/modules/auth_ephemeral/checks.c +++ b/modules/auth_ephemeral/checks.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../dprint.h" #include "../../mod_fix.h" diff --git a/modules/auth_ephemeral/checks.h b/modules/auth_ephemeral/checks.h index 27cb7fe..ee23c7e 100644 --- a/modules/auth_ephemeral/checks.h +++ b/modules/auth_ephemeral/checks.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef CHECKS_H #define CHECKS_H

1 0

git:4.1: modules/outbound: added OpenSSL licensing exception
by Victor Seva 06 Jan '14

06 Jan '14

Module: sip-router Branch: 4.1 Commit: bdb3a86c4453790a91de5aa2320de5b5bb26ad5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bdb3a86… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sun Jan 5 18:15:33 2014 +0000 modules/outbound: added OpenSSL licensing exception (cherry picked from commit 6741c47ad75806355cd7564d419df56acc68987b) --- modules/outbound/api.h | 5 +++++ modules/outbound/config.c | 5 +++++ modules/outbound/config.h | 5 +++++ modules/outbound/ob_mod.c | 5 +++++ 4 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/outbound/api.h b/modules/outbound/api.h index fc0e8b9..facc1db 100644 --- a/modules/outbound/api.h +++ b/modules/outbound/api.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef OB_API_H diff --git a/modules/outbound/config.c b/modules/outbound/config.c index bcb6fbb..5b291f4 100644 --- a/modules/outbound/config.c +++ b/modules/outbound/config.c @@ -17,6 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/outbound/config.h b/modules/outbound/config.h index 0410ff5..cf6796e 100644 --- a/modules/outbound/config.h +++ b/modules/outbound/config.h @@ -17,6 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 9902e91..038c5fa 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <openssl/hmac.h> #include <openssl/rand.h>

1 0

[tracker] Comment added: presence_dialoginfo -> force_single doesn't sent most relevant xml
by sip-router 06 Jan '14

06 Jan '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#341 - presence_dialoginfo -> force_single doesn't sent most relevant xml User who did this - Devs Voicenter (voicenter) ---------- any update if the last version of patch is ok and if it would be included in next version? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=341#comment1263 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: modules/websocket: added OpenSSL licensing exception
by Peter Dunkley 05 Jan '14

05 Jan '14

Module: sip-router Branch: master Commit: 661d7d3a6231713861a8a1236dd7d783113c2890 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=661d7d3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jan 5 18:16:04 2014 +0000 modules/websocket: added OpenSSL licensing exception --- modules/websocket/config.c | 5 +++++ modules/websocket/config.h | 5 +++++ modules/websocket/ws_conn.c | 5 +++++ modules/websocket/ws_conn.h | 5 +++++ modules/websocket/ws_frame.c | 5 +++++ modules/websocket/ws_frame.h | 5 +++++ modules/websocket/ws_handshake.c | 5 +++++ modules/websocket/ws_handshake.h | 5 +++++ modules/websocket/ws_mod.c | 5 +++++ modules/websocket/ws_mod.h | 5 +++++ 10 files changed, 50 insertions(+), 0 deletions(-) diff --git a/modules/websocket/config.c b/modules/websocket/config.c index e6e6a50..a0607a7 100644 --- a/modules/websocket/config.c +++ b/modules/websocket/config.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/websocket/config.h b/modules/websocket/config.h index 690649e..64ed5bd 100644 --- a/modules/websocket/config.h +++ b/modules/websocket/config.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 613f14e..9f2b672 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../locking.h" diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h index d022d0e..0c7d639 100644 --- a/modules/websocket/ws_conn.h +++ b/modules/websocket/ws_conn.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_CONN_H diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index a3a4cef..3ccb4d1 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <limits.h> diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index 1210c6c..815ec65 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_FRAME_H diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index c4e3143..05332e4 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <openssl/sha.h> diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h index e7ff8e0..5c69fa2 100644 --- a/modules/websocket/ws_handshake.h +++ b/modules/websocket/ws_handshake.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_HANDSHAKE_H diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index ec5e07c..8932769 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../dprint.h" diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index 819d3ea..8db9fef 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef _WS_MOD_H

1 0

git:master: modules/outbound: added OpenSSL licensing exception
by Peter Dunkley 05 Jan '14

05 Jan '14

Module: sip-router Branch: master Commit: 6741c47ad75806355cd7564d419df56acc68987b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6741c47… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jan 5 18:15:33 2014 +0000 modules/outbound: added OpenSSL licensing exception --- modules/outbound/api.h | 5 +++++ modules/outbound/config.c | 5 +++++ modules/outbound/config.h | 5 +++++ modules/outbound/ob_mod.c | 5 +++++ 4 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/outbound/api.h b/modules/outbound/api.h index fc0e8b9..facc1db 100644 --- a/modules/outbound/api.h +++ b/modules/outbound/api.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef OB_API_H diff --git a/modules/outbound/config.c b/modules/outbound/config.c index bcb6fbb..5b291f4 100644 --- a/modules/outbound/config.c +++ b/modules/outbound/config.c @@ -17,6 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/outbound/config.h b/modules/outbound/config.h index 0410ff5..cf6796e 100644 --- a/modules/outbound/config.h +++ b/modules/outbound/config.h @@ -17,6 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ /*! diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 9902e91..038c5fa 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <openssl/hmac.h> #include <openssl/rand.h>

1 0

git:master: modules/auth_ephemeral: added OpenSSL licensing exception
by Peter Dunkley 05 Jan '14

05 Jan '14

Module: sip-router Branch: master Commit: 99960be1d55df2ba4ca596c42c8e78e36dad3cf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99960be… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jan 5 18:15:07 2014 +0000 modules/auth_ephemeral: added OpenSSL licensing exception --- modules/auth_ephemeral/autheph_mod.c | 5 +++++ modules/auth_ephemeral/autheph_mod.h | 5 +++++ modules/auth_ephemeral/authorize.c | 5 +++++ modules/auth_ephemeral/authorize.h | 5 +++++ modules/auth_ephemeral/checks.c | 5 +++++ modules/auth_ephemeral/checks.h | 5 +++++ 6 files changed, 30 insertions(+), 0 deletions(-) diff --git a/modules/auth_ephemeral/autheph_mod.c b/modules/auth_ephemeral/autheph_mod.c index 8e72fba..fb59e56 100644 --- a/modules/auth_ephemeral/autheph_mod.c +++ b/modules/auth_ephemeral/autheph_mod.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../dprint.h" #include "../../locking.h" diff --git a/modules/auth_ephemeral/autheph_mod.h b/modules/auth_ephemeral/autheph_mod.h index 62bc808..3ad2356 100644 --- a/modules/auth_ephemeral/autheph_mod.h +++ b/modules/auth_ephemeral/autheph_mod.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef AUTHEPH_MOD_H #define AUTHEPH_MOD_H diff --git a/modules/auth_ephemeral/authorize.c b/modules/auth_ephemeral/authorize.c index a09a9f8..454ecac 100644 --- a/modules/auth_ephemeral/authorize.c +++ b/modules/auth_ephemeral/authorize.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include <openssl/hmac.h> #include <openssl/sha.h> diff --git a/modules/auth_ephemeral/authorize.h b/modules/auth_ephemeral/authorize.h index 8ce9331..0a7bb91 100644 --- a/modules/auth_ephemeral/authorize.h +++ b/modules/auth_ephemeral/authorize.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef AUTHORIZE_H #define AUTHORIZE_H diff --git a/modules/auth_ephemeral/checks.c b/modules/auth_ephemeral/checks.c index 447e997..dacec11 100644 --- a/modules/auth_ephemeral/checks.c +++ b/modules/auth_ephemeral/checks.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #include "../../dprint.h" #include "../../mod_fix.h" diff --git a/modules/auth_ephemeral/checks.h b/modules/auth_ephemeral/checks.h index 27cb7fe..ee23c7e 100644 --- a/modules/auth_ephemeral/checks.h +++ b/modules/auth_ephemeral/checks.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */ #ifndef CHECKS_H #define CHECKS_H

1 0

← Newer
1
...
15
16
17
18
19
20
21
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014