sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:master: debian: minor fix (not important at all) in init scripts.

by I�aki Baz Castillo

Module: sip-router Branch: master Commit: 9d0688efd8e45accc5928754343c6442df5a81f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d0688e… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Tue Aug 2 15:13:33 2011 +0200 debian: minor fix (not important at all) in init scripts. --- pkg/kamailio/deb/debian/kamailio.init | 2 +- pkg/kamailio/deb/lenny/kamailio.init | 2 +- pkg/kamailio/deb/lucid/kamailio.init | 2 +- pkg/kamailio/deb/squeeze/kamailio.init | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kamailio/deb/debian/kamailio.init b/pkg/kamailio/deb/debian/kamailio.init index 9eee7e1..0490282 100644 --- a/pkg/kamailio/deb/debian/kamailio.init +++ b/pkg/kamailio/deb/debian/kamailio.init @@ -213,7 +213,7 @@ case "$1" in echo "Restarting $DESC:" set +e start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE --retry=5 \ - $PIDFILE --exec $DAEMON + --exec $DAEMON if [ $? -ne 0 ] ; then echo "$NAME failed to stop." exit 1 diff --git a/pkg/kamailio/deb/lenny/kamailio.init b/pkg/kamailio/deb/lenny/kamailio.init index 9eee7e1..0490282 100644 --- a/pkg/kamailio/deb/lenny/kamailio.init +++ b/pkg/kamailio/deb/lenny/kamailio.init @@ -213,7 +213,7 @@ case "$1" in echo "Restarting $DESC:" set +e start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE --retry=5 \ - $PIDFILE --exec $DAEMON + --exec $DAEMON if [ $? -ne 0 ] ; then echo "$NAME failed to stop." exit 1 diff --git a/pkg/kamailio/deb/lucid/kamailio.init b/pkg/kamailio/deb/lucid/kamailio.init index 9eee7e1..0490282 100644 --- a/pkg/kamailio/deb/lucid/kamailio.init +++ b/pkg/kamailio/deb/lucid/kamailio.init @@ -213,7 +213,7 @@ case "$1" in echo "Restarting $DESC:" set +e start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE --retry=5 \ - $PIDFILE --exec $DAEMON + --exec $DAEMON if [ $? -ne 0 ] ; then echo "$NAME failed to stop." exit 1 diff --git a/pkg/kamailio/deb/squeeze/kamailio.init b/pkg/kamailio/deb/squeeze/kamailio.init index 9eee7e1..0490282 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.init +++ b/pkg/kamailio/deb/squeeze/kamailio.init @@ -213,7 +213,7 @@ case "$1" in echo "Restarting $DESC:" set +e start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE --retry=5 \ - $PIDFILE --exec $DAEMON + --exec $DAEMON if [ $? -ne 0 ] ; then echo "$NAME failed to stop." exit 1

13 years, 3 months

git:master: core: remove ifdef'ed code left over from a commit one year ago

by Henning Westerholt

Module: sip-router Branch: master Commit: 2559678551f35ee3a407aaf32b9ddc7d54da5cb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2559678… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Aug 2 00:32:02 2011 +0200 core: remove ifdef'ed code left over from a commit one year ago --- sr_module.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/sr_module.h b/sr_module.h index 139aaae..deea860 100644 --- a/sr_module.h +++ b/sr_module.h @@ -326,14 +326,6 @@ typedef struct kam_cmd_export_ kam_cmd_export_t; typedef struct cmd_export_common_ cmd_export_common_t; typedef struct sr31_cmd_export_ sr31_cmd_export_t; -#if 0 -union cmd_export_u{ - cmd_export_common_t c; /* common members for everybody */ - ser_cmd_export_t v0; - kam_cmd_export_t v1; -}; -#endif - /** ser module exports version */ struct ser_module_exports {

13 years, 3 months

git:master: core: many extensions and fixes at doxygen docs for module infrastructure

by Henning Westerholt

Module: sip-router Branch: master Commit: a7524985f79756246ab6e43b9631276116f1a487 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a752498… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Aug 2 00:29:42 2011 +0200 core: many extensions and fixes at doxygen docs for module infrastructure --- sr_module.c | 39 ++++-- sr_module.h | 451 +++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 278 insertions(+), 212 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a75…

13 years, 3 months

redis_client.h:27:29: fatal error: hiredis/hiredis.h: File not found

by Iñaki Baz Castillo

Hi, when I run "make modules" in sip-router master branch I get this error (Ubuntu 11.04): In file included from ndb_redis_mod.c:34:0: redis_client.h:27:29: fatal error: hiredis/hiredis.h: This library exists in Debian Sid (not stable) and Ubuntu Oneiric, should such module be enabled by default taking into account that it could not be compiled neither in Debian stable? -- Iñaki Baz Castillo <ibc(a)aliax.net>

13 years, 3 months

git:master: modules_k/rls, modules_k/presence: Support for splitting large RLS NOTIFY requests into multiple NOTIFY requests

by Peter Dunkley

Module: sip-router Branch: master Commit: 04d7cafbdd6aab840399865fccde854c9c11b99f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04d7caf… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 1 13:47:52 2011 +0100 modules_k/rls, modules_k/presence: Support for splitting large RLS NOTIFY requests into multiple NOTIFY requests - Many SIP devices (including proxies and SBCs) are not able to handle vary large SIP requests. Requests over 64k in size when using TCP are a common problem. It is easily possible with large (and even not so large) resource lists for RLS to generate NOTIFY requests that are too big for some SIP devices to handle. This enhancement gives RLS the ability to split these large NOTIFY requests into multiple smaller requests (that still comply with the) RFC. The default behaviour is the old (send a single big NOTIFY request) behaviour. - Feature added by Andrew Miller at Crocodile RCS --- modules_k/presence/hash.c | 5 +- modules_k/rls/README | 27 +- modules_k/rls/doc/rls_admin.xml | 17 + modules_k/rls/notify.c | 452 ++++++++++++---------- modules_k/rls/notify.h | 4 +- modules_k/rls/resource_notify.c | 787 +++++++++++++++++++++------------------ modules_k/rls/rls.c | 2 + modules_k/rls/rls.h | 1 + modules_k/rls/subscribe.c | 3 +- 9 files changed, 717 insertions(+), 581 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=04d…

13 years, 3 months

git:master: tm: backup/restore lists of avps for usage t_uac

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 203b2678a7115f2ba744eeda5279108fdd5b139d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=203b267… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 1 14:36:39 2011 +0200 tm: backup/restore lists of avps for usage t_uac - when sending a self-generated request while processing other sip message, backup the list of avps and restore afterwards - reported by Sebastian Damm - added helper function to backup/restore the lists of avps from msg context to static var and use transaction lists --- modules/tm/h_table.c | 37 +++++++++++++++++++++++++++++++++++++ modules/tm/h_table.h | 26 +++++++++++++++++++++++++- modules/tm/uac.c | 11 ++--------- 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 743fa94..4870920 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -487,4 +487,41 @@ error0: } +/** + * backup xdata from/to msg context to local var and use T lists + * - mode = 0 - from msg context to _txdata and use T lists + * - mode = 1 - restore to msg context from _txdata + */ +void tm_xdata_swap(tm_cell_t *t, int mode) +{ + static tm_xdata_t _txdata; + tm_xdata_t *x; + + x = &_txdata; + + if(mode==0) { + if(t==NULL) + return; + x->uri_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from ); + x->uri_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to ); + x->user_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from ); + x->user_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); + x->domain_avps_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); + x->domain_avps_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + x->xavps_list = xavp_set_list(&t->xavps_list); +#endif + } else if(mode==1) { + /* restore original avp list */ + set_avp_list( AVP_TRACK_FROM | AVP_CLASS_URI, x->uri_avps_from ); + set_avp_list( AVP_TRACK_TO | AVP_CLASS_URI, x->uri_avps_to ); + set_avp_list( AVP_TRACK_FROM | AVP_CLASS_USER, x->user_avps_from ); + set_avp_list( AVP_TRACK_TO | AVP_CLASS_USER, x->user_avps_to ); + set_avp_list( AVP_TRACK_FROM | AVP_CLASS_DOMAIN, x->domain_avps_from ); + set_avp_list( AVP_TRACK_TO | AVP_CLASS_DOMAIN, x->domain_avps_to ); +#ifdef WITH_XAVP + xavp_set_list(x->xavps_list); +#endif + } +} diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 30a60e1..2ad42ce 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -300,6 +300,25 @@ struct totag_elem { * saves us 2*2 bytes */ typedef unsigned short retr_timeout_t; + +/** + * extra data from SIP message context to transaction storage + */ +typedef struct tm_xdata +{ + /* lists with avps */ + struct usr_avp **uri_avps_from; + struct usr_avp **uri_avps_to; + struct usr_avp **user_avps_from; + struct usr_avp **user_avps_to; + struct usr_avp **domain_avps_from; + struct usr_avp **domain_avps_to; +#ifdef WITH_XAVP + sr_xavp_t **xavps_list; +#endif +} tm_xdata_t; + + /* transaction context */ typedef struct cell @@ -370,7 +389,7 @@ typedef struct cell * many due to downstream forking; */ struct totag_elem *fwded_totags; - /* list with avp */ + /* lists with avps */ struct usr_avp *uri_avps_from; struct usr_avp *uri_avps_to; struct usr_avp *user_avps_from; @@ -543,6 +562,11 @@ inline static void remove_from_hash_table_unsafe( struct cell * p_cell) t_stats_deleted( is_local(p_cell) ); } +/** + * backup xdata from/to msg context to local var and use T lists + */ +void tm_xdata_swap(tm_cell_t *t, int mode); + #endif diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 1a70e38..0f36a4c 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -352,9 +352,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #ifdef USE_COMP lreq.rcv.comp=dst.comp; #endif /* USE_COMP */ - /* AVPs are reset anyway afterwards, so no need to - backup/restore them*/ sflag_bk = getsflags(); + tm_xdata_swap(new_cell, 0); /* run the route */ backup_route_type = get_route_type(); @@ -373,6 +372,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, set_route_type( backup_route_type ); /* restore original environment */ + tm_xdata_swap(new_cell, 1); setsflagsval(sflag_bk); if (unlikely(lreq.new_uri.s)) @@ -408,13 +408,6 @@ static inline int t_uac_prepare(uac_req_t *uac_r, } #endif - /* better reset avp list now - anyhow, it's useless from - * this point (bogdan) */ - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif - new_cell->method.s = buf; new_cell->method.len = uac_r->method->len;

13 years, 3 months

git:master: kamctl: added missing tables for dbtext and db_berkeley

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 01cffe6ff78f6a1b59b41f39f1a29d6a4b361603 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=01cffe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 1 14:49:16 2011 +0200 kamctl: added missing tables for dbtext and db_berkeley --- utils/kamctl/db_berkeley/kamailio/mtree | 10 ++++++++++ utils/kamctl/db_berkeley/kamailio/uacreg | 10 ++++++++++ utils/kamctl/dbtext/kamailio/mtree | 1 + utils/kamctl/dbtext/kamailio/uacreg | 1 + 4 files changed, 22 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/mtree b/utils/kamctl/db_berkeley/kamailio/mtree new file mode 100644 index 0000000..082d9f4 --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/mtree @@ -0,0 +1,10 @@ +METADATA_COLUMNS +id(int) tprefix(str) tvalue(str) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|''|'' diff --git a/utils/kamctl/db_berkeley/kamailio/uacreg b/utils/kamctl/db_berkeley/kamailio/uacreg new file mode 100644 index 0000000..7dda496 --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/uacreg @@ -0,0 +1,10 @@ +METADATA_COLUMNS +id(int) l_uuid(str) l_username(str) l_domain(str) r_username(str) r_domain(str) realm(str) auth_username(str) auth_password(str) auth_proxy(str) expires(int) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|''|''|''|''|''|''|''|''|''|0 diff --git a/utils/kamctl/dbtext/kamailio/mtree b/utils/kamctl/dbtext/kamailio/mtree new file mode 100644 index 0000000..3f721ad --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/mtree @@ -0,0 +1 @@ +id(int,auto) tprefix(string) tvalue(string) diff --git a/utils/kamctl/dbtext/kamailio/uacreg b/utils/kamctl/dbtext/kamailio/uacreg new file mode 100644 index 0000000..1fddd28 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/uacreg @@ -0,0 +1 @@ +id(int,auto) l_uuid(string) l_username(string) l_domain(string) r_username(string) r_domain(string) realm(string) auth_username(string) auth_password(string) auth_proxy(string) expires(int)

13 years, 3 months

git:master: kamctl: updates after changes in .gitignore

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 76e90d5e786a71efa3dfb116dab885a0b8176592 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76e90d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 1 14:35:53 2011 +0200 kamctl: updates after changes in .gitignore --- utils/kamctl/db_berkeley/kamailio/pl_pipes | 2 -- utils/kamctl/db_berkeley/kamailio/version | 2 ++ utils/kamctl/dbtext/kamailio/pl_pipes | 1 - utils/kamctl/dbtext/kamailio/version | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/pl_pipes b/utils/kamctl/db_berkeley/kamailio/pl_pipes index 01a105e..f49ccc5 100644 --- a/utils/kamctl/db_berkeley/kamailio/pl_pipes +++ b/utils/kamctl/db_berkeley/kamailio/pl_pipes @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|''|''|0 -pl_pipes| -pl_pipes|1 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 74a5b86..b76e33a 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -72,6 +72,8 @@ mtree| mtree|1 pdt| pdt|1 +pl_pipes| +pl_pipes|1 presentity| presentity|3 pua| diff --git a/utils/kamctl/dbtext/kamailio/pl_pipes b/utils/kamctl/dbtext/kamailio/pl_pipes index bc51e86..78358b5 100644 --- a/utils/kamctl/dbtext/kamailio/pl_pipes +++ b/utils/kamctl/dbtext/kamailio/pl_pipes @@ -1,2 +1 @@ id(int,auto) pipeid(string) algorithm(string) plimit(int) -pl_pipes:1 diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 009f2e1..f0cd85c 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -31,6 +31,7 @@ matrix:1 missed_calls:3 mtree:1 pdt:1 +pl_pipes:1 presentity:3 pua:6 purplemap:1

13 years, 3 months

git:master: .gitingnore: set root path for binary names

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 285566bd31379ee4b6199f72c8c589a6b313bf07 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=285566b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 1 14:33:15 2011 +0200 .gitingnore: set root path for binary names - some directories containing the binary name (e.g., kamailio like in utils/kamctl/dbtext/kamailio/...) in path were ignored. Updated .gitignore to use /kamailio and /ser which according to manual should match on the root folder of GIT tree --- .gitignore | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6cdbafa..e076c44 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,8 @@ modules.lst # ignore dependency files *.d # ignore binary files and objects -ser -kamailio +/ser +/kamailio *.so *.so.* *.o @@ -38,4 +38,4 @@ utils/pdbt/pdbt libiname.lst *.dylib # man pages -*.7 \ No newline at end of file +*.7

13 years, 3 months

git:master: ipops: Added function is_ip_rfc1918(ip) for detecting private IPv4 according to RFC 1918.

by I�aki Baz Castillo

Module: sip-router Branch: master Commit: aa940ed3b54c8078beba93502c17cb27327885a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa940ed… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Mon Aug 1 12:21:44 2011 +0200 ipops: Added function is_ip_rfc1918(ip) for detecting private IPv4 according to RFC 1918. --- modules/ipops/README | 22 ++ modules/ipops/compile_rfc1918_parser.rl.sh | 21 ++ modules/ipops/doc/ipops_admin.xml | 39 +++ modules/ipops/ipops_mod.c | 28 ++- modules/ipops/rfc1918_parser.c | 399 ++++++++++++++++++++++++++++ modules/ipops/rfc1918_parser.h | 16 ++ modules/ipops/rfc1918_parser.rl | 43 +++ 7 files changed, 567 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=aa9…

13 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011