sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:kamailio_3.0: core: update fwd_reqs stat

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 6a84eeebc2575d90d5795abb95af33ab37407aef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a84eee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 21:40:04 2009 +0200 core: update fwd_reqs stat --- forward.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index d7fb827..a9cfc7f 100644 --- a/forward.c +++ b/forward.c @@ -72,6 +72,7 @@ #include "config.h" #include "parser/msg_parser.h" #include "route.h" +#include "events.h" #include "dprint.h" #include "globals.h" #include "cfg_core.h" @@ -581,6 +582,8 @@ end: #endif if (buf) pkg_free(buf); /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ + if(ret==0) + sr_event_exec(SREV_CORE_STATS, (void*)1); return ret; }

15 years, 2 months

git:kamailio_3.0: kamctl: Makefile action for simple 'make'

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e77ff6f4c9fa32e0bc527d72dc54317658ac448a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e77ff6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 20:41:38 2009 +0200 kamctl: Makefile action for simple 'make' - avoid kamctl installation if 'make' is typed --- utils/kamctl/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index fbc39c3..9c6d377 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -2,6 +2,9 @@ COREPATH=../.. include $(COREPATH)/Makefile.defs +all: + @echo "No compilation needed for kamctl" + install: install-cfg install-bin install-man install-modules install-cfg: $(cfg_prefix)/$(cfg_dir)

15 years, 2 months

git:kamailio_3.0: Makefile: tunnings for K-3.0

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 3996abca9e4abd3b88e56c6749938dbae27a526a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3996abc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 20:44:03 2009 +0200 Makefile: tunnings for K-3.0 - do not install gen_ha1 (not needed) - install kamctl -- reuse refurbished 'install-utils' by calling 'make install' in tools' directory listed in utils_bin_install --- Makefile | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 768c080..2d9f6d3 100644 --- a/Makefile +++ b/Makefile @@ -341,8 +341,8 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # which utils need compilation (directory path) and which to install # (full path including file name) -utils_compile= utils/gen_ha1 utils/sercmd -utils_bin_install= utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl +utils_compile= utils/sercmd +utils_bin_install= utils/kamctl # sercmd is now installed by ctl utils_script_install= # This is the list of files to be installed into the arch-independent @@ -836,29 +836,11 @@ install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man) install-utils: utils $(bin_prefix)/$(bin_dir) @for r in $(utils_bin_install) "" ; do \ - if [ -n "$$r" ]; then \ - if [ -f "$$r" ]; then \ - $(call try_err, $(INSTALL_TOUCH) \ - $(bin_prefix)/$(bin_dir)/`basename "$$r"` ); \ - $(call try_err,\ - $(INSTALL_BIN) "$$r" $(bin_prefix)/$(bin_dir) ); \ - else \ - echo "ERROR: $$r not compiled" ; \ - if [ ${err_fail} = 1 ] ; then \ - exit 1; \ - fi ; \ - fi ;\ - fi ; \ - done; true - @for r in $(utils_script_install) "" ; do \ - if [ -n "$$r" ]; then \ - if [ -f "$$r" ]; then \ - $(call try_err, $(INSTALL_TOUCH) \ - $(bin_prefix)/$(bin_dir)/`basename "$$r"` ); \ - $(call try_err,\ - $(INSTALL_SCRIPT) "$$r" $(bin_prefix)/$(bin_dir) ); \ + if [ -d "$$r" ]; then \ + if [ -f "$$r/Makefile" ]; then \ + make -C "$$r" install; \ else \ - echo "ERROR: $$r not compiled" ; \ + echo "ERROR: $$r has no Makefile to install" ; \ if [ ${err_fail} = 1 ] ; then \ exit 1; \ fi ; \

15 years, 2 months

install utils

by Daniel-Constantin Mierla

Hello, I see in the master Makefile that tools in utils directory are installed based on a list of files. Wouldn't be better to have the install action part of Makefile in the tool directory? There might be many files installed, some in bin, config or lib directories. Cheers, Daniel -- Daniel-Constantin Mierla * Kamailio SIP Masterclass, Nov 9-13, 2009, Berlin * http://www.asipto.com/index.php/sip-router-masterclass/

15 years, 2 months

git:andrei/pointer_alias_warnings: db_postgres: pointer aliasing warnings fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: d44e8a81f8a955c5b0f2e1265019c91b1c3e5b3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d44e8a8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:50:50 2009 +0200 db_postgres: pointer aliasing warnings fixes - use a union to avoid the warnings --- modules/db_postgres/pg_fld.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 4353e48..685d73b 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -91,17 +91,23 @@ int pg_fld(db_fld_t* fld, char* table) } +union ull { + uint64_t ui64; + uint32_t ui32[2]; +}; + static inline uint64_t htonll(uint64_t in) { - uint32_t* p = (uint32_t*)&in; - return ((uint64_t)htonl(p[0]) << 32) + (uint64_t)htonl(p[1]); + union ull* p = (union ull*)&in; + + return ((uint64_t)htonl(p->ui32[0]) << 32) + (uint64_t)htonl(p->ui32[1]); } static inline uint64_t ntohll(uint64_t in) { - uint32_t* p = (uint32_t*)&in; - return ((uint64_t)ntohl(p[0]) << 32) + (uint64_t)ntohl(p[1]); + union ull* p = (union ull*)&in; + return ((uint64_t)ntohl(p->ui32[0]) << 32) + (uint64_t)ntohl(p->ui32[1]); }

15 years, 2 months

git:andrei/pointer_alias_warnings: rr: pointer aliasing warning fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: 34dc702f619b9c647640811275d7087ffade8e93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34dc702… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:52:33 2009 +0200 rr: pointer aliasing warning fixes - use the avp data union --- modules_s/rr/avp_cookie.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/rr/avp_cookie.c b/modules_s/rr/avp_cookie.c index d5a0b50..1e9d027 100644 --- a/modules_s/rr/avp_cookie.c +++ b/modules_s/rr/avp_cookie.c @@ -66,11 +66,11 @@ str *rr_get_avp_cookies(void) { if ((avp->flags&(AVP_NAME_STR|AVP_VAL_STR)) == AVP_NAME_STR) { /* avp type str, int value */ - avp_name = & ((struct str_int_data*)&avp->d.data[0])->name; + avp_name = & ((struct str_int_data*)avp->d.p)->name; } else if ((avp->flags&(AVP_NAME_STR|AVP_VAL_STR)) == (AVP_NAME_STR|AVP_VAL_STR)) { /* avp type str, str value */ - avp_name = & ((struct str_str_data*)&avp->d.data[0])->name; + avp_name = & ((struct str_str_data*)avp->d.p)->name; } else avp_name = 0; /* dummy */

15 years, 2 months

git:andrei/pointer_alias_warnings: group: fix pointer aliasing warnings

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: 221e87850861f8772abf8cc98334970ab59dfa70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=221e878… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:53:27 2009 +0200 group: fix pointer aliasing warnings --- modules_k/group/re_group.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/group/re_group.c b/modules_k/group/re_group.c index 2e38d8c..542e02b 100644 --- a/modules_k/group/re_group.c +++ b/modules_k/group/re_group.c @@ -163,6 +163,7 @@ int get_user_group(struct sip_msg *req, char *user, char *avp) regmatch_t pmatch; char *c; int n; + int* pi; if (get_username_domain( req, (group_check_p)user, &username, &domain)!=0){ LM_ERR("failed to get username@domain\n"); @@ -179,7 +180,8 @@ int get_user_group(struct sip_msg *req, char *user, char *avp) goto error; } - *(int*)uri_buf = htonl(('s'<<24) + ('i'<<16) + ('p'<<8) + ':'); + pi=(int*)uri_buf; + *pi = htonl(('s'<<24) + ('i'<<16) + ('p'<<8) + ':'); c = uri_buf + 4; memcpy( c, username.s, username.len); c += username.len;

15 years, 2 months

git:andrei/pointer_alias_warnings: cfg: fixed pointer aliasing warnings

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: e95c077588d260c55b55a5928411b7469828ea68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e95c077… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:44:13 2009 +0200 cfg: fixed pointer aliasing warnings - changed new_val[] to a union to silence the strict-aliasing warnings. --- cfg/cfg_ctx.c | 40 +++++++++++++++++++++------------------- cfg/cfg_ctx.h | 13 ++++++++++++- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index a504588..e63cc60 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -573,7 +573,7 @@ int cfg_set_delayed(cfg_ctx_t *ctx, str *group_name, str *var_name, if (changed->group != group) continue; memcpy( temp_handle + changed->var->offset, - changed->new_val, + changed->new_val.vraw, cfg_var_size(changed->var)); } } else { @@ -595,7 +595,8 @@ int cfg_set_delayed(cfg_ctx_t *ctx, str *group_name, str *var_name, } /* everything went ok, we can add the new value to the list */ - size = sizeof(cfg_changed_var_t) + cfg_var_size(var) - 1; + size = sizeof(cfg_changed_var_t) - + sizeof(((cfg_changed_var_t*)0)->new_val) + cfg_var_size(var); changed = (cfg_changed_var_t *)shm_malloc(size); if (!changed) { LOG(L_ERR, "ERROR: cfg_set_delayed(): not enough shm memory\n"); @@ -608,7 +609,7 @@ int cfg_set_delayed(cfg_ctx_t *ctx, str *group_name, str *var_name, switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: - *(int *)changed->new_val = (int)(long)v; + changed->new_val.vint = (int)(long)v; break; case CFG_VAR_STRING: @@ -616,18 +617,18 @@ int cfg_set_delayed(cfg_ctx_t *ctx, str *group_name, str *var_name, s.s = v; s.len = (s.s) ? strlen(s.s) : 0; if (cfg_clone_str(&s, &s)) goto error; - *(char **)changed->new_val = s.s; + changed->new_val.vp = s.s; break; case CFG_VAR_STR: /* clone the string to shm mem */ s = *(str *)v; if (cfg_clone_str(&s, &s)) goto error; - memcpy(changed->new_val, &s, sizeof(str)); + changed->new_val.vstr=s; break; case CFG_VAR_POINTER: - *(void **)changed->new_val = v; + changed->new_val.vp=v; break; } @@ -804,7 +805,7 @@ int cfg_commit(cfg_ctx_t *ctx) } memcpy( p, - changed->new_val, + changed->new_val.vraw, cfg_var_size(changed->var)); } @@ -870,8 +871,8 @@ int cfg_rollback(cfg_ctx_t *ctx) if ((CFG_VAR_TYPE(changed->var) == CFG_VAR_STRING) || (CFG_VAR_TYPE(changed->var) == CFG_VAR_STR)) { - if (*(char **)(changed->new_val)) - shm_free(*(char **)(changed->new_val)); + if (changed->new_val.vp) + shm_free(changed->new_val.vp); } shm_free(changed); } @@ -1016,7 +1017,7 @@ int cfg_diff_next(void **h, unsigned int *val_type) { cfg_changed_var_t *changed; - void *p; + union cfg_var_value* pval; static str old_s, new_s; /* we need the value even after the function returns */ @@ -1031,29 +1032,30 @@ int cfg_diff_next(void **h, /* use the module's handle to access the variable It means that the variable is read from the local config after forking */ - p = *(changed->group->handle) + changed->var->offset; + pval = (union cfg_var_value*) + (*(changed->group->handle) + changed->var->offset); switch (CFG_VAR_TYPE(changed->var)) { case CFG_VAR_INT: - *old_val = (void *)(long)*(int *)p; - *new_val = (void *)(long)*(int *)changed->new_val; + *old_val = (void *)(long)pval->vint; + *new_val = (void *)(long)changed->new_val.vint; break; case CFG_VAR_STRING: - *old_val = (void *)*(char **)p; - *new_val = (void *)*(char **)changed->new_val; + *old_val = pval->vp; + *new_val = changed->new_val.vp; break; case CFG_VAR_STR: - memcpy(&old_s, p, sizeof(str)); + old_s=pval->vstr; *old_val = (void *)&old_s; - memcpy(&new_s, changed->new_val, sizeof(str)); + new_s=changed->new_val.vstr; *new_val = (void *)&new_s; break; case CFG_VAR_POINTER: - *old_val = *(void **)p; - *new_val = *(void **)changed->new_val; + *old_val = pval->vp; + *new_val = changed->new_val.vp; break; } diff --git a/cfg/cfg_ctx.h b/cfg/cfg_ctx.h index e738c96..fcab51e 100644 --- a/cfg/cfg_ctx.h +++ b/cfg/cfg_ctx.h @@ -37,6 +37,17 @@ #include "cfg.h" #include "cfg_struct.h" + +/* variable values */ +union cfg_var_value{ + void* vp; + long vlong; + int vint; + str vstr; + unsigned char vraw[1]; /* variable length */ +}; + + /* linked list of variables with their new values */ typedef struct _cfg_changed_var { cfg_group_t *group; @@ -44,7 +55,7 @@ typedef struct _cfg_changed_var { struct _cfg_changed_var *next; /* blob that contains the new value */ - unsigned char new_val[1]; + union cfg_var_value new_val; /* variable size */ } cfg_changed_var_t; /* callback that is called when a new group is declared */

15 years, 2 months

git:andrei/pointer_alias_warnings: core: pointer aliasing warnings fixed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: a19584f942eb5bff0169b33580bbf2c31508e0c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a19584f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 18:49:28 2009 +0200 core: pointer aliasing warnings fixed --- pass_fd.c | 8 ++++++-- route.c | 6 +++--- usr_avp.c | 10 +++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pass_fd.c b/pass_fd.c index 7a2b30c..f7fbf7f 100644 --- a/pass_fd.c +++ b/pass_fd.c @@ -160,6 +160,7 @@ int send_fd(int unix_socket, void* data, int data_len, int fd) struct iovec iov[1]; int ret; #ifdef HAVE_MSGHDR_MSG_CONTROL + int* pi; struct cmsghdr* cmsg; /* make sure msg_control will point to properly aligned data */ union { @@ -176,7 +177,8 @@ int send_fd(int unix_socket, void* data, int data_len, int fd) cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; cmsg->cmsg_len = CMSG_LEN(sizeof(fd)); - *(int*)CMSG_DATA(cmsg)=fd; + pi=(int*)CMSG_DATA(cmsg); + *pi=fd; msg.msg_flags=0; #else msg.msg_accrights=(caddr_t) &fd; @@ -225,6 +227,7 @@ int receive_fd(int unix_socket, void* data, int data_len, int* fd, int flags) int f; #endif /*NO_MSG_WAITALL */ #ifdef HAVE_MSGHDR_MSG_CONTROL + int* pi; struct cmsghdr* cmsg; union{ struct cmsghdr cm; @@ -308,7 +311,8 @@ poll_again: ret=-1; goto error; } - *fd=*((int*) CMSG_DATA(cmsg)); + pi=(int*) CMSG_DATA(cmsg); + *fd=*pi; }else{ /* LOG(L_ERR, "ERROR: receive_fd: no descriptor passed, cmsg=%p," diff --git a/route.c b/route.c index fc25c64..2d9036c 100644 --- a/route.c +++ b/route.c @@ -727,7 +727,7 @@ int fix_actions(struct action* a) return E_UNSPEC; } */ - if ((ret=fix_rval_expr((void**)&rve))<0) + if ((ret=fix_rval_expr(&t->val[0].u.data))<0) return ret; } if ( (t->val[1].type==ACTIONS_ST)&&(t->val[1].u.data) ){ @@ -800,7 +800,7 @@ int fix_actions(struct action* a) rve->fpos.s_line, rve->fpos.s_col); return E_UNSPEC; } - if ((ret=fix_rval_expr((void**)&rve))<0) + if ((ret=fix_rval_expr(&t->val[0].u.data))<0) return ret; }else{ LOG(L_CRIT, "BUG: fix_actions: null while()" @@ -841,7 +841,7 @@ int fix_actions(struct action* a) rve->fpos.s_line, rve->fpos.s_col); return E_UNSPEC; } - if ((ret=fix_rval_expr((void**)&rve))<0) + if ((ret=fix_rval_expr(&t->val[0].u.data))<0) return ret; }else{ LOG(L_CRIT, "BUG: fix_actions: null drop/return" diff --git a/usr_avp.c b/usr_avp.c index 53f38e4..a759664 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -306,10 +306,10 @@ inline str* get_avp_name(avp_t *avp) return 0; case AVP_NAME_STR: /* avp type str, int value */ - return &((struct str_int_data*)&avp->d.data[0])->name; + return &((struct str_int_data*)avp->d.p)->name; case AVP_NAME_STR|AVP_VAL_STR: /* avp type str, str value */ - return &((struct str_str_data*)&avp->d.data[0])->name; + return &((struct str_str_data*)avp->d.p)->name; } LOG(L_ERR,"BUG:avp:get_avp_name: unknown avp type (name&val) %d\n", @@ -331,15 +331,15 @@ inline void get_avp_val(avp_t *avp, avp_value_t *val) break; case AVP_NAME_STR: /* avp type str, int value */ - val->n = ((struct str_int_data*)&avp->d.data[0])->val; + val->n = ((struct str_int_data*)avp->d.p)->val; break; case AVP_VAL_STR: /* avp type ID, str value */ - val->s = *(str*)&avp->d.data[0]; + val->s = *(str*)avp->d.p; break; case AVP_NAME_STR|AVP_VAL_STR: /* avp type str, str value */ - val->s = ((struct str_str_data*)&avp->d.data[0])->val; + val->s = ((struct str_str_data*)avp->d.p)->val; break; } }

15 years, 2 months

git:sr_3.0: core: fix memleak in fixup_free*

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: af8f3e1536d1415ae757d868ff8cfcbb2578c2f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af8f3e1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 20:11:25 2009 +0200 core: fix memleak in fixup_free* fparam_free_contents() (which is what all the fixup_free* call in sr) did not free the original string (which in sr is kept inside the fixed fparam/gparam). It should have no impact, since at this point nobody seems to use any fixup_free* functions. --- sr_module.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index 5414529..1df69b7 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1189,7 +1189,7 @@ void fparam_free_contents(fparam_t* fp) case FPARAM_INT: case FPARAM_STR: /* nothing to do */ - return; + break; case FPARAM_REGEX: if (fp->v.regex){ regfree(fp->v.regex); @@ -1225,6 +1225,10 @@ void fparam_free_contents(fparam_t* fp) } break; } + if (fp->orig){ + pkg_free(fp->orig); + fp->orig=0; + } }

15 years, 2 months

← Newer
1
...
25
26
27
28
29
30
31
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009