sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
382 discussions

git:master: modules/pua: added outbound_proxy to struct publ_info
by Juha Heinanen 25 Oct '14

25 Oct '14

Module: sip-router Branch: master Commit: b0d089b685abc51b68b25e90c6021b888cabf051 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0d089b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Oct 25 18:46:25 2014 +0300 modules/pua: added outbound_proxy to struct publ_info --- modules/pua/README | 25 ++++++++++++++----------- modules/pua/doc/pua_admin.xml | 3 ++- modules/pua/doc/pua_devel.xml | 2 ++ modules/pua/hash.h | 2 +- modules/pua/send_publish.c | 20 ++++++++++++++++++-- modules/pua/send_publish.h | 1 + 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/modules/pua/README b/modules/pua/README index c8c7d8a..ed64a3b 100644 --- a/modules/pua/README +++ b/modules/pua/README @@ -8,7 +8,7 @@ Edited by Anca-Maria Vamanu - Copyright � 2006 Voice Sistem SRL + Copyright (c) 2006 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -186,7 +186,7 @@ modparam("pua", "hash_size", 11) Database url. - Default value is ">mysql://openser:openserrw@localhost/openser". + Default value is ">mysql://kamailio:kamailiorw@localhost/kamailio". Example 1.2. Set db_url parameter ... @@ -243,7 +243,8 @@ modparam("pua", "update_period", 100) 3.7. outbound_proxy (str) - SIP URI of outbound proxy to be used when sending PUBLISH requests. + SIP URI of outbound proxy to be used when sending PUBLISH requests if + no outbound proxy is given in outbound_proxy field of struct publ_info. By default, no outbound proxy has been defined. @@ -334,7 +335,7 @@ modparam("pua", "fetch_rows", 1000) 4.1. pua_update_contact() -4.1. pua_update_contact() +4.1. pua_update_contact() The remote target can be updated by the Contact of a subsequent in dialog request. In the PUA watcher case (sending a SUBSCRIBE messages), @@ -359,7 +360,7 @@ if(method=="NOTIFY") 5.1. pua_cleanup -5.1. pua_cleanup +5.1. pua_cleanup Manually triggers the cleanup functions for the pua table. Useful if you have set update_period to zero or less. @@ -394,7 +395,7 @@ Chapter 2. Developer Guide The module provides the following functions that can be used by other Kamailio modules. -1. bind_pua(pua_api_t* api) +1. bind_pua(pua_api_t* api) This function binds the pua modules and fills the structure with the two exported functions. @@ -410,7 +411,7 @@ typedef struct pua_api { } pua_api_t; ... -2. send_publish +2. send_publish Field type: ... @@ -445,12 +446,14 @@ typedef struct publ_info for that event)*/ str* etag; /* (optional) the value of the etag the request should match */ + str* outbound_proxy;/* outbound_proxy to use when sending the + Publish request */ str* extra_headers /* (optional) extra_headers that should be added to Publish msg*/ }publ_info_t; ... -3. send_subscribe +3. send_subscribe Field type: ... @@ -489,7 +492,7 @@ typedef struct subs_info }subs_info_t; ... -4. is_dialog +4. is_dialog Field type: ... @@ -508,7 +511,7 @@ typedef int (*query_dialog_t)(ua_pres_t* presentity); } ... -5. register_puacb +5. register_puacb Field type: ... @@ -537,7 +540,7 @@ typedef int (*register_puacb_t)(int types, pua_cb f, void* param ); typedef int (pua_cb)(ua_pres_t* hentity, struct sip_msg*); ... -6. add_event +6. add_event Field type: ... diff --git a/modules/pua/doc/pua_admin.xml b/modules/pua/doc/pua_admin.xml index f692786..e7b242d 100644 --- a/modules/pua/doc/pua_admin.xml +++ b/modules/pua/doc/pua_admin.xml @@ -197,7 +197,8 @@ modparam("pua", "update_period", 100) <title><varname>outbound_proxy</varname> (str)</title> <para> SIP URI of outbound proxy to be used when sending - PUBLISH requests. + PUBLISH requests if no outbound proxy is given in + outbound_proxy field of struct publ_info. </para> <para> <emphasis>By default, no outbound proxy has been defined. diff --git a/modules/pua/doc/pua_devel.xml b/modules/pua/doc/pua_devel.xml index 75014b4..d36c8d1 100644 --- a/modules/pua/doc/pua_devel.xml +++ b/modules/pua/doc/pua_devel.xml @@ -86,6 +86,8 @@ typedef struct publ_info for that event)*/ str* etag; /* (optional) the value of the etag the request should match */ + str* outbound_proxy;/* outbound_proxy to use when sending the + Publish request */ str* extra_headers /* (optional) extra_headers that should be added to Publish msg*/ }publ_info_t; diff --git a/modules/pua/hash.h b/modules/pua/hash.h index af32d13..161939b 100644 --- a/modules/pua/hash.h +++ b/modules/pua/hash.h @@ -81,6 +81,7 @@ typedef struct ua_pres{ void* cb_param; struct ua_pres* next; int ua_flag; + str* outbound_proxy; /* croc-not sored in db_only mode */ /* publish */ str etag; @@ -96,7 +97,6 @@ typedef struct ua_pres{ int cseq; int version; /* int watcher_count; croc-nolonger used!! */ - str* outbound_proxy; /* croc-not sored in db_only mode */ str* extra_headers; str record_route; str remote_contact; diff --git a/modules/pua/send_publish.c b/modules/pua/send_publish.c index da74ab7..3ddd5e7 100644 --- a/modules/pua/send_publish.c +++ b/modules/pua/send_publish.c @@ -274,6 +274,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) publ.content_type= hentity->content_type; publ.id= hentity->id; publ.extra_headers= hentity->extra_headers; + publ.outbound_proxy = hentity->outbound_proxy; publ.cb_param= hentity->cb_param; if (dbmode == PUA_DB_ONLY && pua_dbf.end_transaction) @@ -692,8 +693,9 @@ send_publish: result= tmb.t_request(&uac_r, publ->pres_uri, /*! Request-URI */ publ->pres_uri, /*! To */ - publ->pres_uri, /*! From */ - &outbound_proxy /*! Outbound proxy*/ + publ->pres_uri, /*! From */ + publ->outbound_proxy? + publ->outbound_proxy:&outbound_proxy /*! Outbound proxy*/ ); if(result< 0) @@ -757,6 +759,9 @@ ua_pres_t* publish_cbparam(publ_info_t* publ,str* body,str* tuple_id, size= sizeof(ua_pres_t)+ sizeof(str)+ (publ->pres_uri->len+ + publ->content_type.len+ publ->id.len+ 1)*sizeof(char); + + if(publ->outbound_proxy) + size+= sizeof(str)+ publ->outbound_proxy->len* sizeof(char); if(body && body->s && body->len) size+= sizeof(str)+ body->len* sizeof(char); if(publ->etag) @@ -822,6 +827,16 @@ ua_pres_t* publish_cbparam(publ_info_t* publ,str* body,str* tuple_id, cb_param->extra_headers->len= publ->extra_headers->len; size+= publ->extra_headers->len; } + if(publ->outbound_proxy) + { + cb_param->outbound_proxy = (str*)((char*)cb_param + size); + size += sizeof(str); + cb_param->outbound_proxy->s = (char*)cb_param + size; + memcpy(cb_param->outbound_proxy->s, publ->outbound_proxy->s, + publ->outbound_proxy->len); + cb_param->outbound_proxy->len = publ->outbound_proxy->len; + size+= publ->outbound_proxy->len; + } if(publ->content_type.s && publ->content_type.len) { @@ -837,6 +852,7 @@ ua_pres_t* publish_cbparam(publ_info_t* publ,str* body,str* tuple_id, cb_param->tuple_id.len= tuple_id->len; size+= tuple_id->len; } + cb_param->event= publ->event; cb_param->flag|= publ->source_flag; cb_param->cb_param= publ->cb_param; diff --git a/modules/pua/send_publish.h b/modules/pua/send_publish.h index ef81ee9..667d7aa 100644 --- a/modules/pua/send_publish.h +++ b/modules/pua/send_publish.h @@ -44,6 +44,7 @@ typedef struct publ_info str content_type; /*! the content_type of the body if present(optional if the same as the default value for that event) */ str* etag; + str* outbound_proxy; str* extra_headers; void* cb_param; /*! the parameter for the function to be called on the callback for the received reply; it must be allocated in share memory;

1 0

JSON Warning: free function has not been defined for spve
by Muhammad Shahzad 25 Oct '14

25 Oct '14

Hi, I am using JSON module and when i call json_get_field from kamailio.cfg, xlog("L_INFO", "JSON string: $var(json)\n"); json_get_field($var(json), "from_number", "$var(from)"); i get following warning, INFO: <script>: JSON string: {"from_number":"49XXXXXXXX","to_number":"49XXXXXXXX","domain":" sip.mydomain.com","from_name":"John","timestamp":1414095386.7094} WARNING: json [json_mod.c:86]: fixup_get_field_free(): free function has not been defined for spve While the code works fine, but this warning just gives me worries that there may be a memory leak here. Can you guys confirm if i can ignore this warning when this code goes to production? Thank you.

1 0

git:master: cr: fix some cr kamctl fifo problems
by Lucian Balaceanu 24 Oct '14

24 Oct '14

Module: sip-router Branch: master Commit: 22d125e3b73688b227a951dce1ce12b4c798229a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22d125e… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Fri Oct 24 17:29:35 2014 +0300 cr: fix some cr kamctl fifo problems - initialize builtin structures with appropiate values --- modules/carrierroute/cr_config.c | 8 ++++++++ modules/carrierroute/parser_carrierroute.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 0912b9a..03c8df5 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -66,6 +66,13 @@ static void reset_opts(option_description * opts, int size){ opts[i].value.string_data.len = 0; } } + + opts[TO_ID_STRIP ].value.int_data=0; + opts[TO_ID_PROB ].value.float_data=0; + opts[TO_ID_HASH_INDEX].value.int_data=0; + opts[TO_ID_STATUS ].value.int_data=0; + opts[TO_ID_BACKUP ].value.int_data=-1; + return; } @@ -108,6 +115,7 @@ static int init_prefix_opts(option_description * opts){ memset(opts, '\0', sizeof(option_description) * PO_MAX_IDS); strcpy((char*)(opts[PO_MAX_TARGETS].name), "max_targets"); opts[PO_MAX_TARGETS].type=CFG_INT; + opts[PO_MAX_TARGETS].value.int_data=-1; return 0; } diff --git a/modules/carrierroute/parser_carrierroute.c b/modules/carrierroute/parser_carrierroute.c index 499e4f1..2337c3b 100644 --- a/modules/carrierroute/parser_carrierroute.c +++ b/modules/carrierroute/parser_carrierroute.c @@ -178,8 +178,9 @@ int parse_rv_option(str src, option_description* opt){ LM_ERR("Not a string \n"); return ERROR_IN_PARSING; } - strcpy( opt->value.string_data.s, src.s); - opt->value.string_data.len = src.len; + strncpy( opt->value.string_data.s, src.s+1, src.len-2); + opt->value.string_data.s[src.len-2] = '\0'; + opt->value.string_data.len = src.len-2; LM_DBG("String Key=<%s>, value=<%s> \n", opt->name, opt->value.string_data.s); ret = SUCCESSFUL_PARSING; }

1 0

git:master: cr: decreased logging severity of some messages
by Lucian Balaceanu 24 Oct '14

24 Oct '14

Module: sip-router Branch: master Commit: 2a57414fd952f36f88b1ab2dc038934a8ddf6d64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a57414… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Fri Oct 24 17:12:34 2014 +0300 cr: decreased logging severity of some messages - moved some informative messages from ERR to INFO, DBG --- modules/carrierroute/cr_config.c | 4 ++-- modules/carrierroute/parser_carrierroute.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 42da588..0912b9a 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -402,7 +402,7 @@ int load_config(struct route_data_t * rd) { } backup = target_options[TO_ID_BACKUP].value.int_data; - LM_ERR("\n Adding route to tree <'%.*s'>: prefix_name:%s\n," + LM_DBG("\n Adding route to tree <'%.*s'>: prefix_name:%s\n," " max_targets =%d\n, prob=%f\n, rewr_host=%s\n," " strip=%i\n, rwr_prefix=%s\n, rwr_suff=%s\n," " status=%i\n, hash_index=%i\n, comment=%s \n", @@ -452,7 +452,7 @@ int load_config(struct route_data_t * rd) { goto errclose; } - LM_ERR("File parsed successfully \n"); + LM_INFO("File parsed successfully \n"); fclose(file); return 0; errclose: diff --git a/modules/carrierroute/parser_carrierroute.c b/modules/carrierroute/parser_carrierroute.c index 0f7de38..499e4f1 100644 --- a/modules/carrierroute/parser_carrierroute.c +++ b/modules/carrierroute/parser_carrierroute.c @@ -377,7 +377,7 @@ int parse_struct_header(FILE* file, char* expected_struct_type, str* struct_name ret = SUCCESSFUL_PARSING; break; default: - LM_ERR("Wrong number of tokens in line: %s\n", data.s); + LM_DBG("Wrong number of tokens in line: %s\n", data.s); } if ( SUCCESSFUL_PARSING == ret ){

1 0

git:master: textops: fix append_body_part
by Victor Seva 24 Oct '14

24 Oct '14

Module: sip-router Branch: master Commit: e71c7f014f1217cb4431f2644e8c4c32cc6544f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e71c7f0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Oct 24 11:48:53 2014 +0200 textops: fix append_body_part append was adding double '--' to the delimiter --- modules/textops/textops.c | 50 ++++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/modules/textops/textops.c b/modules/textops/textops.c index 581fe12..8bfef16 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -1455,8 +1455,8 @@ static int set_rpl_body_f(struct sip_msg* msg, char* p1, char* p2) return 1; } -static str* generate_boundary(str txt, str content_type, - str content_disposition, str delimiter, unsigned int initial) +static str* generate_boundary(str *txt, str *content_type, + str *content_disposition, str *delimiter, unsigned int initial) { unsigned int i = 0; str cth = {"Content-Type: ", 14}; @@ -1464,32 +1464,37 @@ static str* generate_boundary(str txt, str content_type, str* n; unsigned int flag = 0; - if(txt.len==0||content_type.len==0||delimiter.len==0) + if(txt==NULL||txt->len==0 + ||content_type==NULL||content_type->len==0 + ||delimiter==NULL||delimiter->len==0) { LM_ERR("invalid parameters\n"); return NULL; } + if (delimiter->s[0] == '-') { + LM_ERR("delimiter with initial '-'. Invalid parameter.\n"); + return NULL; + } n = pkg_malloc(sizeof(str)); if(n==NULL) { LM_ERR("out of pkg memory\n"); return NULL; } - n->len = delimiter.len + 2 + CRLF_LEN; + n->len = delimiter->len + 2 + CRLF_LEN; if(initial) n->len = 2*n->len; - if(strncmp("\r\n\r\n", txt.s+txt.len-4,4)!=0) + if(strncmp("\r\n\r\n", txt->s+txt->len-4,4)!=0) { n->len = n->len + CRLF_LEN; flag = 1; LM_DBG("adding final CRLF+CRLF\n"); } - n->len=n->len + cth.len + content_type.len + 2*CRLF_LEN; - if(content_disposition.len>0) + n->len=n->len + cth.len + content_type->len + 2*CRLF_LEN; + if(content_disposition->len>0) { - n->len = n->len + cdh.len + content_disposition.len + CRLF_LEN; + n->len = n->len + cdh.len + content_disposition->len + CRLF_LEN; } - n->len = n->len + txt.len; - + n->len = n->len + txt->len; n->s = pkg_malloc(sizeof(char)*(n->len)); if(n->s==0) { @@ -1497,31 +1502,32 @@ static str* generate_boundary(str txt, str content_type, pkg_free(n); return NULL; } + memset(n->s, 0, sizeof(char)*n->len); if(initial) { memcpy(n->s, "--", 2); i=2; - memcpy(n->s+i, delimiter.s, delimiter.len); i=i+delimiter.len; + memcpy(n->s+i, delimiter->s, delimiter->len); i=i+delimiter->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; } memcpy(n->s+i, cth.s, cth.len); i=i+cth.len; - memcpy(n->s+i, content_type.s, content_type.len); i=i+content_type.len; + memcpy(n->s+i, content_type->s, content_type->len); i=i+content_type->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; - if(content_disposition.len>0) + if(content_disposition->len>0) { memcpy(n->s+i, cdh.s, cdh.len); i=i+cdh.len; - memcpy(n->s+i, content_disposition.s, content_disposition.len); - i=i+content_disposition.len; + memcpy(n->s+i, content_disposition->s, content_disposition->len); + i=i+content_disposition->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; } memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; - memcpy(n->s+i, txt.s, txt.len); i=i+txt.len; + memcpy(n->s+i, txt->s, txt->len); i=i+txt->len; if(flag) { memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; } memcpy(n->s+i, "--", 2); i=i+2; - memcpy(n->s+i, delimiter.s, delimiter.len); i=i+delimiter.len; + memcpy(n->s+i, delimiter->s, delimiter->len); i=i+delimiter->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; if(i!=n->len) @@ -1668,7 +1674,7 @@ int set_multibody_helper(struct sip_msg* msg, char* p1, char* p2, char* p3) } /* get initial boundary */ - nbb = generate_boundary(nb, oc, cd, delimiter, 1); + nbb = generate_boundary(&nb, &oc, &cd, &delimiter, 1); if(nbb==NULL) { LM_ERR("couldn't create initial boundary\n"); @@ -1857,19 +1863,17 @@ int append_multibody_helper(struct sip_msg* msg, char* p1, char* p2, char* p3) LM_ERR("WTF\n"); return -1; } - /* get boundary */ - if(get_boundary(msg, &delimiter)!=0) { + /* get delimiter no initial -- */ + if(get_mixed_part_delimiter(&msg->content_type->body, &delimiter) < 0) { LM_ERR("Cannot get boundary. Is body multipart?\n"); return -1; } - nbb = generate_boundary(txt, nc, cd, delimiter, 0); + nbb = generate_boundary(&txt, &nc, &cd, &delimiter, 0); if(nbb==NULL) { LM_ERR("couldn't create initial boundary\n"); - pkg_free(delimiter.s); return -1; } - pkg_free(delimiter.s); if(insert_new_lump_after(l, nbb->s, nbb->len, 0)==0){ LM_ERR("could not insert new lump\n"); pkg_free(nbb->s); pkg_free(nbb);

1 0

git:4.2: textops: fix append_body_part
by Victor Seva 24 Oct '14

24 Oct '14

Module: sip-router Branch: 4.2 Commit: 7a6e87eea35a9599d5a52d2cbf5f7dd8362e067c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a6e87e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Oct 24 11:48:53 2014 +0200 textops: fix append_body_part append was adding double '--' to the delimiter (cherry picked from commit e71c7f014f1217cb4431f2644e8c4c32cc6544f2) --- modules/textops/textops.c | 50 ++++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/modules/textops/textops.c b/modules/textops/textops.c index 581fe12..8bfef16 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -1455,8 +1455,8 @@ static int set_rpl_body_f(struct sip_msg* msg, char* p1, char* p2) return 1; } -static str* generate_boundary(str txt, str content_type, - str content_disposition, str delimiter, unsigned int initial) +static str* generate_boundary(str *txt, str *content_type, + str *content_disposition, str *delimiter, unsigned int initial) { unsigned int i = 0; str cth = {"Content-Type: ", 14}; @@ -1464,32 +1464,37 @@ static str* generate_boundary(str txt, str content_type, str* n; unsigned int flag = 0; - if(txt.len==0||content_type.len==0||delimiter.len==0) + if(txt==NULL||txt->len==0 + ||content_type==NULL||content_type->len==0 + ||delimiter==NULL||delimiter->len==0) { LM_ERR("invalid parameters\n"); return NULL; } + if (delimiter->s[0] == '-') { + LM_ERR("delimiter with initial '-'. Invalid parameter.\n"); + return NULL; + } n = pkg_malloc(sizeof(str)); if(n==NULL) { LM_ERR("out of pkg memory\n"); return NULL; } - n->len = delimiter.len + 2 + CRLF_LEN; + n->len = delimiter->len + 2 + CRLF_LEN; if(initial) n->len = 2*n->len; - if(strncmp("\r\n\r\n", txt.s+txt.len-4,4)!=0) + if(strncmp("\r\n\r\n", txt->s+txt->len-4,4)!=0) { n->len = n->len + CRLF_LEN; flag = 1; LM_DBG("adding final CRLF+CRLF\n"); } - n->len=n->len + cth.len + content_type.len + 2*CRLF_LEN; - if(content_disposition.len>0) + n->len=n->len + cth.len + content_type->len + 2*CRLF_LEN; + if(content_disposition->len>0) { - n->len = n->len + cdh.len + content_disposition.len + CRLF_LEN; + n->len = n->len + cdh.len + content_disposition->len + CRLF_LEN; } - n->len = n->len + txt.len; - + n->len = n->len + txt->len; n->s = pkg_malloc(sizeof(char)*(n->len)); if(n->s==0) { @@ -1497,31 +1502,32 @@ static str* generate_boundary(str txt, str content_type, pkg_free(n); return NULL; } + memset(n->s, 0, sizeof(char)*n->len); if(initial) { memcpy(n->s, "--", 2); i=2; - memcpy(n->s+i, delimiter.s, delimiter.len); i=i+delimiter.len; + memcpy(n->s+i, delimiter->s, delimiter->len); i=i+delimiter->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; } memcpy(n->s+i, cth.s, cth.len); i=i+cth.len; - memcpy(n->s+i, content_type.s, content_type.len); i=i+content_type.len; + memcpy(n->s+i, content_type->s, content_type->len); i=i+content_type->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; - if(content_disposition.len>0) + if(content_disposition->len>0) { memcpy(n->s+i, cdh.s, cdh.len); i=i+cdh.len; - memcpy(n->s+i, content_disposition.s, content_disposition.len); - i=i+content_disposition.len; + memcpy(n->s+i, content_disposition->s, content_disposition->len); + i=i+content_disposition->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; } memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; - memcpy(n->s+i, txt.s, txt.len); i=i+txt.len; + memcpy(n->s+i, txt->s, txt->len); i=i+txt->len; if(flag) { memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; } memcpy(n->s+i, "--", 2); i=i+2; - memcpy(n->s+i, delimiter.s, delimiter.len); i=i+delimiter.len; + memcpy(n->s+i, delimiter->s, delimiter->len); i=i+delimiter->len; memcpy(n->s+i, CRLF, CRLF_LEN); i=i+CRLF_LEN; if(i!=n->len) @@ -1668,7 +1674,7 @@ int set_multibody_helper(struct sip_msg* msg, char* p1, char* p2, char* p3) } /* get initial boundary */ - nbb = generate_boundary(nb, oc, cd, delimiter, 1); + nbb = generate_boundary(&nb, &oc, &cd, &delimiter, 1); if(nbb==NULL) { LM_ERR("couldn't create initial boundary\n"); @@ -1857,19 +1863,17 @@ int append_multibody_helper(struct sip_msg* msg, char* p1, char* p2, char* p3) LM_ERR("WTF\n"); return -1; } - /* get boundary */ - if(get_boundary(msg, &delimiter)!=0) { + /* get delimiter no initial -- */ + if(get_mixed_part_delimiter(&msg->content_type->body, &delimiter) < 0) { LM_ERR("Cannot get boundary. Is body multipart?\n"); return -1; } - nbb = generate_boundary(txt, nc, cd, delimiter, 0); + nbb = generate_boundary(&txt, &nc, &cd, &delimiter, 0); if(nbb==NULL) { LM_ERR("couldn't create initial boundary\n"); - pkg_free(delimiter.s); return -1; } - pkg_free(delimiter.s); if(insert_new_lump_after(l, nbb->s, nbb->len, 0)==0){ LM_ERR("could not insert new lump\n"); pkg_free(nbb->s); pkg_free(nbb);

1 0

STUN FINGERPRINT attribute missing?
by Peter Villeneuve 23 Oct '14

23 Oct '14

Hi, I just updated to 4.2 stable along with latest rtpengine module compiled today from git. I'm also running latest (compiled today) RFC5766 turn server on the same Debian 7 host. I noticed that sometimes I get one way audio with linphone client in Android, and looking through the logs I see these STUN error messages: rtpengine[4633]: [port 10448] Not handling potential STUN packet from 85.xx.xx.xx:7076: FINGERPRINT attribute missing That 85.xx.xx.xx address is indeed the public IP of the linphone client. Looking further in the RTP engine logs you can see it's not getting the IP which I believe would explain the 1 way audio issues. Media #1, port 10468 <> [::]:0 , 0 p, 0 b, 0 e Now why would rtpengine be dealing with STUN packets at all? I imagine the RFC5766 stun server would handle that completely. I guess the more I dig, the more confused I get. Has anything changed recently in rtpengine or kamailio 4.2 to produce this behavior? Thanks

2 6

async workers causing unexplained high load average
by Alex Balashov 23 Oct '14

23 Oct '14

Another thing I have found is that having a certain amount of async workers running, even if they are not doing anything, appears to cause unexplained CPU load, even if the Kamailio instance is completely idle and not processing any calls. Here is the baseline load with no async workers: [root@centosity6 ~]# uptime 14:06:28 up 2 min, 2 users, load average: 0.01, 0.00, 0.00 If I start Kamailio with 1 async worker... modparam("async", "workers", 1) async_workers=1 14:07:59 up 3 min, 2 users, load average: 0.00, 0.00, 0.00 Still nothing. Now I try 2: 14:08:54 up 4 min, 2 users, load average: 0.45, 0.11, 0.04 14:08:59 up 4 min, 2 users, load average: 0.49, 0.12, 0.04 14:09:04 up 4 min, 2 users, load average: 0.53, 0.14, 0.04 14:09:09 up 4 min, 2 users, load average: 0.57, 0.15, 0.05 14:09:14 up 5 min, 2 users, load average: 0.60, 0.17, 0.05 14:09:19 up 5 min, 2 users, load average: 0.63, 0.18, 0.06 14:09:31 up 5 min, 2 users, load average: 0.69, 0.21, 0.07 14:09:37 up 5 min, 2 users, load average: 0.71, 0.22, 0.07 14:10:35 up 6 min, 2 users, load average: 0.89, 0.36, 0.13 14:11:07 up 6 min, 2 users, load average: 0.93, 0.42, 0.16 ... I don't have time right now to see if it will rise to infinity, but it just keeps going up. There are no SIP messages being received at all, and there is absolutely nothing going on. The ascent of the load average is much higher with >= 4 threads. I have 8 "CPUs" available from /proc/cpuinfo (quad-core processor with HyperThreading). When I attach strace to the PID of the Async Worker, there's nothing going on except the normal recvfrom() blocking wait: [root@centosity6 kamailio]# kamctl ps | grep Async which: no greadlink in (/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/) Process:: ID=11 PID=1559 Type=Async Task Worker Process:: ID=12 PID=1560 Type=Async Task Worker [root@centosity6 kamailio]# strace -p 1559 Process 1559 attached - interrupt to quit recvfrom(9, [root@centosity6 ~]# strace -p 1560 Process 1560 attached - interrupt to quit recvfrom(9, Nor do the other Kamailio threads seem to be doing anything unusual. 'ps aux' and 'top' show 0.0% CPU load on the Kamailio processes themselves, and 'iowait' shows the system as 98-99% idle. I suppose it's possible that this is a peculiarity of the testing environment: I am running this on CentOS 6.5 inside VirtualBox, which I think is KVM-based. I have not had a chance to duplicate this experiment in a different kind of execution environment yet. It's possible that the load average is simply being improperly indicated because of the VM environment. -- Alex Balashov - Principal Evariste Systems LLC Tel: +1-678-954-0670 Web: http://www.evaristesys.com/, http://www.alexbalashov.com/ Please be kind to the English language: http://www.entrepreneur.com/article/232906

1 0

rtpengine, proposal for threads according to number of cpus
by Frederic-Philippe Metz 23 Oct '14

23 Oct '14

Hi all, I saw in the code (master branch) that 'thread_create_detach(poller_loop, ctx.p);' in main() is executed 4 times. I propose to create as many threads as cpus. Patch below. Cheers, Frédéric diff --git a/daemon/main.c b/daemon/main.c index 449db08..50e197c 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -625,6 +625,7 @@ static void poller_loop(void *d) { int main(int argc, char **argv) { struct main_context ctx; + int idx=0, numCPU=0; options(&argc, &argv); init_everything(); @@ -634,10 +635,12 @@ int main(int argc, char **argv) { thread_create_detach(sighandler, NULL); thread_create_detach(timer_loop, ctx.p); - thread_create_detach(poller_loop, ctx.p); - thread_create_detach(poller_loop, ctx.p); - thread_create_detach(poller_loop, ctx.p); - thread_create_detach(poller_loop, ctx.p); + + numCPU = sysconf( _SC_NPROCESSORS_ONLN ); + + for (;idx<numCPU;++idx) { + thread_create_detach(poller_loop, ctx.p); + } while (!global_shutdown) { usleep(100000);

2 1

rtpengine, Question about 'str_sprintf'
by Frederic-Philippe Metz 23 Oct '14

23 Oct '14

Hi all, I have a question resp. str_sprintf: At the end, it ends up in 'INLINE str *__str_vsprintf(const char *fmt, va_list ap)' in str.h, but what I understand is that vasprintf does not allocate memory and 'INLINE str *__str_vsprintf(const char *fmt, va_list ap)' does not allocate memory too. So there's a risk of writing a string into a memory area not allocated before ? Am I right or isn't it a good day for coding today :-) ? Cheers, Frédéric

2 1

← Newer
1
...
5
6
7
8
9
10
11
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014