sr-dev

sr-dev@lists.kamailio.org

15 participants
44233 discussions

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, 3 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, 3 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, 3 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, 3 months

TLS key recommendation

by Olle E. Johansson

" Try to avoid using keys larger then 1024 bytes. Large keys significantly slow down the TLS connection handshake, thus limiting the maximum SIP-router TLS connection rate. " Is this still a valid recommendation? Based on which size of CPU/system? /O

15 years, 3 months

git:kamailio_3.0: k-3.0: creating the branch kamailio_3.0

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: c7b6396744519541ad460634f18975b08aab0bc1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7b6396… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 13 17:58:37 2009 +0200 k-3.0: creating the branch kamailio_3.0 - default FLAVOUR set to kamailio - version set to 3.0.0pre1 - Kamailio statistics set ON by default --- Makefile.defs | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 0684e21..b312bbe 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -113,7 +113,7 @@ $(info normal Makefile.defs exec) endif # verbose # flavour: sip-router, ser or kamailio -FLAVOUR=sip-router +FLAVOUR=kamailio ifeq ($(FLAVOUR),sip-router) # main binary name @@ -139,10 +139,10 @@ SCR_NAME=sip-router INSTALL_FLAVOUR=$(FLAVOUR) #version number -VERSION = 2 -PATCHLEVEL = 99 -SUBLEVEL = 99 -EXTRAVERSION = -pre3 +VERSION = 3 +PATCHLEVEL = 0 +SUBLEVEL = 0 +EXTRAVERSION = -pre1 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) @@ -637,6 +637,7 @@ endif ifeq ($(TLS_HOOKS), 1) C_DEFS+= -DUSE_TLS -DTLS_HOOKS endif +KMSTATS ?= 1 ifeq ($(KMSTATS), 1) C_DEFS+= -DSTATISTICS endif

15 years, 3 months

download one git branch only

by Daniel-Constantin Mierla

Hello, is anyone aware of a git command that downloads locally only one branch of sip repository? I searched on the web and found only some tools, but maybe there are standard git commands to help. Thanks, Daniel -- Daniel-Constantin Mierla * Kamailio SIP Masterclass, Nov 9-13, 2009, Berlin * http://www.asipto.com/index.php/sip-router-masterclass/

15 years, 3 months

Permission problem and setuid in Kamailio 1.5

by marius zbihlei

Hi all, There is a permission problem if the daemon is started given -u and -g parameters (sets up user and group for the process). The do_suid function (defined in demonize.c) is called after the call to init_modules(), so the mod_init functions of the configured module are loaded before the call to do_suid. This wasn't a problem in 1.3 because no module(I am aware off) use the uid and gid of the process to do permission checks. This has changed in 1.5, module carrierroute, as there is a check to see if the route file in config-file mode (usually /etc/kamailio/carrierroute.conf) has the right permission set on it (Issues an warning if it's worldly writable and error if it's not writable by the process owner). This of course is a problem because kamailio hasn't yet setuid()/setgid() so the checks are done using the wrong uid. A correct (imho) course of action is to move the call to do_suid function before the call to init_modules()(and before any other calls to initialization functions). I've attached a small patch that does this (tested). There are any considerations on why the init_modules() should be called with another uid/gid? Greetings, Marius Index: main.c =================================================================== --- main.c (revision 5937) +++ main.c (working copy) @@ -656,10 +656,6 @@ LM_WARN("using only the first listen address (no fork)\n"); } - /* try to drop privileges */ - if (do_suid(uid, gid)==-1) - goto error; - /* we need another process to act as the timer*/ if (start_timer_processes()!=0) { LM_CRIT("cannot start timer process(es)\n"); @@ -752,7 +748,6 @@ /* all processes should have access to all the sockets (for sending) * so we open all first*/ - if (do_suid(uid, gid)==-1) goto error; /* try to drop privileges */ /* udp processes */ for(si=udp_listen; si; si=si->next){ @@ -1278,6 +1273,12 @@ LM_INFO("no private memory pool configured, processes use system memory\n"); #endif + /* Set uid/gid */ + if (do_suid(uid, gid)==-1){ + LM_ERR("failed to drop privileges"); + goto error; /* try to drop privileges */ + } + /* Init statistics */ if (init_stats_collector()<0) { LM_ERR("failed to initialize statistics\n"); @@ -1330,3 +1331,4 @@ cleanup(0); return ret; } +

15 years, 3 months

Please I need a help

by Ahmed Sekka

dear, I want creat video client chat in net. So, I am using jmf2.1e to send and recieve video. Can I use kamailio OpenSER to relay two client video chat in the internet? if it's possible how I can do that? thinks.

15 years, 3 months

Meeting Minutes, Berlin 2009

by Jan Janak

Hello, Attached are the minutes from the last meeting in Berlin. I also uploaded them to the wiki: http://sip-router.org/wiki/meetings/berlin_2009 The minutes are probably not complete because in addition to being a scribe, I was also trying to be a meeting participant, well, I did my best. Enjoy. -- Jan

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev