sr-dev

sr-dev@lists.kamailio.org

19 participants
44307 discussions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f62640d8088de2418ad1ddf791d496a15c5ce109 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f62640d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 13:46:46 2010 +0100 mtree: module compiles now - after early shm intialization was merged back from 3.0 --- Makefile | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4af085a..37bc4c5 100644 --- a/Makefile +++ b/Makefile @@ -287,8 +287,6 @@ else # excluded because they do not compile (remove them only after they are # fixed) -- andrei exclude_modules+= bdb dbtext iptrtpproxy pa rls - # dcm: for now needs backports from sr - exclude_modules+= mtree # depends on libgeoip exclude_modules+= geoip # depends on liblua5.1-dev

14 years, 12 months

git:master: Makefile: use pkg/$MAIN_NAME/debian for defs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cfbf5a105a70d4066ef526dbdb1272ceef4fdbd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfbf5a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 13:53:58 2010 +0100 Makefile: use pkg/$MAIN_NAME/debian for defs - if pkg/$MAIN_NAME/debian dir exists use it to build debs, otherwise use pkg/debian --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index be0b339..360aaf0 100644 --- a/Makefile +++ b/Makefile @@ -810,6 +810,10 @@ bin: deb: -@if [ -d debian ]; then \ dpkg-buildpackage -rfakeroot -tc; \ + elif [ -d pkg/$(MAIN_NAME)/debian ]; then \ + ln -s pkg/$(MAIN_NAME)/debian debian; \ + dpkg-buildpackage -rfakeroot -tc; \ + rm debian; \ else \ ln -s pkg/debian debian; \ dpkg-buildpackage -rfakeroot -tc; \

14 years, 12 months

git:master: Makefile: test if cfg, -basic and -oob exist

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b9571f8b3967611605a3e46e05a46fc4100ff78a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9571f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 14:07:45 2010 +0100 Makefile: test if cfg, -basic and -oob exist - cfg install check the existence of the files before atempting to copy - name of cfg to install depends on flavour --- Makefile | 54 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 360aaf0..356641d 100644 --- a/Makefile +++ b/Makefile @@ -888,26 +888,42 @@ $(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/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(CFG_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)$(MAIN_NAME).cfg ]; then \ - mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ + @if [ -f etc/$(CFG_NAME).cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_NAME).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)$(MAIN_NAME).cfg ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ + fi; \ + fi + @if [ -f etc/$(CFG_NAME)-basic.cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_NAME)-basic.cfg > \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ + chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample; \ + if [ -z "${skip_cfg_install}" -a \ + ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg.sample \ + $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg; \ + fi; \ fi - @sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ - < etc/$(CFG_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)$(MAIN_NAME)-advanced.cfg ]; \ - then \ - mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ - $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ + @if [ -f etc/$(CFG_NAME)-oob.cfg ]; then \ + sed $(foreach m,$(modules_dirs),\ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + < etc/$(CFG_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)$(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; \ fi # other configs @for r in $(C_INSTALL_CFGS) ; do \

14 years, 12 months

git:master: Makefile.defs: moved init of vars before FLAVOUR updates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 821640817c5d5ec210fc17a106bfc74ee4639bf9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8216408… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 13:44:08 2010 +0100 Makefile.defs: moved init of vars before FLAVOUR updates - some vars might depend on type of FLAVOUR installed - kamailio flavour compiles shm stats by default --- Makefile.defs | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 7e2dd0f..a015244 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -115,6 +115,14 @@ endif # verbose # flavour: sip-router, ser or kamailio FLAVOUR?=sip-router +#prefix for various configs and scripts +#config name/name-prefix for distributed configs +CFG_NAME=sip-router +#config name/name-prefix for distributed scripts +SCR_NAME=sip-router +#name in source tree +SRC_NAME=sip-router + ifeq ($(FLAVOUR),sip-router) # main binary name MAIN_NAME=ser @@ -124,19 +132,17 @@ MAIN_NAME=ser else ifeq ($(FLAVOUR),kamailio) # main binary name MAIN_NAME=kamailio +# use kamailio config +CFG_NAME=kamailio +# kamailio statistics on +KMSTATS ?= 1 +# fast malloc statistics on +FMSTATS ?= 1 else # default: # main binary name MAIN_NAME=sip-router endif -#prefix for various configs and scripts -#config name/name-prefix for distributed configs -CFG_NAME=sip-router -#config name/name-prefix for distributed scripts -SCR_NAME=sip-router -#name in source tree -SRC_NAME=sip-router - # what to install INSTALL_FLAVOUR=$(FLAVOUR) @@ -650,6 +656,9 @@ endif ifeq ($(KMSTATS), 1) C_DEFS+= -DSTATISTICS endif +ifeq ($(FMSTATS), 1) + C_DEFS+= -DMALLOC_STATS +endif ifneq ($(STUN),) C_DEFS+= -DUSE_STUN

14 years, 12 months

git:master: Makefile: install kamctl for kamailio flavour

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 17a1dd071d3b267817885921a5a6177af6f79dcf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17a1dd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 13:52:00 2010 +0100 Makefile: install kamctl for kamailio flavour --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 37bc4c5..be0b339 100644 --- a/Makefile +++ b/Makefile @@ -426,7 +426,11 @@ C_INSTALL_BIN= # sercmd is now installed by ctl # which utils know to install themselves and should be installed # along the core (list of utils directories) +ifeq ($(FLAVOUR),kamailio) +C_INSTALL_UTILS= utils/kamctl +else C_INSTALL_UTILS= +endif # list of scripts that should be installed along the core # (here a script is something that doesn't have a Makefile) C_INSTALL_SCRIPTS=

14 years, 12 months

git:master: renamed kamailio radius dictionary

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 16707ed30d9b057f2480c094b4df30260f2882a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16707ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 14:21:57 2010 +0100 renamed kamailio radius dictionary - matches the pattern used for install dictionary.$cfg_name --- etc/{dictionary.radius => dictionary.kamailio} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/etc/dictionary.radius b/etc/dictionary.kamailio similarity index 100% rename from etc/dictionary.radius rename to etc/dictionary.kamailio

14 years, 12 months

git:master: Makefile: version set to 3.0.99-dev1

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e20d9e128cb8cb5cd5e6b53fb518741b924eb5c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e20d9e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 13:34:21 2010 +0100 Makefile: version set to 3.0.99-dev1 --- Makefile.defs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index d69925c..7e2dd0f 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -141,10 +141,10 @@ SRC_NAME=sip-router INSTALL_FLAVOUR=$(FLAVOUR) #version number -VERSION = 2 -PATCHLEVEL = 99 +VERSION = 3 +PATCHLEVEL = 0 SUBLEVEL = 99 -EXTRAVERSION = -pre3 +EXTRAVERSION = -dev1 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) )

14 years, 12 months

documentation team

by Daniel-Constantin Mierla

Hello, following some discussions on users mailing list, seems we may get a group of people willing to digest documentation and contribute to modules' readme or wiki pages. Hopefully Alex Balashov (who volunteered so far) would have some time to coordinate contributions to git docs, for wiki being easier, as anyone has access. I am willing to help as much I can, but time is always a constraint for a dev. I invite you to join IRC channel #sip-router hosted on freenode.net to plan an synchronize easier. Thanks, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 12 months

how to fast forward?

by jh＠tutpro.com

i'm in branch 'master' and pull it to up to date: jh@rautu:/usr/src/orig/sip-router$ eg switch master Already on "master" Your branch is behind the tracked remote branch 'origin/master' by 283 commits, and can be fast-forwarded. jh@rautu:/usr/src/orig/sip-router$ eg pull remote: Counting objects: 176, done. remote: Compressing objects: 100% (108/108), done. remote: Total 109 (delta 70), reused 0 (delta 0) Receiving objects: 100% (109/109), 45.86 KiB, done. Resolving deltas: 100% (70/70), completed with 29 local objects. >From ssh://jh@git.sip-router.org/sip-router ea1f8a2..77523f3 andrei/cdefs2doc -> origin/andrei/cdefs2doc e6eceeb..f572564 kamailio_3.0 -> origin/kamailio_3.0 73655cc..482db59 master -> origin/master b0853ed..0e1baf0 sr_3.0 -> origin/sr_3.0 * [new branch] tmp/pipelimit -> origin/tmp/pipelimit First, rewinding head to replay your work on top of it... Fast-forwarded master to 482db59aa2788737d9c6c0294a625bd3002d54c3. i then switch to another branch, say 'kamailio_3.0', and it tells me: jh@rautu:/usr/src/orig/sip-router$ eg switch kamailio_3.0 Switched to branch "kamailio_3.0" Your branch is behind the tracked remote branch 'origin/kamailio_3.0' by 1 commit, and can be fast-forwarded. how can i do this 'fast-forwarding' without pulling again in this branch? -- juha

14 years, 12 months

git:master: presence(k): dynamic support for new event package

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 147e776d7a93388711191d208a7a3a107286f96d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=147e776… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 12:06:07 2010 +0100 presence(k): dynamic support for new event package - patch by Aymeric Moizard - events can be given as EVENT_OTHER, matching being done on string value --- modules_k/presence/event_list.c | 5 ++++- modules_k/presence/publish.c | 4 ---- modules_k/presence/subscribe.c | 4 ---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/modules_k/presence/event_list.c b/modules_k/presence/event_list.c index 1ccf39b..2ffdfba 100644 --- a/modules_k/presence/event_list.c +++ b/modules_k/presence/event_list.c @@ -350,7 +350,10 @@ pres_ev_t* search_event(event_t* event) while(pres_ev) { - if(pres_ev->evp->type== event->type) + if((pres_ev->evp->type== event->type && event->type!=EVENT_OTHER) + || (pres_ev->evp->name.len== event->name.len && + strncasecmp(pres_ev->evp->name.s,event->name.s, + pres_ev->evp->name.len)== 0)) { if(event->params.list== NULL && pres_ev->evp->params.list== NULL) { diff --git a/modules_k/presence/publish.c b/modules_k/presence/publish.c index a329433..05e6b15 100644 --- a/modules_k/presence/publish.c +++ b/modules_k/presence/publish.c @@ -325,10 +325,6 @@ int handle_publish(struct sip_msg* msg, char* sender_uri, char* str2) reply_str= pu_400a_rpl; goto error; } - if(((event_t*)msg->event->parsed)->type == EVENT_OTHER) - { - goto unsupported_event; - } } else goto unsupported_event; diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 6ea70ae..2fa38e1 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -544,10 +544,6 @@ int handle_subscribe(struct sip_msg* msg, char* str1, char* str2) reply_str= pu_400_rpl; goto error; } - if(((event_t*)msg->event->parsed)->type == EVENT_OTHER) - { - goto bad_event; - } } else goto bad_event;

14 years, 12 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev