sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: tmx: new pseudo-variable $T_inv(pv)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4d106ce392b94295d983f9188d73937ac5f80e24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d106ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 24 22:42:47 2009 +0200 tmx: new pseudo-variable $T_inv(pv) - access the INVITE request while processing the CANCEL - flags, parts of INVITE can be now used during CANCEL handling in config --- modules_k/tmx/t_var.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/tmx/t_var.h | 4 ++ modules_k/tmx/tmx_mod.c | 4 ++ 3 files changed, 98 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index 59b1432..e54e99f 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -36,11 +36,13 @@ struct _pv_tmx_data { static struct _pv_tmx_data _pv_treq; static struct _pv_tmx_data _pv_trpl; +static struct _pv_tmx_data _pv_tinv; void pv_tmx_data_init(void) { memset(&_pv_treq, 0, sizeof(struct _pv_tmx_data)); memset(&_pv_trpl, 0, sizeof(struct _pv_tmx_data)); + memset(&_pv_tinv, 0, sizeof(struct _pv_tmx_data)); } int pv_t_copy_msg(struct sip_msg *src, struct sip_msg *dst) @@ -212,6 +214,79 @@ int pv_t_update_rpl(struct sip_msg *msg) return 0; } +int pv_t_update_inv(struct sip_msg *msg) +{ + struct cell * t; + + if(msg==NULL) + return 1; + if (msg->REQ_METHOD!=METHOD_CANCEL) + return 1; + + t = _tmx_tmb.t_lookup_original(msg); + + if(t==NULL || t==T_UNDEFINED) + return 1; + + if(t->uas.request==NULL) { + _tmx_tmb.unref_cell(t); + return 1; + } + + if(_pv_tinv.T==t && t->uas.request==_pv_tinv.tmsgp + && t->uas.request->id==_pv_tinv.id) + goto done; + + /* make a copy */ + if(_pv_tinv.buf==NULL || _pv_tinv.buf_size<t->uas.request->len+1) + { + if(_pv_tinv.buf!=NULL) + pkg_free(_pv_tinv.buf); + if(_pv_tinv.tmsgp) + free_sip_msg(&_pv_tinv.msg); + _pv_tinv.tmsgp = NULL; + _pv_tinv.id = 0; + _pv_tinv.T = NULL; + _pv_tinv.buf_size = t->uas.request->len+1; + _pv_tinv.buf = (char*)pkg_malloc(_pv_tinv.buf_size*sizeof(char)); + if(_pv_tinv.buf==NULL) + { + LM_ERR("no more pkg\n"); + _pv_tinv.buf_size = 0; + goto error; + } + } + if(_pv_tinv.tmsgp) + free_sip_msg(&_pv_tinv.msg); + memset(&_pv_tinv.msg, 0, sizeof(struct sip_msg)); + memcpy(_pv_tinv.buf, t->uas.request->buf, t->uas.request->len); + _pv_tinv.buf[t->uas.request->len] = '\0'; + _pv_tinv.msg.len = t->uas.request->len; + _pv_tinv.msg.buf = _pv_tinv.buf; + _pv_tinv.tmsgp = t->uas.request; + _pv_tinv.id = t->uas.request->id; + _pv_tinv.T = t; + + + if(pv_t_copy_msg(t->uas.request, &_pv_tinv.msg)!=0) + { + pkg_free(_pv_tinv.buf); + _pv_tinv.buf_size = 0; + _pv_tinv.buf = NULL; + _pv_tinv.tmsgp = NULL; + _pv_tinv.T = NULL; + goto error; + } + +done: + _tmx_tmb.unref_cell(t); + return 0; + +error: + _tmx_tmb.unref_cell(t); + return -1; +} + int pv_get_t_var_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -242,6 +317,21 @@ int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, return pv_get_spec_value(&_pv_trpl.msg, pv, res); } +int pv_get_t_var_inv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + pv_spec_t *pv=NULL; + + if(pv_t_update_inv(msg)) + return pv_get_null(msg, param, res); + + pv = (pv_spec_t*)param->pvn.u.dname; + if(pv==NULL || pv_alter_context(pv)) + return pv_get_null(msg, param, res); + + return pv_get_spec_value(&_pv_tinv.msg, pv, res); +} + int pv_parse_t_var_name(pv_spec_p sp, str *in) { pv_spec_t *pv=NULL; diff --git a/modules_k/tmx/t_var.h b/modules_k/tmx/t_var.h index 68479d1..414bfb2 100644 --- a/modules_k/tmx/t_var.h +++ b/modules_k/tmx/t_var.h @@ -25,6 +25,10 @@ #include "../../pvar.h" +void pv_tmx_data_init(void); + +int pv_get_t_var_inv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); int pv_get_t_var_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index e06f505..c84cff7 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -104,6 +104,8 @@ static pv_export_t mod_pvs[] = { { {"T_reply_code", sizeof("T_reply_code")-1}, PVT_OTHER, pv_get_tm_reply_code, 0, 0, 0, 0, 0 }, + { {"T_inv", sizeof("T_inv")-1}, PVT_OTHER, pv_get_t_var_inv, 0, + pv_parse_t_var_name, 0, 0, 0 }, { {"T_req", sizeof("T_req")-1}, PVT_OTHER, pv_get_t_var_req, 0, pv_parse_t_var_name, 0, 0, 0 }, { {"T_rpl", sizeof("T_rpl")-1}, PVT_OTHER, pv_get_t_var_rpl, 0, @@ -174,6 +176,8 @@ static int mod_init(void) return -1; } #endif + pv_tmx_data_init(); + return 0; }

15 years, 5 months

git:master: tmx: grouped pv static variables in a structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 527ba6b4bc9c1af245a19968b864491ff55dace0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=527ba6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 23 17:15:25 2009 +0200 tmx: grouped pv static variables in a structure - cleaner representation of $T_{req,rpl} contexts --- modules_k/tmx/t_var.c | 157 +++++++++++++++++++++++++----------------------- 1 files changed, 82 insertions(+), 75 deletions(-) diff --git a/modules_k/tmx/t_var.c b/modules_k/tmx/t_var.c index 3f35cec..59b1432 100644 --- a/modules_k/tmx/t_var.c +++ b/modules_k/tmx/t_var.c @@ -25,18 +25,23 @@ #include "tmx_mod.h" #include "t_var.h" -static struct cell *_pv_T_req = NULL; -static struct cell *_pv_T_rpl = NULL; -static struct sip_msg _pv_treq; -static struct sip_msg _pv_trpl; -static struct sip_msg *_pv_treq_p = NULL; -static struct sip_msg *_pv_trpl_p = NULL; -static unsigned int _pv_treq_id = 0; -static unsigned int _pv_trpl_id = 0; -static char *_pv_treq_buf = NULL; -static char *_pv_trpl_buf = NULL; -static unsigned int _pv_treq_size = 0; -static unsigned int _pv_trpl_size = 0; +struct _pv_tmx_data { + struct cell *T; + struct sip_msg msg; + struct sip_msg *tmsgp; + unsigned int id; + char *buf; + int buf_size; +}; + +static struct _pv_tmx_data _pv_treq; +static struct _pv_tmx_data _pv_trpl; + +void pv_tmx_data_init(void) +{ + memset(&_pv_treq, 0, sizeof(struct _pv_tmx_data)); + memset(&_pv_trpl, 0, sizeof(struct _pv_tmx_data)); +} int pv_t_copy_msg(struct sip_msg *src, struct sip_msg *dst) { @@ -84,47 +89,48 @@ int pv_t_update_req(struct sip_msg *msg) if(t->uas.request==NULL) return 1; - if(_pv_T_req==t && t->uas.request==_pv_treq_p - && t->uas.request->id==_pv_treq_id) + if(_pv_treq.T==t && t->uas.request==_pv_treq.tmsgp + && t->uas.request->id==_pv_treq.id) return 0; /* make a copy */ - if(_pv_treq_buf==NULL || _pv_treq_size<t->uas.request->len+1) + if(_pv_treq.buf==NULL || _pv_treq.buf_size<t->uas.request->len+1) { - if(_pv_treq_buf!=NULL) - pkg_free(_pv_treq_buf); - if(_pv_treq_p) - free_sip_msg(&_pv_treq); - _pv_treq_p = NULL; - _pv_treq_id = 0; - _pv_T_req = NULL; - _pv_treq_size = t->uas.request->len+1; - _pv_treq_buf = (char*)pkg_malloc(_pv_treq_size*sizeof(char)); - if(_pv_treq_buf==NULL) + if(_pv_treq.buf!=NULL) + pkg_free(_pv_treq.buf); + if(_pv_treq.tmsgp) + free_sip_msg(&_pv_treq.msg); + _pv_treq.tmsgp = NULL; + _pv_treq.id = 0; + _pv_treq.T = NULL; + _pv_treq.buf_size = t->uas.request->len+1; + _pv_treq.buf = (char*)pkg_malloc(_pv_treq.buf_size*sizeof(char)); + if(_pv_treq.buf==NULL) { LM_ERR("no more pkg\n"); - _pv_treq_size = 0; + _pv_treq.buf_size = 0; return -1; } } - if(_pv_treq_p) - free_sip_msg(&_pv_treq); - memset(&_pv_treq, 0, sizeof(struct sip_msg)); - memcpy(_pv_treq_buf, t->uas.request->buf, t->uas.request->len); - _pv_treq_buf[t->uas.request->len] = '\0'; - _pv_treq.len = t->uas.request->len; - _pv_treq.buf = _pv_treq_buf; - _pv_treq_p = t->uas.request; - _pv_treq_id = t->uas.request->id; - _pv_T_req = t; - - - if(pv_t_copy_msg(t->uas.request, &_pv_treq)!=0) + if(_pv_treq.tmsgp) + free_sip_msg(&_pv_treq.msg); + memset(&_pv_treq.msg, 0, sizeof(struct sip_msg)); + memcpy(_pv_treq.buf, t->uas.request->buf, t->uas.request->len); + _pv_treq.buf[t->uas.request->len] = '\0'; + _pv_treq.msg.len = t->uas.request->len; + _pv_treq.msg.buf = _pv_treq.buf; + _pv_treq.tmsgp = t->uas.request; + _pv_treq.id = t->uas.request->id; + _pv_treq.T = t; + + + if(pv_t_copy_msg(t->uas.request, &_pv_treq.msg)!=0) { - pkg_free(_pv_treq_buf); - _pv_treq_size = 0; - _pv_treq_buf = NULL; - _pv_T_req = NULL; + pkg_free(_pv_treq.buf); + _pv_treq.buf_size = 0; + _pv_treq.buf = NULL; + _pv_treq.tmsgp = NULL; + _pv_treq.T = NULL; return -1; } @@ -159,46 +165,47 @@ int pv_t_update_rpl(struct sip_msg *msg) if(t->uac[branch].reply==NULL || t->uac[branch].reply==FAKED_REPLY) return 1; - if(_pv_T_rpl==t && t->uac[branch].reply==_pv_trpl_p - && t->uac[branch].reply->id==_pv_trpl_id) + if(_pv_trpl.T==t && t->uac[branch].reply==_pv_trpl.tmsgp + && t->uac[branch].reply->id==_pv_trpl.id) return 0; /* make a copy */ - if(_pv_trpl_buf==NULL || _pv_trpl_size<t->uac[branch].reply->len+1) + if(_pv_trpl.buf==NULL || _pv_trpl.buf_size<t->uac[branch].reply->len+1) { - if(_pv_trpl_buf!=NULL) - pkg_free(_pv_trpl_buf); - if(_pv_trpl_p) - free_sip_msg(&_pv_trpl); - _pv_trpl_p = NULL; - _pv_trpl_id = 0; - _pv_T_rpl = NULL; - _pv_trpl_size = t->uac[branch].reply->len+1; - _pv_trpl_buf = (char*)pkg_malloc(_pv_trpl_size*sizeof(char)); - if(_pv_trpl_buf==NULL) + if(_pv_trpl.buf!=NULL) + pkg_free(_pv_trpl.buf); + if(_pv_trpl.tmsgp) + free_sip_msg(&_pv_trpl.msg); + _pv_trpl.tmsgp = NULL; + _pv_trpl.id = 0; + _pv_trpl.T = NULL; + _pv_trpl.buf_size = t->uac[branch].reply->len+1; + _pv_trpl.buf = (char*)pkg_malloc(_pv_trpl.buf_size*sizeof(char)); + if(_pv_trpl.buf==NULL) { LM_ERR("no more pkg\n"); - _pv_trpl_size = 0; + _pv_trpl.buf_size = 0; return -1; } } - if(_pv_trpl_p) - free_sip_msg(&_pv_trpl); - memset(&_pv_trpl, 0, sizeof(struct sip_msg)); - memcpy(_pv_trpl_buf, t->uac[branch].reply->buf, t->uac[branch].reply->len); - _pv_trpl_buf[t->uac[branch].reply->len] = '\0'; - _pv_trpl.len = t->uac[branch].reply->len; - _pv_trpl.buf = _pv_trpl_buf; - _pv_trpl_p = t->uac[branch].reply; - _pv_trpl_id = t->uac[branch].reply->id; - _pv_T_rpl = t; - - if(pv_t_copy_msg(t->uac[branch].reply, &_pv_trpl)!=0) + if(_pv_trpl.tmsgp) + free_sip_msg(&_pv_trpl.msg); + memset(&_pv_trpl.msg, 0, sizeof(struct sip_msg)); + memcpy(_pv_trpl.buf, t->uac[branch].reply->buf, t->uac[branch].reply->len); + _pv_trpl.buf[t->uac[branch].reply->len] = '\0'; + _pv_trpl.msg.len = t->uac[branch].reply->len; + _pv_trpl.msg.buf = _pv_trpl.buf; + _pv_trpl.tmsgp = t->uac[branch].reply; + _pv_trpl.id = t->uac[branch].reply->id; + _pv_trpl.T = t; + + if(pv_t_copy_msg(t->uac[branch].reply, &_pv_trpl.msg)!=0) { - pkg_free(_pv_trpl_buf); - _pv_trpl_buf = NULL; - _pv_trpl_size = 0; - _pv_T_rpl = 0; + pkg_free(_pv_trpl.buf); + _pv_trpl.buf_size = 0; + _pv_trpl.buf = NULL; + _pv_trpl.tmsgp = NULL; + _pv_trpl.T = NULL; return -1; } @@ -217,7 +224,7 @@ int pv_get_t_var_req(struct sip_msg *msg, pv_param_t *param, if(pv==NULL || pv_alter_context(pv)) return pv_get_null(msg, param, res); - return pv_get_spec_value(&_pv_treq, pv, res); + return pv_get_spec_value(&_pv_treq.msg, pv, res); } int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, @@ -232,7 +239,7 @@ int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, if(pv==NULL || pv_alter_context(pv)) return pv_get_null(msg, param, res); - return pv_get_spec_value(&_pv_trpl, pv, res); + return pv_get_spec_value(&_pv_trpl.msg, pv, res); } int pv_parse_t_var_name(pv_spec_p sp, str *in)

15 years, 5 months

git:master: tm: t_lookupOriginalT() added to TM API structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9a9627a248e751700d4392cf7a45a2b00cf939cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a9627a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 23 17:22:08 2009 +0200 tm: t_lookupOriginalT() added to TM API structure --- modules/tm/t_lookup.h | 3 +++ modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index a98d90a..6fc1ba6 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -56,7 +56,10 @@ extern unsigned int global_msg_id; void init_t(); int init_rb( struct retr_buf *rb, struct sip_msg *msg ); + +typedef struct cell* (*tlookup_original_f)( struct sip_msg* p_msg ); struct cell* t_lookupOriginalT( struct sip_msg* p_msg ); + int t_reply_matching( struct sip_msg* , int* ); typedef int (*tlookup_request_f)(struct sip_msg*, int, int*); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 5fa054a..02dd7f5 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -232,6 +232,7 @@ int load_tm( struct tm_binds *tmb) tmb->generate_callid = generate_callid; tmb->generate_fromtag = generate_fromtag; tmb->t_lookup_request = t_lookup_request; + tmb->t_lookup_original = t_lookupOriginalT; tmb->t_check = t_check; tmb->unref_cell = unref_cell; tmb->which_cancel = which_cancel; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 2d5bf46..8a556d6 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -140,6 +140,7 @@ struct tm_binds { generate_callid_f generate_callid; generate_fromtag_f generate_fromtag; tlookup_request_f t_lookup_request; + tlookup_original_f t_lookup_original; tcheck_f t_check; unref_cell_f unref_cell; which_cancel_f which_cancel;

15 years, 5 months

git:master: * Core: Changed sip-router to $(MAIN_NAME) in Makefile.

by Juha Heinanen

Module: sip-router Branch: master Commit: 91ced80144bb3d570c55547e2d5c7cd79003d738 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91ced80… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 24 22:49:26 2009 +0300 * Core: Changed sip-router to $(MAIN_NAME) in Makefile. --- Makefile | 100 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 2bc4162..2dc955b 100644 --- a/Makefile +++ b/Makefile @@ -89,8 +89,8 @@ include Makefile.targets # an utility fails err_fail?=1 -# whether or not to install sip-router.cfg or just sip-router.cfg.default -# (sip-router.cfg will never be overwritten by make install, this is usefull +# whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default +# ($(MAIN_NAME).cfg will never be overwritten by make install, this is usefull # when creating packages) skip_cfg_install?= @@ -345,7 +345,7 @@ utils_bin_install= utils/gen_ha1/gen_ha1 utils/sercmd/sercmd utils_script_install= # This is the list of files to be installed into the arch-independent -# shared directory (by default /usr/local/share/sip-router) +# shared directory (by default /usr/local/share/$(MAIN_NAME)) share_install= scripts/mysql/my_create.sql \ scripts/mysql/my_data.sql \ scripts/mysql/my_drop.sql @@ -632,9 +632,9 @@ tar: $(TAR) -C .. \ --exclude=$(notdir $(CURDIR))/test* \ --exclude=$(notdir $(CURDIR))/tmp* \ - --exclude=$(notdir $(CURDIR))/debian/sip-router \ - --exclude=$(notdir $(CURDIR))/debian/sip-router-* \ - --exclude=$(notdir $(CURDIR))/sip-router_tls* \ + --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME) \ + --exclude=$(notdir $(CURDIR))/debian/$(MAIN_NAME)-* \ + --exclude=$(notdir $(CURDIR))/$(MAIN_NAME)_tls* \ --exclude=CVS* \ --exclude=.svn* \ --exclude=.cvsignore \ @@ -646,7 +646,7 @@ tar: --exclude=*.[do] \ --exclude=*.so \ --exclude=*.il \ - --exclude=$(notdir $(CURDIR))/sip-router \ + --exclude=$(notdir $(CURDIR))/$(MAIN_NAME) \ --exclude=*.gz \ --exclude=*.bz2 \ --exclude=*.tar \ @@ -667,10 +667,10 @@ tar: # binary dist. tar.gz .PHONY: bin bin: - mkdir -p tmp/sip-router/usr/local - $(MAKE) install basedir=tmp/sip-router $(mk_params) - $(TAR) -C tmp/sip-router/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz . - rm -rf tmp/sip-router + mkdir -p tmp/$(MAIN_NAME)/usr/local + $(MAKE) install basedir=tmp/$(MAIN_NAME) $(mk_params) + $(TAR) -C tmp/$(MAIN_NAME)/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz . + rm -rf tmp/$(MAIN_NAME) .PHONY: deb deb: @@ -684,18 +684,18 @@ deb: .PHONY: sunpkg sunpkg: - mkdir -p tmp/sip-router - mkdir -p tmp/sip-router_sun_pkg - $(MAKE) install basedir=tmp/sip-router prefix=/usr/local $(mk_params) + mkdir -p tmp/$(MAIN_NAME) + mkdir -p tmp/$(MAIN_NAME)_sun_pkg + $(MAKE) install basedir=tmp/$(MAIN_NAME) prefix=/usr/local $(mk_params) (cd pkg/solaris; \ - pkgmk -r ../../tmp/sip-router/usr/local -o -d ../../tmp/sip-router_sun_pkg/ -v "$(RELEASE)" ;\ + pkgmk -r ../../tmp/$(MAIN_NAME)/usr/local -o -d ../../tmp/$(MAIN_NAME)_sun_pkg/ -v "$(RELEASE)" ;\ cd ../..) cat /dev/null > ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local - pkgtrans -s tmp/sip-router_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \ - IPTELsip-router + pkgtrans -s tmp/$(MAIN_NAME)_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \ + IPTEL$(MAIN_NAME) gzip -9 ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local - rm -rf tmp/sip-router - rm -rf tmp/sip-router_sun_pkg + rm -rf tmp/$(MAIN_NAME) + rm -rf tmp/$(MAIN_NAME)_sun_pkg .PHONY: install @@ -705,8 +705,8 @@ install: install-bin install-every-module install-cfg \ .PHONY: dbinstall dbinstall: - -@echo "Initializing sip-router database" - scripts/mysql/sip-router_mysql.sh create + -@echo "Initializing $(MAIN_NAME) database" + scripts/mysql/$(MAIN_NAME)_mysql.sh create -@echo "Done" .PHONY: README @@ -750,32 +750,32 @@ $(man_prefix)/$(man_dir)/man5: # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/sip-router/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/sip-router-basic.cfg > $(cfg_prefix)/$(cfg_dir)sip-router.cfg.sample - chmod 644 $(cfg_prefix)/$(cfg_dir)sip-router.cfg.sample + -e "s#/usr/[^:]*lib/$(MAIN_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(MAIN_NAME)-basic.cfg > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg_prefix)/$(cfg_dir)sip-router.cfg ]; then \ - mv -f $(cfg_prefix)/$(cfg_dir)sip-router.cfg.sample \ - $(cfg_prefix)/$(cfg_dir)sip-router.cfg; \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ fi sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/sip-router/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/sip-router-oob.cfg \ - > $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg.sample - chmod 644 $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg.sample + -e "s#/usr/[^:]*lib/$(MAIN_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(MAIN_NAME)-oob.cfg \ + > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg ]; then \ - mv -f $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg.sample \ - $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg; \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ fi # radius dictionary - $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.sip-router - $(INSTALL_CFG) etc/dictionary.sip-router $(cfg_prefix)/$(cfg_dir) + $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(MAIN_NAME) + $(INSTALL_CFG) etc/dictionary.$(MAIN_NAME) $(cfg_prefix)/$(cfg_dir) # TLS configuration $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg $(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) - modules/tls/sip-router_cert.sh -d $(cfg_prefix)/$(cfg_dir) + modules/tls/$(MAIN_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-bin: $(bin_prefix)/$(bin_dir) $(NAME) $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) @@ -840,8 +840,8 @@ install-utils: utils $(bin_prefix)/$(bin_dir) # FIXME: This is a hack, this should be (and will be) done properly in # per-module Makefiles sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR=\"$(share_prefix)/$(share_dir)\"#g" \ - < scripts/mysql/sip-router_mysql.sh > $(bin_prefix)/$(bin_dir)/sip-router_mysql.sh - chmod 755 $(bin_prefix)/$(bin_dir)/sip-router_mysql.sh + < scripts/mysql/$(MAIN_NAME)_mysql.sh > $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh + chmod 755 $(bin_prefix)/$(bin_dir)/$(MAIN_NAME)_mysql.sh install-modules-all: install-every-module install-every-module-doc @@ -860,21 +860,21 @@ install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc $(INSTALL_DOC) README $(doc_prefix)/$(doc_dir) -install-sip-router-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 - sed -e "s#/etc/sip-router/sip-router\.cfg#$(cfg_target)sip-router.cfg#g" \ +install-$(MAIN_NAME)-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 + sed -e "s#/etc/$(MAIN_NAME)/$(MAIN_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ - -e "s#/usr/lib/sip-router/$(m)$[^_]$#$($(m)_target)\1#g") \ - -e "s#/usr/share/doc/sip-router/#$(doc_target)#g" \ - < sip-router.8 > $(man_prefix)/$(man_dir)/man8/sip-router.8 - chmod 644 $(man_prefix)/$(man_dir)/man8/sip-router.8 - sed -e "s#/etc/sip-router/sip-router\.cfg#$(cfg_target)sip-router.cfg#g" \ + -e "s#/usr/lib/$(MAIN_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ + -e "s#/usr/share/doc/$(MAIN_NAME)/#$(doc_target)#g" \ + < $(MAIN_NAME).8 > $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 + chmod 644 $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 + sed -e "s#/etc/$(MAIN_NAME)/$(MAIN_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ - -e "s#/usr/lib/sip-router/$(m)$[^_]$#$($(m)_target)\1#g") \ - -e "s#/usr/share/doc/sip-router/#$(doc_target)#g" \ - < sip-router.cfg.5 > $(man_prefix)/$(man_dir)/man5/sip-router.cfg.5 - chmod 644 $(man_prefix)/$(man_dir)/man5/sip-router.cfg.5 + -e "s#/usr/lib/$(MAIN_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ + -e "s#/usr/share/doc/$(MAIN_NAME)/#$(doc_target)#g" \ + < $(MAIN_NAME).cfg.5 > $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 + chmod 644 $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 install-man: install-sip-router-man install-every-module-man

15 years, 5 months

git:master: * Scripts: Renamed ser_mysql.sh -> sip-router_mysql.sh.

by Juha Heinanen

Module: sip-router Branch: master Commit: 4cf1ce0e147162f458c5534ea978acb81055e3c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cf1ce0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 24 22:10:57 2009 +0300 * Scripts: Renamed ser_mysql.sh -> sip-router_mysql.sh. --- .../mysql/{ser_mysql.sh => sip-router_mysql.sh} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/scripts/mysql/ser_mysql.sh b/scripts/mysql/sip-router_mysql.sh similarity index 100% rename from scripts/mysql/ser_mysql.sh rename to scripts/mysql/sip-router_mysql.sh

15 years, 5 months

git:master: * Core: ser -> sip-router changes

by Juha Heinanen

Module: sip-router Branch: master Commit: a0ce24fed910050ea3210ded0cc94c9c059e6b55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0ce24f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 24 22:01:55 2009 +0300 * Core: ser -> sip-router changes * Changed ser to sip-router. * Updated mailing lists and URLs. --- sip-router.cfg.5 | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sip-router.cfg.5 b/sip-router.cfg.5 index e4de8ba..8c89c3f 100644 --- a/sip-router.cfg.5 +++ b/sip-router.cfg.5 @@ -1,16 +1,16 @@ .\" $Id$ -.TH ser.cfg 5 15.07.2002 ser "Sip Express Router" +.TH sip-router.cfg 5 15.07.2002 sip-router "Sip Express Router" .\" Process with -.\" groff -man -Tascii ser.cfg.5 +.\" groff -man -Tascii sip-router.cfg.5 .\" .SH NAME -ser.cfg \- ser configuration file +sip-router.cfg \- sip-router configuration file .SH SYNOPSIS -.I /etc/ser/ser.cfg +.I /etc/sip-router/sip-router.cfg .SH DESCRIPTION -.B ser +.B sip-router reads the configuration data from -.I /etc/ser/ser.cfg +.I /etc/sip-router/sip-router.cfg (or the file specified with .B \-f on the command line). @@ -24,27 +24,26 @@ This manual page is incomplete. For further information please read the .I Ser User Guide (http://www.iptel.org/ser/admin.html). .SH FILES -.I /etc/ser/ser.cfg +.I /etc/sip-router/sip-router.cfg .SH AUTHORS see -.B /usr/share/doc/ser/AUTHORS +.B /usr/share/doc/sip-router/AUTHORS .SH SEE ALSO -.BR ser(8) +.BR sip-router(8) .PP -Full documentation on ser, including configuration guidelines, FAQs and +Full documentation on sip-router, including configuration guidelines, FAQs and licensing conditions, is available at -.I http://www.iptel.org/ser/. +.I http://sip-router.org. .PP For reporting bugs see .I -http://www.iptel.org/ser/bugs/. +http://sip-router.org/tracker/ .PP Mailing lists: .nf -serusers(a)iptel.org - ser user community +sr-users(a)lists.sip-router.org - SIP Router user community .nf -serdev(a)iptel.org - ser development, new features and unstable version - +sr-dev(a)lists.sip-router.org - SIP Router development, new features and unstable version

15 years, 5 months

git:master: Core: Renamed ser.cfg.5 to sip-router.cfg.5

by Juha Heinanen

Module: sip-router Branch: master Commit: cdc6a4091763fe5731d6af94c60a817b0828fb9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdc6a40… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 24 21:57:20 2009 +0300 Core: Renamed ser.cfg.5 to sip-router.cfg.5 --- ser.cfg.5 => sip-router.cfg.5 | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ser.cfg.5 b/sip-router.cfg.5 similarity index 100% rename from ser.cfg.5 rename to sip-router.cfg.5

15 years, 5 months

Re: [sr-dev] Compilation Error on OpenSUSE

by Andrei Pelinescu-Onciul

On Jun 24, 2009 at 14:16, Edson Gellert Schubert <egschubert(a)gmail.com> wrote: > Find the missed part of this h350 issue.... > > H350 compilation was tryed because the module name is not present on the > "exclude_modules" list. After including it on a clean downloaded source > it worked as expected. > > Could someone update Makefile to include 'h350' on the default excluded > list? Done, thanks. I've excluded a lot of modules that did require external libraries, including h350 that requires and external *.h. BTW: you can ignore compilation errors using: make all err_fail=0. With err_fail=0 the compilation will not stop anymore on errors, it will continue. Andrei

15 years, 5 months

git:master: * Core: Renamed ser.8 to sip-router.8

by Juha Heinanen

Module: sip-router Branch: master Commit: 5623ef894a6e15818de87a4a2b2fc95ede3972ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5623ef8… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 24 21:25:58 2009 +0300 * Core: Renamed ser.8 to sip-router.8 * Renamed ser.8 to sip-router.8. * Small edits in sip-router.8. --- ser.8 => sip-router.8 | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ser.8 b/sip-router.8 similarity index 97% rename from ser.8 rename to sip-router.8 index cc4c5da..aa9c625 100644 --- a/ser.8 +++ b/sip-router.8 @@ -1,5 +1,5 @@ .\" $Id$ -.TH sip-router 8 15.07.2002 sip-router "Sip Express Router" +.TH sip-router 8 15.07.2002 sip-router "SIP Router" .\" Process with .\" groff -man -Tascii sip-router.8 .\" @@ -38,8 +38,7 @@ sip-router \- very fast and configurable sip proxy .SH DESCRIPTION .B sip-router or -.BR Sip -.BR Express +.BR SIP .BR Router is a very fast and configurable SIP proxy.

15 years, 5 months

git:master: tm: safety checks for possible escaped neg. ACKs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8632598cac189adb557ad0c65f15744ef4256e45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8632598… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 24 20:01:46 2009 +0200 tm: safety checks for possible escaped neg. ACKs In normal operation looking up a transaction corresponding to an ACK to a neg. reply or to a local transaction should end up in script termination, so when t_relay_to() is called for a neg. ACK, the transaction should not have been looked up previously. If this assumption fails, the ACK will be processed normally (resulting at worst in calling the TMCB_ACK_NEG_IN callback multiple times for the same ACK) and a warning message will be logged. --- modules/tm/t_funcs.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index d60c99e..aa7d1f4 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -271,11 +271,10 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, /* parsing error, memory alloc, whatever ... if via is bad and we are forced to reply there, return with 0 (->break), pass error status otherwise - - MMA: return value E_SCRIPT means that transaction was already started from the script - so continue with that transaction + MMA: return value E_SCRIPT means that transaction was already started + from the script so continue with that transaction */ - if (new_tran!=E_SCRIPT) { + if (likely(new_tran!=E_SCRIPT)) { if (new_tran<0) { ret = (ser_error==E_BAD_VIA && reply_to_via) ? 0 : new_tran; goto done; @@ -285,11 +284,30 @@ int t_relay_to( struct sip_msg *p_msg , struct proxy_l *proxy, int proto, ret = 1; goto done; } + }else if (unlikely(p_msg->REQ_METHOD==METHOD_ACK)) { + /* transaction previously found (E_SCRIPT) and msg==ACK + => ack to neg. reply or ack to local trans. + => process it and exit */ + /* FIXME: there's no way to distinguish here between acks to + local trans. and neg. acks */ + /* in normal operation we should never reach this point, if we + do WARN(), it might hide some real bug (apart from possibly + hiding a bug the most harm done is calling the TMCB_ACK_NEG + callbacks twice) */ + WARN("negative or local ACK caught, please report\n"); + t=get_t(); + if (unlikely(has_tran_tmcbs(t, TMCB_ACK_NEG_IN))) + run_trans_callbacks(TMCB_ACK_NEG_IN, t, p_msg, 0, + p_msg->REQ_METHOD); + t_release_transaction(t); + ret=1; + goto done; } /* new transaction */ - /* ACKs do not establish a transaction and are fwd-ed statelessly */ + /* at this point if the msg is an ACK it is an e2e ACK and + e2e ACKs do not establish a transaction and are fwd-ed statelessly */ if ( p_msg->REQ_METHOD==METHOD_ACK) { DBG( "SER: forwarding ACK statelessly \n"); if (proxy==0) {

15 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009