sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: snmpstats Align transports to RFC 4780

by Olle E. Johansson

Module: sip-router Branch: master Commit: ac19c57490f2d7758fb0d66e5fc473dcd464d325 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac19c57… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Apr 4 21:57:31 2013 +0200 snmpstats Align transports to RFC 4780 --- modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB | 10 ++++++++-- modules/snmpstats/snmpstats_globals.h | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB b/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB index 86dd8d2..939a1a7 100644 --- a/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB +++ b/modules/snmpstats/mibs/KAMAILIO-SIP-COMMON-MIB @@ -331,8 +331,14 @@ KAMAILIO-SIP-COMMON-MIB DEFINITIONS ::= BEGIN transport protocol is currently not being used. The bits are assigned as follows: - - other(0), udp(1), tcp(2), sctp(3), tls(4)" + bit 0: a protocol other than those defined here + bit 1: User Datagram Protocol + bit 2: Transmission Control Protocol + bit 3: Stream Control Transmission Protocol + bit 4: Transport Layer Security Protocol over TCP + bit 5: Transport Layer Security Protocol over SCTP + bit 6: WebSocket transport + bit 7: WebSocket transport over HTTP/TLS (WSS) ::= { kamailioSIPPortEntry 4 } -- diff --git a/modules/snmpstats/snmpstats_globals.h b/modules/snmpstats/snmpstats_globals.h index 470c38f..431e907 100644 --- a/modules/snmpstats/snmpstats_globals.h +++ b/modules/snmpstats/snmpstats_globals.h @@ -64,6 +64,9 @@ #define TC_SIP_TRANSPORT_PROTOCOL_TCP (128>>2) #define TC_SIP_TRANSPORT_PROTOCOL_SCTP (128>>3) #define TC_SIP_TRANSPORT_PROTOCOL_TLS (128>>4) +#define TC_SIP_TRANSPORT_PROTOCOL_SCTP_TLS (128>>5) +#define TC_SIP_TRANSPORT_PROTOCOL_WS (128 >> 6) +#define TC_SIP_TRANSPORT_PROTOCOL_WSS (128 >> 7) #define TC_SIP_ENTITY_ROLE_OTHER (128 >> 0) #define TC_SIP_ENTITY_ROLE_USER_AGENT (128 >> 1) @@ -88,8 +91,9 @@ #define TC_TRANSPORT_PROTOCOL_TCP (128 >> 2) #define TC_TRANSPORT_PROTOCOL_SCTP (128 >> 3) #define TC_TRANSPORT_PROTOCOL_TLS (128 >> 4) -#define TC_TRANSPORT_PROTOCOL_WS (128 >> 5) -#define TC_TRANSPORT_PROTOCOL_WSS (128 >> 6) +#define TC_TRANSPORT_PROTOCOL_SCRTP_TLS (128 >> 5) +#define TC_TRANSPORT_PROTOCOL_WS (128 >> 6) +#define TC_TRANSPORT_PROTOCOL_WSS (128 >> 7) /* * Textual Conventions for BITS types - ends

11 years, 9 months

git:master: group Update README xml with section ID's

by Olle E. Johansson

Module: sip-router Branch: master Commit: 53579abc49fcb61ba7358d64e2d25bdabfe42afd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53579ab… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Wed Apr 3 22:17:27 2013 +0200 group Update README xml with section ID's --- modules/group/README | 15 ++++++++------- modules/group/doc/group_admin.xml | 30 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/modules/group/README b/modules/group/README index c2ce2a7..c0a27b1 100644 --- a/modules/group/README +++ b/modules/group/README @@ -56,7 +56,7 @@ Jan Janak 1.5. Set group_column parameter 1.6. Set use_domain parameter 1.7. Set re_table parameter - 1.8. Set reg_exp_column parameter + 1.8. Set re_exp_column parameter 1.9. Set re_gid_column parameter 1.10. Set multiple_gid parameter 1.11. is_user_in usage @@ -108,7 +108,8 @@ Chapter 1. Admin Guide groups they belong to. The module provides the possibility to check if a specific user belongs to a specific group. - There is no DB caching support, each check involving a DB query. + There is no DB caching support, which means that each check involves a + DB query. 1.2. Regular Expression based checking @@ -129,7 +130,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * A database module, like mysql, postgres or dbtext + * A database module, like db_mysql, db_postgres or db_text 2.2. External Libraries or Applications @@ -239,9 +240,9 @@ modparam("group", "re_table", "re_grp") Default value is "reg_exp". - Example 1.8. Set reg_exp_column parameter + Example 1.8. Set re_exp_column parameter ... -modparam("group", "reg_exp_column", "re") +modparam("group", "re_exp_column", "re") ... 3.9. re_gid_column (string) @@ -273,7 +274,7 @@ modparam("group", "multiple_gid", 0) 4.1. is_user_in(URI, group) 4.2. get_user_group(URI, AVP) -4.1. is_user_in(URI, group) +4.1. is_user_in(URI, group) This function is to be used for script group membership. The function returns true if username in the given URI is a member of the given @@ -300,7 +301,7 @@ if (is_user_in("Request-URI", "ld")) { }; ... -4.2. get_user_group(URI, AVP) +4.2. get_user_group(URI, AVP) This function is to be used for regular expression based group membership. The function returns true if username in the given URI diff --git a/modules/group/doc/group_admin.xml b/modules/group/doc/group_admin.xml index 7fd83fd..cc4177f 100644 --- a/modules/group/doc/group_admin.xml +++ b/modules/group/doc/group_admin.xml @@ -27,7 +27,7 @@ specific user belongs to a specific group. </para> <para> - There is no DB caching support, each check involving a DB query. + There is no DB caching support, which means that each check involves a DB query. </para> </section> <section> @@ -55,7 +55,7 @@ <itemizedlist> <listitem> <para> - A database module, like mysql, postgres or dbtext + A database module, like db_mysql, db_postgres or db_text </para> </listitem> </itemizedlist> @@ -79,7 +79,7 @@ <section> <title>Parameters</title> - <section> + <section id="group.p.db_url"> <title><varname>db_url</varname> (string)</title> <para> &url; of the database table to be used. @@ -100,7 +100,7 @@ modparam("group", "db_url", "&exampledb;") </example> </section> - <section> + <section id="group.p.table"> <title><varname>table</varname> (string)</title> <para> Name of the table holding strict definitions of groups and @@ -121,7 +121,7 @@ modparam("group", "table", "grp_table") </example> </section> - <section> + <section id="group.p.user_column"> <title><varname>user_column</varname> (string)</title> <para> Name of the <quote>table</quote> column holding usernames. @@ -141,7 +141,7 @@ modparam("group", "user_column", "user") </example> </section> - <section> + <section id="group.p.domain_column"> <title><varname>domain_column</varname> (string)</title> <para> Name of the <quote>table</quote> column holding domains. @@ -161,7 +161,7 @@ modparam("group", "domain_column", "realm") </example> </section> - <section> + <section id="group.p.group_column"> <title><varname>group_column</varname> (string)</title> <para> Name of the <quote>table</quote> column holding group names. @@ -181,7 +181,7 @@ modparam("group", "group_column", "grp") </example> </section> - <section> + <section id="group.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> If enabled (set to a non zero value) then the domain will be used also used @@ -203,7 +203,7 @@ modparam("group", "use_domain", 1) </example> </section> - <section> + <section id="group.p.re_table"> <title><varname>re_table</varname> (string)</title> <para> Name of the table holding definitions for regular-expression @@ -225,7 +225,7 @@ modparam("group", "re_table", "re_grp") </example> </section> - <section> + <section id="group.p.re_exp_column"> <title><varname>re_exp_column</varname> (string)</title> <para> Name of the <quote>re_table</quote> column holding the regular @@ -237,10 +237,10 @@ modparam("group", "re_table", "re_grp") </emphasis> </para> <example> - <title>Set <varname>reg_exp_column</varname> parameter</title> + <title>Set <varname>re_exp_column</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("group", "reg_exp_column", "re") +modparam("group", "re_exp_column", "re") ... </programlisting> </example> @@ -266,7 +266,7 @@ modparam("group", "re_gid_column", "grp_id") </example> </section> - <section> + <section id="group.p.multiple_gid"> <title><varname>multiple_gid</varname> (integer)</title> <para> If enabled (non zero value) the regular-expression matching will @@ -291,7 +291,7 @@ modparam("group", "multiple_gid", 0) <section> <title>Functions</title> - <section> + <section id="group.f.is_user_in"> <title> <function moreinfo="none">is_user_in(URI, group)</function> </title> @@ -346,7 +346,7 @@ if (is_user_in("Request-URI", "ld")) { </example> </section> - <section> + <section id="group.f.get_user_group"> <title> <function moreinfo="none">get_user_group(URI, AVP)</function> </title>

11 years, 9 months

git:master: modules/sipt: regenerate README

by Torrey Searle

Module: sip-router Branch: master Commit: 0f7821b1ab454e0b0a7ec49f76f1f63c65f12a90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f7821b… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Apr 4 17:08:39 2013 +0200 modules/sipt: regenerate README --- modules/sipt/README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/sipt/README b/modules/sipt/README index d8ad096..f655523 100644 --- a/modules/sipt/README +++ b/modules/sipt/README @@ -17,7 +17,7 @@ Torrey Searle 3. Functions 3.1. sipt_destination(destination, hops, nai) - 3.2. sipt_get_hop_count() + 3.2. sipt_get_hop_counter() List of Examples @@ -33,7 +33,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. sipt_destination(destination, hops, nai) - 3.2. sipt_get_hop_count() + 3.2. sipt_get_hop_counter() 1. Overview @@ -51,7 +51,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. sipt_destination(destination, hops, nai) - 3.2. sipt_get_hop_count() + 3.2. sipt_get_hop_counter() 3.1. sipt_destination(destination, hops, nai) @@ -68,7 +68,7 @@ $rU = "19495551234"; sipt_destination($rU, 31, 4); ... -3.2. sipt_get_hop_count() +3.2. sipt_get_hop_counter() Returns the value of the Hop Counter for the IAM message if it exists. Returns -1 if there isn't a hop counter.

11 years, 9 months

git:master: modules/sipt/doc: fix typo in method name

by Torrey Searle

Module: sip-router Branch: master Commit: 6cff96362ef9c2a675ff170f804cad08db2a1f87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6cff963… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Apr 4 17:06:31 2013 +0200 modules/sipt/doc: fix typo in method name --- modules/sipt/doc/sipt_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sipt/doc/sipt_admin.xml b/modules/sipt/doc/sipt_admin.xml index 4674161..d8e9fdd 100644 --- a/modules/sipt/doc/sipt_admin.xml +++ b/modules/sipt/doc/sipt_admin.xml @@ -57,7 +57,7 @@ sipt_destination($rU, 31, 4); </example> </section> <section> - <title><function moreinfo="none">sipt_get_hop_count()</function></title> + <title><function moreinfo="none">sipt_get_hop_counter()</function></title> <para> Returns the value of the Hop Counter for the IAM message if it exists. Returns -1 if there isn't a hop counter.

11 years, 9 months

git:master: modules/sipt: resolve a compiler warning on osx

by Torrey Searle

Module: sip-router Branch: master Commit: e09e20ad7524e2d1469187812b8920723481014f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e09e20a… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Apr 4 15:43:29 2013 +0200 modules/sipt: resolve a compiler warning on osx --- modules/sipt/ss7.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/sipt/ss7.h b/modules/sipt/ss7.h index ba7f36f..2599b80 100644 --- a/modules/sipt/ss7.h +++ b/modules/sipt/ss7.h @@ -24,6 +24,8 @@ * */ +#ifndef _SIPT_SS7_H_ +#define _SIPT_SS7_H_ /* ISUP messages */ #define ISUP_IAM 0x01 @@ -134,7 +136,9 @@ #define ISUP_PARM_DIVERSION_INFORMATION 0x36 #define ISUP_PARM_UUI 0x20 +#ifndef bool #define bool unsigned char +#endif /* ISUP Parameter Pseudo-type */ @@ -147,3 +151,4 @@ struct isup_parm_opt { int isup_get_hop_counter(unsigned char *buf, int len); int isup_update_destination(char * dest, int hops, int nai, unsigned char *buf, int len, unsigned char * obuf, int olen); +#endif

11 years, 9 months

"* - MODULES", "K - MODULES_K", and "S - MODULES_S"

by Peter Dunkley

Should the modules still be marked as *, K, and S on the http://kamailio.org/docs/modules/stable/ and http://kamailio.org/docs/modules/devel/ pages now that there is only one modules directory? Regards, Peter

11 years, 9 months

git:master: ims_auth: Log, which AVP could not be found.

by admin＠sip-router.org

Module: sip-router Branch: master Commit: 9dde9cb53367b75643c4f95f5aea2b7ce1d1f859 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9dde9cb… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Apr 4 12:06:37 2013 +0200 ims_auth: Log, which AVP could not be found. --- modules/ims_auth/cxdx_avp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_auth/cxdx_avp.c b/modules/ims_auth/cxdx_avp.c index 85f7771..12bcf29 100644 --- a/modules/ims_auth/cxdx_avp.c +++ b/modules/ims_auth/cxdx_avp.c @@ -136,7 +136,7 @@ static inline str cxdx_get_avp(AAAMessage *msg,int avp_code,int vendor_id, avp = cdpb.AAAFindMatchingAVP(msg,0,avp_code,vendor_id,0); if (avp==0){ - LM_INFO("%s: Failed finding avp\n",func); + LM_INFO("%s: Failed finding avp (avp_code = %d, vendor_id = %d)\n",func, avp_code, vendor_id); return r; } else

11 years, 9 months

git:master: modules/sipt: Update README in separate commit per best practices

by Torrey Searle

Module: sip-router Branch: master Commit: b523c774721afaa34f36dc278805736e04b3d27c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b523c77… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Apr 4 11:56:03 2013 +0200 modules/sipt: Update README in separate commit per best practices --- modules/sipt/README | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sipt/README b/modules/sipt/README index 4131079..d8ad096 100644 --- a/modules/sipt/README +++ b/modules/sipt/README @@ -70,12 +70,12 @@ sipt_destination($rU, 31, 4); 3.2. sipt_get_hop_count() - Returns the value of the Hop Coutner for the IAM message if it exists. + Returns the value of the Hop Counter for the IAM message if it exists. Returns -1 if there isn't a hop counter. Example 1.2. sipt_get_hop_counter() usage ... -# get the hop couter and update the Max-Forwards header if it exists +# get the hop counter and update the Max-Forwards header if it exists $avp(s:hop) = sipt_get_hop_counter(); if($avp(s:hop) > 0) {

11 years, 9 months

git:master: modules/sipt/doc: corrected documentation typos

by Torrey Searle

Module: sip-router Branch: master Commit: 8cdbaddbf8ec9bfedc32732a6fed6753fab424ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cdbadd… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Apr 4 11:40:26 2013 +0200 modules/sipt/doc: corrected documentation typos --- modules/sipt/doc/sipt_admin.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sipt/doc/sipt_admin.xml b/modules/sipt/doc/sipt_admin.xml index 08e3e4e..4674161 100644 --- a/modules/sipt/doc/sipt_admin.xml +++ b/modules/sipt/doc/sipt_admin.xml @@ -59,14 +59,14 @@ sipt_destination($rU, 31, 4); <section> <title><function moreinfo="none">sipt_get_hop_count()</function></title> <para> - Returns the value of the Hop Coutner for the IAM message if it exists. + Returns the value of the Hop Counter for the IAM message if it exists. Returns -1 if there isn't a hop counter. </para> <example> <title><function moreinfo="none">sipt_get_hop_counter()</function> usage</title> <programlisting format="linespecific"> ... -# get the hop couter and update the Max-Forwards header if it exists +# get the hop counter and update the Max-Forwards header if it exists $avp(s:hop) = sipt_get_hop_counter(); if($avp(s:hop) > 0) {

11 years, 9 months

git:master: modules/sipt: initial import of module

by Torrey Searle

Module: sip-router Branch: master Commit: a45583716671406f6a76cfdf8778517a28cbf2e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a455837… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Apr 4 10:20:08 2013 +0200 modules/sipt: initial import of module --- modules/sipt/Makefile | 18 ++ modules/sipt/README | 86 ++++++++ modules/sipt/doc/Makefile | 4 + modules/sipt/doc/sipt.xml | 31 +++ modules/sipt/doc/sipt_admin.xml | 83 ++++++++ modules/sipt/sipt.c | 419 +++++++++++++++++++++++++++++++++++++++ modules/sipt/ss7.h | 149 ++++++++++++++ modules/sipt/ss7_parser.c | 302 ++++++++++++++++++++++++++++ 8 files changed, 1092 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a45…

11 years, 9 months

← Newer
1
...
31
32
33
34
35
36
37
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013