sr-dev

sr-dev@lists.kamailio.org

8 participants
45206 discussions

git:master: Merge branch 'master' of ssh://oej@git.sip-router.org/ sip-router
by Olle E. Johansson 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: dcf0add128aa3eaec29ae082f4b1efa78c5ff3c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcf0add… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:05:45 2009 +0200 Merge branch 'master' of ssh://oej@git.sip-router.org/sip-router * 'master' of ssh://oej@git.sip-router.org/sip-router: makefile: even more quiet modules warning fixes * callcontrol makefile: quiet output support pike_top: moved from tools/ to utils/ kamctl: moved from tools/ to utils/ core ev: minor cleanups topoh: new module for hiding topology details core: new sr events system core: execute callbacks for NET_DATA_IN and NET_DATA_OUT ---

1 0

git:master: modules warning fixes
by Andrei Pelinescu-Onciul 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: 8830e341eaa524675d7bf309f900c75eab251916 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8830e34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 20:59:18 2009 +0200 modules warning fixes --- lib/binrpc/binrpc_api.c | 2 +- modules_k/siputils/contact_ops.c | 2 +- modules_k/tmx/tmx_mod.c | 2 +- modules_s/ctl/binrpc_run.c | 2 ++ modules_s/eval/eval.c | 1 + modules_s/msilo/msilo.c | 1 + modules_s/permissions/ip_set.c | 1 + 7 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/binrpc/binrpc_api.c b/lib/binrpc/binrpc_api.c index c76267c..89277dd 100644 --- a/lib/binrpc/binrpc_api.c +++ b/lib/binrpc/binrpc_api.c @@ -457,7 +457,7 @@ static int get_reply(struct binrpc_handle *handle, if (n == 0) snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "get_reply: read unexpected EOF: received %d bytes" - " of reply", crt - handle->buf); + " of reply", (int)(long)(crt - handle->buf)); else snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "get_reply: read reply failed: %s (%d)", diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 6601092..872c239 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -488,7 +488,7 @@ decode2format (str uri, char separator, struct uri_format *format) } #ifdef DEBUG - fprintf (stdout, "Decoding %.*s\n",end-start,start); + fprintf (stdout, "Decoding %.*s\n", (int)(long)(end-start), start); #endif state = EX_PREFIX; diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 4a51e7f..0c3af19 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -228,7 +228,7 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) tcx = _tmx_tmb.tm_ctx_get(); if(tcx != NULL) idx = tcx->branch_index; - n = (int)k; + n = (int)(long)k; switch(n) { case 1: /* prepare cancel for every branch except idx */ diff --git a/modules_s/ctl/binrpc_run.c b/modules_s/ctl/binrpc_run.c index aa50e8a..8ad914f 100644 --- a/modules_s/ctl/binrpc_run.c +++ b/modules_s/ctl/binrpc_run.c @@ -302,6 +302,7 @@ error: +#if 0 /* expects an initialized new_b */ static int build_structs(struct binrpc_pkt *new_b, struct binrpc_pkt* body, struct rpc_struct_head* sl_head) @@ -323,6 +324,7 @@ static int build_structs(struct binrpc_pkt *new_b, struct binrpc_pkt* body, error: return ret; } +#endif diff --git a/modules_s/eval/eval.c b/modules_s/eval/eval.c index 2c064b8..2c31f75 100644 --- a/modules_s/eval/eval.c +++ b/modules_s/eval/eval.c @@ -182,6 +182,7 @@ static void get_uri_and_skip_until_params(str *param_area, str *uri) { int i, quoted, uri_pos, uri_done; uri->len = 0; + uri->s = 0; uri_done = 0; for (i=0; i<param_area->len && param_area->s[i]!=';'; ) { /* [ *(token LSW)/quoted-string ] "<" addr-spec ">" | addr-spec */ /* skip name */ diff --git a/modules_s/msilo/msilo.c b/modules_s/msilo/msilo.c index b664b9b..9aa4ebd 100644 --- a/modules_s/msilo/msilo.c +++ b/modules_s/msilo/msilo.c @@ -561,6 +561,7 @@ static int m_dump(struct sip_msg* msg, char* str1, char* str2) str next_hop = STR_NULL; uac_req_t uac_r; + i=0; /* fix warning in DBG() */ if (str1) { next_hop.s = str1; next_hop.len = strlen(str1); diff --git a/modules_s/permissions/ip_set.c b/modules_s/permissions/ip_set.c index 74bcbfa..f33297c 100644 --- a/modules_s/permissions/ip_set.c +++ b/modules_s/permissions/ip_set.c @@ -101,6 +101,7 @@ int ip_set_add_list(struct ip_set *ip_set, str ip_set_s){ ip_set_s.s += ip_s.len; ip_set_s.len -= ip_s.len; mask_s.len = 0; + mask_s.s=0; if (ip_set_s.len && ip_set_s.s[0] == '/') { ip_set_s.s++; ip_set_s.len--;

1 0

git:master: makefile: even more quiet
by Andrei Pelinescu-Onciul 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: a91ba01fc9abbd737e560704e4620370a4e1c08a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a91ba01… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 21:03:03 2009 +0200 makefile: even more quiet --- Makefile | 56 +++++++++++++++++++++++++++++++------------------------- Makefile.defs | 11 +++++++++-- Makefile.libs | 2 ++ Makefile.rules | 13 +++++++++---- 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 3a399a6..88d96e6 100644 --- a/Makefile +++ b/Makefile @@ -247,7 +247,9 @@ ifeq (,$(strip \ $(filter config.mak config cfg cfg-defs $(clean_targets),$(MAKECMDGOALS)))) include config.mak ifeq ($(makefile_defs),1) +ifeq ($(quiet),verbose) $(info config.mak loaded) +endif # verbose # config_make valid & used config_mak=1 ifeq ($(MAIN_NAME),) @@ -265,6 +267,10 @@ $(shell rm -rf config.mak) config_mak=0 makefile_defs=0 exported_vars=0 +else +# config.mak not strictly needed, but try to load it if exists for $(Q) +config_mak=skip +-include config.mak endif endif @@ -401,7 +407,7 @@ ifeq ($(config_mak),1) include Makefile.cfg -else +else ifneq ($(config_mak),skip) config.mak: Makefile.defs @echo making config... @@ -494,8 +500,8 @@ $(1)_target=$(prefix)/$(modules_dir)$(1) $(1): modules.lst @for r in $($(1)) "" ; do \ if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r $$(mk_params) || [ ${err_fail} != 1 ] ; then \ :; \ else \ @@ -508,8 +514,8 @@ $(1): modules.lst $(1)-doc: modules.lst @for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \\ $(MAKE) -C $$$$r/doc $(doc_format) $$(mk_params); \ fi ; \ done @@ -519,8 +525,8 @@ $(1)-doc: modules.lst $(1)-readme: modules.lst -@for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r $$(mk_params) README || [ ${err_fail} != 1 ];\ then \ :; \ @@ -534,8 +540,8 @@ $(1)-readme: modules.lst $(1)-man: modules.lst -@for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r $$(mk_params) man || [ ${err_fail} != 1 ] ;\ then \ :; \ @@ -550,8 +556,8 @@ $(1)-man: modules.lst install-$(1): modules.lst $$($(1)_dst) @for r in $($(1)) "" ; do \ if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r install mods_dst=$$($(1)_dst) $$(mk_params) \ || [ ${err_fail} != 1 ] ; then \ :; \ @@ -617,8 +623,8 @@ $(extra_objs): @echo "Extra objs: $(extra_objs)" @for r in $(static_modules_path) "" ; do \ if [ -n "$$r" -a -r "$$r/Makefile" ]; then \ - echo "" ; \ - echo "Making static module $r" ; \ + $(call oecho, "" ;) \ + $(call oecho, "Making static module $r" ;) \ if $(MAKE) -C $$r static $(mk_params) ; then \ :; \ else \ @@ -631,8 +637,8 @@ $(extra_objs): utils: @for r in $(utils_compile) "" ; do \ if [ -n "$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$r $(mk_params) || [ ${err_fail} != 1 ] ; \ then \ :; \ @@ -774,22 +780,22 @@ $(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),\ + @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 \ + @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 - sed $(foreach m,$(modules_dirs),\ + @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 \ + @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 \ @@ -878,22 +884,22 @@ install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc install-sr-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 - sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ + @sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ < $(CFG_NAME).8 > \ $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 - chmod 644 $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 - sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ + @chmod 644 $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 + @sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ < $(CFG_NAME).cfg.5 > \ $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 - chmod 644 $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 + @chmod 644 $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 install-man: install-sr-man install-every-module-man diff --git a/Makefile.defs b/Makefile.defs index a9bd307..ee02e39 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -75,15 +75,18 @@ # 2009-10-01 use -fsigned-char for gcc on ppc, ppc64, arm and arm6 # (on those archs char is unsigned by default) (andrei) +quiet?=$(if $(filter 1 yes on,$(Q)),silent,verbose) # check if already included/exported - # used for sanity checks for Makefile.defs inclusion (!= makefile_defs which # specifies if we have a set of valid defs) override makefile_defs_included:=1 ifeq ($(makefile_defs),1) +ifeq ($(quiet),verbose) $(info Makefile.defs defs skipped) +endif # verbose + else ifeq (,$(main_makefile)) @@ -94,7 +97,9 @@ ifeq (,$(main_makefile)) # don't export the vars) COREPATH?= ../.. include $(COREPATH)/config.mak +ifeq ($(quiet),verbose) $(info config.mak included) +endif # verbose # config.mak should set makefile_defs if complete export makefile_defs @@ -103,7 +108,9 @@ override makefile_defs=1 export makefile_defs +ifeq ($(quiet),verbose) $(info normal Makefile.defs exec) +endif # verbose # main binary name MAIN_NAME=ser #prefix for various configs and scripts @@ -417,11 +424,11 @@ endif # predefined macros tests (x86_macros, ...) endif # gcc ifdef CC_ARCH -$(info target architecture <$(CC_ARCH)>, host architecture <$(HOST_ARCH)>) ARCH:=$(CC_ARCH) else ARCH:=$(HOST_ARCH) endif +$(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) # compile-time options # diff --git a/Makefile.libs b/Makefile.libs index 21df837..6182580 100644 --- a/Makefile.libs +++ b/Makefile.libs @@ -20,7 +20,9 @@ endif ifneq (,$(filter install% %install install, $(MAKECMDGOALS))) compile_for_install:=yes +ifeq ($(quiet),verbose) $(info install mode) +endif # verbose endif ifeq ($(NAME),) diff --git a/Makefile.rules b/Makefile.rules index 55c7897..feadec5 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -66,9 +66,14 @@ silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ ifneq (,$(filter 1 yes on, $(Q) $(QUIET))) quiet=silent Q=1 +MAKE+= --no-print-directory +#shell optional print +oecho= else -Q=0 +override Q:= quiet=verbose +#shell optional print +oecho=echo $(1) endif quote:= " @@ -156,14 +161,14 @@ $(SER_IPATH_LST): FORCE $(@) 1>/dev/null 2>/dev/null ; \ then :; \ else \ - echo "re-building $(@D)" ; \ + $(call oecho,"re-building $(@D)" ;) \ $(MAKE) -wC $(@D) compile_for_install=$(lib_compile_for_install) ; \ fi .PHONY: FORCE-BUILD-LIBS FORCE-BUILD-LIBS: @for r in $(SER_LIBS_DIRS) ; do \ - echo building lib $$r; \ + $(call oecho,building lib $$r ;) \ $(MAKE) -wC $$r compile_for_install=$(lib_compile_for_install) ; \ done @@ -207,7 +212,7 @@ clean: local-clean clean-modules: -@for r in $(cmodules) $(static_modules_path) "" ; do \ if [ -d "$$r" ]; then \ - echo "module $$r" ; \ + $(call oecho,"module $$r" ;) \ $(MAKE) -C "$$r" clean ; \ [ -d "$$r"/doc/Makefile ] && $(MAKE) -C "$$r"/doc clean ; \ fi ; \

1 0

git:master: * callcontrol
by Raul Alexis Betancor Santana 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: 66b8b7d0942ff68ae83a34a2c69d5259e0677da3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66b8b7d… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Fri Oct 9 19:20:41 2009 +0100 * callcontrol - Ported r6149 from OpenSips: added support for customizing call-control messages from the script - Ported r6236 from OpenSips: fixed incorrect release of memory --- modules_k/call_control/call_control.c | 219 +++++++++++++++++++++++++++++++-- 1 files changed, 210 insertions(+), 9 deletions(-) diff --git a/modules_k/call_control/call_control.c b/modules_k/call_control/call_control.c index f7e1ca2..03ba632 100644 --- a/modules_k/call_control/call_control.c +++ b/modules_k/call_control/call_control.c @@ -86,6 +86,12 @@ typedef struct AVP_Param { unsigned short type; } AVP_Param; +typedef struct AVP_List { + pv_spec_p pv; + str name; + struct AVP_List *next; +} AVP_List; + #define RETRY_INTERVAL 10 #define BUFFER_SIZE 8192 @@ -103,8 +109,12 @@ static int CallControl(struct sip_msg *msg, char *str1, char *str2); static int mod_init(void); static int child_init(int rank); -static int postprocess_request(struct sip_msg *msg, unsigned int flags, void *_param); +static void destroy(void); +static int postprocess_request(struct sip_msg *msg, void *_param); +int parse_param_init(unsigned int type, void *val); +int parse_param_start(unsigned int type, void *val); +int parse_param_stop(unsigned int type, void *val); /* Local global variables */ static CallControlSocket callcontrol_socket = { @@ -128,6 +138,9 @@ static AVP_Param signaling_ip_avp = {str_init(SIGNALING_IP_AVP_SPEC), {0}, 0}; struct dlg_binds dlg_api; static int dialog_flag = -1; +AVP_List *cc_init_avps = NULL, *cc_start_avps = NULL, *cc_stop_avps = NULL; + +pv_elem_t *model; static cmd_export_t commands[] = { {"call_control", (cmd_function)CallControl, 0, 0, 0, REQUEST_ROUTE }, @@ -135,6 +148,9 @@ static cmd_export_t commands[] = { }; static param_export_t parameters[] = { + {"init", STR_PARAM | USE_FUNC_PARAM, parse_param_init}, + {"start", STR_PARAM | USE_FUNC_PARAM, parse_param_start}, + {"stop", STR_PARAM | USE_FUNC_PARAM, parse_param_stop}, {"disable", INT_PARAM, &disable}, {"socket_name", STR_PARAM, &(callcontrol_socket.name)}, {"socket_timeout", INT_PARAM, &(callcontrol_socket.timeout)}, @@ -155,7 +171,7 @@ struct module_exports exports = { NULL, // extra processes mod_init, // module init function (before fork. kids will inherit) NULL, // reply processing function - NULL, // destroy function + destroy, // destroy function child_init // child init function }; @@ -191,6 +207,117 @@ typedef struct CallInfo { } CallInfo; + +#define CHECK_COND(cond) \ + if ((cond) == 0) { \ + LM_ERR("malformed modparam\n"); \ + return -1; \ + } + +#define CHECK_ALLOC(p) \ + if (!(p)) { \ + LM_ERR("no memory left\n"); \ + return -1; \ + } + + +void +destroy_list(AVP_List *list) { + AVP_List *cur, *next; + + cur = list; + while (cur) { + next = cur->next; + pkg_free(cur); + cur = next; + } +} + + +int +parse_param(void *val, AVP_List** avps) { + + char *p; + str *s, content; + AVP_List *mp = NULL; + + //LM_DBG("%.*s\n", content.len, content.s); + + content.s = (char*) val; + content.len = strlen(content.s); + + + p = (char*) pkg_malloc (content.len + 1); + CHECK_ALLOC(p); + + p[content.len] = '\0'; + memcpy(p, content.s, content.len); + + s = (str*) pkg_malloc(sizeof(str)); + CHECK_ALLOC(s); + + for (;*p != '\0';) { + + mp = (AVP_List*) pkg_malloc (sizeof(AVP_List)); + CHECK_ALLOC(mp); + mp->next = *avps; + mp->pv = (pv_spec_p) pkg_malloc (sizeof(pv_spec_t)); + CHECK_ALLOC(mp->pv); + + for (; isspace(*p); p++); + CHECK_COND(*p != '\0'); + + mp->name.s = p; + + for(; isgraph(*p) && *p != '='; p++) + CHECK_COND(*p != '\0'); + + mp->name.len = p - mp->name.s; + + for (; isspace(*p); p++); + CHECK_COND(*p != '\0' && *p == '='); + p++; + + //LM_DBG("%.*s\n", mp->name.len, mp->name.s); + + for (; isspace(*p); p++); + CHECK_COND(*p != '\0' && *p == '$'); + + s->s = p; + s->len = strlen(p); + + p = pv_parse_spec(s, mp->pv); + + for (; isspace(*p); p++); + *avps = mp; + } + + return 0; +} + + +int +parse_param_init(unsigned int type, void *val) { + if (parse_param(val, &cc_init_avps) == -1) + return E_CFG; + return 0; +} + +int +parse_param_start(unsigned int type, void *val) { + if (parse_param(val, &cc_start_avps) == -1) + return E_CFG; + return 0; +} + +int +parse_param_stop(unsigned int type, void *val) { + if (parse_param(val, &cc_stop_avps) == -1) + return E_CFG; + return 0; +} + + // Functions dealing with strings // @@ -414,9 +541,55 @@ get_call_info(struct sip_msg *msg, CallControlAction action) return &call_info; } +static char* +make_custom_request(struct sip_msg *msg, CallInfo *call) +{ + static char request[8192]; + int len = 0; + AVP_List *al; + pv_value_t pt; + + switch (call->action) { + case CAInitialize: + al = cc_init_avps; + break; + case CAStart: + al = cc_start_avps; + break; + case CAStop: + al = cc_stop_avps; + break; + default: + // should never get here, but keep gcc from complaining + assert(False); + return NULL; + } + + for (; al; al = al->next) { + pv_get_spec_value(msg, al->pv, &pt); + if (pt.flags & PV_VAL_INT) { + len += snprintf(request + len, sizeof(request), + "%.*s = %d ", al->name.len, al->name.s, + pt.ri); + } else if (pt.flags & PV_VAL_STR) { + len += snprintf(request + len, sizeof(request), + "%.*s = %.*s ", al->name.len, al->name.s, + pt.rs.len, pt.rs.s); + } + + if (len >= sizeof(request)) { + LM_ERR("callcontrol request is longer than %ld bytes\n", (unsigned long)sizeof(request)); + return NULL; + } + } + + + return request; +} + static char* -make_request(CallInfo *call) +make_default_request(CallInfo *call) { static char request[8192]; int len; @@ -645,18 +818,25 @@ static int call_control_initialize(struct sip_msg *msg) { CallInfo *call; - char *message, *result; + char *message, *result = NULL; + call = get_call_info(msg, CAInitialize); if (!call) { LOG(L_ERR, "can't retrieve call info\n"); return -5; } - message = make_request(call); + + + if (!cc_init_avps) + message = make_default_request(call); + else + message = make_custom_request(msg, call); + if (!message) return -5; - result = send_command(message); + result = send_command(message); if (result==NULL) { return -5; @@ -695,7 +875,11 @@ call_control_start(struct sip_msg *msg, struct dlg_cell *dlg) call->dialog_id.h_entry = dlg->h_entry; call->dialog_id.h_id = dlg->h_id; - message = make_request(call); + if (!cc_start_avps) + message = make_default_request(call); + else + message = make_custom_request(msg, call); + if (!message) return -5; @@ -728,7 +912,11 @@ call_control_stop(struct sip_msg *msg, str callid) call.action = CAStop; call.callid = callid; - message = make_request(&call); + if (!cc_stop_avps) + message = make_default_request(&call); + else + message = make_custom_request(msg, &call); + if (!message) return -5; @@ -933,6 +1121,19 @@ child_init(int rank) } +static void +destroy(void) { + if (cc_init_avps) + destroy_list(cc_init_avps); + + if (cc_start_avps) + destroy_list(cc_start_avps); + + if (cc_stop_avps) + destroy_list(cc_stop_avps); +} + + // Postprocess a request after the main script route is done. // // After all script processing is done, check if the dialog was actually @@ -943,7 +1144,7 @@ child_init(int rank) // would remain dangling until it expires. // static int -postprocess_request(struct sip_msg *msg, unsigned int flags, void *_param) +postprocess_request(struct sip_msg *msg, void *_param) { CallInfo *call;

1 0

git:master: pike_top: moved from tools/ to utils/
by Andrei Pelinescu-Onciul 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: 21e69f544001fac0363d6a12ace881870127de4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21e69f5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 14:09:17 2009 +0200 pike_top: moved from tools/ to utils/ --- {tools => utils}/pike_top/INSTALL | 0 {tools => utils}/pike_top/Makefile | 0 {tools => utils}/pike_top/pike_top.c | 0 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/pike_top/INSTALL b/utils/pike_top/INSTALL similarity index 100% rename from tools/pike_top/INSTALL rename to utils/pike_top/INSTALL diff --git a/tools/pike_top/Makefile b/utils/pike_top/Makefile similarity index 100% rename from tools/pike_top/Makefile rename to utils/pike_top/Makefile diff --git a/tools/pike_top/pike_top.c b/utils/pike_top/pike_top.c similarity index 100% rename from tools/pike_top/pike_top.c rename to utils/pike_top/pike_top.c

1 0

git:master: Merge remote branch 'origin/tmp/core_events'
by Andrei Pelinescu-Onciul 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: e57768f78261efa068b4de2b4fc8b01811765d48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e57768f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 14:16:41 2009 +0200 Merge remote branch 'origin/tmp/core_events' * origin/tmp/core_events: core ev: minor cleanups topoh: new module for hiding topology details core: new sr events system core: execute callbacks for NET_DATA_IN and NET_DATA_OUT ---

1 0

git:master: kamctl: moved from tools/ to utils/
by Andrei Pelinescu-Onciul 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: 9df9c6e10ffe0851b7f4f2f00697c5644aaf9faa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9df9c6e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 14:05:15 2009 +0200 kamctl: moved from tools/ to utils/ - mv tools/kamctl utils/kamctl - updated srdb1 Makefile and test/unit/include/common with the new kamctl path --- lib/srdb1/schema/Makefile | 2 +- test/unit/include/common | 4 ++-- {tools => utils}/kamctl/Makefile | 0 {tools => utils}/kamctl/db_berkeley/kamailio/acc | 0 .../kamctl/db_berkeley/kamailio/active_watchers | 0 .../kamctl/db_berkeley/kamailio/address | 0 .../kamctl/db_berkeley/kamailio/aliases | 0 .../kamctl/db_berkeley/kamailio/carrier_name | 0 .../db_berkeley/kamailio/carrierfailureroute | 0 .../kamctl/db_berkeley/kamailio/carrierroute | 0 {tools => utils}/kamctl/db_berkeley/kamailio/cpl | 0 .../kamctl/db_berkeley/kamailio/dbaliases | 0 .../kamctl/db_berkeley/kamailio/dialog | 0 .../kamctl/db_berkeley/kamailio/dialplan | 0 .../kamctl/db_berkeley/kamailio/dispatcher | 0 .../kamctl/db_berkeley/kamailio/domain | 0 .../kamctl/db_berkeley/kamailio/domain_name | 0 .../kamctl/db_berkeley/kamailio/domainpolicy | 0 .../kamctl/db_berkeley/kamailio/globalblacklist | 0 {tools => utils}/kamctl/db_berkeley/kamailio/grp | 0 {tools => utils}/kamctl/db_berkeley/kamailio/gw | 0 .../kamctl/db_berkeley/kamailio/htable | 0 .../kamctl/db_berkeley/kamailio/imc_members | 0 .../kamctl/db_berkeley/kamailio/imc_rooms | 0 {tools => utils}/kamctl/db_berkeley/kamailio/lcr | 0 .../kamctl/db_berkeley/kamailio/location | 0 .../kamctl/db_berkeley/kamailio/missed_calls | 0 {tools => utils}/kamctl/db_berkeley/kamailio/pdt | 0 .../kamctl/db_berkeley/kamailio/presentity | 0 {tools => utils}/kamctl/db_berkeley/kamailio/pua | 0 .../kamctl/db_berkeley/kamailio/purplemap | 0 .../kamctl/db_berkeley/kamailio/re_grp | 0 .../kamctl/db_berkeley/kamailio/rls_presentity | 0 .../kamctl/db_berkeley/kamailio/rls_watchers | 0 {tools => utils}/kamctl/db_berkeley/kamailio/silo | 0 .../kamctl/db_berkeley/kamailio/sip_trace | 0 .../kamctl/db_berkeley/kamailio/speed_dial | 0 .../kamctl/db_berkeley/kamailio/subscriber | 0 .../kamctl/db_berkeley/kamailio/trusted | 0 {tools => utils}/kamctl/db_berkeley/kamailio/uri | 0 .../kamctl/db_berkeley/kamailio/userblacklist | 0 .../kamctl/db_berkeley/kamailio/usr_preferences | 0 .../kamctl/db_berkeley/kamailio/version | 0 .../kamctl/db_berkeley/kamailio/watchers | 0 {tools => utils}/kamctl/db_berkeley/kamailio/xcap | 0 {tools => utils}/kamctl/dbtext/kamailio/acc | 0 .../kamctl/dbtext/kamailio/active_watchers | 0 {tools => utils}/kamctl/dbtext/kamailio/address | 0 {tools => utils}/kamctl/dbtext/kamailio/aliases | 0 .../kamctl/dbtext/kamailio/carrier_name | 0 .../kamctl/dbtext/kamailio/carrierfailureroute | 0 .../kamctl/dbtext/kamailio/carrierroute | 0 {tools => utils}/kamctl/dbtext/kamailio/cpl | 0 {tools => utils}/kamctl/dbtext/kamailio/dbaliases | 0 {tools => utils}/kamctl/dbtext/kamailio/dialog | 0 {tools => utils}/kamctl/dbtext/kamailio/dialplan | 0 {tools => utils}/kamctl/dbtext/kamailio/dispatcher | 0 {tools => utils}/kamctl/dbtext/kamailio/domain | 0 .../kamctl/dbtext/kamailio/domain_name | 0 .../kamctl/dbtext/kamailio/domainpolicy | 0 .../kamctl/dbtext/kamailio/globalblacklist | 0 {tools => utils}/kamctl/dbtext/kamailio/grp | 0 {tools => utils}/kamctl/dbtext/kamailio/gw | 0 {tools => utils}/kamctl/dbtext/kamailio/htable | 0 .../kamctl/dbtext/kamailio/imc_members | 0 {tools => utils}/kamctl/dbtext/kamailio/imc_rooms | 0 {tools => utils}/kamctl/dbtext/kamailio/lcr | 0 {tools => utils}/kamctl/dbtext/kamailio/location | 0 .../kamctl/dbtext/kamailio/missed_calls | 0 {tools => utils}/kamctl/dbtext/kamailio/pdt | 0 {tools => utils}/kamctl/dbtext/kamailio/presentity | 0 {tools => utils}/kamctl/dbtext/kamailio/pua | 0 {tools => utils}/kamctl/dbtext/kamailio/purplemap | 0 {tools => utils}/kamctl/dbtext/kamailio/re_grp | 0 .../kamctl/dbtext/kamailio/rls_presentity | 0 .../kamctl/dbtext/kamailio/rls_watchers | 0 {tools => utils}/kamctl/dbtext/kamailio/silo | 0 {tools => utils}/kamctl/dbtext/kamailio/sip_trace | 0 {tools => utils}/kamctl/dbtext/kamailio/speed_dial | 0 {tools => utils}/kamctl/dbtext/kamailio/subscriber | 0 {tools => utils}/kamctl/dbtext/kamailio/trusted | 0 {tools => utils}/kamctl/dbtext/kamailio/uri | 0 .../kamctl/dbtext/kamailio/userblacklist | 0 .../kamctl/dbtext/kamailio/usr_preferences | 0 {tools => utils}/kamctl/dbtext/kamailio/version | 0 {tools => utils}/kamctl/dbtext/kamailio/watchers | 0 {tools => utils}/kamctl/dbtext/kamailio/xcap | 0 {tools => utils}/kamctl/dbtextdb/__init__.py | 0 {tools => utils}/kamctl/dbtextdb/dbtextdb.py | 0 {tools => utils}/kamctl/dbtextdb/dbtextdb_test.py | 0 .../kamctl/dbtextdb/tests/bad_table_auto_dupe | 0 .../kamctl/dbtextdb/tests/bad_table_int | 0 .../kamctl/dbtextdb/tests/bad_table_long_row | 0 .../kamctl/dbtextdb/tests/bad_table_null | 0 .../kamctl/dbtextdb/tests/bad_table_short_row | 0 .../kamctl/dbtextdb/tests/bad_table_wrong_type | 0 {tools => utils}/kamctl/dbtextdb/tests/subscriber | 0 {tools => utils}/kamctl/dbtextdb/tests/test | 0 .../kamctl/dbtextdb/tests/unsorted_table | 0 .../kamctl/dbtextdb/tests/unsorted_table2 | 0 {tools => utils}/kamctl/kamctl | 0 {tools => utils}/kamctl/kamctl.8 | 0 {tools => utils}/kamctl/kamctl.base | 0 {tools => utils}/kamctl/kamctl.ctlbase | 0 {tools => utils}/kamctl/kamctl.db_berkeley | 0 {tools => utils}/kamctl/kamctl.dbtext | 0 {tools => utils}/kamctl/kamctl.fifo | 0 {tools => utils}/kamctl/kamctl.mysql | 0 {tools => utils}/kamctl/kamctl.oracle | 0 {tools => utils}/kamctl/kamctl.pgsql | 0 {tools => utils}/kamctl/kamctl.sqlbase | 0 {tools => utils}/kamctl/kamctl.unixsock | 0 {tools => utils}/kamctl/kamctlrc | 0 {tools => utils}/kamctl/kamdbctl | 0 {tools => utils}/kamctl/kamdbctl.8 | 0 {tools => utils}/kamctl/kamdbctl.base | 0 {tools => utils}/kamctl/kamdbctl.db_berkeley | 0 {tools => utils}/kamctl/kamdbctl.dbtext | 0 {tools => utils}/kamctl/kamdbctl.mysql | 0 {tools => utils}/kamctl/kamdbctl.oracle | 0 {tools => utils}/kamctl/kamdbctl.pgsql | 0 {tools => utils}/kamctl/kamdbfunc.oracle | 0 {tools => utils}/kamctl/mysql/acc-create.sql | 0 {tools => utils}/kamctl/mysql/alias_db-create.sql | 0 {tools => utils}/kamctl/mysql/auth_db-create.sql | 0 {tools => utils}/kamctl/mysql/avpops-create.sql | 0 .../kamctl/mysql/carrierroute-create.sql | 0 {tools => utils}/kamctl/mysql/cpl-create.sql | 0 {tools => utils}/kamctl/mysql/dialog-create.sql | 0 {tools => utils}/kamctl/mysql/dialplan-create.sql | 0 .../kamctl/mysql/dispatcher-create.sql | 0 {tools => utils}/kamctl/mysql/domain-create.sql | 0 .../kamctl/mysql/domainpolicy-create.sql | 0 {tools => utils}/kamctl/mysql/group-create.sql | 0 {tools => utils}/kamctl/mysql/htable-create.sql | 0 {tools => utils}/kamctl/mysql/imc-create.sql | 0 {tools => utils}/kamctl/mysql/lcr-create.sql | 0 {tools => utils}/kamctl/mysql/msilo-create.sql | 0 {tools => utils}/kamctl/mysql/pdt-create.sql | 0 .../kamctl/mysql/permissions-create.sql | 0 {tools => utils}/kamctl/mysql/presence-create.sql | 0 {tools => utils}/kamctl/mysql/purple-create.sql | 0 {tools => utils}/kamctl/mysql/registrar-create.sql | 0 {tools => utils}/kamctl/mysql/rls-create.sql | 0 {tools => utils}/kamctl/mysql/siptrace-create.sql | 0 {tools => utils}/kamctl/mysql/speeddial-create.sql | 0 {tools => utils}/kamctl/mysql/standard-create.sql | 0 {tools => utils}/kamctl/mysql/uri_db-create.sql | 0 .../kamctl/mysql/userblacklist-create.sql | 0 {tools => utils}/kamctl/mysql/usrloc-create.sql | 0 {tools => utils}/kamctl/oracle/README.TYPES | 0 {tools => utils}/kamctl/oracle/acc-create.sql | 0 {tools => utils}/kamctl/oracle/admin/README | 0 .../kamctl/oracle/admin/_create_as_sys.tmpl | 0 .../kamctl/oracle/admin/_drop_as_sys.tmpl | 0 {tools => utils}/kamctl/oracle/alias_db-create.sql | 0 {tools => utils}/kamctl/oracle/auth_db-create.sql | 0 {tools => utils}/kamctl/oracle/avpops-create.sql | 0 .../kamctl/oracle/carrierroute-create.sql | 0 {tools => utils}/kamctl/oracle/cpl-create.sql | 0 {tools => utils}/kamctl/oracle/dialog-create.sql | 0 {tools => utils}/kamctl/oracle/dialplan-create.sql | 0 .../kamctl/oracle/dispatcher-create.sql | 0 {tools => utils}/kamctl/oracle/domain-create.sql | 0 .../kamctl/oracle/domainpolicy-create.sql | 0 {tools => utils}/kamctl/oracle/group-create.sql | 0 {tools => utils}/kamctl/oracle/htable-create.sql | 0 {tools => utils}/kamctl/oracle/imc-create.sql | 0 .../kamctl/oracle/inc/_create_compat.sql | 0 {tools => utils}/kamctl/oracle/inc/_createsch.tmpl | 0 {tools => utils}/kamctl/oracle/inc/_dropsch.tmpl | 0 {tools => utils}/kamctl/oracle/inc/_grantfunc.tmpl | 0 {tools => utils}/kamctl/oracle/inc/_grantroot.tmpl | 0 {tools => utils}/kamctl/oracle/lcr-create.sql | 0 {tools => utils}/kamctl/oracle/msilo-create.sql | 0 {tools => utils}/kamctl/oracle/pdt-create.sql | 0 .../kamctl/oracle/permissions-create.sql | 0 {tools => utils}/kamctl/oracle/presence-create.sql | 0 {tools => utils}/kamctl/oracle/purple-create.sql | 0 .../kamctl/oracle/registrar-create.sql | 0 {tools => utils}/kamctl/oracle/rls-create.sql | 0 {tools => utils}/kamctl/oracle/siptrace-create.sql | 0 .../kamctl/oracle/speeddial-create.sql | 0 {tools => utils}/kamctl/oracle/standard-create.sql | 0 {tools => utils}/kamctl/oracle/uri_db-create.sql | 0 .../kamctl/oracle/userblacklist-create.sql | 0 {tools => utils}/kamctl/oracle/usrloc-create.sql | 0 {tools => utils}/kamctl/postgres/acc-create.sql | 0 .../kamctl/postgres/alias_db-create.sql | 0 .../kamctl/postgres/auth_db-create.sql | 0 {tools => utils}/kamctl/postgres/avpops-create.sql | 0 .../kamctl/postgres/carrierroute-create.sql | 0 {tools => utils}/kamctl/postgres/cpl-create.sql | 0 {tools => utils}/kamctl/postgres/dialog-create.sql | 0 .../kamctl/postgres/dialplan-create.sql | 0 .../kamctl/postgres/dispatcher-create.sql | 0 {tools => utils}/kamctl/postgres/domain-create.sql | 0 .../kamctl/postgres/domainpolicy-create.sql | 0 {tools => utils}/kamctl/postgres/group-create.sql | 0 {tools => utils}/kamctl/postgres/htable-create.sql | 0 {tools => utils}/kamctl/postgres/imc-create.sql | 0 {tools => utils}/kamctl/postgres/lcr-create.sql | 0 {tools => utils}/kamctl/postgres/msilo-create.sql | 0 {tools => utils}/kamctl/postgres/pdt-create.sql | 0 .../kamctl/postgres/permissions-create.sql | 0 .../kamctl/postgres/presence-create.sql | 0 {tools => utils}/kamctl/postgres/purple-create.sql | 0 .../kamctl/postgres/registrar-create.sql | 0 {tools => utils}/kamctl/postgres/rls-create.sql | 0 .../kamctl/postgres/siptrace-create.sql | 0 .../kamctl/postgres/speeddial-create.sql | 0 .../kamctl/postgres/standard-create.sql | 0 {tools => utils}/kamctl/postgres/uri_db-create.sql | 0 .../kamctl/postgres/userblacklist-create.sql | 0 {tools => utils}/kamctl/postgres/usrloc-create.sql | 0 215 files changed, 3 insertions(+), 3 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9df…

1 0

Database docs - INSTALL
by Olle E. Johansson 09 Oct '09

09 Oct '09

As a separate issue for a morning discussion, we need to discuss the varius "*ctl" apps. The INSTALL document fails to mention that we have kamdbctl that will populate the databases with the proper tables and indexes automagically for you. Now, this is on the kamailio side of our schizophrenic product, so it's propably not very generic - or have we reached a stage where the database tables are the same for both variants of sip-router? If so, we should propably move kamdbctl out of the kamailio corner, move it up front and rename it srdbctl or something more generic. When we package Kamailio for release 3, we can modify the INSTALL for that distro, but if we can avoid having to mantain duplicates or different versions of documentation, life will be much easier for everyone involved. Your thoughts or feedback on this, please! /O

4 4

git:master: Updating INSTALL - mostly formatting
by Olle E. Johansson 09 Oct '09

09 Oct '09

Module: sip-router Branch: master Commit: df0c82a0c0a18eb195c03b1b0e55c0624da8a7e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df0c82a… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 11:23:20 2009 +0200 Updating INSTALL - mostly formatting --- INSTALL | 664 ++++++++++++++++++++++++++++++--------------------------------- 1 files changed, 319 insertions(+), 345 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=df0…

1 0

INSTALL file
by Olle E. Johansson 09 Oct '09

09 Oct '09

Good morning, team! I took a look at the INSTALL file yesterday, and it's getting very old and not very up2date. I added a small part in the beginning to explain the new product: + Welcome to the SIP router! This is an amazingly flexible, robust + and secure SIP server built on years of experience in several Open + Source projects. It's a merge of the SIP Express Router and the + OpenSER/Kamailio products produced by a joint development team. + This memo gives you hints how to set up SIP Router quickly. To understand how SIP Router works and how to configure it properly, - read admin's guide available from SIP Router website. We also - urge you to read latest ISSUES (available from SIP Router website + please read the admin's guide available from the SIP Router website. + + We also urge you to read latest ISSUES (available from SIP Router website too) and check for potential problems in this release. - Users of previous releases are encouraged to read NEWS to - learn how to move to this new SIP Router version. + Users of previous releases are encouraged to read NEWS to learn how to move to + this new SIP Router version. OK? I also changed the layout to make it more readable. Seemed like many people have added to the file during the years and had different ideas on formatting. The documented only mentioned Mysql as a module and made it sound like installing Mysql was a requirement unless you wanted to run without any security at all. I rephrased that and changes to "a database module, like MySQL" and mentioned Berkeley DB and PostgreSQL somewhere to make it a bit more generic and also show that we have support of multiple databases. There are also parts that refer to commercial support by iptelorg and iptelorg bulletin boards that I think we either should remove or make more neutral by referring to a "group of commercial companies providing support" and a sr-biz mailing list. One thing I did not attempt was to sort out the modules part. Now, I know that we will have a few different distributions that emphasize the kamailio side or the ser side, but I also do believe that a lot of people will simply download sip-router. Should I make an attempt to explain this for the coming release in the INSTALL file? It feels important. Feedback, please before I commit :-) /O

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev