sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:master: presence_conference: fix what it looks like a copy/paste error

by Ovidiu Sas

Module: sip-router Branch: master Commit: 4b53052e3c912c927927529cd98a05957e02ab18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b53052… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Sep 19 09:19:16 2013 -0400 presence_conference: fix what it looks like a copy/paste error --- modules/presence_conference/presence_conference.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/presence_conference/presence_conference.c b/modules/presence_conference/presence_conference.c index fecad7b..51c0340 100644 --- a/modules/presence_conference/presence_conference.c +++ b/modules/presence_conference/presence_conference.c @@ -109,7 +109,7 @@ static int mod_init(void) } pres_add_event = pres.add_event; - if (add_event == NULL) { + if (pres_add_event == NULL) { LM_ERR("could not import add_event function\n"); return -1; }

11 years, 2 months

git:master: pdb: fix warning dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

by Ovidiu Sas

Module: sip-router Branch: master Commit: 1af47db737d8ca6fcfc43f4abb3d3768f5a8257c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1af47db… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Sep 19 09:01:04 2013 -0400 pdb: fix warning dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] --- modules/pdb/pdb.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/pdb/pdb.c b/modules/pdb/pdb.c index 6c5db8c..a5f99cd 100644 --- a/modules/pdb/pdb.c +++ b/modules/pdb/pdb.c @@ -158,7 +158,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct { struct timeval tstart, tnow; struct server_item_t *server; - short int carrierid; + short int carrierid, *_id; char buf[NETBUFSIZE+1+sizeof(carrierid)]; size_t reqlen; int_str avp_val; @@ -270,7 +270,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct if (recv(server_list->fds[i].fd, buf, NETBUFSIZE, MSG_DONTWAIT) > 0) { /* do not block - just in case select/poll was wrong */ buf[NETBUFSIZE] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - carrierid=ntohs(*((short int *)&(buf[reqlen]))); /* convert to host byte order */ + _id = (short int *)&(buf[reqlen]); + carrierid=ntohs(*_id); /* convert to host byte order */ goto found; } }

11 years, 2 months

[tracker] Task closed: xavp semantics

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#345 - xavp semantics User who did this - Víctor Seva (linuxmaniac) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=345 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 2 months

git:master: sl: use global variable for event route index for local response

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6592870dbd2b388b3884d85b9cc69e323f1d175a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6592870… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 15:00:14 2013 +0200 sl: use global variable for event route index for local response - rt should have been no longer used after previous commit - reported by Ovidiu Sas --- modules/sl/sl_funcs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c index c9c870c..fd19e1c 100644 --- a/modules/sl/sl_funcs.c +++ b/modules/sl/sl_funcs.c @@ -150,7 +150,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) int backup_mhomed, ret; str text; - int rt, backup_rt; + int backup_rt; struct run_act_ctx ctx; struct sip_msg pmsg; @@ -293,7 +293,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], &pmsg, 0); + run_top_route(event_rt.rlist[_sl_evrt_local_response], &pmsg, 0); set_route_type(backup_rt); p_onsend=0;

11 years, 2 months

git:master: pv: use pv_get_buffer on pv_core

by Victor Seva

Module: sip-router Branch: master Commit: 8ca99e58442becd4513bb03730806c37f86f0d8f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ca99e5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Sep 20 13:38:29 2013 +0200 pv: use pv_get_buffer on pv_core --- modules/pv/pv_core.c | 63 +++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 1b5a1f5..85e6f8a 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -33,6 +33,7 @@ #include "../../data_lump.h" #include "../../lib/kcore/cmpapi.h" #include "../../tcp_conn.h" +#include "../../pvapi.h" #include "../../parser/parse_from.h" #include "../../parser/parse_uri.h" @@ -71,10 +72,6 @@ int _pv_pid = 0; #define PV_FIELD_DELIM ", " #define PV_FIELD_DELIM_LEN (sizeof(PV_FIELD_DELIM) - 1) -#define PV_LOCAL_BUF_SIZE 511 - -static char pv_local_buf[PV_LOCAL_BUF_SIZE+1]; - int pv_get_msgid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) @@ -1378,7 +1375,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, qvalue_t q; int cnt, i; unsigned int qlen; - char *p, *qbuf; + char *p, *qbuf, *p_ini; if(msg==NULL || res==NULL) return -1; @@ -1402,15 +1399,15 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); s.len += (cnt - 1) * PV_FIELD_DELIM_LEN; - - if (s.len + 1 > PV_LOCAL_BUF_SIZE) + if (s.len + 1 > pv_get_buffer_size()) { LM_ERR("local buffer length exceeded\n"); return pv_get_null(msg, param, res); } i = 0; - p = pv_local_buf; + p_ini = pv_get_buffer(); + p = p_ini; while ((uri.s = get_branch(i, &uri.len, &q, 0, 0, 0, 0, 0, 0, 0))) { @@ -1439,7 +1436,7 @@ int pv_get_branches(struct sip_msg *msg, pv_param_t *param, i++; } - s.s = &(pv_local_buf[0]); + s.s = &(p_ini[0]); return pv_get_strval(msg, param, res, &s); } @@ -1453,7 +1450,8 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) struct usr_avp *avp0; int idx; int idxf; - char *p; + char *p, *p_ini; + int p_size; int n=0; struct search_state state; @@ -1491,11 +1489,13 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } if(idxf==PV_IDX_ALL) { - p = pv_local_buf; + p_ini = pv_get_buffer(); + p = p_ini; + p_size = pv_get_buffer_size(); do { - if(p!=pv_local_buf) + if(p!=p_ini) { - if(p-pv_local_buf+PV_FIELD_DELIM_LEN+1>PV_LOCAL_BUF_SIZE) + if(p-p_ini+PV_FIELD_DELIM_LEN+1>p_size) { LM_ERR("local buffer length exceeded\n"); return pv_get_null(msg, param, res); @@ -1510,7 +1510,7 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) res->rs.s = int2str(avp_value.n, &res->rs.len); } - if(p-pv_local_buf+res->rs.len+1>PV_LOCAL_BUF_SIZE) + if(p-p_ini+res->rs.len+1>p_size) { LM_ERR("local buffer length exceeded!\n"); return pv_get_null(msg, param, res); @@ -1518,9 +1518,8 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) memcpy(p, res->rs.s, res->rs.len); p += res->rs.len; } while ((avp=search_next_avp(&state, &avp_value))!=0); - *p = 0; - res->rs.s = pv_local_buf; - res->rs.len = p - pv_local_buf; + res->rs.s = p_ini; + res->rs.len = p - p_ini; return 0; } @@ -1579,8 +1578,8 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) pv_value_t tv; struct hdr_field *hf; struct hdr_field *hf0; - char *p; - int n; + char *p, *p_ini; + int n, p_size; if(msg==NULL || res==NULL || param==NULL) return -1; @@ -1639,11 +1638,13 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } if(idxf==PV_IDX_ALL) { - p = pv_local_buf; + p_ini = pv_get_buffer(); + p = p_ini; + p_size = pv_get_buffer_size(); do { - if(p!=pv_local_buf) + if(p!=p_ini) { - if(p-pv_local_buf+PV_FIELD_DELIM_LEN+1>PV_LOCAL_BUF_SIZE) + if(p-p_ini+PV_FIELD_DELIM_LEN+1>p_size) { LM_ERR("local buffer length exceeded\n"); return pv_get_null(msg, param, res); @@ -1651,10 +1652,10 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) memcpy(p, PV_FIELD_DELIM, PV_FIELD_DELIM_LEN); p += PV_FIELD_DELIM_LEN; } - if(p-pv_local_buf+hf->body.len+1>PV_LOCAL_BUF_SIZE) + if(p-p_ini+hf->body.len+1>p_size) { LM_ERR("local buffer length exceeded [%d/%d]!\n", - (int)(p-pv_local_buf+hf->body.len+1), + (int)(p-p_ini+hf->body.len+1), hf->body.len); return pv_get_null(msg, param, res); } @@ -1673,9 +1674,8 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } } } while (hf); - *p = 0; - res->rs.s = pv_local_buf; - res->rs.len = p - pv_local_buf; + res->rs.s = p_ini; + res->rs.len = p - p_ini; return 0; } @@ -2740,14 +2740,15 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) return 0; } - if(in->len>=PV_LOCAL_BUF_SIZE-1) + if(in->len>=pv_get_buffer_size()-1) { LM_ERR("name too long\n"); return -1; } - memcpy(pv_local_buf, in->s, in->len); - pv_local_buf[in->len] = ':'; - s.s = pv_local_buf; + p = pv_get_buffer(); + memcpy(p, in->s, in->len); + p[in->len] = ':'; + s.s = p; s.len = in->len+1; if (parse_hname2(s.s, s.s + ((s.len<4)?4:s.len), &hdr)==0)

11 years, 2 months

git:master: pv: get all values for second key for xavp

by Victor Seva

Module: sip-router Branch: master Commit: 039081166803f4be4226026e51f43ee9793876a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0390811… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Sep 19 13:27:21 2013 +0200 pv: get all values for second key for xavp --- modules/pv/pv_xavp.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv_xavp.c b/modules/pv/pv_xavp.c index b434794..3ba737b 100644 --- a/modules/pv/pv_xavp.c +++ b/modules/pv/pv_xavp.c @@ -22,9 +22,13 @@ #include "../../dprint.h" #include "../../xavp.h" +#include "../../pvapi.h" #include "pv_xavp.h" +#define PV_FIELD_DELIM ", " +#define PV_FIELD_DELIM_LEN (sizeof(PV_FIELD_DELIM) - 1) + int pv_xavp_get_value(struct sip_msg *msg, pv_param_t *param, pv_value_t *res, sr_xavp_t *avp) { @@ -78,6 +82,8 @@ int pv_get_xavp(struct sip_msg *msg, pv_param_t *param, int idxf = 0; int idx = 0; int count; + char *p, *p_ini; + int p_size; if(param==NULL) { @@ -127,6 +133,40 @@ int pv_get_xavp(struct sip_msg *msg, pv_param_t *param, avp = xavp_get_by_index(&xname->next->name, idx, &avp->val.v.xavp); if(avp==NULL) return pv_get_null(msg, param, res); + /* get all values of second key */ + if(idxf==PV_IDX_ALL) + { + p_ini = pv_get_buffer(); + p = p_ini; + p_size = pv_get_buffer_size(); + do { + if(p!=p_ini) + { + if(p-p_ini+PV_FIELD_DELIM_LEN+1>p_size) + { + LM_ERR("local buffer length exceeded\n"); + return pv_get_null(msg, param, res); + } + memcpy(p, PV_FIELD_DELIM, PV_FIELD_DELIM_LEN); + p += PV_FIELD_DELIM_LEN; + } + if(pv_xavp_get_value(msg, param, res, avp)<0) + { + LM_ERR("can get value\n"); + return pv_get_null(msg, param, res); + } + if(p-p_ini+res->rs.len+1>p_size) + { + LM_ERR("local buffer length exceeded!\n"); + return pv_get_null(msg, param, res); + } + memcpy(p, res->rs.s, res->rs.len); + p += res->rs.len; + } while ((avp=xavp_get_next(avp))!=0); + res->rs.s = p_ini; + res->rs.len = p - p_ini; + return 0; + } return pv_xavp_get_value(msg, param, res, avp); }

11 years, 2 months

[tracker] Comment added: xavp semantics

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#345 - xavp semantics User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks, all patches can be committed! ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=345#comment1095 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 2 months

[tracker] Comment added: avpops: use xavp semantic on second parameter

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#346 - avpops: use xavp semantic on second parameter User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks, all patches can be committed! ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=346#comment1094 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 2 months

[tracker] Comment added: xavp semantics (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#345 - xavp semantics User who did this - Víctor Seva (linuxmaniac) ---------- In case you prefer to review the 0001 and 0002 patches merged ---------- One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=345#comment1093 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 2 months

[tracker] Comment added: xavp semantics (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#345 - xavp semantics User who did this - Víctor Seva (linuxmaniac) ---------- 0002 patch uses pv_get_buffer. I saw that the same thing can be done at pv_core.c so I did it on 0003 patch ---------- One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=345#comment1092 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013