sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
246 discussions

git:master: uac: $uac_req(sock) - new attribute to set local send socket

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6624d10b5edbfaf32726875fbbf2ac2221807c84 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6624d10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 17 12:26:11 2013 +0200 uac: $uac_req(sock) - new attribute to set local send socket - local socket can be set for generated requests: $uac_req(sock) = "udp:127.0.0.1:5060"; --- modules/uac/uac_send.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/modules/uac/uac_send.c b/modules/uac/uac_send.c index 2374b3a..153c3bb 100644 --- a/modules/uac/uac_send.c +++ b/modules/uac/uac_send.c @@ -58,6 +58,8 @@ typedef struct _uac_send_info { str s_body; char b_ouri[MAX_URI_SIZE]; str s_ouri; + char b_sock[MAX_URI_SIZE]; + str s_sock; char b_auser[128]; str s_auser; char b_apasswd[64]; @@ -87,6 +89,7 @@ uac_send_info_t *uac_send_info_clone(uac_send_info_t *ur) tp->s_auser.s = tp->b_auser; tp->s_apasswd.s = tp->b_apasswd; tp->s_callid.s = tp->b_callid; + tp->s_sock.s = tp->b_sock; return tp; } @@ -141,6 +144,10 @@ int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, if(_uac_req.s_callid.len<=0) return pv_get_null(msg, param, res); return pv_get_strval(msg, param, res, &_uac_req.s_callid); + case 12: + if(_uac_req.s_sock.len<=0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_uac_req.s_sock); default: return pv_get_uintval(msg, param, res, _uac_req.flags); } @@ -379,9 +386,29 @@ int pv_set_uac_req(struct sip_msg* msg, pv_param_t *param, LM_ERR("Invalid value type\n"); return -1; } - memcpy(_uac_req.s_callid.s, val->rs.s, val->rs.len); - _uac_req.s_callid.s[val->rs.len] = '\0'; - _uac_req.s_callid.len = val->rs.len; + memcpy(_uac_req.s_callid.s, val->rs.s, val->rs.len); + _uac_req.s_callid.s[val->rs.len] = '\0'; + _uac_req.s_callid.len = val->rs.len; + break; + case 12: + if(val==NULL) + { + _uac_req.s_apasswd.len = 0; + return 0; + } + if(!(val->flags&PV_VAL_STR)) + { + LM_ERR("Invalid socket pv type\n"); + return -1; + } + if(val->rs.len>=MAX_URI_SIZE) + { + LM_ERR("Value size too big\n"); + return -1; + } + memcpy(_uac_req.s_sock.s, val->rs.s, val->rs.len); + _uac_req.s_sock.s[val->rs.len] = '\0'; + _uac_req.s_sock.len = val->rs.len; break; } return 0; @@ -412,6 +439,8 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 5; else if(strncmp(in->s, "ouri", 4)==0) sp->pvp.pvn.u.isname.name.n = 6; + else if(strncmp(in->s, "sock", 4)==0) + sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; case 5: @@ -464,7 +493,8 @@ void uac_req_init(void) _uac_req.s_method.s = _uac_req.b_method; _uac_req.s_auser.s = _uac_req.b_auser; _uac_req.s_apasswd.s = _uac_req.b_apasswd; - _uac_req.s_callid.s = _uac_req.b_callid; + _uac_req.s_callid.s = _uac_req.b_callid; + _uac_req.s_sock.s = _uac_req.b_sock; return; } @@ -592,6 +622,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) uac_r.method = &tp->s_method; uac_r.headers = &s_hdrs; uac_r.body = (tp->s_body.len <= 0) ? NULL : &tp->s_body; + uac_r.ssock = (tp->s_sock.len <= 0) ? NULL : &tp->s_sock; uac_r.dialog = &tmdlg; uac_r.cb_flags = TMCB_LOCAL_COMPLETED; ret = tmb.t_request_within(&uac_r); @@ -623,6 +654,7 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) uac_r.method = &_uac_req.s_method; uac_r.headers = (_uac_req.s_hdrs.len <= 0) ? NULL : &_uac_req.s_hdrs; uac_r.body = (_uac_req.s_body.len <= 0) ? NULL : &_uac_req.s_body; + uac_r.ssock = (_uac_req.s_sock.len <= 0) ? NULL : &_uac_req.s_sock; if(_uac_req.s_auser.len > 0 && _uac_req.s_apasswd.len>0) { tp = uac_send_info_clone(&_uac_req);

10 years, 10 months

git:master: tm: enhanced local request API to set send socket

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9a3aa5e6e7949dd08146910a301fbeebdf052742 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a3aa5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 17 12:24:42 2013 +0200 tm: enhanced local request API to set send socket --- modules/tm/uac.c | 19 +++++++++++++++++++ modules/tm/uac.h | 1 + 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 38ead71..8f54dbe 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -701,6 +701,12 @@ int req_within(uac_req_t *uac_r) goto err; } + if(uac_r->ssock!=NULL && uac_r->ssock->len>0 + && uac_r->dialog->send_sock==NULL) { + /* set local send socket */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } + if ((uac_r->method->len == 3) && (!memcmp("ACK", uac_r->method->s, 3))) goto send; if ((uac_r->method->len == 6) && (!memcmp("CANCEL", uac_r->method->s, 6))) goto send; uac_r->dialog->loc_seq.value++; /* Increment CSeq */ @@ -741,6 +747,12 @@ int req_outside(uac_req_t *uac_r, str* ruri, str* to, str* from, str *next_hop) if (next_hop) uac_r->dialog->dst_uri = *next_hop; w_calculate_hooks(uac_r->dialog); + if(uac_r->ssock!=NULL && uac_r->ssock->len>0 + && uac_r->dialog->send_sock==NULL) { + /* set local send socket */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } + return t_uac(uac_r); err: @@ -794,6 +806,13 @@ int request(uac_req_t *uac_r, str* ruri, str* to, str* from, str *next_hop) * before freeing dialog here must be removed */ uac_r->dialog = dialog; + + if(uac_r->ssock!=NULL && uac_r->ssock->len>0 + && uac_r->dialog->send_sock==NULL) { + /* set local send socket */ + uac_r->dialog->send_sock = lookup_local_socket(uac_r->ssock); + } + res = t_uac(uac_r); dialog->rem_target.s = 0; dialog->dst_uri.s = 0; diff --git a/modules/tm/uac.h b/modules/tm/uac.h index 9843d15..b466426 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -54,6 +54,7 @@ typedef struct uac_req { str *method; str *headers; str *body; + str *ssock; dlg_t *dialog; int cb_flags; transaction_cb *cb;

10 years, 10 months

[tracker] Comment added: Possible memory leak in srdb1 (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#319 - Possible memory leak in srdb1 User who did this - Konstantin (Konstantin) ---------- Please find the fix in the attachment ---------- 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=319#comment1006 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.

10 years, 10 months

[tracker] Comment added: Possible memory leak in srdb1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#319 - Possible memory leak in srdb1 User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you just do: git diff >/tmp/db_free_columns.patch and attache the patch file here. It is easier to spot the changes and if all is fine, then I can simply apply the patch, not struggle with copy&paste and miss something or copy more. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=319#comment1005 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.

10 years, 10 months

[tracker] Comment added: Possible memory leak in srdb1 (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#319 - Possible memory leak in srdb1 User who did this - Konstantin (Konstantin) ---------- Please find comments /* FIX FOR MEMORY LEAKAGE */ inside db_free_columns function. ---------- 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=319#comment1004 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.

10 years, 10 months

[tracker] Task closed: Entity URI in NOTIFY XML body

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#324 - Entity URI in NOTIFY XML body User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch applied to master and 4.0 branches. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=324 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.

10 years, 10 months

git:4.0: presence_dialoginfo: add schema to entity

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: b7e890b309331a13eb92c5080d276036be5833ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7e890b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 17 00:04:06 2013 +0200 presence_dialoginfo: add schema to entity - patch by Pawel Sternal, FS#324 (cherry picked from commit 716ffd2787a68734a21a1374c3dc6dd4783844bd) --- modules/presence_dialoginfo/notify_body.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index 6a63d3e..cc65efb 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -147,14 +147,15 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) /* LM_DBG("number of bodies in total [n]=%d, number of useful bodies [j]=%d\n", n, j ); */ /* create the new NOTIFY body */ - if ( (pres_user->len + pres_domain->len + 1) > MAX_URI_SIZE) { + if ( (pres_user->len + pres_domain->len + 1 + 4 + 1) >= MAX_URI_SIZE) { LM_ERR("entity URI too long, maximum=%d\n", MAX_URI_SIZE); return NULL; } - memcpy(buf, pres_user->s, pres_user->len); - buf[pres_user->len] = '@'; - memcpy(buf + pres_user->len + 1, pres_domain->s, pres_domain->len); - buf[pres_user->len + 1 + pres_domain->len]= '\0'; + memcpy(buf, "sip:", 4); + memcpy(buf+4, pres_user->s, pres_user->len); + buf[pres_user->len+4] = '@'; + memcpy(buf + pres_user->len + 5, pres_domain->s, pres_domain->len); + buf[pres_user->len + 5 + pres_domain->len]= '\0'; doc = xmlNewDoc(BAD_CAST "1.0"); if(doc==0)

10 years, 10 months

git:master: presence_dialoginfo: add schema to entity

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 716ffd2787a68734a21a1374c3dc6dd4783844bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=716ffd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 17 00:04:06 2013 +0200 presence_dialoginfo: add schema to entity - patch by Pawel Sternal, FS#324 --- modules/presence_dialoginfo/notify_body.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index 6a63d3e..cc65efb 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -147,14 +147,15 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) /* LM_DBG("number of bodies in total [n]=%d, number of useful bodies [j]=%d\n", n, j ); */ /* create the new NOTIFY body */ - if ( (pres_user->len + pres_domain->len + 1) > MAX_URI_SIZE) { + if ( (pres_user->len + pres_domain->len + 1 + 4 + 1) >= MAX_URI_SIZE) { LM_ERR("entity URI too long, maximum=%d\n", MAX_URI_SIZE); return NULL; } - memcpy(buf, pres_user->s, pres_user->len); - buf[pres_user->len] = '@'; - memcpy(buf + pres_user->len + 1, pres_domain->s, pres_domain->len); - buf[pres_user->len + 1 + pres_domain->len]= '\0'; + memcpy(buf, "sip:", 4); + memcpy(buf+4, pres_user->s, pres_user->len); + buf[pres_user->len+4] = '@'; + memcpy(buf + pres_user->len + 5, pres_domain->s, pres_domain->len); + buf[pres_user->len + 5 + pres_domain->len]= '\0'; doc = xmlNewDoc(BAD_CAST "1.0"); if(doc==0)

10 years, 10 months

[tracker] Comment added: tm doesn't relay changed 'To' header in CANCEL before dialog is established

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#325 - tm doesn't relay changed 'To' header in CANCEL before dialog is established User who did this - Daniel-Constantin Mierla (miconda) ---------- uac_replace_to() should be used for updates to To header if you want changes to be reflected in CANCEL. There is an internal flag set for the case when To is updated, not done by other functions that are not specific for To update. You can try to make a patch that sets the flag, if uac_replace_to() is not enough for you. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=325#comment1003 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.

10 years, 10 months

[tracker] Comment added: tm doesn't relay changed 'To' header in CANCEL before dialog is established

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#325 - tm doesn't relay changed 'To' header in CANCEL before dialog is established User who did this - Trip Volpe (tvolpe) ---------- Just remove_hf/insert_hf, like so: remove_hf("To"); insert_hf("To: <sip:$var(format_tn)@flowroute.com>\r\n"); ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=325#comment1002 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.

10 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013