October 2010 - sr-dev - kamailio.org

git:master: app_python: include dset.h
by Daniel-Constantin Mierla 05 Oct '10

05 Oct '10

Module: sip-router Branch: master Commit: e43191620f43a58a63bc0eb90b136a9ca26e591f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e431916… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 5 09:29:54 2010 +0200 app_python: include dset.h - get rid of compile warning for ruri_mark_new() - reported by Ovidiu Sas --- modules/app_python/python_msgobj.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 4adece6..4bf601a 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -23,6 +23,7 @@ #include "../../action.h" #include "../../mem/mem.h" #include "../../sr_module.h" +#include "../../dset.h" #include "../../parser/msg_parser.h" #include <Python.h>

1 0

git:master: pkg/kamailio/rpm/kamailio.spec.CenOS: enable purple and perl modules
by Ovidiu Sas 05 Oct '10

05 Oct '10

Module: sip-router Branch: master Commit: a807bf6b1ef61e40410d0d243f3f982b624fedf0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a807bf6… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Oct 4 15:31:11 2010 -0400 pkg/kamailio/rpm/kamailio.spec.CenOS: enable purple and perl modules --- pkg/kamailio/rpm/kamailio.spec.CenOS | 85 +++++++++++++++++++++------------- 1 files changed, 52 insertions(+), 33 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 78f6bd4..2d209e4 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -168,15 +168,15 @@ BuildPrereq: libconfuse-devel The kamailio-carrierroute package contains a fast routing engine. -#%package purple -#Summary: Provides the purple module, a multi-protocol IM gateway. -#Group: System Environment/Daemons -#Requires: kamailio = %ver -#BuildPrereq: libpurple-devel -# -#%description purple -#The kamailio-purple package provides the purple module, a multi-protocol instant -#messaging gateway module. +%package purple +Summary: Provides the purple module, a multi-protocol IM gateway. +Group: System Environment/Daemons +Requires: kamailio = %ver +BuildPrereq: libpurple-devel + +%description purple +The kamailio-purple package provides the purple module, a multi-protocol instant +messaging gateway module. #%package ldap @@ -212,15 +212,15 @@ The kamailio-carrierroute package contains a fast routing engine. #Management and Control Interface. -#%package perl -#Summary: Perl extensions and database driver for Kamailio. -#Group: System Environment/Daemons -#Requires: kamailio = %ver -#BuildPrereq: libperl-devel -# -#%description perl -#The kamailio-perl package provides an interface for Kamailio to write Perl extensions and -#the perlvdb database driver for Kamailio. +%package perl +Summary: Perl extensions and database driver for Kamailio. +Group: System Environment/Daemons +Requires: kamailio = %ver +BuildPrereq: mod_perl-devel + +%description perl +The kamailio-perl package provides an interface for Kamailio to write Perl extensions and +the perlvdb database driver for Kamailio. #%package lua @@ -273,11 +273,11 @@ make every-module group_include="k%PRESENCE_MODULES" make every-module group_include="k%XMPP_MODULES" make every-module group_include="k%TLS_MODULES" make every-module group_include="k%CARRIERROUTE_MODULES" -#make every-module group_include="k%PURPLE_MODULES" +make every-module group_include="k%PURPLE_MODULES" #make every-module group_include="k%LDAP_MODULES" #make every-module group_include="k%MEMCACHED_MODULES" #make every-module group_include="k%XMLRPC_MODULES" -#make every-module group_include="k%PERL_MODULES" +make every-module group_include="k%PERL_MODULES" #make every-module group_include="k%LUA_MODULES" make every-module group_include="k%PYTHON_MODULES" make every-module group_include="k%GEOIP_MODULES" @@ -298,11 +298,11 @@ make install-modules-all group_include="k%PRESENCE_MODULES" make install-modules-all group_include="k%XMPP_MODULES" make install-modules-all group_include="k%TLS_MODULES" make install-modules-all group_include="k%CARRIERROUTE_MODULES" -#make install-modules-all group_include="k%PURPLE_MODULES" +make install-modules-all group_include="k%PURPLE_MODULES" #make install-modules-all group_include="k%LDAP_MODULES" #make install-modules-all group_include="k%MEMCACHED_MODULES" #make install-modules-all group_include="k%XMLRPC_MODULES" -#make install-modules-all group_include="k%PERL_MODULES" +make install-modules-all group_include="k%PERL_MODULES" #make install-modules-all group_include="k%LUA_MODULES" make install-modules-all group_include="k%PYTHON_MODULES" make install-modules-all group_include="k%GEOIP_MODULES" @@ -664,10 +664,10 @@ fi %{_libdir}/kamailio/modules/carrierroute.so -#%files purple -#%defattr(-,root,root) -#%doc %{_docdir}/kamailio/modules_k/README.purple -#%{_libdir}/kamailio/modules_k/purple.so +%files purple +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules_k/README.purple +%{_libdir}/kamailio/modules_k/purple.so #%files ldap @@ -690,13 +690,32 @@ fi #%{_libdir}/kamailio/modules_k/memcached.so -#%files perl -#%defattr(-,root,root) -#%doc %{_docdir}/kamailio/modules_k/README.perl -#%doc %{_docdir}/kamailio/modules_k/README.perlvdb -#%{_libdir}/kamailio/modules_k/perl.so -#%{_libdir}/kamailio/modules_k/perlvdb.so - +%files perl +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules_k/README.perl +%doc %{_docdir}/kamailio/modules_k/README.perlvdb +%{_libdir}/kamailio/modules_k/perl.so +%{_libdir}/kamailio/modules_k/perlvdb.so +%{_libdir}/kamailio/perl/OpenSER.pm +%{_libdir}/kamailio/perl/OpenSER/Constants.pm +%{_libdir}/kamailio/perl/OpenSER/LDAPUtils/LDAPConf.pm +%{_libdir}/kamailio/perl/OpenSER/LDAPUtils/LDAPConnection.pm +%{_libdir}/kamailio/perl/OpenSER/Message.pm +%{_libdir}/kamailio/perl/OpenSER/Utils/Debug.pm +%{_libdir}/kamailio/perl/OpenSER/Utils/PhoneNumbers.pm +%{_libdir}/kamailio/perl/OpenSER/VDB.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/AccountingSIPtrace.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Alias.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Auth.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Describe.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Speeddial.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/TableVersions.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Column.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Pair.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/ReqCond.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Result.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/VTab.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Value.pm #%files lua #%defattr(-,root,root)

1 0

kamailio 3.1 app_python compiler warnings
by Ovidiu Sas 04 Oct '10

04 Oct '10

While compiling app_python on CentOS I got the following warnings: + make every-module group_include=kpython CC (gcc) [M app_python.so] python_exec.o CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] python_mod.o CC (gcc) [M app_python.so] python_msgobj.o python_msgobj.c: In function 'msg_set_dst_uri': python_msgobj.c:151: warning: implicit declaration of function 'ruri_mark_new' python_msgobj.c: In function 'python_msgobj_init': python_msgobj.c:529: warning: dereferencing type-punned pointer will break strict-aliasing rules CC (gcc) [M app_python.so] python_support.o LD (gcc) [M app_python.so] app_python.so Regards, Ovidiu Sas

1 0

git:master: registrar(s): by default trust contact received info
by Andrei Pelinescu-Onciul 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: d5b8c86bfacdf495cdd46e6a306d7aee02d3dfb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5b8c86… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 4 19:34:22 2010 +0200 registrar(s): by default trust contact received info - by default trust contact received info (to maintain compatibility with old configs). - the possible settings for the trust_received_flag modparam are: * -2 (default) - always trust contact received info (added when replicating REGISTERs) * -1 - disable (never trust received info) * >=0 - trust only the messages with the corresponding flag set (it can also be a flag name). --- modules_s/registrar/reg_mod.c | 7 +++++-- modules_s/registrar/save.c | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/modules_s/registrar/reg_mod.c b/modules_s/registrar/reg_mod.c index b8f87e4..f623d1b 100644 --- a/modules_s/registrar/reg_mod.c +++ b/modules_s/registrar/reg_mod.c @@ -67,9 +67,12 @@ int append_branches = 1; /* If set to 1, lookup will put all contac int case_sensitive = 0; /* If set to 1, username in aor will be case sensitive */ int save_nat_flag = 4; /* The contact will be marked as behind NAT if this flag is set before calling save */ int load_nat_flag = 4; /* This flag will be set by lookup if a contact is behind NAT*/ -int trust_received_flag = -1; /* if this flag is set, a contact +int trust_received_flag = -2; /* if this flag is set (>=0), a contact received param. will be trusted - (otherwise it will be ignored) */ + (otherwise it will be ignored) + -1 = disable + -2 = trust all. + */ int min_expires = 60; /* Minimum expires the phones are allowed to use in seconds, * use 0 to switch expires checking off */ int max_expires = 0; /* Minimum expires the phones are allowed to use in seconds, diff --git a/modules_s/registrar/save.c b/modules_s/registrar/save.c index 08fcb9f..f87fd3c 100644 --- a/modules_s/registrar/save.c +++ b/modules_s/registrar/save.c @@ -420,8 +420,10 @@ static inline int insert(struct sip_msg* _m, str* aor, contact_t* _c, udomain_t* } send_sock = 0; - if (_c->received && (trust_received_flag >=0) && - (isflagset(_m, trust_received_flag) == 1)) { + if (_c->received && + (((trust_received_flag >= 0) && + (isflagset(_m, trust_received_flag) == 1)) || + (trust_received_flag == -2)) ) { recv = &_c->received->body; send_sock = find_send_socket(recv); } else if (flags & FL_NAT && _m->first_line.type == SIP_REQUEST) { @@ -591,8 +593,10 @@ static inline int update(struct sip_msg* _m, urecord_t* _r, str* aor, contact_t* } send_sock = 0; - if (_c->received && (trust_received_flag >=0) && - (isflagset(_m, trust_received_flag) == 1)) { + if (_c->received && + (((trust_received_flag >=0 ) && + (isflagset(_m, trust_received_flag) == 1)) || + (trust_received_flag == -2)) ) { recv = &_c->received->body; send_sock = find_send_socket(recv); } else if (nated & FL_NAT && @@ -649,8 +653,10 @@ static inline int update(struct sip_msg* _m, urecord_t* _r, str* aor, contact_t* } send_sock = 0; - if (_c->received && (trust_received_flag >=0) && - (isflagset(_m, trust_received_flag) == 1)) { + if (_c->received && + (((trust_received_flag >=0 ) && + (isflagset(_m, trust_received_flag) == 1)) || + (trust_received_flag == -2)) ) { recv = &_c->received->body; send_sock = find_send_socket(recv); } else if (nated & FL_NAT && _m->first_line.type == SIP_REQUEST) {

1 0

git:master: registrar(s): set send socket if uri includes received info
by Andrei Pelinescu-Onciul 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: a7d84df08c2ef8f420db4df8c4110b969cd8de9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7d84df… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 4 18:39:50 2010 +0200 registrar(s): set send socket if uri includes received info - set send socket when the contact includes received info (replication for NATed contacts) - use contact received information only if the trust_received_flag is set for the message (the flag actually used can be set with the modparam with the same name). --- modules_s/registrar/reg_mod.c | 14 ++++ modules_s/registrar/reg_mod.h | 1 + modules_s/registrar/save.c | 139 +++++++++++++++++++++++++++++++++++++---- 3 files changed, 142 insertions(+), 12 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a7d…

1 0

git:master: usrloc(s): s/_res/_reset/
by Andrei Pelinescu-Onciul 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: e135452ce5292d590de415058c538e2acc4be652 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e135452… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 4 19:14:28 2010 +0200 usrloc(s): s/_res/_reset/ _res is a macro defined in /usr/include/resolv.h and hence it should never be used as variable name in the code (a single include of resolv.h would break things). --- modules_s/usrloc/ucontact.c | 19 ++++++++++++------- modules_s/usrloc/ucontact.h | 17 +++++++++++------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/modules_s/usrloc/ucontact.c b/modules_s/usrloc/ucontact.c index 566325a..6c6b2d7 100644 --- a/modules_s/usrloc/ucontact.c +++ b/modules_s/usrloc/ucontact.c @@ -220,9 +220,11 @@ void print_ucontact(FILE* _f, ucontact_t* _c) /* * Update ucontact structure in memory */ -int mem_update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, qvalue_t _q, str* _cid, int _cs, - unsigned int _set, unsigned int _res, str* _ua, str* _recv, - struct socket_info* sock, str* _inst) +int mem_update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, + qvalue_t _q, str* _cid, int _cs, + unsigned int _set, unsigned int _reset, + str* _ua, str* _recv, + struct socket_info* sock, str* _inst) { char* ptr; @@ -335,7 +337,7 @@ int mem_update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, qvalue_t _ _c->q = _q; _c->cseq = _cs; _c->flags |= _set; - _c->flags &= ~_res; + _c->flags &= ~_reset; _c->sock = sock; return 0; @@ -581,8 +583,10 @@ int db_delete_ucontact(ucontact_t* _c) /* * Update ucontact with new values */ -int update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, qvalue_t _q, str* _cid, int _cs, - unsigned int _set, unsigned int _res, str* _ua, str* _recv, +int update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, + qvalue_t _q, str* _cid, int _cs, + unsigned int _set, unsigned int _reset, + str* _ua, str* _recv, struct socket_info* sock, str* _inst, int sid) { /* run callbacks for UPDATE event */ @@ -592,7 +596,8 @@ int update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, qvalue_t _q, s /* we have to update memory in any case, but database directly * only in db_mode 1 */ - if (mem_update_ucontact(_c, _u, aor, _e, _q, _cid, _cs, _set, _res, _ua, _recv, sock, _inst) < 0) { + if (mem_update_ucontact(_c, _u, aor, _e, _q, _cid, _cs, _set, _reset, + _ua, _recv, sock, _inst) < 0) { LOG(L_ERR, "update_ucontact(): Error while updating\n"); return -1; } diff --git a/modules_s/usrloc/ucontact.h b/modules_s/usrloc/ucontact.h index c1a76e7..ca71b44 100644 --- a/modules_s/usrloc/ucontact.h +++ b/modules_s/usrloc/ucontact.h @@ -183,11 +183,16 @@ int db_delete_ucontact(ucontact_t* _c); /* * Update ucontact with new values without replication */ -typedef int (*update_ucontact_t)(ucontact_t* _c, str* _u, str* aor, time_t _e, qvalue_t _q, str* _cid, int _cs, - unsigned int _set, unsigned int _res, str* _ua, str* _recv, - struct socket_info* sock, str* _inst, int sid); -int update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, qvalue_t _q, str* _cid, int _cs, - unsigned int _set, unsigned int _res, str* _ua, str* _recv, - struct socket_info* sock, str* _inst, int sid); +typedef int (*update_ucontact_t)(ucontact_t* _c, str* _u, str* aor, time_t _e, + qvalue_t _q, str* _cid, int _cs, + unsigned int _set, unsigned int _reset, + str* _ua, str* _recv, + struct socket_info* sock, str* _inst, + int sid); +int update_ucontact(ucontact_t* _c, str* _u, str* aor, time_t _e, qvalue_t _q, + str* _cid, int _cs, unsigned int _set, + unsigned int _reset, + str* _ua, str* _recv, + struct socket_info* sock, str* _inst, int sid); #endif /* UCONTACT_H */

1 0

git:master: pkg/kamailio/rpm/kamailio.spec.CenOS: CentOS rpm spec file updated for 3.1
by Ovidiu Sas 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: f9a546d10542d202a4ab483ac68ff23b47d81207 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9a546d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Oct 4 11:22:50 2010 -0400 pkg/kamailio/rpm/kamailio.spec.CenOS: CentOS rpm spec file updated for 3.1 --- pkg/kamailio/rpm/kamailio.spec.CenOS | 160 ++++++++++++++++++++++++++------- 1 files changed, 126 insertions(+), 34 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f9a…

1 0

git:master: modules_k/seas: fix compiler warning
by Ovidiu Sas 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: eb3962fa5b5269aef99de0d5dc5f73296937c4cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb3962f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Oct 4 11:05:19 2010 -0400 modules_k/seas: fix compiler warning - initialize 'the_param' to NULL in function 'ac_reply' --- modules_k/seas/seas_action.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/seas/seas_action.c b/modules_k/seas/seas_action.c index 8d39958..3db43b8 100644 --- a/modules_k/seas/seas_action.c +++ b/modules_k/seas/seas_action.c @@ -667,6 +667,7 @@ int ac_reply(as_p the_as,unsigned char processor_id,unsigned int flags,char *act ttag=NULL; my_msg=NULL; i=k=0; + the_param=NULL; net2hostL(hash_index,action,k); net2hostL(label,action,k);

1 0

git:master: modules_k/presence_conference: fix compiler warning
by Ovidiu Sas 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: c0801ac4509a76b1d531e7fe8ad68a19f7c4e139 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0801ac… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Oct 4 10:56:41 2010 -0400 modules_k/presence_conference: fix compiler warning - add newline at end of file --- modules_k/presence_conference/add_events.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/presence_conference/add_events.c b/modules_k/presence_conference/add_events.c index 6263c9c..a80a0f6 100644 --- a/modules_k/presence_conference/add_events.c +++ b/modules_k/presence_conference/add_events.c @@ -66,4 +66,4 @@ int conference_add_events(void) return 0; } - \ No newline at end of file +

1 0

git:master: route.c: fix compiler warning
by Ovidiu Sas 04 Oct '10

04 Oct '10

Module: sip-router Branch: master Commit: 9306b90693babab7f49966d65314e114aefbbd66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9306b90… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Oct 4 17:41:45 2010 -0400 route.c: fix compiler warning - initialize he to NULL - use 'NULL' instead of '0' to initialize pointers --- route.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/route.c b/route.c index 45de184..ebb2077 100644 --- a/route.c +++ b/route.c @@ -1607,10 +1607,11 @@ inline static int comp_ip(int op, struct ip_addr* ip, int rtype, pv_value_t pval; int destroy_pval; - right=0; /* warning fix */ - rv=0; + right=NULL; /* warning fix */ + rv=NULL; destroy_pval=0; ret=-1; + he=NULL; /* warning fix */ switch(rtype){ case NET_ST: switch(op){

1 0