sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

git:master: modules_k/dialog: Remove unused parameter "new" from prototype and

by Timo Reimann

Module: sip-router Branch: master Commit: a8d376e9108e1f1835a40c5da29b104adf847399 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8d376e… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Sep 9 13:34:10 2011 +0200 modules_k/dialog: Remove unused parameter "new" from prototype and calls to set_dlg_variable_unsafe(). Credits to Anca Vamanu (anca.vamanu(a)1und1.ro). --- modules_k/dialog/dlg_db_handler.c | 2 +- modules_k/dialog/dlg_var.c | 10 +++++----- modules_k/dialog/dlg_var.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules_k/dialog/dlg_db_handler.c b/modules_k/dialog/dlg_db_handler.c index 6f55dcf..c0b8fbc 100644 --- a/modules_k/dialog/dlg_db_handler.c +++ b/modules_k/dialog/dlg_db_handler.c @@ -526,7 +526,7 @@ static int load_dialog_vars_from_db(int fetch_num_rows) dlg = (d_table->entries)[VAL_INT(values)].first; while (dlg) { if (dlg->h_id == VAL_INT(values+1)) { - set_dlg_variable_unsafe(dlg, &VAL_STR(values+2), &VAL_STR(values+3), 0); + set_dlg_variable_unsafe(dlg, &VAL_STR(values+2), &VAL_STR(values+3)); continue; } dlg = dlg->next; diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 51ce8eb..3226bc4 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -104,7 +104,7 @@ struct dlg_var * get_local_varlist_pointer(struct sip_msg *msg, int clear_pointe } /* Adds, updates and deletes dialog variables */ -int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val, int new) +int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val) { struct dlg_var * var = NULL; struct dlg_var * it; @@ -250,12 +250,12 @@ int set_dlg_variable(struct dlg_cell *dlg, str *key, str *val) if( !val) { - if (set_dlg_variable_unsafe(dlg, key, NULL, 1)!=0) { + if (set_dlg_variable_unsafe(dlg, key, NULL)!=0) { LM_ERR("failed to delete dialog variable <%.*s>\n", key->len,key->s); goto error; } } else { - if (set_dlg_variable_unsafe(dlg, key, val, 1)!=0) { + if (set_dlg_variable_unsafe(dlg, key, val)!=0) { LM_ERR("failed to store dialog values <%.*s>\n",key->len,key->s); goto error; } @@ -332,7 +332,7 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value if (val==NULL || val->flags&(PV_VAL_NONE|PV_VAL_NULL|PV_VAL_EMPTY)) { /* if NULL, remove the value */ - if (set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, NULL, 1)!=0) { + if (set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, NULL)!=0) { LM_ERR("failed to delete dialog variable <%.*s>\n", param->pvn.u.isname.name.s.len,param->pvn.u.isname.name.s.s); /* unlock dialog */ if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); @@ -347,7 +347,7 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value return -1; } - if (set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, &val->rs, 1)!=0) { + if (set_dlg_variable_unsafe(dlg, &param->pvn.u.isname.name.s, &val->rs)!=0) { LM_ERR("failed to store dialog values <%.*s>\n",param->pvn.u.isname.name.s.len,param->pvn.u.isname.name.s.s); /* unlock dialog */ if (dlg) dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); diff --git a/modules_k/dialog/dlg_var.h b/modules_k/dialog/dlg_var.h index cd53807..03e2fd8 100644 --- a/modules_k/dialog/dlg_var.h +++ b/modules_k/dialog/dlg_var.h @@ -62,7 +62,7 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value struct dlg_var * get_local_varlist_pointer(struct sip_msg *msg, int clear_pointer); /* Adds, updates and deletes dialog variables */ -int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val, int new); +int set_dlg_variable_unsafe(struct dlg_cell *dlg, str *key, str *val); extern dlg_ctx_t _dlg_ctx;

13 years, 2 months

New commits on branch 3.1

by Daniel-Constantin Mierla

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2661675… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 11 11:36:10 2011 +0200 pua_xmpp: removed invalid lib path from Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30fd945… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 11 11:34:24 2011 +0200 presence_xml: removed invalid lib path from Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b7c8a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 11 11:32:34 2011 +0200 presence(k): removed invalid lib path from Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7723e6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 12 12:27:52 2011 +0100 tmx: added the docs for t_flush_flags() (cherry picked from commit ce7aa8e46e839a56d5759a688d03515f94497267) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5ba5f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 12 12:22:51 2011 +0100 tmx: restored t_flush_flags() - function to sycn the msg flags back to transaction when the transaction was created before modifying the flags - reported by Juha Heinanen (cherry picked from commit 83620cb7cd14ee3b509eef72d99337567f53967f) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14d4575… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jun 26 11:48:39 2011 +0200 tm: renamed typedef cell_type to tm_cell_t (cherry picked from commit c4c3773622a5419d890a13a5226d721ff0a7bcfa) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8027fd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 9 10:25:02 2011 +0200 xcap_client: use curl-config to get include and lib compile flags URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f31b2a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 9 10:08:33 2011 +0200 xcap_server: use xml2-config to get include and libs compile flags (cherry picked from commit 3e502e2ac387999306d4a472784ed0699b8c7f77) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0bc863… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 7 21:57:03 2011 +0200 xcap_server: remove invalid lib dir from Makefile (cherry picked from commit 7e1564b7e67a25eb22c26f4ae235d9b380ce8417) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f4a52c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 6 14:12:00 2011 +0200 tm: update T msg flags after {branch/failure}_route - after execution of branch_route or failure_route, set the message flags of the temporary request back to transaction request - 1.x behaviour - reported and partial patch by Alex Hermann (cherry picked from commit c589ca35b2aa3097a3c9e2a5a050514337300c05) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7edd05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 23 00:27:10 2011 +0200 app_lua: fixed assignments for Makefile vars (cherry picked from commit 1d4f8bbf2e3889c9c5279bf81ec832fb86b69112) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee121bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 12 22:51:20 2011 +0200 pua_xmpp: fixes to SIP-XMPP presence status translations * patch by Laura Testi to fix: - the online/offline status is ok in both direction (SIP<-->XMPP) - other status (away/busy) is not ok from XMPP to SIP - busy status is not ok from SIP to XMPP - each time XMPP contact change the status, triger a new SUBSCRIBE in xmpp gateway which generate multiple same subscriptions with different callid in both active_watchers and pua tables. This also makes multiple NOTIFY generation from the main Presence Server to GW when the SIP contact change it's status (cherry picked from commit d1097d6ac9295c529ad6e682534ee4b3f0a9daae) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b07dd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 4 11:41:32 2011 +0200 tls: safety check for current cipher - SSL_get_current_cipher(...) may return NULL, in case of the cipher was not set yet for the connection - caused crash when RPC command tls.list was used in such moment - cipher description is set to 'unknown' for such case - reported by Francesco Castellano (cherry picked from commit 816a0218130782ea86a3cc16feb2a008fe6fff68) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a38f618… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 23:03:54 2011 +0200 tm: don't set dst_uri to next hop for branch_route - added flag to skip setting dst_uri to next hop for branch_route if the dst_uri was not set before - there is already a select and a pseudo-variable to access next hop value, in case it is needed in branch route - reported by Alex Hermann (cherry picked from commit fb4ecbf986f4af366e5be9cbad26ceba924c77fd) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0dcf964… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 19:34:09 2011 +0200 tm: allow nested backup of avp lists when sending local requests - added ability to use a local variable instead static var to backup/restore avps lists for local generated transactions (cherry picked from commit 08798a6d06b628fa5888ded867c5d18416b9f013) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab9451a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 1 14:36:39 2011 +0200 tm: backup/restore lists of avps for usage t_uac - when sending a self-generated request while processing other sip message, backup the list of avps and restore afterwards - reported by Sebastian Damm - added helper function to backup/restore the lists of avps from msg context to static var and use transaction lists (cherry picked from commit 203b2678a7115f2ba744eeda5279108fdd5b139d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3585f8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 17 00:28:26 2011 +0200 app_python: provide a clone string to dirname and basename - script name value is cloned before execution of dirname and basename since they may modify the parameter - reported by Arnaud Chong, FS#137 (cherry picked from commit 53605f2ca1718e42f1f1fcb87bb67935c889249a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25bebfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 17 00:17:58 2011 +0200 app_python: fixed compile warning - warning: dereferencing type-punned pointer will break strict-aliasing rules

13 years, 2 months

Siremis Enhancements: Added new field to SIP Trace

by James Wyatt

SIP Trace detail form will now show time_us field from table. This patch requires the User interface changes patch be applied first James

13 years, 2 months

Siremis Enhancements: Install error

by James Wyatt

Fixes a bug where initial install of siremis produces an error where it cannot access the openser database. James

13 years, 2 months

Siremis Enhancements: Added new PUA pages

by James Wyatt

Added PUA pages to manage the pua table. This patch requires that the RLS patch be applied first. James

13 years, 2 months

Siremis Enhancements: User interface element changes

by James Wyatt

I have changed some of the UI elements so that human readable times are shown instead of a raw timestamp in seconds and removed the text editor that showed on detail forms of some of the pages and swaped some for textareas in edit forms. James

13 years, 2 months

Siremis Enhancements: Dispatcher pages

by James Wyatt

In the dispatcher forms you can now set flags with checkboxes and select attributes from a pulldown menu. James

13 years, 2 months

Siremis Enhancements: Added new RLS pages

by James Wyatt

Added RLS Presentity and RLS Watchers pages to manage the rls_presentity and rls_watchers tables. James

13 years, 2 months

registrar save() with multiple Contact headers

by Francesco Castellano

Dear Sirs, I was wondering if an unexpected behaviour I'm experiencing on our SIP proxy is caused by a faulty client (i.e., faulty expectation of mine), or, this is the reason I'm writing you, by a possible bug. I'm running SIP router version 3.1.3, Kamailio flavour (so the actual module loaded is from modules_k/). The client, after a successful REGISTER parses the contacts in the 200 OK reply, and then, if found, de-register previous registrations by itself no more relevant (essentially we're speaking of a mobile application, so changes of connectivity can lead to these broken locations). The second REGISTER, with re-register of the current good location, and de-register of previous, broken locations looked like: REGISTER sip:sip.domain.com SIP/2.0. Via: SIP/2.0/TCP 192.168.130.21:5060;rport;branch=z9hG4bK-864-1-17. Route: <sip:213.98.57.102:5060;transport=TCP;lr>. Max-Forwards: 70. From: "cippa" <sip:1234@sip.domain.com>;tag=l0p3Kw9T0iksJso7bfbajNx8zFbTLMdv-1. To: "cippa" <sip:1234@sip.domain.com>. Call-ID: 5300432-enOD-gYijrKAsugiWFZ8iYVublP98xvS///1-864(a)192.168.130.21. CSeq: 6 REGISTER. Contact: <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiReg>. Contact: <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiRog>;expires=0. Expires: 600. Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS. Authorization: [...] Content-Length: 0. And the proxy reacted to this request updating the first location (sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiReg) expire time, but ignoring the second one (sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiRog).. No better results, if the expire value was always specified as an header parameter as opposed to an header ad hoc: REGISTER sip:sip.domain.com SIP/2.0. Via: SIP/2.0/TCP 192.168.130.21:5060;rport;branch=z9hG4bK-864-1-17. Route: <sip:213.98.57.102:5060;transport=TCP;lr>. Max-Forwards: 70. From: "cippa" <sip:1234@sip.domain.com>;tag=l0p3Kw9T0iksJso7bfbajNx8zFbTLMdv-1. To: "cippa" <sip:1234@sip.domain.com>. Call-ID: 5300432-enOD-gYijrKAsugiWFZ8iYVublP98xvS///1-864(a)192.168.130.21. CSeq: 6 REGISTER. Contact: <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiReg>;expires=600. Contact: <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiRog>;expires=0. Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS. Authorization: [...] Content-Length: 0. Compacting instead the Contact headers worked fine: REGISTER sip:sip.domain.com SIP/2.0. Via: SIP/2.0/TCP 192.168.130.21:5060;rport;branch=z9hG4bK-864-1-17. Route: <sip:213.98.57.102:5060;transport=TCP;lr>. Max-Forwards: 70. From: "cippa" <sip:1234@sip.domain.com>;tag=l0p3Kw9T0iksJso7bfbajNx8zFbTLMdv-1. To: "cippa" <sip:1234@sip.domain.com>. Call-ID: 5300432-enOD-gYijrKAsugiWFZ8iYVublP98xvS///1-864(a)192.168.130.21. CSeq: 6 REGISTER. Contact: <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiReg>;expires=600, <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiRog>;expires=0. Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS. Authorization: [...] Content-Length: 0. even with a global Expires headers: REGISTER sip:sip.domain.com SIP/2.0. Via: SIP/2.0/TCP 192.168.130.21:5060;rport;branch=z9hG4bK-864-1-17. Route: <sip:213.98.57.102:5060;transport=TCP;lr>. Max-Forwards: 70. From: "cippa" <sip:1234@sip.domain.com>;tag=l0p3Kw9T0iksJso7bfbajNx8zFbTLMdv-1. To: "cippa" <sip:1234@sip.domain.com>. Call-ID: 5300432-enOD-gYijrKAsugiWFZ8iYVublP98xvS///1-864(a)192.168.130.21. CSeq: 6 REGISTER. Contact: <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiReg>, <sip:1234@192.168.130.21:5060;transport=TCP;uniq=MultiRog>;expires=0. Expires: 600 Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS. Authorization: [...] Content-Length: 0. Who is doing wrong? The client with multiple Contact headers, or the server not treating as semantically equals the requests? Thank you for your attention, Best regards, Francesco Castellano

13 years, 2 months

git:master: xcap_client: use curl-config to get include and lib compile flags

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5969fc96aac2ae61f1171c704e98a681f2679ed4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5969fc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 9 10:25:02 2011 +0200 xcap_client: use curl-config to get include and lib compile flags --- modules_k/xcap_client/Makefile | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_client/Makefile b/modules_k/xcap_client/Makefile index d275d47..d3f513e 100644 --- a/modules_k/xcap_client/Makefile +++ b/modules_k/xcap_client/Makefile @@ -10,9 +10,19 @@ auto_gen= NAME=xcap_client.so LIBS= -DEFS+=-I$(LOCALBASE)/include +CURLCFG=$(shell which curl-config) -LIBS+=-L$(SYSBASE)/lib -L$(LOCALBASE)/lib -lcurl +ifneq ($(CURLCFG),) + + DEFS += $(shell $(CURLCFG) --cflags) + LIBS += $(shell $(CURLCFG) --libs) + +else + + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(SYSBASE)/lib -L$(LOCALBASE)/lib -lcurl + +endif DEFS+=-DOPENSER_MOD_INTERFACE

13 years, 2 months

← Newer
1
...
18
19
20
21
22
23
24
...
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 2011