sr-dev July 2012

sr-dev@lists.kamailio.org

24 participants
173 discussions

git:pd/websocket: Merge branch 'master' into websocket
by Peter Dunkley 04 Jul '12

04 Jul '12

Module: sip-router Branch: pd/websocket Commit: 1792586578d9680d45d52af37ddf2786b8b30ca8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1792586… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 18:08:02 2012 +0100 Merge branch 'master' into websocket * master: modules/lcr: Fixed to/from_gw tests when proto parameter is 0 (ANY) cdp_avp: added README file CDP: … [View More]

1 0

git:pd/websocket: modules_k/pv: Added missing break;s
by Peter Dunkley 04 Jul '12

04 Jul '12

Module: sip-router Branch: pd/websocket Commit: d1d9d63984fed14fc2912c31e7abc30e0500bbb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1d9d63… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 16:13:40 2012 +0100 modules_k/pv: Added missing break;s --- modules_k/pv/pv_core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/… [View More]

1 0

git:pd/websocket: modules/websocket: Fixes to WS and WSS message sending
by Peter Dunkley 04 Jul '12

04 Jul '12

Module: sip-router Branch: pd/websocket Commit: 86362e52c17858bfb81bda33cc6ae46e0f75517f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86362e5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 16:15:29 2012 +0100 modules/websocket: Fixes to WS and WSS message sending --- modules/websocket/ws_frame.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) … [View More]

1 0

git:pd/websocket: core: Fixes for WSS (secure WebSocket) transport and Via: s
by Peter Dunkley 04 Jul '12

04 Jul '12

Module: sip-router Branch: pd/websocket Commit: 1ccd1f68cff759a2a54b8f441ca8c53647f845a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ccd1f6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 16:12:53 2012 +0100 core: Fixes for WSS (secure WebSocket) transport and Via:s --- forward.c | 6 +- msg_translator.c | 238 ++++++++++++++++++++++++++++++++… [View More]

1 0

git:3.3: modules/lcr: Fixed to/from_gw tests when proto parameter is 0 (ANY )
by admin＠sip-router.org 04 Jul '12

04 Jul '12

Module: sip-router Branch: 3.3 Commit: 948df15d215e7d12ad404dec7dfdbb41d58bea3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=948df15… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jul 4 17:15:43 2012 +0300 modules/lcr: Fixed to/from_gw tests when proto parameter is 0 (ANY) - Also, updated README regarding handling of NULL value in lcr_gw transport column. (cherry picked from commit … [View More]1382c30da7ffd8831479affafde4d8e038a41240) --- modules/lcr/README | 4 ++-- modules/lcr/doc/lcr_admin.xml | 2 +- modules/lcr/lcr_mod.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 3676a55..178f265 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -268,8 +268,8 @@ Chapter 1. Admin Guide scheme, IP address, port, and transport protocol. Valid URI scheme values are NULL = sip, 1 = sip and 2 = sips. Currently - valid transport protocol values are NULL = none, 1 = udp, 2 = tcp, 3 = - tls, and 4 = sctp. + valid transport protocol values are NULL and 0 = none, 1 = udp, 2 = + tcp, 3 = tls, and 4 = sctp. As a side effect of gateway selection, selected gateway's tag and flags (that may contain information about the gateway and its capabilities) diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 39aa980..d498904 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -103,7 +103,7 @@ </para> <para> Valid URI scheme values are NULL = sip, 1 = sip and 2 - = sips. Currently valid transport protocol values are NULL = + = sips. Currently valid transport protocol values are NULL and 0 = none, 1 = udp, 2 = tcp, 3 = tls, and 4 = sctp. </para> <para> diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 370e973..3bdcc98 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2309,8 +2309,7 @@ static int do_from_gw(struct sip_msg* _m, unsigned int lcr_id, /* Store tag and flags and return result */ if ((res != NULL) && - ((res->transport == transport) || - ((res->transport == PROTO_NONE) && (transport == PROTO_UDP)))) { + ((transport == PROTO_NONE) || (res->transport == transport))) { LM_DBG("request game from gw\n"); if (tag_avp_param) { val.s.s = res->tag; @@ -2499,8 +2498,7 @@ static int do_to_gw(struct sip_msg* _m, unsigned int lcr_id, /* Return result */ if ((res != NULL) && - ((res->transport == transport) || - ((transport == PROTO_NONE) && (res->transport == PROTO_UDP)))) { + ((transport == PROTO_NONE) || (res->transport == transport))) { LM_DBG("request goes to gw\n"); return 1; } else { [View Less]

1 0

git:master: modules/lcr: Fixed to/from_gw tests when proto parameter is 0 ( ANY)
by admin＠sip-router.org 04 Jul '12

04 Jul '12

Module: sip-router Branch: master Commit: 1382c30da7ffd8831479affafde4d8e038a41240 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1382c30… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jul 4 17:15:43 2012 +0300 modules/lcr: Fixed to/from_gw tests when proto parameter is 0 (ANY) - Also, updated README regarding handling of NULL value in lcr_gw transport column. --- modules/lcr/README | … [View More] 4 ++-- modules/lcr/doc/lcr_admin.xml | 2 +- modules/lcr/lcr_mod.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 3676a55..178f265 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -268,8 +268,8 @@ Chapter 1. Admin Guide scheme, IP address, port, and transport protocol. Valid URI scheme values are NULL = sip, 1 = sip and 2 = sips. Currently - valid transport protocol values are NULL = none, 1 = udp, 2 = tcp, 3 = - tls, and 4 = sctp. + valid transport protocol values are NULL and 0 = none, 1 = udp, 2 = + tcp, 3 = tls, and 4 = sctp. As a side effect of gateway selection, selected gateway's tag and flags (that may contain information about the gateway and its capabilities) diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 39aa980..d498904 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -103,7 +103,7 @@ </para> <para> Valid URI scheme values are NULL = sip, 1 = sip and 2 - = sips. Currently valid transport protocol values are NULL = + = sips. Currently valid transport protocol values are NULL and 0 = none, 1 = udp, 2 = tcp, 3 = tls, and 4 = sctp. </para> <para> diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 370e973..3bdcc98 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2309,8 +2309,7 @@ static int do_from_gw(struct sip_msg* _m, unsigned int lcr_id, /* Store tag and flags and return result */ if ((res != NULL) && - ((res->transport == transport) || - ((res->transport == PROTO_NONE) && (transport == PROTO_UDP)))) { + ((transport == PROTO_NONE) || (res->transport == transport))) { LM_DBG("request game from gw\n"); if (tag_avp_param) { val.s.s = res->tag; @@ -2499,8 +2498,7 @@ static int do_to_gw(struct sip_msg* _m, unsigned int lcr_id, /* Return result */ if ((res != NULL) && - ((res->transport == transport) || - ((transport == PROTO_NONE) && (res->transport == PROTO_UDP)))) { + ((transport == PROTO_NONE) || (res->transport == transport))) { LM_DBG("request goes to gw\n"); return 1; } else { [View Less]

1 0

doubt about from_gw() with proto=ANY
by Andrew Pogrebennyk 04 Jul '12

04 Jul '12

Hello, I have a few gateways with lcr_gw.transport = 1|2|3 The point is that transport is always filled it with some not NULL value. In config script I do from_any_gw($si, 0). Kamailio version is 3.3. According to http://kamailio.org/docs/modules/3.3.x/modules/lcr.html#id2512701 : 0 = ANY so it should match gateway with this IP address no matter what the transport is. But in reality that's not what the lcr_mod.c does: /* Store tag and flags and return result */ if ((res != NULL) … [View More]

2 3

usrloc concurrency
by Alex Balashov 04 Jul '12

04 Jul '12

Does anyone know of any issues running usrloc with DB backing ('location') in a multi-master DB-replicated environment? I am referring to plain usrloc, not p_usrloc. I have such an environment set up with db_mode = 1 (immediate write-through) and have run into a problem where Kamailio occasionally stops writing to the location table for no apparent reason. I am wondering if this is because another Kamailio instance bound to the secondary replica is performing a DB sync as well, and at … [View More]

2 1

git:pd/websocket: modules/websocket and pkg/kamailio/fedora: Added websocket module documentation
by Peter Dunkley 03 Jul '12

03 Jul '12

Module: sip-router Branch: pd/websocket Commit: c39580925bebdb6506e106295119fb72f861e76f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c395809… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jul 3 23:59:22 2012 +0100 modules/websocket and pkg/kamailio/fedora: Added websocket module documentation --- modules/websocket/README | 462 ++++++++++++++++++… [View More]

1 0

git:pd/websocket: pkg/kamailio/(centos|fedora): Tweaked .spec and . appl files to add WebSocket support
by Peter Dunkley 03 Jul '12

03 Jul '12

Module: sip-router Branch: pd/websocket Commit: 6d751215160cddb96dd16b33bd668d573a61b3d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d75121… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jul 3 16:57:50 2012 +0100 pkg/kamailio/(centos|fedora): Tweaked .spec and .appl files to add WebSocket support --- pkg/kamailio/centos/6/kamailio-build.appl | 8 +++++--- … [View More]pkg/kamailio/centos/6/kamailio.appl | 3 ++- pkg/kamailio/fedora/16/kamailio-build.appl | 8 +++++--- pkg/kamailio/fedora/16/kamailio.appl | 3 ++- pkg/kamailio/fedora/16/kamailio.spec | 16 ++++++++-------- pkg/kamailio/fedora/17/kamailio-build.appl | 8 +++++--- pkg/kamailio/fedora/17/kamailio.appl | 3 ++- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio-build.appl b/pkg/kamailio/centos/6/kamailio-build.appl index d3faee1..d4b23b5 100644 --- a/pkg/kamailio/centos/6/kamailio-build.appl +++ b/pkg/kamailio/centos/6/kamailio-build.appl @@ -8,18 +8,20 @@ hardware: memory: 1024 partitions: "/": - size: 4 + size: 6 packages: - @core - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp - flex # kamailio - - gcc # kamailio + - gcc + - git - glib2-devel # kamailio-purple - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple + - libunistring-devel # kamailio-websocket - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - lua-devel # kamailio-lua - make # kamailio @@ -27,7 +29,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls + - openssl-devel # kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/centos/6/kamailio.appl b/pkg/kamailio/centos/6/kamailio.appl index 2e6980d..5462ead 100644 --- a/pkg/kamailio/centos/6/kamailio.appl +++ b/pkg/kamailio/centos/6/kamailio.appl @@ -17,12 +17,13 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple + - libunistring # kamailio-websocket - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - mod_perl # kamailio-perl - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls + - openssl # kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl index 1193dc3..141375a 100644 --- a/pkg/kamailio/fedora/16/kamailio-build.appl +++ b/pkg/kamailio/fedora/16/kamailio-build.appl @@ -8,7 +8,7 @@ hardware: memory: 1024 partitions: "/": - size: 4 + size: 6 packages: - @core - bison # kamailio @@ -16,7 +16,8 @@ packages: - expat-devel # kamailio-xmpp - flex # kamailio - GeoIP-devel # kamailio-GeoIP - - gcc # kamailio + - gcc + - git - glib-devel # kamailio-purple - hiredis-devel # kamailio-redis - json-c-devel # kamailio-json @@ -24,6 +25,7 @@ packages: - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple + - libunistring-devel # kamailio-websocket - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - lua-devel # kamailio-lua - make # kamailio @@ -32,7 +34,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls + - openssl-devel # kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl index f65ecd2..ec7ede0 100644 --- a/pkg/kamailio/fedora/16/kamailio.appl +++ b/pkg/kamailio/fedora/16/kamailio.appl @@ -21,13 +21,14 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple + - libunistring # kamailio-websocket - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls + - openssl # kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 95f13e4..675dbbb 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -351,15 +351,15 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ - klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kredis kjson kmono kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops"\ %else make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ - klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops" %endif @@ -373,8 +373,8 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ - klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kredis kjson kmono kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ @@ -388,8 +388,8 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ - klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops websocket" + klcr ksqlite kberkeley kwebsocket" \ + include_modules="xmlrpc xmlops" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl index 4b194d4..9b1c1ef 100644 --- a/pkg/kamailio/fedora/17/kamailio-build.appl +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -8,7 +8,7 @@ hardware: memory: 1024 partitions: "/": - size: 4 + size: 6 packages: - @core - bison # kamailio @@ -16,7 +16,8 @@ packages: - expat-devel # kamailio-xmpp - flex # kamailio - GeoIP-devel # kamailio-GeoIP - - gcc # kamailio + - gcc + - git - glib-devel # kamailio-purple - hiredis-devel # kamailio-redis - json-c-devel # kamailio-json @@ -24,6 +25,7 @@ packages: - libcurl-devel # kamailio-utils, kamailio-presence - libevent-devel # kamailio-json - libpurple-devel # kamailio-purple + - libunistring-devel # kamailio-websocket - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - lua-devel # kamailio-lua - make # kamailio @@ -32,7 +34,7 @@ packages: - mysql-devel # kamailio-mysql - net-snmp-devel # kamailio-snmpstats - openldap-devel # kamailio-ldap - - openssl-devel # kamailio-tls + - openssl-devel # kamailio-tls, kamailio-websocket - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl index e71964a..70a850d 100644 --- a/pkg/kamailio/fedora/17/kamailio.appl +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -21,13 +21,14 @@ packages: - libcurl # kamailio-utils, kamailio-presence - libevent # kamailio-json - libpurple # kamailio-purple + - libunistring # kamailio-websocket - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - - openssl # kamailio-tls + - openssl # kamailio-tls, kamailio-websocket - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr - perl-Authen-SASL # kamailio-perl - perl-LDAP # kamailio-perl [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2012