sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: db_flatstore: fix clang compiler warning

by Ovidiu Sas

Module: sip-router Branch: master Commit: abe9d1642a70cfd7d5440db692a484b991253862 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abe9d16… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Sep 3 13:17:32 2014 -0400 db_flatstore: fix clang compiler warning --- modules/db_flatstore/km_flatstore.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index cd042c4..abb4602 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -212,6 +212,10 @@ int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, case DB1_BITMAP: fprintf(f, "%u", VAL_BITMAP(v + i)); break; + + default: + LM_ERR("val type [%d] not supported", VAL_TYPE(v + i)); + return -1; } if (i < (n - 1)) {

9 years, 8 months

git:master: lib/srdb1: fix clang compiler warning

by Ovidiu Sas

Module: sip-router Branch: master Commit: 89f9f0c10c10c09218576129e3fdc3da55355c48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89f9f0c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Sep 3 13:15:35 2014 -0400 lib/srdb1: fix clang compiler warning --- lib/srdb1/db_val.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_val.c b/lib/srdb1/db_val.c index dc2ea4b..1bdc2bc 100644 --- a/lib/srdb1/db_val.c +++ b/lib/srdb1/db_val.c @@ -183,6 +183,9 @@ int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l, VAL_BLOB(_v).len = _l; VAL_TYPE(_v) = DB1_BLOB; return 0; + + default: + return -10; } return -10; }

9 years, 8 months

git:master: jsonrpc-s: initial support for 'u' specifier

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 938373a28545a51f335e9489541b106c8261b81d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=938373a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 3 09:45:42 2014 +0200 jsonrpc-s: initial support for 'u' specifier - auto-convert to unsigned int --- modules/jsonrpc-s/jsonrpc-s_mod.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index 4e65894..1ecd135 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -303,6 +303,9 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) case 'd': nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, int)); break; + case 'u': + nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, unsigned int)); + break; case 'f': nj = srjson_CreateNumber(ctx->jrpl, va_arg(*ap, double)); break; @@ -396,6 +399,7 @@ err: static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) { int *int_ptr; + unsigned int *uint_ptr; char **char_ptr; double *double_ptr; str *str_ptr; @@ -429,6 +433,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) int_ptr = va_arg(ap, int*); *int_ptr = ctx->req_node->valueint; break; + case 'u': /* Integer */ + uint_ptr = va_arg(ap, unsigned int*); + *uint_ptr = (unsigned int)ctx->req_node->valueint; + break; case 'f': /* double */ double_ptr = va_arg(ap, double*); *double_ptr = ctx->req_node->valuedouble;

9 years, 8 months

git:master: doc/rpc: updated content to reflect renaming of printf() to rpl_printf()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f925ea38f98c3c6f0908064586338a3fb971def6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f925ea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 3 09:28:53 2014 +0200 doc/rpc: updated content to reflect renaming of printf() to rpl_printf() --- doc/rpc/ser_rpc.txt | 34 +++++++++++++++++++++------------- doc/rpc/ser_rpc.xml | 32 +++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/doc/rpc/ser_rpc.txt b/doc/rpc/ser_rpc.txt index 5d0cb13..06b8044 100644 --- a/doc/rpc/ser_rpc.txt +++ b/doc/rpc/ser_rpc.txt @@ -17,7 +17,7 @@ 1.2.4.1. fault 1.2.4.2. send 1.2.4.3. add - 1.2.4.4. printf + 1.2.4.4. rpl_printf 1.2.4.5. struct_add 1.2.5. Real World Example @@ -39,12 +39,19 @@ implementing RPC transports. The RPC transports are implemented by writting a RPC transport module. - The most used transport modules are ctl and xmlrpc . The first one - implements a ser-proprietary fast and space efficient RPC encoding over - different protocols (unix sockets, UDP, TCP, fifo). The second one uses - the de-facto XML-RPC standard encoding (over HTTP TCP or TLS). For more - information about the existing transport modules, please refer to their - documentation. + The most used transport modules are ctl , xmlrpc and jsonrpc-s . + + ctl implements a proprietary fast and space efficient RPC encoding over + different protocols (unix sockets, UDP, TCP, fifo). + + xmlrpc uses the de-facto XML-RPC standard encoding (over HTTP TCP or + TLS). + + jsonrpc-s uses the de-facto JSON-RPC standard encoding (over HTTP TCP + or TLS). + + For more information about the existing transport modules, please refer + to their documentation. When writing a RPC procedure or function, one needs only use the RPC API and it will work automatically with all the transports and @@ -523,13 +530,14 @@ static void rpc_func(rpc_t* rpc, void *ctx) You can set the attributes of the newly created structure using struct_add function described in Section 1.2.4.5, "struct_add". -1.2.4.4. printf +1.2.4.4. rpl_printf - printf is a convenience function. The function adds data of type string - to the result set. The first parameter of the function is again a - formatting string, but this time it is printf-like formatting string: -if (rpc->printf(ctx, "Unable to delete %d entries from table %s", num_entries, t -able_name) < 0) return; + rpl_printf is a convenience function. The function adds data of type + string to the result set. The first parameter of the function is again + a formatting string, but this time it is standard printf-like + formatting string: +if (rpc->rpl_printf(ctx, "Unable to delete %d entries from table %s", num_entrie +s, table_name) < 0) return; The return value of the function is the same as of add function. diff --git a/doc/rpc/ser_rpc.xml b/doc/rpc/ser_rpc.xml index 2aca3fd..a8355c8 100644 --- a/doc/rpc/ser_rpc.xml +++ b/doc/rpc/ser_rpc.xml @@ -34,17 +34,30 @@ <para> The RPC transports are implemented by writting a RPC transport module. The most used transport modules are - <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules/ctl/ctl.html'> + <ulink url='http://www.kamailio.org/docs/modules/devel/modules/ctl/ctl.html'> <emphasis>ctl</emphasis> + </ulink>, + <ulink url='http://www.kamailio.org/docs/modules/devel/modules/xmlrpc/xmlrpc.html'> + <emphasis>xmlrpc</emphasis> </ulink> and - <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules/xmlrpc/xmlrp…'> - <emphasis>xmlrpc</emphasis> + <ulink url='http://www.kamailio.org/docs/modules/devel/modules/jsonrpc-s/jsonrpc-s.html'> + <emphasis>jsonrpc-s</emphasis> </ulink>. - The first one implements a ser-proprietary fast and space efficient + </para> + <para> + ctl implements a proprietary fast and space efficient RPC encoding over different protocols (unix sockets, UDP, TCP, fifo). - The second one uses the de-facto XML-RPC standard encoding + </para> + <para> + xmlrpc uses the de-facto XML-RPC standard encoding (over HTTP TCP or TLS). + </para> + <para> + jsonrpc-s uses the de-facto JSON-RPC standard encoding + (over HTTP TCP or TLS). + </para> + <para> For more information about the existing transport modules, please refer to their documentation. </para> @@ -738,15 +751,16 @@ static void rpc_func(rpc_t* rpc, void *ctx) </para> </section> <section> - <title>printf</title> + <title>rpl_printf</title> <para> - <varname>printf</varname> is a convenience function. The + <varname>rpl_printf</varname> is a convenience function. The function adds data of type string to the result set. The first parameter of the function is again a formatting - string, but this time it is <function>printf</function>-like formatting string: + string, but this time it is standard + <function>printf</function>-like formatting string: <programlisting> <![CDATA[ -if (rpc->printf(ctx, "Unable to delete %d entries from table %s", num_entries, table_name) < 0) return; +if (rpc->rpl_printf(ctx, "Unable to delete %d entries from table %s", num_entries, table_name) < 0) return; ]]> </programlisting> The return value of the function is the same as of

9 years, 8 months

git:master: xmlrpc: initial support for 'u' specifier

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 241d6387989be258880131e578598591869a3645 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=241d638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 3 09:46:41 2014 +0200 xmlrpc: initial support for 'u' specifier - auto-convert to unsigned int --- modules/xmlrpc/xmlrpc.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 634c1e8..e97a3f3 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -1013,6 +1013,12 @@ static int print_value(struct xmlrpc_reply* res, body.s = sint2str(va_arg(*ap, int), &body.len); break; + case 'u': + prefix = int_prefix; + suffix = int_suffix; + body.s = int2str(va_arg(*ap, unsigned int), &body.len); + break; + case 'f': prefix = double_prefix; suffix = double_suffix; @@ -1501,7 +1507,9 @@ static int get_string(char** val, struct xmlrpc_reply* reply, static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) { int read; + int ival; int* int_ptr; + unsigned int* uint_ptr; char** char_ptr; str* str_ptr; double* double_ptr; @@ -1548,6 +1556,12 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) int_ptr = va_arg(ap, int*); if (get_int(int_ptr, reply, ctx->doc, value, f) < 0) goto error; break; + + case 'u': /* Integer */ + uint_ptr = va_arg(ap, unsigned int*); + if (get_int(&ival, reply, ctx->doc, value, f) < 0) goto error; + *uint_ptr = (unsigned int)ival; + break; case 'f': /* double */ double_ptr = va_arg(ap, double*); @@ -1898,8 +1912,10 @@ static int rpc_struct_printf(struct rpc_struct* s, char* member_name, static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...) { int read; + int ival; va_list ap; int* int_ptr; + unsigned int* uint_ptr; double* double_ptr; char** char_ptr; str* str_ptr; @@ -1929,6 +1945,12 @@ static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...) if (get_int(int_ptr, reply, s->doc, value, f) < 0) goto error; break; + case 'u': /* Integer */ + uint_ptr = va_arg(ap, unsigned int*); + if (get_int(&ival, reply, s->doc, value, f) < 0) goto error; + *uint_ptr = (unsigned int)ival; + break; + case 'f': /* double */ double_ptr = va_arg(ap, double*); if (get_double(double_ptr, reply, s->doc, value, f) < 0)

9 years, 8 months

[tracker] Comment added: CRASH: Program terminated with signal 6, Aborted.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#449 - CRASH: Program terminated with signal 6, Aborted. User who did this - Nuno Miguel Reis (nmreis) ---------- Hi Daniel. I've just started working this Monday again, after a 2 week vacation period and in the meanwhile didn't have the opportunity to test this issue better. Nevertheless since you felt confident with your patches ans closed the issue, i'll let you know if the bug pops up again, eventually, as suggested. Thanks and keep up the good work. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=449#comment1610 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.

9 years, 8 months

git:master: modules/ims_registrar_pcscf: fixed transport lookup code

by Jason Penton

Module: sip-router Branch: master Commit: edfc839ed2c0778f0ce370e5b1caf10f865cf524 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edfc839… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Sep 3 12:05:21 2014 +0200 modules/ims_registrar_pcscf: fixed transport lookup code --- modules/ims_registrar_pcscf/lookup.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/ims_registrar_pcscf/lookup.c b/modules/ims_registrar_pcscf/lookup.c index a6f5ecd..aefddda 100644 --- a/modules/ims_registrar_pcscf/lookup.c +++ b/modules/ims_registrar_pcscf/lookup.c @@ -88,17 +88,17 @@ int lookup_transport(struct sip_msg* _m, udomain_t* _d, str* _uri) { ret = -2; goto done; } + + tmp_s.s = tmp; + tmp_s.len = strlen(tmp); + if (set_dst_uri(_m, &tmp_s) < 0) { + LM_ERR("failed to set dst_uri for terminating UE\n"); + ret = -2; + goto done; + } + LM_DBG("Changed dst URI transport for UE to [%.*s]\n", tmp_s.len, tmp_s.s); } - tmp_s.s = tmp; - tmp_s.len = strlen(tmp); - if (set_dst_uri(_m, &tmp_s) < 0) { - LM_ERR("failed to set dst_uri for terminating UE\n"); - ret = -2; - goto done; - } - LM_DBG("Changed dst URI transport for UE to [%.*s]\n", tmp_s.len, tmp_s.s); - done: ul.unlock_udomain(_d, &uri); return ret;

9 years, 8 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/kamailio

by Hugh Waite

Module: sip-router Branch: master Commit: 331b0cf3e9a739f44fc23a3c7d07da725145aa76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=331b0cf… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Wed Sep 3 11:49:49 2014 +0100 Merge branch 'master' of ssh://git.sip-router.org/kamailio ---

9 years, 8 months

git:master: htable: Fix declarations of variable ht_expired_cell

by Hugh Waite

Module: sip-router Branch: master Commit: 9f3cad7fbd74bf45c242bc6f587dce96c796fcc1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f3cad7… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Wed Sep 3 11:42:58 2014 +0100 htable: Fix declarations of variable ht_expired_cell - Removed unused extern delaration in htable.c - Reported by Ovidiu Sas --- modules/htable/ht_var.c | 2 +- modules/htable/htable.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/htable/ht_var.c b/modules/htable/ht_var.c index 5f8c043..50901d3 100644 --- a/modules/htable/ht_var.c +++ b/modules/htable/ht_var.c @@ -26,7 +26,7 @@ /* pkg copy */ ht_cell_t *_htc_local=NULL; -ht_cell_t *ht_expired_cell; +extern ht_cell_t *ht_expired_cell; int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 747fb0f..0dfdcda 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -52,7 +52,6 @@ MODULE_VERSION int ht_timer_interval = 20; int ht_db_expires_flag = 0; int ht_enable_dmq = 0; -extern ht_cell_t *ht_expired_cell; static int htable_init_rpc(void);

9 years, 8 months

How to uniquely identify SIP WS / WSS endpoint

by Muhammad Shahzad

Sorry for putting this question on both dev and user mailing lists, as it is a rather theoretical question and i hope some SIP guru on either mail list will answer. For non-WS endpoints which use TCP or UDP for SIP transport, each upstream request has top most VIA header pointing to the previous hop which forwarded the request to current hop while each downstream request has top most VIA header pointing to next hop to which it will be forwarded from current hop. But for WS endpoints, the top most VIA has dummy static value, so there is no way to identify who sent this request or to whom the reply is going to. Please note that i am not specifically interested in network address of remote endpoint (though VIA header is suppose to provide it), i only need to match requests and responses from / to a specific device using SIP v2.0 standard. Any help is highly appreciated. Thank you.

9 years, 8 months

← Newer
1
...
30
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014